diff -up blam-1.8.5/configure.xlc blam-1.8.5/configure --- blam-1.8.5/configure.xlc 2008-10-27 12:00:43.000000000 -0400 +++ blam-1.8.5/configure 2008-10-27 12:10:38.000000000 -0400 @@ -22257,6 +22257,8 @@ fi $as_echo_n "checking which mozilla to use... " >&6; } MOZILLA= +MOZILLA_XPCOM= +MOZILLA_GTKMOZEMBED= # Check whether --with-mozilla was given. if test "${with_mozilla+set}" = set; then @@ -22265,16 +22267,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 { { $as_echo "$as_me:$LINENO: error: no mozilla installation found" >&5 $as_echo "$as_me: error: no mozilla installation found" >&2;} @@ -22296,13 +22312,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 { $as_echo "$as_me:$LINENO: checking for MOZILLA_COMPONENT" >&5 $as_echo_n "checking for MOZILLA_COMPONENT... " >&6; } @@ -22312,12 +22327,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { ($as_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 + { ($as_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=$? $as_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 @@ -22330,12 +22345,12 @@ if test -n "$PKG_CONFIG"; then pkg_cv_MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS" else if test -n "$PKG_CONFIG" && \ - { ($as_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 + { ($as_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=$? $as_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 @@ -22354,14 +22369,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 - { { $as_echo "$as_me:$LINENO: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements ($MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version) were not met: $MOZILLA_COMPONENT_PKG_ERRORS @@ -22372,7 +22387,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 -$as_echo "$as_me: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) were not met: +$as_echo "$as_me: error: Package requirements ($MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version) were not met: $MOZILLA_COMPONENT_PKG_ERRORS @@ -22418,13 +22433,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 @@ -22503,7 +22518,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`" { $as_echo "$as_me:$LINENO: checking whether nsIFilePicker methods expect nsAString&" >&5 @@ -22723,16 +22738,16 @@ if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { ($as_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=$? $as_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 @@ -22747,16 +22762,16 @@ if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { ($as_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=$? $as_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 @@ -22777,18 +22792,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 { { $as_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 @@ -22801,7 +22816,7 @@ See the pkg-config man page for more det " >&5 $as_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