Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas
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
* 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
* remove useless -L flags in *_la_LDFLAGS
===================================================================
RCS file: /cvs/e/e17/libs/evas/configure.in,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -3 -r1.233 -r1.234
--- configure.in 28 Oct 2007 14:11:56 -0000 1.233
+++ configure.in 4 Nov 2007 09:21:44 -0000 1.234
@@ -1,20 +1,34 @@
# get rid of that stupid cache mechanism
rm -f config.cache
-AC_INIT(configure.in)
+AC_INIT(evas, 0.9.9.041)
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(configure.in)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_ISC_POSIX
-AM_INIT_AUTOMAKE(evas, 0.9.9.041)
+
+AM_INIT_AUTOMAKE(1.6 dist-bzip2)
AM_CONFIG_HEADER(config.h)
-AC_C_BIGENDIAN
+AC_PROG_CXX
AC_PROG_CC
AM_PROG_CC_STDC
AC_HEADER_STDC
+AC_C_BIGENDIAN
AC_C_CONST
-AM_ENABLE_SHARED
-AM_PROG_LIBTOOL
+
+AC_LIBTOOL_WIN32_DLL
+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
MODULE_ARCH="$host_os-$host_cpu"
@@ -29,35 +43,6 @@
esac
AC_SUBST(create_shared_lib)
-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)
-
x_dir=""
x_cflags=""
x_libs=""
@@ -577,7 +562,7 @@
]
)
if test "x$have_evas_qtopia" = "xyes"; then
- AC_PROG_CXX
+ AC_LANG_PUSH(C++)
AC_CHECK_HEADER(qdirectpainter_qws.h,
[
AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_QTOPIA, test "$enableval" = "yes")
@@ -597,6 +582,7 @@
#include <qpainter.h>
]
)
+ AC_LANG_POP(C++)
else
AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_QTOPIA, false)
fi
-------------------------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
