[Gnash-commit] gnash ./ChangeLog macros/ghelp.m4 doc/omf.make

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/02/09 15:15:28

Modified files:
        .              : ChangeLog 
        macros         : ghelp.m4 
        doc            : omf.make 

Log message:
        * macros/ghelp.m4: Disable ghelp support by default. Use
        --enable-ghelp to turn it back on.
        * doc/omf.make: Don't try to install anything if GHELP isn't
        defined.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.112&tr2=1.113&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/ghelp.m4.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/omf.make.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.112 gnash/ChangeLog:1.113
--- gnash/ChangeLog:1.112       Thu Feb  9 15:11:39 2006
+++ gnash/ChangeLog     Thu Feb  9 15:15:28 2006
@@ -1,3 +1,10 @@
+2006-02-09  Rob Savoye  <address@hidden>
+
+       * macros/ghelp.m4: Disable ghelp support by default. Use
+       --enable-ghelp to turn it back on.
+       * doc/omf.make: Don't try to install anything if GHELP isn't
+       defined.
+
 2006-02-09 Sandro Santilli <address@hidden>
 
        * doc/C/Makefile.am: spaces => tab
@@ -12,6 +19,11 @@
        * testsuite/actionscript.all: add and fix up parseInt test cases
        also add some parseFloat test cases
 
+2006-02-08  Rob Savoye  <address@hidden>
+
+       * server/shm.cpp (exists): Move to be within the ENABLE_TESTING
+       block.
+
 2006-02-08  Rob Savoye  <address@hidden>
 
        * Makefile.am: Rearrange directories for SUBDIRS and
Index: gnash/doc/omf.make
diff -u gnash/doc/omf.make:1.5 gnash/doc/omf.make:1.6
--- gnash/doc/omf.make:1.5      Thu Feb  9 02:33:53 2006
+++ gnash/doc/omf.make  Thu Feb  9 15:15:28 2006
@@ -38,6 +38,7 @@
        touch omf_timestamp
 
 install-data-hook-omf:
+if GHELP
        $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
        for file in $(omffile); do \
          $(INSTALL_DATA) $(srcdir)/$$file.out 
$(DESTDIR)$(omf_dest_dir)/$$file; \
@@ -47,7 +48,7 @@
        else \
            echo "ERROR: you must be root to install scrollkeeper files!";\
        fi
-
+endif
 
 uninstall-local-omf:
        address@hidden file in $(omffile); do \
Index: gnash/macros/ghelp.m4
diff -u gnash/macros/ghelp.m4:1.4 gnash/macros/ghelp.m4:1.5
--- gnash/macros/ghelp.m4:1.4   Thu Feb  9 02:33:53 2006
+++ gnash/macros/ghelp.m4       Thu Feb  9 15:15:28 2006
@@ -17,12 +17,12 @@
 
 AC_DEFUN([GNASH_PATH_GHELP],
 [
-  AC_ARG_ENABLE(ghelp, [  --disable-ghelp            Disable support for the 
GNOME help system],
+  AC_ARG_ENABLE(ghelp, [  --enable-ghelp            Enable support for the 
GNOME help system],
   [case "${enableval}" in
     yes) ghelp=yes ;;
     no)  ghelp=no ;;
     *)   AC_MSG_ERROR([bad value ${enableval} for enable-ghelp option]) ;;
-  esac], ghelp=yes)
+  esac], ghelp=no)
 
   if test x"$ghelp" = x"yes" ; then
     AC_PATH_PROG(SCROLLKEEPER, scrollkeeper-config, [],