Ticket #29205: patch-configure.ac.diff

configure.ac

@@ -253 +253 @@
 
 if test "x$with_libctl" != xno; then
 
-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(readline, readline)
         AC_CHECK_LIB(dl, dlopen)
         AC_CHECK_LIB(guile-ltdl, scm_lt_dlinit, [], [AC_CHECK_LIB(ltdl, dlopen)])
-        AC_CHECK_LIB(guile, gh_eval_str, [], [AC_MSG_ERROR([linking to guile failed])])
+        AC_CHECK_LIB(guile16, gh_eval_str, [], [AC_MSG_ERROR([linking to guile failed])])
 else
         CPPFLAGS="$CPPFLAGS `$GUILE_CONFIG compile`"
         LIBS="`$GUILE_CONFIG link` $LIBS"
         AC_MSG_CHECKING([if linking to guile works])
         AC_TRY_LINK_FUNC(gh_enter, AC_MSG_RESULT(yes), [
         AC_MSG_RESULT(no)
-        AC_MSG_ERROR(guile-config is broken)
+        AC_MSG_ERROR(guile16-config is broken)
         ])
 fi
 
@@ -273 +273 @@
 
 AC_CHECK_FUNCS(scm_make_smob_type)
 AC_MSG_CHECKING([for SCM_SMOB_PREDICATE])
-AC_TRY_LINK([#include <guile/gh.h>
-#include <libguile/smob.h>],
+AC_TRY_LINK([#include <guile16/gh.h>
+#include <libguile16/smob.h>],
                     [int x; SCM_SMOB_PREDICATE(1,x);],
                     ok=yes, ok=no)
 AC_MSG_RESULT($ok)
@@ -282 +282 @@
         AC_DEFINE(HAVE_SCM_SMOB_PREDICATE, 1, [define if we have SCM_SMOB_PREDICATE])
 fi
 AC_MSG_CHECKING([for SCM_SMOB_DATA])
-AC_TRY_LINK([#include <guile/gh.h>
-#include <libguile/smob.h>],
+AC_TRY_LINK([#include <guile16/gh.h>
+#include <libguile16/smob.h>],
                     [int x; SCM_SMOB_DATA(x);],
                     ok=yes, ok=no)
 AC_MSG_RESULT($ok)
@@ -291 +291 @@
         AC_DEFINE(HAVE_SCM_SMOB_DATA, 1, [define if we have SCM_SMOB_DATA])
 fi
 AC_MSG_CHECKING([for SCM_NEWSMOB])
-AC_TRY_LINK([#include <guile/gh.h>
-#include <libguile/smob.h>],
+AC_TRY_LINK([#include <guile16/gh.h>
+#include <libguile16/smob.h>],
                     [int x; SCM_NEWSMOB(x,1,0);],
                     ok=yes, ok=no)
 AC_MSG_RESULT($ok)
@@ -306 +306 @@
 if test "x$cross_compiling" = xno; then
 AC_MSG_CHECKING(how to activate readline in Guile)
 ractivate="(use-modules (readline-activator)) (activate-readline)"
-if guile -c "$ractivate" > /dev/null 2>&1; then
+if guile16 -c "$ractivate" > /dev/null 2>&1; then
         AC_MSG_RESULT(readline-activator)
         ACTIVATE_READLINE="$ractivate"
 else
         ractivate="(use-modules (ice-9 readline)) (activate-readline)"
-        if guile -c "$ractivate" >& /dev/null; then
+        if guile16 -c "$ractivate" >& /dev/null; then
                 AC_MSG_RESULT(ice-9 readline)
                 ACTIVATE_READLINE="$ractivate"
         else