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

3 files changed, 71 insertions, 52 deletions

diff --git a/configure b/configure
index 3996820d8..1dd09ae2e 100755
--- a/configure
+++ b/configure
@@ -2806,7 +2806,7 @@ fi;
 	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
@@ -2852,33 +2852,57 @@ fi
 
 	fi
 	if test "$MYSQLCONF" != ""; then
-		MYSQL_CFLAGS="`$MYSQLCONF --cflags`"
-		MYSQL_LIBS="`$MYSQLCONF --libs`"
-		echo "$as_me:$LINENO: checking if mysql_config returns valid values" >&5
-echo $ECHO_N "checking if mysql_config returns valid values... $ECHO_C" >&6
-if test "${ac_cv_mysql_valid+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-cat >mysql_check.c << __EOF__
+		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
+		cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 #include <mysql.h>
-int main() {
-	MYSQL *mysql = mysql_init(0);
-	return 0;
+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
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_mysql_valid=yes
 else
-	ac_cv_mysql_valid=yes
-fi
-
-rm -f mysql_check mysql_check.c
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+ac_cv_mysql_valid=no
 fi
-echo "$as_me:$LINENO: result: $ac_cv_mysql_valid" >&5
-echo "${ECHO_T}$ac_cv_mysql_valid" >&6
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+		echo $ac_cv_mysql_valid >&6
 		if test "$ac_cv_mysql_valid" = "yes"; then
 
 cat >>confdefs.h <<_ACEOF
@@ -2894,9 +2918,10 @@ _ACEOF
 			RDB=" rdb.c "
 
 
-			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
 
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)
 
diff --git a/version.log b/version.log
index 66a4b44ff..8c5dbf594 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="1178"
+VERSION_BUILD="1179"
 
 # $Log$
 #
+# BUILD : 1.7.16 (1179)
+# BUGS  : 
+# NOTES : Changed uber-mysql-validation-detection to use AM_LINK_IFELSE as it should have used all along...
+#
 # BUILD : 1.7.16 (1178)
 # BUGS  : 
 # NOTES : Fixed a MySQL query error in the RDB functions.... successor cannot be NULL