diff options
| author | unknown <istruewing@chilla.local> | 2007-02-01 17:10:09 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-02-01 17:10:09 +0100 |
| commit | da984b33769c41d4c138e06c1c698f34e05a0456 (patch) | |
| tree | 9022606423d0df311f11cfe24459b77b1ea21418 /BUILD | |
| parent | 8c2c52714d31dccbd0f5734e0a8e7de48c7e36b0 (diff) | |
| parent | 4a7724b75f95b2e10a619d93b3c03b2f8bcf9402 (diff) | |
| download | mariadb-git-da984b33769c41d4c138e06c1c698f34e05a0456.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into chilla.local:/home/mydev/mysql-5.0-axmrg
BUILD/SETUP.sh:
Auto merged
configure.in:
Auto merged
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 |