diff options
| author | unknown <df@kahlann.erinye.com> | 2007-01-30 13:53:48 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2007-01-30 13:53:48 +0100 |
| commit | 0f1a3537f71a8562352e6b3140ac961c67b9fcfc (patch) | |
| tree | 870667f7c5d834f753994e617d58e33655461859 /BUILD/SETUP.sh | |
| parent | 6db6be5a06d79d03836e8d84198e51562f50d6cb (diff) | |
| parent | 244046164164b110ccfb915790fb7663e0e5d880 (diff) | |
| download | mariadb-git-0f1a3537f71a8562352e6b3140ac961c67b9fcfc.tar.gz | |
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-25530
BUILD/SETUP.sh:
Auto merged
configure.in:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'BUILD/SETUP.sh')
| -rwxr-xr-x | BUILD/SETUP.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 274676e0ead..3316b1dd525 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 |