--- configure.ac.old	2008-05-24 00:05:05.000000000 +0200
+++ configure.ac.old	2008-06-18 21:16:29.000000000 +0200
@@ -6046,7 +6046,7 @@ 
           AC_PATH_PROG(SEAMONKEY_CONFIG, seamonkey-config, no)
           if test "${SEAMONKEY_CONFIG}" = "no"
           then
-            AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no)
+            AC_PATH_PROG(XULRUNNER_CONFIG, true, no)
             if test "${XULRUNNER_CONFIG}" = "no"
             then
               AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.])
@@ -6062,29 +6062,22 @@ 
     )
     if test ! -z "${MOZILLA_CONFIG}"
     then
-      if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
         LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
         AC_CHECK_LIB(Xt,XtStrings,
          [
            VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}])
-           VLC_ADD_LIBS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE -lXpm])
+           VLC_ADD_LIBS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lXpm])
          ],
          [],
-         [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE -lXpm]
+         [[]
         ])
         AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h]))
         LDFLAGS="${LDFLAGS_save}"
-      fi
 
       mozilla=:
       PLUGINS_BINDINGS="${PLUGINS_BINDINGS} mozilla"
       dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490
-      VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]])
-      if ${need_xpcom_libs}; then
-         VLC_ADD_LIBS([mozilla],[`${MOZILLA_CONFIG} --libs plugin xpcom`])
-      else
-         VLC_ADD_LIBS([mozilla],[`${MOZILLA_CONFIG} --libs plugin`])
-      fi
+      VLC_ADD_CPPFLAGS([mozilla],[[`pkg-config libxul-unstable --cflags | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]])
       CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mozilla}"
       MOZILLA_REQUIRED_HEADERS=1
       AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0)
@@ -6100,7 +6092,7 @@ 
       fi
       MOZILLA_REQUIRED_HEADERS=
       CPPFLAGS="${CPPFLAGS_save}"
-      MOZILLA_SDK_PATH="`${MOZILLA_CONFIG} --prefix`"
+      MOZILLA_SDK_PATH="`pkg-config libxul --variable=sdkdir`"
     fi
     dnl End of moz_sdk = ""
   else