* src/main.c

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 51b6af8cd7d1b6053c5f21c9d7400f28f31404d0..2e6a19825306da2f86677c5dacbf49eb051b2401 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ PACKAGE=sylpheed
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=9
-MICRO_VERSION=0
+MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws29
+EXTRA_VERSION=claws2
 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,7 @@ 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
@@ -217,6 +219,14 @@ AC_ARG_WITH(passcrypt-key, [  --with-passcrypt-key=KEY     Key used to encode pa
            with_passcrypt_key="$withval", with_passcrypt_key="passkey0")
 AC_SUBST(PASSCRYPT_KEY, $with_passcrypt_key)
 
+dnl RC dir (will be default at a certain point in time)
+AC_ARG_WITH(config-dir,    [  --with-config-dir=RCDIR      Local configuration dir (default: .sylpheed)],
+             ac_cv_with_config_dir="$withval", ac_cv_with_config_dir=".sylpheed")
+if test x"$ac_cv_with_config_dir" = x""; then
+       ac_cv_with_config_dir=".sylpheed"
+fi 
+AC_DEFINE_UNQUOTED(CFG_RC_DIR, "$ac_cv_with_config_dir", Configuration directory)
+
 dnl ************************
 dnl ** GTK user interface **
 dnl ************************
@@ -389,8 +399,7 @@ AC_ARG_ENABLE(mathml-viewer-plugin,
        [ac_cv_enable_mathml_viewer_plugin=$enableval], [ac_cv_enable_mathml_viewer_plugin=no])
 AM_CONDITIONAL(BUILD_MATHML_VIEWER_PLUGIN, test x"$ac_cv_enable_mathml_viewer_plugin" = xyes)
 if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
-       GTK_MATH_VIEW_CFLAGS=$( gtkmathview-config --cflags )
-       GTK_MATH_VIEW_LIBS=$( gtkmathview-config --libs )
+       PKG_CHECK_MODULES(GTK_MATH_VIEW, gtkmathview >= 0.4.2)
        AC_SUBST(GTK_MATH_VIEW_CFLAGS)
        AC_SUBST(GTK_MATH_VIEW_LIBS)
 
@@ -418,7 +427,7 @@ if test x"$ac_cv_enable_image_viewer_plugin" = xyes; then
                        AC_DEFINE(HAVE_GDK_IMLIB, 1, Define if you use gdk_imlib to support image viewer),
                        [ac_cv_enable_imlib=no])
        fi
-       if test "$ac_cv_enable_gdk_pixbuf" = no -a "$ac_cv_enable_imlib" = no; then
+       if test x"$ac_cv_enable_gdk_pixbuf" = xno -a x"$ac_cv_enable_imlib" = xno; then
                $ac_cv_enable_image_viewer_plugin = no
        fi
 fi
@@ -485,6 +494,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
@@ -517,6 +527,7 @@ echo "IPv6          : $ac_cv_enable_ipv6"
 echo "GNU/aspell    : $ac_cv_enable_aspell"
 echo "Crash dialog  : $ac_cv_enable_crash_dialog"
 echo "Plugins       : $PLUGINS"
+echo "Config dir    : $ac_cv_with_config_dir"
 echo ""
 echo "The binary will be installed in $prefix/bin"
 echo ""