Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/edje
Dir : e17/libs/edje
Modified Files:
configure.in
Log Message:
configure improvements:
* add libtool versioning from the package version (from raster's
management of package version)
* replace AM_PROG_LIBTOOL(deprecated) by AC_PROG_LIBTOOL
* remove AM_ENABLE_SHARED as shared lib is built by default
* add AC_LIBTOOL_WIN32_DLL for libraries ported to Windows (tm)
* remove the libtool checks of c++ and fortran compilers
* remove PACKAGE_*_DIR from configure.in and define them in
Makefile.am as bindir and al. are expanded in them.
please report any problem that these changes can add
===================================================================
RCS file: /cvs/e/e17/libs/edje/configure.in,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- configure.in 8 Sep 2007 18:36:22 -0000 1.86
+++ configure.in 7 Oct 2007 08:02:53 -0000 1.87
@@ -7,7 +7,9 @@
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_ISC_POSIX
-AM_INIT_AUTOMAKE(edje, 0.5.0.041)
+
+VER=0.5.0.041
+AM_INIT_AUTOMAKE(edje, $VER)
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
@@ -15,8 +17,18 @@
AM_PROG_CC_C_O
AC_HEADER_STDC
AC_C_CONST
-AM_ENABLE_SHARED
-AM_PROG_LIBTOOL
+AC_LIBTOOL_WIN32_DLL
+define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl
+define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+AC_PROG_LIBTOOL
+
+VMAJ=`echo $VER | awk -F . '{printf("%s", $1);}'`
+VMIN=`echo $VER | awk -F . '{printf("%s", $2);}'`
+VMIC=`echo $VER | awk -F . '{printf("%s", $3);}'`
+SNAP=`echo $VER | awk -F . '{printf("%s", $4);}'`
+version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
+AC_SUBST(version_info)
+
AC_FUNC_ALLOCA
create_shared_lib=""
@@ -51,35 +63,6 @@
AC_SUBST(fnmatch_libs)
-if test "x${bindir}" = 'xNONE'; then
- if test "x${prefix}" = "xNONE"; then
- PACKAGE_BIN_DIR="${ac_default_prefix}/bin"
- else
- PACKAGE_BIN_DIR="${prefix}/bin"
- fi
-else
- PACKAGE_BIN_DIR="${bindir}"
-fi
-AC_SUBST(PACKAGE_BIN_DIR)
-
-if test "x${libdir}" = 'xNONE'; then
- if test "x${prefix}" = "xNONE"; then
- PACKAGE_LIB_DIR="${ac_default_prefix}/lib"
- else
- PACKAGE_LIB_DIR="${prefix}/lib"
- fi
-else
- PACKAGE_LIB_DIR="${libdir}"
-fi
-AC_SUBST(PACKAGE_LIB_DIR)
-
-if test "x${prefix}" = "xNONE"; then
- PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
-else
- PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
-fi
-AC_SUBST(PACKAGE_DATA_DIR)
-
AC_MSG_CHECKING(whether to build edje_cc)
have_edje_cc="yes"
AC_ARG_ENABLE(edje-cc, [ --disable-edje-cc disable building of edje_cc
], [
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs