[Gnash-commit] gnash ./ChangeLog ./configure.ac doc/omf.make d...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/01/28 23:08:34

Modified files:
        .              : ChangeLog configure.ac 
        doc            : omf.make 
        doc/C          : Makefile.am 
        macros         : docbook.m4 
Added files:
        macros         : ghelp.m4 

Log message:
        * doc/omf.make (install-data-hook-omf): Only install if you are
        root, as this requires writing to system directories.
        * configure.ac: Link the doc/C/images directory to the build
        directory so we can find images when producing output files. Check
        state of DocBook when it's enabled.
        * macros/docbook.m4: Add path to stylesheets for Ubuntu. Look for
        fop.sh, and the DocBook2X conversion tools. Make DocBook optional,
        use --enable-docbook to enable. When disableed, you can't build
        any of the docs.
        * macros/ghelp.m4: Check for Scrollkeeper tools. Using GNOME Help
        is disabled by default. Use --enable-ghelp to enable.
        * doc/C/Makefile.am: Use variables defined by configure for all
        the conversion tools.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/omf.make.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/Makefile.am.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/docbook.m4.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/ghelp.m4?rev=1.1

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.46 gnash/ChangeLog:1.47
--- gnash/ChangeLog:1.46        Sat Jan 28 01:14:33 2006
+++ gnash/ChangeLog     Sat Jan 28 23:08:34 2006
@@ -1,3 +1,19 @@
+2006-01-28  Rob Savoye  <address@hidden>
+
+       * doc/omf.make (install-data-hook-omf): Only install if you are
+       root, as this requires writing to system directories.
+       * configure.ac: Link the doc/C/images directory to the build
+       directory so we can find images when producing output files. Check
+       state of DocBook when it's enabled.
+       * macros/docbook.m4: Add path to stylesheets for Ubuntu. Look for
+       fop.sh, and the DocBook2X conversion tools. Make DocBook optional,
+       use --enable-docbook to enable. When disableed, you can't build
+       any of the docs.
+       * macros/ghelp.m4: Check for Scrollkeeper tools. Using GNOME Help
+       is disabled by default. Use --enable-ghelp to enable.
+       * doc/C/Makefile.am: Use variables defined by configure for all
+       the conversion tools.
+
 2006-01-27  Rob Savoye  <address@hidden>
 
        * plugin/player.cpp: Use GLinitialized instead of
@@ -26,7 +42,7 @@
        * server/xml.h, xml.cpp: Include config.h as generated
        by configue if it exists.
        * configure.ac: Enable test for pthread.h and libpthread. Don't
-       look for Vorbis, the OGG tests aer enough.
+       look for Vorbis, the OGG tests are enough.
        * server/Movie.cpp, Sprite.cpp, impl.cpp, array.cpp: Include
        pthread.h to get around a data type definition problem on
        NetBSD. This seems to be required when using STL containers on
@@ -38,7 +54,7 @@
        * macros/jpeg.m4: Use mad.m4 as a template and rewrite to be
        more portable.
        * macros/sdl.m4: Look for SDL specific directory before and after
-       the include or lib sinc some platforms install these differently.
+       the include or lib since some platforms install these differently.
        * macros/pthreads.m4: Look for POSIX Thread support. This turns
        out to be very messy with NetBSD, as the old version is also
        installed, and we have to link with the right one for any
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.23 gnash/configure.ac:1.24
--- gnash/configure.ac:1.23     Sat Jan 28 17:29:14 2006
+++ gnash/configure.ac  Sat Jan 28 23:08:34 2006
@@ -98,15 +98,6 @@
 AM_CONDITIONAL(HTTP, test x$http = xtrue)
 
 dnl Where are the Docbook stylesheets ?
-AC_DOCBOOK_STYLES
-AC_ARG_WITH(docbook, [  --with-docbook=DIR      specify the path to the Docbook
-stylesheets],
-[case "${withval}" in
-  yes) ;;
-  no)  docbook_styles=;;
-  *)   docbook_styles=${withval};;
-esac])
-
 AC_PATH_FIREFOX
 
 AC_PROG_CC
@@ -135,7 +126,8 @@
 AM_PATH_SDL_MIXER
 AM_PATH_OPENGL
 GNASH_PATH_PTHREADS
-
+GNASH_PATH_GHELP
+GNASH_DOCBOOK
 AC_PROG_LIBTOOL
 
 dnl Define winsock if we're on windows. We could do something complicated,
@@ -144,6 +136,8 @@
   AC_DEFINE(HAVE_WINSOCK,1,[This is defined is we are on Win32])
 fi
 
+AC_CONFIG_LINKS(doc/C/images)
+
 AC_OUTPUT(Makefile
 libbase/Makefile
 libgeometry/Makefile
@@ -209,11 +203,22 @@
   echo "        Firefox plugin disabled"
 fi
 
+if test x"$ghelp" = x"yes"; then
+  echo "        GNOME help enabled"
+else
+  echo "        GNOME help disabled (default)"
+fi
+
 echo ""
 echo "Configured paths for ${build} are:"
 
-if test x"$docbook_styles" != x; then
-  echo "        Docbook styles sheets in $docbook_styles"
+if test x"$docbook" = x"yes"; then
+  echo "        DocBook document processing enabled"
+  if test x"$docbook_styles" != x; then
+    echo "        Docbook styles sheets in $docbook_styles"
+  fi
+else
+  echo "        DocBook document processing disabled (default)"
 fi
 
 # set a variable if we shouldn't continue. This way we can print
@@ -359,6 +364,44 @@
   fi
 fi
 
+if test x"$docbook" = x"yes"; then
+  if test x"$DB2X_XSLTPROC" = x -o x"$DB2X_TEXIXML" = x -o x"$MAKEINFO" = x -o 
x"$XSLTPROC" = x; then
+    echo "ERROR: No DocBook tools installed!\
+ docbook, docbook-xml, docbook2Xm docbook-utils, docbook-xsl (using apt-get or 
yum)."
+    nogo=true
+  else
+    echo "        You have all the DocBook tools installed."
+  fi
+
+  if test x"$JAVA" = x; then
+    echo "ERROR: JAVA not installed!.\
+ You need Sun Java to run the fop processor to produce PDF output\
+ from XML Docbook files."
+    nogo=true
+  else
+    java=`dirname $JAVA`
+    java=`dirname $java`
+    if test ${#JAVA_HOME} = 0; then
+      echo "        Fop requires you to set the JAVA_HOME environment\
+ variable to the path to your JAVA runtime. For this machine, this\
+ value is likely to be JAVA_HOME=$java."
+      export JAVA_HOME=$java
+    fi
+dnl     if test ${#CLASSPATH} = 0; then
+dnl       echo "        Fop requires you to set the CLASSPATH environment\
+dnl  variable to the path to your JAI (Java Advanced Imaging). For this \
+dnl  machine, this value is likely to be CLASSPATH=$java."
+dnl       export CLASSPATH=$java 
+dnl     else
+dnl       tmp=`echo $CLASSPATH | grep -c "$java" 2>/dev/null`
+dnl       if test $tmp -gt 0; then
+dnl         echo "WARNING: You probably need to add $java to your CLASSPATH."
+dnl       fi
+dnl      fi
+  fi
+fi
+
+
 # If anything critical is missing, don't bother to continue
 if test x"$nogo" = x"true"; then
 echo ""
Index: gnash/doc/C/Makefile.am
diff -u gnash/doc/C/Makefile.am:1.2 gnash/doc/C/Makefile.am:1.3
--- gnash/doc/C/Makefile.am:1.2 Thu Jan 19 23:50:11 2006
+++ gnash/doc/C/Makefile.am     Sat Jan 28 23:08:34 2006
@@ -17,6 +17,7 @@
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
+# Building a PDF using Apache FOP only works with fop-0.20.5 for now.
 include $(top_srcdir)/doc/xmldocs.make
 
 STYLESDIR = @docbook_styles@
@@ -46,22 +47,60 @@
 
 .xml.html:
        @echo "Making HTML from XML source..."
-       @xsltproc --output $@ --nonet $(STYLESDIR)/html/docbook.xsl $<
+       @if test x"$(XSLTPROC)" != x; then \
+         $(XSLTPROC) --output $@ --nonet $(STYLESDIR)/html/docbook.xsl $< ; \
+       else \
+         echo "You need to install the xsltproc package"; \
+       fi
 
 .xml.pdf:
        @echo "Making PDF from XML source..."
-       @fop.sh -xsl $(STYLESDIR)/fo/docbook.xsl -xml $< -pdf $@
+       @if test x"$(FOP)" != x; then \
+         $(FOP) -xsl $(STYLESDIR)/fo/docbook.xsl -xml $< -pdf $@; \
+       fi
 
 .xml.texi:
-       db2x_xsltproc -s texi $(srcdir)/gnash.xml -o gnash.txml
-       db2x_texixml gnash.txml
-       mv gnash_manual_v*.texi gnash.texi
+       @echo "Making Texinfo from XML source..."
+       @if test x"$(DB2X_XSLTPROC)" != x -a x"$(DB2X_TEXIXML)" != x; then \
+         $(DB2X_XSLTPROC) -s texi $(srcdir)/gnash.xml -o gnash.txml; \
+         $(DB2X_TEXIXML) gnash.txml; \
+       fi
        address@hidden(RM) gnash.txml
 
 .texi.info:
-       makeinfo --force gnash.texi
-       mv gnash_manual_v*.info gnash.info
+       @echo "Making INFO from Texinfo source..."
+       @if test x"$(MAKEINFO)" != x; then \
+         $(MAKEINFO) --force gnash.texi; \
+       else \
+         echo "You need to install the texinfo package"; \
+       fi
        address@hidden(RM) gnash.texi
+#      mv gnash_manual_v*.info gnash.info
+
+builddocs:
+       @echo "Making HTML from XML source..."
+       @if test x"$(XSLTPROC)" != x; then \
+         $(XSLTPROC) --output gnash.html --nonet $(STYLESDIR)/html/docbook.xsl 
$(srcdir)/gnash.xml ; \
+       else \
+         echo "You need to install the xsltproc package"; \
+       fi
+       @echo "Making PDF from XML source..."
+       @if test x"$(FOP)" != x; then \
+         $(FOP) -xsl $(STYLESDIR)/fo/docbook.xsl -xml $(srcdir)/gnash.xml -pdf 
gnash.pdf; \
+       fi
+       @echo "Making Texinfo from XML source..."
+       @echo "Making Texinfo from XML source..."
+       @if test x"$(DB2X_XSLTPROC)" != x -a x"$(DB2X_TEXIXML)" != x; then \
+         $(DB2X_XSLTPROC) -s texi $(srcdir)/gnash.xml -o gnash.txml; \
+         $(DB2X_TEXIXML) gnash.txml; \
+       fi
+       address@hidden(RM) gnash.txml
+       @echo "Making INFO from Texinfo source..."
+       @if test x"$(MAKEINFO)" != x; then \
+         $(MAKEINFO) --force gnash.texi; \
+       else \
+         echo "You need to install the texinfo package"; \
+       fi
 
 dist-hook: app-dist-hook
 
@@ -84,9 +123,10 @@
        gnash.mxml \
        omf_timestamp
 
+#      @xsltproc --output pgd.1 --nonet $(STYLESDIR)/manpages/docbook.xsl 
$(srcdir)/gnash-man.xml
 gnash.1: gnash-man.xml
        @echo "Making man pages from XML source..."
-#      @xsltproc --output pgd.1 --nonet $(STYLESDIR)/manpages/docbook.xsl 
$(srcdir)/gnash-man.xml
+       @if test x"$(DB2X_XSLTPROC)" != x -a x"$(DB2X_MANXML)" != x; then \
        db2x_xsltproc -s man $(srcdir)/gnash-man.xml -o gnash.mxml
        db2x_manxml gnash.mxml
        address@hidden(RM) gnash.mxml
Index: gnash/doc/omf.make
diff -u gnash/doc/omf.make:1.1 gnash/doc/omf.make:1.2
--- gnash/doc/omf.make:1.1      Tue Dec 20 20:52:15 2005
+++ gnash/doc/omf.make  Sat Jan 28 23:08:34 2006
@@ -32,17 +32,25 @@
 omf: omf_timestamp
 
 omf_timestamp: $(omffile)
-       -for file in $(omffile); do \
-         scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file 
$(srcdir)/$$file.out; \
-       done
+       address@hidden test x"$(GHELP)" = x"yes"; then
+         for file in $(omffile); do \
+           $(SCROLLKEEPER-PREINSTALL) $(docdir)/$(docname).xml 
$(srcdir)/$$file $(srcdir)/$$file.out; \
+         done; \
+       fi
        touch omf_timestamp
 
 install-data-hook-omf:
-       $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
-       for file in $(omffile); do \
-               $(INSTALL_DATA) $(srcdir)/$$file.out 
$(DESTDIR)$(omf_dest_dir)/$$file; \
-       done
-       -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o 
$(DESTDIR)$(omf_dest_dir)
+       address@hidden test x"$(GHELP)" = x"yes"; then \
+         if test x"$(USER)" != x"root" ; then \
+           echo "ERROR: you must be root to install scrollkeeper files!";\
+           exit;\
+         fi;\
+         $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir);\
+         for file in $(omffile); do \
+           $(INSTALL_DATA) $(srcdir)/$$file.out 
$(DESTDIR)$(omf_dest_dir)/$$file; \
+         done; \
+         $(SCROLL-UPDATE) -p $(scrollkeeper_localstate_dir) -o 
$(DESTDIR)$(omf_dest_dir); \
+       fi
 
 uninstall-local-omf:
        -for file in $(srcdir)/*.omf; do \
@@ -50,4 +58,4 @@
                rm -f $(omf_dest_dir)/$$basefile; \
        done
        -rmdir $(omf_dest_dir)
-       -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
+       -$(SCROLLKEEPER-UPDATE) -p $(scrollkeeper_localstate_dir)
Index: gnash/macros/docbook.m4
diff -u gnash/macros/docbook.m4:1.4 gnash/macros/docbook.m4:1.5
--- gnash/macros/docbook.m4:1.4 Thu Jan 19 23:50:11 2006
+++ gnash/macros/docbook.m4     Sat Jan 28 23:08:34 2006
@@ -16,16 +16,96 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-AC_DEFUN([AC_DOCBOOK_STYLES], [
-  dirlist="/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
-         docbook_styles=`(cd $i; pwd)`
-         break
-       fi
-  done
+AC_DEFUN([GNASH_DOCBOOK], [
 
-dnl FIXME: Make sure fop.sh exists too!
+  AC_ARG_ENABLE(docbook, [  --enable-docbook            Enable support for the 
GNOME help system],
+  [case "${enableval}" in
+    yes) docbook=yes ;;
+    no)  docbook=no ;;
+    *)   AC_MSG_ERROR([bad value ${enableval} for enable-docbook option]) ;;
+  esac], docbook=no)
+
+  if test x"$docbook" = x"yes"; then
+    AC_ARG_WITH(docbook_styles, [  --with-docbook-styles  directory where 
Docbook stylesheets are], with_docbook_styles=${withval})
+    AC_CACHE_VAL(ac_cv_path_docbook_styles,[
+    if test x"${with_docbook_styles}" != x ; then
+      if test -f ${with_docbook_styles}/html/docbook.xsl ; then
+        ac_cv_path_docbook_styles=`(cd ${with_docbook_styles}; pwd)`
+      else
+        AC_MSG_ERROR([${with_docbook_styles} directory doesn't contain 
docbook.xsl])
+      fi
+    fi
+    ])
+
+    dirlist="/usr/share/xml/docbook/stylesheet/nwalsh 
/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
+        docbook_styles=`(cd $i; pwd)`
+      break
+      fi
+    done
+
+    AC_MSG_NOTICE([checking for other programs needed to process the DocBook 
files])
+    AC_PATH_PROG(FOP, fop.sh, [FOP=""],
+       
[$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
+      AC_MSG_WARN(No fop.sh found! PDF format files can't be generated)
+    fi
+
+    dirlist="/usr/lib/jre /usr/jre /opt/local/Java/JavaSDK ~/ReQuest/jre"
+    JAVA=""
+    for i in $dirlist; do
+      if test -f $i/bin/java; then
+       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
+         version=sun
+         JAVA=$i/bin/java
+         break;
+       fi
+       dnl See if it's GCJ
+       tmp=`echo $version | grep -c "java version" `
+       if test $tmp -gt 0; then
+         AC_MSG_WARN([$i/bin/java not Sun version!])
+         version=gcj
+       fi
+      fi
+    done
+
+    AC_MSG_CHECKING(for Sun java runtime)
+    if test x"$JAVA" = x; then
+      AC_MSG_RESULT(not found)
+      AC_MSG_WARN([You need to install Sun Java and the JAI toolkit to run 
fop])
+    else
+      AC_MSG_RESULT($JAVA)
+    fi
+
+    AC_PATH_PROG(XSLTPROC, xsltproc, [XSLTPROC=""],
+       [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
+
+    AC_PATH_PROG(DB2X_XSLTPROC, db2x_xsltproc, [DB2X_XSLTPROC=""],
+       [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
+
+    AC_PATH_PROG(DB2X_TEXIXML, db2x_texixml, [DB2X_TEXIXML=""],
+       [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
+
+    AC_PATH_PROG(DB2X_MANXML, db2x_manxml, [DB2X_MANXML=""],
+       [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
+
+    AC_PATH_PROG(MAKEINFO, makeinfo, [MAKEINFO=""],
+       [$PATH:/usr/bin:/usr/bin/X11:/usr/local/X11/bin])
+
+    if test x"$XSLTPROC" = x; then
+      AC_MSG_WARN([You need to install xsltproc before HTML output can be 
generated])
+    fi
+    if test x"$DB2X_XSLTPROC" = x -o x"$DB2X_TEXIXML" = x -o x"$MAKEINFO" = x; 
then
+      AC_MSG_WARN([You need to install the docbook2X package before Texi 
output can be generated])
+    fi
+  fi
+
+  AM_CONDITIONAL(HAVE_JAVA, [test x$JAVA != x])
+  AC_SUBST(JAVA)
 
   AC_SUBST(docbook_styles)
 ])