diff --git a/auxdir/x_ac_databases.m4 b/auxdir/x_ac_databases.m4
index 63c87fc62968f105406d682e233a865c871c55f0..776239b8e75fafb206ff332c46a34e8883bc3cd5 100644
--- a/auxdir/x_ac_databases.m4
+++ b/auxdir/x_ac_databases.m4
@@ -89,15 +89,15 @@ AC_DEFUN([X_AC_DATABASES],
 				CFLAGS="$save_CFLAGS"
 				LIBS="$save_LIBS"
 				
- 				MYSQL_CFLAGS=""
-				MYSQL_LIBS=""
-      				if test "$ac_have_mysql" == "yes"; then
+    				if test "$ac_have_mysql" == "yes"; then
             				AC_MSG_RESULT([MySQL (non-threaded) test program built properly.])
             				AC_SUBST(MYSQL_LIBS)
 					AC_SUBST(MYSQL_CFLAGS)
 					AC_DEFINE(HAVE_MYSQL, 1, [Define to 1 if using MySQL libaries])
 				else
-       					AC_MSG_WARN([*** MySQL test program execution failed.])
+					MYSQL_CFLAGS=""
+					MYSQL_LIBS=""
+          				AC_MSG_WARN([*** MySQL test program execution failed.])
 				fi        	
 			fi
 		fi
diff --git a/configure b/configure
index 3e8f0950ef5a8c61844ca70e39c3a729133c2b76..fe472cf3a0e361b3137bba160dbf42f97c83dd9a 100755
--- a/configure
+++ b/configure
@@ -25626,9 +25626,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 				CFLAGS="$save_CFLAGS"
 				LIBS="$save_LIBS"
 
- 				MYSQL_CFLAGS=""
-				MYSQL_LIBS=""
-      				if test "$ac_have_mysql" == "yes"; then
+    				if test "$ac_have_mysql" == "yes"; then
             				{ echo "$as_me:$LINENO: result: MySQL (non-threaded) test program built properly." >&5
 echo "${ECHO_T}MySQL (non-threaded) test program built properly." >&6; }
 
@@ -25639,7 +25637,9 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 				else
-       					{ echo "$as_me:$LINENO: WARNING: *** MySQL test program execution failed." >&5
+					MYSQL_CFLAGS=""
+					MYSQL_LIBS=""
+          				{ echo "$as_me:$LINENO: WARNING: *** MySQL test program execution failed." >&5
 echo "$as_me: WARNING: *** MySQL test program execution failed." >&2;}
 				fi
 			fi