diff options
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | version.log | 6 |
3 files changed, 21 insertions, 5 deletions
@@ -2854,8 +2854,14 @@ fi if test "$MYSQLCONF" != ""; then hold_cflags="$CFLAGS" hold_ldflags="$LDFLAGS" - CFLAGS="$CFLAGS `$MYSQLCONF --cflags`" - LDFLAGS="$LDFLAGS `$MYSQLCONF --libs`" + if test "$MYSQL_CFLAGS" = ""; then + MYSQL_CFLAGS="`$MYSQLCONF --cflags`" + fi + if test "$MYSQL_LDFLAGS" = ""; then + MYSQL_LDFLAGS="`$MYSQLCONF --libs`" + fi + CFLAGS="$CFLAGS $MYSQL_CFLAGS" + LDFLAGS="$LDFLAGS $MYSQL_LDFLAGS" echo $ECHO_N "checking if mysql_config produces valid values... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ diff --git a/configure.in b/configure.in index 180e2403c..5d5b69d0f 100644 --- a/configure.in +++ b/configure.in @@ -90,8 +90,14 @@ AC_ARG_WITH(mysql, [ --without-mysql Do not use MySQL or attempt to fin if test "$MYSQLCONF" != ""; then hold_cflags="$CFLAGS" hold_ldflags="$LDFLAGS" - CFLAGS="$CFLAGS `$MYSQLCONF --cflags`" - LDFLAGS="$LDFLAGS `$MYSQLCONF --libs`" + if test "$MYSQL_CFLAGS" = ""; then + MYSQL_CFLAGS="`$MYSQLCONF --cflags`" + fi + if test "$MYSQL_LDFLAGS" = ""; then + MYSQL_LDFLAGS="`$MYSQLCONF --libs`" + fi + CFLAGS="$CFLAGS $MYSQL_CFLAGS" + LDFLAGS="$LDFLAGS $MYSQL_LDFLAGS" echo $ECHO_N "checking if mysql_config produces valid values... $ECHO_C" >&6 AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <mysql.h>]],[[MYSQL *mysql = mysql_init(0);]])], ac_cv_mysql_valid=yes,ac_cv_mysql_valid=no) diff --git a/version.log b/version.log index 373c1b345..fbf74976b 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="16" VERSION_EXTRA="-svn" -VERSION_BUILD="1180" +VERSION_BUILD="1181" # $Log$ # +# BUILD : 1.7.16 (1181) +# BUGS : +# NOTES : Fixed MySQL detection in configure.in; it should now always work correctly if mysql_config is found +# # BUILD : 1.7.16 (1180) # BUGS : 614 # NOTES : Fixed: [1] MySQL not storing passwords at all (blank passes) [2] saving of ttb with MySQL/RDB was completely fubar [3] do not send PONG-flood anymore on db-load... |