diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/configure.in b/configure.in index ed3d732828e..5b33b6e3984 100644 --- a/configure.in +++ b/configure.in @@ -2288,16 +2288,20 @@ fi AC_SUBST(man_dirs) AC_SUBST(man1_files) +if test -e sql-bench +then # Shall we build the bench code? AC_ARG_WITH(bench, [ --without-bench Skip building of the benchmark suite.], [with_bench=$withval], [with_bench=yes] ) +fi if test "$with_bench" = "yes" then bench_dirs="sql-bench" + AC_CONFIG_FILES(sql-bench/Makefile) else bench_dirs="" fi @@ -2317,6 +2321,12 @@ AC_ARG_WITH(libedit, [ with_libedit=undefined ] ) +if test "$with_readline/$with_libedit" = "undefined/undefined" -a ! -e "$srcdir/cmd-line-utils" +then + with_readline=no + with_libedit=no +fi + # # We support next variants of compilation: # --with-readline @@ -2392,6 +2402,16 @@ else versions of libedit or readline]) fi fi +# +# if either readline or libedit is enabled - generate Makefile's for both +# (to make sure both are included in 'make dist') +# +if test -n "$readline_basedir" +then + AC_CONFIG_FILES(cmd-line-utils/Makefile dnl + cmd-line-utils/libedit/Makefile dnl + cmd-line-utils/readline/Makefile) +fi fi AC_SUBST(readline_dir) @@ -2404,7 +2424,7 @@ MYSQL_CHECK_BIG_TABLES MYSQL_CHECK_MAX_INDEXES MYSQL_CHECK_REPLICATION -MYSQL_STORAGE_ENGINE(innobase,,innodb,,,,storage/innobase,ha_innodb.o,[ dnl +MYSQL_STORAGE_ENGINE(innobase,,innodb,,,,innobase,ha_innodb.o,[ dnl \$(top_builddir)/storage/innobase/usr/libusr.a dnl \$(top_builddir)/storage/innobase/srv/libsrv.a dnl \$(top_builddir)/storage/innobase/dict/libdict.a dnl @@ -2446,24 +2466,24 @@ MYSQL_STORAGE_ENGINE(innobase,,innodb,,,,storage/innobase,ha_innodb.o,[ dnl other_configures="$other_configures storage/innobase/configure" ]) -MYSQL_STORAGE_ENGINE(berkeley,,berkeley-db,,,,storage/bdb,,,[ +MYSQL_STORAGE_ENGINE(berkeley,,berkeley-db,,,,bdb,,,[ MYSQL_SETUP_BERKELEY_DB ]) -MYSQL_STORAGE_ENGINE(example,,,,,,storage/example,no, +MYSQL_STORAGE_ENGINE(example,,,,,,example,no, \$(top_builddir)/storage/example/libexample.a,[ AC_CONFIG_FILES(storage/example/Makefile) ]) -MYSQL_STORAGE_ENGINE(archive,,,,,,storage/archive,, +MYSQL_STORAGE_ENGINE(archive,,,,,,archive,, \$(top_builddir)/storage/archive/libarchive.a, [ AC_CONFIG_FILES(storage/archive/Makefile) ]) -MYSQL_STORAGE_ENGINE(csv,,,"yes",,tina_hton,storage/csv,no, +MYSQL_STORAGE_ENGINE(csv,,,"yes",,tina_hton,csv,no, \$(top_builddir)/storage/csv/libcsv.a,[ AC_CONFIG_FILES(storage/csv/Makefile) ]) MYSQL_STORAGE_ENGINE(blackhole) MYSQL_STORAGE_ENGINE(federated) -MYSQL_STORAGE_ENGINE(ndbcluster,,ndbcluster,,,,storage/ndb,,,[ +MYSQL_STORAGE_ENGINE(ndbcluster,,ndbcluster,,,,ndb,,,[ MYSQL_SETUP_NDBCLUSTER ]) MYSQL_STORAGE_ENGINE(partition,,partition) @@ -2523,7 +2543,7 @@ then AC_SUBST(THREAD_LOBJECTS) server_scripts="mysqld_safe mysql_install_db" sql_server_dirs="strings mysys dbug extra regex" - mysql_se_dirs="storage/myisam storage/myisammrg storage/heap $mysql_se_dirs" + mysql_se_dirs="myisam myisammrg heap $mysql_se_dirs" sql_server="$sql_server vio sql" fi @@ -2593,16 +2613,12 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl sql/handlerton.cc sql-common/Makefile dnl dbug/Makefile scripts/Makefile dnl - include/Makefile sql-bench/Makefile dnl + include/Makefile dnl server-tools/Makefile server-tools/instance-manager/Makefile dnl tests/Makefile Docs/Makefile support-files/Makefile dnl support-files/MacOSX/Makefile mysql-test/Makefile dnl mysql-test/ndb/Makefile netware/Makefile dnl include/mysql_version.h dnl - cmd-line-utils/Makefile dnl - cmd-line-utils/libedit/Makefile dnl - zlib/Makefile dnl - cmd-line-utils/readline/Makefile dnl plugin/Makefile dnl plugin/fulltext/Makefile dnl win/Makefile) |