--- a/ChangeLog	Fri May 14 17:30:57 2010 +0100
+++ b/ChangeLog	Mon May 17 19:24:55 2010 +0100
@@ -1,3 +1,16 @@
+2010-05-17 Andrew John Hughes  <ahughes@redhat.com>
+
+	* acinclude.m4:
+	Remove duplicate IT_XULRUNNER_VERSION macro.
+
+2010-01-22  Deepak Bhole <dbhole@redhat.com>
+
+	* Makefile.am:
+	Use MOZILLA_CFLAGS/LIBS rather than
+	XULRUNNER.
+	* 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	Fri May 14 17:30:57 2010 +0100
+++ b/Makefile.am	Mon May 17 19:24:55 2010 +0100
@@ -2071,7 +2071,7 @@
 	$(CXX) $(CXXFLAGS) \
 	  $< \
 	  $(GTK_LIBS) \
-	  $(XULRUNNER_LIBS) \
+	  $(MOZILLA_LIBS) \
 	  -shared -o $@
 
 clean-IcedTeaPlugin:

--- a/acinclude.m4	Fri May 14 17:30:57 2010 +0100
+++ b/acinclude.m4	Mon May 17 19:24:55 2010 +0100
@@ -1271,57 +1271,6 @@
 AC_PROVIDE([$0])dnl
 ])
 
-AC_DEFUN([IT_XULRUNNER_VERSION],
-[
-AC_LANG_PUSH([C++])
-OLDCPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS"
-
-AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],
-    [AC_RUN_IFELSE(
-      [AC_LANG_PROGRAM([[
-#include <mozilla-config.h>
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-]],[[
-int version = 0;
-const char* token = NULL;
-int power=6;
-FILE *datafile;
-
-datafile = fopen ("conftest.vdata", "w");
-if (!datafile) return 1;
-
-// 32 chars is more than enough to hold version
-char* mozilla_version = (char*) malloc(32*sizeof(char));
-snprintf(mozilla_version, 32, "%s", MOZILLA_VERSION);
-
-token = strtok(mozilla_version, ".");
-while (token)
-{
-    version += atoi(token)*(pow(10, power));
-    power -=2;
-    token = strtok(NULL, ".");
-}
-
-fprintf (datafile, "%d\n", version);
-free(mozilla_version);
-if (fclose(datafile)) return 1;
-
-return EXIT_SUCCESS;
-]])],
-    [xulrunner_cv_collapsed_version="$(cat conftest.vdata)"],
-    [AC_MSG_FAILURE([cannot determine xulrunner version])])],
-  [xulrunner_cv_collapsed_version="190000"])
-
-CPPFLAGS="$OLDCPPFLAGS"
-AC_LANG_POP([C++])
-
-AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version)
-])
-
 AC_DEFUN([IT_CHECK_ADDITIONAL_VMS],
 [
 AC_MSG_CHECKING([for additional virtual machines to build])

--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Fri May 14 17:30:57 2010 +0100
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Mon May 17 19:24:55 2010 +0100
@@ -1336,7 +1336,7 @@
 
   // if proxy info is available, extract it
   nsCString phost;
-  PRint32_t pport;
+  PRInt32 pport;
   nsCString ptype;
 
   info->GetHost(phost);