2 files changed, 12 insertions, 12 deletions
diff --git a/config/ac-macros/ssl.m4 b/config/ac-macros/ssl.m4
index 3ff4ef1e143..729115ffe88 100644
--- a/config/ac-macros/ssl.m4
+++ b/config/ac-macros/ssl.m4
@@ -15,14 +15,6 @@ dnl  Add defines so yassl is built and linked with
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [
 
-  AC_CONFIG_FILES(extra/yassl/Makefile dnl
-    extra/yassl/taocrypt/Makefile dnl
-    extra/yassl/taocrypt/benchmark/Makefile dnl
-    extra/yassl/taocrypt/src/Makefile dnl
-    extra/yassl/taocrypt/test/Makefile dnl
-    extra/yassl/src/Makefile dnl
-    extra/yassl/testsuite/Makefile)
-
   with_bundled_yassl="yes"
 
   yassl_dir="yassl"
@@ -167,6 +159,15 @@ dnl   macro bails out with error.
 dnl
 dnl ------------------------------------------------------------------------
 AC_DEFUN([MYSQL_CHECK_SSL], [
+
+  AC_CONFIG_FILES(extra/yassl/Makefile dnl
+    extra/yassl/taocrypt/Makefile dnl
+    extra/yassl/taocrypt/benchmark/Makefile dnl
+    extra/yassl/taocrypt/src/Makefile dnl
+    extra/yassl/taocrypt/test/Makefile dnl
+    extra/yassl/src/Makefile dnl
+    extra/yassl/testsuite/Makefile)
+
 AC_MSG_CHECKING(for SSL)
   AC_ARG_WITH([ssl],
               [  --with-ssl[=DIR]    Include SSL support],
diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4
index 5586b1ba816..f62bb056249 100644
--- a/config/ac-macros/zlib.m4
+++ b/config/ac-macros/zlib.m4
@@ -64,6 +64,9 @@ dnl installation dir ($pkglibdir), so ZLIB_DEPS is set to point to
 dnl $pkglibdir.
 
 AC_DEFUN([MYSQL_CHECK_ZLIB_WITH_COMPRESS], [
+
+AC_CONFIG_FILES(zlib/Makefile)
+
 AC_MSG_CHECKING([for zlib compression library])
 case $SYSTEM_TYPE in
 *netware* | *modesto*)
@@ -124,10 +127,6 @@ case $SYSTEM_TYPE in
     fi
     ;;
 esac
-if test -n "$zlib_dir"
-then
-  AC_CONFIG_FILES(zlib/Makefile)
-fi
 ])
 
 dnl ------------------------------------------------------------------------