diff options
| author | unknown <bell@laptop.sanja.is.com.ua> | 2003-08-20 21:59:31 +0300 |
|---|---|---|
| committer | unknown <bell@laptop.sanja.is.com.ua> | 2003-08-20 21:59:31 +0300 |
| commit | 8359a2c7298f4c936ca2a0bde083d87d35538e1d (patch) | |
| tree | 6293b13f167ef1f8b2bca48ee11c26b5087b3df8 | |
| parent | 94d018c26865877431867e334719731b2f17fcd3 (diff) | |
| parent | 0e34c128da785dc1dbba9133adaee9cbfdc43a5b (diff) | |
| download | mariadb-git-8359a2c7298f4c936ca2a0bde083d87d35538e1d.tar.gz | |
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
| -rw-r--r-- | cmd-line-utils/Makefile.am | 1 | ||||
| -rw-r--r-- | configure.in | 19 |
2 files changed, 4 insertions, 16 deletions
diff --git a/cmd-line-utils/Makefile.am b/cmd-line-utils/Makefile.am index 340dcdccf18..7214d1231f9 100644 --- a/cmd-line-utils/Makefile.am +++ b/cmd-line-utils/Makefile.am @@ -1,6 +1,7 @@ ## Process this file with automake to create Makefile.in SUBDIRS= @readline_basedir@ +DIST_SUBDIRS= libedit readline # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/configure.in b/configure.in index 40d3c0ba6f6..f376e77e09a 100644 --- a/configure.in +++ b/configure.in @@ -2797,22 +2797,6 @@ esac AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS) # Output results - -if test "$compile_readline" = "yes" -then - AC_OUTPUT(cmd-line-utils/readline/Makefile) -fi - -if test "$compile_libedit" = "yes" -then - AC_OUTPUT(cmd-line-utils/libedit/Makefile) -fi - -if [test "$compile_libedit" = "yes"] || [test "$compile_readline" = "yes"] -then - AC_OUTPUT(cmd-line-utils/Makefile) -fi - AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl strings/Makefile regex/Makefile heap/Makefile dnl bdb/Makefile dnl @@ -2828,6 +2812,9 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile dnl tests/Makefile Docs/Makefile support-files/Makefile dnl support-files/MacOSX/Makefile mysql-test/Makefile dnl include/mysql_version.h dnl + cmd-line-utils/Makefile dnl + cmd-line-utils/libedit/Makefile dnl + cmd-line-utils/readline/Makefile dnl , , [ test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ]) |