dnl version number
MAJOR_VERSION=1
MINOR_VERSION=9
-MICRO_VERSION=13
+MICRO_VERSION=14
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=32
+EXTRA_VERSION=46
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
*-darwin*)
CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
;;
+*-*-mingw*)
+ CFLAGS="$CFLAGS -mms-bitfields"
+ LIBS="$LIBS -lws2_32"
+ ;;
esac
dnl Checks for iconv
LIBS=$syl_save_LIBS
dnl for gettext
-ALL_LINGUAS="bg ca cs de el en_GB es fi fr hr hu it ja ko nb nl pl pt_BR ru sk sr sv zh_CN zh_TW.Big5"
+ALL_LINGUAS="bg ca cs de el en_GB es fi fr hr hu it ja ko nb nl pl pt_BR ru sk sr sv zh_CN zh_TW"
GETTEXT_PACKAGE=sylpheed-claws
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
dnl AM_GNU_GETTEXT
dnl AC_CHECK_FUNC(gettext, AC_CHECK_LIB(intl, gettext))
localedir='${prefix}/${DATADIRNAME}/locale'
+AC_ARG_WITH(localedir,
+ [ --with-localedir=DIR Locale directory],
+ [localedir="$withval"])
AC_SUBST(localedir)
manualdir='${prefix}/${DATADIRNAME}/${PACKAGE}/manual'
+AC_ARG_WITH(manualdir,
+ [ --with-manualdir=DIR Manual directory],
+ [manualdir="$withval"])
AC_SUBST(manualdir)
+
faqdir='${prefix}/${DATADIRNAME}/${PACKAGE}/faq'
+AC_ARG_WITH(faqdir,
+ [ --with-faqdir=DIR FAQ directory],
+ [faqdir="$withval"])
AC_SUBST(faqdir)
dnl Set PACKAGE_DATA_DIR in config.h.
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 locale.h)
+ wchar.h wctype.h locale.h netdb.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
wcsstr wcswcs iswalnum iswspace towlower \
wcslen wcscpy wcsncpy \
uname flock lockf inet_aton inet_addr \
- fchmod mkstemp)
+ fchmod mkstemp truncate getuid regcomp)
dnl *****************
dnl ** common code **
dnl GNU/Aspell is used for spell checking
AC_ARG_ENABLE(aspell,
- [ --enable-aspell Enable GNU/aspell support [default=no]],
- [ac_cv_enable_aspell=$enableval], [ac_cv_enable_aspell=no])
+ [ --disable-aspell Disable GNU/aspell support [default=yes]],
+ [ac_cv_enable_aspell=$enableval], [ac_cv_enable_aspell=yes])
AC_MSG_CHECKING([whether to use GNU/aspell])
if test $ac_cv_enable_aspell = yes; then
AC_MSG_RESULT(yes)
dnl for LDAP support in addressbook
dnl no check for libraries; dynamically loaded
AC_ARG_ENABLE(ldap,
- [ --enable-ldap Enable LDAP support [default=no]],
- [ac_cv_enable_ldap=$enableval], [ac_cv_enable_ldap=no])
+ [ --disable-ldap Do not build LDAP support [default=yes]],
+ [ac_cv_enable_ldap=$enableval], [ac_cv_enable_ldap=yes])
AC_MSG_CHECKING([whether to use LDAP])
if test x"$ac_cv_enable_ldap" = xno; then
AC_MSG_RESULT(no)
AC_MSG_RESULT($ac_cv_have_tls)
if test "$ac_cv_enable_ldap" = yes; then
- CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
- LDAP_LIBS="$LDAP_LIBS -lldap `$GLIB_CONFIG --libs gthread`"
AC_DEFINE(USE_LDAP, 1, Define if you want LDAP support in addressbook.)
+ LDAP_LIBS="$LDAP_LIBS -lldap"
AC_SUBST(LDAP_LIBS)
if test "$ac_cv_have_tls" = yes; then
AC_DEFINE(USE_LDAP_TLS, 1, Define if you want LDAP TLS support in addressbook.)
dnl for JPilot support in addressbook
dnl no check for libraries; these are dynamically loaded
AC_ARG_ENABLE(jpilot,
- [ --enable-jpilot Enable JPilot support [default=no]],
- [ac_cv_enable_jpilot=$enableval], [ac_cv_enable_jpilot=no])
+ [ --disable-jpilot Enable JPilot support [default=yes]],
+ [ac_cv_enable_jpilot=$enableval], [ac_cv_enable_jpilot=yes])
AC_MSG_CHECKING([whether to use JPilot])
if test "$ac_cv_enable_jpilot" = yes; then
AC_MSG_RESULT(yes)
if test "x$libetpan_result" = "xyes"; then
AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
LDFLAGS="$LDFLAGS `$libetpanconfig --libs 2>/dev/null`"
- AC_TRY_LINK([], [db_mailstorage_init();], [libetpan_result=yes], [libetpan_result=no])
+ AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
AC_MSG_RESULT([$libetpan_result])
fi
fi
LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
LIBETPAN_LIBS="`$libetpanconfig --libs`"
LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
- if test "$LIBETPAN_VERSION" -lt "038"; then
- AC_MSG_ERROR([Sylpheed requires libetpan 0.38 or newer. See http://www.etpan.org/])
+ if test "$LIBETPAN_VERSION" -lt "039"; then
+ AC_MSG_ERROR([Sylpheed requires libetpan 0.39 or newer. See http://www.etpan.org/])
AC_MSG_ERROR([You can use --disable-libetpan if you don't need IMAP4 support.])
fi
AC_SUBST(LIBETPAN_FLAGS)