Libravatar: fix API usage if built without GnuTLS

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c82171e92a121396d46b95e19a68f4c44e5820e6..5eafd2a799525353265c3addeb973cba43ea0999 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -180,7 +180,7 @@ if test x"$_gcc_psign" = xyes ; then
        CFLAGS="$CFLAGS -Wno-pointer-sign"
 fi
 
-CFLAGS="$CFLAGS -Wall"
+CFLAGS="$CFLAGS -Wall -D_GNU_SOURCE"
 
 if test $USE_MAINTAINER_MODE = yes; then
        CFLAGS="$CFLAGS -g -Wno-pointer-sign -DUSE_MAINTAINER_MODE"
@@ -220,7 +220,7 @@ AC_CHECK_FUNCS(bind_textdomain_codeset)
 LIBS=$syl_save_LIBS
 
 dnl for gettext
-ALL_LINGUAS="ca cs da de en_GB es fi fr hu id_ID it ja nb nl pl pt_BR ro ru sk sv tr zh_TW"
+ALL_LINGUAS="ca cs da de en_GB es fi fr hu id_ID it ja nb nl pl pt_BR pt_PT ro ru sk sv tr zh_TW"
 GETTEXT_PACKAGE=claws-mail
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
@@ -296,16 +296,12 @@ AC_ARG_ENABLE(alternate-addressbook,
                [  --enable-alternate-addressbook  Build alternate external address book support],
                [enable_alternate_addressbook=$enableval], [enable_alternate_addressbook=no])
 
-AC_ARG_ENABLE(gtk3,
-               [  --enable-gtk3                   Build GTK3 support],
-               [enable_gtk3=$enableval], [enable_gtk3=no])
-
 AC_ARG_ENABLE(svg,
         [  --disable-svg                   Do not build SVG support],
         [enable_svg=$enableval], [enable_svg=yes])
 
 AC_ARG_ENABLE(tests,
-                               [ --enable-tests                   Build unit tests],
+                               [  --enable-tests                   Build unit tests],
                                [enable_tests=$enableval], [enable_tests=no])
 
 manualdir='${docdir}/manual'
@@ -427,7 +423,7 @@ AC_CHECK_FUNCS(gethostname mkdir mktime socket strstr strchr \
               uname flock lockf inet_aton inet_addr \
               fchmod mkstemp truncate getuid regcomp)
 
-AC_CHECK_FUNCS(fgets_unlocked fwrite_unlocked)
+AC_CHECK_FUNCS(fgets_unlocked fgetc_unlocked fputs_unlocked fputc_unlocked fread_unlocked fwrite_unlocked feof_unlocked ferror_unlocked fmemopen)
 
 dnl *****************
 dnl ** common code **
@@ -568,15 +564,7 @@ dnl ** GTK user interface **
 dnl ************************
 
 dnl Checks for GTK
-AM_CONDITIONAL(GTK3, false)
-AM_CONDITIONAL(GTK2, true)
-if test x"$enable_gtk3" = x"yes"; then
-       PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 cairo)
-       AM_CONDITIONAL(GTK3, true)
-       AM_CONDITIONAL(GTK2, false)
-else
-       PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24)
-fi
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24)
 AC_ARG_ENABLE(deprecated,
                [  --disable-deprecated            Disable deprecated GTK functions],
                [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])