X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=inline;f=configure;h=2a5ff8c9643666f218a75528a78d7d10e410918a;hb=b5dae53293e6752ee659b57e1e3f34a813022c5c;hp=9b60c3addb1420225d00cc7e8c22e2c32175faf5;hpb=7593f8f93951b6ca853a72bdbcd0a34dc741bc52;p=mmh
diff --git a/configure b/configure
index 9b60c3a..2a5ff8c 100755
--- a/configure
+++ b/configure
@@ -12,27 +12,36 @@ ac_help=
ac_default_prefix=/usr/local
# Any additions from configure.in:
ac_help="$ac_help
- --enable-masquerade[='draft_from[ mmailid[ username_extension]]']
- enable 3 types of email address masquerading [none]"
+ --enable-apop enable client-side support for POP3 and APOP"
ac_help="$ac_help
- --enable-nmh-debug enable nmh code debugging"
+ --enable-debug enable nmh code debugging"
ac_help="$ac_help
- --enable-nmh-mhe enable mhe support (DEFAULT)"
+ --enable-masquerade[='draft_from mmailid username_extension']
+ enable up to 3 types of address masquerading [none]"
ac_help="$ac_help
- --enable-nmh-pop enable client-side support for pop"
+ --enable-mhe enable mhe support (DEFAULT)"
+ac_help="$ac_help
+ --enable-pop enable client-side support for plain POP3"
+ac_help="$ac_help
+ --with-cyrus-sasl=
Specify location of Cyrus SASL library for auth"
ac_help="$ac_help
--with-editor=EDITOR specify the default editor"
ac_help="$ac_help
+ --with-hash-backup use # as the backup prefix (default: ,)"
+ac_help="$ac_help
--with-hesiod=PREFIX specify location of Hesiod"
ac_help="$ac_help
- --with-krb4=PREFIX specify location of Kerberos V4 for kpop support"
+ --with-krb4=PREFIX specify location of Kerberos V4 for KPOP support"
+ac_help="$ac_help
+ --with-locking=LOCKTYPE specify the file locking method
+ (one of dot, fcntl, flock, lockf)"
ac_help="$ac_help
- --with-mts=MTS specify the mail transport agent"
+ --with-mts=MTS specify the default mail transport agent/service"
ac_help="$ac_help
--with-pager=PAGER specify the default pager"
ac_help="$ac_help
--with-smtpservers='SMTPSERVER1[ SMTPSERVER2...]'
- specify the default smtp server(s) [localhost]"
+ specify the default SMTP server(s) [localhost]"
ac_default_prefix=/usr/local/nmh
# Initialize some variables set by options.
@@ -593,7 +602,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:597: checking host system type" >&5
+echo "configure:606: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -614,7 +623,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:618: checking target system type" >&5
+echo "configure:627: checking target system type" >&5
target_alias=$target
case "$target_alias" in
@@ -632,7 +641,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:636: checking build system type" >&5
+echo "configure:645: checking build system type" >&5
build_alias=$build
case "$build_alias" in
@@ -663,6 +672,30 @@ VERSION=`sed -e 's/nmh-//' ${srcdir}/VERSION`
echo "configuring for nmh-$VERSION"
+# Check whether --enable-apop or --disable-apop was given.
+if test "${enable_apop+set}" = set; then
+ enableval="$enable_apop"
+ :
+fi
+
+if test x"$enable_apop" = x"yes"; then
+ cat >> confdefs.h <<\EOF
+#define APOP 1
+EOF
+ APOPLIB=md5.o
+ enable_pop=yes
+fi
+
+# Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+ enableval="$enable_debug"
+ :
+fi
+
+if test x"$enable_nmh_debug" = x"yes"; then
+ enable_debug=yes
+fi
+
# Check whether --enable-masquerade or --disable-masquerade was given.
if test "${enable_masquerade+set}" = set; then
enableval="$enable_masquerade"
@@ -674,40 +707,39 @@ if test "${enable_masquerade+set}" = set; then
fi
-# Check whether --enable-nmh-debug or --disable-nmh-debug was given.
-if test "${enable_nmh_debug+set}" = set; then
- enableval="$enable_nmh_debug"
- :
-fi
-
-
-# Check whether --enable-nmh-mhe or --disable-nmh-mhe was given.
-if test "${enable_nmh_mhe+set}" = set; then
- enableval="$enable_nmh_mhe"
+# Check whether --enable-mhe or --disable-mhe was given.
+if test "${enable_mhe+set}" = set; then
+ enableval="$enable_mhe"
:
fi
-if test x$"enable_nmh_mhe" != x"no"; then
+if test x"$enable_mhe" != x"no" -a x"$enable_nmh_mhe" != x"no"; then
cat >> confdefs.h <<\EOF
#define MHE 1
EOF
fi
-# Check whether --enable-nmh-pop or --disable-nmh-pop was given.
-if test "${enable_nmh_pop+set}" = set; then
- enableval="$enable_nmh_pop"
+# Check whether --enable-pop or --disable-pop was given.
+if test "${enable_pop+set}" = set; then
+ enableval="$enable_pop"
:
fi
if test x"$enable_nmh_pop" = x"yes"; then
+ enable_pop=yes
+fi
+
+# Check whether --with-cyrus-sasl or --without-cyrus-sasl was given.
+if test "${with_cyrus_sasl+set}" = set; then
+ withval="$with_cyrus_sasl"
+ :
+fi
+
+if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then
cat >> confdefs.h <<\EOF
-#define POP 1
+#define CYRUS_SASL 1
EOF
- POPLIB=popsbr.o
- POPSED='/^%nmhbeginpop%/d;/^%nmhendpop%/d'
-else
- POPSED='/^%nmhbeginpop%/,/^%nmhendpop%/d'
fi
# Check whether --with-editor or --without-editor was given.
@@ -721,6 +753,21 @@ if test -n "$with_editor"; then
editorpath="$with_editor"
fi
+# Check whether --with-hash-backup or --without-hash-backup was given.
+if test "${with_hash_backup+set}" = set; then
+ withval="$with_hash_backup"
+ :
+fi
+
+if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then
+ backup_prefix="#"
+else
+ backup_prefix=","
+fi
+cat >> confdefs.h <> confdefs.h <<\EOF
#define KPOP 1
EOF
@@ -748,6 +796,50 @@ EOF
EOF
fi
+if test x"$enable_pop" = x"yes"; then
+ cat >> confdefs.h <<\EOF
+#define POP 1
+EOF
+ POPLIB=popsbr.o
+ POPSED='/^%nmhbeginpop%/d;/^%nmhendpop%/d'
+else
+ POPSED='/^%nmhbeginpop%/,/^%nmhendpop%/d'
+fi
+
+# Check whether --with-locking or --without-locking was given.
+if test "${with_locking+set}" = set; then
+ withval="$with_locking"
+ :
+fi
+
+
+if test x"$with_locking" = x"dot"; then
+ LOCKTYPE="dot"
+ cat >> confdefs.h <<\EOF
+#define DOT_LOCKING 1
+EOF
+elif test x"$with_locking" = x"flock"; then
+ LOCKTYPE="flock"
+ cat >> confdefs.h <<\EOF
+#define FLOCK_LOCKING 1
+EOF
+elif test x"$with_locking" = x"lockf"; then
+ LOCKTYPE="lockf"
+ cat >> confdefs.h <<\EOF
+#define LOCKF_LOCKING 1
+EOF
+elif test x"$with_locking" = x"fcntl"; then
+ LOCKTYPE="fcntl"
+ cat >> confdefs.h <<\EOF
+#define FCNTL_LOCKING 1
+EOF
+else
+ LOCKTYPE="dot"
+ cat >> confdefs.h <<\EOF
+#define DOT_LOCKING 1
+EOF
+fi
+
# Check whether --with-mts or --without-mts was given.
if test "${with_mts+set}" = set; then
withval="$with_mts"
@@ -757,24 +849,15 @@ fi
if test x"$with_mts" = x"smtp"; then
MTS="smtp"
- MTSLIB="mts/smtp/libsmtp.a"
- cat >> confdefs.h <<\EOF
-#define SMTPMTS 1
-EOF
elif test x"$with_mts" = x"sendmail"; then
MTS="sendmail"
- MTSLIB="mts/sendmail/libsend.a"
- cat >> confdefs.h <<\EOF
-#define SENDMTS 1
-EOF
else
MTS="smtp"
- MTSLIB="mts/smtp/libsmtp.a"
- cat >> confdefs.h <<\EOF
-#define SMTPMTS 1
-EOF
fi
+cat >> confdefs.h <<\EOF
+#define SMTPMTS 1
+EOF
# Check whether --with-pager or --without-pager was given.
if test "${with_pager+set}" = set; then
@@ -802,14 +885,14 @@ fi
test -z "$CFLAGS" && CFLAGS= auto_cflags=1
-if test x"$enable_nmh_debug" = x"yes"; then
+if test x"$enable_debug" = x"yes"; then
test -z "$LDFLAGS" && LDFLAGS=-g
fi
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:813: checking for $ac_word" >&5
+echo "configure:896: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -839,7 +922,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:843: checking for $ac_word" >&5
+echo "configure:926: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -890,7 +973,7 @@ fi
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:894: checking for $ac_word" >&5
+echo "configure:977: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -922,7 +1005,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:926: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1009: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -933,12 +1016,12 @@ cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext << EOF
-#line 937 "configure"
+#line 1020 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -964,12 +1047,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:968: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1051: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:973: checking whether we are using GNU C" >&5
+echo "configure:1056: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -978,7 +1061,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -997,7 +1080,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1001: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1084: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1030,16 +1113,25 @@ fi
if test -n "$auto_cflags"; then
- if test x"$enable_nmh_debug" = x"yes"; then
+ if test x"$enable_debug" = x"yes"; then
if test -n "$GCC"; then
test -z "$CFLAGS" && CFLAGS="-Wall -g" || CFLAGS="$CFLAGS -Wall -g"
else
test -z "$CFLAGS" && CFLAGS=-g || CFLAGS="$CFLAGS -g"
fi
else
- test -z "$LDFLAGS" && LDFLAGS=-s
+ if test -z "$LDFLAGS"; then
+ case "$build_os" in
+ darwin*)
+ LDFLAGS=
+ ;;
+ *)
+ LDFLAGS=-s
+ ;;
+ esac
+ fi
if test -n "$GCC"; then
- test -z "$CFLAGS" && CFLAGS=-O2 || CFLAGS="$CFLAGS -O2"
+ test -z "$CFLAGS" && CFLAGS="-Wall -O2" || CFLAGS="$CFLAGS -Wall -O2"
else
test -z "$CFLAGS" && CFLAGS=-O || CFLAGS="$CFLAGS -O"
fi
@@ -1047,12 +1139,12 @@ if test -n "$auto_cflags"; then
fi
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1051: checking for working const" >&5
+echo "configure:1143: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1122,7 +1214,7 @@ EOF
fi
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1126: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1218: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1159,7 +1251,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1163: checking for a BSD compatible install" >&5
+echo "configure:1255: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1213,7 +1305,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1217: checking for $ac_word" >&5
+echo "configure:1309: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1239,12 +1331,12 @@ if test -n "$RANLIB"; then
else
echo "$ac_t""no" 1>&6
fi
- for ac_prog in mawk gawk nawk awk
+ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1248: checking for $ac_word" >&5
+echo "configure:1340: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1275,7 +1367,7 @@ done
# Extract the first word of "flex", so it can be a program name with args.
set dummy flex; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1279: checking for $ac_word" >&5
+echo "configure:1371: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1309,7 +1401,7 @@ then
*) ac_lib=l ;;
esac
echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:1313: checking for yywrap in -l$ac_lib" >&5
+echo "configure:1405: checking for yywrap in -l$ac_lib" >&5
ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1317,7 +1409,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l$ac_lib $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1354,7 +1446,7 @@ pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
# Extract the first word of "cut", so it can be a program name with args.
set dummy cut; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1358: checking for $ac_word" >&5
+echo "configure:1450: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_cutpath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1388,11 +1480,81 @@ else
fi
+# Extract the first word of "lclint", so it can be a program name with args.
+set dummy lclint; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1487: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_linttmp1'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$linttmp1"; then
+ ac_cv_prog_linttmp1="$linttmp1" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_linttmp1="lclint"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_prog_linttmp1" && ac_cv_prog_linttmp1="no"
+fi
+fi
+linttmp1="$ac_cv_prog_linttmp1"
+if test -n "$linttmp1"; then
+ echo "$ac_t""$linttmp1" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+if test x$ac_cv_prog_linttmp1 != xno ; then
+ LINT=$ac_cv_prog_linttmp1
+ LINTFLAGS="-weak +posixlib -macrovarprefixexclude"
+else
+ # Extract the first word of "lint", so it can be a program name with args.
+set dummy lint; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1520: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_linttmp2'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$linttmp2"; then
+ ac_cv_prog_linttmp2="$linttmp2" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_linttmp2="lint"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_prog_linttmp2" && ac_cv_prog_linttmp2="no"
+fi
+fi
+linttmp2="$ac_cv_prog_linttmp2"
+if test -n "$linttmp2"; then
+ echo "$ac_t""$linttmp2" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+ if test x$ac_cv_prog_linttmp2 != xno ; then
+ LINT=$ac_cv_prog_linttmp2
+ LINTFLAGS=""
+ else
+ LINT="echo 'No lint program found'"
+ LINTFLAGS=""
+ fi
+fi
# Extract the first word of "libtool", so it can be a program name with args.
set dummy libtool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1396: checking for $ac_word" >&5
+echo "configure:1558: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LIBTOOL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1419,16 +1581,18 @@ else
fi
+if test -n "$LIBTOOL" ; then
tmptest=`$LIBTOOL --version 2>&1 | grep GNU`
if test x"$tmptest" != x ; then
GNU_LIBTOOL=1
fi
+fi
# Extract the first word of "lorder", so it can be a program name with args.
set dummy lorder; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1432: checking for $ac_word" >&5
+echo "configure:1596: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LORDER'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1457,7 +1621,7 @@ fi
# Extract the first word of "tsort", so it can be a program name with args.
set dummy tsort; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1461: checking for $ac_word" >&5
+echo "configure:1625: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_TSORT'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1489,11 +1653,29 @@ if test x$ac_cv_prog_LORDER != xlorder -o x$ac_cv_prog_TSORT != xtsort; then
TSORT=cat
fi
+echo $ac_n "checking whether tsort can deal with loops""... $ac_c" 1>&6
+echo "configure:1658: checking whether tsort can deal with loops" >&5
+if eval "test \"`echo '$''{'nmh_cv_tsort_loop'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -z "`echo a b b a | tsort 2>/dev/null | grep a`" ; then
+ nmh_cv_tsort_loop=no
+ else
+ nmh_cv_tsort_loop=yes
+ fi
+fi
+
+echo "$ac_t""$nmh_cv_tsort_loop" 1>&6
+if test x$nmh_cv_tsort_loop = xno ; then
+ LORDER=echo
+ TSORT=cat
+ fi
+
pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
# Extract the first word of "ls", so it can be a program name with args.
set dummy ls; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1497: checking for $ac_word" >&5
+echo "configure:1679: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_lspath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1529,7 +1711,7 @@ fi
if test "$lspath" != "no"; then
echo $ac_n "checking how to get ls to show us the group ownership of a file""... $ac_c" 1>&6
-echo "configure:1533: checking how to get ls to show us the group ownership of a file" >&5
+echo "configure:1715: checking how to get ls to show us the group ownership of a file" >&5
if eval "test \"`echo '$''{'nmh_cv_ls_grpopt'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1547,7 +1729,7 @@ pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
# Extract the first word of "more", so it can be a program name with args.
set dummy more; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1551: checking for $ac_word" >&5
+echo "configure:1733: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_morepath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1589,7 +1771,7 @@ pathtmp=/usr/lib:/usr/sbin:/usr/etc:/usr/ucblib:/usr/bin:/bin
# Extract the first word of "sendmail", so it can be a program name with args.
set dummy sendmail; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1593: checking for $ac_word" >&5
+echo "configure:1775: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_sendmailpath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1627,7 +1809,7 @@ pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
# Extract the first word of "vi", so it can be a program name with args.
set dummy vi; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1631: checking for $ac_word" >&5
+echo "configure:1813: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_vipath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1666,7 +1848,7 @@ if test -z "$editorpath"; then
fi
echo $ac_n "checking for broken vi""... $ac_c" 1>&6
-echo "configure:1670: checking for broken vi" >&5
+echo "configure:1852: checking for broken vi" >&5
if eval "test \"`echo '$''{'nmh_cv_attvibug'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1688,7 +1870,7 @@ EOF
fi
echo $ac_n "checking where mail spool is located""... $ac_c" 1>&6
-echo "configure:1692: checking where mail spool is located" >&5
+echo "configure:1874: checking where mail spool is located" >&5
if eval "test \"`echo '$''{'nmh_cv_mailspool'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1704,7 +1886,7 @@ mailspool=$nmh_cv_mailspool
if test "$lspath" != "no" -a "$cutpath" != "no"; then
echo $ac_n "checking whether the mail spool is world-writable""... $ac_c" 1>&6
-echo "configure:1708: checking whether the mail spool is world-writable" >&5
+echo "configure:1890: checking whether the mail spool is world-writable" >&5
if eval "test \"`echo '$''{'nmh_cv_mailspool_world_writable'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1718,88 +1900,135 @@ fi
echo "$ac_t""$nmh_cv_mailspool_world_writable" 1>&6
fi
-if test x"$nmh_cv_mailspool_world_writable" = x"no"; then
- cat >> confdefs.h <<\EOF
-#define MAILGROUP 1
-EOF
- SETGID_MAIL=1
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:1905: checking how to run the C preprocessor" >&5
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
fi
-
-echo $ac_n "checking what group owns the mail spool""... $ac_c" 1>&6
-echo "configure:1730: checking what group owns the mail spool" >&5
-if eval "test \"`echo '$''{'nmh_cv_ls_mail_grp'+set}'`\" = set"; then
+if test -z "$CPP"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
- nmh_cv_ls_mail_grp=`$lspath -dL $nmh_cv_ls_grpopt $mailspool|$AWK '{print $4}'`
-
+ # This must be in double quotes, not single quotes, because CPP may get
+ # substituted into the Makefile and "${CC-cc}" will confuse make.
+ CPP="${CC-cc} -E"
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp.
+ cat > conftest.$ac_ext <
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ :
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CPP="${CC-cc} -E -traditional-cpp"
+ cat > conftest.$ac_ext <
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ :
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CPP="${CC-cc} -nologo -E"
+ cat > conftest.$ac_ext <
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ :
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CPP=/lib/cpp
fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+ ac_cv_prog_CPP="$CPP"
+fi
+ CPP="$ac_cv_prog_CPP"
+else
+ ac_cv_prog_CPP="$CPP"
+fi
+echo "$ac_t""$CPP" 1>&6
-echo "$ac_t""$nmh_cv_ls_mail_grp" 1>&6
-MAIL_SPOOL_GRP=$nmh_cv_ls_mail_grp
-
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:1746: checking for $ac_hdr that defines DIR" >&5
-if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+ac_safe=`echo "lockfile.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for lockfile.h""... $ac_c" 1>&6
+echo "configure:1986: checking for lockfile.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
-#include <$ac_hdr>
-int main() {
-DIR *dirp = 0;
-; return 0; }
+#include
EOF
-if { (eval echo configure:1759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1996: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
rm -rf conftest*
- eval "ac_cv_header_dirent_$ac_safe=yes"
+ eval "ac_cv_header_$ac_safe=yes"
else
+ echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- eval "ac_cv_header_dirent_$ac_safe=no"
+ eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
-if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <&6
-fi
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
-echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:1784: checking for opendir in -ldir" >&5
-ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for lockfile_create in -llockfile""... $ac_c" 1>&6
+echo "configure:2013: checking for lockfile_create in -llockfile" >&5
+ac_lib_var=`echo lockfile'_'lockfile_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-ldir $LIBS"
+LIBS="-llockfile $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1814,22 +2043,148 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- LIBS="$LIBS -ldir"
+ ac_tr_lib=HAVE_LIB`echo lockfile | sed -e 's/^a-zA-Z0-9_/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <&6
fi
-
+
else
-echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:1825: checking for opendir in -lx" >&5
-ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+ echo "$ac_t""no" 1>&6
+fi
+
+
+# Extract the first word of "dotlockfile", so it can be a program name with args.
+set dummy dotlockfile; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2067: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_dotlockfilepath'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$dotlockfilepath" in
+ /*)
+ ac_cv_path_dotlockfilepath="$dotlockfilepath" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_dotlockfilepath="$dotlockfilepath" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_dotlockfilepath="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_dotlockfilepath" && ac_cv_path_dotlockfilepath="no"
+ ;;
+esac
+fi
+dotlockfilepath="$ac_cv_path_dotlockfilepath"
+if test -n "$dotlockfilepath"; then
+ echo "$ac_t""$dotlockfilepath" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+if test "$ac_cv_lib_lockfile_lockfile_create" != "no" ; then
+ if test "$ac_cv_path_dotlockfilepath" != "no" ; then
+ echo $ac_n "checking whether dotlockfile is setgid""... $ac_c" 1>&6
+echo "configure:2103: checking whether dotlockfile is setgid" >&5
+if eval "test \"`echo '$''{'nmh_cv_dotlockfile_setgid'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -g "$ac_cv_path_dotlockfilepath" ; then
+ nmh_cv_dotlockfile_setgid=yes
+ else
+ nmh_cv_dotlockfile_setgid=no
+ fi
+fi
+
+echo "$ac_t""$nmh_cv_dotlockfile_setgid" 1>&6
+ fi
+fi
+
+if test x"$nmh_cv_mailspool_world_writable" = x"no" -a x"$nmh_cv_dotlockfile_setgid" != x"yes" ; then
+ cat >> confdefs.h <<\EOF
+#define MAILGROUP 1
+EOF
+ SETGID_MAIL=1
+fi
+
+echo $ac_n "checking what group owns the mail spool""... $ac_c" 1>&6
+echo "configure:2126: checking what group owns the mail spool" >&5
+if eval "test \"`echo '$''{'nmh_cv_ls_mail_grp'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ nmh_cv_ls_mail_grp=`$lspath -dL $nmh_cv_ls_grpopt $mailspool|$AWK '{print $4}'`
+
+fi
+
+echo "$ac_t""$nmh_cv_ls_mail_grp" 1>&6
+MAIL_SPOOL_GRP=$nmh_cv_ls_mail_grp
+
+ac_header_dirent=no
+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
+echo "configure:2142: checking for $ac_hdr that defines DIR" >&5
+if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <
+#include <$ac_hdr>
+int main() {
+DIR *dirp = 0;
+; return 0; }
+EOF
+if { (eval echo configure:2155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_header_dirent_$ac_safe=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_dirent_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <&6
+fi
+done
+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+if test $ac_header_dirent = dirent.h; then
+echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
+echo "configure:2180: checking for opendir in -ldir" >&5
+ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lx $LIBS"
+LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1855,100 +2210,61 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- LIBS="$LIBS -lx"
+ LIBS="$LIBS -ldir"
else
echo "$ac_t""no" 1>&6
fi
-fi
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1867: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
else
- # This must be in double quotes, not single quotes, because CPP may get
- # substituted into the Makefile and "${CC-cc}" will confuse make.
- CPP="${CC-cc} -E"
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- :
+echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+echo "configure:2221: checking for opendir in -lx" >&5
+ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext < conftest.$ac_ext <
-Syntax Error
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char opendir();
+
+int main() {
+opendir()
+; return 0; }
EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- :
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
+if { (eval echo configure:2240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- CPP="${CC-cc} -nologo -E"
- cat > conftest.$ac_ext <
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- :
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
- echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
- ac_cv_prog_CPP="$CPP"
+LIBS="$ac_save_LIBS"
+
fi
- CPP="$ac_cv_prog_CPP"
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="$LIBS -lx"
else
- ac_cv_prog_CPP="$CPP"
+ echo "$ac_t""no" 1>&6
+fi
+
fi
-echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1947: checking for ANSI C header files" >&5
+echo "configure:2263: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -1956,7 +2272,7 @@ else
#include
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1973,7 +2289,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <
EOF
@@ -1991,7 +2307,7 @@ fi
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <
EOF
@@ -2012,7 +2328,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2023,7 +2339,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); }
EOF
-if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -2047,12 +2363,12 @@ EOF
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2051: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2367: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -2061,7 +2377,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:2065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -2082,12 +2398,12 @@ EOF
fi
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2086: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2402: checking for sys/wait.h that is POSIX.1 compatible" >&5
if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -2103,7 +2419,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:2107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -2124,12 +2440,12 @@ EOF
fi
echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:2128: checking whether stat file-mode macros are broken" >&5
+echo "configure:2444: checking whether stat file-mode macros are broken" >&5
if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -2186,17 +2502,17 @@ for ac_hdr in string.h memory.h stdlib.h unistd.h errno.h fcntl.h \
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2190: checking for $ac_hdr" >&5
+echo "configure:2506: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2225,12 +2541,12 @@ done
echo $ac_n "checking POSIX termios""... $ac_c" 1>&6
-echo "configure:2229: checking POSIX termios" >&5
+echo "configure:2545: checking POSIX termios" >&5
if eval "test \"`echo '$''{'nmh_cv_sys_posix_termios'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -2240,7 +2556,7 @@ int main() {
tcgetattr(0, 0);
; return 0; }
EOF
-if { (eval echo configure:2244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
nmh_cv_sys_posix_termios=yes
else
@@ -2256,12 +2572,12 @@ echo "$ac_t""$nmh_cv_sys_posix_termios" 1>&6
if test $nmh_cv_sys_posix_termios = yes; then
echo $ac_n "checking TIOCGWINSZ in termios.h""... $ac_c" 1>&6
-echo "configure:2260: checking TIOCGWINSZ in termios.h" >&5
+echo "configure:2576: checking TIOCGWINSZ in termios.h" >&5
if eval "test \"`echo '$''{'nmh_cv_header_termios_h_tiocgwinsz'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -2269,7 +2585,7 @@ int main() {
int x = TIOCGWINSZ;
; return 0; }
EOF
-if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
nmh_cv_header_termios_h_tiocgwinsz=yes
else
@@ -2288,12 +2604,12 @@ fi
if test $nmh_cv_header_termios_h_tiocgwinsz = no; then
echo $ac_n "checking TIOCGWINSZ in sys/ioctl.h""... $ac_c" 1>&6
-echo "configure:2292: checking TIOCGWINSZ in sys/ioctl.h" >&5
+echo "configure:2608: checking TIOCGWINSZ in sys/ioctl.h" >&5
if eval "test \"`echo '$''{'nmh_cv_header_sys_ioctl_h_tiocgwinsz'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -2301,7 +2617,7 @@ int main() {
int x = TIOCGWINSZ;
; return 0; }
EOF
-if { (eval echo configure:2305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
nmh_cv_header_sys_ioctl_h_tiocgwinsz=yes
else
@@ -2318,23 +2634,22 @@ echo "$ac_t""$nmh_cv_header_sys_ioctl_h_tiocgwinsz" 1>&6
cat >> confdefs.h <<\EOF
#define GWINSZ_IN_SYS_IOCTL 1
EOF
-
fi
fi
ac_safe=`echo "libio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for libio.h""... $ac_c" 1>&6
-echo "configure:2328: checking for libio.h" >&5
+echo "configure:2643: checking for libio.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2352,7 +2667,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
cat > conftest.$ac_ext <
EOF
@@ -2374,17 +2689,17 @@ fi
ac_safe=`echo "sys/ptem.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/ptem.h""... $ac_c" 1>&6
-echo "configure:2378: checking for sys/ptem.h" >&5
+echo "configure:2693: checking for sys/ptem.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2410,12 +2725,12 @@ fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:2414: checking for pid_t" >&5
+echo "configure:2729: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#if STDC_HEADERS
@@ -2444,17 +2759,17 @@ fi
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:2448: checking for vfork.h" >&5
+echo "configure:2763: checking for vfork.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2479,18 +2794,18 @@ else
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:2483: checking for working vfork" >&5
+echo "configure:2798: checking for working vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:2489: checking for vfork" >&5
+echo "configure:2804: checking for vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vfork=yes"
else
@@ -2535,7 +2850,7 @@ fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
else
cat > conftest.$ac_ext <
@@ -2630,7 +2945,7 @@ main() {
}
}
EOF
-if { (eval echo configure:2634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_vfork_works=yes
else
@@ -2653,7 +2968,7 @@ EOF
fi
echo $ac_n "checking for mkstemp in -lmkstemp""... $ac_c" 1>&6
-echo "configure:2657: checking for mkstemp in -lmkstemp" >&5
+echo "configure:2972: checking for mkstemp in -lmkstemp" >&5
ac_lib_var=`echo mkstemp'_'mkstemp | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2661,7 +2976,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lmkstemp $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2701,15 +3016,15 @@ fi
for ac_func in waitpid wait3 sigaction sigprocmask sigblock sigsetmask \
sighold sigrelse writev lstat uname tzset killpg mkstemp \
- sethostent
+ sethostent getutent
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2708: checking for $ac_func" >&5
+echo "configure:3023: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2758,12 +3073,12 @@ done
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:2762: checking for gethostbyname" >&5
+echo "configure:3077: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -2807,7 +3122,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:2811: checking for gethostbyname in -lnsl" >&5
+echo "configure:3126: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2815,7 +3130,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2853,16 +3168,16 @@ fi
echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:2857: checking for sigsetjmp" >&5
+echo "configure:3172: checking for sigsetjmp" >&5
cat > conftest.$ac_ext <
int main() {
sigsetjmp((void *)0, 0);
; return 0; }
EOF
-if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cat >> confdefs.h <<\EOF
#define HAVE_SIGSETJMP 1
@@ -2879,12 +3194,12 @@ rm -f conftest*
for ac_func in snprintf strerror strdup
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2883: checking for $ac_func" >&5
+echo "configure:3198: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2935,7 +3250,7 @@ done
cat > conftest.$ac_ext <
EOF
@@ -2949,7 +3264,7 @@ EOF
else
rm -rf conftest*
cat > conftest.$ac_ext <
EOF
@@ -2968,7 +3283,7 @@ rm -f conftest*
cat > conftest.$ac_ext <
EOF
@@ -2984,12 +3299,12 @@ rm -f conftest*
echo $ac_n "checking for modf""... $ac_c" 1>&6
-echo "configure:2988: checking for modf" >&5
+echo "configure:3303: checking for modf" >&5
if eval "test \"`echo '$''{'ac_cv_func_modf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_modf=yes"
else
@@ -3030,7 +3345,7 @@ if eval "test \"`echo '$ac_cv_func_'modf`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for modf in -lm""... $ac_c" 1>&6
-echo "configure:3034: checking for modf in -lm" >&5
+echo "configure:3349: checking for modf in -lm" >&5
ac_lib_var=`echo m'_'modf | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3038,7 +3353,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3080,12 +3395,12 @@ fi
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:3084: checking for gethostbyname" >&5
+echo "configure:3399: checking for gethostbyname" >&5
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
@@ -3126,7 +3441,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:3130: checking for gethostbyname in -lnsl" >&5
+echo "configure:3445: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3134,7 +3449,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3171,7 +3486,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6
-echo "configure:3175: checking for gethostbyname in -lresolv" >&5
+echo "configure:3490: checking for gethostbyname in -lresolv" >&5
ac_lib_var=`echo resolv'_'gethostbyname | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3179,7 +3494,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lresolv $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3222,12 +3537,12 @@ fi
fi
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:3226: checking for socket" >&5
+echo "configure:3541: checking for socket" >&5
if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
else
@@ -3268,7 +3583,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:3272: checking for socket in -lsocket" >&5
+echo "configure:3587: checking for socket in -lsocket" >&5
ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3276,7 +3591,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3318,165 +3633,10 @@ fi
-echo $ac_n "checking for ruserpass""... $ac_c" 1>&6
-echo "configure:3323: checking for ruserpass" >&5
-if eval "test \"`echo '$''{'ac_cv_func_ruserpass'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char ruserpass();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_ruserpass) || defined (__stub___ruserpass)
-choke me
-#else
-ruserpass();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_ruserpass=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_ruserpass=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'ruserpass`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-echo $ac_n "checking for _ruserpass""... $ac_c" 1>&6
-echo "configure:3369: checking for _ruserpass" >&5
-if eval "test \"`echo '$''{'ac_cv_func__ruserpass'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char _ruserpass();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub__ruserpass) || defined (__stub____ruserpass)
-choke me
-#else
-_ruserpass();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func__ruserpass=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func__ruserpass=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'_ruserpass`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-echo $ac_n "checking for _ruserpass in -lsocket""... $ac_c" 1>&6
-echo "configure:3415: checking for _ruserpass in -lsocket" >&5
-ac_lib_var=`echo socket'_'_ruserpass | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lsocket $LIBS"
-cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/^a-zA-Z0-9_/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <&6
-fi
-
-fi
-
-fi
-
-if test x$ac_cv_func_ruserpass = xno; then
- if test x$ac_cv_func__ruserpass = xyes -o x$ac_cv_lib_socket__ruserpass = xyes; then
- cat >> confdefs.h <<\EOF
-#define ruserpass _ruserpass
-EOF
-
- else
- LIBOBJS="$LIBOBJS ruserpass.o"
- fi
-fi
-
-
termcap_curses_order="termcap curses ncurses"
for lib in $termcap_curses_order; do
echo $ac_n "checking for tgetent in -l${lib}""... $ac_c" 1>&6
-echo "configure:3480: checking for tgetent in -l${lib}" >&5
+echo "configure:3640: checking for tgetent in -l${lib}" >&5
ac_lib_var=`echo ${lib}'_'tgetent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3484,7 +3644,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-l${lib} $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3517,14 +3677,13 @@ fi
done
-
echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:3523: checking for dbm_open" >&5
+echo "configure:3682: checking for dbm_open" >&5
if eval "test \"`echo '$''{'ac_cv_func_dbm_open'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dbm_open=yes"
else
@@ -3565,7 +3724,7 @@ if eval "test \"`echo '$ac_cv_func_'dbm_open`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6
-echo "configure:3569: checking for dbm_open in -lndbm" >&5
+echo "configure:3728: checking for dbm_open in -lndbm" >&5
ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3573,7 +3732,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lndbm $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3610,7 +3769,7 @@ EOF
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:3614: checking for dbm_open in -ldbm" >&5
+echo "configure:3773: checking for dbm_open in -ldbm" >&5
ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3618,7 +3777,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldbm $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3665,17 +3824,17 @@ for ac_hdr in db1/ndbm.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3669: checking for $ac_hdr" >&5
+echo "configure:3828: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -3708,12 +3867,12 @@ if test x"$with_hesiod" != x -a x"$with_hesiod" != x"no"; then
HESIOD_LIBS="-L$with_hesiod/lib"
fi
echo $ac_n "checking for res_send""... $ac_c" 1>&6
-echo "configure:3712: checking for res_send" >&5
+echo "configure:3871: checking for res_send" >&5
if eval "test \"`echo '$''{'ac_cv_func_res_send'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_res_send=yes"
else
@@ -3750,30 +3909,27 @@ fi
if eval "test \"`echo '$ac_cv_func_'res_send`\" = yes"; then
echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-echo $ac_n "checking for res_send in -lresolv""... $ac_c" 1>&6
-echo "configure:3758: checking for res_send in -lresolv" >&5
-ac_lib_var=`echo resolv'_'res_send | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for hes_resolve in -lhesiod""... $ac_c" 1>&6
+echo "configure:3914: checking for hes_resolve in -lhesiod" >&5
+ac_lib_var=`echo hesiod'_'hes_resolve | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lresolv $LIBS"
+LIBS="-lhesiod $HESIOD_LIBS $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3788,30 +3944,24 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/^a-zA-Z0-9_/_/g' \
- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
- cat >> confdefs.h <&6
+{ echo "configure: error: Hesiod library not found" 1>&2; exit 1; }
fi
-fi
-
- echo $ac_n "checking for hes_resolve in -lhesiod""... $ac_c" 1>&6
-echo "configure:3807: checking for hes_resolve in -lhesiod" >&5
+else
+ echo "$ac_t""no" 1>&6
+echo $ac_n "checking for hes_resolve in -lhesiod""... $ac_c" 1>&6
+echo "configure:3957: checking for hes_resolve in -lhesiod" >&5
ac_lib_var=`echo hesiod'_'hes_resolve | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lhesiod $HESIOD_LIBS $LIBS"
+LIBS="-lhesiod $HESIOD_LIBS -lresolv $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3837,7 +3987,7 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- HESIOD_LIBS="$HESIOD_LIBS -lhesiod"
+ HESIOD_LIBS="$HESIOD_LIBS -lhesiod -lresolv"
else
echo "$ac_t""no" 1>&6
{ echo "configure: error: Hesiod library not found" 1>&2; exit 1; }
@@ -3845,6 +3995,9 @@ fi
fi
+
+fi
+
if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
if test x"$with_krb4" != x"yes"; then
KRB4_INCLUDES="-I$with_krb4/include"
@@ -3855,8 +4008,87 @@ if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
elif test -d /usr/include/kerberosIV; then
KRB4_INCLUDES="-I/usr/include/kerberosIV"
fi
+
+ echo $ac_n "checking for krb5_encrypt in -lk5crypto""... $ac_c" 1>&6
+echo "configure:4014: checking for krb5_encrypt in -lk5crypto" >&5
+ac_lib_var=`echo k5crypto'_'krb5_encrypt | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lk5crypto $KRB4_LIBS $LIBS"
+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
echo $ac_n "checking for krb_rd_req in -lkrb4""... $ac_c" 1>&6
-echo "configure:3860: checking for krb_rd_req in -lkrb4" >&5
+echo "configure:4049: checking for krb_rd_req in -lkrb4" >&5
+ac_lib_var=`echo krb4'_'krb_rd_req | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lkrb4 $KRB4_LIBS -ldes425 -lkrb5 -lk5crypto -lcom_err $LIBS"
+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ KRB4_LIBS="$KRB4_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
+else
+ echo "$ac_t""no" 1>&6
+{ echo "configure: error: Kerberos 4 compatibility libraries not found" 1>&2; exit 1; }
+fi
+
+else
+ echo "$ac_t""no" 1>&6
+echo $ac_n "checking for krb_rd_req in -lkrb4""... $ac_c" 1>&6
+echo "configure:4092: checking for krb_rd_req in -lkrb4" >&5
ac_lib_var=`echo krb4'_'krb_rd_req | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3864,7 +4096,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lkrb4 $KRB4_LIBS -ldes425 -lkrb5 -lcrypto -lcom_err $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3894,7 +4126,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for krb_rd_req in -lkrb""... $ac_c" 1>&6
-echo "configure:3898: checking for krb_rd_req in -lkrb" >&5
+echo "configure:4130: checking for krb_rd_req in -lkrb" >&5
ac_lib_var=`echo krb'_'krb_rd_req | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -3902,7 +4134,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lkrb $KRB4_LIBS -ldes $LIBS"
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -3939,16 +4171,70 @@ fi
fi
+fi
+
+if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then
+ if test x"$with_cyrus_sasl" != x"yes"; then
+ SASL_INCLUDES="-I$with_cyrus_sasl/include"
+ SASL_LIBS="-L$with_cyrus_sasl/lib"
+ fi
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $SASL_LIBS"
+ echo $ac_n "checking for sasl_client_new in -lsasl""... $ac_c" 1>&6
+echo "configure:4185: checking for sasl_client_new in -lsasl" >&5
+ac_lib_var=`echo sasl'_'sasl_client_new | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lsasl $LIBS"
+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ SASL_LIBS="$SASL_LIBS -lsasl"
+else
+ echo "$ac_t""no" 1>&6
+{ echo "configure: error: Cyrus SASL library not found" 1>&2; exit 1; }
+fi
+
+ LDFLAGS="$save_LDFLAGS"
+fi
+
+
nmh_save_LIBS="$LIBS"
LIBS="$TERMLIB $LIBS"
echo $ac_n "checking if an include file defines ospeed""... $ac_c" 1>&6
-echo "configure:3947: checking if an include file defines ospeed" >&5
+echo "configure:4233: checking if an include file defines ospeed" >&5
if eval "test \"`echo '$''{'nmh_cv_decl_ospeed_include_defines'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#if HAVE_TERMIOS_H
@@ -3961,7 +4247,7 @@ int main() {
ospeed = 0;
; return 0; }
EOF
-if { (eval echo configure:3965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
nmh_cv_decl_ospeed_include_defines=yes
else
@@ -3977,19 +4263,19 @@ echo "$ac_t""$nmh_cv_decl_ospeed_include_defines" 1>&6
if test $nmh_cv_decl_ospeed_include_defines = no; then
echo $ac_n "checking if you must define ospeed""... $ac_c" 1>&6
-echo "configure:3981: checking if you must define ospeed" >&5
+echo "configure:4267: checking if you must define ospeed" >&5
if eval "test \"`echo '$''{'nmh_cv_decl_ospeed_must_define'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
nmh_cv_decl_ospeed_must_define=yes
else
@@ -4008,7 +4294,6 @@ if test $nmh_cv_decl_ospeed_include_defines = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_OSPEED 1
EOF
-
elif test $nmh_cv_decl_ospeed_must_define = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_OSPEED 1
@@ -4024,12 +4309,12 @@ fi
LIBS="$nmh_save_LIBS"
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4028: checking return type of signal handlers" >&5
+echo "configure:4313: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -4046,7 +4331,7 @@ int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:4050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -4065,12 +4350,12 @@ EOF
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:4069: checking for pid_t" >&5
+echo "configure:4354: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#if STDC_HEADERS
@@ -4098,12 +4383,12 @@ EOF
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4102: checking for off_t" >&5
+echo "configure:4387: checking for off_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#if STDC_HEADERS
@@ -4131,12 +4416,12 @@ EOF
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:4135: checking for uid_t in sys/types.h" >&5
+echo "configure:4420: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
EOF
@@ -4165,12 +4450,12 @@ EOF
fi
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:4169: checking for mode_t" >&5
+echo "configure:4454: checking for mode_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#if STDC_HEADERS
@@ -4198,12 +4483,12 @@ EOF
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:4202: checking for size_t" >&5
+echo "configure:4487: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#if STDC_HEADERS
@@ -4232,12 +4517,12 @@ fi
echo $ac_n "checking for sigset_t""... $ac_c" 1>&6
-echo "configure:4236: checking for sigset_t" >&5
+echo "configure:4521: checking for sigset_t" >&5
if eval "test \"`echo '$''{'nmh_cv_type_sigset_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -4245,7 +4530,7 @@ int main() {
sigset_t tempsigset;
; return 0; }
EOF
-if { (eval echo configure:4249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
nmh_cv_type_sigset_t=yes
else
@@ -4266,12 +4551,12 @@ EOF
fi
echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:4270: checking for st_blksize in struct stat" >&5
+echo "configure:4555: checking for st_blksize in struct stat" >&5
if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
#include
@@ -4279,7 +4564,7 @@ int main() {
struct stat s; s.st_blksize;
; return 0; }
EOF
-if { (eval echo configure:4283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_blksize=yes
else
@@ -4301,12 +4586,12 @@ fi
echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:4305: checking for tm_gmtoff in struct tm" >&5
+echo "configure:4590: checking for tm_gmtoff in struct tm" >&5
if eval "test \"`echo '$''{'nmh_cv_struct_tm_gmtoff'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <
@@ -4322,7 +4607,7 @@ int main() {
struct tm temptm; temptm.tm_gmtoff = 0;
; return 0; }
EOF
-if { (eval echo configure:4326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
nmh_cv_struct_tm_gmtoff=yes
else
@@ -4343,7 +4628,7 @@ EOF
fi
echo $ac_n "checking what style of signals to use""... $ac_c" 1>&6
-echo "configure:4347: checking what style of signals to use" >&5
+echo "configure:4632: checking what style of signals to use" >&5
if test $ac_cv_func_sigaction = yes -a $ac_cv_func_sigprocmask = yes; then
signals_style=POSIX_SIGNALS
cat >> confdefs.h <<\EOF
@@ -4381,7 +4666,7 @@ fi
echo "$ac_t""$signals_style" 1>&6
echo $ac_n "checking where signal.h is located""... $ac_c" 1>&6
-echo "configure:4385: checking where signal.h is located" >&5
+echo "configure:4670: checking where signal.h is located" >&5
if eval "test \"`echo '$''{'nmh_cv_path_signal_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4600,10 +4885,8 @@ ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
trap 'rm -fr `echo "Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \
- zotnet/Makefile zotnet/mts/Makefile zotnet/tws/Makefile \
- zotnet/mf/Makefile zotnet/bboards/Makefile mts/Makefile \
- mts/smtp/Makefile mts/sendmail/Makefile mts/mmdf/Makefile \
- etc/Makefile man/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+ mts/Makefile mts/smtp/Makefile \
+ etc/Makefile docs/Makefile man/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -4918,6 +5206,21 @@ eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}"
eval "nmhlib=${libdir}"; eval "nmhlib2=${nmhlib}"
eval "nmhman=${mandir}"
+pop_kinds=no
+if test x"$enable_pop" = x"yes"; then
+ pop_kinds="yes ("
+
+ if test x"$enable_apop" = x"yes"; then
+ pop_kinds="${pop_kinds}APOP "
+ fi
+
+ if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
+ pop_kinds="${pop_kinds}KPOP "
+ fi
+
+ pop_kinds="${pop_kinds}POP3)"
+fi
+
echo "
nmh configuration
-----------------
@@ -4931,9 +5234,12 @@ binary install path : ${nmhbin2}
libary install path : ${nmhlib2}
config files install path : ${nmhsysconf2}
man page install path : ${nmhman}
+backup prefix : ${backup_prefix}
transport system : ${MTS}
+file locking type : ${LOCKTYPE}
default smtp servers : ${smtpservers}
default editor : ${editorpath}
default pager : ${pagerpath}
-email address masquerading : ${masquerade}"
+email address masquerading : ${masquerade}
+pop is enabled : ${pop_kinds}"
echo ""