[Texmacs-dev] Fedora patch to config

[Orion Poplawski]

I just ran into an issue building the Fedora TeXmacs package for rawhide
(test version).  Turns out that TeXmacs' configure will overwrite the passed
in CXXFLAGS, which is bad, so I've fixed that.

We also have been carrying a fix that adds a PDF_LDFLAGS variable and sets
it to -lz.  The combined patch follows:

Index: configure.in
===================================================================
--- configure.in        (revision 9766)
+++ configure.in        (working copy)
@@ -601,6 +601,7 @@
 #--------------------------------------------------------------------
 
 AC_MSG_CHECKING(whether ... arguments behave correctly)
+ac_save_CXXFLAGS="$CXXFLAGS"
 if test -z "$GUILE_CFLAGS"; then
   CXXFLAGS="`$GUILE_CONFIG compile`"
 else
@@ -619,9 +620,10 @@
 ],[
   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`"
 else
@@ -641,7 +643,7 @@
   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"
@@ -1005,6 +1007,7 @@
 #        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.
@@ -1172,6 +1175,7 @@
 AC_SUBST(COCOA_CFLAGS)
 AC_SUBST(COCOA_LDFLAGS)
 AC_SUBST(PDF_CFLAGS)
+AC_SUBST(PDF_LDFLAGS)

 AC_SUBST(CONFIG_X11)
 AC_SUBST(CONFIG_COCOA)
@@ -1198,6 +1202,7 @@
 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;
@@ -1209,7 +1214,7 @@
     CONFIG_CXXDIALECT=""
     AC_MSG_RESULT(no)
 ])
-CXXFLAGS=""
+CXXFLAGS="$ac_save_CXXFLAGS"
 AC_SUBST(CONFIG_CXXDIALECT)

 AC_ARG_ENABLE(profile,
Index: src/makefile.in
===================================================================
--- src/makefile.in     (revision 9766)
+++ src/makefile.in     (working copy)
@@ -52,7 +52,7 @@
 LDRT = @CONFIG_LDRT@
 LDSTATIC = @CONFIG_BSTATIC@
 LDSHARED = @CONFIG_BSHARED@
-LDPATH = @CONFIG_BPATH@
+LDPATH =
 LDDL = @CONFIG_BDL@
 LDX11 = @X11_LDFLAGS@
 LDCOCOA = @COCOA_LDFLAGS@
@@ -66,6 +66,7 @@
 LDICONV = @ICONV_LDFLAGS@
 LDGUILE = @GUILE_LDFLAGS@
 LDSPARKLE = @SPARKLE_LDFLAGS@
+LDPDF = @PDF_LDFLAGS@

 AR = ar
 ARFLAGS = -r
@@ -427,7 +428,7 @@

 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) $^ $@