summaryrefslogtreecommitdiff
path: root/BUILD/SETUP.sh
diff options
context:
space:
mode:
authoracurtis@xiphis.org <>2006-04-24 13:36:15 -0700
committeracurtis@xiphis.org <>2006-04-24 13:36:15 -0700
commit53d4594cfe03a9b440edf09639635a024e04b079 (patch)
tree8d426c8740820381d4c07c02035f4a4bf29c2fa3 /BUILD/SETUP.sh
parentafdb3faae15e2b992fb09ce9c0cb7d475bdb6902 (diff)
parent91801e5cc051b60c1d9670438f614c73d759f7da (diff)
downloadmariadb-git-53d4594cfe03a9b440edf09639635a024e04b079.tar.gz
Merge xiphis.org:/home/antony/work2/wl3201.3
into xiphis.org:/home/antony/work2/wl3201.merge
Diffstat (limited to 'BUILD/SETUP.sh')
-rwxr-xr-xBUILD/SETUP.sh15
1 files changed, 3 insertions, 12 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 6c83fffa8fb..d115e3c29dc 100755
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -147,18 +147,9 @@ static_link="$static_link --with-client-ldflags=-all-static"
local_infile_configs="--enable-local-infile"
-max_configs="--with-innodb --with-berkeley-db"
-max_configs="$max_configs --with-archive-storage-engine"
-max_configs="$max_configs --with-big-tables"
-max_configs="$max_configs --with-blackhole-storage-engine"
-max_configs="$max_configs --with-federated-storage-engine"
-max_configs="$max_configs --with-csv-storage-engine"
-max_configs="$max_configs --with-example-storage-engine"
-max_configs="$max_configs --with-partition $SSL_LIBRARY"
-
-max_no_embedded_configs="$max_configs --with-ndbcluster"
-max_no_ndb_configs="$max_configs --without-ndbcluster --with-embedded-server"
-max_configs="$max_configs --with-ndbcluster --with-embedded-server"
+max_no_embedded_configs="$SSL_LIBRARY --with-modules=max"
+max_no_ndb_configs="$SSL_LIBRARY --with-modules=max-no-ndb --with-embedded-server"
+max_configs="$SSL_LIBRARY --with-modules=max --with-embedded-server"
#
# CPU and platform specific compilation flags.