diff -up TeXmacs-1.99.2-src/aclocal.m4.conffix TeXmacs-1.99.2-src/aclocal.m4
--- TeXmacs-1.99.2-src/aclocal.m4.conffix 2014-03-06 09:43:02.000000000 -0700
+++ TeXmacs-1.99.2-src/aclocal.m4 2015-08-10 14:28:36.606505499 -0600
@@ -8,15 +8,15 @@ AC_DEFUN([GUILE_FLAGS],[
## 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.8-config link > /dev/null || {
+ echo "configure: cannot find guile1.8-config; is Guile installed?" 1>&2
exit 1
}
- GUILE_ORIGINAL_CFLAGS="`guile-config compile`"
+ GUILE_ORIGINAL_CFLAGS="`guile1.8-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_LDFLAGS="`guile1.8-config link`"
+ GUILE_VARIANT_LDFLAGS="-L`guile1.8-config info libdir` -lguile -lreadline -ltermcap"
AC_SUBST(GUILE_CFLAGS)
AC_SUBST(GUILE_LDFLAGS)
AC_MSG_RESULT(yes)
diff -up TeXmacs-1.99.2-src/configure.in.conffix TeXmacs-1.99.2-src/configure.in
--- TeXmacs-1.99.2-src/configure.in.conffix 2014-07-18 09:11:43.000000000 -0600
+++ TeXmacs-1.99.2-src/configure.in 2015-08-10 16:01:30.855722931 -0600
@@ -102,12 +102,12 @@ if test -z "$GUILE_CFLAGS" -a -z "$GUILE
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.8 -c '(display (version))'`
fi
AC_MSG_RESULT($GUILE_EFFECTIVE_VERSION)
AC_MSG_CHECKING(guile data path)
if test -z "$GUILE_DATA_PATH" ; then
- GUILE_DATA_PATH=`guile-config info pkgdatadir`
+ GUILE_DATA_PATH=`guile1.8-config info pkgdatadir`
fi
AC_MSG_RESULT($GUILE_DATA_PATH)
@@ -596,8 +596,9 @@ AC_SUBST(WINSPARKLE_PATH)
#--------------------------------------------------------------------
AC_MSG_CHECKING(whether ... arguments behave correctly)
+ac_save_CXXFLAGS="$CXXFLAGS"
if test -z "$GUILE_CFLAGS"; then
- CXXFLAGS="`guile-config compile`"
+ CXXFLAGS="`guile1.8-config compile`"
else
CXXFLAGS="$GUILE_CFLAGS"
fi
@@ -614,11 +615,12 @@ AC_TRY_COMPILE([
],[
AC_MSG_RESULT(no)
])
-CXXFLAGS=""
+CXXFLAGS="$ac_save_CXXFLAGS"
AC_MSG_CHECKING(the size_t of guile strings)
+ac_save_CXXFLAGS="$CXXFLAGS"
if test -z "$GUILE_CFLAGS"; then
- CXXFLAGS="`guile-config compile`"
+ CXXFLAGS="`guile1.8-config compile`"
else
CXXFLAGS="$GUILE_CFLAGS"
fi
@@ -636,7 +638,7 @@ AC_TRY_COMPILE([
AC_DEFINE(guile_str_size_t, size_t, [Guile string size type])
AC_MSG_RESULT(size_t)
])
-CXXFLAGS=""
+CXXFLAGS="$ac_save_CXXFLAGS"
AC_MSG_CHECKING([if statically linking with guile works])
SAVE_CPPFLAGS="$CPPFLAGS"
@@ -1008,6 +1010,7 @@ T1_EncodingType t;
# CONFIG_PDF="Pdf Pdf/PDFWriter"
CONFIG_PDF="Pdf"
PDF_CFLAGS="-DPDFHUMMUS_NO_TIFF -DPDFHUMMUS_NO_DCT"
+ PDF_LDFLAGS="-lz"
],[
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find FreeType or your version is < 2.4.8.
@@ -1154,6 +1157,7 @@ AC_SUBST(X11_LDFLAGS)
AC_SUBST(COCOA_CFLAGS)
AC_SUBST(COCOA_LDFLAGS)
AC_SUBST(PDF_CFLAGS)
+AC_SUBST(PDF_LDFLAGS)
AC_SUBST(CONFIG_X11)
AC_SUBST(CONFIG_COCOA)
@@ -1179,6 +1183,7 @@ if test "$enable_cocoa" = "yes"; then
fi
AC_MSG_CHECKING(if compiler supports $STD_DEBUG_FLAGS)
+ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$STD_DEBUG_FLAGS"
AC_TRY_COMPILE([
int some_variable = 0;
@@ -1190,7 +1195,7 @@ AC_TRY_COMPILE([
CONFIG_CXXDIALECT=""
AC_MSG_RESULT(no)
])
-CXXFLAGS=""
+CXXFLAGS="$ac_save_CXXFLAGS"
AC_SUBST(CONFIG_CXXDIALECT)
AC_ARG_ENABLE(profile,
diff -up TeXmacs-1.99.2-src/src/makefile.in.conffix TeXmacs-1.99.2-src/src/makefile.in
--- TeXmacs-1.99.2-src/src/makefile.in.conffix 2014-06-07 10:40:55.000000000 -0600
+++ TeXmacs-1.99.2-src/src/makefile.in 2015-08-10 14:28:36.611505478 -0600
@@ -49,7 +49,7 @@ LDFLAGS = @LDFLAGS@ @CONFIG_BFLAGS@ @QT_
LDRT = @CONFIG_LDRT@
LDSTATIC = @CONFIG_BSTATIC@
LDSHARED = @CONFIG_BSHARED@
-LDPATH = @CONFIG_BPATH@
+LDPATH =
LDDL = @CONFIG_BDL@
LDX11 = @X11_LDFLAGS@
LDCOCOA = @COCOA_LDFLAGS@
@@ -63,6 +63,7 @@ LDFREETYPE = @FREETYPE_LDFLAGS@
LDICONV = @ICONV_LDFLAGS@
LDGUILE = @GUILE_LDFLAGS@
LDSPARKLE = @SPARKLE_LDFLAGS@
+LDPDF = @PDF_LDFLAGS@
AR = ar
ARFLAGS = -r
@@ -399,7 +400,7 @@ TEXMACS_objects := $(strip $(call uses,s
link_options:=-L$(tmsrc)/lib $(LDRT) -lm $(LDPATH) $(LDGUI) $(LDICONV) \
$(LDGUILE) $(LDAXEL) $(LDCAIRO) $(LDIMLIB2) $(LDSQLITE3) $(LDFREETYPE) \
- $(LDDL) $(LDSPARKLE)
+ $(LDDL) $(LDSPARKLE) $(LDPDF)
$(tmsrc)/bin/texmacs.bin: Objects/texmacs-$(link).bin
$(CP) $^ $@