X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.in;h=2551da6bd8f0854ba75ddf3e0ca9e88dece06a5e;hb=477b1f4fcc8ed1396a737dd5d11056c1f076f934;hp=6b91132f2b3b9a5ea56aa0a81eb23994c28f44a8;hpb=8562ce89152234b39c54eeec81b0abcf0e08d5cf;p=ghc-hetmet.git

diff --git a/configure.in b/configure.in
index 6b91132..2551da6 100644
--- a/configure.in
+++ b/configure.in
@@ -326,7 +326,11 @@ if test "$GHC" = ""; then
   AC_PATH_PROG(GHC,ghc)
 fi
 if test "$GHC" != ""; then
-  FPTOOLS_GHC_VERSION
+  FPTOOLS_GHC_VERSION([GhcVersion], [GhcMajVersion], [GhcMinVersion], [GhcPatchLevel])dnl
+  AC_SUBST(GhcVersion)dnl
+  AC_SUBST(GhcMajVersion)dnl
+  AC_SUBST(GhcMinVersion)dnl
+  AC_SUBST(GhcPatchLevel)dnl
 fi
 
 AC_PATH_PROGS(NHC,nhc nhc98)
@@ -497,7 +501,7 @@ AC_PATH_PROGS(CompressCmd,gzip compress,gzip)
 dnl ** check for jade/openjade & determine a working catalog
 AC_PATH_PROGS(JadeCmd,openjade jade,jade)
 FPTOOLS_DOCBOOK_CATALOG(Catalog, $JadeCmd, docs/fptools-both.dsl, 
-                        /usr/share/sgml/CATALOG.docbkdsl $hardtop/glafp-utils/docbook/CATALOG*)
+                        /etc/sgml.catalog /usr/share/sgml/CATALOG.docbkdsl $hardtop/glafp-utils/docbook/CATALOG*)
 if test -z "$Catalog"; then
   AC_MSG_RESULT([Warning: You will not be able to build the documentation.])
 fi