summaryrefslogtreecommitdiff
path: root/BUILD
diff options
context:
space:
mode:
authoristruewing@chilla.local <>2007-02-01 17:10:09 +0100
committeristruewing@chilla.local <>2007-02-01 17:10:09 +0100
commitdae855c16870088d0533ea75a2a767d764f49996 (patch)
tree9022606423d0df311f11cfe24459b77b1ea21418 /BUILD
parentb0e8f2b534d0314e41fa3005a584b6d3574216cc (diff)
parent9fe01abcca70a4e6c75b5e88ca1a910858a54e31 (diff)
downloadmariadb-git-dae855c16870088d0533ea75a2a767d764f49996.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into chilla.local:/home/mydev/mysql-5.0-axmrg
Diffstat (limited to 'BUILD')
-rwxr-xr-xBUILD/SETUP.sh11
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