diff options
| author | unknown <df@kahlann.erinye.com> | 2007-01-25 09:18:10 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2007-01-25 09:18:10 +0100 |
| commit | 244046164164b110ccfb915790fb7663e0e5d880 (patch) | |
| tree | 74e1edcc598bfe622247cb90045067c268a3a77f /BUILD/SETUP.sh | |
| parent | e57ef96a08b7339a9e6a546fd8a603d98a6aa072 (diff) | |
| parent | 6cfffb500532cf8769013fc57e7140b861811632 (diff) | |
| download | mariadb-git-244046164164b110ccfb915790fb7663e0e5d880.tar.gz | |
merge fix
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 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 |