Date: Monday, March 19, 2007 @ 14:36:37
Author: marc
Path: /cvsroot/carob/libmysequoia
Modified: configure.ac (1.34 -> 1.35)
Search for log4cxx BEFORE carob, so we never get a wrong "carob
missing" message when log4cxx is missing.
--------------+
configure.ac | 85 +++++++++++++++++++++++++++++----------------------------
1 files changed, 44 insertions(+), 41 deletions(-)
Index: libmysequoia/configure.ac
diff -u libmysequoia/configure.ac:1.34 libmysequoia/configure.ac:1.35
--- libmysequoia/configure.ac:1.34 Sat Mar 17 17:49:44 2007
+++ libmysequoia/configure.ac Mon Mar 19 14:36:37 2007
@@ -102,6 +102,50 @@
AC_SUBST(DOXYGEN)
+
+# Check for log4cxx headers and library
+AC_MSG_CHECKING([for log4cxx headers])
+log4cxx_header_dir="/usr/include"
+AC_ARG_WITH(log4cxx-headers,
+ [ --with-log4cxx-headers=DIR log4cxx header files directory.],
+ [
+ log4cxx_header_dir="$withval"
+ ]
+)
+if test -f "$log4cxx_header_dir/log4cxx/logger.h"
+then
+ LOG4CXX_CFLAGS="-I$log4cxx_header_dir"
+else
+ AC_MSG_ERROR([You need to install the log4cxx development package or use
--with-log4cxx-headers=DIR if the headers are in an unusual place.])
+fi
+AC_MSG_RESULT([$log4cxx_header_dir])
+AC_SUBST(LOG4CXX_CFLAGS)
+
+AC_MSG_CHECKING([for log4cxx library])
+case `uname -m` in
+ i?86 ) log4cxx_lib_dir="/usr/lib";;
+ x86_64 ) log4cxx_lib_dir="/usr/lib64";;
+esac
+AC_ARG_WITH(log4cxx-lib,
+ [ --with-log4cxx-lib=DIR log4cxx library directory.],
+ [
+ log4cxx_lib_dir="$withval"
+ ]
+)
+save_CXXFLAGS="$CXXFLAGS"
+save_LIBS="$LIBS"
+CXXFLAGS="-I$log4cxx_header_dir"
+LIBS="-L$log4cxx_lib_dir -llog4cxx -lpthread"
+AC_TRY_LINK([#include <log4cxx/logger.h>],
+ [using namespace log4cxx; LoggerPtr
logger(Logger::getLogger(_T("test")));; ],
+ ,AC_MSG_ERROR([You need to install the log4cxx development
packages or use --with-log4cxx-lib=DIR if the library is in an unusual place.]))
+CXXFLAGS="$save_CXXFLAGS"
+LIBS="$save_LIBS"
+LOG4CXX_LDADD="-L$log4cxx_lib_dir -llog4cxx"
+AC_SUBST(LOG4CXX_LDADD)
+AC_MSG_RESULT([yes])
+
+
# Check for Carob headers and library
AC_MSG_CHECKING([for Carob])
carob_header_dir="/usr/include"
@@ -152,47 +196,6 @@
AC_SUBST(CAROB_LDADD)
AC_MSG_RESULT([yes])
-# Check for log4cxx headers and library
-AC_MSG_CHECKING([for log4cxx headers])
-log4cxx_header_dir="/usr/include"
-AC_ARG_WITH(log4cxx-headers,
- [ --with-log4cxx-headers=DIR log4cxx header files directory.],
- [
- log4cxx_header_dir="$withval"
- ]
-)
-if test -f "$log4cxx_header_dir/log4cxx/logger.h"
-then
- LOG4CXX_CFLAGS="-I$log4cxx_header_dir"
-else
- AC_MSG_ERROR([You need to install the log4cxx development package or use
--with-log4cxx-headers=DIR if the headers are in an unusual place.])
-fi
-AC_MSG_RESULT([$log4cxx_header_dir])
-AC_SUBST(LOG4CXX_CFLAGS)
-
-AC_MSG_CHECKING([for log4cxx library])
-case `uname -m` in
- i?86 ) log4cxx_lib_dir="/usr/lib";;
- x86_64 ) log4cxx_lib_dir="/usr/lib64";;
-esac
-AC_ARG_WITH(log4cxx-lib,
- [ --with-log4cxx-lib=DIR log4cxx library directory.],
- [
- log4cxx_lib_dir="$withval"
- ]
-)
-save_CXXFLAGS="$CXXFLAGS"
-save_LIBS="$LIBS"
-CXXFLAGS="-I$log4cxx_header_dir"
-LIBS="-L$log4cxx_lib_dir -llog4cxx -lpthread"
-AC_TRY_LINK([#include <log4cxx/logger.h>],
- [using namespace log4cxx; LoggerPtr
logger(Logger::getLogger(_T("test")));; ],
- ,AC_MSG_ERROR([You need to install the log4cxx development
packages or use --with-log4cxx-lib=DIR if the library is in an unusual place.]))
-CXXFLAGS="$save_CXXFLAGS"
-LIBS="$save_LIBS"
-LOG4CXX_LDADD="-L$log4cxx_lib_dir -llog4cxx"
-AC_SUBST(LOG4CXX_LDADD)
-AC_MSG_RESULT([yes])
# Check for mysql headers
AC_MSG_CHECKING([for MySQL headers])
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
