X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=d5a6cd8b6f4def22ff16e2a1e93ff6e063efd902;hb=f220cc512fdc7f885e60d656ba7ba0d9f2e67611;hp=3146d380f0f8dfad384fe5c3871034467884447f;hpb=b218afda6760db984a12275291de686c5cbe3e72;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index 3146d38..d5a6cd8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -205,7 +205,9 @@ struct nlist xYzzY1[] = {{"xYzzY1", 0},{0}};
 struct nlist xYzzY2[] = {{"_xYzzY2", 0},{0}};
 #endif
 
-int main()
+int main(argc, argv)
+int argc;
+char **argv;
 {
 #ifdef HAVE_NLIST_H
     if(nlist(argv[0], xYzzY1) == 0 && xYzzY1[0].n_value != 0)
@@ -493,8 +495,8 @@ AC_CACHE_CHECK([whether $fp_prog_ar_raw supports -input], [fp_cv_prog_ar_support
 if test $fp_prog_ar_is_gnu = no; then
   rm -f conftest*
   touch conftest.lst
-  if $fp_prog_ar_raw $fp_prog_ar_args conftest.a -input conftest.lst > /dev/null 2> /dev/null; then
-    fp_cv_prog_ar_supports_input=yes
+  if FP_EVAL_STDERR([$fp_prog_ar_raw $fp_prog_ar_args conftest.a -input conftest.lst]) >/dev/null; then
+    test -s conftest.err || fp_cv_prog_ar_supports_input=yes
   fi
   rm -f conftest*
 fi])
@@ -910,14 +912,66 @@ fi
 ])# FP_CHECK_DOCBOOK_DTD
 
 
+# FP_GEN_FO
+# ------------------
+# Generates a formatting objects document in conftest.fo.
+AC_DEFUN([FP_GEN_FO],
+[rm -f conftest.fo
+cat > conftest.fo << EOF
+<?xml version="1.0"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+  <fo:layout-master-set>
+    <fo:simple-page-master master-name="blank">
+      <fo:region-body/>
+    </fo:simple-page-master>
+  </fo:layout-master-set>
+  <fo:page-sequence master-reference="blank">
+    <fo:flow flow-name="xsl-region-body">
+      <fo:block>
+        Test!
+      </fo:block>
+    </fo:flow>
+  </fo:page-sequence>
+</fo:root>
+EOF
+]) # FP_GEN_FO
+
+
+# FP_PROG_FOP
+# -----------
+# Set the output variable 'FopCmd' to the first working 'fop' in the current
+# 'PATH'. Note that /usr/bin/fop is broken in SuSE 9.1 (unpatched), so try
+# /usr/share/fop/fop.sh in that case (or no 'fop'), too.
+AC_DEFUN([FP_PROG_FOP],
+[AC_PATH_PROGS([FopCmd1], [fop])
+if test -n "$FopCmd1"; then
+  AC_CACHE_CHECK([for $FopCmd1 usability], [fp_cv_fop_usability],
+    [FP_GEN_FO
+    if "$FopCmd1" -fo conftest.fo -ps conftest.ps > /dev/null 2>&1; then
+      fp_cv_fop_usability=yes
+    else
+      fp_cv_fop_usability=no
+    fi
+    rm -rf conftest*])
+  if test x"$fp_cv_fop_usability" = xyes; then
+     FopCmd=$FopCmd1
+  fi
+fi
+if test -z "$FopCmd"; then
+  AC_PATH_PROGS([FopCmd2], [fop.sh], , [/usr/share/fop])
+  FopCmd=$FopCmd2
+fi
+AC_SUBST([FopCmd])
+])# FP_PROG_FOP
+
+
 # FP_PROG_FO_PROCESSOR
 # --------------------
 # Try to find an FO processor. PassiveTeX output is sometimes a bit strange, so
-# try FOP first.  Furthermore, /usr/bin/fop is broken in SuSE 9.1, so try the
-# "real" fop.sh first. Sets the output variables FopCmd, XmltexCmd, DvipsCmd,
-# and PdfxmltexCmd.
+# try FOP first. Sets the output variables FopCmd, XmltexCmd, DvipsCmd, and
+# PdfxmltexCmd.
 AC_DEFUN([FP_PROG_FO_PROCESSOR],
-[AC_PATH_PROGS([FopCmd], [fop.sh fop], [], [$PATH:/usr/share/fop])
+[AC_REQUIRE([FP_PROG_FOP])
 AC_PATH_PROG([XmltexCmd], [xmltex])
 AC_PATH_PROG([DvipsCmd], [dvips])
 if test -z "$FopCmd"; then