[Gnash-commit] gnash ./ChangeLog ./configure.ac doc/C/Makefile...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/02/11 16:52:44

Modified files:
        .              : ChangeLog configure.ac 
        doc/C          : Makefile.am 
        macros         : docbook.m4 

Log message:
        * macros/docbook.m4: Extract and save the version of the Docbook2X
        tools, because there are two big differences in command line
        options depending which version you have.
        * configure.ac: Print the version of the Docbook2X tools, if
        --enable-docbook is specified.
        * doc/C/Makefile.am: Check the version of the Docbook2X tools when
        running db2x_texixml.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.123&tr2=1.124&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/docbook.m4.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.123 gnash/ChangeLog:1.124
--- gnash/ChangeLog:1.123       Sat Feb 11 15:18:22 2006
+++ gnash/ChangeLog     Sat Feb 11 16:52:44 2006
@@ -1,6 +1,14 @@
 2006-02-11  Rob Savoye  <address@hidden>
 
-       * macros/sdl.m4: Define HAVE_SDL_MICER_H if we have SDL Mixer
+       * macros/docbook.m4: Extract and save the version of the Docbook2X
+       tools, because there are two big differences in command line
+       options depending which version you have.
+       * configure.ac: Print the version of the Docbook2X tools, if
+       --enable-docbook is specified.
+       * doc/C/Makefile.am: Check the version of the Docbook2X tools when
+       running db2x_texixml.
+       
+       * macros/sdl.m4: Define HAVE_SDL_MIXER_H if we have SDL Mixer
        installed.
 
 2006-02-10  Rob Savoye  <address@hidden>
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.33 gnash/configure.ac:1.34
--- gnash/configure.ac:1.33     Sat Feb 11 01:57:02 2006
+++ gnash/configure.ac  Sat Feb 11 16:52:44 2006
@@ -415,6 +415,8 @@
     nogo=true
   else
     echo "        You have all the DocBook tools installed."
+    echo "        You have version $db2x_version of the DocBook2X tools."
+
   fi
 
 fi
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.9 gnash/doc/C/Makefile.am:1.10
--- gnash/doc/C/Makefile.am:1.9 Thu Feb  9 12:04:58 2006
+++ gnash/doc/C/Makefile.am     Sat Feb 11 16:52:44 2006
@@ -110,8 +110,12 @@
 if ENABLE_TEXI
        basefile=$(notdir $(basename $<)); \
        $(DB2X_XSLTPROC) -s texi $< --output $${basefile}.txml; \
-       $(DB2X_TEXIXML) --to-stdout $${basefile}.txml; \
-       sed -e '/setfilename/d' $${basefile}_manual_v*.texi > 
$${basefile}.texi; \
+       if test x"$(DB2X_VERSION)" = "0.8.5"; then \
+         $(DB2X_TEXIXML) --to-stdout $${basefile}.txml; \
+        sed -e '/setfilename/d' $${basefile}_manual_v*.texi > 
$${basefile}.texi; \
+       else\
+         $(DB2X_TEXIXML) --to-stdout $${basefile}.txml >  $${basefile}.texi ; \
+        fi
        $(RM) $${basefile}_manual_v*.texi
 else
        touch $@
Index: gnash/macros/docbook.m4
diff -u gnash/macros/docbook.m4:1.9 gnash/macros/docbook.m4:1.10
--- gnash/macros/docbook.m4:1.9 Thu Feb  9 02:33:53 2006
+++ gnash/macros/docbook.m4     Sat Feb 11 16:52:44 2006
@@ -111,6 +111,19 @@
   AM_CONDITIONAL(ENABLE_MAN, [ test x"$DB2X_XSLTPROC" != x -a x"$DB2X_MANXML" 
!= x ])
   AC_SUBST(JAVA)
 
+dnl See which version of the DocBook2x tools we have, because it
+dnl forces a command line change in the Makefile.
+
+dnl db2x_texixml (part of docbook2X 0.8.3)
+dnl db2x_texixml (part of docbook2X 0.8.5)
+  DB2X_VERSION=""
+  if test x"${DB2X_TEXIXML}" != x; then
+    db2x_version=`${DB2X_TEXIXML} --version | head -1 | sed -e 's/^.*docbook2X 
//' -e 's/).*$//'`
+    DB2X_VERSION="${db2x_version}"
+    AC_SUBST(DB2X_VERSION)
+  fi
+
+  AM_CONDITIONAL(NEW_DOCBOOK2X, [test $db2x_version = "0.8.5"])
   AC_SUBST(docbook_styles)
 ])