Date: Wednesday, March 21, 2007 @ 19:19:16
Author: marc
Path: /cvsroot/carob/libmysequoia
Modified: src/Makefile.am (1.15 -> 1.16) test/Makefile.am (1.12 -> 1.13)
Replaced manual carob detection using obsolete AC_TRY_LINK macro by
standard AC_CHECH_HEADER + AC_CHECK_LIB. 35 lines shorter. Carob
location may now be specified using CPPFLAGS and LDFLAGS (FLAGS
ordering problems are no more hidden under the carpet).
------------------+
src/Makefile.am | 4 ++--
test/Makefile.am | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Index: libmysequoia/src/Makefile.am
diff -u libmysequoia/src/Makefile.am:1.15 libmysequoia/src/Makefile.am:1.16
--- libmysequoia/src/Makefile.am:1.15 Tue Jan 2 11:09:00 2007
+++ libmysequoia/src/Makefile.am Wed Mar 21 19:19:16 2007
@@ -33,8 +33,8 @@
Converter.cpp \
HostTokenizer.cpp
-libmysequoia_la_CXXFLAGS = @CAROB_CFLAGS@ @LOG4CXX_CFLAGS@ @MYSQL_CFLAGS@
@GCOV_CFLAGS@ @PROFILE_CFLAGS@
-libmysequoia_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ @GCOV_LDADD@
@CAROB_LDADD@ @LOG4CXX_LDADD@ @PROFILE_LDADD@
+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@
clean-local:
rm -f *.gcno *.gcda
Index: libmysequoia/test/Makefile.am
diff -u libmysequoia/test/Makefile.am:1.12 libmysequoia/test/Makefile.am:1.13
--- libmysequoia/test/Makefile.am:1.12 Tue Jan 2 11:09:00 2007
+++ libmysequoia/test/Makefile.am Wed Mar 21 19:19:16 2007
@@ -30,8 +30,8 @@
TestIniParser.cpp \
TestConverter.cpp
-runTests_CXXFLAGS = @CPPUNIT_CFLAGS@ @CAROB_CFLAGS@ @LOG4CXX_CFLAGS@
@MYSQL_CFLAGS@ @GCOV_CFLAGS@ @PROFILE_CFLAGS@
-runTests_LDADD = $(top_builddir)/src/libmysequoia.la @CPPUNIT_LDADD@
@GCOV_LDADD@ @CAROB_LDADD@ @LOG4CXX_LDADD@ @PROFILE_LDADD@
+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@
TESTS = $(check_PROGRAMS)
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
