--- a/ChangeLog	Sat Jan 22 21:47:34 2011 +0100
+++ b/ChangeLog	Mon Mar 07 20:15:21 2011 +0000
@@ -1,3 +1,13 @@
+2011-01-26  Damien Raude-Morvan <drazzib@drazzib.com>
+
+	Remove NetX and the IcedTea plugin (drop remaining bits from acinclude.m4
+	and configure.ac)
+	* acinclude.m4:
+	(IT_CHECK_PLUGIN): Removed.
+	(IT_CHECK_PLUGIN_DEPENDENCIES): Likewise.
+	(IT_CHECK_XULRUNNER_VERSION): Likewise.
+	* configure.ac: Don't call IT_CHECK_XULRUNNER_VERSION.
+
 2010-01-22  Mark Wielaard  <mark@klomp.org>
 
 	* configure.ac: Add xvfb-run AC_CHECK_PROG.

--- a/THANKYOU	Sat Jan 22 21:47:34 2011 +0100
+++ b/THANKYOU	Mon Mar 07 20:15:21 2011 +0000
@@ -5,4 +5,5 @@
 us know. Please keep this list in alphabetic order.
 
 Alon Bar-Lev (alon.barlev@gmail.com)
-C. K. Jester-Young  (cky944@gmail.com)
\ No newline at end of file
+C. K. Jester-Young  (cky944@gmail.com)
+Damien Raude-Morvan (drazzib@drazzib.com)

--- a/acinclude.m4	Sat Jan 22 21:47:34 2011 +0100
+++ b/acinclude.m4	Mon Mar 07 20:15:21 2011 +0000
@@ -1654,52 +1654,6 @@
   AM_CONDITIONAL([HAS_JDK_REVISION], test "x${JDK_REVISION}" != xnone)
   AM_CONDITIONAL([HAS_HOTSPOT_REVISION], test "x${HOTSPOT_REVISION}" != xnone)
 ])
-AC_DEFUN_ONCE([IT_CHECK_PLUGIN],
-[
-AC_MSG_CHECKING([whether to build the browser plugin])
-AC_ARG_ENABLE([plugin],
-              [AS_HELP_STRING([--disable-plugin],
-                              [Disable compilation of browser plugin])],
-              [enable_plugin="${enableval}"], [enable_plugin="yes"])
-AC_MSG_RESULT(${enable_plugin})
-])
-
-AC_DEFUN_ONCE([IT_CHECK_PLUGIN_DEPENDENCIES],
-[
-dnl Check for plugin support headers and libraries.
-dnl FIXME: use unstable
-AC_REQUIRE([IT_CHECK_PLUGIN])
-if test "x${enable_plugin}" = "xyes" ; then
-  PKG_CHECK_MODULES(GTK, gtk+-2.0)
-  PKG_CHECK_MODULES(GLIB, glib-2.0)
-  AC_SUBST(GLIB_CFLAGS)
-  AC_SUBST(GLIB_LIBS)
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-
-  PKG_CHECK_MODULES(MOZILLA, mozilla-plugin)
-    
-  AC_SUBST(MOZILLA_CFLAGS)
-  AC_SUBST(MOZILLA_LIBS)
-fi
-AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes")
-])
-
-AC_DEFUN_ONCE([IT_CHECK_XULRUNNER_VERSION],
-[
-AC_REQUIRE([IT_CHECK_PLUGIN_DEPENDENCIES])
-if test "x${enable_plugin}" = "xyes"
-then
-  AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[
-    if pkg-config --modversion libxul >/dev/null 2>&1
-    then
-      xulrunner_cv_collapsed_version=`pkg-config --modversion libxul | awk -F. '{power=6; v=0; for (i=1; i <= NF; i++) {v += $i * 10 ^ power; power -=2}; print v}'`
-    else
-      AC_MSG_FAILURE([cannot determine xulrunner version])
-    fi])
-  AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version)
-fi
-])
 
 AC_DEFUN_ONCE([IT_OBTAIN_DEFAULT_LIBDIR],
 [

--- a/configure.ac	Sat Jan 22 21:47:34 2011 +0100
+++ b/configure.ac	Mon Mar 07 20:15:21 2011 +0000
@@ -179,9 +179,6 @@
 AC_PATH_TOOL([GCJ],[gcj])
 AC_SUBST([GCJ])
 
-dnl Plugin
-IT_CHECK_XULRUNNER_VERSION
-
 dnl pkgconfig cannot be used to find these headers and libraries.
 AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
 	,[AC_MSG_ERROR("CUPS headers were not found -