From: Kurt Zeilenga Date: Tue, 13 Feb 2007 21:21:56 +0000 (+0000) Subject: Quick merge: everything from HEAD X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3c5068bc1fa84fc5daf1e50d4f1a929cec91b7e9;p=openldap Quick merge: everything from HEAD --- 3c5068bc1fa84fc5daf1e50d4f1a929cec91b7e9 diff --cc CHANGES index 4f640b4f8a,0000000000..dc456dd4f1 mode 100644,000000..100644 --- a/CHANGES +++ b/CHANGES @@@ -1,5 -1,0 +1,5 @@@ +OpenLDAP 2.4 Change Log + - OpenLDAP 2.4.3alpha Release ++OpenLDAP 2.4.4alpha Release + Changes not tracked + diff --cc build/version.var index 25ccabbdf7,131da34762..7823dd7796 --- a/build/version.var +++ b/build/version.var @@@ -14,10 -14,10 +14,10 @@@ ## . ol_package=OpenLDAP ol_major=2 -ol_minor=X +ol_minor=4 - ol_patch=3alpha - ol_api_inc=20403 + ol_patch=X -ol_api_inc=000000 -ol_api_current=0 -ol_api_revision=0 -ol_api_age=0 -ol_release_date="0000/00/00" ++ol_api_inc=20404 +ol_api_current=1 - ol_api_revision=2 ++ol_api_revision=3 +ol_api_age=1 - ol_release_date="2006/08/22" ++ol_release_date="2006/10/20" diff --cc configure index 13edfa9a12,0ce7f34173..204042d757 --- a/configure +++ b/configure @@@ -1,5 -1,5 +1,5 @@@ #! /bin/sh - # From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.631.2.3 2006/08/17 23:50:21 kurt Exp . -# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.645 2007/01/19 01:54:44 kurt Exp . ++# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.631.2.4 2006/10/19 20:06:32 kurt Exp . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # diff --cc include/portable.hin index ba3be72eb1,2f82be5d73..b31e486f17 --- a/include/portable.hin +++ b/include/portable.hin @@@ -463,7 -421,7 +421,7 @@@ /* Define to 1 if you have the `pthread_kill_other_threads_np' function. */ #undef HAVE_PTHREAD_KILL_OTHER_THREADS_NP --/* Define to 1 if you have the `pthread_rwlock_destroy' function. */ ++/* define if you have pthread_rwlock_destroy function */ #undef HAVE_PTHREAD_RWLOCK_DESTROY /* Define to 1 if you have the `pthread_setconcurrency' function. */