X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=f386b354ee5751a6c42e6236f075da7577256241;hb=2d367f855c3556166d24cf538d5c34d0ff596a2f;hp=a5132f027aa42fb0ddb122bc9672662bd592ec9e;hpb=2b1d153a60b9f8720bda74180d50a0aed2d02af2;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index a5132f0..f386b35 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -10,7 +10,7 @@
 AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
 [
     case $$1 in
-    i386-apple-darwin|powerpc-apple-darwin)
+    i386-apple-darwin)
         # By default, gcc on OS X will generate SSE
         # instructions, which need things 16-byte aligned,
         # but we don't 16-byte align things. Thus drop
@@ -755,7 +755,7 @@ AS_VAR_POPDEF([fp_func])dnl
 
 # FP_GEN_DOCBOOK_XML
 # ------------------
-# Generates a DocBook XML V4.2 document in conftest.xml.
+# Generates a DocBook XML V4.5 document in conftest.xml.
 #
 # It took a lot of experimentation to find a document that will cause
 # xsltproc to fail with an error code when the relevant
@@ -767,8 +767,8 @@ AC_DEFUN([FP_GEN_DOCBOOK_XML],
 [rm -f conftest.xml conftest-book.xml
 cat > conftest.xml << EOF
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [[
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [[
 <!ENTITY conftest-book SYSTEM "conftest-book.xml">
 ]]>
 <book id="test">
@@ -862,7 +862,7 @@ if test -n "$XmllintCmd"; then
     AC_MSG_RESULT([ok])
   else
     AC_MSG_RESULT([failed])
-    AC_MSG_WARN([cannot find a DTD for DocBook XML V4.2, you will not be able to validate your documentation])
+    AC_MSG_WARN([cannot find a DTD for DocBook XML V4.5, you will not be able to validate your documentation])
     AC_MSG_WARN([check your XML_CATALOG_FILES environment variable and/or /etc/xml/catalog])
   fi
   rm -rf conftest*
@@ -1266,7 +1266,7 @@ if test ! -f utils/ghc-pwd/ghc-pwd && test ! -f utils/ghc-pwd/ghc-pwd.exe; then
   rm -f *.hi
   rm -f ghc-pwd
   rm -f ghc-pwd.exe
-  "$WithGhc" -v0 --make ghc-pwd -o ghc-pwd
+  "$WithGhc" -v0 -no-user-package-conf --make ghc-pwd -o ghc-pwd
   cd ../..
 fi