* config/tc-i960.c (md_convert_frag): Add ATTRIBUTE_UNUSED to args.
[binutils-gdb.git] / configure
index 465c7032d8ad87affc7356aa5aaee80efe5fe845..6b4d9b495623f5f4443c72b45c0809bd4a13c561 100755 (executable)
--- a/configure
+++ b/configure
@@ -585,28 +585,6 @@ case "${exec_prefixoption}" in
 *) ;;
 esac
 
-# Define the trigger file to make sure configure will re-run whenever
-# the gcc version number changes.
-if [ "${with_gcc_version_trigger+set}" = set ]; then
-    gcc_version_trigger="$with_gcc_version_trigger"
-    gcc_version=`grep version_string ${with_gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
-else
-    # If gcc's sources are available, define the trigger file.
-    if [ -f ${topsrcdir}/gcc/version.c ] ; then
-       gcc_version_trigger=${topsrcdir}/gcc/version.c
-       gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
-       case "$arguments" in
-         *--with-gcc-version-trigger=$gcc_version_trigger* )
-           ;;
-         * )
-           # Make sure configure.in knows about this.
-           arguments="--with-gcc-version-trigger=$gcc_version_trigger $arguments"
-           ;;
-       esac
-       withoptions="--with-gcc-version-trigger=$gcc_version_trigger $withoptions"
-    fi
-fi
-
 ### break up ${srcdir}/configure.in.
 case "`grep '^# per\-host:' ${srcdir}/configure.in`" in
 "")
@@ -1301,34 +1279,10 @@ if [ -f ${srcdir}/${Makefile_in} ] ; then
       -e "s|@oldincludedir@|${oldincludedir}|" \
       -e "s|@infodir@|${infodir}|" \
       -e "s|@mandir@|${mandir}|" \
-      -e "/^CC[        ]*=/{
-          :loop1
-          /\\\\$/ N
-          s/\\\\\\n//g
-          t loop1
-          s%^CC[       ]*=.*$%CC = ${CC}%
-          }" \
-      -e "/^CXX[       ]*=/{
-          :loop2
-          /\\\\$/ N
-          s/\\\\\\n//g
-          t loop2
-          s%^CXX[      ]*=.*$%CXX = ${CXX}%
-          }" \
-      -e "/^CFLAGS[    ]*=/{
-          :loop3
-          /\\\\$/ N
-          s/\\\\\\n//g
-          t loop3
-          s%^CFLAGS[   ]*=.*$%CFLAGS = ${CFLAGS}%
-          }" \
-      -e "/^CXXFLAGS[  ]*=/{
-          :loop4
-          /\\\\$/ N
-          s/\\\\\\n//g
-          t loop4
-          s%^CXXFLAGS[         ]*=.*$%CXXFLAGS = ${CXXFLAGS}%
-          }" \
+      -e "s|@CC@|${CC}|" \
+      -e "s|@CXX@|${CXX}|" \
+      -e "s|@CFLAGS@|${CFLAGS}|" \
+      -e "s|@CXXFLAGS@|${CXXFLAGS}|" \
       -e "s|@config_shell@|${config_shell}|" \
       -e "s|@srcdir@|${srcdir}|" \
       -e "s/\f//" \
@@ -1418,98 +1372,6 @@ if [ -r ./config.back ] ; then
 fi
 ${config_shell} ${moveifchange} ./config.new ./config.status
 
-# If there are subdirectories, then recur.
-if [ -z "${norecursion}" ] && [ -n "${configdirs}" ] ; then 
-        for configdir in ${configdirs} ${extraconfigdirs} ; do
-
-               # If configdir contains ',' it is
-               # srcdir,builddir,target_alias
-               # These come from extraconfigdirs.
-               case ${configdir} in
-               *,*)
-                   eval `echo ${configdir} | sed -e 's/\([^,]*\),\([^,]*\),\(.*\)/cfg_dir=\1 bld_dir=\2 tgt_alias=\3/'`
-                   ;;
-               *)
-                   cfg_dir=${configdir}
-                   bld_dir=${configdir}
-                   tgt_alias=${target_alias}
-                   ;;
-               esac
-
-                if [ -d ${srcdir}/${cfg_dir} ] ; then
-                        eval echo Configuring ${configdir}... ${redirect}
-                        case "${srcdir}" in
-                        ".") ;;
-                        *)
-                                if [ ! -d ./${bld_dir} ] ; then
-                                        if mkdir ./${bld_dir} ; then
-                                                true
-                                        else
-                                                echo '***' "${progname}: could not make ${PWD=`${PWDCMD-pwd}`}/${bld_dir}" 1>&2
-                                                exit 1
-                                        fi
-                                fi
-                                ;;
-                        esac
-
-                        POPDIR=${PWD=`${PWDCMD-pwd}`}
-                        cd ${bld_dir} 
-
-### figure out what to do with srcdir
-                        case "${srcdir}" in
-                        ".") newsrcdir=${srcdir} ;; # no -srcdir option.  We're building in place.
-                        /* | [A-Za-z]:[\\/]* ) # absolute path
-                                newsrcdir=${srcdir}/${cfg_dir}
-                                srcdiroption="--srcdir=${newsrcdir}"
-                                ;;
-                        *) # otherwise relative
-                                newsrcdir=../${srcdir}/${cfg_dir}
-                                srcdiroption="--srcdir=${newsrcdir}"
-                                ;;
-                        esac
-
-                       # Handle --cache-file=../XXX
-                       case "${cache_file}" in
-                       "") # empty
-                               ;;
-                       /* | [A-Za-z]:[\\/]* ) # absolute path
-                               cache_file_option="--cache-file=${cache_file}"
-                               ;;
-                       *) # relative path
-                               cache_file_option="--cache-file=../${cache_file}"
-                               ;;
-                       esac
-
-### check for guested configure, otherwise fix possibly relative progname
-                        if [ -f ${newsrcdir}/configure ] ; then
-                                recprog=${newsrcdir}/configure
-                        elif [ -f ${newsrcdir}/configure.in ] ; then
-                                case "${progname}" in
-                                /* | [A-Za-z]:[\\/]* )  recprog=${progname} ;;
-                                *)                      recprog=../${progname} ;;
-                                esac
-                       else
-                               eval echo No configuration information in ${cfg_dir} ${redirect}
-                               recprog=
-                        fi
-
-### The recursion line is here.
-                       if [ ! -z "${recprog}" ] ; then
-                               if eval ${config_shell} ${recprog} ${verbose} ${buildopt} --host=${host_alias} --target=${tgt_alias} \
-                                       ${prefixoption} ${tmpdiroption} ${exec_prefixoption} \
-                                       ${srcdiroption} ${diroptions} ${program_prefixoption} ${program_suffixoption} ${program_transform_nameoption} ${site_option} ${withoptions} ${withoutoptions} ${enableoptions} ${disableoptions} ${floating_pointoption} ${cache_file_option} ${other_options} ${redirect} ; then
-                                       true
-                               else
-                                       echo Configure in `${PWDCMD-pwd}` failed, exiting. 1>&2
-                                       exit 1
-                               fi
-                       fi
-
-                        cd ${POPDIR}
-                fi
-        done
-fi
-
 # Perform the same cleanup as the trap handler, minus the "exit 1" of course,
 # and reset the trap handler.
 rm -rf ${tmpdir}