[Gnash-commit] gnash ChangeLog configure.ac [release_0_8_2_rc1]

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_8_2_rc1
Changes by:     Sandro Santilli <strk>  08/02/25 11:13:07

Modified files:
        .              : ChangeLog configure.ac 

Log message:
        don't complain if high-level scripts for doc generations aren't 
available
        as long as lower-level ones are. 
        Fixes bug reported in comment #12 of bug #22343.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.5711.2.21&r2=1.5711.2.22
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_8_2_rc1&r1=1.479.2.3&r2=1.479.2.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5711.2.21
retrieving revision 1.5711.2.22
diff -u -b -r1.5711.2.21 -r1.5711.2.22
--- ChangeLog   25 Feb 2008 08:37:59 -0000      1.5711.2.21
+++ ChangeLog   25 Feb 2008 11:13:05 -0000      1.5711.2.22
@@ -1,5 +1,8 @@
 2008-02-25 Sandro Santilli <address@hidden>
 
+       * configure.ac: don't complain if high-level scripts for doc
+         generations aren't available as long as lower-level ones are.
+         Fixes bug reported in comment #12 of bug #22343.
        * testsuite/libamf.all/test_lc.cpp: don't assume (void*) is 32-bit,
          remove unneeded casts, fix missing return warnings. Should fix bug
          #22378.

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.479.2.3
retrieving revision 1.479.2.4
diff -u -b -r1.479.2.3 -r1.479.2.4
--- configure.ac        22 Feb 2008 14:16:32 -0000      1.479.2.3
+++ configure.ac        25 Feb 2008 11:13:06 -0000      1.479.2.4
@@ -2451,13 +2451,24 @@
 fi
 
 if test x"$docbook" = x"yes"; then
-  if test x"$DB2X_TEXI" = x -o x"$MAKEINFO" = x -o x"$DB2X_MAN" = x; then
+  if test x"$MAKEINFO" = x; then
+    echo "        ERROR: no makeinfo tools installed!"
+    echo "               Either install it from 
http://www.gnu.org/software/texinfo/";
+    echo "               or .deb users: apt-get install texinfo"
+    echo "               or configure without --enable-docbook"
+    nogo=true
+  fi
+  dnl low-level tools
+  if test x"$DB2X_TEXIXML" = x -o x"$DB2X_MANXML" = x -o x"$DB2X_XSLTPROC" = 
x; then
+    dnl high-level tools
+    if test x"${DB2X_TEXI}" = x -o x"${DB2X_MAN}" = x; then
     echo "        ERROR: No DocBook2X tools installed!"
     echo "               Either install it from 
http://docbook2x.sourceforge.net";
     echo "               or .deb users: apt-get install docbook docbook2x 
docbook-utils"
     echo "                              docbook-xml docbook-xsl texinfo 
xsltproc"
     echo "               or configure without --enable-docbook"
     nogo=true
+    fi
   else
     echo "        You have version $db2x_version of the DocBook2X tools."
   fi