From: Enlightenment C. <no...@cv...> - 2007-11-04 09:11:22
|
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/eet Dir : e17/libs/eet Modified Files: configure.in Log Message: autostuff improvements: * use non deprecated version of AC_INIT and AM_INIT_AUTOMAKE and check the required minimal versions. * add bzipped distribution archive * add AC_LIBTOOL_WIN32_DLL * forbid libtool to check fortran and c++ compilers * compute libtool versioning from the version of the package * pass the directories based on ${prefix} to the preoprocessor with the -D option * replace INCLUDES, wich is deprecated since 2001 by AM_CPPFLAGS =================================================================== RCS file: /cvs/e/e17/libs/eet/configure.in,v retrieving revision 1.78 retrieving revision 1.79 diff -u -3 -r1.78 -r1.79 --- configure.in 25 Sep 2007 18:26:48 -0000 1.78 +++ configure.in 4 Nov 2007 09:10:49 -0000 1.79 @@ -1,19 +1,33 @@ # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT(configure.in) +AC_INIT(eet, 0.9.10.041, enl...@li...) +AC_PREREQ(2.52) +AC_CONFIG_SRCDIR(configure.in) AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(eet, 0.9.10.041) + +AM_INIT_AUTOMAKE(1.6 dist-bzip2) AM_CONFIG_HEADER(config.h) AC_PROG_CC AM_PROG_CC_STDC 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 $PACKAGE_VERSION | awk -F . '{printf("%s", $1);}'` +VMIN=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $2);}'` +VMIC=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $3);}'` +SNAP=`echo $PACKAGE_VERSION | awk -F . '{printf("%s", $4);}'` +version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN" +AC_SUBST(version_info) + AC_FUNC_ALLOCA AC_CHECK_HEADER(zlib.h,, AC_MSG_ERROR("Cannot find zlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file")) @@ -72,35 +86,6 @@ ], AC_MSG_WARN([Cannot check when cross-compiling -- assuming null is okay]) ) -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) - #AM_CHECK_DOXYGEN() AC_OUTPUT([ @@ -128,12 +113,9 @@ echo echo "Configuration Options Summary:" echo -#echo " Build documentation..: $BUILD_DOCS" -#echo echo " Compilation..........: make" echo echo " Installation.........: make install" echo echo " prefix.............: $prefix" -#echo " documentation..: $datadir/$PACKAGE/doc" echo |