diff options
| author | Simon Josefsson <simon@josefsson.org> | 2007-06-26 15:24:15 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-06-26 15:24:15 +0200 |
| commit | 6b1da319e3997386458242d50a6a14c71af81873 (patch) | |
| tree | 8a3b60670e323b1d8a03f095787aac47e14f6679 | |
| parent | 6ca6781f8bd2138c7ba62d212218b486dbc278f0 (diff) | |
| download | gnutls-6b1da319e3997386458242d50a6a14c71af81873.tar.gz | |
Check that the guile header files is recent enough and that it works.
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | configure.in | 12 |
2 files changed, 12 insertions, 5 deletions
@@ -5,6 +5,11 @@ See the end for copying conditions. * Version 1.7.15 (unreleased) +** Test that the Guile header files are recent enough to work. +Before we just tested that the command line tool 'guile' was recent +enough, which may not be sufficient if you still have an old +libguile.h header installed. + ** Guile bindings are now installed under $prefix by default. Use --without-guile-site-dir to install it under $pkgdatadir/site/ where $pkgdatadir is as returned by "guile-config info pkgdatadir". diff --git a/configure.in b/configure.in index f38838d1be..4ff951ec92 100644 --- a/configure.in +++ b/configure.in @@ -311,11 +311,13 @@ if test "x$opt_guile_bindings" = "xyes"; then GUILE_PROGS GUILE_FLAGS - AC_MSG_CHECKING([whether GNU Guile 1.8 or later is available]) - GUILE_CHECK([is_guile_1_8], - [(exit (string>=? (version) (number->string 1.8)))]) + AC_MSG_CHECKING([whether GNU Guile is recent enough]) + AC_COMPILE_IFELSE(AC_LANG_PROGRAM([ + #include <libguile.h> +SCM_API scm_t_bits scm_tc16_gnutls_cipher_enum;]), + recent_guile=yes,recent_guile=no) - if test $is_guile_1_8 -eq 0; then + if test "$recent_guile" = yes; then AC_MSG_RESULT([yes]) case "x$with_guile_site_dir" in xno) @@ -337,7 +339,7 @@ if test "x$opt_guile_bindings" = "xyes"; then esac else AC_MSG_RESULT([no]) - AC_MSG_WARN([GNU Guile 1.8 or later is required. Guile bindings not built.]) + AC_MSG_WARN([A sufficiently recent GNU Guile not found. Guile bindings not built.]) opt_guile_bindings=no fi fi |