Date: Wednesday, January 17, 2007 @ 17:34:31
Author: csaba
Path: /cvsroot/carob/libmysequoia/config
Modified: mysequoia_config (1.3 -> 1.4) ure.ac (1.23 -> 1.24)
Do not link libmysequoia to the pthread library.
------------------+
mysequoia_config | 5 +++--
ure.ac | 7 ++-----
2 files changed, 5 insertions(+), 7 deletions(-)
Index: libmysequoia/config/mysequoia_config
diff -u libmysequoia/config/mysequoia_config:1.3
libmysequoia/config/mysequoia_config:1.4
--- libmysequoia/config/mysequoia_config:1.3 Tue Nov 21 10:48:28 2006
+++ libmysequoia/config/mysequoia_config Wed Jan 17 17:34:31 2007
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ "$(which mysql_config)" == "" ]; then
+if test -z "`which mysql_config`" ; then
echo "Error: The mysql-devel package is not installed. Please install it."
exit 1
fi
@@ -9,4 +9,5 @@
-e 's#mysequoia_r#mysequoia#g' \
-e 's#mysql_config#mysequoia_config#g' \
-e 's#/usr/lib/mysql#/usr/lib/mysequoia#g' \
- -e 's#/usr/lib64/mysql#/usr/lib64/mysequoia#g'
+ -e 's#/usr/lib64/mysql#/usr/lib64/mysequoia#g' \
+ -e 's#/usr/local/lib/mysql#/usr/local/lib#g'
Index: libmysequoia/configure.ac
diff -u libmysequoia/configure.ac:1.23 libmysequoia/configure.ac:1.24
--- libmysequoia/configure.ac:1.23 Wed Jan 17 13:28:23 2007
+++ libmysequoia/configure.ac Wed Jan 17 17:34:31 2007
@@ -102,9 +102,6 @@
AC_SUBST(DOXYGEN)
-# Check for pthreads.
-AC_CHECK_LIB([pthread], [main],, AC_MSG_ERROR([pthread library not found.
Please install it.]))
-
# Check for Carob headers and library
AC_MSG_CHECKING([for Carob])
carob_header_dir="/usr/include/carob"
@@ -140,7 +137,7 @@
,AC_MSG_ERROR([You need to install the Carob development
packages or use --with-carob-lib=DIR if the library is in an unusual place.]))
CXXFLAGS="$save_CXXFLAGS"
LIBS="$save_LIBS"
-CAROB_LDADD="-L$carob_lib_dir -lcarob -lpthread"
+CAROB_LDADD="-L$carob_lib_dir -lcarob"
AC_SUBST(CAROB_LDADD)
AC_MSG_RESULT([yes])
@@ -179,7 +176,7 @@
,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"
+LOG4CXX_LDADD="-L$log4cxx_lib_dir -llog4cxx"
AC_SUBST(LOG4CXX_LDADD)
AC_MSG_RESULT([yes])
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
