Nico Golde:

[apps/madmutt.git] / configure.in

diff --git a/configure.in b/configure.in
index 29358ec..c199e96 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -114,6 +114,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 +132,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="pgpringng pgpewrapng"
+                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
 
@@ -494,12 +495,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 +519,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 --
 
@@ -835,8 +841,13 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([--enable-hcache], [Enable header caching])
             AC_TRY_LINK([#include <gdbm.h>],[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)
@@ -904,6 +915,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 --
 
@@ -1119,9 +1134,35 @@ 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)
+    ;;
+  *)
+    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)