diff --git a/BUILD/compile-dist b/BUILD/compile-dist
index 99ddccf7f10..326de19da13 100755
--- a/BUILD/compile-dist
+++ b/BUILD/compile-dist
@@ -54,7 +54,7 @@ fi
   --with-federated-storage-engine \
   --with-berkeley-db \
   --with-innodb \
-  --with-yassl \
+  --with-ssl \
   --enable-thread-safe-client \
   --with-extra-charsets=complex \
   --with-ndbcluster \
diff --git a/config/ac-macros/ssl.m4 b/config/ac-macros/ssl.m4
index 14f3dcc9bc8..eec646462ea 100644
--- a/config/ac-macros/ssl.m4
+++ b/config/ac-macros/ssl.m4
@@ -23,7 +23,7 @@ AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [
     extra/yassl/src/Makefile dnl
     extra/yassl/testsuite/Makefile)
 
-  with_yassl="yes"
+  with_bundled_yassl="yes"
 
   yassl_dir="yassl"
   AC_SUBST([yassl_dir])
@@ -196,5 +196,5 @@ AC_MSG_CHECKING(for SSL)
       MYSQL_FIND_OPENSSL([$mysql_ssl_dir])
       ;;
   esac
-  AM_CONDITIONAL([HAVE_YASSL], [ test "$with_yassl" = "yes" ])
+  AM_CONDITIONAL([HAVE_YASSL], [ test "$with_bundled_yassl" = "yes" ])
 ])