This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Toplevel configure.in cleanup 2/n


Only the first change is a behavioral change; this was accidental fallout
from the autoconfiscation.  These 'default' settings now come after argument
processing, which means they override arguments, which is wrong.  The change
restores the intended behavior (they will still default to 'no').

I'll be doing more cleanup passes; I'm breaking them into pieces for ease
of review.  Pass 1/n is the still outstanding change to macroize the 
setting of build_subdir and target_subdir.

Tested on i686-pc-linux-gnu; no change in generated Makefile, unless
--enable-threads or --enable-shared is specified.  (As it should be.)

	* configure.in: Don't set enable_threads and enable_shared to 'no'.
	Remove bogus comments.  Remove redundant noconfigdirs.
	* configure: Regenerate.

--- configure.in.old	2003-02-25 14:04:39.000000000 -0500
+++ configure.in	2003-02-25 14:16:58.000000000 -0500
@@ -27,8 +27,6 @@
 
 # clear some things potentially inherited from environment.
 
-enable_threads=no
-enable_shared=no
 enable_libstdcxx_v3=yes
 floating_point=default
 gas=default
@@ -68,15 +66,6 @@
 
 config_shell=${CONFIG_SHELL-/bin/sh}
 
-## this is a little touchy and won't always work, but...
-##
-## if the argv[[0]] starts with a slash then it is an absolute name that can (and
-## must) be used as is.
-##
-## otherwise, if argv[[0]] has no slash in it, we can assume that it is on the
-## path.  Since PATH might include "." we also add `pwd` to the end of PATH.
-##
-
 progname=$0
 # if PWD already has a value, it is probably wrong.
 if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi
@@ -418,7 +407,7 @@
     noconfigdirs="$noconfigdirs target-newlib"
     case "${host}" in
       *-*-cygwin*) ;; # keep gdb and readline
-      *) noconfigdirs="$noconfigdirs gdb readline ${libstdcxx_version}"
+      *) noconfigdirs="$noconfigdirs gdb readline"
 	 ;;
     esac
     ;;
@@ -1244,6 +1233,11 @@
   extra_host_args="$extra_host_args --with-newlib"
 fi
 
+# Default to disabling threads.
+case "${enable_threads}" in
+  "") enable_threads=no ;;
+esac
+
 # We default to --with-shared on platforms where -fpic is meaningless.
 # Well, we don't yet, but we will.
 if false && test "${host}" = "${target}" && test x${enable_shared} = x ; then
@@ -1258,7 +1252,7 @@
 case "${enable_shared}" in
   yes) shared=yes ;;
   no) shared=no ;;
-  "") shared=no ;;
+  "") shared=no ; enable_shared=no ;;
   *) shared=yes ;;
 esac
 


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]