diff options
| author | serg@serg.mylan <> | 2006-04-12 14:08:24 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2006-04-12 14:08:24 +0200 |
| commit | 70c2ff34f708de50c531f60e9f80102138ad9c6e (patch) | |
| tree | 46aa796924bcff90935d9149ffb0d65ac7c6ae61 /config | |
| parent | 5eefa6ec1f57cdac17e454c8f2a71b8ebc129f00 (diff) | |
| download | mariadb-git-70c2ff34f708de50c531f60e9f80102138ad9c6e.tar.gz | |
fixes for 'make dist' and 'make distcheck'
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/yassl.m4 | 11 | ||||
| -rw-r--r-- | config/ac-macros/zlib.m4 | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/config/ac-macros/yassl.m4 b/config/ac-macros/yassl.m4 index c736f2f10f2..906a65a2fc3 100644 --- a/config/ac-macros/yassl.m4 +++ b/config/ac-macros/yassl.m4 @@ -1,8 +1,3 @@ -AC_CONFIG_FILES(extra/yassl/Makefile dnl -extra/yassl/taocrypt/Makefile dnl -extra/yassl/taocrypt/src/Makefile dnl -extra/yassl/src/Makefile) - AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_MSG_CHECKING(for yaSSL) AC_ARG_WITH([yassl], [ --with-yassl Include the yaSSL support],,) @@ -14,7 +9,11 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [ AC_MSG_ERROR([Cannot configure MySQL to use yaSSL and OpenSSL simultaneously.]) fi AC_MSG_RESULT([using bundled yaSSL]) - yassl_dir="extra/yassl" + AC_CONFIG_FILES(extra/yassl/Makefile dnl + extra/yassl/taocrypt/Makefile dnl + extra/yassl/taocrypt/src/Makefile dnl + extra/yassl/src/Makefile) + yassl_dir="yassl" yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt" yassl_includes="-I\$(top_srcdir)/extra/yassl/include" AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.]) diff --git a/config/ac-macros/zlib.m4 b/config/ac-macros/zlib.m4 index a8c54c845a1..23cc132aca8 100644 --- a/config/ac-macros/zlib.m4 +++ b/config/ac-macros/zlib.m4 @@ -63,7 +63,7 @@ case $SYSTEM_TYPE in ;; *) AC_ARG_WITH([zlib-dir], - AC_HELP_STRING([--with-zlib-dir=DIR], + AC_HELP_STRING([--with-zlib-dir=no|bundled|DIR], [Provide MySQL with a custom location of compression library. Given DIR, zlib binary is assumed to be in $DIR/lib and header files @@ -113,6 +113,10 @@ case $SYSTEM_TYPE in fi ;; esac +if test -n "$zlib_dir" +then + AC_CONFIG_FILES(zlib/Makefile) +fi ]) dnl ------------------------------------------------------------------------ |