-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
+dnl Do you want client-side support for pop?
+undefine([pop])dnl
+AC_ARG_ENABLE(pop,
+[ --enable-pop enable client-side support for plain POP3])
+dnl The old redundant --enable-nmh-pop is deprecated and undocumented.
+if test x"$enable_nmh_pop" = x"yes"; then