/hg/release/icedtea-web-1.1: PR782: Support building against npa...

[dbhole at icedtea.classpath.org]

changeset c7b22b085229 in /hg/release/icedtea-web-1.1
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=c7b22b085229
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Sep 13 16:23:04 2011 -0400

	PR782: Support building against npapi-sdk as well Patch from Micha?
	G?rny < mgorny at gentoo dot org >


diffstat:

 AUTHORS      |   1 +
 ChangeLog    |   6 ++++++
 NEWS         |   2 ++
 acinclude.m4 |  11 +++++++++--
 4 files changed, 18 insertions(+), 2 deletions(-)

diffs (57 lines):

diff -r cea1007c04db -r c7b22b085229 AUTHORS
--- a/AUTHORS	Wed Aug 31 14:19:03 2011 -0400
+++ b/AUTHORS	Tue Sep 13 16:23:04 2011 -0400
@@ -8,6 +8,7 @@
 Mark Greenwood <mark at dcs.shef.ac.uk>
 Andrew John Hughes <gnu_andrew at member.fsf.org, ahughes at redhat.com>
 Matthias Klose <doko at ubuntu.com>
+Michał Górny < mgorny at gentoo.org >
 Francis Kung <fkung at redhat.com>
 DJ Lucas <dj at lucasit.com>
 Omair Majid <omajid at redhat.com>
diff -r cea1007c04db -r c7b22b085229 ChangeLog
--- a/ChangeLog	Wed Aug 31 14:19:03 2011 -0400
+++ b/ChangeLog	Tue Sep 13 16:23:04 2011 -0400
@@ -1,3 +1,9 @@
+2011-09-13  Deepak Bhole <dbhole at 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-08-31  Deepak Bhole <dbhole at redhat.com>
 
 	* NEWS: Prepare for 1.1.3
diff -r cea1007c04db -r c7b22b085229 NEWS
--- a/NEWS	Wed Aug 31 14:19:03 2011 -0400
+++ b/NEWS	Tue Sep 13 16:23:04 2011 -0400
@@ -9,6 +9,8 @@
 CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
 
 New in release 1.1.3 (2011-XX-XX):
+* Plugin
+  - PR782: Support building against npapi-sdk as well
 
 New in release 1.1.2 (2011-08-31):
 * Plugin
diff -r cea1007c04db -r c7b22b085229 acinclude.m4
--- a/acinclude.m4	Wed Aug 31 14:19:03 2011 -0400
+++ b/acinclude.m4	Tue Sep 13 16:23:04 2011 -0400
@@ -372,8 +372,15 @@
   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