From e33601ce5abdca9ae9094e5e0e364d63869c7818 Mon Sep 17 00:00:00 2001
From: alexlan <alexlan@fedoraproject.org>
Date: Jul 21 2008 13:50:43 +0000
Subject: Make sure the new xulrunner-configure patch is added to CVS.


---

diff --git a/blam-xulrunner-configure.patch b/blam-xulrunner-configure.patch
new file mode 100644
index 0000000..45a4d70
--- /dev/null
+++ b/blam-xulrunner-configure.patch
@@ -0,0 +1,216 @@
+diff -up blam-1.8.3/configure.old blam-1.8.3/configure
+--- blam-1.8.3/configure.old	2006-11-17 01:29:56.000000000 +0100
++++ blam-1.8.3/configure	2008-06-23 10:08:35.000000000 +0200
+@@ -22092,6 +22092,8 @@ fi
+ echo $ECHO_N "checking which mozilla to use... $ECHO_C" >&6; }
+ 
+ MOZILLA=
++MOZILLA_XPCOM=
++MOZILLA_GTKMOZEMBED=
+ 
+ # Check whether --with-mozilla was given.
+ if test "${with_mozilla+set}" = set; then
+@@ -22100,16 +22102,30 @@ fi
+ 
+ 
+ if test "x$MOZILLA" = "x"; then
+-  if pkg-config --exists mozilla-gtkmozembed; then
+-    MOZILLA=mozilla
++  if pkg-config --exists libxul; then
++    MOZILLA=libxul
++    MOZILLA_XPCOM=libxul
++    MOZILLA_GTKMOZEMBED=mozilla-gtkmozembed
+   elif pkg-config --exists firefox-gtkmozembed; then
+     MOZILLA=firefox
++    MOZILLA_XPCOM=firefox-xpcom
++    MOZILLA_GTKMOZEMBED=firefox-gtkmozembed
+   elif pkg-config --exists thunderbird-gtkmozembed; then
+     MOZILLA=thunderbird
++    MOZILLA_XPCOM=thunderbird-xpcom
++    MOZILLA_GTKMOZEMBED=thunderbird-gtkmozembed
+ elif pkg-config --exists xulrunner-gtkmozembed; then
+     MOZILLA=xulrunner
++    MOZILLA_XPCOM=xulrunner-xpcom
++    MOZILLA_GTKMOZEMBED=xulrunner-gtkmozembed
+ elif pkg-config --exists seamonkey-gtkmozembed; then
+     MOZILLA=seamonkey
++    MOZILLA_XPCOM=seamonkey-xpcom
++    MOZILLA_GTKMOZEMBED=seamonkey-gtkmozembed
++elif pkg-config --exists mozilla-gtkmozembed; then
++    MOZILLA=mozilla
++    MOZILLA_XPCOM=mozilla-xpcom
++    MOZILLA_GTKMOZEMBED=mozilla-gtkmozembed
+   else
+     { { echo "$as_me:$LINENO: error: no mozilla installation found" >&5
+ echo "$as_me: error: no mozilla installation found" >&2;}
+@@ -22131,13 +22147,12 @@ mozilla) min_version=1.7 flavour=mozilla
+ firefox) min_version=0.10 flavour=toolkit ;;
+ thunderbird) min_version=0.8 flavour=toolkit ;;
+ xulrunner) min_version=1.8 flavour=toolkit ;;
++libxul) min_version=1.8 flavour=toolkit ;;
+ seamonkey) min_version=1.0 flavour=mozilla ;;
+ esac
+ 
+ MOZILLA_FLAVOUR=$flavour
+ 
+-
+-
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for MOZILLA_COMPONENT" >&5
+ echo $ECHO_N "checking for MOZILLA_COMPONENT... $ECHO_C" >&6; }
+@@ -22147,12 +22162,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-xpcom >= \$min_version\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA_GTKMOZEMBED >= \$min_version \$MOZILLA_XPCOM >= \$min_version\"") >&5
++  ($PKG_CONFIG --exists --print-errors "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_MOZILLA_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version" 2>/dev/null`
++  pkg_cv_MOZILLA_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22165,12 +22180,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-xpcom >= \$min_version\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA_GTKMOZEMBED >= \$min_version \$MOZILLA_XPCOM >= \$min_version\"") >&5
++  ($PKG_CONFIG --exists --print-errors "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_MOZILLA_COMPONENT_LIBS=`$PKG_CONFIG --libs "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version" 2>/dev/null`
++  pkg_cv_MOZILLA_COMPONENT_LIBS=`$PKG_CONFIG --libs "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22189,14 +22204,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version"`
++	        MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version"`
+         else
+-	        MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version"`
++	        MOZILLA_COMPONENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$MOZILLA_COMPONENT_PKG_ERRORS" >&5
+ 
+-	{ { echo "$as_me:$LINENO: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) were not met:
++	{ { echo "$as_me:$LINENO: error: Package requirements ($MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version) were not met:
+ 
+ $MOZILLA_COMPONENT_PKG_ERRORS
+ 
+@@ -22207,7 +22222,7 @@ Alternatively, you may set the environme
+ and MOZILLA_COMPONENT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) were not met:
++echo "$as_me: error: Package requirements ($MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version) were not met:
+ 
+ $MOZILLA_COMPONENT_PKG_ERRORS
+ 
+@@ -22251,13 +22266,13 @@ fi
+ 
+ 
+ 
+-MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-gtkmozembed`"
++MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA_GTKMOZEMBED`"
+ 
+ 
+-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA-gtkmozembed`"
++MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $MOZILLA_GTKMOZEMBED`"
+ 
+ 
+-MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $MOZILLA-gtkmozembed`"
++MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $MOZILLA_GTKMOZEMBED`"
+ 
+ 
+ ac_ext=cpp
+@@ -22333,7 +22348,7 @@ fi
+ 
+ 
+ 
+-CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom`"
++CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA_XPCOM`"
+ 
+ 
+ { echo "$as_me:$LINENO: checking whether nsIFilePicker methods expect nsAString&" >&5
+@@ -22598,16 +22613,16 @@ if test -n "$PKG_CONFIG"; then
+         if test -n "$PKG_CONFIG" && \
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.2
+ 		  libgnomeui-2.0 >= 2.2
+-                  \$MOZILLA-gtkmozembed\"") >&5
++                  \$MOZILLA_GTKMOZEMBED\"") >&5
+   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.2
+ 		  libgnomeui-2.0 >= 2.2
+-                  $MOZILLA-gtkmozembed") 2>&5
++                  $MOZILLA_GTKMOZEMBED") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   pkg_cv_LIBBLAM_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.2
+ 		  libgnomeui-2.0 >= 2.2
+-                  $MOZILLA-gtkmozembed" 2>/dev/null`
++                  $MOZILLA_GTKMOZEMBED" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22622,16 +22637,16 @@ if test -n "$PKG_CONFIG"; then
+         if test -n "$PKG_CONFIG" && \
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.2
+ 		  libgnomeui-2.0 >= 2.2
+-                  \$MOZILLA-gtkmozembed\"") >&5
++                  \$MOZILLA_GTKMOZEMBED\"") >&5
+   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.2
+ 		  libgnomeui-2.0 >= 2.2
+-                  $MOZILLA-gtkmozembed") 2>&5
++                  $MOZILLA_GTKMOZEMBED") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   pkg_cv_LIBBLAM_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.2
+ 		  libgnomeui-2.0 >= 2.2
+-                  $MOZILLA-gtkmozembed" 2>/dev/null`
++                  $MOZILLA_GTKMOZEMBED" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22652,18 +22667,18 @@ fi
+         if test $_pkg_short_errors_supported = yes; then
+ 	        LIBBLAM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.2
+ 		  libgnomeui-2.0 >= 2.2
+-                  $MOZILLA-gtkmozembed"`
++                  $MOZILLA_GTKMOZEMBED"`
+         else
+ 	        LIBBLAM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= 2.2
+ 		  libgnomeui-2.0 >= 2.2
+-                  $MOZILLA-gtkmozembed"`
++                  $MOZILLA_GTKMOZEMBED"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBBLAM_PKG_ERRORS" >&5
+ 
+ 	{ { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.2
+ 		  libgnomeui-2.0 >= 2.2
+-                  $MOZILLA-gtkmozembed) were not met:
++                  $MOZILLA_GTKMOZEMBED) were not met:
+ 
+ $LIBBLAM_PKG_ERRORS
+ 
+@@ -22676,7 +22691,7 @@ See the pkg-config man page for more det
+ " >&5
+ echo "$as_me: error: Package requirements (gtk+-2.0 >= 2.2
+ 		  libgnomeui-2.0 >= 2.2
+-                  $MOZILLA-gtkmozembed) were not met:
++                  $MOZILLA_GTKMOZEMBED) were not met:
+ 
+ $LIBBLAM_PKG_ERRORS
+