X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.in;h=8b26bfd8a597d940a99513b2d4ecb47de05bc7ed;hp=a64271a7e6589d4a14eadcaaa13a99bf92a0365f;hb=82d5d8ffc8cd4cf837736187eba9ddfd8b2e2f7f;hpb=814a01519c9605d479201b99eb16c97b0ad8635d diff --git a/configure.in b/configure.in index a64271a..8b26bfd 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,13 @@ AC_PREREQ([2.50]) AC_INIT([mutt.h]) AM_CONFIG_HEADER(config.h) -mutt_cv_version=`cat $srcdir/VERSION` +if test -f "$srcdir/.svn/entries" ; then + echo "`cat $srcdir/VERSION.in`-r`grep revision $srcdir/.svn/entries | sort -r | uniq | head -n 1 | cut -d '"' -f 2`" > "$srcdir/VERSION" +else + cp "$srcdir/VERSION.in" "$srcdir/VERSION" +fi + +mutt_cv_version=`cat "$srcdir/VERSION"` AM_INIT_AUTOMAKE(muttng, $mutt_cv_version) dnl AC_GNU_SOURCE @@ -90,10 +96,6 @@ AC_PATH_PROG(SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$ac_aux_path_sendmail AC_DEFINE_UNQUOTED(SENDMAIL,"$ac_cv_path_SENDMAIL",[ Where to find sendmail on your system. ]) OPS='$(srcdir)/OPS' -if test -f $srcdir/EXPORTABLE ; then - SUBVERSION="us" -else - SUBVERSION="i" AC_ARG_ENABLE(gpgme, AC_HELP_STRING([--enable-gpgme], [Enable GPGME support]), [ if test x$enableval = xyes; then @@ -161,7 +163,6 @@ else [ Where to find mixmaster on your system. ]) ]) -fi # We now require all OPS OPS="$OPS \$(srcdir)/OPS.PGP \$(srcdir)/OPS.SMIME \$(srcdir)/OPS.CRYPT " AC_SUBST([OPS]) @@ -170,9 +171,6 @@ AC_SUBST([OPS]) AC_SUBST(PGPAUX_TARGET) AC_SUBST(SMIMEAUX_TARGET) -AC_DEFINE_UNQUOTED(SUBVERSION,"$SUBVERSION",[ Is this the international version? ]) -AC_SUBST([SUBVERSION]) - AC_PATH_PROG(ISPELL, ispell, no) if test $ISPELL != no; then AC_DEFINE_UNQUOTED(ISPELL,"$ISPELL",[ Where to find ispell on your system. ]) @@ -254,7 +252,7 @@ main () AC_CHECK_FUNC(initscr,,[ cf_ncurses="ncurses" - for lib in ncurses ncursesw + for lib in ncursesw ncurses do AC_CHECK_LIB($lib, waddnwstr, [cf_ncurses="$lib"; break]) done @@ -735,10 +733,8 @@ dnl -- end socket -- AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable debugging support]), [ if test x$enableval = xyes ; then AC_DEFINE(DEBUG,1,[ Define to enable debugging info. ]) - want_debug=yes fi ]) -AM_CONDITIONAL(WANT_DEBUG, test x$want_debug = xyes) AC_ARG_ENABLE(flock, AC_HELP_STRING([--enable-flock], [Use flock() to lock files]), [if test $enableval = yes; then @@ -810,14 +806,6 @@ AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alter fi], [AC_DEFINE_UNQUOTED(EXECSHELL, "/bin/sh")]) -AC_ARG_ENABLE(exact-address, AC_HELP_STRING([--enable-exact-address], [Enable regeneration of email addresses]), - [if test $enableval = yes; then - AC_DEFINE(EXACT_ADDRESS,1, - [Enable exact regeneration of email addresses as parsed? - NOTE: this requires significant more memory when defined.]) - - fi]) - dnl -- start cache -- AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]), [if test x$enableval = xyes; then @@ -827,10 +815,34 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]) OLDLIBS="$LIBS" need_md5="yes" + + ac_prefer_qdbm=yes + 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 ],[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 + 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; then + if test x$ac_prefer_gdbm != xno -a x$ac_cv_vlopen != xyes; then ac_cv_gdbmopen=no GDBM_DIRS="$mutt_cv_prefix /usr/local /usr" AC_MSG_CHECKING([for gdbm_open]) @@ -853,7 +865,7 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]) 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; then + if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != 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" @@ -886,7 +898,7 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]) break ]) done - test x$ac_dbcreate = xyes && break + test x$ac_cv_dbcreate = xyes && break fi fi done @@ -899,7 +911,11 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]) fi fi - if test x$ac_cv_gdbmopen = xyes; then + if test x$ac_cv_vlopen = xyes; then + CPPFLAGS="$OLDCPPFLAGS $QDBM_INC" + LIBS="$OLDLIBS $QDBM_LIB -lqdbm" + AC_DEFINE(HAVE_QDBM, 1, [QDBM Support]) + elif test x$ac_cv_gdbmopen = xyes; then CPPFLAGS="$OLDCPPFLAGS $GDBM_INC" LIBS="$OLDLIBS $GDBM_LIB -lgdbm"; AC_DEFINE(HAVE_GDBM, 1, [GDBM Support]) @@ -908,7 +924,7 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]) LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB" AC_DEFINE(HAVE_DB4, 1, [Sleepycat DB4 Support]) else - AC_MSG_ERROR(You need Sleepycat DB4 or GDBM for --enable-hcache) + AC_MSG_ERROR([You need one of: QDBM, GDBM or Sleepycat DB4 for --enable-hcache]) fi fi]) dnl -- end cache --