diff options
| author | unknown <df@kahlann.erinye.com> | 2007-01-25 08:46:07 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2007-01-25 08:46:07 +0100 |
| commit | 6cfffb500532cf8769013fc57e7140b861811632 (patch) | |
| tree | 3c8c15b6e6eddd0dbfabbcb70da51e36dcfc389c /BUILD | |
| parent | bb5dccf26065e07488a68dc636b8e79c059981a7 (diff) | |
| download | mariadb-git-6cfffb500532cf8769013fc57e7140b861811632.tar.gz | |
BUG#25530 --with-readline fails with commercial source packages
BUILD/SETUP.sh:
BUG#25530 --with-readline fails with commercial source packages
The compile-* scripts should not use --with-readline explicitly when no readline is present.
configure.in:
BUG#25530 --with-readline fails with commercial source packages
Configuring --with-readline should fail when libreadline is not bundled.
A system libreadline is only used when there is a bundled libreadline too, so the commercial source code isn't linked with GPL libreadline by accident.
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 6f3c4222ed2..7f979d765d3 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -84,7 +84,16 @@ debug_extra_cflags="-O1 -Wuninitialized" base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti" amd64_cxxflags="" # If dropping '--with-big-tables', add here "-DBIG_TABLES" -base_configs="$prefix_configs --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline --with-big-tables" +base_configs="$prefix_configs --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-big-tables" + +if test -d "$path/../cmd-line-utils/readline" +then + base_configs="$base_configs --with-readline" +elif test -d "$path/../cmd-line-utils/libedit" +then + base_configs="$base_configs --with-libedit" +fi + static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static" amd64_configs="" alpha_configs="" # Not used yet |