Import build environment changes from -devel.

- KerberosV des_debug fix
- conditional include some inet headers

CHANGES

@@ -21,6 +21,7 @@ Changes included in OpenLDAP 1.2
 		Fixed openldap.m4 to "protect" shell variable
 		Fixed HAVE_PHREAD_FINAL typo
 		Fixed pthread detection on Digital UNIX
+		Fixed KerberosV build bug
 		Updated to Autoconf 1.3 with aclocal from automake 1.4
 		Removed autoconf dependencies from main makefile
 

clients/ud/string_to_key.c

@@ -29,8 +29,11 @@
 #include <stdio.h>
 #include <ac/krb.h>
 
+#if defined( DEBUG ) && defined( HAVE_DES_DEBUG )
+#define USE_DES_DEBUG
 extern int des_debug;
-extern int des_debug_print();
+#endif
+
 extern void des_fixup_key_parity();
 
 #ifndef HAVE_AFS_KERBEROS
@@ -64,7 +67,7 @@ des_string_to_key( char *str, register des_cblock *key )
     /* init key array for bits */
     memset(k_char, 0, sizeof(k_char));
 
-#ifdef DEBUG
+#ifdef USE_DES_DEBUG
     if (des_debug)
 	fprintf(stdout,
 		"\n\ninput str length = %d  string = %s\nstring = 0x ",
@@ -75,7 +78,7 @@ des_string_to_key( char *str, register des_cblock *key )
     for (i = 1; i <= length; i++) {
 	/* get next input key byte */
 	temp = (unsigned int) *str++;
-#ifdef DEBUG
+#ifdef USE_DES_DEBUG
 	if (des_debug)
 	    fprintf(stdout,"%02x ",temp & 0xff);
 #endif
@@ -116,11 +119,13 @@ des_string_to_key( char *str, register des_cblock *key )
     /* now fix up key parity again */
     des_fixup_key_parity(key);
 
+#ifdef USE_DES_DEBUG
     if (des_debug)
 	fprintf(stdout,
 		"\nResulting string_to_key = 0x%x 0x%x\n",
 		*((unsigned long *) key),
 		*((unsigned long *) key+1));
+#endif
 }
 
 #endif /* HAVE_KERBEROS_V */

configure.in

@@ -338,6 +338,31 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 ; then
 			ol_link_kerberos=yes
 
 			KRB_LIBS="-lkrb4 -lkrb5 -ldes425"
+
+			LIBS="$KRB_LIBS $LIBS"
+
+			AC_CACHE_CHECK([for des_debug in Kerberos libraries],
+				[ol_cv_var_des_debug], [
+				dnl save the flags
+				save_LIBS="$LIBS"
+				LIBS="$KRB_LIBS $LIBS"
+				AC_TRY_LINK([
+#include <kerberosIV/krb.h>
+#include <kerberosIV/des.h>
+extern int des_debug;
+],[
+des_debug = 1;
+],				ol_cv_var_des_debug=yes, ol_cv_var_des_debug=no)
+				dnl restore the LIBS
+				LIBS="$save_LIBS"
+			])
+
+			if test $ol_cv_var_des_debug= yes ; then
+				AC_DEFINE(HAVE_DES_DEBUG,1,
+					[define if you have Kerberos des_debug])
+			fi
+
+			LIBS="$save_LIBS"
 		fi
 	fi
 fi
@@ -1209,6 +1234,7 @@ if test $am_cv_sys_posix_termios = yes ; then
 fi
 
 AC_CHECK_HEADERS(	\
+	arpa/nameser.h	\
 	crypt.h			\
 	errno.h			\
 	fcntl.h			\
@@ -1221,6 +1247,7 @@ AC_CHECK_HEADERS(	\
 	regex.h			\
 	psap.h			\
 	pwd.h			\
+	resolv.h		\
 	sgtty.h			\
 	stdarg.h		\
 	stddef.h		\

include/ac/socket.h

@@ -27,11 +27,19 @@
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
+
+#ifdef HAVE_ARPA_NAMESER_H
 #include <arpa/nameser.h>
+#endif
+
 #include <netdb.h>
+
+#ifdef HAVE_RESOLV_H
 #include <resolv.h>
 #endif
 
+#endif /* HAVE_SYS_SOCKET_H */
+
 #ifdef HAVE_WINSOCK2
 #include <winsock2.h>
 #elif HAVE_WINSOCK

include/portable.h.in

@@ -331,6 +331,9 @@
 /* Define if you have the waitpid function.  */
 #undef HAVE_WAITPID
 
+/* Define if you have the <arpa/nameser.h> header file.  */
+#undef HAVE_ARPA_NAMESER_H
+
 /* Define if you have the <crypt.h> header file.  */
 #undef HAVE_CRYPT_H
 
@@ -412,6 +415,9 @@
 /* Define if you have the <regex.h> header file.  */
 #undef HAVE_REGEX_H
 
+/* Define if you have the <resolv.h> header file.  */
+#undef HAVE_RESOLV_H
+
 /* Define if you have the <sched.h> header file.  */
 #undef HAVE_SCHED_H
 
@@ -529,6 +535,9 @@
 /* define if you have -lpp */
 #undef HAVE_PP
 
+/* define if you have Kerberos des_debug */
+#undef HAVE_DES_DEBUG
+
 /* define if you have Kerberos */
 #undef HAVE_KERBEROS