X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=configure.in;h=aad23c2d5019477a895c9b38d1307d1a554c7645;hp=ac5ccf10004a6fdf7448ef7bb42b3f7fafaa2224;hb=ce220f6dc8789ed75468c63adce953fbdfed11a8;hpb=36d6553c2d1a80b38e961b95ebbfe0290dd5b002

diff --git a/configure.in b/configure.in
index ac5ccf1..aad23c2 100644
--- 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 --
 
@@ -1140,6 +1146,12 @@ case "`uname -s`" in
     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"
@@ -1154,7 +1166,9 @@ 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)