[Gnash-commit] gnash ./ChangeLog ./Makefile.am ./Makefile.in ....

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     05/12/22 05:11:47

Modified files:
        .              : ChangeLog Makefile.am Makefile.in configure 
        macros         : firefox.m4 

Log message:
        Tweak how the conditional for the plugin is setup, so if the mozilla
        development package isn't installed, then only build the standalone 
client.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.am.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/firefox.m4.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.6 gnash/ChangeLog:1.7
--- gnash/ChangeLog:1.6 Thu Dec 22 04:56:55 2005
+++ gnash/ChangeLog     Thu Dec 22 05:11:47 2005
@@ -4,7 +4,7 @@
        doesn't exist, look for mozilla-config. If neither exists, the
        plugin won't be built as the mozilla development headers and
        libraries aren't installed.
-       * Makefile.am: DOn't try to build the plugin if the mozilla
+       * Makefile.am: Don't try to build the plugin if the mozilla
        development SDK isn't installed.
 
        * config.h.in: Checkin header file produced by autoheader so Gnash
Index: gnash/Makefile.am
diff -u gnash/Makefile.am:1.2 gnash/Makefile.am:1.3
--- gnash/Makefile.am:1.2       Thu Dec 22 04:56:55 2005
+++ gnash/Makefile.am   Thu Dec 22 05:11:47 2005
@@ -13,7 +13,7 @@
 
 STD_DIRS = libbase libgeometry server backend utilities # testsuite
 if PLUGIN
-SUBDIRS = plugin $(STD_DIRS)
+SUBDIRS = $(STD_DIRS) plugin
 else
 SUBDIRS = $(STD_DIRS)
 endif
Index: gnash/Makefile.in
diff -u gnash/Makefile.in:1.3 gnash/Makefile.in:1.4
--- gnash/Makefile.in:1.3       Thu Dec 22 04:56:55 2005
+++ gnash/Makefile.in   Thu Dec 22 05:11:47 2005
@@ -234,7 +234,7 @@
 AUTOMAKE_OPTIONS = dejagnu
 STD_DIRS = libbase libgeometry server backend utilities # testsuite
 @address@hidden = $(STD_DIRS)
address@hidden@SUBDIRS = plugin $(STD_DIRS)
address@hidden@SUBDIRS = $(STD_DIRS) plugin
 all: config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
Index: gnash/configure
diff -u gnash/configure:1.3 gnash/configure:1.4
--- gnash/configure:1.3 Thu Dec 22 04:56:55 2005
+++ gnash/configure     Thu Dec 22 05:11:47 2005
@@ -2517,7 +2517,7 @@
   fi
 
   if test x"$mconfig" = "x" ; then
-    plugin=""
+    plugin="no"
     FIREFOX_CFLAGS=""
     FIREFOX_LIBS=""
     FIREFOX_DEFS=""
@@ -2551,7 +2551,7 @@
 
 
 
-if test x$plugin = xtrue; then
+if test x$plugin = xyes; then
   PLUGIN_TRUE=
   PLUGIN_FALSE='#'
 else
Index: gnash/macros/firefox.m4
diff -u gnash/macros/firefox.m4:1.2 gnash/macros/firefox.m4:1.3
--- gnash/macros/firefox.m4:1.2 Thu Dec 22 04:56:56 2005
+++ gnash/macros/firefox.m4     Thu Dec 22 05:11:47 2005
@@ -64,7 +64,7 @@
   fi
 
   if test x"$mconfig" = "x" ; then
-    plugin=""
+    plugin="no"
     FIREFOX_CFLAGS=""
     FIREFOX_LIBS=""
     FIREFOX_DEFS=""
@@ -90,7 +90,7 @@
     AC_DEFINE(HAVE_FIREFOX,1,[Define this if you have firefox support 
available])
   fi
 
-  AM_CONDITIONAL(PLUGIN, test x$plugin = xtrue)
+  AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes])
 
   AC_SUBST(FIREFOX_CFLAGS)
   AC_SUBST(FIREFOX_LIBS)