diff options
| author | geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2006-10-16 17:53:02 +0000 |
|---|---|---|
| committer | geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2006-10-16 17:53:02 +0000 |
| commit | af5f8af76f67f4053f529243d4ebe43c2bc2e282 (patch) | |
| tree | bbab2dafe41cde0ab27f55733ae82c43ffb7cb5c /configure.in | |
| parent | dac7c2dbfde4bb72ba1653cfd9d224a6610850c1 (diff) | |
BUILD : 1.7.16 (1179) BUGS : NOTES : Changed uber-mysql-validation-detection to use AM_LINK_IFELSE as it should have used all along...
git-svn-id: svn://svn.anope.org/anope/trunk@1179 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@900 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/configure.in b/configure.in index 7661089bb..180e2403c 100644 --- a/configure.in +++ b/configure.in @@ -74,39 +74,28 @@ fi DIS_MYSQL=" MySQL: No" -AC_ARG_WITH(mysql, [ --without-mysql Do not use MySQL or attempt to find it],,[ +AC_ARG_WITH(mysql, [ --without-mysql Do not use MySQL or attempt to find it],,[ AC_ARG_WITH(mysqlconfig-path, [ --with-mysqlconfig-path=PATH Complete path to the mysql_config executable], mysql_config_path="$withval", mysql_config_path="") MYSQLCONF="" if test "$mysql_config_path" != ""; then if test -x "$mysql_config_path"; then MYSQLCONF="$mysql_config_path" - echo "checking for mysql_config... $MYSQLCONF" + echo "checking for mysql_config... $MYSQLCONF" >&6 fi fi if test "$MYSQLCONF" = ""; then AC_PATH_PROG(MYSQLCONF,mysql_config, "") fi if test "$MYSQLCONF" != ""; then - MYSQL_CFLAGS="`$MYSQLCONF --cflags`" - MYSQL_LIBS="`$MYSQLCONF --libs`" - AC_CACHE_CHECK(if mysql_config returns valid values,ac_cv_mysql_valid,[ -cat >mysql_check.c << __EOF__ -#include <mysql.h> -int main() { - MYSQL *mysql = mysql_init(0); - return 0; -} -__EOF__ -$CC -o mysql_check $CFLAGS $MYSQL_CFLAGS $MYSQL_LIBS mysql_check.c 1>&5 2>&5 -if test "$?" != "0"; then - ac_cv_mysql_valid=no -else - ac_cv_mysql_valid=yes -fi - -rm -f mysql_check mysql_check.c -]) + hold_cflags="$CFLAGS" + hold_ldflags="$LDFLAGS" + CFLAGS="$CFLAGS `$MYSQLCONF --cflags`" + LDFLAGS="$LDFLAGS `$MYSQLCONF --libs`" + 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) + echo $ac_cv_mysql_valid >&6 if test "$ac_cv_mysql_valid" = "yes"; then AC_DEFINE_UNQUOTED(USE_MYSQL,1,"Use Mysql") AC_DEFINE_UNQUOTED(USE_RDB,1,"Use RDB") @@ -114,13 +103,14 @@ rm -f mysql_check mysql_check.c RDB=" rdb.c " AC_SUBST(MYSQL) AC_SUBST(RDB) - CFLAGS="$CFLAGS $MYSQL_CFLAGS" - LDFLAGS="$LDFLAGS $MYSQL_LIBS" - DIS_MYSQL=" MySQL: Yes" + DIS_MYSQL=" MySQL: Yes" + else + CFLAGS="$hold_cflags" + LDFLAGS="$hold_ldflags" fi fi ]) - + AC_SUBST(ANOPELIBS) AC_SUBST(LDFLAGS) |