pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-02 08:26:38 +02:00
Code Activity

BUILD : 1.7.16 (1181) BUGS : NOTES : Fixed MySQL detection in configure.in; it should now always work correctly if mysql_config is found

Browse Source 
git-svn-id: svn://svn.anope.org/anope/trunk@1181 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@902 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b
2006-10-17 19:08:23 +00:00
parent 4d638356f5
commit b84de63e72
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+8 -2
View File
@@ -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. */
configure.in
+8 -2
View File
@@ -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)
version.log
+5 -1
View File
@@ -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...