Andreas Krennmair:

[apps/madmutt.git] / configure.in

diff --git a/configure.in b/configure.in
index 7b37365..ac5ccf1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -494,12 +494,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
@@ -909,6 +911,8 @@ AC_SUBST(MUTTLIBS)
 AC_SUBST(MUTT_LIB_OBJECTS)
 AC_SUBST(LIBIMAP)
 AC_SUBST(LIBIMAPDEPS)
+AC_SUBST(LIBPOP)
+AC_SUBST(LIBPOPDEPS)
 
 dnl -- iconv/gettext --
 
@@ -1126,6 +1130,9 @@ 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"
@@ -1133,7 +1140,7 @@ case "`uname -s`" in
     SGML2HTML_CMD="sgmlfmt -f html manual.sgml || true"
     AC_MSG_RESULT(FreeBSD)
     ;;
-  default)
+  *)
     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"
@@ -1148,5 +1155,6 @@ AC_OUTPUT(Makefile intl/Makefile m4/Makefile
         po/Makefile.in doc/Makefile contrib/Makefile
         muttbug.sh
         imap/Makefile
+        pop/Makefile
         Muttngrc.head
         doc/instdoc.sh)