[Gnash-commit] /srv/bzr/gnash/trunk r9950: Have xpi packaging scripts define GNASH_XPI_PLUGIN, don't force it from HAVE_XPCOM

[Sandro Santilli]

------------------------------------------------------------
revno: 9950
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Tue 2008-10-07 09:05:35 +0200
message:
  Have xpi packaging scripts define GNASH_XPI_PLUGIN, don't force it from 
HAVE_XPCOM
modified:
  packaging/xpi.am
  plugin/plugin.cpp

=== modified file 'packaging/xpi.am'
--- a/packaging/xpi.am  2008-10-06 16:50:53 +0000
+++ b/packaging/xpi.am  2008-10-07 07:05:35 +0000
@@ -48,7 +48,7 @@
        $(MAKE) -C $(XPI_BUILD) install DESTDIR=$(XPI_TMP)
 
        (cd $(XPI_BUILD); ./configure $(CONFIG_OPTS) --disable-static 
--enable-shared) # configure for plugin.
-       $(MAKE) -C $(XPI_BUILD)/plugin clean all GNASHBINDIR= # build and get 
the plugin
+       $(MAKE) -C $(XPI_BUILD)/plugin clean all CXXFLAGS=-DGNASH_XPI_PLUGIN # 
build and get the plugin
        $(MAKE) -C $(XPI_BUILD) install-plugin DESTDIR=$(XPI_TMP)
        $(MAKE) -C $(XPI_BUILD)/plugin/xpcom install-pkglib DESTDIR=$(XPI_TMP)
 

=== modified file 'plugin/plugin.cpp'
--- a/plugin/plugin.cpp 2008-10-06 17:15:28 +0000
+++ b/plugin/plugin.cpp 2008-10-07 07:05:35 +0000
@@ -100,8 +100,6 @@
 
 #ifdef HAVE_XPCOM
 static nsICookieManager *cookieManager = NULL;
-// I belive the XPI define should be only set by xpi build scripts
-# define GNASH_XPI_PLUGIN 
 #endif // HAVE_XPCOM
 
 
@@ -427,6 +425,8 @@
        {
                g_source_remove(_ichanWatchId);
        }
+
+    // TODO: unlink the cookie jar
 }
 
 /// \brief Initialize an instance of the plugin object