diff options
| author | Deepak Bhole <dbhole@redhat.com> | 2011-09-13 16:23:04 -0400 |
|---|---|---|
| committer | Deepak Bhole <dbhole@redhat.com> | 2011-09-13 16:23:04 -0400 |
| commit | cf26e6d0b7e266f9866e5c608c56814e831cdb07 (patch) | |
| tree | 5b6dcf5fbf92987213ebd5a47dbc8299b5e0e408 | |
| parent | 58403a2f214f7a59a9821121489ba6ebbec18af9 (diff) | |
PR782: Support building against npapi-sdk as well
Patch from Michał Górny < mgorny at gentoo dot org >
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | acinclude.m4 | 11 |
4 files changed, 17 insertions, 2 deletions
@@ -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> @@ -1,5 +1,11 @@ 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. 2011-09-01 Jiri Vanek<jvanek@redhat.com> @@ -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 |