[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.0-48-g6a94e6e

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=6a94e6e1ae6c018fe1ea1c0c6a9cca577dff4d85

The branch, stable-2.0 has been updated
       via  6a94e6e1ae6c018fe1ea1c0c6a9cca577dff4d85 (commit)
       via  62cdb4e478d58ade852b04bdcfcf79c1ac815e21 (commit)
      from  dcb7c7ddf5dc2c7e32720ed91c6d7bbed7f7455a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6a94e6e1ae6c018fe1ea1c0c6a9cca577dff4d85
Author: Ludovic Courtès <address@hidden>
Date:   Mon Feb 28 00:40:45 2011 +0100

    Link stand-alone tests against libgc.
    
    Reported by Andreas Rottmann <address@hidden>.
    
    * test-suite/standalone/Makefile.am (LIBGUILE_LDADD): New variable.
      (test_num2integral_LDADD, test_round_LDADD, libtest_asmobs_la_LIBADD,
      libtest_ffi_la_LIBADD, test_list_LDADD, test_unwind_LDADD,
      test_conversion_LDADD, test_loose_ends_LDADD, test_scm_c_read_LDADD,
      test_scm_take_locale_symbol_LDADD, test_scm_take_u8vector_LDADD,
      libtest_extensions_la_LIBADD, test_with_guile_module_LDADD,
      test_scm_with_guile_LDADD): Use it.

commit 62cdb4e478d58ade852b04bdcfcf79c1ac815e21
Author: Ludovic Courtès <address@hidden>
Date:   Mon Feb 28 00:21:48 2011 +0100

    Strip any CPPFLAGS other than `-I' from `guile-2.0.pc'.
    
    * configure.ac: Strip anything beyond `-I' from $GUILE_CFLAGS so that
      `guile-2.0.pc' does not export them to the user.  Reported and fixed
      by Bruno Haible <address@hidden>.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                      |   22 ++++++++++++++++++++--
 test-suite/standalone/Makefile.am |   34 ++++++++++++++++++++--------------
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 423ae99..9929064 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1566,9 +1566,27 @@ AC_SUBST(LIBGUILE_I18N_INTERFACE)
 
 #######################################################################
 
-dnl Tell guile-config what flags guile users should compile and link with.
+dnl Tell guile-config what flags guile users should compile and link
+dnl with, keeping only `-I' flags from $CPPFLAGS.
+GUILE_CFLAGS=""
+next_is_includedir=false
+for flag in $CPPFLAGS
+do
+  if $next_is_includedir; then
+    GUILE_CFLAGS="$GUILE_CFLAGS -I $flag"
+    next_is_includedir=false
+  else
+    case "$flag" in
+      -I)  next_is_includedir=true;;
+      -I*) GUILE_CFLAGS="$GUILE_CFLAGS $flag";;
+      *)   ;;
+    esac
+  fi
+done
+
+GUILE_CFLAGS="$GUILE_CFLAGS $PTHREAD_CFLAGS"
 GUILE_LIBS="$LDFLAGS $LIBS"
-GUILE_CFLAGS="$CPPFLAGS $PTHREAD_CFLAGS"
+
 AC_SUBST(GUILE_LIBS)
 AC_SUBST(GUILE_CFLAGS)
 
diff --git a/test-suite/standalone/Makefile.am 
b/test-suite/standalone/Makefile.am
index 861e668..3e32067 100644
--- a/test-suite/standalone/Makefile.am
+++ b/test-suite/standalone/Makefile.am
@@ -45,6 +45,12 @@ test_cflags =                                        \
 
 AM_LDFLAGS = $(GUILE_CFLAGS)
 
+# How to link with libguile (same as `Libs' in `guile-2.0.pc'.)
+LIBGUILE_LDADD =                                                       \
+  ${top_builddir}/libguile/address@hidden@.la  \
+  $(BDW_GC_LIBS)
+
+
 snarfcppopts =                                                               \
   -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_builddir) \
   -I. $(DEFS) $(DEFAULT_INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -69,13 +75,13 @@ TESTS += test-require-extension
 # test-num2integral
 test_num2integral_SOURCES = test-num2integral.c
 test_num2integral_CFLAGS = ${test_cflags}
-test_num2integral_LDADD = ${top_builddir}/libguile/address@hidden@.la
+test_num2integral_LDADD = $(LIBGUILE_LDADD)
 check_PROGRAMS += test-num2integral
 TESTS += test-num2integral
 
 # test-round
 test_round_CFLAGS = ${test_cflags}
-test_round_LDADD = ${top_builddir}/libguile/address@hidden@.la
+test_round_LDADD = $(LIBGUILE_LDADD)
 check_PROGRAMS += test-round
 TESTS += test-round
 
@@ -86,7 +92,7 @@ noinst_LTLIBRARIES += libtest-asmobs.la
 libtest_asmobs_la_SOURCES = test-asmobs-lib.c
 libtest_asmobs_la_CFLAGS = ${test_cflags}
 libtest_asmobs_la_LDFLAGS = -module -no-undefined -rpath `pwd` # so libtool 
will really build an .so
-libtest_asmobs_la_LIBADD = ${top_builddir}/libguile/address@hidden@.la
+libtest_asmobs_la_LIBADD = $(LIBGUILE_LDADD)
 BUILT_SOURCES += test-asmobs-lib.x
 check_SCRIPTS += test-asmobs
 TESTS += test-asmobs
@@ -96,7 +102,7 @@ noinst_LTLIBRARIES += libtest-ffi.la
 libtest_ffi_la_SOURCES = test-ffi-lib.c
 libtest_ffi_la_CFLAGS = ${test_cflags}
 libtest_ffi_la_LDFLAGS = -module -no-undefined -rpath `pwd` # so libtool will 
really build an .so
-libtest_ffi_la_LIBADD = ${top_builddir}/libguile/address@hidden@.la
+libtest_ffi_la_LIBADD = $(LIBGUILE_LDADD)
 check_SCRIPTS += test-ffi
 TESTS += test-ffi
 
@@ -105,28 +111,28 @@ endif HAVE_SHARED_LIBRARIES
 # test-list
 test_list_SOURCES = test-list.c
 test_list_CFLAGS = ${test_cflags}
-test_list_LDADD = ${top_builddir}/libguile/address@hidden@.la
+test_list_LDADD = $(LIBGUILE_LDADD)
 check_PROGRAMS += test-list
 TESTS += test-list
 
 # test-unwind
 test_unwind_SOURCES = test-unwind.c
 test_unwind_CFLAGS = ${test_cflags}
-test_unwind_LDADD = ${top_builddir}/libguile/address@hidden@.la
+test_unwind_LDADD = $(LIBGUILE_LDADD)
 check_PROGRAMS += test-unwind
 TESTS += test-unwind
 
 # test-conversion
 test_conversion_SOURCES = test-conversion.c
 test_conversion_CFLAGS = ${test_cflags}
-test_conversion_LDADD = ${top_builddir}/libguile/address@hidden@.la
+test_conversion_LDADD = $(LIBGUILE_LDADD)
 check_PROGRAMS += test-conversion
 TESTS += test-conversion
 
 # test-loose-ends
 test_loose_ends_SOURCES = test-loose-ends.c
 test_loose_ends_CFLAGS = ${test_cflags}
-test_loose_ends_LDADD = ${top_builddir}/libguile/address@hidden@.la
+test_loose_ends_LDADD = $(LIBGUILE_LDADD)
 check_PROGRAMS += test-loose-ends
 TESTS += test-loose-ends
 
@@ -141,21 +147,21 @@ TESTS += test-use-srfi
 # test-scm-c-read
 test_scm_c_read_SOURCES = test-scm-c-read.c
 test_scm_c_read_CFLAGS = ${test_cflags}
-test_scm_c_read_LDADD = ${top_builddir}/libguile/address@hidden@.la
+test_scm_c_read_LDADD = $(LIBGUILE_LDADD)
 check_PROGRAMS += test-scm-c-read
 TESTS += test-scm-c-read
 
 # test-scm-take-locale-symbol
 test_scm_take_locale_symbol_SOURCES = test-scm-take-locale-symbol.c
 test_scm_take_locale_symbol_CFLAGS = ${test_cflags}
-test_scm_take_locale_symbol_LDADD = ${top_builddir}/libguile/address@hidden@.la
+test_scm_take_locale_symbol_LDADD = $(LIBGUILE_LDADD)
 check_PROGRAMS += test-scm-take-locale-symbol
 TESTS += test-scm-take-locale-symbol
 
 # test-scm-take-u8vector
 test_scm_take_u8vector_SOURCES = test-scm-take-u8vector.c
 test_scm_take_u8vector_CFLAGS = ${test_cflags}
-test_scm_take_u8vector_LDADD = ${top_builddir}/libguile/address@hidden@.la
+test_scm_take_u8vector_LDADD = $(LIBGUILE_LDADD)
 check_PROGRAMS += test-scm-take-u8vector
 TESTS += test-scm-take-u8vector
 
@@ -166,7 +172,7 @@ noinst_LTLIBRARIES += libtest-extensions.la
 libtest_extensions_la_SOURCES = test-extensions-lib.c
 libtest_extensions_la_CFLAGS = ${test_cflags}
 libtest_extensions_la_LDFLAGS = -module -no-undefined -rpath `pwd` # so 
libtool will really build an .so
-libtest_extensions_la_LIBADD = ${top_builddir}/libguile/address@hidden@.la
+libtest_extensions_la_LIBADD = $(LIBGUILE_LDADD)
 check_SCRIPTS += test-extensions
 TESTS += test-extensions
 
@@ -176,12 +182,12 @@ if BUILD_PTHREAD_SUPPORT
 
 # test-with-guile-module
 test_with_guile_module_CFLAGS = ${test_cflags}
-test_with_guile_module_LDADD = ${top_builddir}/libguile/address@hidden@.la
+test_with_guile_module_LDADD = $(LIBGUILE_LDADD)
 check_PROGRAMS += test-with-guile-module
 TESTS += test-with-guile-module
 
 test_scm_with_guile_CFLAGS = ${test_cflags}
-test_scm_with_guile_LDADD = ${top_builddir}/libguile/address@hidden@.la
+test_scm_with_guile_LDADD = $(LIBGUILE_LDADD)
 check_PROGRAMS += test-scm-with-guile
 TESTS += test-scm-with-guile
 


hooks/post-receive
-- 
GNU Guile