From: Tomasz Pala <gotar@pld-linux.org>
Date: Tue, 15 May 2007 13:30:12 +0000 (+0000)
Subject: - fixed `mysql_config --libs` output handling for strings and linker
X-Git-Tag: help
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=87d69f660d931ce6e26affb6662e406f613f5a4b;p=packages%2Fulogd.git

- fixed `mysql_config --libs` output handling for strings and linker

Changed files:
    ulogd-mysql.patch -> 1.1
---

diff --git a/ulogd-mysql.patch b/ulogd-mysql.patch
new file mode 100644
index 0000000..d968069
--- /dev/null
+++ b/ulogd-mysql.patch
@@ -0,0 +1,22 @@
+--- configure.in.orig	2005-11-25 20:58:27.000000000 +0100
++++ configure.in	2007-05-15 14:55:26.000000000 +0200
+@@ -60,7 +60,7 @@
+ else
+         AC_DEFINE(HAVE_MYSQL)
+         MYSQLINCLUDES=`$d/mysql_config --include`
+-        MYSQLLIBS=`$d/mysql_config --libs`
++        MYSQLLIBS=`$d/mysql_config --libs | sed 's/-Wl,--as-needed //'`
+ 
+ 	DATABASE_DIR="${DATABASE_DIR} mysql"
+ 
+--- configure.in.orig	2007-05-15 15:02:06.000000000 +0200
++++ configure.in	2007-05-15 15:10:36.000000000 +0200
+@@ -83,7 +83,7 @@
+ 
+ 	AC_MSG_CHECKING(for mysql_real_escape_string support)
+ 
+-	MYSQL_FUNCTION_TEST=`strings ${MYSQLLIBS}/libmysqlclient.so | grep mysql_real_escape_string`
++	MYSQL_FUNCTION_TEST=`strings $(echo ${MYSQLLIBS} | grep -m 1 -o -- '-L/[[^ ]]*/ ' | sed 's/[[-L ]]//g')/libmysqlclient.so | grep mysql_real_escape_string`
+ 
+ 	if test "x$MYSQL_FUNCTION_TEST" = x
+ 	then