changes from gas-2.3/binutils-2.4 dist (details in branch log msgs, changelogs)

[deliverable/binutils-gdb.git] / configure

diff --git a/configure b/configure
index 73f2ccbcdc5345c1e518af4c33731f384b516f7f..c3ee67ef5fd0be29621e726f2afb690e7eff6ba8 100755 (executable)
--- a/configure
+++ b/configure
@@ -141,7 +141,7 @@ do
                ;;
 # These options have mandatory values.  Since we didn't find an = sign,
 # the value must be in the next argument
-       --b* | --ex* | --ho* | --pre* | --program-p* | --program-s* | --program-t* | --si* | --sr* | --ta* | --tm*)
+       --b* | --ex* | --ho* | --pre* | --program-p* | --program-s* | --program-t* | --si* | --sr* | --ta* | --tm* | --x-*)
                optarg=$1
                shift
                ;;
@@ -158,6 +158,11 @@ do
                   ;;
                esac
                ;;
+       --disable-*)
+               enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'`
+               eval $enableopt=no
+               disableoptions="$disableoptions $option"
+               ;;
        --enable-*)
                case "$option" in
                *=*)    ;;
@@ -212,15 +217,19 @@ do
        --rm)
                removing=--rm
                ;;
-       --site* | --si*)
+       --silent | --sil* | --quiet | --q*)
+               redirect=">/dev/null"
+               verbose=--silent
+               ;;
+       --site* | --sit*)
                site=$optarg
                site_option="--site=$optarg"
                ;;
        --srcdir*/ | --sr*/)
                 # Remove trailing slashes.  Otherwise, when the file name gets
-                # bolted into an object file as debug info, it has two slashes in
-                # it.  Ordinarily this is ok, but emacs takes double slash to
-                # mean "forget the first part".
+                # bolted into an object file as debug info, it has two slashes
+                # in it.  Ordinarily this is ok, but emacs takes double slash
+                # to mean "forget the first part".
                srcdir=`echo $optarg | sed -e 's:/$::'`
                ;;
        --srcdir* | --sr*)
@@ -257,13 +266,15 @@ do
                withoptions="$withoptions $option"
                ;;
        --without-*)
-               withopt=`echo ${option} | sed 's:^--::;s:out::;s:-:_:g'`                
+               withopt=`echo ${option} | sed 's:^--::;s:out::;s:-:_:g'`
                eval $withopt=no
                withoutoptions="$withoutoptions $option"
                ;;
        --x)    with_x=yes
                withoptions="$withoptions --with-x"
                ;;
+       --x-i* | --x-l*) other_options="$other_options $orig_option"
+               ;;
        --*)
                echo "Warning: Unrecognized option: \"$orig_option\"". >&2
                # Pass the option to any configure scripts in subdirectories
@@ -371,6 +382,7 @@ if [ -n "${fatal}" -o "${host_alias}" = "help" ] ; then
        echo ' --with-FOO, --with-FOO=BAR package FOO is available (parameter BAR)'
        echo ' --without-FOO             package FOO is NOT available'
        echo ' --enable-FOO, --enable-FOO=BAR include feature FOO (parameter BAR)'
+       echo ' --disable-FOO             do not include feature FOO'
        echo
        echo 'Where HOST and TARGET are something like "vax", "sun3", "encore", etc.'
        echo
@@ -931,7 +943,7 @@ if [ -z "${norecursion}" -a -n "${configdirs}" ] ; then
                        if [ ! -z "${recprog}" ] ; then
                                if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${target_alias} \
                                        ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
-                                       ${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${removing} ${other_options} ${redirect} ; then
+                                       ${srcdiroption} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${removing} ${other_options} ${redirect} ; then
                                        true
                                else
                                        echo Configure in `pwd` failed, exiting. 1>&2