Fix blunder made when applying patch to arm.h

[pf3gnuchains/gcc-fork.git] / configure

diff --git a/configure b/configure
index 389ee65..a7d3cb8 100755 (executable)
--- a/configure
+++ b/configure
@@ -677,8 +677,24 @@ fi
 
 ### do common part of configure.in
 
+# If the language specific compiler does not exist, but the "gcc" directory does,
+# we will skip this directory; in this case the sub-directory's common part
+# of configure.in will create a small shell script "skip-this-dir" containing
+# commands to completely clean up any temporary or created files.
+
 . ${tmpfile}.com
 
+if test -f skip-this-dir; then
+       # Perform the same cleanup as the trap handler, minus the "exit 1" of course,
+       # and reset the trap handler.
+       trap 0
+       rm -f Makefile* ${tmpfile}.com ${tmpfile}.tgt ${tmpfile}.hst ${tmpfile}.pos
+       # Execute the final clean-up actions
+       ${config_shell} skip-this-dir
+       # and stop configuring this directory.
+       exit 0
+fi
+
 # some sanity checks on configure.in
 case "${srctrigger}" in
 "")
@@ -1315,35 +1331,6 @@ EOF
                 echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile}
             fi 
 
-           # provide a proper gxx_include_dir to all subdirs.
-           # Note, if you change the default, make sure to fix both here
-           # and in the gcc subdirectory.
-           # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
-           gxx_include_dir=
-           if test -n "${with_gxx_include_dir}"; then
-               case "${with_gxx_include_dir}" in
-                 yes )
-                   echo "configure: error: bad value ${withval} given for g++ include directory" 1>&2
-                   exit 1
-                   ;;
-                 no )
-                   ;;
-                 * )
-                   gxx_include_dir=${with_gxx_include_dir}
-                   ;;
-               esac
-           fi
-           if test x${gxx_include_dir} = x; then
-               if test x${enable_version_specific_runtime_libs} = xyes; then
-                   echo gxx_include_dir = '${libsubdir}/include/g++' >> ${Makefile}
-               else
-                   . ${topsrcdir}/config.if
-                   echo gxx_include_dir = '${prefix}/include/g++'-${libstdcxx_interface} >> ${Makefile}
-               fi
-           else
-               echo gxx_include_dir = ${gxx_include_dir} >> ${Makefile}
-           fi
-
            # record if we want to build shared libs.
            if test -z "${enable_shared}"; then
                echo enable_shared = no >> ${Makefile}