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