guile/guile-oops configure configure.in

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Mikael Djurfeldt <address@hidden>       01/03/09 17:26:49

Modified files:
        guile-oops     : configure configure.in 

Log message:
        * configure.in: Don't remove -lqthreads from LIBS until all checks
        involving linking with libguile has been performed.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/configure.diff?r1=1.19&r2=1.20
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/configure.in.diff?r1=1.19&r2=1.20

Patches:
Index: guile/guile-oops/configure
diff -u guile/guile-oops/configure:1.19 guile/guile-oops/configure:1.20
--- guile/guile-oops/configure:1.19     Mon Mar  5 12:00:08 2001
+++ guile/guile-oops/configure  Fri Mar  9 17:26:48 2001
@@ -1518,20 +1518,17 @@
 
 
 CFLAGS="$CFLAGS $GUILE_CFLAGS"
-LIBS="$LIBS `echo $GUILE_LDFLAGS | sed s/-lqthreads//`"
-LIBQTHREADS=`echo $GUILE_LDFLAGS | sed 's/.*\(-lqthreads\).*/\1/p;d'`
-
+LIBS="$LIBS $GUILE_LDFLAGS"
 
-
 for ac_func in scm_simple_format scm_shared_array_root scm_init_goops
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1530: checking for $ac_func" >&5
+echo "configure:1527: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1535 "configure"
+#line 1532 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1554,7 +1551,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && 
test -s conftest${ac_exeext}; then
+if { (eval echo configure:1555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && 
test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1588,19 +1585,19 @@
 
 
 echo $ac_n "checking for two argument scm_mutex_init""... $ac_c" 1>&6
-echo "configure:1592: checking for two argument scm_mutex_init" >&5
+echo "configure:1589: checking for two argument scm_mutex_init" >&5
 if eval "test \"`echo '$''{'ac_cv_func_scm_mutex_init_two_args'+set}'`\" = 
set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1597 "configure"
+#line 1594 "configure"
 #include "confdefs.h"
 #include <libguile.h>
 int main() {
 scm_mutex_init (NULL, NULL);
 ; return 0; }
 EOF
-if { (eval echo configure:1604: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
+if { (eval echo configure:1601: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
   rm -rf conftest*
   ac_cv_func_scm_mutex_init_two_args=yes
 else
@@ -1629,6 +1626,12 @@
     CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wmissing-prototypes" ;;
 esac
 
+## NOTE: After we've done this, we can no longer perform any tests
+##       involving linking with libguile
+LIBS="`echo $LIBS | sed s/-lqthreads//`"
+LIBQTHREADS=`echo $GUILE_LDFLAGS | sed 's/.*\(-lqthreads\).*/\1/p;d'`
+
+
 
 
 
@@ -1819,8 +1822,8 @@
 address@hidden@%$build_os%g
 address@hidden@%$RANLIB%g
 address@hidden@%$LIBTOOL%g
address@hidden@%$LIBQTHREADS%g
 address@hidden@%$GUILEVERSION%g
address@hidden@%$LIBQTHREADS%g
 address@hidden@%$GOOPS_MAJOR_VERSION%g
 address@hidden@%$GOOPS_MINOR_VERSION%g
 address@hidden@%$GOOPS_VERSION%g
Index: guile/guile-oops/configure.in
diff -u guile/guile-oops/configure.in:1.19 guile/guile-oops/configure.in:1.20
--- guile/guile-oops/configure.in:1.19  Mon Mar  5 12:00:08 2001
+++ guile/guile-oops/configure.in       Fri Mar  9 17:26:48 2001
@@ -22,10 +22,7 @@
 AM_PROG_LIBTOOL
 
 CFLAGS="$CFLAGS $GUILE_CFLAGS"
-LIBS="$LIBS `echo $GUILE_LDFLAGS | sed s/-lqthreads//`"
-LIBQTHREADS=`echo $GUILE_LDFLAGS | sed 's/.*\(-lqthreads\).*/\1/p;d'`
-
-AC_SUBST(LIBQTHREADS)
+LIBS="$LIBS $GUILE_LDFLAGS"
 
 AC_CHECK_FUNCS(scm_simple_format scm_shared_array_root scm_init_goops)
 
@@ -55,6 +52,12 @@
     ## less than exasperating.
     CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wmissing-prototypes" ;;
 esac
+
+## NOTE: After we've done this, we can no longer perform any tests
+##       involving linking with libguile
+LIBS="`echo $LIBS | sed s/-lqthreads//`"
+LIBQTHREADS=`echo $GUILE_LDFLAGS | sed 's/.*\(-lqthreads\).*/\1/p;d'`
+AC_SUBST(LIBQTHREADS)
 
 AC_SUBST(GOOPS_MAJOR_VERSION)
 AC_SUBST(GOOPS_MINOR_VERSION)