From b4527b297382a9d5093976d740d1c2476947f8b1 Mon Sep 17 00:00:00 2001 From: kcr Date: Fri, 18 Jul 2008 20:38:04 +0000 Subject: [PATCH] r224@bucket (orig r220): kcr | 2007-12-24 20:24:15 -0500 M configure run autoconf D h/zephyr/zephyr_err.h generated file git-svn-id: svn://svn.1ts.org/debian/trunk/zephyr@289 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f --- configure | 967 ++++++++++++++++++++++++++++++++++-------- h/zephyr/zephyr_err.h | 34 -- 2 files changed, 791 insertions(+), 210 deletions(-) delete mode 100644 h/zephyr/zephyr_err.h diff --git a/configure b/configure index fac8b0f..94cc807 100755 --- a/configure +++ b/configure @@ -860,6 +860,7 @@ TLIB RLIB SLIB KRB4_LIBS +KRB5_LIBS HESIOD_LIBS REGEX_LIBS ARES_LIBS @@ -1476,6 +1477,7 @@ Optional Packages: --with-tags[=TAGS] include additional configurations [automatic] --with-x use the X Window System --with-krb4=PREFIX Use Kerberos 4 + --with-krb5=PREFIX Use Kerberos 5 --with-hesiod=PREFIX Use Hesiod --with-regex=PREFIX Use installed regex library --with-ares=PREFIX Use libares @@ -4139,7 +4141,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4142 "configure"' > conftest.$ac_ext + echo '#line 4144 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6705,11 +6707,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6708: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6710: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6712: \$? = $ac_status" >&5 + echo "$as_me:6714: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6938,11 +6940,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6941: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6943: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6945: \$? = $ac_status" >&5 + echo "$as_me:6947: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6998,11 +7000,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7001: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7003: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7005: \$? = $ac_status" >&5 + echo "$as_me:7007: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8328,7 +8330,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 8331 "configure"' > conftest.$ac_ext + echo '#line 8333 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9166,7 +9168,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11448: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11450: \$? = $ac_status" >&5 + echo "$as_me:11452: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11503,11 +11505,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11506: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11508: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11510: \$? = $ac_status" >&5 + echo "$as_me:11512: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12014,7 +12016,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 12017 "configure"' > conftest.$ac_ext + echo '#line 12019 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -12852,7 +12854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13782: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13784: \$? = $ac_status" >&5 + echo "$as_me:13786: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13837,11 +13839,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13840: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13842: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13844: \$? = $ac_status" >&5 + echo "$as_me:13846: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15147,7 +15149,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 15150 "configure"' > conftest.$ac_ext + echo '#line 15152 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15891,11 +15893,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15894: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15896: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15898: \$? = $ac_status" >&5 + echo "$as_me:15900: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16124,11 +16126,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16127: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16129: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16131: \$? = $ac_status" >&5 + echo "$as_me:16133: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -16184,11 +16186,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16187: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16189: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16191: \$? = $ac_status" >&5 + echo "$as_me:16193: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17514,7 +17516,7 @@ linux*) libsuff= case "$host_cpu" in x86_64*|s390x*|powerpc64*) - echo '#line 17517 "configure"' > conftest.$ac_ext + echo '#line 17519 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -18352,7 +18354,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 -echo $ECHO_N "checking for res_send... $ECHO_C" >&6; } -if test "${ac_cv_func_res_send+set}" = set; then +if test "$krb5" != no; then + { echo "$as_me:$LINENO: checking for library containing gethostbyname" >&5 +echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&6; } +if test "${ac_cv_search_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define res_send to an innocuous variant, in case declares res_send. - For example, HP-UX 11i declares gettimeofday. */ -#define res_send innocuous_res_send - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char res_send (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef res_send /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -24055,23 +24043,23 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char res_send (); -/* 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_res_send || defined __stub___res_send -choke me -#endif - +char gethostbyname (); int main () { -return res_send (); +return gethostbyname (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' nsl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -24089,30 +24077,42 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_func_res_send=yes + ac_cv_search_gethostbyname=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_res_send=no + fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext + conftest$ac_exeext + if test "${ac_cv_search_gethostbyname+set}" = set; then + break fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_res_send" >&5 -echo "${ECHO_T}$ac_cv_func_res_send" >&6; } -if test $ac_cv_func_res_send = yes; then +done +if test "${ac_cv_search_gethostbyname+set}" = set; then : else + ac_cv_search_gethostbyname=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6; } +ac_res=$ac_cv_search_gethostbyname +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -{ echo "$as_me:$LINENO: checking for res_send in -lresolv" >&5 -echo $ECHO_N "checking for res_send in -lresolv... $ECHO_C" >&6; } -if test "${ac_cv_lib_resolv_res_send+set}" = set; then +fi + +{ echo "$as_me:$LINENO: checking for library containing socket" >&5 +echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6; } +if test "${ac_cv_search_socket+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lresolv $LIBS" + ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24126,16 +24126,23 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char res_send (); +char socket (); int main () { -return res_send (); +return socket (); ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext +for ac_lib in '' socket; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -24153,42 +24160,44 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_resolv_res_send=yes + ac_cv_search_socket=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_resolv_res_send=no + fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + conftest$ac_exeext + if test "${ac_cv_search_socket+set}" = set; then + break fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_send" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv_res_send" >&6; } -if test $ac_cv_lib_resolv_res_send = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBRESOLV 1 -_ACEOF - - LIBS="-lresolv $LIBS" - +done +if test "${ac_cv_search_socket+set}" = set; then + : +else + ac_cv_search_socket=no fi - +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi +{ echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5 +echo "${ECHO_T}$ac_cv_search_socket" >&6; } +ac_res=$ac_cv_search_socket +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -if test "$hesiod" != yes; then - CPPFLAGS="$CPPFLAGS -I$hesiod/include" - LDFLAGS="$LDFLAGS -L$hesiod/lib" fi -{ echo "$as_me:$LINENO: checking for hes_resolve in -lhesiod" >&5 -echo $ECHO_N "checking for hes_resolve in -lhesiod... $ECHO_C" >&6; } -if test "${ac_cv_lib_hesiod_hes_resolve+set}" = set; then + + +{ echo "$as_me:$LINENO: checking for compile in -lgen" >&5 +echo $ECHO_N "checking for compile in -lgen... $ECHO_C" >&6; } +if test "${ac_cv_lib_gen_compile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lhesiod $LIBS $LIBS" +LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24202,11 +24211,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char hes_resolve (); +char compile (); int main () { -return hes_resolve (); +return compile (); ; return 0; } @@ -24229,55 +24238,40 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_hesiod_hes_resolve=yes + ac_cv_lib_gen_compile=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_hesiod_hes_resolve=no + ac_cv_lib_gen_compile=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_hesiod_hes_resolve" >&5 -echo "${ECHO_T}$ac_cv_lib_hesiod_hes_resolve" >&6; } -if test $ac_cv_lib_hesiod_hes_resolve = yes; then - : -else - { { echo "$as_me:$LINENO: error: Hesiod library not found" >&5 -echo "$as_me: error: Hesiod library not found" >&2;} - { (exit 1); exit 1; }; } -fi - - HESIOD_LIBS="-lhesiod" - cat >>confdefs.h <<\_ACEOF -#define HAVE_HESIOD 1 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gen_compile" >&5 +echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6; } +if test $ac_cv_lib_gen_compile = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBGEN 1 _ACEOF -fi - + LIBS="-lgen $LIBS" -# Check whether --with-regex was given. -if test "${with_regex+set}" = set; then - withval=$with_regex; regex="$withval" -else - regex=no fi -if test "$regex" != no; then - if test "$regex" != yes; then - CPPFLAGS="$CPPFLAGS -I$regex/include" - LDFLAGS="$LDFLAGS -L$regex/lib" - fi - { echo "$as_me:$LINENO: checking for regcomp in -lregex" >&5 -echo $ECHO_N "checking for regcomp in -lregex... $ECHO_C" >&6; } -if test "${ac_cv_lib_regex_regcomp+set}" = set; then +if test "$krb5" != yes; then + CPPFLAGS="$CPPFLAGS -I$krb5/include" + LDFLAGS="$LDFLAGS -L$krb5/lib" +fi +{ echo "$as_me:$LINENO: checking for krb5_init_context in -lkrb5" >&5 +echo $ECHO_N "checking for krb5_init_context in -lkrb5... $ECHO_C" >&6; } +if test "${ac_cv_lib_krb5_krb5_init_context+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lregex $LIBS" +LIBS="-lkrb5 -lk5crypto -lcom_err $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24291,11 +24285,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char regcomp (); +char krb5_init_context (); int main () { -return regcomp (); +return krb5_init_context (); ; return 0; } @@ -24318,32 +24312,47 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_regex_regcomp=yes + ac_cv_lib_krb5_krb5_init_context=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_regex_regcomp=no + ac_cv_lib_krb5_krb5_init_context=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_regex_regcomp" >&5 -echo "${ECHO_T}$ac_cv_lib_regex_regcomp" >&6; } -if test $ac_cv_lib_regex_regcomp = yes; then - REGEX_LIBS=-lregex +{ echo "$as_me:$LINENO: result: $ac_cv_lib_krb5_krb5_init_context" >&5 +echo "${ECHO_T}$ac_cv_lib_krb5_krb5_init_context" >&6; } +if test $ac_cv_lib_krb5_krb5_init_context = yes; then + : else - { { echo "$as_me:$LINENO: error: regex library not found" >&5 -echo "$as_me: error: regex library not found" >&2;} + { { echo "$as_me:$LINENO: error: Kerberos 5 libraries not found" >&5 +echo "$as_me: error: Kerberos 5 libraries not found" >&2;} { (exit 1); exit 1; }; } fi + KRB5_LIBS="-lkrb5 -lk5crypto -lcom_err" + cat >>confdefs.h <<\_ACEOF +#define HAVE_KRB5 1 +_ACEOF + +fi + + +# Check whether --with-hesiod was given. +if test "${with_hesiod+set}" = set; then + withval=$with_hesiod; hesiod="$withval" else - { echo "$as_me:$LINENO: checking for regcomp" >&5 -echo $ECHO_N "checking for regcomp... $ECHO_C" >&6; } -if test "${ac_cv_func_regcomp+set}" = set; then + hesiod=no +fi + +if test "$hesiod" != no; then + { echo "$as_me:$LINENO: checking for res_send" >&5 +echo $ECHO_N "checking for res_send... $ECHO_C" >&6; } +if test "${ac_cv_func_res_send+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -24352,12 +24361,12 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Define regcomp to an innocuous variant, in case declares regcomp. +/* Define res_send to an innocuous variant, in case declares res_send. For example, HP-UX 11i declares gettimeofday. */ -#define regcomp innocuous_regcomp +#define res_send innocuous_res_send /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char regcomp (); below. + which can conflict with char res_send (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ @@ -24367,7 +24376,7 @@ cat >>conftest.$ac_ext <<_ACEOF # include #endif -#undef regcomp +#undef res_send /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC @@ -24375,18 +24384,18 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char regcomp (); +char res_send (); /* 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_regcomp || defined __stub___regcomp +#if defined __stub_res_send || defined __stub___res_send choke me #endif int main () { -return regcomp (); +return res_send (); ; return 0; } @@ -24409,37 +24418,357 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_func_regcomp=yes + ac_cv_func_res_send=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_func_regcomp=no + ac_cv_func_res_send=no fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_regcomp" >&5 -echo "${ECHO_T}$ac_cv_func_regcomp" >&6; } -if test $ac_cv_func_regcomp = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_func_res_send" >&5 +echo "${ECHO_T}$ac_cv_func_res_send" >&6; } +if test $ac_cv_func_res_send = yes; then : else - { { echo "$as_me:$LINENO: error: can't find POSIX regexp support" >&5 -echo "$as_me: error: can't find POSIX regexp support" >&2;} - { (exit 1); exit 1; }; } -fi - -fi - -# Check whether --with-ares was given. -if test "${with_ares+set}" = set; then - withval=$with_ares; ares="$withval" +{ echo "$as_me:$LINENO: checking for res_send in -lresolv" >&5 +echo $ECHO_N "checking for res_send in -lresolv... $ECHO_C" >&6; } +if test "${ac_cv_lib_resolv_res_send+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ares=no -fi - + ac_check_lib_save_LIBS=$LIBS +LIBS="-lresolv $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char res_send (); +int +main () +{ +return res_send (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_resolv_res_send=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_resolv_res_send=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_send" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv_res_send" >&6; } +if test $ac_cv_lib_resolv_res_send = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBRESOLV 1 +_ACEOF + + LIBS="-lresolv $LIBS" + +fi + +fi + +if test "$hesiod" != yes; then + CPPFLAGS="$CPPFLAGS -I$hesiod/include" + LDFLAGS="$LDFLAGS -L$hesiod/lib" +fi +{ echo "$as_me:$LINENO: checking for hes_resolve in -lhesiod" >&5 +echo $ECHO_N "checking for hes_resolve in -lhesiod... $ECHO_C" >&6; } +if test "${ac_cv_lib_hesiod_hes_resolve+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lhesiod $LIBS $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char hes_resolve (); +int +main () +{ +return hes_resolve (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_hesiod_hes_resolve=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_hesiod_hes_resolve=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_hesiod_hes_resolve" >&5 +echo "${ECHO_T}$ac_cv_lib_hesiod_hes_resolve" >&6; } +if test $ac_cv_lib_hesiod_hes_resolve = yes; then + : +else + { { echo "$as_me:$LINENO: error: Hesiod library not found" >&5 +echo "$as_me: error: Hesiod library not found" >&2;} + { (exit 1); exit 1; }; } +fi + + HESIOD_LIBS="-lhesiod" + cat >>confdefs.h <<\_ACEOF +#define HAVE_HESIOD 1 +_ACEOF + +fi + + +# Check whether --with-regex was given. +if test "${with_regex+set}" = set; then + withval=$with_regex; regex="$withval" +else + regex=no +fi + +if test "$regex" != no; then + if test "$regex" != yes; then + CPPFLAGS="$CPPFLAGS -I$regex/include" + LDFLAGS="$LDFLAGS -L$regex/lib" + fi + { echo "$as_me:$LINENO: checking for regcomp in -lregex" >&5 +echo $ECHO_N "checking for regcomp in -lregex... $ECHO_C" >&6; } +if test "${ac_cv_lib_regex_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lregex $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char regcomp (); +int +main () +{ +return regcomp (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_regex_regcomp=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_regex_regcomp=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_regex_regcomp" >&5 +echo "${ECHO_T}$ac_cv_lib_regex_regcomp" >&6; } +if test $ac_cv_lib_regex_regcomp = yes; then + REGEX_LIBS=-lregex +else + { { echo "$as_me:$LINENO: error: regex library not found" >&5 +echo "$as_me: error: regex library not found" >&2;} + { (exit 1); exit 1; }; } +fi + +else + { echo "$as_me:$LINENO: checking for regcomp" >&5 +echo $ECHO_N "checking for regcomp... $ECHO_C" >&6; } +if test "${ac_cv_func_regcomp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define regcomp to an innocuous variant, in case declares regcomp. + For example, HP-UX 11i declares gettimeofday. */ +#define regcomp innocuous_regcomp + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char regcomp (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef regcomp + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char regcomp (); +/* 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_regcomp || defined __stub___regcomp +choke me +#endif + +int +main () +{ +return regcomp (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_regcomp=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_regcomp=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_regcomp" >&5 +echo "${ECHO_T}$ac_cv_func_regcomp" >&6; } +if test $ac_cv_func_regcomp = yes; then + : +else + { { echo "$as_me:$LINENO: error: can't find POSIX regexp support" >&5 +echo "$as_me: error: can't find POSIX regexp support" >&2;} + { (exit 1); exit 1; }; } +fi + +fi + + +# Check whether --with-ares was given. +if test "${with_ares+set}" = set; then + withval=$with_ares; ares="$withval" +else + ares=no +fi + if test "$ares" != no; then { echo "$as_me:$LINENO: checking for res_send" >&5 echo $ECHO_N "checking for res_send... $ECHO_C" >&6; } @@ -24994,7 +25323,7 @@ else echo "$as_me: error: This package requires ss." >&2;} { (exit 1); exit 1; }; } fi -LIBS="$KRB4_LIBS $HESIOD_LIBS $LIBS" +LIBS="$KRB5_LIBS $KRB4_LIBS $HESIOD_LIBS $LIBS" if test $ac_cv_c_compiler_gnu = yes; then { echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5 @@ -25562,6 +25891,291 @@ fi done + + +for ac_func in krb5_free_data krb5_c_make_checksum krb5_cc_set_default_name +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* 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_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + +{ echo "$as_me:$LINENO: checking for krb5_auth_con_getauthenticator taking double pointer" >&5 +echo $ECHO_N "checking for krb5_auth_con_getauthenticator taking double pointer... $ECHO_C" >&6; } +if test "${ac_cv_krb5_auth_con_getauthenticator_takes_double_pointer+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +local_save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="${CPPFLAGS} ${KRB5_INC_FLAGS}" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#define socklen_t int +#define ssize_t int +#include +krb5_error_code +krb5_auth_con_getauthenticator(krb5_context context, + krb5_auth_context auth_context, + krb5_authenticator *authenticator); +int +main () +{ +krb5_error_code foo = krb5_auth_con_getauthenticator(0, 0, 0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_krb5_auth_con_getauthenticator_takes_double_pointer=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_krb5_auth_con_getauthenticator_takes_double_pointer=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi + +CPPFLAGS="${local_save_CPPFLAGS}" +if test "$ac_cv_krb5_auth_con_getauthenticator_takes_double_pointer" = yes; then + cat >>confdefs.h <<\_ACEOF +#define KRB5_AUTH_CON_GETAUTHENTICATOR_TAKES_DOUBLE_POINTER 1 +_ACEOF +fi +{ echo "$as_me:$LINENO: result: $ac_cv_krb5_auth_con_getauthenticator_takes_double_pointer" >&5 +echo "${ECHO_T}$ac_cv_krb5_auth_con_getauthenticator_takes_double_pointer" >&6; } + +{ echo "$as_me:$LINENO: checking for enc_part2 in struct krb5_ticket" >&5 +echo $ECHO_N "checking for enc_part2 in struct krb5_ticket... $ECHO_C" >&6; } +if test "${ac_cv_have_krb5_ticket_enc_part2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +local_save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="${CPPFLAGS} ${KRB5_INC_FLAGS}" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +krb5_ticket _tkt; _tkt.enc_part2; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_krb5_ticket_enc_part2=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_krb5_ticket_enc_part2=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi + +CPPFLAGS="${local_save_CPPFLAGS}" +if test "$ac_cv_have_krb5_ticket_enc_part2" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_KRB5_TICKET_ENC_PART2 1 +_ACEOF +fi +{ echo "$as_me:$LINENO: result: $ac_cv_have_krb5_ticket_enc_part2" >&5 +echo "${ECHO_T}$ac_cv_have_krb5_ticket_enc_part2" >&6; } + +{ echo "$as_me:$LINENO: checking for enctype in struct krb5_keyblock" >&5 +echo $ECHO_N "checking for enctype in struct krb5_keyblock... $ECHO_C" >&6; } +if test "${ac_cv_have_krb5_creds_keyblock_enctype+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + +local_save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="${CPPFLAGS} ${KRB5_INC_FLAGS}" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +krb5_creds _creds; _creds.keyblock.enctype; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_krb5_creds_keyblock_enctype=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_krb5_creds_keyblock_enctype=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi + +CPPFLAGS="${local_save_CPPFLAGS}" +if test "$ac_cv_have_krb5_creds_keyblock_enctype" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_KRB5_CREDS_KEYBLOCK_ENCTYPE 1 +_ACEOF +fi +{ echo "$as_me:$LINENO: result: $ac_cv_have_krb5_creds_keyblock_enctype" >&5 +echo "${ECHO_T}$ac_cv_have_krb5_creds_keyblock_enctype" >&6; } + ac_config_headers="$ac_config_headers h/config.h" ac_config_files="$ac_config_files Makefile clients/Makefile clients/xzwrite/Makefile clients/zaway/Makefile clients/zctl/Makefile clients/zleave/Makefile clients/zlocate/Makefile clients/zmailnotify/Makefile clients/znol/Makefile clients/zpopnotify/Makefile clients/zshutdown_notify/Makefile clients/zstat/Makefile clients/zwrite/Makefile lib/Makefile libdyn/Makefile server/Makefile zhm/Makefile zwgc/Makefile" @@ -26292,10 +26906,10 @@ TLIB!$TLIB$ac_delim RLIB!$RLIB$ac_delim SLIB!$SLIB$ac_delim KRB4_LIBS!$KRB4_LIBS$ac_delim +KRB5_LIBS!$KRB5_LIBS$ac_delim HESIOD_LIBS!$HESIOD_LIBS$ac_delim REGEX_LIBS!$REGEX_LIBS$ac_delim ARES_LIBS!$ARES_LIBS$ac_delim -LIBOBJS!$LIBOBJS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -26337,10 +26951,11 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 2; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/h/zephyr/zephyr_err.h b/h/zephyr/zephyr_err.h deleted file mode 100644 index 3fd16e9..0000000 --- a/h/zephyr/zephyr_err.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * zephyr_err.h: - * This file is automatically generated; please do not edit it. - */ - -#define ZERR_PKTLEN (-772103680L) -#define ZERR_HEADERLEN (-772103679L) -#define ZERR_ILLVAL (-772103678L) -#define ZERR_HMPORT (-772103677L) -#define ZERR_PORTINUSE (-772103676L) -#define ZERR_BADPKT (-772103675L) -#define ZERR_VERS (-772103674L) -#define ZERR_NOPORT (-772103673L) -#define ZERR_NONOTICE (-772103672L) -#define ZERR_QLEN (-772103671L) -#define ZERR_HMDEAD (-772103670L) -#define ZERR_INTERNAL (-772103669L) -#define ZERR_NOLOCATIONS (-772103668L) -#define ZERR_NOMORELOCS (-772103667L) -#define ZERR_FIELDLEN (-772103666L) -#define ZERR_BADFIELD (-772103665L) -#define ZERR_SERVNAK (-772103664L) -#define ZERR_AUTHFAIL (-772103663L) -#define ZERR_LOGINFAIL (-772103662L) -#define ZERR_NOSUBSCRIPTIONS (-772103661L) -#define ZERR_NOMORESUBSCRIPTIONS (-772103660L) -#define ZERR_TOOMANYSUBS (-772103659L) -#define ZERR_EOF (-772103658L) -extern void initialize_zeph_error_table(void); -#define ERROR_TABLE_BASE_zeph (-772103680L) - -/* for compatibility with older versions... */ -#define init_zeph_err_tbl initialize_zeph_error_table -#define zeph_err_base ERROR_TABLE_BASE_zeph -- 2.45.2