summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2007-10-11 15:13:24 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2007-10-11 15:13:24 +0000
commit8584912684a5509f6fe82b1ec9e170921023ffd2 (patch)
tree44e3fcd3c13125e588c7d61af6f440f522423dbc
parent341af8bcd0a7683b6c17ca23f1028ae47a9cf4c5 (diff)
downloadrsyslog-8584912684a5509f6fe82b1ec9e170921023ffd2.tar.gz
rsyslog-8584912684a5509f6fe82b1ec9e170921023ffd2.tar.xz
rsyslog-8584912684a5509f6fe82b1ec9e170921023ffd2.zip
integrated patch by varmojfekoj to tweak build system even further
-rw-r--r--configure.ac14
1 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index da0aac81..3de829d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,17 +254,23 @@ if test "x$enable_mysql" = "xyes"; then
[mysql/mysql.h],,
[AC_MSG_FAILURE([MySQL is missing])]
)
- AC_SUBST(LIBS_TMP,[$LIBS])
- AC_SEARCH_LIBS(
- [mysql_init],
+ AC_CHECK_PROG(
+ [HAVE_MYSQL_CONFIG],
+ [mysql_config],
+ [yes],,,
+ )
+ if test "x${HAVE_MYSQL_CONFIG}" != "xyes"; then
+ AC_MSG_FAILURE([mysql_config not found in PATH])
+ fi
+ AC_CHECK_LIB(
[mysqlclient],
+ [mysql_init],
[mysql_cflags=`mysql_config --cflags`
mysql_libs=`mysql_config --libs`
],
[AC_MSG_FAILURE([MySQL library is missing])],
[`mysql_config --libs`]
)
- AC_SUBST(LIBS,[$LIBS_TMP])
fi
AM_CONDITIONAL(ENABLE_MYSQL, test x$enable_mysql = xyes)
AC_SUBST(mysql_cflags)