Ticket #29204: patch-configure.ac.diff

configure.ac

@@ -51 +51 @@
 
 # Find Guile library, flags, etcetera:
 
-AC_CHECK_PROG(GUILE, guile, guile, unknown)
+AC_CHECK_PROG(GUILE, guile16, guile16, unknown)
 if test x"$guile_ok" = xunknown; then
         AC_MSG_ERROR([could not find guile program; check your PATH])
 fi
 AC_SUBST(GUILE)
 
-AC_CHECK_PROG(GUILE_CONFIG, guile-config, guile-config, unknown)
+AC_CHECK_PROG(GUILE_CONFIG, guile16-config, guile16-config, unknown)
 if test "x$GUILE_CONFIG" = "xunknown"; then
         AC_CHECK_LIB(m, sqrt)
         AC_CHECK_LIB(readline, readline)
         AC_CHECK_LIB(dl, dlopen)
-        AC_CHECK_LIB(guile, gh_eval_str)
+        AC_CHECK_LIB(guile16, gh_eval_str)
 else
         CPPFLAGS="$CPPFLAGS `$GUILE_CONFIG compile`"
         LIBS="$LIBS `$GUILE_CONFIG link`"
@@ -80 +80 @@
 
 AC_MSG_CHECKING([for gh_load])
 ok=yes
-AC_TRY_LINK([#include <guile/gh.h>
+AC_TRY_LINK([#include <guile16/gh.h>
 ], [gh_load(0);], [AC_DEFINE(HAVE_GH_LOAD, 1, [Define if we have gh_load.])], ok=no)
 AC_MSG_RESULT($ok)
 
 AC_MSG_CHECKING([for gh_bool2scm])
 ok=yes
-AC_TRY_LINK([#include <guile/gh.h>
+AC_TRY_LINK([#include <guile16/gh.h>
 ], [gh_bool2scm(0);], [AC_DEFINE(HAVE_GH_BOOL2SCM, 1, [Define if we have gh_bool2scm])], ok=no)
 AC_MSG_RESULT($ok)
 
 AC_MSG_CHECKING([for gh_vector_ref])
 ok=yes
-AC_TRY_LINK([#include <guile/gh.h>
+AC_TRY_LINK([#include <guile16/gh.h>
 ], [gh_vector_ref(0,0);], [AC_DEFINE(HAVE_GH_VECTOR_REF, 1, [Define if we have gh_vector_ref])], ok=no)
 AC_MSG_RESULT($ok)
 
 AC_MSG_CHECKING([for gh_list_ref])
 ok=yes
-AC_TRY_LINK([#include <guile/gh.h>
+AC_TRY_LINK([#include <guile16/gh.h>
 ], [gh_list_ref(0,0);], [AC_DEFINE(HAVE_GH_LIST_REF, 1, [Define if we have gh_list_ref])], ok=no)
 AC_MSG_RESULT($ok)
 
 AC_MSG_CHECKING([for gh_length])
 ok=yes
-AC_TRY_LINK([#include <guile/gh.h>
+AC_TRY_LINK([#include <guile16/gh.h>
 ], [gh_length(0);], [AC_DEFINE(HAVE_GH_LENGTH, 1, [Define if we have gh_length])], ok=no)
 AC_MSG_RESULT($ok)
 
 AC_MSG_CHECKING([for scm_flush_all_ports])
 ok=yes
-AC_TRY_LINK([#include <guile/gh.h>
+AC_TRY_LINK([#include <guile16/gh.h>
 ], [scm_flush_all_ports();], [AC_DEFINE(HAVE_SCM_FLUSH_ALL_PORTS, 1, [Define if we have scm_flush_all_ports])], ok=no)
 AC_MSG_RESULT($ok)
 
@@ -118 +118 @@
 
 AC_MSG_CHECKING([for SCM_COMPLEXP])
 ok=yes
-AC_TRY_LINK([#include <guile/gh.h>
+AC_TRY_LINK([#include <guile16/gh.h>
 ], [SCM x; SCM_COMPLEXP(x);], [AC_DEFINE(HAVE_SCM_COMPLEXP, 1, [Define if we have SCM_COMPLEXP])], ok=no)
 AC_MSG_RESULT($ok)
 
@@ -126 +126 @@
 ok=yes
 AC_TRY_RUN([
 #include <stdlib.h>
-#include <guile/gh.h>
+#include <guile16/gh.h>
 void main_entry(int argc, char *argv[])
 {
      gh_eval_str("(define foo 3.14159)");