Andreas Krennmair:

[apps/madmutt.git] / configure.in

diff --git a/configure.in b/configure.in
index ac5ccf1..0ab911c 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])
@@ -518,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 --
 
@@ -913,6 +917,8 @@ AC_SUBST(LIBIMAP)
 AC_SUBST(LIBIMAPDEPS)
 AC_SUBST(LIBPOP)
 AC_SUBST(LIBPOPDEPS)
+AC_SUBST(LIBNNTP)
+AC_SUBST(LIBNNTPDEPS)
 
 dnl -- iconv/gettext --
 
@@ -1156,5 +1162,6 @@ AC_OUTPUT(Makefile intl/Makefile m4/Makefile
         muttbug.sh
         imap/Makefile
         pop/Makefile
+        nntp/Makefile
         Muttngrc.head
         doc/instdoc.sh)