X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.in;h=8b26bfd8a597d940a99513b2d4ecb47de05bc7ed;hp=419ae453ee860c874fdd83864d7fd2c6211a5266;hb=82d5d8ffc8cd4cf837736187eba9ddfd8b2e2f7f;hpb=9621cc775021e9da160d7117caff437ee9e7fe39 diff --git a/configure.in b/configure.in index 419ae45..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 @@ -114,6 +116,7 @@ else 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]) @@ -131,7 +134,7 @@ else if test x$have_pgp != xno ; then AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1, [ Define if you want classic PGP support. ]) - PGPAUX_TARGET="pgpring pgpewrap" + PGPAUX_TARGET="pgpringng\$(EXEEXT) pgpewrapng\$(EXEEXT)" MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o" fi @@ -145,7 +148,7 @@ else AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME,1, [ Define if you want clasic S/MIME support. ]) MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o" - SMIMEAUX_TARGET="smime_keys" + SMIMEAUX_TARGET="smime_keysng" fi AC_ARG_WITH(mixmaster, AC_HELP_STRING([--with-mixmaster[=PATH]], [Include Mixmaster support]), @@ -160,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]) @@ -169,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. ]) @@ -197,13 +196,13 @@ main () if test $withval = yes; then if test -d $srcdir/../slang; then mutt_cv_slang=$srcdir/../slang/src - CPPFLAGS="$CPPFLAGS -I${mutt_cv_slang}" + CFLAGS="$CFLAGS -I${mutt_cv_slang}" LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs" else if test -d $mutt_cv_prefix/include/slang; then - CPPFLAGS="$CPPFLAGS -I$mutt_cv_prefix/include/slang" + CFLAGS="$CFLAGS -I$mutt_cv_prefix/include/slang" elif test -d /usr/include/slang; then - CPPFLAGS="$CPPFLAGS -I/usr/include/slang" + CFLAGS="$CFLAGS -I/usr/include/slang" fi mutt_cv_slang=yes fi @@ -211,15 +210,15 @@ main () dnl ---Check to see if $withval is a source directory if test -f $withval/src/slang.h; then mutt_cv_slang=$withval/src - CPPFLAGS="$CPPFLAGS -I${mutt_cv_slang}" + CFLAGS="$CFLAGS -I${mutt_cv_slang}" LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs" else dnl ---Must be installed somewhere mutt_cv_slang=$withval if test -d $withval/include/slang; then - CPPFLAGS="$CPPFLAGS -I${withval}/include/slang" + CFLAGS="$CFLAGS -I${withval}/include/slang" elif test -d $withval/include; then - CPPFLAGS="$CPPFLAGS -I${withval}/include" + CFLAGS="$CFLAGS -I${withval}/include" fi LDFLAGS="$LDFLAGS -L${withval}/lib" fi @@ -253,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 @@ -494,12 +493,14 @@ dnl -- socket dependencies -- AC_ARG_ENABLE(pop, AC_HELP_STRING([--enable-pop], [Enable POP3 support]), [ if test x$enableval = xyes ; then AC_DEFINE(USE_POP,1,[ Define if you want support for the POP3 protocol. ]) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pop.o pop_lib.o pop_auth.o" + LIBPOP="-Lpop -lpop" + LIBPOPDEPS="\$(top_srcdir)/pop/pop.h pop/libpop.a" need_socket="yes" need_pop="yes" need_md5="yes" fi ]) +AM_CONDITIONAL(BUILD_POP, test x$need_pop = xyes) AC_ARG_ENABLE(imap, AC_HELP_STRING([--enable-imap], [Enable IMAP support]), [ if test x$enableval = xyes ; then @@ -516,10 +517,13 @@ AM_CONDITIONAL(BUILD_IMAP, test x$need_imap = xyes) AC_ARG_ENABLE(nntp, [ --enable-nntp Enable NNTP support], [ if test x$enableval = xyes ; then AC_DEFINE(USE_NNTP) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS nntp.o newsrc.o" + LIBNNTP="-Lnntp -lnntp" + LIBNNTPDEPS="\$(top_srcdir)/nntp/nntp.h nntp/libnntp.a" + need_nntp="yes" need_socket="yes" fi ]) +AM_CONDITIONAL(BUILD_NNTP, test x$need_nntp = xyes) dnl -- end socket dependencies -- @@ -802,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 @@ -819,22 +815,57 @@ 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 - CPPFLAGS="$OLDCPPFLAGS" - LIBS="$OLDLIBS -lgdbm"; - AC_CACHE_CHECK(for gdbm_open, ac_cv_gdbmopen,[ - ac_cv_gdbmopen=no + 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]) + for d in $GDBM_DIRS; do + if test x$ac_cv_gdbmopen = xno && test -d "$d/include" && test -d "$d/lib"; then + GDBM_INC="-I$d/include" + GDBM_LIB="-L$d/lib" + CPPFLAGS="$OLDCPPFLAGS $GDBM_INC" + LIBS="$OLDLIBS $GDBM_LIB -lgdbm" AC_TRY_LINK([#include ],[gdbm_open(0,0,0,0,0);],[ac_cv_gdbmopen=yes]) - ]) + fi + done + if test x$ac_cv_gdbmopen = xyes; then + AC_MSG_RESULT(yes) + else + 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; 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" @@ -867,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 @@ -880,16 +911,20 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching]) fi fi - if test x$ac_cv_gdbmopen = xyes; then - CPPFLAGS="$OLDCPPFLAGS" - LIBS="$OLDLIBS -lgdbm"; + 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]) elif test x$ac_cv_dbcreate = xyes; then CPPFLAGS="-I$BDB_INCLUDE_DIR $OLDCPPFLAGS" 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 -- @@ -898,6 +933,10 @@ AC_SUBST(MUTTLIBS) AC_SUBST(MUTT_LIB_OBJECTS) AC_SUBST(LIBIMAP) AC_SUBST(LIBIMAPDEPS) +AC_SUBST(LIBPOP) +AC_SUBST(LIBPOPDEPS) +AC_SUBST(LIBNNTP) +AC_SUBST(LIBNNTPDEPS) dnl -- iconv/gettext -- @@ -1113,9 +1152,41 @@ if test x$use_libesmtp = xyes; then fi dnl -- end libesmtp -- +dnl -- sgml tools -- +AC_MSG_CHECKING([for SGML Tools style]) +SGML2TXT_CMD="true" +SGML2PS_CMD="true" +SGML2HTML_CMD="true" +case "`uname -s`" in + FreeBSD) + SGML2TXT_CMD="sgmlfmt -f ascii manual.sgml && uniq < manual.ascii | expand > manual.txt && rm -rf manual.ascii || true" + SGML2PS_CMD="sgmlfmt -f ps manual.sgml || true" + SGML2HTML_CMD="sgmlfmt -f html manual.sgml || true" + AC_MSG_RESULT(FreeBSD) + ;; + SunOS) + SGML2TXT_CMD="sgml2txt manual || true" + SGML2PS_CMD="sgml2latex -p manual || true" + SGML2HTML_CMD="sgml2html manual || true" + AC_MSG_RESULT(Solaris) + ;; + *) + SGML2TXT_CMD="if linuxdoc -B txt --pass='-P -c' manual ; then uniq < manual.txt | expand > _manual.txt ; rm manual.txt ; col -b < _manual.txt > manual.txt ; rm -rf _manual.txt ; fi || true" + SGML2PS_CMD="sgml2latex --output=ps manual || true" + SGML2HTML_CMD="sgml2html manual || true" + AC_MSG_RESULT(Linux (default)) + ;; +esac +AC_SUBST(SGML2TXT_CMD) +AC_SUBST(SGML2PS_CMD) +AC_SUBST(SGML2HTML_CMD) + AC_OUTPUT(Makefile intl/Makefile m4/Makefile po/Makefile.in doc/Makefile contrib/Makefile muttbug.sh + lib/Makefile imap/Makefile + pop/Makefile + nntp/Makefile Muttngrc.head doc/instdoc.sh)