[Gnash-commit] [SCM] Gnash branch, npapi, created. release_0_8_9_start-161-g22ddecf

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, npapi has been created
        at  22ddecff7028d6c6318e38601102e1223115843a (commit)

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=22ddecff7028d6c6318e38601102e1223115843a


commit 22ddecff7028d6c6318e38601102e1223115843a
Author: Hicham HAOUARI <address@hidden>
Date:   Tue Mar 1 21:30:35 2011 +0000

    Use system npapi headers

diff --git a/configure.ac b/configure.ac
index ae32835..16f0ad9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1947,6 +1947,10 @@ AC_ARG_ENABLE(npapi,
   fi
 )
 
+if test x"$npapi" = x"yes"; then
+  
PKG_CHECK_MODULES([MOZPLUGIN],[mozilla-plugin],[have_mozplugin=yes],[have_mozplugin=no])
+fi
+
 dnl -----------------------------------------------------------------
 dnl Enable us to disable building all browser plugins in one command.
 dnl -----------------------------------------------------------------
@@ -3856,6 +3860,19 @@ if test x"$ac_cv_gcc_visibility" != xyes; then
   fi
 fi
 
+if test x"$npapi" = xyes; then
+  if test x"$have_mozplugin" = xyes; then
+    echo "        MOZILLA PLUGIN flags are: $MOZPLUGIN_CFLAGS"
+  else
+    echo "        ERROR : No xulrunner development package is installed" >&3
+         "                Install it from 
http://releases.mozilla.org/pub/mozilla.org/xulrunner"; >&3
+         "                or .deb users: apt-get install xulrunner-dev" >&3
+         "                or .rpm users: yum install xulrunner-devel" >&3
+  fi
+else
+  echo "        NPAPI plugin is disabled"
+fi
+
 if test x"${DEJAGNU}" != x""; then
   echo "        DEJAGNU's runtest is $DEJAGNU"
 else
diff --git a/plugin/npapi/Makefile.am b/plugin/npapi/Makefile.am
index c7276cb..891be3f 100644
--- a/plugin/npapi/Makefile.am
+++ b/plugin/npapi/Makefile.am
@@ -22,10 +22,6 @@ SUBDIRS =
 
 # make sure these files make it into the distribution tarball.
 EXTRA_DIST = \
-       mozilla-sdk/include/npapi.h \
-       mozilla-sdk/include/npfunctions.h \
-       mozilla-sdk/include/npruntime.h \
-       mozilla-sdk/include/nptypes.h \
        mozilla-sdk/np_entry.cpp \
        mozilla-sdk/npn_gate.cpp \
        mozilla-sdk/npp_gate.cpp \
@@ -48,7 +44,7 @@ AM_CPPFLAGS = -DPLUGIN_TRACE -DGNASHBINDIR=\"$(GNASHBINDIR)\" 
\
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/librender \
        -I$(srcdir)/mozilla-sdk \
-       -I$(srcdir)/mozilla-sdk/include \
+       $(MOZPLUGIN_CFLAGS) \
        $(X11_CFLAGS) \
         $(GLIB_CFLAGS) \
        $(NULL)
@@ -67,11 +63,7 @@ endif
 
 noinst_HEADERS = plugin.h \
         mozilla-sdk/pluginbase.h \
-        mozilla-sdk/npplat.h \
-        mozilla-sdk/include/npapi.h \
-         mozilla-sdk/include/npfunctions.h \
-         mozilla-sdk/include/npruntime.h \
-         mozilla-sdk/include/nptypes.h
+        mozilla-sdk/npplat.h
 
 if !WIN32
 if !AMIGAOS4

-----------------------------------------------------------------------


hooks/post-receive
-- 
Gnash