# HG changeset patch
# User diego
# Date 1280310461 0
# Node ID 12ef042165eb23a71db977fd80e3768697e04638
# Parent  6a701db99f5b4c94558399297cd407cd92049760
Simplify adding --catalogs option to xsltproc/xmllint command line.

diff -r 6a701db99f5b -r 12ef042165eb DOCS/xml/configure
--- a/DOCS/xml/configure	Wed Jul 28 08:38:45 2010 +0000
+++ b/DOCS/xml/configure	Wed Jul 28 09:47:41 2010 +0000
@@ -25,6 +25,7 @@
 
 if test -n "$catalog"; then
   echo "Found SGML catalog at $catalog"
+  catalog_opts=--catalogs
 else
   echo "No SGML catalog found."
 fi
@@ -167,11 +168,7 @@
 if xsltproc --version > /dev/null 2>&1; then
   if test -z "$fake_chunk_xsl"; then
     echo "Found xsltproc. If it works, it's probably the best choice."
-    if test -n "$catalog"; then
-      xsltcommand="xsltproc --catalogs -o \$\$1 \$\$2 \$\$3"
-    else
-      xsltcommand="xsltproc -o \$\$1 \$\$2 \$\$3"
-    fi
+    xsltcommand="xsltproc $catalog_opts -o \$\$1 \$\$2 \$\$3"
   else
     echo "Found xsltproc but no stylesheets on your system."
     echo "xsltproc is unusable without stylesheets."
@@ -182,11 +179,7 @@
 echo "Searching for XML checker..."
 if command -v xmllint > /dev/null 2>&1; then
   echo "Found xmllint"
-  if test -n "$catalog"; then
-    xmllint_command="xmllint --noout --noent --postvalid --catalogs \$*"
-  else
-    xmllint_command="xmllint --noout --noent --postvalid \$*"
-  fi
+    xmllint_command="xmllint --noout --noent --postvalid $catalog_opts \$*"
 else
   echo "Not found"
   xmllint_command=true