;; IPv6 patch for cyrus-sasl-1.5.28 ;; Jan 6, 2002 by Hajimu UMEMOTO ;; Sep 10, 2002 updated to 1.5.28 by Scot W. Hetzel ;; Index: acconfig.h diff -u acconfig.h.orig acconfig.h --- acconfig.h.orig Thu Dec 20 20:30:48 2001 +++ acconfig.h Tue Sep 10 00:03:28 2002 @@ -134,8 +134,20 @@ /* define if your system has getpid() */ #undef HAVE_GETPID +/* define if your system has struct sockaddr_storage */ +#undef HAVE_SOCKADDR_STORAGE + @BOTTOM@ +/* define if your system has getnameinfo() */ +#undef HAVE_GETNAMEINFO + +/* Define if you have ss_family in struct sockaddr_storage. */ +#undef HAVE_SS_FAMILY + +/* do we have socklen_t? */ +#undef HAVE_SOCKLEN_T + /* location of the random number generator */ #ifndef DEV_RANDOM #define DEV_RANDOM "/dev/random" @@ -183,6 +195,22 @@ #endif /* WIN32 */ #include +#if defined(HAVE_SOCKADDR_STORAGE) && defined(HAVE_GETNAMEINFO) +#define INET6 +#endif +#ifdef INET6 +#include +#ifndef NI_WITHSCOPEID +#define NI_WITHSCOPEID 0 +#endif +#ifndef HAVE_SS_FAMILY +#define ss_family __ss_family +#endif +#endif #include + +#ifndef HAVE_SOCKLEN_T +typedef int socklen_t; +#endif #endif /* CONFIG_H */ Index: aclocal.m4 diff -u aclocal.m4.orig aclocal.m4 --- aclocal.m4.orig Tue Jul 16 15:27:03 2002 +++ aclocal.m4 Tue Sep 10 00:03:28 2002 @@ -692,3 +692,72 @@ AC_SUBST(LIB_SOCKET) ]) +dnl See whether we can use IPv6 related functions +AC_DEFUN(IPv6_CHECK_FUNC, [ +changequote(, )dnl +ac_tr_lib=HAVE_`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +changequote([, ])dnl +AC_CHECK_FUNC($1, [dnl + AC_DEFINE_UNQUOTED($ac_tr_lib) + ac_cv_lib_socket_$1=no + ac_cv_lib_inet6_$1=no +], [dnl + AC_CHECK_LIB(socket, $1, [dnl + AC_DEFINE_UNQUOTED($ac_tr_lib) + LIBS="$LIBS -lsocket" + ac_cv_lib_inet6_$1=no + ], [dnl + AC_MSG_CHECKING([whether your system has IPv6 directory]) + AC_CACHE_VAL(ipv6_cv_dir, [dnl + for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do + if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then + break + fi + done])dnl + AC_MSG_RESULT($ipv6_cv_dir) + if test $ipv6_cv_dir = no; then + ac_cv_lib_inet6_$1=no + else + if test x$ipv6_libinet6 = x; then + ipv6_libinet6=no + SAVELDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib" + fi + AC_CHECK_LIB(inet6, $1, [dnl + AC_DEFINE_UNQUOTED($ac_tr_lib) + if test $ipv6_libinet6 = no; then + ipv6_libinet6=yes + LIBS="$LIBS -linet6" + fi],)dnl + if test $ipv6_libinet6 = no; then + LDFLAGS="$SAVELDFLAGS" + fi + fi])dnl +])dnl +if test $ac_cv_func_$1 = yes -o $ac_cv_lib_socket_$1 = yes \ + -o $ac_cv_lib_inet6_$1 = yes +then + ipv6_cv_$1=yes + ifelse([$2], , :, [$2]) +else + ipv6_cv_$1=no + ifelse([$3], , :, [$3]) +fi]) + + +dnl See whether we have ss_family in sockaddr_storage +AC_DEFUN(IPv6_CHECK_SS_FAMILY, [ +AC_MSG_CHECKING([whether you have ss_family in struct sockaddr_storage]) +AC_CACHE_VAL(ipv6_cv_ss_family, [dnl +AC_TRY_COMPILE([#include +#include ], + [struct sockaddr_storage ss; int i = ss.ss_family;], + [ipv6_cv_ss_family=yes], [ipv6_cv_ss_family=no])])dnl +if test $ipv6_cv_ss_family = yes; then + ifelse([$1], , AC_DEFINE(HAVE_SS_FAMILY), [$1]) +else + ifelse([$2], , :, [$2]) +fi +AC_MSG_RESULT($ipv6_cv_ss_family)]) + Index: cmulocal/ipv6.m4 diff -u cmulocal/ipv6.m4.orig cmulocal/ipv6.m4 --- cmulocal/ipv6.m4.orig Wed Dec 31 18:00:00 1969 +++ cmulocal/ipv6.m4 Tue Sep 10 00:03:28 2002 @@ -0,0 +1,68 @@ +dnl See whether we can use IPv6 related functions +AC_DEFUN(IPv6_CHECK_FUNC, [ +changequote(, )dnl +ac_tr_lib=HAVE_`echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +changequote([, ])dnl +AC_CHECK_FUNC($1, [dnl + AC_DEFINE_UNQUOTED($ac_tr_lib) + ac_cv_lib_socket_$1=no + ac_cv_lib_inet6_$1=no +], [dnl + AC_CHECK_LIB(socket, $1, [dnl + AC_DEFINE_UNQUOTED($ac_tr_lib) + LIBS="$LIBS -lsocket" + ac_cv_lib_inet6_$1=no + ], [dnl + AC_MSG_CHECKING([whether your system has IPv6 directory]) + AC_CACHE_VAL(ipv6_cv_dir, [dnl + for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do + if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then + break + fi + done])dnl + AC_MSG_RESULT($ipv6_cv_dir) + if test $ipv6_cv_dir = no; then + ac_cv_lib_inet6_$1=no + else + if test x$ipv6_libinet6 = x; then + ipv6_libinet6=no + SAVELDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib" + fi + AC_CHECK_LIB(inet6, $1, [dnl + AC_DEFINE_UNQUOTED($ac_tr_lib) + if test $ipv6_libinet6 = no; then + ipv6_libinet6=yes + LIBS="$LIBS -linet6" + fi],)dnl + if test $ipv6_libinet6 = no; then + LDFLAGS="$SAVELDFLAGS" + fi + fi])dnl +])dnl +if test $ac_cv_func_$1 = yes -o $ac_cv_lib_socket_$1 = yes \ + -o $ac_cv_lib_inet6_$1 = yes +then + ipv6_cv_$1=yes + ifelse([$2], , :, [$2]) +else + ipv6_cv_$1=no + ifelse([$3], , :, [$3]) +fi]) + + +dnl See whether we have ss_family in sockaddr_storage +AC_DEFUN(IPv6_CHECK_SS_FAMILY, [ +AC_MSG_CHECKING([whether you have ss_family in struct sockaddr_storage]) +AC_CACHE_VAL(ipv6_cv_ss_family, [dnl +AC_TRY_COMPILE([#include +#include ], + [struct sockaddr_storage ss; int i = ss.ss_family;], + [ipv6_cv_ss_family=yes], [ipv6_cv_ss_family=no])])dnl +if test $ipv6_cv_ss_family = yes; then + ifelse([$1], , AC_DEFINE(HAVE_SS_FAMILY), [$1]) +else + ifelse([$2], , :, [$2]) +fi +AC_MSG_RESULT($ipv6_cv_ss_family)]) Index: config.h diff -u config.h.in.orig config.h.in --- config.h.in.orig Tue Jul 16 13:59:11 2002 +++ config.h.in Tue Sep 10 00:03:28 2002 @@ -131,6 +131,9 @@ /* Define if you have the dns_lookup function. */ #undef HAVE_DNS_LOOKUP +/* define if your system has struct sockaddr_storage */ +#undef HAVE_SOCKADDR_STORAGE + /* Define if you have the getdomainname function. */ #undef HAVE_GETDOMAINNAME @@ -210,6 +213,15 @@ #undef HAVE___ATTRIBUTE__ +/* define if your system has getnameinfo() */ +#undef HAVE_GETNAMEINFO + +/* Define if you have ss_family in struct sockaddr_storage. */ +#undef HAVE_SS_FAMILY + +/* do we have socklen_t? */ +#undef HAVE_SOCKLEN_T + /* location of the random number generator */ #ifndef DEV_RANDOM #define DEV_RANDOM "/dev/random" @@ -257,6 +269,22 @@ #endif /* WIN32 */ #include +#if defined(HAVE_SOCKADDR_STORAGE) && defined(HAVE_GETNAMEINFO) +#define INET6 +#endif +#ifdef INET6 +#include +#ifndef NI_WITHSCOPEID +#define NI_WITHSCOPEID 0 +#endif +#ifndef HAVE_SS_FAMILY +#define ss_family __ss_family +#endif +#endif #include + +#ifndef HAVE_SOCKLEN_T +typedef int socklen_t; +#endif #endif /* CONFIG_H */ Index: configure diff -u configure.orig configure --- configure.orig Tue Jul 16 15:27:04 2002 +++ configure Tue Sep 10 00:05:34 2002 @@ -70,6 +70,8 @@ be found [/usr/lib/sasl] " ac_help="$ac_help --with-rc4=DIR use internal rc4 routines [yes] " +ac_help="$ac_help + --disable-ipv6 Don't compile in IPv6 support" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -87,6 +89,7 @@ program_transform_name=s,x,x, silent= site= +sitefile= srcdir= target=NONE verbose= @@ -201,6 +204,7 @@ --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages + --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -371,6 +375,11 @@ -site=* | --site=* | --sit=*) site="$ac_optarg" ;; + -site-file | --site-file | --site-fil | --site-fi | --site-f) + ac_prev=sitefile ;; + -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) + sitefile="$ac_optarg" ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -536,12 +545,16 @@ srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +if test -z "$sitefile"; then + if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi fi +else + CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -609,7 +622,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:613: checking host system type" >&5 +echo "configure:626: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -642,7 +655,7 @@ # 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:646: checking for a BSD compatible install" >&5 +echo "configure:659: 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 @@ -695,7 +708,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:699: checking whether build environment is sane" >&5 +echo "configure:712: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -752,7 +765,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:756: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:769: 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 @@ -798,7 +811,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:802: checking for working aclocal" >&5 +echo "configure:815: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -811,7 +824,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:815: checking for working autoconf" >&5 +echo "configure:828: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -824,7 +837,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:828: checking for working automake" >&5 +echo "configure:841: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -837,7 +850,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:841: checking for working autoheader" >&5 +echo "configure:854: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -850,7 +863,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:854: checking for working makeinfo" >&5 +echo "configure:867: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -891,7 +904,7 @@ # 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:895: checking for $ac_word" >&5 +echo "configure:908: 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 @@ -921,7 +934,7 @@ # 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:925: checking for $ac_word" >&5 +echo "configure:938: 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 @@ -972,7 +985,7 @@ # 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:976: checking for $ac_word" >&5 +echo "configure:989: 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 @@ -1004,7 +1017,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1008: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1021: 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. @@ -1015,12 +1028,12 @@ cat > conftest.$ac_ext << EOF -#line 1019 "configure" +#line 1032 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1037: \"$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 @@ -1046,12 +1059,12 @@ { 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:1050: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1063: 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:1055: checking whether we are using GNU C" >&5 +echo "configure:1068: 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 @@ -1060,7 +1073,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1064: \"$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:1077: \"$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 @@ -1079,7 +1092,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1083: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1096: 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 @@ -1111,7 +1124,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1115: checking how to run the C preprocessor" >&5 +echo "configure:1128: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1126,13 +1139,13 @@ # 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:1136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1149: \"$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 : @@ -1143,13 +1156,13 @@ 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:1153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1166: \"$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 : @@ -1160,13 +1173,13 @@ 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:1170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1183: \"$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 : @@ -1202,7 +1215,7 @@ # 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:1206: checking for a BSD compatible install" >&5 +echo "configure:1219: 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 @@ -1256,13 +1269,13 @@ echo $ac_n "checking for __attribute__""... $ac_c" 1>&6 -echo "configure:1260: checking for __attribute__" >&5 +echo "configure:1273: checking for __attribute__" >&5 if eval "test \"`echo '$''{'ac_cv___attribute__'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1279,7 +1292,7 @@ ; return 0; } EOF -if { (eval echo configure:1283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv___attribute__=yes else @@ -1303,7 +1316,7 @@ # CMU GUESS RUNPATH SWITCH echo $ac_n "checking for runpath switch""... $ac_c" 1>&6 -echo "configure:1307: checking for runpath switch" >&5 +echo "configure:1320: checking for runpath switch" >&5 if eval "test \"`echo '$''{'andrew_runpath_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1312,14 +1325,14 @@ SAVE_LDFLAGS="${LDFLAGS}" LDFLAGS="-R /usr/lib" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* andrew_runpath_switch="-R" else @@ -1329,14 +1342,14 @@ LDFLAGS="-Wl,-rpath,/usr/lib" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* andrew_runpath_switch="-Wl,-rpath," else @@ -1435,7 +1448,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1439: checking build system type" >&5 +echo "configure:1452: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1455,7 +1468,7 @@ # 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:1459: checking for $ac_word" >&5 +echo "configure:1472: 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 @@ -1494,7 +1507,7 @@ if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1498: checking for ld used by GCC" >&5 +echo "configure:1511: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -1518,10 +1531,10 @@ esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1522: checking for GNU ld" >&5 +echo "configure:1535: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1525: checking for non-GNU ld" >&5 +echo "configure:1538: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1556,7 +1569,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1560: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1573: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1572,7 +1585,7 @@ echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1576: checking for BSD-compatible nm" >&5 +echo "configure:1589: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1608,7 +1621,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1612: checking whether ln -s works" >&5 +echo "configure:1625: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1657,8 +1670,8 @@ case "$lt_target" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1661 "configure"' > conftest.$ac_ext - if { (eval echo configure:1662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1674 "configure"' > conftest.$ac_ext + if { (eval echo configure:1675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1679,19 +1692,19 @@ SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1683: checking whether the C compiler needs -belf" >&5 +echo "configure:1696: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+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:1708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1832,7 +1845,7 @@ # 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:1836: checking for $ac_word" >&5 +echo "configure:1849: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PURECOV'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1874,7 +1887,7 @@ # 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:1878: checking for $ac_word" >&5 +echo "configure:1891: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PURIFY'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1917,7 +1930,7 @@ # Extract the first word of "javac", so it can be a program name with args. set dummy javac; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1921: checking for $ac_word" >&5 +echo "configure:1934: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1955,7 +1968,7 @@ # 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:1959: checking for $ac_word" >&5 +echo "configure:1972: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAVAH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1996,7 +2009,7 @@ # 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:2000: checking for $ac_word" >&5 +echo "configure:2013: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_JAVADOC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2043,7 +2056,7 @@ if test "$enable_java" = yes; then echo $ac_n "checking JNI cpp flags""... $ac_c" 1>&6 -echo "configure:2047: checking JNI cpp flags" >&5 +echo "configure:2060: checking JNI cpp flags" >&5 if test `echo $JAVAH | sed 's,.*/,,'` = "kaffeh"; then JAVA_INCLUDES=-I`echo $JAVAH | sed -e 's,/bin.*,/include/kaffe,'` else @@ -2092,7 +2105,7 @@ fi echo $ac_n "checking DB path to use""... $ac_c" 1>&6 -echo "configure:2096: checking DB path to use" >&5 +echo "configure:2109: checking DB path to use" >&5 echo "$ac_t""$dbpath" 1>&6 cat >> confdefs.h <&6 -echo "configure:2122: checking for db3/db.h" >&5 +echo "configure:2135: checking for db3/db.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:2132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2145: \"$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* @@ -2147,7 +2160,7 @@ for dbname in db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db do echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6 -echo "configure:2151: checking for db_create in -l$dbname" >&5 +echo "configure:2164: checking for db_create in -l$dbname" >&5 ac_lib_var=`echo $dbname'_'db_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 @@ -2155,7 +2168,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$dbname $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2183: \"$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 @@ -2191,7 +2204,7 @@ done if test "$dblib" = "no"; then echo $ac_n "checking for db_open in -ldb""... $ac_c" 1>&6 -echo "configure:2195: checking for db_open in -ldb" >&5 +echo "configure:2208: checking for db_open in -ldb" >&5 ac_lib_var=`echo db'_'db_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 @@ -2199,7 +2212,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2227: \"$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 @@ -2244,17 +2257,17 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "db.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for db.h""... $ac_c" 1>&6 -echo "configure:2248: checking for db.h" >&5 +echo "configure:2261: checking for db.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:2258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2271: \"$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* @@ -2273,7 +2286,7 @@ for dbname in db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db do echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6 -echo "configure:2277: checking for db_create in -l$dbname" >&5 +echo "configure:2290: checking for db_create in -l$dbname" >&5 ac_lib_var=`echo $dbname'_'db_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 @@ -2281,7 +2294,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$dbname $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2309: \"$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 @@ -2317,7 +2330,7 @@ done if test "$dblib" = "no"; then echo $ac_n "checking for db_open in -ldb""... $ac_c" 1>&6 -echo "configure:2321: checking for db_open in -ldb" >&5 +echo "configure:2334: checking for db_open in -ldb" >&5 ac_lib_var=`echo db'_'db_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 @@ -2325,7 +2338,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2353: \"$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 @@ -2372,17 +2385,17 @@ gdbm) ac_safe=`echo "gdbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gdbm.h""... $ac_c" 1>&6 -echo "configure:2376: checking for gdbm.h" >&5 +echo "configure:2389: checking for gdbm.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:2386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2399: \"$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* @@ -2399,7 +2412,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:2403: checking for gdbm_open in -lgdbm" >&5 +echo "configure:2416: checking for gdbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'gdbm_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 @@ -2407,7 +2420,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2435: \"$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 @@ -2448,17 +2461,17 @@ ndbm) ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6 -echo "configure:2452: checking for ndbm.h" >&5 +echo "configure:2465: checking for ndbm.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:2462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2475: \"$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* @@ -2475,7 +2488,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6 -echo "configure:2479: checking for dbm_open in -lndbm" >&5 +echo "configure:2492: 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 @@ -2483,7 +2496,7 @@ 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:2511: \"$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 @@ -2513,12 +2526,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:2517: checking for dbm_open" >&5 +echo "configure:2530: 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:2560: \"$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 @@ -2571,17 +2584,17 @@ auto_detect) ac_safe=`echo "db3/db.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for db3/db.h""... $ac_c" 1>&6 -echo "configure:2575: checking for db3/db.h" >&5 +echo "configure:2588: checking for db3/db.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:2585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2598: \"$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* @@ -2600,7 +2613,7 @@ for dbname in db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db do echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6 -echo "configure:2604: checking for db_create in -l$dbname" >&5 +echo "configure:2617: checking for db_create in -l$dbname" >&5 ac_lib_var=`echo $dbname'_'db_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 @@ -2608,7 +2621,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$dbname $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2636: \"$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 @@ -2644,7 +2657,7 @@ done if test "$dblib" = "no"; then echo $ac_n "checking for db_open in -ldb""... $ac_c" 1>&6 -echo "configure:2648: checking for db_open in -ldb" >&5 +echo "configure:2661: checking for db_open in -ldb" >&5 ac_lib_var=`echo db'_'db_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 @@ -2652,7 +2665,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2680: \"$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 @@ -2697,17 +2710,17 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "db.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for db.h""... $ac_c" 1>&6 -echo "configure:2701: checking for db.h" >&5 +echo "configure:2714: checking for db.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:2711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2724: \"$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* @@ -2726,7 +2739,7 @@ for dbname in db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db do echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6 -echo "configure:2730: checking for db_create in -l$dbname" >&5 +echo "configure:2743: checking for db_create in -l$dbname" >&5 ac_lib_var=`echo $dbname'_'db_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 @@ -2734,7 +2747,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$dbname $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2762: \"$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 @@ -2770,7 +2783,7 @@ done if test "$dblib" = "no"; then echo $ac_n "checking for db_open in -ldb""... $ac_c" 1>&6 -echo "configure:2774: checking for db_open in -ldb" >&5 +echo "configure:2787: checking for db_open in -ldb" >&5 ac_lib_var=`echo db'_'db_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 @@ -2778,7 +2791,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2806: \"$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 @@ -2824,17 +2837,17 @@ if test "$dblib" = no; then ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6 -echo "configure:2828: checking for ndbm.h" >&5 +echo "configure:2841: checking for ndbm.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:2838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2851: \"$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* @@ -2851,7 +2864,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6 -echo "configure:2855: checking for dbm_open in -lndbm" >&5 +echo "configure:2868: 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 @@ -2859,7 +2872,7 @@ 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:2887: \"$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 @@ -2898,12 +2911,12 @@ if test "$dblib" = "weird"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:2902: checking for dbm_open" >&5 +echo "configure:2915: 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:2943: \"$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 @@ -2951,17 +2964,17 @@ if test "$dblib" = no; then ac_safe=`echo "gdbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gdbm.h""... $ac_c" 1>&6 -echo "configure:2955: checking for gdbm.h" >&5 +echo "configure:2968: checking for gdbm.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:2965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2978: \"$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* @@ -2978,7 +2991,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:2982: checking for gdbm_open in -lgdbm" >&5 +echo "configure:2995: checking for gdbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'gdbm_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 @@ -2986,7 +2999,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3014: \"$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 @@ -3040,7 +3053,7 @@ LIBS="$cmu_save_LIBS" echo $ac_n "checking DB library to use""... $ac_c" 1>&6 -echo "configure:3044: checking DB library to use" >&5 +echo "configure:3057: checking DB library to use" >&5 echo "$ac_t""$dblib" 1>&6 case "$dblib" in @@ -3075,7 +3088,7 @@ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:3079: checking for dlopen in -ldl" >&5 +echo "configure:3092: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3083,7 +3096,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3111: \"$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 @@ -3120,12 +3133,12 @@ for ac_func in syslog do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3124: checking for $ac_func" >&5 +echo "configure:3137: 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:3165: \"$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 @@ -3175,12 +3188,12 @@ LIB_CRYPT="" echo $ac_n "checking for crypt""... $ac_c" 1>&6 -echo "configure:3179: checking for crypt" >&5 +echo "configure:3192: checking for crypt" >&5 if eval "test \"`echo '$''{'ac_cv_func_crypt'+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:3220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_crypt=yes" else @@ -3221,7 +3234,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:3225: checking for crypt in -lcrypt" >&5 +echo "configure:3238: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3229,7 +3242,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3257: \"$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 @@ -3269,12 +3282,12 @@ save_LIBS="$LIBS" LIB_SOCKET="" echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3273: checking for connect" >&5 +echo "configure:3286: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+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:3314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -3315,7 +3328,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3319: checking for gethostbyname in -lnsl" >&5 +echo "configure:3332: 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 @@ -3323,7 +3336,7 @@ 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:3351: \"$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 @@ -3355,7 +3368,7 @@ fi echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3359: checking for connect in -lsocket" >&5 +echo "configure:3372: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3363,7 +3376,7 @@ 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:3391: \"$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 @@ -3399,12 +3412,12 @@ LIBS="$LIB_SOCKET $save_LIBS" echo $ac_n "checking for res_search""... $ac_c" 1>&6 -echo "configure:3403: checking for res_search" >&5 +echo "configure:3416: checking for res_search" >&5 if eval "test \"`echo '$''{'ac_cv_func_res_search'+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:3444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_res_search=yes" else @@ -3445,7 +3458,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 -echo "configure:3449: checking for res_search in -lresolv" >&5 +echo "configure:3462: checking for res_search in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3453,7 +3466,7 @@ 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:3481: \"$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 @@ -3491,12 +3504,12 @@ for ac_func in dn_expand dns_lookup do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3495: checking for $ac_func" >&5 +echo "configure:3508: 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:3536: \"$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 @@ -3584,7 +3597,7 @@ fi cmu_save_LIBS="$LIBS" echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 -echo "configure:3588: checking for pam_start in -lpam" >&5 +echo "configure:3601: checking for pam_start in -lpam" >&5 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3592,7 +3605,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpam $SASL_DL_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3620: \"$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 @@ -3620,17 +3633,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "security/pam_appl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for security/pam_appl.h""... $ac_c" 1>&6 -echo "configure:3624: checking for security/pam_appl.h" >&5 +echo "configure:3637: checking for security/pam_appl.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:3634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3647: \"$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* @@ -3661,7 +3674,7 @@ fi echo $ac_n "checking PAM support""... $ac_c" 1>&6 -echo "configure:3665: checking PAM support" >&5 +echo "configure:3678: checking PAM support" >&5 echo "$ac_t""$with_pam" 1>&6 LIB_PAM="" if test "$with_pam" != no; then @@ -3707,12 +3720,12 @@ for ac_func in getspnam getuserpw do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3711: checking for $ac_func" >&5 +echo "configure:3724: 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:3752: \"$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 @@ -3781,12 +3794,12 @@ EOF echo $ac_n "checking for getspnam""... $ac_c" 1>&6 -echo "configure:3785: checking for getspnam" >&5 +echo "configure:3798: checking for getspnam" >&5 if eval "test \"`echo '$''{'ac_cv_func_getspnam'+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:3826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getspnam=yes" else @@ -3851,7 +3864,7 @@ echo $ac_n "checking CRAM-MD5""... $ac_c" 1>&6 -echo "configure:3855: checking CRAM-MD5" >&5 +echo "configure:3868: checking CRAM-MD5" >&5 if test "$cram" != no; then echo "$ac_t""enabled" 1>&6 SASL_MECHS="$SASL_MECHS libcrammd5.la" @@ -3870,7 +3883,7 @@ echo $ac_n "checking SCRAM-MD5""... $ac_c" 1>&6 -echo "configure:3874: checking SCRAM-MD5" >&5 +echo "configure:3887: checking SCRAM-MD5" >&5 if test "$scram" != no; then echo "$ac_t""enabled" 1>&6 SASL_MECHS="$SASL_MECHS libscrammd5.la" @@ -3903,7 +3916,7 @@ LDFLAGS="$LDFLAGS -L${with_des}/lib" fi echo $ac_n "checking for des_pcbc_encrypt in -ldes""... $ac_c" 1>&6 -echo "configure:3907: checking for des_pcbc_encrypt in -ldes" >&5 +echo "configure:3920: checking for des_pcbc_encrypt in -ldes" >&5 ac_lib_var=`echo des'_'des_pcbc_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 @@ -3911,7 +3924,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldes $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3939: \"$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 @@ -3946,7 +3959,7 @@ if test "$with_des" = no; then echo $ac_n "checking for des_pcbc_encrypt in -ldes524""... $ac_c" 1>&6 -echo "configure:3950: checking for des_pcbc_encrypt in -ldes524" >&5 +echo "configure:3963: checking for des_pcbc_encrypt in -ldes524" >&5 ac_lib_var=`echo des524'_'des_pcbc_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 @@ -3954,7 +3967,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldes524 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3982: \"$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 @@ -3990,7 +4003,7 @@ fi if test "$with_des" = no; then echo $ac_n "checking for des_pcbc_encrypt in -ldes425""... $ac_c" 1>&6 -echo "configure:3994: checking for des_pcbc_encrypt in -ldes425" >&5 +echo "configure:4007: checking for des_pcbc_encrypt in -ldes425" >&5 ac_lib_var=`echo des425'_'des_pcbc_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 @@ -3998,7 +4011,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldes425 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4026: \"$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 @@ -4036,7 +4049,7 @@ LIB_RSAREF="" echo $ac_n "checking for RSAPublicEncrypt in -lrsaref""... $ac_c" 1>&6 -echo "configure:4040: checking for RSAPublicEncrypt in -lrsaref" >&5 +echo "configure:4053: checking for RSAPublicEncrypt in -lrsaref" >&5 ac_lib_var=`echo rsaref'_'RSAPublicEncrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4044,7 +4057,7 @@ ac_save_LIBS="$LIBS" LIBS="-lrsaref $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4072: \"$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 @@ -4078,7 +4091,7 @@ echo $ac_n "checking for des_pcbc_encrypt in -lcrypto""... $ac_c" 1>&6 -echo "configure:4082: checking for des_pcbc_encrypt in -lcrypto" >&5 +echo "configure:4095: checking for des_pcbc_encrypt in -lcrypto" >&5 ac_lib_var=`echo crypto'_'des_pcbc_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 @@ -4086,7 +4099,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIB_RSAREF $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4114: \"$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 @@ -4114,17 +4127,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "openssl/des.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for openssl/des.h""... $ac_c" 1>&6 -echo "configure:4118: checking for openssl/des.h" >&5 +echo "configure:4131: checking for openssl/des.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:4128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4141: \"$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* @@ -4173,7 +4186,7 @@ fi echo $ac_n "checking DIGEST-MD5""... $ac_c" 1>&6 -echo "configure:4177: checking DIGEST-MD5" >&5 +echo "configure:4190: checking DIGEST-MD5" >&5 if test "$digest" != no; then echo "$ac_t""enabled" 1>&6 SASL_MECHS="$SASL_MECHS libdigestmd5.la" @@ -4194,7 +4207,7 @@ if test "$krb4" != no; then echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 -echo "configure:4198: checking for res_search in -lresolv" >&5 +echo "configure:4211: checking for res_search in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4202,7 +4215,7 @@ 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:4230: \"$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 @@ -4243,7 +4256,7 @@ if test -d ${krb4}; then echo $ac_n "checking for Kerberos includes""... $ac_c" 1>&6 -echo "configure:4247: checking for Kerberos includes" >&5 +echo "configure:4260: checking for Kerberos includes" >&5 if eval "test \"`echo '$''{'cyrus_krbinclude'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4269,17 +4282,17 @@ if test "$with_des" != no; then ac_safe=`echo "krb.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for krb.h""... $ac_c" 1>&6 -echo "configure:4273: checking for krb.h" >&5 +echo "configure:4286: checking for krb.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:4283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4296: \"$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* @@ -4296,7 +4309,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for com_err in -lcom_err""... $ac_c" 1>&6 -echo "configure:4300: checking for com_err in -lcom_err" >&5 +echo "configure:4313: checking for com_err in -lcom_err" >&5 ac_lib_var=`echo com_err'_'com_err | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4304,7 +4317,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4332: \"$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 @@ -4331,7 +4344,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for krb_mk_priv in -lkrb""... $ac_c" 1>&6 -echo "configure:4335: checking for krb_mk_priv in -lkrb" >&5 +echo "configure:4348: checking for krb_mk_priv in -lkrb" >&5 ac_lib_var=`echo krb'_'krb_mk_priv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4339,7 +4352,7 @@ ac_save_LIBS="$LIBS" LIBS="-lkrb -ldes -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4367: \"$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 @@ -4374,7 +4387,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for krb_mk_priv in -lkrb""... $ac_c" 1>&6 -echo "configure:4378: checking for krb_mk_priv in -lkrb" >&5 +echo "configure:4391: checking for krb_mk_priv in -lkrb" >&5 ac_lib_var=`echo krb'_'krb_mk_priv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4382,7 +4395,7 @@ ac_save_LIBS="$LIBS" LIBS="-lkrb -ldes $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4410: \"$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 @@ -4429,17 +4442,17 @@ if test "$with_des" != "no"; then ac_safe=`echo "krb.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for krb.h""... $ac_c" 1>&6 -echo "configure:4433: checking for krb.h" >&5 +echo "configure:4446: checking for krb.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:4443: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4456: \"$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* @@ -4456,7 +4469,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for krb_mk_priv in -lkrb4""... $ac_c" 1>&6 -echo "configure:4460: checking for krb_mk_priv in -lkrb4" >&5 +echo "configure:4473: checking for krb_mk_priv in -lkrb4" >&5 ac_lib_var=`echo krb4'_'krb_mk_priv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4464,7 +4477,7 @@ ac_save_LIBS="$LIBS" LIBS="-lkrb4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4492: \"$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 @@ -4505,7 +4518,7 @@ fi echo $ac_n "checking KERBEROS_V4""... $ac_c" 1>&6 -echo "configure:4509: checking KERBEROS_V4" >&5 +echo "configure:4522: checking KERBEROS_V4" >&5 if test "$krb4" = kfm; then echo "$ac_t""MIT KfM 4.0" 1>&6 SASL_MECHS="$SASL_MECHS libkerberos4.la" @@ -4550,17 +4563,17 @@ fi ac_safe=`echo "gssapi.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gssapi.h""... $ac_c" 1>&6 -echo "configure:4554: checking for gssapi.h" >&5 +echo "configure:4567: checking for gssapi.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:4564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4577: \"$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* @@ -4584,17 +4597,17 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "gssapi/gssapi.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gssapi/gssapi.h""... $ac_c" 1>&6 -echo "configure:4588: checking for gssapi/gssapi.h" >&5 +echo "configure:4601: checking for gssapi/gssapi.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:4598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4611: \"$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* @@ -4622,7 +4635,7 @@ if test "$gssapi" != no; then echo $ac_n "checking for db_open in -ldb""... $ac_c" 1>&6 -echo "configure:4626: checking for db_open in -ldb" >&5 +echo "configure:4639: checking for db_open in -ldb" >&5 ac_lib_var=`echo db'_'db_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 @@ -4630,7 +4643,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4658: \"$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 @@ -4671,7 +4684,7 @@ gss_impl="mit"; echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 -echo "configure:4675: checking for res_search in -lresolv" >&5 +echo "configure:4688: checking for res_search in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4679,7 +4692,7 @@ 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:4707: \"$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 @@ -4725,7 +4738,7 @@ # the base64_decode check fails because libroken has dependencies # FIXME: this is probabally non-optimal as well echo $ac_n "checking for krb5_vlog in -lkrb5""... $ac_c" 1>&6 -echo "configure:4729: checking for krb5_vlog in -lkrb5" >&5 +echo "configure:4742: checking for krb5_vlog in -lkrb5" >&5 ac_lib_var=`echo krb5'_'krb5_vlog | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4733,7 +4746,7 @@ ac_save_LIBS="$LIBS" LIBS="-lkrb5 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4761: \"$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 @@ -4783,7 +4796,7 @@ if test "$ac_cv_header_gssapi_h" = "yes"; then cat > conftest.$ac_ext < EOF @@ -4799,7 +4812,7 @@ elif test "$ac_cv_header_gssapi_gssapi_h"; then cat > conftest.$ac_ext < EOF @@ -4817,11 +4830,11 @@ GSSAPI_LIBS="" echo $ac_n "checking GSSAPI""... $ac_c" 1>&6 -echo "configure:4821: checking GSSAPI" >&5 +echo "configure:4834: checking GSSAPI" >&5 if test "$gssapi" != no; then echo "$ac_t""with implementation ${gss_impl}" 1>&6 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6 -echo "configure:4825: checking for dbm_open in -lndbm" >&5 +echo "configure:4838: 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 @@ -4829,7 +4842,7 @@ 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:4857: \"$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 @@ -4861,7 +4874,7 @@ fi echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 -echo "configure:4865: checking for res_search in -lresolv" >&5 +echo "configure:4878: checking for res_search in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4869,7 +4882,7 @@ 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:4897: \"$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 @@ -4907,12 +4920,12 @@ for ac_func in gsskrb5_register_acceptor_identity do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4911: checking for $ac_func" >&5 +echo "configure:4924: 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:4952: \"$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 @@ -4976,7 +4989,7 @@ echo $ac_n "checking ANONYMOUS""... $ac_c" 1>&6 -echo "configure:4980: checking ANONYMOUS" >&5 +echo "configure:4993: checking ANONYMOUS" >&5 if test "$anon" != no; then echo "$ac_t""enabled" 1>&6 SASL_MECHS="$SASL_MECHS libanonymous.la" @@ -5012,7 +5025,7 @@ echo $ac_n "checking PLAIN""... $ac_c" 1>&6 -echo "configure:5016: checking PLAIN" >&5 +echo "configure:5029: checking PLAIN" >&5 if test "$plain" != no; then echo "$ac_t""enabled" 1>&6 SASL_MECHS="$SASL_MECHS libplain.la" @@ -5030,7 +5043,7 @@ echo $ac_n "checking LOGIN""... $ac_c" 1>&6 -echo "configure:5034: checking LOGIN" >&5 +echo "configure:5047: checking LOGIN" >&5 if test "$login" != no; then echo "$ac_t""enabled" 1>&6 SASL_MECHS="$SASL_MECHS liblogin.la" @@ -5048,7 +5061,7 @@ echo $ac_n "checking SRP""... $ac_c" 1>&6 -echo "configure:5052: checking SRP" >&5 +echo "configure:5065: checking SRP" >&5 if test "$srp" != no; then { echo "configure: error: This is pre-alpha. You probably don't want to use this" 1>&2; exit 1; } echo "$ac_t""enabled" 1>&6 @@ -5113,12 +5126,12 @@ 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:5117: checking for $ac_hdr that defines DIR" >&5 +echo "configure:5130: 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> @@ -5126,7 +5139,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:5130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -5151,7 +5164,7 @@ # 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:5155: checking for opendir in -ldir" >&5 +echo "configure:5168: 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 @@ -5159,7 +5172,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5187: \"$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 @@ -5192,7 +5205,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:5196: checking for opendir in -lx" >&5 +echo "configure:5209: 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 @@ -5200,7 +5213,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5228: \"$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 @@ -5234,12 +5247,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5238: checking for ANSI C header files" >&5 +echo "configure:5251: 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 @@ -5247,7 +5260,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5264: \"$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* @@ -5264,7 +5277,7 @@ 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 @@ -5282,7 +5295,7 @@ 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 @@ -5303,7 +5316,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -5314,7 +5327,7 @@ exit (0); } EOF -if { (eval echo configure:5318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5340,12 +5353,12 @@ for ac_func in strchr memcpy getpwnam getspnam gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5344: checking for $ac_func" >&5 +echo "configure:5357: 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:5385: \"$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 @@ -5395,12 +5408,12 @@ sasl_cv_getsubopt=no echo $ac_n "checking for getsubopt""... $ac_c" 1>&6 -echo "configure:5399: checking for getsubopt" >&5 +echo "configure:5412: checking for getsubopt" >&5 if eval "test \"`echo '$''{'ac_cv_func_getsubopt'+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:5440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getsubopt=yes" else @@ -5455,12 +5468,12 @@ sasl_cv_snprintf=no SNPRINTFOBJS="" echo $ac_n "checking for snprintf""... $ac_c" 1>&6 -echo "configure:5459: checking for snprintf" >&5 +echo "configure:5472: checking for snprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_snprintf'+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:5500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_snprintf=yes" else @@ -5507,12 +5520,12 @@ fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:5511: checking for vsnprintf" >&5 +echo "configure:5524: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+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:5552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vsnprintf=yes" else @@ -5571,17 +5584,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5575: checking for $ac_hdr" >&5 +echo "configure:5588: 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:5585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5598: \"$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* @@ -5608,12 +5621,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5612: checking for working const" >&5 +echo "configure:5625: 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:5679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5683,21 +5696,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5687: checking for inline" >&5 +echo "configure:5700: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5724,12 +5737,12 @@ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:5728: checking return type of signal handlers" >&5 +echo "configure:5741: 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 @@ -5746,7 +5759,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:5750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -5767,17 +5780,17 @@ ac_safe=`echo "sfio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sfio.h""... $ac_c" 1>&6 -echo "configure:5771: checking for sfio.h" >&5 +echo "configure:5784: checking for sfio.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:5781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5794: \"$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* @@ -5807,12 +5820,12 @@ for ac_func in getdomainname getpassphrase getpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5811: checking for $ac_func" >&5 +echo "configure:5824: 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:5852: \"$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 @@ -5871,6 +5884,266 @@ EOF fi + +# Check whether --enable-ipv6 or --disable-ipv6 was given. +if test "${enable_ipv6+set}" = set; then + enableval="$enable_ipv6" + ipv6="$enableval" +else + ipv6="yes" +fi + +if test "$ipv6" != "yes"; then + echo "$ac_t""IPv6 support is disabled" 1>&6 +else + +ac_tr_lib=HAVE_`echo getnameinfo | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +echo $ac_n "checking for getnameinfo""... $ac_c" 1>&6 +echo "configure:5904: checking for getnameinfo" >&5 +if eval "test \"`echo '$''{'ac_cv_func_getnameinfo'+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 getnameinfo(); + +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_getnameinfo) || defined (__stub___getnameinfo) +choke me +#else +getnameinfo(); +#endif + +; return 0; } +EOF +if { (eval echo configure:5932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_getnameinfo=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_getnameinfo=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'getnameinfo`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <&6 + echo $ac_n "checking for getnameinfo in -lsocket""... $ac_c" 1>&6 +echo "configure:5956: checking for getnameinfo in -lsocket" >&5 +ac_lib_var=`echo socket'_'getnameinfo | 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 + cat >> confdefs.h <&6 + echo $ac_n "checking whether your system has IPv6 directory""... $ac_c" 1>&6 +echo "configure:6000: checking whether your system has IPv6 directory" >&5 + if eval "test \"`echo '$''{'ipv6_cv_dir'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do + if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then + break + fi + done +fi + echo "$ac_t""$ipv6_cv_dir" 1>&6 + if test $ipv6_cv_dir = no; then + ac_cv_lib_inet6_getnameinfo=no + else + if test x$ipv6_libinet6 = x; then + ipv6_libinet6=no + SAVELDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib" + fi + echo $ac_n "checking for getnameinfo in -linet6""... $ac_c" 1>&6 +echo "configure:6020: checking for getnameinfo in -linet6" >&5 +ac_lib_var=`echo inet6'_'getnameinfo | 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="-linet6 $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 + cat >> confdefs.h <&6 +fi + if test $ipv6_libinet6 = no; then + LDFLAGS="$SAVELDFLAGS" + fi + fi +fi + +fi +if test $ac_cv_func_getnameinfo = yes -o $ac_cv_lib_socket_getnameinfo = yes \ + -o $ac_cv_lib_inet6_getnameinfo = yes +then + ipv6_cv_getnameinfo=yes + : +else + ipv6_cv_getnameinfo=no + : +fi + cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "sockaddr_storage" >/dev/null 2>&1; then + rm -rf conftest* + cat >> confdefs.h <<\EOF +#define HAVE_SOCKADDR_STORAGE 1 +EOF + +fi +rm -f conftest* + + +echo $ac_n "checking whether you have ss_family in struct sockaddr_storage""... $ac_c" 1>&6 +echo "configure:6098: checking whether you have ss_family in struct sockaddr_storage" >&5 +if eval "test \"`echo '$''{'ipv6_cv_ss_family'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#include +int main() { +struct sockaddr_storage ss; int i = ss.ss_family; +; return 0; } +EOF +if { (eval echo configure:6111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ipv6_cv_ss_family=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ipv6_cv_ss_family=no +fi +rm -f conftest* +fi +if test $ipv6_cv_ss_family = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_SS_FAMILY 1 +EOF + +else + : +fi +echo "$ac_t""$ipv6_cv_ss_family" 1>&6 +fi + +cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "socklen_t" >/dev/null 2>&1; then + rm -rf conftest* + cat >> confdefs.h <<\EOF +#define HAVE_SOCKLEN_T 1 +EOF + +fi +rm -f conftest* + Index: configure.in diff -u configure.in.orig configure.in --- configure.in.orig Tue Jul 16 15:03:36 2002 +++ configure.in Tue Sep 10 00:03:28 2002 @@ -726,6 +726,19 @@ AC_DEFINE_UNQUOTED(PREFER_MECH, "KERBEROS_V4") fi +AC_ARG_ENABLE(ipv6, [ --disable-ipv6 Don't compile in IPv6 support], + ipv6="$enableval", ipv6="yes") +if test "$ipv6" != "yes"; then + AC_MSG_RESULT(IPv6 support is disabled) +else + IPv6_CHECK_FUNC(getnameinfo) + AC_EGREP_HEADER(sockaddr_storage, sys/socket.h, + AC_DEFINE(HAVE_SOCKADDR_STORAGE)) + IPv6_CHECK_SS_FAMILY() +fi + +AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_DEFINE(HAVE_SOCKLEN_T)) + AC_SUBST(DIRS) AC_OUTPUT(Makefile Index: lib/checkpw.c diff -u lib/checkpw.c.orig lib/checkpw.c --- lib/checkpw.c.orig Thu Dec 20 20:31:07 2001 +++ lib/checkpw.c Tue Sep 10 00:03:33 2002 @@ -557,7 +557,12 @@ const char **reply) { char *host; +#ifdef INET6 + struct sockaddr *addr; + socklen_t salen; +#else struct sockaddr_in *addr; +#endif char *argv[2], *argv0 = "SASL"; SIAENTITY *ent; int ret; @@ -572,8 +577,21 @@ /* Get the remote host */ if (sasl_getprop(conn, SASL_IP_REMOTE, (void **) &addr) != SASL_OK) host = NULL; - else + else { +#ifdef INET6 +#ifdef SIN6_LEN + salen = addr->sa_len; +#else + salen = (addr->sa_family == AF_INET) ? sizeof(struct sockaddr_in) + : sizeof(struct sockaddr_in6); +#endif + getnameinfo(addr, salen, hbuf, sizeof(hbuf), NULL, 0, + NI_NUMERICHOST | NI_WITHSCOPEID); + host = hbuf; +#else host = inet_ntoa(*addr); +#endif + } /* Try to validate */ if (sia_ses_init (&ent, 1, argv, host, userid, NULL, 0, NULL) != SIASUCCESS) Index: lib/common.c diff -u lib/common.c.orig lib/common.c --- lib/common.c.orig Thu Dec 20 20:31:07 2001 +++ lib/common.c Tue Sep 10 00:03:33 2002 @@ -361,13 +361,21 @@ if (! conn->got_ip_local) result = SASL_NOTDONE; else +#ifdef INET6 + *(struct sockaddr **)pvalue = (struct sockaddr *)&conn->ip_local; +#else *(struct sockaddr_in **)pvalue = &conn->ip_local; +#endif break; case SASL_IP_REMOTE: if (! conn->got_ip_remote) result = SASL_NOTDONE; else +#ifdef INET6 + *(struct sockaddr **)pvalue = (struct sockaddr *)&conn->ip_remote; +#else *(struct sockaddr_in **)pvalue = &conn->ip_remote; +#endif break; default: result = SASL_BADPARAM; @@ -384,6 +392,10 @@ { int result = SASL_OK; char *str; +#ifdef INET6 + int family; + socklen_t salen; +#endif /* make sure the sasl context is valid */ if (!conn) @@ -415,12 +427,40 @@ sizeof(sasl_security_properties_t)); break; case SASL_IP_LOCAL: - conn->got_ip_local = 1; +#ifdef INET6 + /* XXX: Yes, this is ugly. But, there is such code, eg. testsuite.c */ + family = ((struct sockaddr *)value)->sa_family; + if (family!= AF_INET && family != AF_INET6) + family = AF_INET; + salen = (family == AF_INET) ? sizeof(struct sockaddr_in) + : sizeof(struct sockaddr_in6); + memcpy(&conn->ip_local, value, salen); + conn->ip_local.ss_family = family; +#ifdef SIN6_LEN + conn->ip_local.ss_len = salen; +#endif +#else conn->ip_local= *(struct sockaddr_in *) value; +#endif + conn->got_ip_local = 1; break; case SASL_IP_REMOTE: - conn->got_ip_remote = 1; +#ifdef INET6 + /* XXX: Yes, this is ugly. But, there is such code, eg. testsuite.c */ + family = ((struct sockaddr *)value)->sa_family; + if (family!= AF_INET && family != AF_INET6) + family = AF_INET; + salen = (family == AF_INET) ? sizeof(struct sockaddr_in) + : sizeof(struct sockaddr_in6); + memcpy(&conn->ip_remote, value, salen); + conn->ip_remote.ss_family = family; +#ifdef SIN6_LEN + conn->ip_remote.ss_len = salen; +#endif +#else conn->ip_remote= *(struct sockaddr_in *) value; +#endif + conn->got_ip_remote = 1; break; default: result = SASL_BADPARAM; Index: lib/saslint.h diff -u lib/saslint.h.orig lib/saslint.h --- lib/saslint.h.orig Thu Dec 20 20:31:07 2001 +++ lib/saslint.h Tue Sep 10 00:03:33 2002 @@ -92,7 +92,11 @@ int secflags; /* security layer flags passed to sasl_*_new */ int got_ip_local, got_ip_remote; +#ifdef INET6 + struct sockaddr_storage ip_local, ip_remote; +#else struct sockaddr_in ip_local, ip_remote; +#endif sasl_external_properties_t external; void *context; Index: plugins/anonymous.c diff -u plugins/anonymous.c.orig plugins/anonymous.c --- plugins/anonymous.c.orig Thu Dec 20 20:31:16 2001 +++ plugins/anonymous.c Tue Sep 10 00:03:33 2002 @@ -106,7 +106,11 @@ const char **errstr) { int result; +#ifdef INET6 + struct sockaddr *remote_addr; +#else struct sockaddr_in *remote_addr; +#endif char *clientdata; if (!sparams @@ -141,6 +145,23 @@ SASL_IP_REMOTE, (void **)&remote_addr); if (result==SASL_OK) { +#ifdef INET6 + socklen_t salen; + char hbuf[NI_MAXHOST]; + +#ifdef SIN6_LEN + salen = remote_addr->sa_len; +#else + salen = (remote_addr->sa_family == AF_INET) + ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6); +#endif + getnameinfo(remote_addr, salen, hbuf, sizeof(hbuf), NULL, 0, + NI_NUMERICHOST | NI_WITHSCOPEID); + sparams->utils->log(sparams->utils->conn, + SASL_LOG_INFO, + "ANONYMOUS", 0, 0, + "login: \"%s\" from [%s]", clientdata, hbuf); +#else int ipnum = remote_addr->sin_addr.s_addr; sparams->utils->log(sparams->utils->conn, @@ -152,6 +173,7 @@ ipnum >> 16 & 0xFF, ipnum >> 8 &0xFF, ipnum & 0xFF); +#endif } else { sparams->utils->log(sparams->utils->conn, SASL_LOG_INFO, Index: plugins/kerberos4.c diff -u plugins/kerberos4.c.orig plugins/kerberos4.c --- plugins/kerberos4.c.orig Thu Dec 20 20:31:16 2001 +++ plugins/kerberos4.c Tue Sep 10 00:03:33 2002 @@ -147,10 +147,17 @@ des_key_schedule dec_keysched; /* decryption key schedule */ +#ifdef INET6 + struct sockaddr *ip_local; /* local ip address and port. + needed for layers */ + struct sockaddr *ip_remote; /* remote ip address and port. + needed for layers */ +#else struct sockaddr_in *ip_local; /* local ip address and port. needed for layers */ struct sockaddr_in *ip_remote; /* remote ip address and port. needed for layers */ +#endif sasl_malloc_t *malloc; /* encode and decode need these */ sasl_realloc_t *realloc; @@ -590,7 +597,11 @@ AUTH_DAT ad; KTEXT_ST ticket; int lup; +#ifdef INET6 + struct sockaddr *addr; +#else struct sockaddr_in *addr; +#endif VL(("KERBEROS_V4 Step 2\n")); @@ -629,9 +640,17 @@ return SASL_BADAUTH; } #endif +#ifdef INET6 + if (addr->sa_family != AF_INET) { + if (errstr) + *errstr = "unsupported address family"; + return SASL_BADAUTH; + } +#endif /* check ticket */ result = krb_rd_req(&ticket, (char *) sparams->service, text->instance, - addr ? addr->sin_addr.s_addr : 0L, &ad, srvtab); + addr ? ((struct sockaddr_in *)addr)->sin_addr.s_addr + : 0L, &ad, srvtab); if (result) { /* if fails mechanism fails */ VL(("krb_rd_req failed service=%s instance=%s error code=%i\n",