Fix configuration for docbook backend and add detection of xlstproc. (Rafael García)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27389 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/configure.py b/lib/configure.py
index 3e648819e3ce8d4fe78fa0964c13bf9684ccc786..993c7cf15c1aab46e031945ccd30c81cb9f70a2c 100644 (file)
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -550,13 +550,15 @@ def checkConverterEntries():
 
 def checkDocBook():
     ''' Check docbook '''
-    path, DOCBOOK = checkProg('SGML-tools 2.x (DocBook) or db2x scripts', ['sgmltools', 'db2dvi'],
+    path, DOCBOOK = checkProg('SGML-tools 2.x (DocBook), db2x scripts or xsltproc', ['sgmltools', 'db2dvi', 'xsltproc'],
         rc_entry = [
             r'''\converter docbook    dvi        "sgmltools -b dvi $$i"        ""
 \converter docbook    html       "sgmltools -b html $$i"       ""''',
             r'''\converter docbook    dvi        "db2dvi $$i"  ""
 \converter docbook    html       "db2html $$i" ""''',
             r'''\converter docbook    dvi        ""    ""
+\converter docbook    html       "" ""''',
+            r'''\converter docbook    dvi        ""    ""
 \converter docbook    html       ""    ""'''])
     #
     if DOCBOOK != '':
@@ -686,8 +688,7 @@ def checkLatexConfig(check_config, bool_docbook):
         if not os.path.isfile( 'chkconfig.ltx' ):
             shutil.copyfile( os.path.join(srcdir, 'chkconfig.ltx'), 'chkconfig.ltx' )
             rmcopy = True
-        writeToFile('wrap_chkconfig.ltx', '%s\n%s\n\\input{chkconfig.ltx}\n',
-            docbook_cmd)
+        writeToFile('wrap_chkconfig.ltx', '%s\n\\input{chkconfig.ltx}\n' % docbook_cmd)
         # Construct the list of classes to test for.
         # build the list of available layout files and convert it to commands
         # for chkconfig.ltx

diff --git a/status.16x b/status.16x
index 79eab0492dcbbbf75e613fe17fd848605d358d85..601406f6f206e022907e1d3fe21618b4a318fc61 100644 (file)
--- a/status.16x
+++ b/status.16x
@@ -73,4 +73,5 @@ What's new
 
 * BUILD/INSTALLATION
 
+- Fix configuration for docbook backend and add detection of xlstproc.