guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] GNU Guile branch, master, updated. release_1-9-1-29-gf48


From: Andy Wingo
Subject: [Guile-commits] GNU Guile branch, master, updated. release_1-9-1-29-gf486388
Date: Tue, 04 Aug 2009 19:16:10 +0000

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=f4863880f5ef539cb545999c19b6b5c0eec9382d

The branch, master has been updated
       via  f4863880f5ef539cb545999c19b6b5c0eec9382d (commit)
       via  45cc8a38777c9f971b6aae4895311fcc9e15ce3e (commit)
      from  ee0ddd21211757664092eaec631c4c76f4aae74f (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 f4863880f5ef539cb545999c19b6b5c0eec9382d
Author: Andy Wingo <address@hidden>
Date:   Tue Aug 4 21:16:32 2009 +0200

    perform gmp/unistring compile checks with AC_LIB_HAVE_LINKFLAGS
    
    * configure.ac: Rework gmp and unistring checks to use
      AC_LIB_HAVE_LINKFLAGS, so that the compilation checks run with the
      right -L/-l flags.
    
    * libguile/Makefile.am (libguile_la_LIBADD): Adapt to need to add
      $(LIBGMP) and $(LIBUNISTRING) here.
    
    Hopefully this solves
    http://article.gmane.org/gmane.lisp.guile.bugs/4288.

commit 45cc8a38777c9f971b6aae4895311fcc9e15ce3e
Author: Andy Wingo <address@hidden>
Date:   Tue Aug 4 20:46:20 2009 +0200

    rename configure.in to configure.ac
    
    * configure.ac:
    * guile-readline/configure.ac: Rename from configure.in, as recommended
      by the autoconf manual.

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

Summary of changes:
 configure.in => configure.ac                  |   23 ++++++++++-------------
 guile-readline/{configure.in => configure.ac} |    0
 libguile/Makefile.am                          |    2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)
 rename configure.in => configure.ac (99%)
 rename guile-readline/{configure.in => configure.ac} (100%)

diff --git a/configure.in b/configure.ac
similarity index 99%
rename from configure.in
rename to configure.ac
index 53049eb..dae8295 100644
--- a/configure.in
+++ b/configure.ac
@@ -827,22 +827,19 @@ fi
 
 
 dnl GMP tests
-AC_LIB_LINKFLAGS(gmp)
-AC_CHECK_LIB([gmp], [__gmpz_init], ,
-  [AC_MSG_ERROR([GNU MP not found, see README])])
-
-# mpz_import is a macro so we need to include <gmp.h>
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gmp.h>]],
-                               [[mpz_import (0, 0, 0, 0, 0, 0, 0); ]])],
+AC_LIB_HAVE_LINKFLAGS(gmp,
   [],
-  [AC_MSG_ERROR([At least GNU MP 4.1 is required, see README])])
+  [#include <gmp.h>],
+  [mpz_import (0, 0, 0, 0, 0, 0, 0);],
+  AC_MSG_ERROR([GNU MP 4.1 or greater not found, see README]))
 
 dnl GNU libunistring tests.
-if test "x$LTLIBUNISTRING" != "x"; then
-   LIBS="$LTLIBUNISTRING $LIBS"
-else
-   AC_MSG_ERROR([GNU libunistring is required, please install it.])
-fi
+AC_LIB_HAVE_LINKFLAGS(unistring,
+  [],
+  [#include <unistr.h>],
+  [u8_check ("foo", 3)]
+  AC_MSG_ERROR([GNU libunistring not found, see README]))
+
 
 dnl i18n tests
 #AC_CHECK_HEADERS([libintl.h])
diff --git a/guile-readline/configure.in b/guile-readline/configure.ac
similarity index 100%
rename from guile-readline/configure.in
rename to guile-readline/configure.ac
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 8c9c598..dfaa65a 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -220,7 +220,7 @@ noinst_HEADERS = convert.i.c                                
        \
 noinst_HEADERS += vm-engine.c vm-i-system.c vm-i-scheme.c vm-i-loader.c
 
 libguile_la_DEPENDENCIES = @LIBLOBJS@
-libguile_la_LIBADD = @LIBLOBJS@ $(gnulib_library)
+libguile_la_LIBADD = @LIBLOBJS@ $(gnulib_library) $(LTLIBGMP) $(LTLIBUNISTRING)
 libguile_la_LDFLAGS = @LTLIBINTL@ -version-info 
@LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@
 -export-dynamic -no-undefined
 
 # These are headers visible as <guile/mumble.h>


hooks/post-receive
-- 
GNU Guile




reply via email to

[Prev in Thread] Current Thread [Next in Thread]