[netfilter-cvslog] r6962 - trunk/ulog/ulogd

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2007-07-26 16:28:13 +0200 (Thu, 26 Jul 2007)
New Revision: 6962

Modified:
   trunk/ulog/ulogd/configure.in
Log:
fix old mysql detection (Jan EngelHardt)


Modified: trunk/ulog/ulogd/configure.in
===================================================================
--- trunk/ulog/ulogd/configure.in	2007-07-24 08:24:37 UTC (rev 6961)
+++ trunk/ulog/ulogd/configure.in	2007-07-26 14:28:13 UTC (rev 6962)
@@ -64,7 +64,6 @@
 else
         AC_DEFINE(HAVE_MYSQL)
         MYSQLINCLUDES=`$d/mysql_config --include`
-        MYSQLLIBS=`$d/mysql_config --libs`
 
 	DATABASE_DIR="${DATABASE_DIR} mysql"
 
@@ -87,16 +86,9 @@
 
 	AC_MSG_CHECKING(for mysql_real_escape_string support)
 
-	MYSQL_FUNCTION_TEST=`strings ${MYSQLLIBS}/libmysqlclient.so | grep mysql_real_escape_string`
+	AC_SEARCH_LIBS(mysql_real_escape_string, mysqlclient_r mysqlclient,
+		[EXTRA_MYSQL_DEF="-DOLD_MYSQL=1"])
 
-	if test "x$MYSQL_FUNCTION_TEST" = x
-	then
-                EXTRA_MYSQL_DEF="-DOLD_MYSQL=1 "
-                AC_MSG_RESULT(found old MySQL)
-	else
-		AC_MSG_RESULT(found new MySQL)
-	fi
-
 fi      
 ])