MICRO_VERSION=3
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=claws22
+EXTRA_VERSION=claws51
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl set $target
AM_CONDITIONAL(SYLPHEED_GNOME, test -d "$gnomedir")
dnl Claws version
-AC_DEFINE(CLAWS, 1)
+AC_DEFINE(CLAWS, 1, Compiling Claws branch of sylpheed)
dnl libtool versioning
LT_RELEASE=$MAJOR_VERSION.$MINOR_VERSION
dnl Set PACKAGE_DATA_DIR in config.h.
if test "x${datadir}" = 'x${prefix}/share'; then
if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}")
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", PACKAGE_DATA_DIR)
else
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", PACKAGE_DATA_DIR)
fi
else
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", PACKAGE_DATA_DIR)
fi
dnl Checks for libraries.
if test "$ac_cv_enable_gdk_pixbuf" = yes; then
AM_PATH_GDK_PIXBUF(0.8.0,
- [AC_DEFINE(HAVE_GDK_PIXBUF)
+ [AC_DEFINE(HAVE_GDK_PIXBUF, 1, Use GDK Pixbuf for image rendering)
ac_cv_enable_imlib=no], [ac_cv_enable_gdk_pixbuf=no])
fi
if test "$ac_cv_enable_imlib" = yes; then
AM_PATH_GDK_IMLIB(1.9,
- AC_DEFINE(HAVE_GDK_IMLIB), [ac_cv_enable_imlib=no])
+ AC_DEFINE(HAVE_GDK_IMLIB, 1, Use GDK Imlib for image rendering), [ac_cv_enable_imlib=no])
fi
if test "$ac_cv_enable_gdk_pixbuf" = no -a "$ac_cv_enable_imlib" = no; then
AC_MSG_WARN(*** Built-in image view will not be supported ***)
AC_MSG_CHECKING([whether to use GPGME])
if test $ac_cv_enable_gpgme = yes; then
AC_MSG_RESULT(yes)
- AM_PATH_GPGME(0.3.5, AC_DEFINE(USE_GPGME), [use_gpgme=no
- ac_cv_enable_gpgme=no])
+ AM_PATH_GPGME(0.3.5, AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP),
+ [use_gpgme=no ac_cv_enable_gpgme=no])
else
AC_MSG_RESULT(no)
fi
if test "$ac_cv_enable_jpilot" = yes; then
AC_MSG_RESULT(yes)
AC_CHECK_HEADERS(pi-args.h pi-appinfo.h pi-address.h,
- [ AC_DEFINE(USE_JPILOT) ],
+ [ AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ],
[ ac_cv_enable_jpilot=no ])
if test "$ac_cv_enable_jpilot" = no; then
AC_CHECK_HEADERS(libpisock/pi-args.h libpisock/pi-appinfo.h libpisock/pi-address.h,
[ ac_cv_enable_jpilot=yes
- AC_DEFINE(USE_JPILOT) ])
+ AC_DEFINE(USE_JPILOT, 1) ])
fi
AC_MSG_CHECKING([whether jpilot is available])
AC_MSG_RESULT($ac_cv_enable_jpilot)
AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="$LDAP_LIBS -lresolv")
AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
- AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="$LDAP_LIBS -llber")
+ AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="$LDAP_LIBS -llber",,
+ $LDAP_LIBS)
dnl we need libpthread for sylpheed ldap, until we find
dnl a better way to handle ldap requests asynchronously...
AC_CHECK_LIB(pthread, pthread_create, LDAP_LIBS="$LDAP_LIBS -lpthread")
- dnl the check for the headers
AC_CHECK_HEADERS(ldap.h lber.h pthread.h,
[ ac_cv_enable_ldap=yes ],
[ ac_cv_enable_ldap=no ])
- AC_MSG_CHECKING([whether ldap headers were detected])
+
+ if test "$ac_cv_enable_ldap" = yes; then
+ AC_CHECK_LIB(ldap, ldap_open,
+ [ ac_cv_enable_ldap=yes ],
+ [ ac_cv_enable_ldap=no ],
+ $LDAP_LIBS)
+ fi
+
+ AC_MSG_CHECKING([whether ldap library is available])
AC_MSG_RESULT($ac_cv_enable_ldap)
if test "$ac_cv_enable_ldap" = yes; then
- AC_CHECK_LIB(ldap, ldap_open, [
- ac_cv_enable_ldap=yes
- CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
- LDAP_LIBS="$LDAP_LIBS -lldap `$GLIB_CONFIG --libs gthread`"
- AC_DEFINE(USE_LDAP)
- AC_SUBST(LDAP_LIBS)
- ],
- [ ac_cv_enable_ldap=no ], $LDAP_LIBS )
- AC_MSG_CHECKING([whether ldap libs were detected])
- AC_MSG_RESULT($ac_cv_enable_ldap)
+ CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
+ LDAP_LIBS="$LDAP_LIBS -lldap `$GLIB_CONFIG --libs gthread`"
+ AC_DEFINE(USE_LDAP, 1, Define LDAP support in addressbook.)
+ AC_SUBST(LDAP_LIBS)
fi
else
AC_MSG_RESULT(no)
#include <openssl/opensslv.h>
], [ return OPENSSL_VERSION_NUMBER; ],
[ AC_MSG_RESULT(yes)
- AC_DEFINE(USE_SSL) ],
+ AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL) ],
[ AC_MSG_RESULT(no)
LIBS="$ac_save_LIBS"
ac_cv_enable_ssl=no ])
if test ! -z `$GLIB_CONFIG --help 2>&1 |grep 'gthread'` ; then
CFLAGS="$CFLAGS `$GLIB_CONFIG --cflags gthread`"
LIBS="$LIBS `$GLIB_CONFIG --libs gthread`"
- AC_DEFINE(USE_THREADS)
+ AC_DEFINE(USE_THREADS, 1, Whether to use multithread or not)
else
AC_MSG_ERROR([Sylpheed requires GThread from GLib to use threading.])
fi
])
AC_MSG_RESULT($ac_cv_ipv6)
if test $ac_cv_ipv6 = yes; then
- AC_DEFINE(INET6)
+ AC_DEFINE(INET6, 1, Define if you want IPv6 support.)
else
AC_MSG_WARN(*** IPv6 will not be supported ***)
ac_cv_enable_ipv6=no
AC_MSG_CHECKING([whether to use GNU/aspell])
if test $ac_cv_enable_aspell = yes; then
AC_MSG_RESULT(yes)
- AM_PATH_ASPELL(0.50, AC_DEFINE(USE_ASPELL), [use_aspell=no
- ac_cv_enable_aspell=no])
- aspell_path="`$ASPELL config dict-dir`"
- AC_DEFINE_UNQUOTED(ASPELL_PATH, "${aspell_path}/")
+ AM_PATH_ASPELL(0.50, AC_DEFINE(USE_ASPELL, 1, Define if you use ASPELL to support spell checking),
+ [use_aspell=no ac_cv_enable_aspell=no])
else
AC_MSG_RESULT(no)
fi
])
AC_MSG_RESULT($ac_cv_use_gtkgdk_xim)
if test $ac_cv_use_gtkgdk_xim = yes; then
- AC_DEFINE(USE_GTKGDK_XIM)
+ AC_DEFINE(USE_GTKGDK_XIM, 1, USE_GTKGDK_XIM)
fi
CFLAGS="$CFLAGS_SAVE"
LDFLAGS="$LDFLAGS_SAVE"
AC_CHECK_PROG(ac_cv_enable_crash_dialog, gdb, yes, no)
AC_MSG_CHECKING([whether to use crash dialog])
if test $ac_cv_enable_crash_dialog = yes; then
- AC_DEFINE(CRASH_DIALOG)
+ AC_DEFINE(CRASH_DIALOG, 1, Pop up crash dialog)
fi
AC_MSG_RESULT($ac_cv_enable_crash_dialog)
fi
#if HAVE_WCHAR_H
#include <wchar.h>
#endif
-])
+], Define to `unsigned int' if <stddef.h> or <wchar.h> doesn't define.)
-GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF)
+GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF, Used to test for a u32 typedef)
AC_CHECK_SIZEOF(unsigned short, 2)
AC_CHECK_SIZEOF(unsigned int, 4)
AC_CHECK_SIZEOF(unsigned long, 4)
else
echo "image support : no"
fi
-echo "GPGME : $ac_cv_enable_gpgme"
+echo "GnuPG : $ac_cv_enable_gpgme"
echo "JPilot : $ac_cv_enable_jpilot"
echo "LDAP : $ac_cv_enable_ldap"
echo "OpenSSL : $ac_cv_enable_ssl"
projects / claws.git / blobdiff