Mercurial > hg > release > icedtea-web-1.2
changeset 286:d2434b3dc395
PR782: Support building against npapi-sdk as well
Patch from Micha? G?rny < mgorny at gentoo dot org >
| author | Deepak Bhole <dbhole@redhat.com> |
|---|---|
| date | Tue, 13 Sep 2011 16:23:04 -0400 |
| parents | 418a9e44fce7 |
| children | e9a9792ee189 |
| files | AUTHORS ChangeLog NEWS acinclude.m4 |
| diffstat | 4 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/AUTHORS Tue Sep 13 16:19:47 2011 -0400 +++ b/AUTHORS Tue Sep 13 16:23:04 2011 -0400 @@ -9,6 +9,7 @@ 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>
--- a/ChangeLog Tue Sep 13 16:19:47 2011 -0400 +++ b/ChangeLog Tue Sep 13 16:23:04 2011 -0400 @@ -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.
--- a/NEWS Tue Sep 13 16:19:47 2011 -0400 +++ b/NEWS Tue Sep 13 16:23:04 2011 -0400 @@ -16,6 +16,7 @@ - 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
--- a/acinclude.m4 Tue Sep 13 16:19:47 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