autoheader is now working...

configure

@@ -37154,7 +37154,8 @@ _ACEOF
 fi
 
 if test $ol_link_threads != no ; then
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE 1
 _ACEOF
 
@@ -48798,25 +48799,30 @@ if test "$ac_cv_sizeof_int" -lt 4 ; then
 	{ echo "$as_me:$LINENO: WARNING: OpenLDAP requires 'int' to be 32 bits or greater." >&5
 echo "$as_me: WARNING: OpenLDAP requires 'int' to be 32 bits or greater." >&2;}
 
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define LBER_INT_T long
 _ACEOF
 
 else
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define LBER_INT_T int
 _ACEOF
 
 fi
 
+
 cat >>confdefs.h <<\_ACEOF
 #define LBER_LEN_T long
 _ACEOF
 
+
 cat >>confdefs.h <<\_ACEOF
 #define LBER_SOCKET_T int
 _ACEOF
 
+
 cat >>confdefs.h <<\_ACEOF
 #define LBER_TAG_T long
 _ACEOF
@@ -50510,7 +50516,8 @@ _ACEOF
 
 fi
 if test "$ol_link_kbind" != no ; then
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND LDAP_VENDOR_VERSION
 _ACEOF
 
@@ -50523,7 +50530,8 @@ _ACEOF
 
 fi
 if test "$ol_enable_referrals" != no ; then
-	cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS LDAP_VENDOR_VERSION
 _ACEOF
 

configure.in

@@ -158,22 +158,6 @@ AH_TOP([
 #undef _SGI_MP_SOURCE
 #endif
 
-/* These are defined in ldap_features.h */
-/*
-	LDAP_API_FEATURE_X_OPENLDAP_REENTRANT
-	LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
-	LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-	LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
-*/
-
-/* These are defined in lber_types.h */
-/*
-	LBER_INT_T
-	LBER_LEN_T
-	LBER_SOCKET_T
-	LBER_TAG_T
-*/
-
 /* end of portable.h.pre */
 ])
 AH_BOTTOM([
@@ -1965,7 +1949,8 @@ if test $ol_link_threads = no ; then
 fi
 
 if test $ol_link_threads != no ; then
-	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE,1)
+	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE,1,
+		[define to 1 if library is thread safe])
 fi
 
 dnl ----------------------------------------------------------------
@@ -2501,14 +2486,14 @@ AC_COMPILE_CHECK_SIZEOF(wchar_t)
 if test "$ac_cv_sizeof_int" -lt 4 ; then
 	AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.])
 
-	AC_DEFINE(LBER_INT_T,long)
+	AC_DEFINE(LBER_INT_T,long,[define to 32-bit or greater integer type])
 else
-	AC_DEFINE(LBER_INT_T,int)
+	AC_DEFINE(LBER_INT_T,int,[define to 32-bit or greater integer type])
 fi
 
-AC_DEFINE(LBER_LEN_T,long)
+AC_DEFINE(LBER_LEN_T,long,[define to large integer type])
-AC_DEFINE(LBER_SOCKET_T,int)
+AC_DEFINE(LBER_SOCKET_T,int,[define to socket descriptor type])
-AC_DEFINE(LBER_TAG_T,long)
+AC_DEFINE(LBER_TAG_T,long,[define to large integer type])
 
 dnl ----------------------------------------------------------------
 dnl Checks for library functions.
@@ -2651,14 +2636,16 @@ if test "$ol_enable_syslog" = yes ; then
 		[define this to add syslog code])
 fi
 if test "$ol_link_kbind" != no ; then
-	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND,LDAP_VENDOR_VERSION)
+	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND,LDAP_VENDOR_VERSION,
+		[define to LDAP VENDOR VERSION])
 fi
 if test "$ol_enable_proctitle" != no ; then
 	AC_DEFINE(LDAP_PROCTITLE,1,
 		[define this for LDAP process title support])
 fi
 if test "$ol_enable_referrals" != no ; then
-	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_VENDOR_VERSION)
+	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_VENDOR_VERSION,
+		[define to LDAP VENDOR VERSION])
 fi
 if test "$ol_enable_local" != no; then
 	AC_DEFINE(LDAP_PF_LOCAL,1,[define to support PF_LOCAL])

include/Makefile.in

@@ -33,7 +33,7 @@ veryclean-local: clean-local FORCE
 
 depend-local: ldap_config.h FORCE
 
-LDAP_CONFIG=$(srcdir)/ldap_config.h.in
+LDAP_CONFIG=$(srcdir)/ldap_config.hin
 
 ldap_config.h: $(LDAP_CONFIG) Makefile
 	@$(RM) $@

include/ldap_features.hin

@@ -0,0 +1,63 @@
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+
+/* 
+ * LDAP Features
+ */
+
+#ifndef _LDAP_FEATURES_H
+#define _LDAP_FEATURES_H 1
+
+/* OpenLDAP API version macros */
+#undef LDAP_VENDOR_VERSION
+#undef LDAP_VENDOR_VERSION_MAJOR
+#undef LDAP_VENDOR_VERSION_MINOR
+#undef LDAP_VENDOR_VERSION_PATCH
+
+/*
+** WORK IN PROGRESS!
+**
+** OpenLDAP reentrancy/thread-safeness should be dynamically
+** checked using ldap_get_option().
+**
+** The -lldap implementation is not thread-safe.
+**
+** The -lldap_r implementation is:
+**		LDAP_API_FEATURE_THREAD_SAFE (basic thread safety)
+** but also be:
+**		LDAP_API_FEATURE_SESSION_THREAD_SAFE
+**		LDAP_API_FEATURE_OPERATION_THREAD_SAFE
+**
+** The preprocessor flag LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
+** can be used to determine if -lldap_r is available at compile
+** time.  You must define LDAP_THREAD_SAFE if and only if you
+** link with -lldap_r.
+**
+** If you fail to define LDAP_THREAD_SAFE when linking with
+** -lldap_r or define LDAP_THREAD_SAFE when linking with -lldap,
+** provided header definations and declarations may be incorrect.
+**
+*/
+
+/* is -lldap_r available or not */
+#undef LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
+
+/* LDAP v2 Kerberos Bind */
+#undef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
+
+/* LDAP v2 Referrals */
+#undef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
+
+#endif /* LDAP_FEATURES */