AC_PROG_INSTALL
AC_PROG_RANLIB
AC_PROG_GPERF
+PKG_PROG_PKG_CONFIG
AC_CHECK_TOOL(AR, ar, ar)
AC_C_INLINE
have_gpgme=yes
fi
])
- AC_ARG_WITH(gpgme-prefix, AC_HELP_STRING([--with-gpgme-prefix=PFX], [prefix where GPGME is installed (optional)]),
- gpgme_config_prefix="$withval", gpgme_config_prefix="")
-
if test x$have_gpgme = xyes; then
- if test x$gpgme_config_prefix != x; then
- GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config"
- else
- AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no)
- fi
- if test "x$GPGME_CONFIG" = "xno"; then
- AC_MSG_ERROR([GPGME not found])
- else
- LIBGPGME_CFLAGS=`$GPGME_CONFIG --cflags`
- LIBGPGME_LIBS=`$GPGME_CONFIG --libs`
- MUTTLIBS="$MUTTLIBS $LIBGPGME_LIBS"
- MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS crypt-gpgme.o crypt-mod-pgp-gpgme.o crypt-mod-smime-gpgme.o"
- AC_DEFINE(CRYPT_BACKEND_GPGME, 1, [Defined, if GPGME support is enabled])
- fi
+ AM_PATH_GPGME(,,[AC_MSG_ERROR(GPGME not found)])
+ MUTTLIBS="$MUTTLIBS $GPGME_LIBS"
+ MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS crypt-gpgme.o crypt-mod-pgp-gpgme.o crypt-mod-smime-gpgme.o"
+ AC_DEFINE(CRYPT_BACKEND_GPGME, 1, [Defined, if GPGME support is enabled])
fi
- AC_SUBST(LIBGPGME_CFLAGS)
- AC_SUBST(LIBGPGME_LIBS)
dnl ---------------- mixmaster ----------------
AC_ARG_WITH(qdbm, AC_HELP_STRING([--without-qdbm], [Don't use qdbm even if it is available]),
ac_prefer_qdbm=$withval)
if test x$ac_prefer_qdbm != xno; then
- ac_cv_vlopen=no
- QDBM_DIRS="$mutt_cv_prefix /usr/local /usr"
- AC_MSG_CHECKING([for vlopen])
- for d in $QDBM_DIRS; do
- if test x$ac_cv_vlopen = xno && test -d "$d/include" && test -d "$d/lib"; then
- QDBM_INC="-I$d/include"
- QDBM_LIB="-L$d/lib"
- CPPFLAGS="$OLDCPPFLAGS $QDBM_INC"
- LIBS="$OLDLIBS $QDBM_LIB -lqdbm"
- AC_TRY_LINK([#include <villa.h>],[vlopen(0,0,0);],[ac_cv_vlopen=yes])
- fi
- done
- if test x$ac_cv_vlopen = xyes; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
+ PKG_CHECK_MODULES(QDBM,qdbm,[ac_qdbm_here=yes],[ac_qdbm_here=no])
fi
ac_prefer_gdbm=yes
AC_ARG_WITH(gdbm, AC_HELP_STRING([--without-gdbm], [Don't use gdbm even if it is available]),
ac_prefer_gdbm=$withval)
- if test x$ac_prefer_gdbm != xno -a x$ac_cv_vlopen != xyes; then
+ if test x$ac_prefer_gdbm != xno -a x$ac_qdbm_here != xyes; then
ac_cv_gdbmopen=no
GDBM_DIRS="$mutt_cv_prefix /usr/local /usr"
AC_MSG_CHECKING([for gdbm_open])
AC_MSG_RESULT(no)
fi
fi
-
+
ac_bdb_prefix=yes
AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb[=DIR]], [Use BerkeleyDB4 if gdbm is not available ]),
ac_bdb_prefix=$withval)
- if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != xyes; then
+ if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_qdbm_here != xyes; then
test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr"
for d in $ac_bdb_prefix; do
bdbpfx="$bdbpfx $d"
fi
fi
- if test x$ac_cv_vlopen = xyes; then
- CPPFLAGS="$OLDCPPFLAGS $QDBM_INC"
- LIBS="$OLDLIBS $QDBM_LIB -lqdbm"
+ if test x$ac_qdbm_here = xyes; then
+ CPPFLAGS="$OLDCPPFLAGS $QDBM_CFLAGS"
+ LIBS="$OLDLIBS $QDBM_LIBS"
AC_DEFINE(HAVE_QDBM, 1, [QDBM Support])
elif test x$ac_cv_gdbmopen = xyes; then
CPPFLAGS="$OLDCPPFLAGS $GDBM_INC"
#define MUTTNG_HCACHE_ID "0x004"
-# if HAVE_INTTYPES_H
+# ifdef HAVE_INTTYPES_H
# include <inttypes.h>
# else
-# if HAVE_STDINT_H
+# ifdef HAVE_STDINT_H
# include <stdint.h>
# endif
# endif
-#if HAVE_QDBM
+#if defined(HAVE_QDBM)
#include <depot.h>
#include <cabin.h>
#include <villa.h>
-#elif HAVE_GDBM
+#elif defined(HAVE_GDBM)
#include <gdbm.h>
-#elif HAVE_DB4
+#elif defined(HAVE_DB4)
#include <db.h>
#endif
#include <errno.h>
#include <fcntl.h>
-#if HAVE_SYS_TIME_H
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include "lib/debug.h"
-#if HAVE_QDBM
-static struct
- header_cache {
+static struct header_cache {
+#if defined(HAVE_QDBM)
VILLA *db;
char *folder;
unsigned int crc;
-} HEADER_CACHE;
-#elif HAVE_GDBM
-static struct
- header_cache {
+#elif defined(HAVE_GDBM)
GDBM_FILE db;
char *folder;
unsigned int crc;
-} HEADER_CACHE;
-#elif HAVE_DB4
-static struct
- header_cache {
+#elif defined(HAVE_DB4)
DB_ENV *env;
DB *db;
unsigned int crc;
int fd;
char lockfile[_POSIX_PATH_MAX];
-} HEADER_CACHE;
#endif
+} HEADER_CACHE;
typedef union {
struct timeval timeval;
return xmalloc(siz);
}
-static void lazy_realloc (void *ptr, size_t siz)
+static void lazy_realloc(void *ptr, ssize_t siz)
{
void **p = (void **) ptr;
return;
}
- p_realloc(ptr, siz);
+ p_realloc(p, siz);
}
static unsigned char *dump_int (unsigned int i, unsigned char *d, int *off)
m_strlen
(MUTTNG_HCACHE_ID "sithglan@stud.uni-erlangen.de[sithglan]|hcache.c|20041108231548|29613"));
-#if HAVE_LANGINFO_CODESET
+#ifdef HAVE_LANGINFO_CODESET
crc = crc32(crc, (unsigned char const *) Charset, m_strlen(Charset));
crc = crc32(crc, (unsigned char const *) "HAVE_LANGINFO_CODESET",
m_strlen("HAVE_LANGINFO_CODESET"));
return h;
}
-#if HAVE_QDBM
+#if defined(HAVE_QDBM)
void *
mutt_hcache_open(const char *path, const char *folder)
{
- struct header_cache *h = p_new(HEADER_CACHE, 1);
+ struct header_cache *h = p_new(struct header_cache, 1);
int flags = VL_OWRITER | VL_OCREAT;
h->db = NULL;
h->folder = m_strdup(folder);
{
struct header_cache *h = db;
char path[_POSIX_PATH_MAX];
- int ksize, len;
+ int ksize;
char *data = NULL;
if (!h)
return vlout(h->db, path, ksize);
}
-#elif HAVE_GDBM
+#elif defined(HAVE_GDBM)
void *mutt_hcache_open (const char *path, const char *folder)
{
return gdbm_delete (h->db, key);
}
-#elif HAVE_DB4
+#elif defined(HAVE_DB4)
static void mutt_hcache_dbt_init (DBT * dbt, void *data, size_t len)
{