From cf26e6d0b7e266f9866e5c608c56814e831cdb07 Mon Sep 17 00:00:00 2001
From: Deepak Bhole <dbhole@redhat.com>
Date: Tue, 13 Sep 2011 16:23:04 -0400
Subject: PR782: Support building against npapi-sdk as well Patch from Michał
Górny < mgorny at gentoo dot org >
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
AUTHORS | 1 +
ChangeLog | 6 ++++++
NEWS | 1 +
acinclude.m4 | 11 +++++++++--
4 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 07a8a67..c253459 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,6 +9,7 @@ Thomas Fitzsimmons <fitzsim@redhat.com>
Mark Greenwood <mark@dcs.shef.ac.uk>
Andrew John Hughes <ahughes@redhat.com>
Matthias Klose <doko@ubuntu.com>
+Michał Górny < mgorny@gentoo.org >
Francis Kung <fkung@redhat.com>
Denis Lila <dlila@redhat.com>
DJ Lucas <dj@lucasit.com>
diff --git a/ChangeLog b/ChangeLog
index 2d883d0..f5a088c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-13 Deepak Bhole <dbhole@redhat.com>
+
+ PR782: Support building against npapi-sdk as well
+ Patch from Michał Górny < mgorny at gentoo dot org >
+ * acinclude.m4: Build against npapi-sdk.
+
2011-09-13 Deepak Bhole <dbhole@redhat.com>
* ChangeLog: Fixed formatting issues in previous entry.
diff --git a/NEWS b/NEWS
index 1173ce2..6648ef4 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ New in release 1.2 (2011-XX-XX):
- PR765: JNLP file with all resource jars marked as 'lazy' fails to validate signature and stops the launch of application
* Plugin
- PR749: sun.applet.PluginStreamHandler#handleMessage(String) really slow
+ - PR782: Support building against npapi-sdk as well
- RH718693: MindTerm SSH Applet doesn't work
Common
- PR768: Signed applets/Web Start apps don't work with OpenJDK7 and up
diff --git a/acinclude.m4 b/acinclude.m4
index 4d84244..932ac56 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -372,8 +372,15 @@ if test "x${enable_plugin}" = "xyes" ; then
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
- PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
-
+ PKG_CHECK_MODULES(MOZILLA, npapi-sdk, [
+ AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[
+ # XXX: use NPAPI versions instead
+ xulrunner_cv_collapsed_version=20000000
+ ])
+ ], [
+ PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
+ ])
+
AC_SUBST(MOZILLA_CFLAGS)
AC_SUBST(MOZILLA_LIBS)
fi
--
cgit v1.2.3