File TeXmacs-fix_impose_guile1.patch of Package TeXmacs

Overview Repositories Revisions Requests Users Attributes Meta

File TeXmacs-fix_impose_guile1.patch of Package TeXmacs (Revision bad35dd39c46bddc05e4f4d480411781)

Currently displaying revision bad35dd39c46bddc05e4f4d480411781 , Show latest

diff --git a/aclocal.m4 b/aclocal.m4
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -8,15 +8,15 @@
 ## The GUILE_FLAGS macro.
   ## First, let's just see if we can find Guile at all.
   AC_MSG_CHECKING(for Guile)
-  guile-config link > /dev/null || {
-    echo "configure: cannot find guile-config; is Guile installed?" 1>&2
+  guile1-config link > /dev/null || {
+    echo "configure: cannot find guile1-config; is Guile installed?" 1>&2
     exit 1
   }
-  GUILE_ORIGINAL_CFLAGS="`guile-config compile`"
+  GUILE_ORIGINAL_CFLAGS="`guile1-config compile`"
   GUILE_CFLAGS="$GUILE_ORIGINAL_CFLAGS"
-  GUILE_VARIANT_CFLAGS="$GUILE_ORIGINAL_CFLAGS $GUILE_ORIGINAL_CFLAGS/guile $GUILE_ORIGINAL_CFLAGS/libguile"
-  GUILE_LDFLAGS="`guile-config link`"
-  GUILE_VARIANT_LDFLAGS="-L`guile-config info libdir` -lguile -lreadline -ltermcap"
+  GUILE_VARIANT_CFLAGS="$GUILE_ORIGINAL_CFLAGS $GUILE_ORIGINAL_CFLAGS/guile1 $GUILE_ORIGINAL_CFLAGS/libguile1"
+  GUILE_LDFLAGS="`guile1-config link`"
+  GUILE_VARIANT_LDFLAGS="-L`guile1-config info libdir` -lguile1 -lreadline -ltermcap"
   AC_SUBST(GUILE_CFLAGS)
   AC_SUBST(GUILE_LDFLAGS)
   AC_MSG_RESULT(yes)
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -97,12 +97,12 @@
 fi
 AC_MSG_CHECKING(version of guile)
 if test -z "$GUILE_EFFECTIVE_VERSION" ; then
-  GUILE_EFFECTIVE_VERSION=`guile -c '(display (version))'`
+  GUILE_EFFECTIVE_VERSION=`guile1 -c '(display (version))'`
 fi
 AC_MSG_RESULT($GUILE_EFFECTIVE_VERSION)
-AC_MSG_CHECKING(guile data path)
+AC_MSG_CHECKING(guile1 data path)
 if test -z "$GUILE_DATA_PATH" ; then
-  GUILE_DATA_PATH=`guile-config info pkgdatadir`
+  GUILE_DATA_PATH=`guile1-config info pkgdatadir`
 fi
 AC_MSG_RESULT($GUILE_DATA_PATH)
 
@@ -577,7 +577,7 @@
 
 AC_MSG_CHECKING(whether ... arguments behave correctly)
 if test -z "$GUILE_CFLAGS"; then
-  CXXFLAGS="`guile-config compile`"
+  CXXFLAGS="`guile1-config compile`"
 else
   CXXFLAGS="$GUILE_CFLAGS"
 fi
@@ -598,7 +598,7 @@
 
 AC_MSG_CHECKING(the size_t of guile strings)
 if test -z "$GUILE_CFLAGS"; then
-  CXXFLAGS="`guile-config compile`"
+  CXXFLAGS="`guile1-config compile`"
 else
   CXXFLAGS="$GUILE_CFLAGS"
 fi

Places

File TeXmacs-fix_impose_guile1.patch of Package TeXmacs (Revision bad35dd39c46bddc05e4f4d480411781)

Places