[Gnash-commit] /srv/bzr/gnash/trunk r12089: Drop more XPCOM (and NSPR)

[Sandro Santilli]

------------------------------------------------------------
revno: 12089
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Sun 2010-03-21 00:01:26 +0100
message:
  Drop more XPCOM (and NSPR)
modified:
  Makefile.am
  configure.ac

=== modified file 'Makefile.am'
--- a/Makefile.am       2010-03-14 02:26:46 +0000
+++ b/Makefile.am       2010-03-20 23:01:26 +0000
@@ -348,13 +348,6 @@
        @echo " AGG_CFLAGS is $(AGG_CFLAGS)"
        @echo " AGG_LIBS is $(AGG_LIBS)"
 endif
-if XPCOM
-       @echo " XPCOM_CFLAGS is $(XPCOM_CFLAGS)"
-       @echo " XPCOM_LIBS is $(XPCOM_LIBS)"
-       @echo " XPIDL path is $(XPIDL)"
-       @echo " NSPR_CFLAGS is $(NSPR_CFLAGS)"
-       @echo " NSPR_LIBS is $(NSPR_LIBS)"
-endif
        @echo ""
        @echo "A blank value for CFLAGS means the header is installed in the"
        @echo "default system header location. All the LIBS should have a"
@@ -418,9 +411,6 @@
 if BUILD_HAIKU_GUI
        @echo " Supported GUI: Haiku"
 endif
-if XPCOM
-       @echo " XPCOM support for Mozilla/Firefox"
-endif
 if JEMALLOC
        @echo " Using jemalloc memory manager"
 endif

=== modified file 'configure.ac'
--- a/configure.ac      2010-03-19 19:22:45 +0000
+++ b/configure.ac      2010-03-20 23:01:26 +0000
@@ -1573,13 +1573,6 @@
 
 
 GNASH_PATH_FIREFOX
-dnl XPCOM and NSPR can be used in the plugin for better integration
-dnl within Firefox.
-GNASH_PATH_XPCOM
-if test x$has_xpcom = xyes; then nspr4=yes; fi
-GNASH_PATH_NSPR
-dnl If we don't have both XPCOM and NSPR, we can't build either.
-AM_CONDITIONAL(XPCOM, test x$has_xpcom = xyes -a x$has_nspr = xyes)
 
 dnl -----------------------------------------------------------------
 dnl END OF PLUGIN RELATED STUFF
@@ -2709,7 +2702,6 @@
 plugin/Makefile
 plugin/npapi/Makefile
 plugin/npapi/mozilla-sdk/Makefile
-plugin/xpcom/Makefile
 plugin/klash/Makefile
 plugin/klash4/Makefile
 plugin/win32/Makefile
@@ -3720,27 +3712,6 @@
     echo "        Haiku libs are: $HAIKU_LIBS"
 fi
  
-dnl XPCOM support for Mozilla/Firefox
-if test x"$xpcom" = x"yes"; then
-  if test x"$has_xpcom" = x"yes"; then
-    echo "        XPCOM flags are: $XPCOM_CFLAGS"
-    echo "        XPCOM libs are: $XPCOM_LIBS"
-    echo "        XPIDL path is: $XPIDL"
-  else
-    echo "        ERROR: No XPCOM development package is installed." >&3
-    echo "                Install it from 
http://www.mozilla.org/projects/xpcom/"; >&3
-    echo "                or .deb users: apt-get install xulrunner-1.9-dev" >&3
-   echo "                 or .rpm users: yum install xulrunner-devel" >&4
-  fi
-fi
-if test x"$nspr4" = x"yes"; then
-  if test x"$has_nspr" = x"yes"; then
-    echo "        NSPR flags are: $NSPR_CFLAGS"
-    echo "        NSPR libs are: $NSPR_LIBS"
-  else
-    echo "        ERROR: No NSPR development package is installed." >&3
-  fi
-fi
 if test x"$python" = x"yes"; then
   if test x"$has_python" = x"yes"; then
     echo "        PYTHON flags are: $PYTHON_CFLAGS"