Date: Wednesday, April 11, 2007 @ 19:06:14
Author: marc
Path: /cvsroot/carob/libmysequoia
Modified: configure.ac (1.50 -> 1.51)
Added AC_CHECK_PROGS(MYSQL_CONFIG) (not used yet)
--------------+
configure.ac | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
Index: libmysequoia/configure.ac
diff -u libmysequoia/configure.ac:1.50 libmysequoia/configure.ac:1.51
--- libmysequoia/configure.ac:1.50 Thu Apr 5 12:43:22 2007
+++ libmysequoia/configure.ac Wed Apr 11 19:06:14 2007
@@ -139,20 +139,20 @@
SEQUOIA_AC_MYSQL_VERSION_ID_AT_LEAST(50000)
if test x"$sequoia_ac_mysql_at_least" = xyes
-then major_version=15
+then major_version=15; mysql_major=5
fi
if test x"$sequoia_ac_mysql_at_least" = xno; then
SEQUOIA_AC_MYSQL_VERSION_ID_AT_LEAST(40100)
if test x"$sequoia_ac_mysql_at_least" = xyes
- then major_version=14; fi
+ then major_version=14; mysql_major=4; fi
fi
if test x"$sequoia_ac_mysql_at_least" = xno; then
SEQUOIA_AC_MYSQL_VERSION_ID_AT_LEAST(40000)
if test x"$sequoia_ac_mysql_at_least" = xyes
- then major_version=12
- # you can comment out the following line to try
+ then major_version=12; mysql_major=4
+ dnl you can comment out the following line to try
AC_MSG_ERROR([[libmysqlclient.so.12 not supported yet, check JIRA LMS-44]])
fi
fi
@@ -161,6 +161,9 @@
then AC_MSG_ERROR([[MYSQL_VERSION_ID too old (< 40000)]])
fi
+
+AC_CHECK_PROGS(MYSQL_CONFIG, [mysql_config mysql_config${mysql_major}],
[[NONE]])
+
# See the libtool docs for information on how to do shared lib versions.
SHARED_LIB_VERSION=$major_version:0:0
AC_SUBST(SHARED_LIB_VERSION)
@@ -172,7 +175,7 @@
# /usr/bin/php.dlopen(RTLD_DEEPBIND) madness or similar, by ensuring
# we are both in the same lookup scope, so we side-step any subtle
# priorities between different scopes.
-
+# TODO: implement a (dangerous) option to disable this
AC_CHECK_LIB([mysqlclient], [main], ,
[AC_MSG_ERROR([[libmysqlclient not found. Try to fix LDFLAGS, for
instance:
./configure LDFLAGS="... -L/usr/local/lib"]])]
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
