RSSyl: Convert relative URLs in Atom entries to absolute URLs, using feed's <link...

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ed09b5f41104711a146fcdbde7588d271b987861..3966e419731d3ad0f4edfcf712883d369339cd91 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -205,18 +205,14 @@ LIBS="$LIBS $GTK_LIBS"
 AC_CHECK_FUNCS(bind_textdomain_codeset)
 LIBS=$syl_save_LIBS
 
-dnl for i18n
-ALL_LINGUAS="bg ca cs de en_GB eo es fi fr he hu id_ID it ja lt nl pl pt_BR pt_PT ru sk sv uk zh_CN zh_TW"
+dnl for gettext
+ALL_LINGUAS="bg ca cs de en_GB eo es fi fr he hu id_ID it ja lt nb nl pl pt_BR pt_PT ru sk sv uk zh_CN zh_TW"
 GETTEXT_PACKAGE=claws-mail
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
 
 AM_GNU_GETTEXT_VERSION([0.18])
 AM_GNU_GETTEXT([external])
-AM_NLS
-AS_IF([test x"$enable_nls" != xno], [
-       IT_PROG_INTLTOOL
-])
 
 AC_ARG_ENABLE(manual,
                [  --disable-manual                Do not build user manual],
@@ -907,19 +903,6 @@ else
 fi
 AM_CONDITIONAL(CLAWS_VALGRIND, test x"$enable_valgrind" = x"yes")
 
-dnl disabled by default
-AC_ARG_ENABLE(appdata,
-               [  --enable-appdata             Build appdata],
-               [enable_appdata=$enableval], [enable_appdata=no])
-
-AC_MSG_CHECKING([whether to build appdata])
-if test x"$enable_appdata" != xno; then
-       AC_MSG_RESULT(yes)
-else
-       AC_MSG_RESULT(no)
-fi
-AM_CONDITIONAL(BUILD_APPDATA, test x"$enable_appdata" = x"yes")
-
 dnl *************************
 dnl ** section for plugins **
 dnl *************************
@@ -1279,11 +1262,13 @@ AC_SUBST(libcanberra_gtk_CFLAGS)
 AC_SUBST(libcanberra_gtk_LIBS)
 
 dnl libindicate ****************************************************************
-dnl We support either 0.3+ or 0.5+
+dnl We support either 0.3+ or 0.5+ or 0.6+ or 0.7+
 LIBINDICATE_MODULE=indicate
 LIBINDICATE_REQUIRED=0.3.0
 
 PKG_CHECK_EXISTS(indicate-0.5 >= 0.5.0, LIBINDICATE_MODULE=indicate-0.5)
+PKG_CHECK_EXISTS(indicate-0.6 >= 0.6.0, LIBINDICATE_MODULE=indicate-0.6)
+PKG_CHECK_EXISTS(indicate-0.7 >= 0.7.0, LIBINDICATE_MODULE=indicate-0.7)
 PKG_CHECK_MODULES(libindicate, $LIBINDICATE_MODULE >= $LIBINDICATE_REQUIRED, HAVE_LIBINDICATE=yes, HAVE_LIBINDICATE=no)
 if test x"$HAVE_LIBINDICATE" = xyes; then
        AC_DEFINE(NOTIFICATION_INDICATOR, 1, [Activate support for indicators])
@@ -1908,7 +1893,6 @@ dnl ****************************
 
 AC_OUTPUT([
 Makefile
-appdata/Makefile
 m4/Makefile
 po/Makefile.in
 src/common/version.h
@@ -2019,7 +2003,6 @@ echo "DBUS               : $enable_dbus"
 echo "NetworkManager     : $enable_networkmanager"
 echo "Manual             : $enable_manual"
 echo "Generic UMPC code  : $enable_generic_umpc"
-echo "AppData            : $enable_appdata"
 echo "Config dir         : $ac_cv_with_config_dir"
 
 echo "Plugins"