diff options
| author | kent@mysql.com/kent-amd64.(none) <> | 2007-09-26 18:47:55 +0200 |
|---|---|---|
| committer | kent@mysql.com/kent-amd64.(none) <> | 2007-09-26 18:47:55 +0200 |
| commit | 1b53e4a5474f5da7e60b6932a39f55ff29d8f142 (patch) | |
| tree | a7b4f00420fa09a5e96ab9ccf56fa3831e7ff9fe /config | |
| parent | 3978bf99461a266a5ad833ffb18ca30e048bddfa (diff) | |
| download | mariadb-git-1b53e4a5474f5da7e60b6932a39f55ff29d8f142.tar.gz | |
Makefile.am:
Always include all sub directories in "make dist"
Removed incorrect comment
configure.in:
Unconditionally list make files in AC_CONFIG_FILES
Removed 'thread_dirs', it is not used
Minor cleanup
compile-dist:
Simplified the configure line needed for "make dist" to get it all
zlib.m4, ssl.m4:
Unconditionally list make files in AC_CONFIG_FILES
Makefile.am:
Removed DIST_SUBDIRS not needed
Don't copy soft links as files into source package
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/ssl.m4 | 17 | ||||
| -rw-r--r-- | config/ac-macros/zlib.m4 | 7 |
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 ------------------------------------------------------------------------ |