(Toplevel patch) Clean up use of enable_shared, enable_threads.

(Toplevel patch) Clean up use of enable_shared, enable_threads.

[Nathanael Nerode]

This is intended to apply after my previous toplevel cleanup patches; I
noticed that, although set in the Makefile, they weren't used there or
passed down to anything, so it's dead code.  Every subdirectory which cares
appears to set them in its own configure script.

If this is the 'wrong direction' and I should instead be causing them to 
be passed down, let me know, but that seemed more invasive and would 
cause behavioral changes.

Bootstrapped i686-pc-linux-gnu.

	* Makefile.tpl: Don't set unused enable_shared, enable_threads macros.
	* Makefile.in: Regenerate.
	* configure.in: Remove unused logic relating to --enable-shared
	and --enable-threads.
	* configure: Regenerate.

--- Makefile.tpl.old	2003-02-25 15:39:04.000000000 -0500
+++ Makefile.tpl	2003-02-25 15:48:44.000000000 -0500
@@ -87,8 +87,6 @@
 # -------------------------------------------------
 
 links=@configlinks@
-enable_shared = @enable_shared@
-enable_threads = @enable_threads@
 enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@
 # The file containing GCC's version number.
 gcc_version_trigger = @gcc_version_trigger@
--- configure.in.old	2003-02-25 15:44:39.000000000 -0500
+++ configure.in	2003-02-25 15:48:57.000000000 -0500
@@ -1217,29 +1217,6 @@
   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
-  case "${target}" in
-    alpha*-dec-osf*)	enable_shared=yes ;;
-    alpha*-*-linux*)	enable_shared=yes ;;
-    mips-sgi-irix5*)	enable_shared=yes ;;
-    *)			enable_shared=no ;;
-  esac
-fi
-
-case "${enable_shared}" in
-  yes) shared=yes ;;
-  no) shared=no ;;
-  "") shared=no ; enable_shared=no ;;
-  *) shared=yes ;;
-esac
-
 
 # Default to using --with-stabs for certain targets.
 if test x${with_stabs} = x ; then
@@ -1615,12 +1592,10 @@
 
 # If --enable-shared was set, we must set LD_LIBRARY_PATH so that the
 # binutils tools will find libbfd.so.
-if test "${shared}" = "yes" ; then
-  SET_LIB_PATH="\$(REALLY_SET_LIB_PATH)"
-else
-  SET_LIB_PATH=
-fi
-
+case "${enable_shared}" in
+  no | "") SET_LIB_PATH= ;;
+  *) SET_LIB_PATH="\$(REALLY_SET_LIB_PATH)" ;;
+esac
 
 case "${host}" in
   *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
@@ -2007,8 +1982,6 @@
 AC_SUBST(BUILD_PREFIX)
 AC_SUBST(BUILD_PREFIX_1)
 AC_SUBST(configlinks)
-AC_SUBST(enable_shared)
-AC_SUBST(enable_threads)
 AC_SUBST(enable_version_specific_runtime_libs)
 AC_SUBST(gcc_version_trigger)
 AC_SUBST(gcc_version)

Re: (Toplevel patch) Clean up use of enable_shared, enable_threads.

[Alexandre Oliva]

On Feb 25, 2003, Nathanael Nerode <neroden@twcny.rr.com> wrote:

> 	* Makefile.tpl: Don't set unused enable_shared, enable_threads macros.
> 	* Makefile.in: Regenerate.
> 	* configure.in: Remove unused logic relating to --enable-shared
> 	and --enable-threads.
> 	* configure: Regenerate.

Ah, good, you read my mind ;-)

Please merge this with Toplevel configure.in 2/n and check them both
in at the same time.

-- 
Alexandre Oliva   Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/
Red Hat GCC Developer                 aoliva@{redhat.com, gcc.gnu.org}
CS PhD student at IC-Unicamp        oliva@{lsd.ic.unicamp.br, gnu.org}
Free Software Evangelist                Professional serial bug killer