[project @ 2002-02-13 19:42:38 by sof]

FPTOOLS_DOCBOOK_CATALOG: check whether the SGML_CATALOG_FILES env var is
defined. If it is, treat it as gospel.

diff --git a/aclocal.m4 b/aclocal.m4
index 7dc2e4d..12c5a42 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.94 2002/02/13 11:51:40 simonmar Exp $
+dnl $Id: aclocal.m4,v 1.95 2002/02/13 19:42:38 sof Exp $
 dnl 
 dnl Extra autoconf macros for the Glasgow fptools
 dnl
@@ -1001,13 +1001,18 @@ Test.
 </Article>
 EOF
 fptools_cv_sgml_catalog=no
-for fptools_catalog in $4; do
-  ac_try="$2 -t rtf -d $3#print -c $fptools_catalog conftest.sgml"
-  if AC_TRY_EVAL(ac_try); then
-    fptools_cv_sgml_catalog=[$]fptools_catalog
-    break
-  fi
-done
+if test -z "$SGML_CATALOG_FILES" ; then
+ for fptools_catalog in $4; do
+   ac_try="$2 -t rtf -d $3#print -c $fptools_catalog conftest.sgml"
+   if AC_TRY_EVAL(ac_try); then
+     fptools_cv_sgml_catalog=[$]fptools_catalog
+     break
+   fi
+ done
+else
+# If the env var SGML_CATALOG_FILES is defined, assume things are cool.
+  fptools_cv_sgml_catalog="yes"
+fi
 ])
 rm -rf conftest*
 if test $fptools_cv_sgml_catalog != "no"; then

diff --git a/configure.in b/configure.in
index b8bc441..38438bc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -617,6 +617,9 @@ if test -z "$Catalog"; then
   AC_MSG_RESULT([Warning: You will not be able to build the documentation.])
 fi
 case $Catalog in
+   yes) # assume it is provided by other means (e.g., SGML_CATALOG_FILES env var).
+        Catalog=
+       ;;
    glafp*) 
        case $HostOS_CPP in
           mingw32)