Modified username_extension masquerading to only use the extended address on

[mmh] / configure.in

diff --git a/configure.in b/configure.in
index 1910558..a3d532f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ AC_DEFUN(NMH_PROG_GNU_LIBTOOL, [
   tmptest=`$LIBTOOL --version 2>&1 | grep GNU`
   if test x"$tmptest" != x  ; then
     GNU_LIBTOOL=1
   tmptest=`$LIBTOOL --version 2>&1 | grep GNU`
   if test x"$tmptest" != x  ; then
     GNU_LIBTOOL=1

-    AC_SUBST(GNU_LIBTOOL)
+    AC_SUBST(GNU_LIBTOOL)dnl

   fi
 ] )
   
   fi
 ] )
   

@@ -49,8 +49,8 @@ else
   AC_DEFINE(SMTPMTS)dnl
 fi
 
   AC_DEFINE(SMTPMTS)dnl
 fi
 

-AC_SUBST(MTS)
-AC_SUBST(MTSLIB)
+AC_SUBST(MTS)dnl
+AC_SUBST(MTSLIB)dnl

 
 dnl What should be the default editor?
 undefine([editor])dnl
 
 dnl What should be the default editor?
 undefine([editor])dnl

@@ -247,7 +247,7 @@ else
 fi])
  
 if test "$nmh_cv_attvibug" = yes; then
 fi])
  
 if test "$nmh_cv_attvibug" = yes; then

-  AC_DEFINE(ATTVIBUG)
+  AC_DEFINE(ATTVIBUG)dnl

 fi
 
 dnl ----------------------------------------------------------
 fi
 
 dnl ----------------------------------------------------------

@@ -280,23 +280,16 @@ fi
 dnl ...If it's not, we need to #define MAILGROUP to 1 and make inc setgid.
 if test x"$nmh_cv_mailspool_world_writable" = x"no"; then
   dnl do we really need both of these?
 dnl ...If it's not, we need to #define MAILGROUP to 1 and make inc setgid.
 if test x"$nmh_cv_mailspool_world_writable" = x"no"; then
   dnl do we really need both of these?

-  AC_DEFINE(MAILGROUP)
+  AC_DEFINE(MAILGROUP)dnl

   SETGID_MAIL=1
 fi
 AC_SUBST(SETGID_MAIL)dnl
 
   SETGID_MAIL=1
 fi
 AC_SUBST(SETGID_MAIL)dnl
 

-dnl see if we can determine which group owns the mail spool dir
+dnl Use ls to see which group owns the mail spool directory.

 AC_CACHE_CHECK(what group owns the mail spool, nmh_cv_ls_mail_grp,
 [nmh_cv_ls_mail_grp=`$lspath -dL $nmh_cv_ls_grpopt $mailspool|$AWK '{print $4}'`
 AC_CACHE_CHECK(what group owns the mail spool, nmh_cv_ls_mail_grp,
 [nmh_cv_ls_mail_grp=`$lspath -dL $nmh_cv_ls_grpopt $mailspool|$AWK '{print $4}'`

- dnl Should we just set it to whatever ls reports, rather than only allowing
- dnl certain values...?
- if test x$nmh_cv_ls_mail_grp = xmail; then
-   MAIL_SPOOL_GRP="mail"
- elif test x$nmh_cv_ls_mail_grp = xwheel; then
-   MAIL_SPOOL_GRP="wheel"
- else
-   MAIL_SPOOL_GRP="'0'"
- fi])
+])
+MAIL_SPOOL_GRP=$nmh_cv_ls_mail_grp

 AC_SUBST(MAIL_SPOOL_GRP)dnl
 
 dnl ------------------
 AC_SUBST(MAIL_SPOOL_GRP)dnl
 
 dnl ------------------

@@ -366,7 +359,7 @@ AC_CHECK_FUNCS(waitpid wait3 sigaction sigprocmask sigblock sigsetmask \
                sighold sigrelse writev lstat uname tzset killpg mkstemp \
                sethostent)
 
                sighold sigrelse writev lstat uname tzset killpg mkstemp \
                sethostent)
 

-dnl solaris screws ths up
+dnl solaris screws this up

 AC_CHECK_FUNC(gethostbyname, [AC_DEFINE(HAVE_GETHOSTBYNAME)],
   AC_CHECK_LIB(nsl, gethostbyname, [AC_DEFINE(HAVE_GETHOSTBYNAME)] ) )
 
 AC_CHECK_FUNC(gethostbyname, [AC_DEFINE(HAVE_GETHOSTBYNAME)],
   AC_CHECK_LIB(nsl, gethostbyname, [AC_DEFINE(HAVE_GETHOSTBYNAME)] ) )
 

@@ -377,6 +370,17 @@ AC_TRY_LINK([#include <setjmp.h>], [sigsetjmp((void *)0, 0);],
 
 AC_REPLACE_FUNCS(snprintf strerror strdup)
 
 
 AC_REPLACE_FUNCS(snprintf strerror strdup)
 

+dnl Look for the initgroups() declaration.  On AIX 4.[13], Solaris 4.1.3, and
+dnl ULTRIX 4.2A the function is defined in libc but there's no declaration in
+dnl any system header.  
+dnl
+dnl On Solaris 2.[456], the declaration is in <grp.h>.  On HP-UX 9-11 and
+dnl (reportedly) FreeBSD 3.[23], it's in <unistd.h>.  Any other locations we
+dnl need to check? 
+AC_EGREP_HEADER(initgroups, grp.h, AC_DEFINE(INITGROUPS_HEADER, <grp.h>),
+                AC_EGREP_HEADER(initgroups, unistd.h, 
+                                AC_DEFINE(INITGROUPS_HEADER, <unistd.h>)))
+

 dnl On AIX 4.1, snprintf() is defined in libc.a but there's no prototype in
 dnl <stdio.h> or elsewhere.  Apparently it's not officially supported (though it
 dnl seems to work perfectly and IBM apparently uses it in internal code).
 dnl On AIX 4.1, snprintf() is defined in libc.a but there's no prototype in
 dnl <stdio.h> or elsewhere.  Apparently it's not officially supported (though it
 dnl seems to work perfectly and IBM apparently uses it in internal code).