Date: Thursday, March 22, 2007 @ 19:38:23
Author: marc
Path: /cvsroot/carob/libmysequoia
Modified: configure.ac (1.44 -> 1.45)
Put MySQL checks first so they are not polluted by log4cxx and carob
threaded libs.
--------------+
configure.ac | 62 +++++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 30 deletions(-)
Index: libmysequoia/configure.ac
diff -u libmysequoia/configure.ac:1.44 libmysequoia/configure.ac:1.45
--- libmysequoia/configure.ac:1.44 Thu Mar 22 19:29:27 2007
+++ libmysequoia/configure.ac Thu Mar 22 19:38:23 2007
@@ -112,35 +112,6 @@
[AC_MSG_ERROR([[libgmp not found. Install it or fix LDFLAGS.]])])
-# Check for log4cxx headers and library
-AC_CHECK_HEADER([log4cxx/logger.h], ,
- [AC_MSG_ERROR([[log4cxx/logger.h not found. Try to fix
CPPFLAGS, for instance:
- ./configure CPPFLAGS="... -I/usr/local/include"]])])
-
-# AC_CHECK_LIB does not support namespaces
-AC_CHECK_LIB([log4cxx], [main], ,
- [AC_MSG_ERROR([[liblog4cxx not found. Try to fix LDFLAGS, for instance:
- ./configure LDFLAGS="... -L/usr/local/lib"]])]
- , [-pthread])
-# -pthread works only with gcc.
-# Should probably use http://autoconf-archive.cryp.to/acx_pthread.html
-
-
-# Check for Carob headers and library
-AC_CHECK_HEADER([carob/Common.hpp], ,
- [AC_MSG_ERROR([[carob/Common.hpp not found. Try to fix
CPPFLAGS, for instance:
- ./configure CPPFLAGS="... -I\`pwd\`/../carob/include"
- or ./configure CPPFLAGS="... -I/usr/local/include"]])])
-
-# AC_CHECK_LIB does not support namespaces
-AC_CHECK_LIB([carob], [main], ,
- [AC_MSG_ERROR([[libcarob not found. Try to fix LDFLAGS, for instance:
- ./configure LDFLAGS="... -L`pwd`/../carob"
- or ./configure LDFLAGS="... -L/usr/local/lib"]])]
- , [-pthread])
-# -pthread works only with gcc.
-# Should probably use http://autoconf-archive.cryp.to/acx_pthread.html
-
# Check for mysql headers
AC_CHECK_HEADER([[mysql/mysql_version.h]], ,
[AC_MSG_ERROR([[mysql/mysql_version.h not found. Try to fix
CPPFLAGS, for instance:
@@ -186,7 +157,38 @@
SHARED_LIB_VERSION=$major_version:0:0
AC_SUBST(SHARED_LIB_VERSION)
-AC_MSG_NOTICE([[Compiling libmysequoia $major_version.0.0]])
+AC_MSG_NOTICE([[Compiling libmysequoia version $major_version.0.0]])
+
+
+# Check for log4cxx headers and library
+AC_CHECK_HEADER([log4cxx/logger.h], ,
+ [AC_MSG_ERROR([[log4cxx/logger.h not found. Try to fix
CPPFLAGS, for instance:
+ ./configure CPPFLAGS="... -I/usr/local/include"]])])
+
+# AC_CHECK_LIB does not support namespaces
+AC_CHECK_LIB([log4cxx], [main], ,
+ [AC_MSG_ERROR([[liblog4cxx not found. Try to fix LDFLAGS, for instance:
+ ./configure LDFLAGS="... -L/usr/local/lib"]])]
+ , [-pthread])
+# -pthread works only with gcc.
+# Should probably use http://autoconf-archive.cryp.to/acx_pthread.html
+
+
+# Check for Carob headers and library
+AC_CHECK_HEADER([carob/Common.hpp], ,
+ [AC_MSG_ERROR([[carob/Common.hpp not found. Try to fix
CPPFLAGS, for instance:
+ ./configure CPPFLAGS="... -I\`pwd\`/../carob/include"
+ or ./configure CPPFLAGS="... -I/usr/local/include"]])])
+
+# AC_CHECK_LIB does not support namespaces
+AC_CHECK_LIB([carob], [main], ,
+ [AC_MSG_ERROR([[libcarob not found. Try to fix LDFLAGS, for instance:
+ ./configure LDFLAGS="... -L`pwd`/../carob"
+ or ./configure LDFLAGS="... -L/usr/local/lib"]])]
+ , [-pthread])
+# -pthread works only with gcc.
+# Should probably use http://autoconf-archive.cryp.to/acx_pthread.html
+
# Checks for header files.
AC_HEADER_STDC
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
