X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.in;h=9d3d2263c47ef757a0eb2d492bd3ee9f5d764af6;hb=3021e2535d74e219a9c7ccba2cc91c126e4b1a9f;hp=27b541dc70d66aeb28e666596a7263edbabb1549;hpb=fd2a10c17dec1491b240a3f098eb621c7bf55b31;p=mmh

diff --git a/configure.in b/configure.in
index 27b541d..9d3d226 100644
--- a/configure.in
+++ b/configure.in
@@ -63,6 +63,33 @@ if test x"$enable_mhe" != x"no" -a x"$enable_nmh_mhe" != x"no"; then
   AC_DEFINE(MHE)dnl
 fi
 
+dnl Do you want client-side support for apop?
+dnl Note that this appears before pop so that we can enforce enable-pop
+AC_ARG_ENABLE(apop,
+[  --enable-apop            enable client-side support for apop])
+if test x"$enable_apop" = x"yes"; then
+  AC_DEFINE(APOP)dnl
+  APOPLIB=md5.o
+  enable_pop=yes
+fi
+AC_SUBST(APOPLIB)dnl
+
+dnl Do you want support for hesiod
+AC_ARG_WITH(hesiod,
+[  --with-hesiod=PREFIX    specify location of Hesiod])
+if test x"$with_hesiod" != x -a x"$with_hesiod" != x"no"; then
+  AC_DEFINE(HESIOD)dnl
+fi
+
+dnl Do you want client-side support for kpop
+AC_ARG_WITH(krb4,
+[  --with-krb4=PREFIX      specify location of Kerberos V4 for kpop support])
+if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
+  enable_pop=yes
+  AC_DEFINE(KPOP)dnl
+  AC_DEFINE(KPOP_PRINCIPAL, "pop")dnl
+fi
+
 dnl Do you want client-side support for pop?
 undefine([pop])dnl
 AC_ARG_ENABLE(pop,
@@ -90,21 +117,6 @@ if test -n "$with_editor"; then
   editorpath="$with_editor"
 fi
 
-dnl Do you want support for hesiod
-AC_ARG_WITH(hesiod,
-[  --with-hesiod=PREFIX    specify location of Hesiod])
-if test x"$with_hesiod" != x -a x"$with_hesiod" != x"no"; then
-  AC_DEFINE(HESIOD)dnl
-fi
-
-dnl Do you want client-side support for kpop
-AC_ARG_WITH(krb4,
-[  --with-krb4=PREFIX      specify location of Kerberos V4 for kpop support])
-if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
-  AC_DEFINE(KPOP)dnl
-  AC_DEFINE(KPOP_PRINCIPAL, "pop")dnl
-fi
-
 dnl What method of posting should post use?
 undefine([mts])dnl
 AC_ARG_WITH(mts,
@@ -432,10 +444,6 @@ AC_CHECK_FUNC(modf, , AC_CHECK_LIB(m, modf))
 dnl Checks for network libraries (nsl, socket)
 AC_CHECK_NETLIBS
 
-dnl Check for bug in libraries such that ruserpass
-dnl needs to be linked as _ruserpass.
-AC_CHECK_RUSERPASS
-
 termcap_curses_order="termcap curses ncurses"
 for lib in $termcap_curses_order; do
   AC_CHECK_LIB(${lib}, tgetent, [TERMLIB="-l$lib"; break])
@@ -699,8 +707,20 @@ eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}"
 eval "nmhlib=${libdir}";         eval "nmhlib2=${nmhlib}"
 eval "nmhman=${mandir}"
 
-if test x"$enable_pop" = x; then
-  enable_pop=no
+pop_kinds="no"
+if test x"$enable_pop" = x"yes"; then
+        pop_kinds="yes (pop"
+        if test x"$enable_apop" = x"yes"; then
+                pop_kinds="${pop_kinds} apop"
+        fi
+        if test x"$with_krb4" = x"yes"; then
+                pop_kinds="${pop_kinds} kpop"
+        fi
+        if test "$pop_kinds" = "yes (pop"; then
+                pop_kinds="yes"
+        else
+                pop_kinds="${pop_kinds})"
+        fi
 fi
 
 echo "
@@ -721,5 +741,8 @@ default smtp servers       : ${smtpservers}
 default editor             : ${editorpath}
 default pager              : ${pagerpath}
 email address masquerading : ${masquerade}
-pop is enabled             : ${enable_pop}"
+pop is enabled             : ${pop_kinds}"
 echo ""
+
+
+