Date: Wednesday, March 21, 2007 @ 20:04:01
Author: marc
Path: /cvsroot/carob/libmysequoia
Modified: configure.ac (1.38 -> 1.39) src/Makefile.am (1.16 -> 1.17)
test/Makefile.am (1.13 -> 1.14)
Simplified log4cxx detection, just like carob. Collapsed "optional"
--with-log4cxx options into standard CPP/LDFLAGS (log4cxx is
mandatory). 30 lines won. LMS-1
------------------+
configure.ac | 48 ++++++++----------------------------------------
src/Makefile.am | 4 ++--
test/Makefile.am | 4 ++--
3 files changed, 12 insertions(+), 44 deletions(-)
Index: libmysequoia/configure.ac
diff -u libmysequoia/configure.ac:1.38 libmysequoia/configure.ac:1.39
--- libmysequoia/configure.ac:1.38 Wed Mar 21 19:44:09 2007
+++ libmysequoia/configure.ac Wed Mar 21 20:04:01 2007
@@ -104,47 +104,15 @@
# Check for log4cxx headers and library
-# TODO: simplify just like carob below
-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_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_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])
+# 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"]])]
+ )
# Check for Carob headers and library
Index: libmysequoia/src/Makefile.am
diff -u libmysequoia/src/Makefile.am:1.16 libmysequoia/src/Makefile.am:1.17
--- libmysequoia/src/Makefile.am:1.16 Wed Mar 21 19:19:16 2007
+++ libmysequoia/src/Makefile.am Wed Mar 21 20:04:01 2007
@@ -33,8 +33,8 @@
Converter.cpp \
HostTokenizer.cpp
-libmysequoia_la_CXXFLAGS = @LOG4CXX_CFLAGS@ @MYSQL_CFLAGS@ @GCOV_CFLAGS@
@PROFILE_CFLAGS@
-libmysequoia_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ @GCOV_LDADD@
@LOG4CXX_LDADD@ @PROFILE_LDADD@
+libmysequoia_la_CXXFLAGS = @MYSQL_CFLAGS@ @GCOV_CFLAGS@ @PROFILE_CFLAGS@
+libmysequoia_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ @GCOV_LDADD@
@PROFILE_LDADD@
clean-local:
rm -f *.gcno *.gcda
Index: libmysequoia/test/Makefile.am
diff -u libmysequoia/test/Makefile.am:1.13 libmysequoia/test/Makefile.am:1.14
--- libmysequoia/test/Makefile.am:1.13 Wed Mar 21 19:19:16 2007
+++ libmysequoia/test/Makefile.am Wed Mar 21 20:04:01 2007
@@ -30,8 +30,8 @@
TestIniParser.cpp \
TestConverter.cpp
-runTests_CXXFLAGS = @CPPUNIT_CFLAGS@ @LOG4CXX_CFLAGS@ @MYSQL_CFLAGS@
@GCOV_CFLAGS@ @PROFILE_CFLAGS@
-runTests_LDADD = $(top_builddir)/src/libmysequoia.la @CPPUNIT_LDADD@
@GCOV_LDADD@ @LOG4CXX_LDADD@ @PROFILE_LDADD@
+runTests_CXXFLAGS = @CPPUNIT_CFLAGS@ @MYSQL_CFLAGS@ @GCOV_CFLAGS@
@PROFILE_CFLAGS@
+runTests_LDADD = $(top_builddir)/src/libmysequoia.la @CPPUNIT_LDADD@
@GCOV_LDADD@ @PROFILE_LDADD@
TESTS = $(check_PROGRAMS)
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
