Convert from the poorly-named and confusing adrsprintf() to getlocaladdr().

[nmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index d73f376eba5e0a7c30c67bea49a2065b7582cac0..ba848c35bc87dea633269f72ec5b526dff8d1de9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,14 +43,6 @@ AC_ARG_ENABLE(masquerade,
   fi], [masquerade="draft_from mmailid username_extension"])
 AC_SUBST(masquerade)dnl
 
   fi], [masquerade="draft_from mmailid username_extension"])
 AC_SUBST(masquerade)dnl
 

-dnl Do you want client-side support for pop?
-AC_ARG_ENABLE([pop],
-  AS_HELP_STRING([--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
-  enable_pop=yes
-fi
-

 dnl Do you want to disable use of locale functions
 AH_TEMPLATE([LOCALE],
 [Undefine if you don't want locale features.  By default this is defined.])
 dnl Do you want to disable use of locale functions
 AH_TEMPLATE([LOCALE],
 [Undefine if you don't want locale features.  By default this is defined.])


@@ -106,13 +98,6 @@ fi
 AC_DEFINE_UNQUOTED([BACKUP_PREFIX], "$backup_prefix",
     [The prefix that is prepended to the name of message files when they are "removed" by rmm. This should typically be `,' or `#'.])dnl
 
 AC_DEFINE_UNQUOTED([BACKUP_PREFIX], "$backup_prefix",
     [The prefix that is prepended to the name of message files when they are "removed" by rmm. This should typically be `,' or `#'.])dnl
 

-dnl After we know if we're including apop and kpop support, do pop stuff
-if test x"$enable_pop" = x"yes"; then
-  AC_DEFINE([POP], 1,
-    [Define this to compile client-side support for pop into inc and msgchk.])dnl
-fi
-AM_CONDITIONAL([POP_SUPPORT], [test x"$enable_pop" = x"yes"])
-

 dnl What method of locking to use?
 AC_ARG_WITH(locking,
   AS_HELP_STRING([--with-locking=@<:@dot|fcntl|flock|lockf@:>@],
 dnl What method of locking to use?
 AC_ARG_WITH(locking,
   AS_HELP_STRING([--with-locking=@<:@dot|fcntl|flock|lockf@:>@],


@@ -215,11 +200,10 @@ if test "$nmh_cv_has_unusedmacros" = 'yes'; then
 fi
 AC_SUBST(DISABLE_UNUSED_MACROS_WARNING)dnl
 
 fi
 AC_SUBST(DISABLE_UNUSED_MACROS_WARNING)dnl
 

-AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_wextra],
+AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra],

 [nmh_saved_cflags="$CFLAGS"
  CFLAGS="$CFLAGS -Wextra -Wno-clobbered"
 [nmh_saved_cflags="$CFLAGS"
  CFLAGS="$CFLAGS -Wextra -Wno-clobbered"

- AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
-   [nmh_cv_wextras=' -Wextra -Wno-clobbered'], [echo $ECHO_N "no$ECHO_C"])
+ AC_TRY_COMPILE([],[],nmh_cv_has_wextra=yes,nmh_cv_has_wextra=no)

  CFLAGS="$nmh_saved_cflags"])
 
 AC_CACHE_CHECK([whether compiler supports -Wno-pointer-sign], [nmh_cv_has_noptrsign],
  CFLAGS="$nmh_saved_cflags"])
 
 AC_CACHE_CHECK([whether compiler supports -Wno-pointer-sign], [nmh_cv_has_noptrsign],


@@ -237,9 +221,17 @@ dnl also use -Wno-pointer-sign, because gcc 4 now produces a lot of new
 dnl warnings which are probably mostly spurious and which in any case we
 dnl don't want to deal with now.
 if test "$nmh_cv_has_noptrsign" = "yes"; then
 dnl warnings which are probably mostly spurious and which in any case we
 dnl don't want to deal with now.
 if test "$nmh_cv_has_noptrsign" = "yes"; then

-        nmh_gcc_warnflags="-Wall$nmh_cv_wextra -Wno-pointer-sign"
+    if test "$nmh_cv_has_wextra" = "yes"; then
+        nmh_gcc_warnflags="-Wall -Wextra -Wno-clobbered -Wno-pointer-sign"
+    else
+        nmh_gcc_warnflags="-Wall -Wno-pointer-sign"
+    fi

 else
 else

-        nmh_gcc_warnflags="-Wall$nmh_cv_wextra"
+    if test "$nmh_cv_has_wextra" = "yes"; then
+        nmh_gcc_warnflags="-Wall -Wextra -Wno-clobbered"
+    else
+        nmh_gcc_warnflags="-Wall"
+    fi

 fi
 
 if test -n "$auto_cflags"; then
 fi
 
 if test -n "$auto_cflags"; then


@@ -741,6 +733,19 @@ nmh_cv_path_signal_h=$SIGNAL_H
 SIGNAL_H=$nmh_cv_path_signal_h
 AC_SUBST(SIGNAL_H)dnl
 
 SIGNAL_H=$nmh_cv_path_signal_h
 AC_SUBST(SIGNAL_H)dnl
 

+dnl
+dnl Sigh, this is required because under the new world order autoconf has
+dnl nothing to create in a few of the build directories when doing an object
+dnl tree build.  So make sure we created certain directories if they don't
+dnl exist.
+dnl
+
+AC_CONFIG_COMMANDS([build-directories],
+[test -d etc || ${MKDIR_P} etc
+test -d man || ${MKDIR_P} man])
+
+AC_CONFIG_COMMANDS_POST([
+

 dnl These odd looking assignments are done to expand out unexpanded
 dnl variables in bindir et al (for instance mandir is '${datarootdir}/man',
 dnl but expanding that gives '${prefix}/share/man', so we need to expand
 dnl These odd looking assignments are done to expand out unexpanded
 dnl variables in bindir et al (for instance mandir is '${datarootdir}/man',
 dnl but expanding that gives '${prefix}/share/man', so we need to expand


@@ -754,23 +759,6 @@ eval "nmhlib=${libdir}";         eval "nmhlib=${nmhlib}"
 eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"
 eval "nmhrpm=${nmhrpm}";
 
 eval "nmhman=${mandir}";         eval "nmhman=${nmhman}"
 eval "nmhrpm=${nmhrpm}";
 

-pop_kinds=no
-if test x"$enable_pop" = x"yes"; then
-  pop_kinds="yes (POP3)"
-fi
-
-dnl
-dnl Sigh, this is required because under the new world order autoconf has
-dnl nothing to create in a few of the build directories when doing an object
-dnl tree build.  So make sure we created certain directories if they don't
-dnl exist.
-dnl
-
-AC_CONFIG_COMMANDS([build-directories],
-[test -d etc || ${MKDIR_P} etc
-test -d man || ${MKDIR_P} man])
-
-AC_CONFIG_COMMANDS_POST([

 echo "
 nmh configuration
 -----------------
 echo "
 nmh configuration
 -----------------


@@ -793,7 +781,6 @@ default smtp servers       : ${smtpservers}
 default editor             : ${editorpath}
 default pager              : ${pagerpath}
 email address masquerading : ${masquerade}
 default editor             : ${editorpath}
 default pager              : ${pagerpath}
 email address masquerading : ${masquerade}

-pop is enabled             : ${pop_kinds}

 SASL support               : ${sasl_support}
 TLS support                : ${tls_support}"
 echo ""])
 SASL support               : ${sasl_support}
 TLS support                : ${tls_support}"
 echo ""])