Commit 42531336 authored by ingo@mysql.com's avatar ingo@mysql.com

Re-enabled the use of --prefix.

Adjusted the "Usage:" string.
Ordered the option recognition in reverse order from "Usage:".
parent 896d3a5f
...@@ -6,12 +6,15 @@ then ...@@ -6,12 +6,15 @@ then
exit 1 exit 1
fi fi
prefix_configs="--prefix=/usr/local/mysql"
just_print= just_print=
just_configure= just_configure=
full_debug= full_debug=
while test $# -gt 0 while test $# -gt 0
do do
case "$1" in case "$1" in
--prefix=* ) prefix_configs="$1"; shift ;;
--with-debug=full ) full_debug="=full"; shift ;;
-c | --just-configure ) just_configure=1; shift ;; -c | --just-configure ) just_configure=1; shift ;;
-n | --just-print | --print ) just_print=1; shift ;; -n | --just-print | --print ) just_print=1; shift ;;
-h | --help ) cat <<EOF; exit 0 ;; -h | --help ) cat <<EOF; exit 0 ;;
...@@ -19,12 +22,11 @@ Usage: $0 [-h|-n] [configure-options] ...@@ -19,12 +22,11 @@ Usage: $0 [-h|-n] [configure-options]
-h, --help Show this help message. -h, --help Show this help message.
-n, --just-print Don't actually run any commands; just print them. -n, --just-print Don't actually run any commands; just print them.
-c, --just-configure Stop after running configure. -c, --just-configure Stop after running configure.
--with-debug=full Build with full debug.
Any other options will be passed directly to configure. --prefix=path Build with prefix 'path'.
Note: this script is intended for internal use by MySQL developers. Note: this script is intended for internal use by MySQL developers.
EOF EOF
--with-debug=full ) full_debug="=full"; shift ;;
* ) * )
echo "Unknown option '$1'" echo "Unknown option '$1'"
exit 1 exit 1
...@@ -70,7 +72,7 @@ debug_extra_cflags="-O1 -Wuninitialized" ...@@ -70,7 +72,7 @@ debug_extra_cflags="-O1 -Wuninitialized"
base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti" base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
amd64_cxxflags="-DBIG_TABLES" amd64_cxxflags="-DBIG_TABLES"
base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline" base_configs="$prefix_configs --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline"
static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static" static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"
amd64_configs="" amd64_configs=""
alpha_configs="" # Not used yet alpha_configs="" # Not used yet
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment