Mercurial > hg > release > icedtea6-1.8
changeset 1843:36726dd810a7
Make new plugin support more platforms.
2010-01-22 Deepak Bhole <dbhole@redhat.com>
* Makefile.am:
Use MOZILLA_CFLAGS/LIBS rather than
XULRUNNER.
* configure.ac:
Check for Mozilla not XULrunner.
Bring in libxul-unstable as well.
* plugin/icedteanp/IcedTeaNPPlugin.cc:
Use PRInt32 rather than PRInt32_t for port.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Mon, 25 Jan 2010 21:31:04 +0000 |
| parents | 7f40cc095348 |
| children | b0df194e92bb |
| files | ChangeLog Makefile.am configure.ac plugin/icedteanp/IcedTeaNPPlugin.cc |
| diffstat | 4 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 25 19:42:12 2010 +0000 +++ b/ChangeLog Mon Jan 25 21:31:04 2010 +0000 @@ -1,3 +1,14 @@ +2010-01-22 Deepak Bhole <dbhole@redhat.com> + + * Makefile.am: + Use MOZILLA_CFLAGS/LIBS rather than + XULRUNNER. + * configure.ac: + Check for Mozilla not XULrunner. + Bring in libxul-unstable as well. + * plugin/icedteanp/IcedTeaNPPlugin.cc: + Use PRInt32 rather than PRInt32_t for port. + 2010-01-25 Andrew John Hughes <ahughes@redhat.com> * IcedTeaPlugin.cc:
--- a/Makefile.am Mon Jan 25 19:42:12 2010 +0000 +++ b/Makefile.am Mon Jan 25 21:31:04 2010 +0000 @@ -1530,13 +1530,13 @@ -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \ -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \ $(GTK_CFLAGS) \ - $(XULRUNNER_CFLAGS) \ + $(MOZILLA_CFLAGS) \ -fPIC -c -o $@ $< IcedTeaPlugin.so: IcedTeaPlugin.o $(CXX) $(CXXFLAGS) \ $< \ $(GTK_LIBS) \ - $(XULRUNNER_LIBS) \ + $(MOZILLA_LIBS) \ -shared -o $@ clean-IcedTeaPlugin:
--- a/configure.ac Mon Jan 25 19:42:12 2010 +0000 +++ b/configure.ac Mon Jan 25 21:31:04 2010 +0000 @@ -418,7 +418,7 @@ dnl FIXME: use unstable if test "x${enable_plugin}" = "xyes" then - PKG_CHECK_MODULES(XULRUNNER, \ + PKG_CHECK_MODULES(MOZILLA, \ nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9) PKG_CHECK_MODULES(GTK, gtk+-2.0) PKG_CHECK_MODULES(GLIB, glib-2.0) @@ -434,7 +434,7 @@ if test "x${enable_npplugin}" = "xyes" then PKG_CHECK_MODULES(MOZILLA, \ - mozilla-plugin libxul) + mozilla-plugin libxul libxul-unstable) PKG_CHECK_MODULES(GTK, gtk+-2.0) PKG_CHECK_MODULES(GLIB, glib-2.0) @@ -450,7 +450,7 @@ then AC_LANG_PUSH([C++]) OLDCPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS" + CPPFLAGS="$CPPFLAGS $MOZILLA_CFLAGS" AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version], [AC_RUN_IFELSE(
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Jan 25 19:42:12 2010 +0000 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Mon Jan 25 21:31:04 2010 +0000 @@ -1336,7 +1336,7 @@ // if proxy info is available, extract it nsCString phost; - PRint32_t pport; + PRInt32 pport; nsCString ptype; info->GetHost(phost);