From aaac3b4650ea86197d3b0931149d64119c81d374 Mon Sep 17 00:00:00 2001
From: jjgarcia <jjgarcia>
Date: Thu, 4 Nov 2004 09:34:45 +0000
Subject: [PATCH] When configuring the Boehm-Weiser garbage collector, make use
 of the flags --enable/disable-threads and --enable/disable-cplusplus

---
 src/configure    | 16 ++++++----------
 src/configure.in | 16 ++++++----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/configure b/src/configure
index c43beb4fa..994b3367a 100755
--- a/src/configure
+++ b/src/configure
@@ -4565,6 +4565,7 @@ else
   INFOEXT=info
 fi
 
+gc_flags=""
 TARGETS="ecl${EXEEXT}"
 LIBRARIES=""
 SUBDIR=c
@@ -4681,6 +4682,7 @@ echo "$as_me:$LINENO: checking for threads support" >&5
 echo $ECHO_N "checking for threads support... $ECHO_C" >&6
 if test "${threads}" ; then
   if test -z "${THREAD_LDFLAGS}"; then
+    gc_flags="${gc_flags} --disable-threads"
     threads='';
     echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
@@ -4703,6 +4705,7 @@ if test ${usecxx} = "no" ; then
   ECL_CC="${CC}"
 else
   ECL_CC="${CXX}"
+  gc_flags="${gc_flags} --enable-cplusplus"
 fi
 if test ! ${opcode8} = "no" ; then
   cat >>confdefs.h <<\_ACEOF
@@ -6540,17 +6543,10 @@ elif test "${local_boehm}" = "no" ; then
 echo "${ECHO_T}configuring local copy" >&6
   test -d gc && rm -rf gc
   if mkdir gc; then
-    if test "${threads}" ; then
-      (destdir=`${PWDCMD}`; cd gc; CC="${CC} ${PICFLAG}" \
-       $srcdir/gc/configure --disable-shared --prefix=${destdir} \
+     (destdir=`${PWDCMD}`; cd gc; CC="${CC} ${PICFLAG}" \
+        $srcdir/gc/configure --disable-threads --disable-shared --prefix=${destdir} \
 	--includedir=${destdir}/h --libdir=${destdir} --build=${build_alias} \
-	--host=${host_alias})
-    else
-      (destdir=`${PWDCMD}`; cd gc; CC="${CC} ${PICFLAG}" \
-       $srcdir/gc/configure --disable-threads --disable-shared --prefix=${destdir} \
-	--includedir=${destdir}/h --libdir=${destdir} --build=${build_alias} \
-	--host=${host_alias})
-    fi
+	--host=${host_alias} ${gc_flags})
   fi
 else
   echo "$as_me:$LINENO: result: already installed" >&5
diff --git a/src/configure.in b/src/configure.in
index 97538e4a3..8a6cd93f8 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -176,6 +176,7 @@ fi
 dnl ----------------------------------------------------------------------
 dnl		Set options
 dnl
+gc_flags=""
 TARGETS="ecl${EXEEXT}"
 LIBRARIES=""
 SUBDIR=c
@@ -261,6 +262,7 @@ fi
 AC_MSG_CHECKING(for threads support)
 if test "${threads}" ; then
   if test -z "${THREAD_LDFLAGS}"; then
+    gc_flags="${gc_flags} --disable-threads"
     threads='';
     AC_MSG_RESULT(no)
   else
@@ -277,6 +279,7 @@ if test ${usecxx} = "no" ; then
   ECL_CC="${CC}"
 else
   ECL_CC="${CXX}"
+  gc_flags="${gc_flags} --enable-cplusplus"
 fi
 if test ! ${opcode8} = "no" ; then
   AC_DEFINE(ECL_SMALL_BYTECODES)
@@ -369,17 +372,10 @@ elif test "${local_boehm}" = "no" ; then
   AC_MSG_RESULT(configuring local copy)
   test -d gc && rm -rf gc
   if mkdir gc; then
-    if test "${threads}" ; then
-      (destdir=`${PWDCMD}`; cd gc; CC="${CC} ${PICFLAG}" \
-       $srcdir/gc/configure --disable-shared --prefix=${destdir} \
+     (destdir=`${PWDCMD}`; cd gc; CC="${CC} ${PICFLAG}" \
+        $srcdir/gc/configure --disable-threads --disable-shared --prefix=${destdir} \
 	--includedir=${destdir}/h --libdir=${destdir} --build=${build_alias} \
-	--host=${host_alias})
-    else
-      (destdir=`${PWDCMD}`; cd gc; CC="${CC} ${PICFLAG}" \
-       $srcdir/gc/configure --disable-threads --disable-shared --prefix=${destdir} \
-	--includedir=${destdir}/h --libdir=${destdir} --build=${build_alias} \
-	--host=${host_alias})
-    fi
+	--host=${host_alias} ${gc_flags})
   fi
 else
   AC_MSG_RESULT(already installed)