diff options
| author | unknown <serg@serg.mylan> | 2005-07-17 21:34:57 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-07-17 21:34:57 +0200 |
| commit | dbceaf37218e98f60df6813e4eeb157527b96a1c (patch) | |
| tree | 5e23bb549d23d350e706668a739bc2220c243225 | |
| parent | e2bd74015c5cda61912b265c408471ef6a4293d2 (diff) | |
| parent | cc24ed0e3e0d5e4ac2e5443e81da3f88166f548a (diff) | |
| download | mariadb-git-dbceaf37218e98f60df6813e4eeb157527b96a1c.tar.gz | |
Merge
configure.in:
SCCS merged
| -rw-r--r-- | config/ac-macros/yassl.m4 | 9 | ||||
| -rw-r--r-- | configure.in | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index fb7c89181df..92133339343 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -5,12 +5,9 @@ extra/yassl/src/Makefile) AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_MSG_CHECKING(for yaSSL) - AC_ARG_WITH([yassl], - [ --with-yassl Include the yaSSL support], - [yassl=yes], - [yassl=no]) + AC_ARG_WITH([yassl], [ --with-yassl Include the yaSSL support],,) - if test "$yassl" = "yes" + if test "$with_yassl" = "yes" then if test "$openssl" != "no" then @@ -30,5 +27,5 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_SUBST(openssl_libs) AC_SUBST(openssl_includes) AC_SUBST(yassl_dir) - AM_CONDITIONAL([HAVE_YASSL], [ test "$yassl" = "yes" ]) + AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ]) ]) diff --git a/configure.in b/configure.in index 21494999ca4..8ea135c3613 100644 --- a/configure.in +++ b/configure.in @@ -130,6 +130,7 @@ AC_PROG_MAKE_SET # Hack for OS X/Darwin and Metrowerks CodeWarrior AC_ARG_WITH(darwin-mwcc, [ --with-darwin-mwcc Use Metrowerks CodeWarrior wrappers on OS X/Darwin],[ + if [ "with_darwin_mwcc" = yes ] ; then builddir=`pwd` ccwrapper="$builddir/support-files/MacOSX/mwcc-wrapper" arwrapper="$builddir/support-files/MacOSX/mwar-wrapper" @@ -141,7 +142,7 @@ AC_ARG_WITH(darwin-mwcc, export CC CXX LD AR RANLIB AC_SUBST(AR) AC_SUBST(RANLIB) - with_darwin_mwcc=yes + fi ]) AM_CONDITIONAL(DARWIN_MWCC, test x$with_darwin_mwcc = xyes) |