From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 13 Feb 2006 18:48:09 +0000 (+0000)
Subject: Additional changes from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_3_20~28
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d404254b01d83581487e51c63d7d99dce16b8357;p=openldap

Additional changes from HEAD
---

diff --git a/CHANGES b/CHANGES
index 1a1e55bc70..2b4717f37f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,13 @@ OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.20 Engineering
 	Added libldap SASL workaround for broken LDAP servers (ITS#4391)
+	Fixed slapd non-read/write epoll event handling (ITS#4395)
 	Fixed slapo-auditlog crash (ITS#4394)
 	Fixed slapd-bdb/hdb wake listener on runqueue submit (ITS#4385)
 	Fixed slurpd reject error formating (ITS#4382)
+	Build Environment
+		Fixed <netinet/tcp.h> detection on AIX (ITS#4312)
+		Fixed liblunicode cross compiling problem (ITS#4363)
 
 OpenLDAP 2.3.19 Release
 	Fixed libldap disable DH key exchange with DH params (ITS#4354)
diff --git a/configure b/configure
index 89643edc0b..71b7c3901f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.560.2.25 2006/01/16 19:06:12 kurt Exp .
+# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.560.2.26 2006/02/13 17:35:52 kurt Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -13916,14 +13916,13 @@ fi
 
 
 
-
 
 
 for ac_header in \
 	arpa/inet.h		\
-	arpa/nameser.h		\
+	arpa/nameser.h	\
 	assert.h		\
-	bits/types.h		\
+	bits/types.h	\
 	conio.h			\
 	crypt.h			\
 	direct.h		\
@@ -13936,7 +13935,6 @@ for ac_header in \
 	libutil.h		\
 	limits.h		\
 	locale.h		\
-	netinet/tcp.h		\
 	malloc.h		\
 	memory.h		\
 	psap.h			\
@@ -13953,11 +13951,11 @@ for ac_header in \
 	sys/errno.h		\
 	sys/ioctl.h		\
 	sys/param.h		\
-	sys/resource.h		\
-	sys/select.h		\
-	sys/socket.h		\
+	sys/resource.h	\
+	sys/select.h	\
+	sys/socket.h	\
 	sys/stat.h		\
-	sys/syslog.h		\
+	sys/syslog.h	\
 	sys/time.h		\
 	sys/types.h		\
 	sys/uio.h		\
@@ -14182,6 +14180,70 @@ done
 
 
 
+for ac_header in netinet/tcp.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+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.  */
+$ac_includes_default
+#include <netinet/in.h>
+
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_Header=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
 for ac_header in sys/ucred.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/libraries/liblunicode/Makefile.in b/libraries/liblunicode/Makefile.in
index 633d1bd7de..c7de1a7827 100644
--- a/libraries/liblunicode/Makefile.in
+++ b/libraries/liblunicode/Makefile.in
@@ -29,7 +29,9 @@ XLIBS = $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
-uctable.h: ucgendat.c $(srcdir)/UnicodeData.txt $(srcdir)/CompositionExclusions.txt
+uctable.h: $(XXDIR)/uctable.h
+
+$(XXDIR)/uctable.h: $(XXDIR)/ucgendat.c $(srcdir)/UnicodeData.txt $(srcdir)/CompositionExclusions.txt
 	$(MAKE) ucgendat
 	./ucgendat $(srcdir)/UnicodeData.txt -x $(srcdir)/CompositionExclusions.txt