* AUTHORS

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b2a44230c5c6131e4cd85dbf94f9e85e05676181..c417f477ff665a073404a208bbd8f5d9519d22db 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,11 +7,11 @@ PACKAGE=sylpheed
 
 dnl version number
 MAJOR_VERSION=0
-MINOR_VERSION=8
-MICRO_VERSION=11
+MINOR_VERSION=9
+MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws145
+EXTRA_VERSION=claws34
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -79,7 +79,7 @@ case "$target" in
 esac
 
 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"
+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
 dnl AC_CHECK_FUNC(gettext, AC_CHECK_LIB(intl, gettext))
 localedir='${prefix}/${DATADIRNAME}/locale'
@@ -130,6 +130,18 @@ 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)
 
+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
 AC_TYPE_OFF_T
@@ -413,9 +425,9 @@ fi
 AM_CONDITIONAL(BUILD_IMAGE_VIEWER_PLUGIN, test x"$ac_cv_enable_image_viewer_plugin" = xyes)
 if test x"$ac_cv_enable_image_viewer_plugin" = xyes; then
        if test "$ac_cv_enable_gdk_pixbuf" = yes; then
-               PLUGINS="image-viewer(gdk-pixbuf)"
+               PLUGINS="image-viewer(gdk-pixbuf) $PLUGINS"
        elif test "$ac_cv_enable_imlib" = yes; then
-               PLUGINS="image-viewer(gdk_imlib)"
+               PLUGINS="image-viewer(gdk_imlib) $PLUGINS"
        fi
 fi
 
@@ -445,7 +457,9 @@ if test x"$ac_cv_enable_clamav_plugin" = xyes; then
        then
                AC_MSG_ERROR(clamav library not found)
        fi
-       LIBS="${clamav_lib} ${LIBS}"
+       CLAMAV_LIBS="${clamav_lib}"
+       AC_SUBST(CLAMAV_LIBS)
+
        PLUGINS="clamav $PLUGINS"
 fi