[Gnash-commit] gnash ./ChangeLog ./Makefile.am ./configure.ac ...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/18 16:42:52

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

Log message:
        * Makefile.am, configure.ac, macros/firefox.m4: moved handling of 
--enable-plugin from firefox macro to top-level configure so you can disable 
build in the plugin/ dir (--disable-plugin didn't work).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.357&tr2=1.358&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/Makefile.am.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.79&tr2=1.80&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/firefox.m4.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.357 gnash/ChangeLog:1.358
--- gnash/ChangeLog:1.357       Thu May 18 15:17:57 2006
+++ gnash/ChangeLog     Thu May 18 16:42:52 2006
@@ -1,5 +1,9 @@
 2006-05-18 Sandro Santilli <address@hidden>
 
+       * Makefile.am, configure.ac, macros/firefox.m4:
+       moved handling of --enable-plugin from firefox macro
+       to top-level configure so you can disable build in
+       the plugin/ dir (--disable-plugin didn't work).
        * server/edit_text_character_def.h, server/edit_text_character.cpp
        edit_text_character_def made a real class, ensuring data
        members are never changed. Type of variables holding twips
Index: gnash/Makefile.am
diff -u gnash/Makefile.am:1.22 gnash/Makefile.am:1.23
--- gnash/Makefile.am:1.22      Fri May 12 22:17:29 2006
+++ gnash/Makefile.am   Thu May 18 16:42:52 2006
@@ -37,11 +37,18 @@
 AUTOMAKE_OPTIONS = dejagnu
 ACLOCAL_AMFLAGS = -I macros
 
-STD_DIRS = libbase libgeometry server backend utilities plugin # gui
+STD_DIRS = libbase libgeometry server backend utilities # gui
+
+if PLUGIN
+PLUGIN_DIRS = plugin
+endif
+
 if DOCBOOK
 DOC_DIRS = doc
 endif
-SUBDIRS      = $(STD_DIRS) $(DOC_DIRS)
+
+SUBDIRS      = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS)
+
 # libamf isn't used yet, but we still want it in the distribution
 DIST_SUBDIRS = $(STD_DIRS) doc testsuite libamf
 
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.79 gnash/configure.ac:1.80
--- gnash/configure.ac:1.79     Wed May 17 08:48:52 2006
+++ gnash/configure.ac  Thu May 18 16:42:52 2006
@@ -257,6 +257,22 @@
 
 dnl LIBS+="-L/usr/lib64"
 
+dnl
+dnl !! This has been moved here to make --enable-plugin work
+dnl !! All of plugin-related macro calls could be moved into
+dnl !! a specialized macros/plugin.m4
+dnl
+AC_ARG_ENABLE(plugin,
+  [  --enable-plugin         Enable plugins build],
+  [case "${enableval}" in
+    yes) plugin=yes ;;
+    no)  plugin=no ;;
+    *)   AC_MSG_ERROR([bad value ${enableval} for disable-plugin option]) ;;
+  esac],
+  plugin=no
+)
+AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes])
+
 GNASH_PATH_FIREFOX
 AC_PATH_XTRA
 AC_CHECK_HEADERS(dejagnu.h)
Index: gnash/macros/firefox.m4
diff -u gnash/macros/firefox.m4:1.16 gnash/macros/firefox.m4:1.17
--- gnash/macros/firefox.m4:1.16        Mon Apr 24 23:05:55 2006
+++ gnash/macros/firefox.m4     Thu May 18 16:42:52 2006
@@ -43,12 +43,16 @@
 dnl both the configuration and compilation processes.
 AC_DEFUN([GNASH_PATH_FIREFOX],
 [dnl 
-  AC_ARG_ENABLE(plugin, [  --disable-plugin         Enable support for being a 
plugin],
-  [case "${enableval}" in
-    yes) plugin=yes ;;
-    no)  plugin=no ;;
-    *)   AC_MSG_ERROR([bad value ${enableval} for disable-plugin option]) ;;
-  esac], plugin=yes)
+
+dnl !!
+dnl !! Moved to configure.ac to allow builds where plugins don't work
+dnl !!
+dnl   AC_ARG_ENABLE(plugin, [  --disable-plugin         Enable support for 
being a plugin],
+dnl   [case "${enableval}" in
+dnl     yes) plugin=yes ;;
+dnl     no)  plugin=no ;;
+dnl     *)   AC_MSG_ERROR([bad value ${enableval} for disable-plugin option]) 
;;
+dnl   esac], plugin=yes)
 
   if test x"${plugin}" = x"yes"; then