Patch for Bug #331 (compiling with xulrunner 1.9.1)

[Deepak Bhole]

Attached patch adds conditional compilation for the plugin, so that
it can compile with xulrunner 1.9.1 and older versions. I have tested 
the patch on an F10 box (xul 1.9.10) and rawhide (xul 1.9.1).

Bug is here: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=331

ChangeLog:
2009-05-05 Deepak Bhole <dbhole at redhat.com>

    * IcedTeaPlugin.cc: Add conditional compilation block.
    * Makefile.am: Define a collapsed (comparable) version when compiling the
    plugin.
    * configure.ac: Determine a collapsed (comparable) version that can be
    used by the preprocessor for conditional compilation.

Cheers,
Deepak
-------------- next part --------------
diff -r be7c5293ac85 IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc	Tue May 05 13:30:07 2009 +0200
+++ b/IcedTeaPlugin.cc	Tue May 05 10:22:27 2009 -0400
@@ -3938,7 +3938,11 @@
     }
   PLUGIN_DEBUG_TWO ("created output fifo:", out_pipe_name);
 
+#if MOZILLA_VERSION_COLLAPSED < 1090100
   result = applet_viewer_process->Run (PR_FALSE, args, numArgs, nsnull);
+#else
+  result = applet_viewer_process->Run (PR_FALSE, args, numArgs);
+#endif
   PLUGIN_CHECK_RETURN ("run process", result);
 
   out_to_appletviewer = g_io_channel_new_file (out_pipe_name,
diff -r be7c5293ac85 Makefile.am
--- a/Makefile.am	Tue May 05 13:30:07 2009 +0200
+++ b/Makefile.am	Tue May 05 10:22:27 2009 -0400
@@ -1654,6 +1654,7 @@
 	$(CXX) $(CXXFLAGS) \
 	  -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
 	  -DPLUGIN_VERSION="\"$$plugin_version\"" \
+	  -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
 	  $(GTK_CFLAGS) \
 	  $(XULRUNNER_CFLAGS) \
 	  -fPIC -c -o $@ $<
diff -r be7c5293ac85 configure.ac
--- a/configure.ac	Tue May 05 13:30:07 2009 +0200
+++ b/configure.ac	Tue May 05 10:22:27 2009 -0400
@@ -509,6 +509,54 @@
   fi
 fi
 
+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);
+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_MSG_CHECKING(for --with-additional-vms)
 AC_ARG_WITH(additional-vms,
             AC_HELP_STRING([--with-additional-vms=vm-list], [build additional virtual machines. Valid value is a comma separated string with the backend names `cacao', `zero' and `shark'.]),