diff -urNad liferea-1.4.14~/configure liferea-1.4.14/configure
--- liferea-1.4.14~/configure 2008-03-12 00:43:44.000000000 +0100
+++ liferea-1.4.14/configure 2008-03-31 17:42:29.000000000 +0200
@@ -1619,7 +1619,7 @@
--disable-xulrunner don't compile the xulrunner backend
--disable-gecko don't compile the Gecko backend
--enable-gecko=ARG specify which Gecko provider to use ("mozilla",
- "firefox" or "seamonkey")
+ "firefox", "xulrunner-1.9" or "seamonkey")
--enable-gnutls Attempt to use GNUTLS for SSL support [default=yes]
--disable-libnotify don't compile the libnotify plugin
--disable-lua don't compile with LUA scripting support
@@ -25119,158 +25119,22 @@
if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then
gecko_provider=mozilla
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for MOZILLA" >&5
-echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$MOZILLA_CFLAGS"; then
- pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5
- ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null`
-else
- pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$MOZILLA_LIBS"; then
- pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5
- ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _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 "$gecko_provider-gtkmozembed"`
- else
- MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$MOZILLA_PKG_ERRORS" >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- enable_mozilla=no
-elif test $pkg_failed = untried; then
- enable_mozilla=no
-else
- MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS
- MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- enable_mozilla=yes
-fi
- { echo "$as_me:$LINENO: result: $gecko_provider: $enable_mozilla" >&5
-echo "${ECHO_T}$gecko_provider: $enable_mozilla" >&6; }
+if test "x$enable_mozilla" != "xyes" -a "x$enable_gecko" = "xxulrunner-1.9" ; then
+ gecko_provider=xulrunner-1.9
+ gecko_provider_gtkmozembed=libxul-embedding
fi
if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then
gecko_provider=firefox
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for MOZILLA" >&5
-echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$MOZILLA_CFLAGS"; then
- pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5
- ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$MOZILLA_LIBS"; then
- pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5
- ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _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 "$gecko_provider-gtkmozembed"`
- else
- MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$MOZILLA_PKG_ERRORS" >&5
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- enable_mozilla=no
-elif test $pkg_failed = untried; then
- enable_mozilla=no
-else
- MOZILLA_CFLAGS=$pkg_cv_MOZILLA_CFLAGS
- MOZILLA_LIBS=$pkg_cv_MOZILLA_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- enable_mozilla=yes
-fi
- { echo "$as_me:$LINENO: result: $gecko_provider: $enable_mozilla" >&5
-echo "${ECHO_T}$gecko_provider: $enable_mozilla" >&6; }
fi
if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then
gecko_provider=seamonkey
+fi
+
+if test "x$gecko_provider" != "x"; then
+ if test "$gecko_provider_gtkmozembed" = "x"; then
+ gecko_provider_gtkmozembed=$gecko_provider-gtkmozembed
+ fi
pkg_failed=no
{ echo "$as_me:$LINENO: checking for MOZILLA" >&5
@@ -25281,12 +25145,12 @@
pkg_cv_MOZILLA_CFLAGS="$MOZILLA_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5
- ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider_gtkmozembed\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$gecko_provider_gtkmozembed") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider-gtkmozembed" 2>/dev/null`
+ pkg_cv_MOZILLA_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider_gtkmozembed" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -25299,12 +25163,12 @@
pkg_cv_MOZILLA_LIBS="$MOZILLA_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider-gtkmozembed\"") >&5
- ($PKG_CONFIG --exists --print-errors "$gecko_provider-gtkmozembed") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$gecko_provider_gtkmozembed\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$gecko_provider_gtkmozembed") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider-gtkmozembed" 2>/dev/null`
+ pkg_cv_MOZILLA_LIBS=`$PKG_CONFIG --libs "$gecko_provider_gtkmozembed" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -25323,9 +25187,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 "$gecko_provider-gtkmozembed"`
+ MOZILLA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gecko_provider_gtkmozembed"`
else
- MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider-gtkmozembed"`
+ MOZILLA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gecko_provider_gtkmozembed"`
fi
# Put the nasty error message in config.log where it belongs
echo "$MOZILLA_PKG_ERRORS" >&5
@@ -25342,7 +25206,7 @@
echo "${ECHO_T}yes" >&6; }
enable_mozilla=yes
fi
- { echo "$as_me:$LINENO: result: $gecko_provider: $enable_mozilla" >&5
+ { echo "$as_me:$LINENO: result: $gecko_provider: $enable_mozilla" >&5
echo "${ECHO_T}$gecko_provider: $enable_mozilla" >&6; }
fi
@@ -25828,9 +25692,9 @@
- MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider-gtkmozembed | awk '{print $1}' | sed "s/^-I//"`
+ MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider_gtkmozembed | awk '{print $1}' | sed "s/^-I//"`
MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT`
- MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider-gtkmozembed | awk '{print $1}' | cut -c 3-`
+ MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider_gtkmozembed | awk '{print $1}' | cut -c 3-`
MOZILLA_CFLAGS="$MOZILLA_CFLAGS \
-I$MOZILLA_INCLUDE_ROOT \
diff -urNad liferea-1.4.14~/configure.ac liferea-1.4.14/configure.ac
--- liferea-1.4.14~/configure.ac 2008-02-29 00:45:05.000000000 +0100
+++ liferea-1.4.14/configure.ac 2008-03-31 17:42:29.000000000 +0200
@@ -36,7 +36,7 @@
AC_ARG_ENABLE(webkit, AS_HELP_STRING([--disable-webkit],[don't compile the webkit backend]),,enable_webkit=yes)
AC_ARG_ENABLE(xulrunner, AS_HELP_STRING([--disable-xulrunner],[don't compile the xulrunner backend]),,enable_xulrunner=yes)
AC_ARG_ENABLE(gecko, AS_HELP_STRING([--disable-gecko],[don't compile the Gecko backend]),,enable_gecko=yes)
-AC_ARG_ENABLE(gecko, AS_HELP_STRING([--enable-gecko=ARG],[specify which Gecko provider to use ("mozilla", "firefox" or "seamonkey")]),,enable_gecko=yes)
+AC_ARG_ENABLE(gecko, AS_HELP_STRING([--enable-gecko=ARG],[specify which Gecko provider to use ("mozilla", "firefox", "xulrunner-1.9" or "seamonkey")]),,enable_gecko=yes)
AC_ARG_ENABLE(gnutls, AS_HELP_STRING([--enable-gnutls],[Attempt to use GNUTLS for SSL support @<:@default=yes@:>@]),,enable_gnutls=yes)
AC_ARG_ENABLE(libnotify, AS_HELP_STRING([--disable-libnotify],[don't compile the libnotify plugin]),,enable_libnotify=yes)
AC_ARG_ENABLE(lua, AS_HELP_STRING([--disable-lua],[don't compile with LUA scripting support]),,enable_lua=yes)
@@ -215,18 +215,24 @@
if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then
gecko_provider=mozilla
- PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no)
- AC_MSG_RESULT($gecko_provider: $enable_mozilla)
+fi
+if test "x$enable_mozilla" != "xyes" -a "x$enable_gecko" = "xxulrunner-1.9" ; then
+ gecko_provider=xulrunner-1.9
+ gecko_provider_gtkmozembed=libxul-embedding
fi
if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then
gecko_provider=firefox
- PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no)
- AC_MSG_RESULT($gecko_provider: $enable_mozilla)
fi
if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then
gecko_provider=seamonkey
- PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no)
- AC_MSG_RESULT($gecko_provider: $enable_mozilla)
+fi
+
+if test "x$gecko_provider" != "x"; then
+ if test "$gecko_provider_gtkmozembed" = "x"; then
+ gecko_provider_gtkmozembed=$gecko_provider-gtkmozembed
+ fi
+ PKG_CHECK_MODULES(MOZILLA, $gecko_provider_gtkmozembed, enable_mozilla=yes, enable_mozilla=no)
+ AC_MSG_RESULT($gecko_provider: $enable_mozilla)
fi
AM_CONDITIONAL(WITH_MOZILLA, test "x$enable_mozilla" = "xyes")
@@ -246,9 +252,9 @@
dnl of macros to come around this. Which I would like to
dnl avoid. So this might be not very portable...
- MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider-gtkmozembed | awk '{print $1}' | sed "s/^-I//"`
+ MOZILLA_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider_gtkmozembed | awk '{print $1}' | sed "s/^-I//"`
MOZILLA_INCLUDE_ROOT=`dirname $MOZILLA_INCLUDE_ROOT`
- MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider-gtkmozembed | awk '{print $1}' | cut -c 3-`
+ MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider_gtkmozembed | awk '{print $1}' | cut -c 3-`
dnl Maybe we don't need all of this...
MOZILLA_CFLAGS="$MOZILLA_CFLAGS \