Date: Monday, February 13, 2006 @ 13:26:25
Author: csaba
Path: /cvsroot/carob/libmysequoia
Modified: configure.ac (1.5 -> 1.6) src/Makefile.am (1.7 -> 1.8)
test/Makefile.am (1.6 -> 1.7)
Remove the hardcoded carob include files and carob library path.
------------------+
configure.ac | 9 +++++++--
src/Makefile.am | 5 ++---
test/Makefile.am | 5 ++---
3 files changed, 11 insertions(+), 8 deletions(-)
Index: libmysequoia/configure.ac
diff -u libmysequoia/configure.ac:1.5 libmysequoia/configure.ac:1.6
--- libmysequoia/configure.ac:1.5 Thu Feb 9 13:05:59 2006
+++ libmysequoia/configure.ac Mon Feb 13 13:26:24 2006
@@ -82,9 +82,14 @@
fi
AC_SUBST(DOXYGEN)
+# Check for Carob headers and library
+CXXFLAGS="$CXXFLAGS -I/usr/include/carob"
+LIBS="$LIBS -lcarob"
+AC_TRY_LINK([#include <ConnectionParameters.hpp>],
+ [using namespace CarobNS; ConnectionParameters c; return 0
],
+ ,AC_MSG_ERROR([Carob header files and library not found.
Please install it.]))
+
# Checks for libraries.
-#TODO enable Carob lirary check when Carob will be installable
-#AC_CHECK_LIB([carobcpp], [main],, AC_MSG_ERROR([carob library not found.
Please install it.]))
AC_CHECK_LIB([dl], [dlopen],, AC_MSG_ERROR([dl library not found. Please
install it.]))
AC_CHECK_LIB([log4cxx], [main], LOG4CXX_LDADD="-llog4cxx",
AC_MSG_ERROR([log4cxx library not found. Please install it.]))
AC_SUBST(LOG4CXX_LDADD)
Index: libmysequoia/src/Makefile.am
diff -u libmysequoia/src/Makefile.am:1.7 libmysequoia/src/Makefile.am:1.8
--- libmysequoia/src/Makefile.am:1.7 Tue Jan 31 11:27:01 2006
+++ libmysequoia/src/Makefile.am Mon Feb 13 13:26:25 2006
@@ -29,9 +29,8 @@
Utils.cpp \
IniParser.cpp
-# remove the relative paths to carob when carob will be installable
-libmysequoia_la_CXXFLAGS = -I$(top_builddir)/../carob/include @MYSQL_CFLAGS@
@GCOV_CFLAGS@
-libmysequoia_la_LDFLAGS = -version-info 0:0:0 -L$(top_builddir)/../carob
-lcarob @GCOV_LDADD@ @LOG4CXX_LDADD@
+libmysequoia_la_CXXFLAGS = @MYSQL_CFLAGS@ @GCOV_CFLAGS@
+libmysequoia_la_LDFLAGS = -version-info 0:0:0 @GCOV_LDADD@ @LOG4CXX_LDADD@
clean-local:
rm -f *.gcno *.gcda
Index: libmysequoia/test/Makefile.am
diff -u libmysequoia/test/Makefile.am:1.6 libmysequoia/test/Makefile.am:1.7
--- libmysequoia/test/Makefile.am:1.6 Thu Feb 9 13:05:59 2006
+++ libmysequoia/test/Makefile.am Mon Feb 13 13:26:25 2006
@@ -29,9 +29,8 @@
TestMySQLAPI.cpp \
TestIniParser.cpp
-# FIXME the relative PATH
-runTests_CXXFLAGS = -I$(top_builddir)/../carob/include @CPPUNIT_CFLAGS@
@MYSQL_CFLAGS@ @GCOV_CFLAGS@
-runTests_LDADD = $(top_builddir)/src/libmysequoia.la @CPPUNIT_LDADD@
@GCOV_LDADD@ -lpthread
+runTests_CXXFLAGS = @CPPUNIT_CFLAGS@ @MYSQL_CFLAGS@ @GCOV_CFLAGS@
+runTests_LDADD = $(top_builddir)/src/libmysequoia.la @CPPUNIT_LDADD@
@GCOV_LDADD@ -lpthread
TESTS = $(check_PROGRAMS)
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
