summaryrefslogtreecommitdiff
path: root/BUILD/SETUP.sh
diff options
context:
space:
mode:
authordf@kahlann.erinye.com <>2007-01-25 09:18:10 +0100
committerdf@kahlann.erinye.com <>2007-01-25 09:18:10 +0100
commitd938549e2e1b80d8f513b282527322c9446b14fc (patch)
tree74e1edcc598bfe622247cb90045067c268a3a77f /BUILD/SETUP.sh
parent729f0158669cb4dc7956d920f30307b299b0a113 (diff)
parentfdd8410e59f5cfe8037cba321b9f9bbd3b3ea748 (diff)
downloadmariadb-git-d938549e2e1b80d8f513b282527322c9446b14fc.tar.gz
merge fix
Diffstat (limited to 'BUILD/SETUP.sh')
-rwxr-xr-xBUILD/SETUP.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 1f62ffe7c26..faa8d05c917 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -139,9 +139,17 @@ fi
#
base_configs="--prefix=$prefix --enable-assembler "
base_configs="$base_configs --with-extra-charsets=complex "
-base_configs="$base_configs --enable-thread-safe-client --with-readline "
+base_configs="$base_configs --enable-thread-safe-client "
base_configs="$base_configs --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 "
static_link="$static_link --with-client-ldflags=-all-static"
# we need local-infile in all binaries for rpl000001