--- ./configure.orig	2007-12-20 19:27:31.000000000 +0000
+++ ./configure	2007-12-20 19:29:27.000000000 +0000
@@ -7022,12 +7022,12 @@
         pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\"") >&5
-  ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xulrunner-plugin") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin" 2>/dev/null`
+  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -7040,12 +7040,12 @@
         pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin\"") >&5
-  ($PKG_CONFIG --exists --print-errors "mozilla-plugin") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xulrunner-plugin") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-plugin" 2>/dev/null`
+  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -7064,9 +7064,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-plugin"`
+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xulrunner-plugin"`
         else
-	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-plugin"`
+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xulrunner-plugin"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$MOZILLA_PKG_ERRORS" >&5
@@ -7097,12 +7097,12 @@
         pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin firefox-xpcom\"") >&5
-  ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin firefox-xpcom\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xulrunner-plugin firefox-xpcom") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin firefox-xpcom" 2>/dev/null`
+  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin firefox-xpcom" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -7115,12 +7115,12 @@
         pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin firefox-xpcom\"") >&5
-  ($PKG_CONFIG --exists --print-errors "firefox-plugin firefox-xpcom") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin firefox-xpcom\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xulrunner-plugin firefox-xpcom") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "firefox-plugin firefox-xpcom" 2>/dev/null`
+  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin firefox-xpcom" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -7139,9 +7139,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-plugin firefox-xpcom"`
+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xulrunner-plugin firefox-xpcom"`
         else
-	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin firefox-xpcom"`
+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xulrunner-plugin firefox-xpcom"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$MOZILLA_PKG_ERRORS" >&5
@@ -7247,12 +7247,12 @@
         pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-firefox-plugin mozilla-firefox-xpcom\"") >&5
-  ($PKG_CONFIG --exists --print-errors "mozilla-firefox-plugin mozilla-firefox-xpcom") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-xulrunner-plugin mozilla-firefox-xpcom\"") >&5
+  ($PKG_CONFIG --exists --print-errors "mozilla-xulrunner-plugin mozilla-firefox-xpcom") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-firefox-plugin mozilla-firefox-xpcom" 2>/dev/null`
+  pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "mozilla-xulrunner-plugin mozilla-firefox-xpcom" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -7265,12 +7265,12 @@
         pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-firefox-plugin mozilla-firefox-xpcom\"") >&5
-  ($PKG_CONFIG --exists --print-errors "mozilla-firefox-plugin mozilla-firefox-xpcom") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-xulrunner-plugin mozilla-firefox-xpcom\"") >&5
+  ($PKG_CONFIG --exists --print-errors "mozilla-xulrunner-plugin mozilla-firefox-xpcom") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-firefox-plugin mozilla-firefox-xpcom" 2>/dev/null`
+  pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "mozilla-xulrunner-plugin mozilla-firefox-xpcom" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -7289,9 +7289,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-firefox-plugin mozilla-firefox-xpcom"`
+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-xulrunner-plugin mozilla-firefox-xpcom"`
         else
-	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-firefox-plugin mozilla-firefox-xpcom"`
+	        MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-xulrunner-plugin mozilla-firefox-xpcom"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$MOZILLA_PKG_ERRORS" >&5