sync with 0.9.2cvs9

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5da9418e9ef2e6608b5797655d5e2d5cdf6bb985..c178a04d52add72e441cb2b2f2a17e97479104b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws9
+EXTRA_VERSION=claws69
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -78,9 +78,11 @@ case "$target" in
        ;;
 esac
 
+AM_ICONV
+
 dnl for gettext
 ALL_LINGUAS="bg cs de el en_GB es fr hr hu it ja ko nl pl pt_BR ru sr sv zh_TW.Big5"
-AM_GNU_GETTEXT
+AM_GNU_GETTEXT([use-libtool])
 dnl AC_CHECK_FUNC(gettext, AC_CHECK_LIB(intl, gettext))
 localedir='${prefix}/${DATADIRNAME}/locale'
 AC_SUBST(localedir)
@@ -128,7 +130,19 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h sys/file.h unistd.h paths.h \
                 sys/param.h sys/utsname.h sys/select.h \
-                wchar.h wctype.h)
+                wchar.h wctype.h locale.h)
+
+dnl alf - Check for apache installation f*ck up. apache may also install an 
+dnl fnmatch, which includes their own regex stuff if USE_HSREGEX is defined
+AC_TRY_COMPILE([#include <stdlib.h>
+               #include <fnmatch.h>],
+       [int x = USE_HSREGEX;],
+       ac_cv_have_apache_fnmatch=yes, ac_cv_have_apache_fnmatch=no)
+if test $ac_cv_have_apache_fnmatch = yes; then
+       AC_DEFINE(HAVE_APACHE_FNMATCH, 1, Define if you need to work around apache regex/fnmatch !KLUDGE!)
+fi
+AC_MSG_CHECKING([whether to use Apache regex header kludge])
+AC_MSG_RESULT($ac_cv_have_apache_fnmatch)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -473,6 +487,7 @@ src/plugins/mathml_viewer/Makefile
 src/plugins/dillo_viewer/Makefile
 src/plugins/image_viewer/Makefile
 src/plugins/trayicon/Makefile
+src/plugins/trayicon/libeggtrayicon/Makefile
 src/plugins/clamav/Makefile
 faq/Makefile
 faq/de/Makefile