[Gnash-commit] /srv/bzr/gnash/trunk r9940: Don't use DISTCHECK flags for configuring the xpi builds, also disable

[Sandro Santilli]

------------------------------------------------------------
revno: 9940
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Mon 2008-10-06 18:50:53 +0200
message:
  Don't use DISTCHECK flags for configuring the xpi builds, also disable
  testsuite for that task.
modified:
  packaging/xpi.am

=== modified file 'packaging/xpi.am'
--- a/packaging/xpi.am  2008-10-02 01:34:00 +0000
+++ b/packaging/xpi.am  2008-10-06 16:50:53 +0000
@@ -29,21 +29,25 @@
 # this is where the gnash gets compiled
 XPI_BUILD=gnash-${VERSION}
 
-CONFIG_OPTS = $(DISTCHECK_CONFIGURE_FLAGS) \
+# These are the options we want to use to build the standalone
+# gnash player to ship within the .xpi
+CONFIG_OPTS = \
        --disable-kparts \
+    --disable-testsuite \
        --enable-gui=gtk \
+    --enable-xpcom \
        --with-npapi-plugindir=/tmp/plugin
 
 xpi xpi-bundle:
        rm -rf $(XPI_BUILD) # extract the tarball.
        tar jxf $(XPI_BUILD).tar.bz2
 
-       (cd $(XPI_BUILD); ./configure $(CONFIG_OPTS) --disable-shared 
--enable-static --enable-xpcom) # configure for speed.
+       (cd $(XPI_BUILD); ./configure $(CONFIG_OPTS) --disable-shared 
--enable-static) # configure for standalone player.
 
        $(MAKE) -C $(XPI_BUILD) all # build and install in temp
        $(MAKE) -C $(XPI_BUILD) install DESTDIR=$(XPI_TMP)
 
-       (cd $(XPI_BUILD); ./configure $(CONFIG_OPTS) --disable-static 
--enable-shared --enable-xpcom) # configure for the plugin.
+       (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) install-plugin DESTDIR=$(XPI_TMP)
        $(MAKE) -C $(XPI_BUILD)/plugin/xpcom install-pkglib DESTDIR=$(XPI_TMP)