X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=configure;h=cad60b77c507c9ceb5ee4c026d76f6d7c333f3f2;hb=9ea033b2dfa95ca58778cd0e7232bfcc347fb769;hp=6521d23332ad6a9b893632fae7111c8136150987;hpb=10b2757be5c6b726a2e8b00d8eed80b9bca95369;p=deliverable%2Fbinutils-gdb.git

diff --git a/configure b/configure
index 6521d23332..cad60b77c5 100755
--- a/configure
+++ b/configure
@@ -576,15 +576,6 @@ case "${srcdir}" in
         fi
 esac
 
-# start-sanitize-cygnus
-# Don't allow builds at Cygnus to be done with srcdir==builddir.  We
-# can assume srcdir==. in this case, because of code above.
-if test "$srcdir" = .; then
-   echo '***' "Cannot configure in source tree." >&2
-   echo '***' "Make a parallel directory and configure there." >&2
-   exit 1
-fi
-# end-sanitize-cygnus
 
 # default exec_prefix
 case "${exec_prefixoption}" in
@@ -687,8 +678,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
 "")
@@ -1050,28 +1057,6 @@ export CXX
 export CFLAGS
 export CXXFLAGS
 
-# start-sanitize-gdbtk
-# FIXME: This should be in configure.in, not configure
-case "$host" in
-	*go32*)
-	    enable_gdbtk=no ;;
-	*msdosdjgpp*)
-	    enable_gdbtk=no ;;
-esac
-
-# FIXME: This should be in configure.in, not configure
-# Determine whether gdb needs tk/tcl or not.
-if [ "$enable_gdbtk" != "no" ]; then
-	GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui"
-	# start-sanitize-ide
-	if [ "$enable_ide" = "yes" ]; then
-		GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui all-libide all-libidetcl"
-	fi
-	# end-sanitize-ide
-else
-	GDB_TK=""
-fi
-# end-sanitize-gdbtk
 
 for subdir in . ${subdirs} ; do
 
@@ -1330,35 +1315,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}
@@ -1442,10 +1398,6 @@ EOF
 		    -e "s:^DEFAULT_M4[  ]*=.*$:DEFAULT_M4 = ${DEFAULT_M4}:" \
                     ${subdir}/Makefile.tem >> ${Makefile}
   
-	    # start-sanitize-gdbtk
-	    sed -e "s:^GDB_TK[	 ]*=.*$:GDB_TK = ${GDB_TK}:" ${Makefile} >${Makefile}.tem
-	    mv -f ${Makefile}.tem ${Makefile}
-	    # end-sanitize-gdbtk
 
 	    # If this is a Canadian Cross, preset the values of many more
 	    # tools.