[Gnash-commit] [SCM] Gnash branch, master, updated. 011c29e10ae1377cf92d7202c84e407524c20f24

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  011c29e10ae1377cf92d7202c84e407524c20f24 (commit)
      from  39a65cc29f4915c6bdda444b1be7d22965735d1e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=011c29e10ae1377cf92d7202c84e407524c20f24


commit 011c29e10ae1377cf92d7202c84e407524c20f24
Author: Sandro Santilli <address@hidden>
Date:   Thu Dec 16 09:14:34 2010 +0100

    Add brackets around control flow constructs to make more readable

diff --git a/macros/docbook.m4 b/macros/docbook.m4
index 2db013e..72937f5 100644
--- a/macros/docbook.m4
+++ b/macros/docbook.m4
@@ -24,7 +24,7 @@ AC_DEFUN([GNASH_DOCBOOK], [
   esac], docbook=no)
 
   DB2X_VERSION=
-  if test x"$docbook" = x"yes"; then
+  if test x"$docbook" = x"yes"; then dnl## {
     dnl install-info is used to update entries in the dirs file, used by
     dnl info to find all of it files.
     AC_PATH_PROG(INSTALL_INFO, install-info, $PATH:/usr/sbin)
@@ -33,65 +33,74 @@ AC_DEFUN([GNASH_DOCBOOK], [
 
     docbook_styles=
     AC_ARG_WITH(docbook_styles, AC_HELP_STRING([--with-docbook-styles], 
[directory where Docbook stylesheets are]), with_docbook_styles=${withval})
-    if test x"${with_docbook_styles}" != x ; then
-      if test -f ${with_docbook_styles}/html/docbook.xsl ; then
+    if test x"${with_docbook_styles}" != x ; then dnl## {
+
+      if test -f ${with_docbook_styles}/html/docbook.xsl ; then dnl## {
         docbook_styles="`(cd ${with_docbook_styles}; pwd)`"
-      else
+      else dnl## }{
         AC_MSG_ERROR([${with_docbook_styles}/html directory doesn't contain 
docbook.xsl])
-      fi
-    else
+      fi dnl## }
+
+    else dnl## }{
       AC_CACHE_CHECK([for docbook styles path],[gnash_cv_path_docbook_styles],[
       dirlist="/usr/share/xml/docbook/stylesheet/nwalsh 
/usr/share/xml/docbook/stylesheet/nwalsh/current 
/usr/share/sgml/docbook/xsl-stylesheets 
/usr/local/share/sgml/docbook/xsl-stylesheets 
/opt/share/sgml/docbook/xsl-stylesheets 
/home/latest/share/sgml/docbook/xsl-stylesheets 
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh"
       for i in $dirlist; do
         if test -f $i/html/docbook.xsl; then
           gnash_cv_path_docbook_styles="`(cd $i; pwd)`"
-        break
+          break
         fi
       done
       ])
-      if test x$gnash_cv_path_docbook_styles != x; then
+
+      if test x$gnash_cv_path_docbook_styles != x; then dnl## {
         docbook_styles=$gnash_cv_path_docbook_styles
-      fi
-    fi
+      fi dnl## }
+
+    fi dnl## }
 
 
     AC_MSG_NOTICE([checking for other programs needed to process the DocBook 
files])
     AC_PATH_PROG(FOP, fop.sh, [],
        
[$PATH:/usr/local/fop-0.20.5/:/usr/fop-0.20.5/:/usr/local/fop:/usr/lib/java/fop])
-    if test x"$FOP" = x; then
+    if test x"$FOP" = x; then dnl## {
         AC_PATH_PROG(FOP, fop, [],
             
[$PATH:/usr/local/fop-0.20.5/:/usr/fop-0.20.5/:/usr/local/fop:/usr/lib/java/fop])
-    fi
-    if test x"$FOP" != x; then
+    fi dnl## }
+
+    if test x"$FOP" != x; then dnl## {
       dirlist="/usr /usr/lib/jre /usr/jre /opt/local/Java/JavaSDK 
~/ReQuest/jre $J2REDIR"
       JAVA=
       for i in $dirlist; do
-        if test -f $i/bin/java; then
+        if test -f $i/bin/java; then dnl## {
           version=`$i/bin/java -version 2>&1`
           dnl See if it's Sun Java
           tmp="`echo $version | grep -c "java version" `"
-          if test $tmp -gt 0; then
+          if test $tmp -gt 0; then dnl## {
             version=sun
             JAVA=$i/bin/java
             break;
-          fi
+          fi dnl## }
+
           dnl See if it's GCJ
           tmp="`echo $version | grep -c "java version" `"
-          if test $tmp -gt 0; then
+          if test $tmp -gt 0; then dnl## {
             AC_MSG_WARN([$i/bin/java not Sun version!])
             version=gcj
-          fi
-        fi
+          fi dnl## }
+
+        fi dnl## }
+
       done
 
       AC_MSG_CHECKING(for Sun java runtime)
-      if test x"$JAVA" = x; then
+      if test x"$JAVA" = x; then dnl## {
         AC_MSG_RESULT(not found)
         AC_MSG_WARN([You need to install Sun Java and the JAI toolkit to run 
fop])
-      else
+      else dnl## }{
         AC_MSG_RESULT([$JAVA])
-      fi
-    fi
+      fi dnl## }
+
+    fi dnl## }
 
     AC_PATH_PROG(PDFXMLTEX, pdfxmltex, [],
        [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
@@ -105,10 +114,10 @@ dnl       
[$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
     AC_PATH_PROG(DB2X_XSLTPROC, db2x_xsltproc, [],
      [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
 
-    if test x$DB2X_XSLTPROC = x; then
+    if test x$DB2X_XSLTPROC = x; then dnl## {
       AC_PATH_PROG(DB2X_XSLTPROC, db2x_xsltproc.pl, [],
          [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
-    fi
+    fi dnl## }
 
     dnl Find the programs we need to convert docbook into Texi for
     dnl making info pages. The first catagory are the wrapper
@@ -121,7 +130,7 @@ dnl         
[$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
     dnl support the encoding of entities, so we get massive warnings
     dnl about entities in included files we never heard about.
     scripts="db2x_docbook2texi docbook2texi docbook2texi.pl"
-    for i in $scripts; do
+    for i in $scripts; do dnl## {
       AC_PATH_PROG(DB2X_TEXI, $i, [], 
[$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
       if test x$DB2X_TEXI != x; then
         type="`file $DB2X_TEXI  | grep -ic " perl " 2>&1`"
@@ -131,7 +140,7 @@ dnl         
[$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
           DB2X_TEXI=
         fi
       fi
-    done
+    done dnl## }
 
     dnl These look for the seperate utilities used by the wrapper
     dnl scripts. If we don't find the wrappers, then we use the lower
@@ -169,9 +178,10 @@ dnl        
[$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
 
     AC_PATH_PROG(MAKEINFO, makeinfo, [], 
[$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
 
-    if test x"$XSLTPROC" = x -o x"$docbook_styles" = x ; then
+    if test x"$XSLTPROC" = x -o x"$docbook_styles" = x ; then 
       AC_MSG_WARN([You need to install xsltproc and docbook style sheets 
before HTML output can be generated])
     fi
+
     if test x"$DB2X_XSLTPROC" = x -o x"$DB2X_TEXIXML" = x  -o x"$DB2X_MANXML" 
= x -o x"$MAKEINFO" = x ; then
       AC_MSG_WARN([You need to install the docbook2X package before Texi 
output can be generated])
     fi
@@ -184,7 +194,8 @@ dnl         
[$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
     else
       AC_MSG_WARN([No suitable fop nor pdfxmltex, PDF format files can't be 
generated - hint: apt-get install xmltex fop])
     fi
-  fi
+
+  fi dnl## }
 
 dnl  AM_CONDITIONAL(HAVE_JAVA, [test x$JAVA != x])
   AM_CONDITIONAL(ENABLE_TEXI, [ test x"$DB2X_TEXI" != x -o x"$DB2X_TEXIXML" != 
x ])
@@ -202,11 +213,11 @@ 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)
 dnl docbook2texi (part of docbook2X 0.8.8)
-  if test x"${DB2X_TEXIXML}" != x; then
+  if test x"${DB2X_TEXIXML}" != x; then dnl## {
     db2x_version=`${DB2X_TEXIXML} --version | head -1 | sed -e 's/^.*docbook2X 
//' -e 's/).*$//' 2>&1`
     DB2X_VERSION="${db2x_version}"
     AC_SUBST(DB2X_VERSION)
-  fi
+  fi dnl## }
 
 dnl  AM_CONDITIONAL(NEW_DOCBOOK2X, [test "$db2x_version" = "0.8.5"])
   AC_SUBST(docbook_styles)

-----------------------------------------------------------------------

Summary of changes:
 macros/docbook.m4 |   73 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 42 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
Gnash