diff -crB liferea-1.4.16b/configure liferea-1.4.16b-fedora/configure
*** liferea-1.4.16b/configure 2008-06-11 18:14:17.000000000 -0400
--- liferea-1.4.16b-fedora/configure 2008-07-02 11:00:02.000000000 -0400
***************
*** 1619,1625 ****
--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")
--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
--- 1619,1625 ----
--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", "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
***************
*** 25207,25365 ****
gecko_provider=mozilla
{ echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5
echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; }
-
- 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
! fi
if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then
gecko_provider=firefox
{ echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5
echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; }
- 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
fi
if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then
gecko_provider=seamonkey
{ echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5
echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; }
pkg_failed=no
{ echo "$as_me:$LINENO: checking for MOZILLA" >&5
echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; }
--- 25207,25245 ----
gecko_provider=mozilla
{ echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5
echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; }
fi
+ #change begin
+ 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
! #change end
!
if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then
gecko_provider=firefox
{ echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5
echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; }
fi
if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then
gecko_provider=seamonkey
{ echo "$as_me:$LINENO: checking for Gecko provider $gecko_provider" >&5
echo $ECHO_N "checking for Gecko provider $gecko_provider... $ECHO_C" >&6; }
+ #change begins
+
+ fi
+
+ if test "x$gecko_provider" != "x"; then
+ if test "$gecko_provider_gtkmozembed" = "x"; then
+ gecko_provider_gtkmozembed=$gecko_provider-gtkmozembed
+ fi
+
+ #change ends
+
pkg_failed=no
{ echo "$as_me:$LINENO: checking for MOZILLA" >&5
echo $ECHO_N "checking for MOZILLA... $ECHO_C" >&6; }
***************
*** 25369,25380 ****
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
--- 25249,25260 ----
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" nspr 2>/dev/null`
else
pkg_failed=yes
fi
***************
*** 25387,25398 ****
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
--- 25267,25278 ----
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
***************
*** 25411,25419 ****
_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
--- 25291,25299 ----
_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
***************
*** 25914,25922 ****
! 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_CFLAGS="$MOZILLA_CFLAGS \
-I$MOZILLA_INCLUDE_ROOT \
--- 25794,25802 ----
! 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_CFLAGS="$MOZILLA_CFLAGS \
-I$MOZILLA_INCLUDE_ROOT \
Only in liferea-1.4.16b-fedora: configure~
diff -crB liferea-1.4.16b/configure.ac liferea-1.4.16b-fedora/configure.ac
*** liferea-1.4.16b/configure.ac 2008-06-11 18:08:41.000000000 -0400
--- liferea-1.4.16b-fedora/configure.ac 2008-07-01 22:35:58.000000000 -0400
***************
*** 36,42 ****
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(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)
--- 36,42 ----
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", "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)
***************
*** 44,51 ****
AC_MSG_CHECKING([for 64bit platform])
case "$target" in
x86_64-*-*)
! enable_gtkhtml2=no
! AC_MSG_RESULT([yes -> disabling GtkHTML2])
;;
*)
AC_MSG_RESULT([no])
--- 44,51 ----
AC_MSG_CHECKING([for 64bit platform])
case "$target" in
x86_64-*-*)
! enable_gtkhtml2=yes
! AC_MSG_RESULT([yes -> enabling GtkHTML2])
;;
*)
AC_MSG_RESULT([no])
***************
*** 227,244 ****
if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then
gecko_provider=mozilla
- AC_MSG_CHECKING([for Gecko provider $gecko_provider])
- PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no)
fi
if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xfirefox" \) ; then
gecko_provider=firefox
- AC_MSG_CHECKING([for Gecko provider $gecko_provider])
- PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no)
fi
if test "x$enable_mozilla" != "xyes" -a \( "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xseamonkey" \) ; then
gecko_provider=seamonkey
! AC_MSG_CHECKING([for Gecko provider $gecko_provider])
! PKG_CHECK_MODULES(MOZILLA, $gecko_provider-gtkmozembed, enable_mozilla=yes, enable_mozilla=no)
fi
AM_CONDITIONAL(WITH_MOZILLA, test "x$enable_mozilla" = "xyes")
--- 227,251 ----
if test "x$enable_gecko" = "xyes" -o "x$enable_gecko" = "xmozilla" ; then
gecko_provider=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
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_CHECK_MODULES(MOZILLA, $gecko_provider_gtkmozembed, enable_mozilla=yes, enable_mozilla=no)
fi
AM_CONDITIONAL(WITH_MOZILLA, test "x$enable_mozilla" = "xyes")
***************
*** 258,266 ****
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=`dirname $MOZILLA_INCLUDE_ROOT`
! 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 \
--- 265,273 ----
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=`dirname $MOZILLA_INCLUDE_ROOT`
! 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 \