From 57119aa9ebf8dbeb7e3fcab520153c2eb664b63f Mon Sep 17 00:00:00 2001
From: Zack Weinberg <zack@wolery.cumb.org>
Date: Mon, 14 Aug 2000 18:08:46 +0000
Subject: top level:

	* configure: Make enable_threads and enable_shared defaults
	explicit.  Substitute enable_threads into generated Makefiles.
	* configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
	* libtool.m4: Accept *-*-linux* not just *-*-linux-gnu*.
gcc:
	* configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
	* fixinc/inclhack.def: Likewise.
	* fixinc/mkfixinc.sh: Likewise.
	* configure: Regenerate.
	* fixinc/fixincl.x: Regenerate.
	* install.texi: Document equivalence of linux and linux-gnu.
libio:
	* configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
	Honor --disable-threads.
libstdc++:
	* configure.in: Accept *-*-linux* not just *-*-linux-gnu*.
	Honor --disable-threads.
libstdc++-v3:
	* configure: Regenerate after change to ../libtool.m4.
libobjc:
	* configure: Regenerate after change to ../libtool.m4.

From-SVN: r35680
---
 configure | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 9de3cc4..e0d6026 100755
--- a/configure
+++ b/configure
@@ -53,6 +53,8 @@ cache_file_option=
 configdirs=
 extraconfigdirs=
 diroptions=
+enable_threads=no
+enable_shared=no
 exec_prefix=
 exec_prefixoption=
 fatal=
@@ -86,7 +88,7 @@ subdirs=
 target_alias=NOTARGET
 target_makefile_frag=
 undefs=NOUNDEFS
-version="$Revision: 1.26 $"
+version="$Revision: 1.27 $"
 x11=default
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
@@ -1335,12 +1337,8 @@ EOF
                 echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile}
             fi 
 
-	    # record if we want to build shared libs.
-	    if test -z "${enable_shared}"; then
-	        echo enable_shared = no >> ${Makefile}
-	    else
-	        echo enable_shared = ${enable_shared} >> ${Makefile}
-	    fi
+	    echo enable_shared = ${enable_shared} >> ${Makefile}
+	    echo enable_threads = ${enable_threads} >> ${Makefile}
 	    # record if we want to rumtime library stuff installed in libsubdir.
 	    if test -z "${enable_version_specific_runtime_libs}"; then
 	        echo enable_version_specific_runtime_libs = no >> ${Makefile}
-- 
cgit v1.1