[Guile-commits] GNU Guile branch, master, updated. release_1-9-14-151-g2ddf085

[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=2ddf08514965cb7c0fa60a56b343dfa811e836e5

The branch, master has been updated
       via  2ddf08514965cb7c0fa60a56b343dfa811e836e5 (commit)
      from  a8591a55f0d7186fbdd58b3c570bbe945b58fa11 (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 2ddf08514965cb7c0fa60a56b343dfa811e836e5
Author: Ludovic Courtès <address@hidden>
Date:   Mon Jan 31 19:26:01 2011 +0100

    Disable stand-alone tests that require `dlopen' when `--disable-shared'.
    
    * configure.ac (HAVE_SHARED_LIBRARIES): New Automake conditional.
    
    * test-suite/standalone/Makefile.am (check_SCRIPTS): Add `test-asmobs',
      `test-ffi', and `test-extensions' only when `HAVE_SHARED_LIBRARIES'.

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

Summary of changes:
 configure.ac                      |    5 ++++-
 test-suite/standalone/Makefile.am |   11 ++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5c70aa8..69f35e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,8 @@ dnl
 
 define(GUILE_CONFIGURE_COPYRIGHT,[[
 
-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 
2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+  2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 This file is part of GUILE
 
@@ -75,6 +76,8 @@ AM_PROG_CC_C_O
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 
+AM_CONDITIONAL([HAVE_SHARED_LIBRARIES], [test "x$enable_shared" = "xyes"])
+
 dnl Check for libltdl.
 AC_LIB_HAVE_LINKFLAGS([ltdl], [], [#include <ltdl.h>],
   [lt_dlopenext ("foo");])
diff --git a/test-suite/standalone/Makefile.am 
b/test-suite/standalone/Makefile.am
index e3b5a38..861e668 100644
--- a/test-suite/standalone/Makefile.am
+++ b/test-suite/standalone/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in.
 ##
-## Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Software 
Foundation, Inc.
+## Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+##   2011 Free Software Foundation, Inc.
 ##
 ## This file is part of GUILE.
 ##
@@ -78,6 +79,8 @@ test_round_LDADD = ${top_builddir}/libguile/address@hidden@.l
 check_PROGRAMS += test-round
 TESTS += test-round
 
+if HAVE_SHARED_LIBRARIES
+
 # test-asmobs
 noinst_LTLIBRARIES += libtest-asmobs.la
 libtest_asmobs_la_SOURCES = test-asmobs-lib.c
@@ -97,6 +100,8 @@ libtest_ffi_la_LIBADD = 
${top_builddir}/libguile/address@hidden
 check_SCRIPTS += test-ffi
 TESTS += test-ffi
 
+endif HAVE_SHARED_LIBRARIES
+
 # test-list
 test_list_SOURCES = test-list.c
 test_list_CFLAGS = ${test_cflags}
@@ -154,6 +159,8 @@ test_scm_take_u8vector_LDADD = 
${top_builddir}/libguile/address@hidden
 check_PROGRAMS += test-scm-take-u8vector
 TESTS += test-scm-take-u8vector
 
+if HAVE_SHARED_LIBRARIES
+
 # test-extensions
 noinst_LTLIBRARIES += libtest-extensions.la
 libtest_extensions_la_SOURCES = test-extensions-lib.c
@@ -163,6 +170,8 @@ libtest_extensions_la_LIBADD = 
${top_builddir}/libguile/address@hidden
 check_SCRIPTS += test-extensions
 TESTS += test-extensions
 
+endif HAVE_SHARED_LIBRARIES
+
 if BUILD_PTHREAD_SUPPORT
 
 # test-with-guile-module


hooks/post-receive
-- 
GNU Guile