Commit 393c867f authored by unknown's avatar unknown
Browse files

Use --with-ssl 


BUILD/compile-dist:
  Use --with-ssl instead of --with-yassl
config/ac-macros/ssl.m4:
  Change variable name to with_bundled_yassl
parent d2f5a104

BUILD/compile-dist

+1 −1
Original line number Diff line number Diff line
@@ -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 \

config/ac-macros/ssl.m4

+2 −2
Original line number Diff line number Diff line
@@ -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" ])

])