Date: Wednesday, December 20, 2006 @ 17:59:13
Author: csaba
Path: /cvsroot/carob/libmysequoia
Modified: configure.ac (1.19 -> 1.20) src/Makefile.am (1.13 -> 1.14)
test/Makefile.am (1.10 -> 1.11)
Configurable log4cxx header and library path. Fixes LMS-37
------------------+
configure.ac | 42 ++++++++++++++++++++++++++++++++++++++++--
src/Makefile.am | 2 +-
test/Makefile.am | 4 ++--
3 files changed, 43 insertions(+), 5 deletions(-)
Index: libmysequoia/configure.ac
diff -u libmysequoia/configure.ac:1.19 libmysequoia/configure.ac:1.20
--- libmysequoia/configure.ac:1.19 Wed Dec 20 16:26:04 2006
+++ libmysequoia/configure.ac Wed Dec 20 17:59:13 2006
@@ -121,9 +121,47 @@
AC_SUBST(CAROB_LDADD)
AC_MSG_RESULT([yes])
-# Checks for libraries.
-AC_CHECK_LIB([log4cxx], [main], LOG4CXX_LDADD="-llog4cxx",
AC_MSG_ERROR([log4cxx library not found. Please install it.]))
+# Check for pthreads.
+AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR([pthread library not found.
Please install it.]))
+
+# 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])
+log4cxx_lib_dir="/usr/lib"
+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 -lpthread"
AC_SUBST(LOG4CXX_LDADD)
+AC_MSG_RESULT([yes])
# Check for mysql headers
AC_MSG_CHECKING([for MySQL headers])
Index: libmysequoia/src/Makefile.am
diff -u libmysequoia/src/Makefile.am:1.13 libmysequoia/src/Makefile.am:1.14
--- libmysequoia/src/Makefile.am:1.13 Wed Dec 20 16:26:04 2006
+++ libmysequoia/src/Makefile.am Wed Dec 20 17:59:13 2006
@@ -33,7 +33,7 @@
Converter.cpp \
HostTokenizer.cpp
-libmysequoia_la_CXXFLAGS = @CAROB_CFLAGS@ @MYSQL_CFLAGS@ @GCOV_CFLAGS@
+libmysequoia_la_CXXFLAGS = @CAROB_CFLAGS@ @LOG4CXX_CFLAGS@ @MYSQL_CFLAGS@
@GCOV_CFLAGS@
libmysequoia_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ @GCOV_LDADD@
@CAROB_LDADD@ @LOG4CXX_LDADD@
clean-local:
Index: libmysequoia/test/Makefile.am
diff -u libmysequoia/test/Makefile.am:1.10 libmysequoia/test/Makefile.am:1.11
--- libmysequoia/test/Makefile.am:1.10 Wed Dec 20 16:26:04 2006
+++ libmysequoia/test/Makefile.am Wed Dec 20 17:59:13 2006
@@ -30,8 +30,8 @@
TestIniParser.cpp \
TestConverter.cpp
-runTests_CXXFLAGS = @CPPUNIT_CFLAGS@ @CAROB_CFLAGS@ @MYSQL_CFLAGS@
@GCOV_CFLAGS@
-runTests_LDADD = $(top_builddir)/src/libmysequoia.la @CPPUNIT_LDADD@
@GCOV_LDADD@ @CAROB_LDADD@ -lpthread
+runTests_CXXFLAGS = @CPPUNIT_CFLAGS@ @CAROB_CFLAGS@ @LOG4CXX_CFLAGS@
@MYSQL_CFLAGS@ @GCOV_CFLAGS@
+runTests_LDADD = $(top_builddir)/src/libmysequoia.la @CPPUNIT_LDADD@
@GCOV_LDADD@ @CAROB_LDADD@ @LOG4CXX_LDADD@
TESTS = $(check_PROGRAMS)
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
