Minor fixes to complete backout of initialization/startup changes.

[openldap] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index 7280eef9139b66e272f98292327dcc3cf5d308cf..22869f04682f00a70d6212ddf98ea842e78397ef 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,23 +1,40 @@
-/* acconfig.h
-  Copyright 1998 The OpenLDAP Foundation,  All Rights Reserved.
-  COPYING RESTRICTIONS APPLY, See COPYRIGHT file
-
-   Descriptive text for the C preprocessor macros that
-   the distributed Autoconf macros can define.
+/*
+ * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted only
+ * as authorized by the OpenLDAP Public License.  A copy of this
+ * license is available at http://www.OpenLDAP.org/license.html or
+ * in file LICENSE in the top-level directory of the distribution.
+ */
 
-   Leave the following blank line there!!  Autoheader needs it.  */
-\f
+#ifndef _LDAP_PORTABLE_H
+#define _LDAP_PORTABLE_H
 
+/* end of preamble */
+@TOP@
 
 /* define this if needed to get reentrant functions */
+#ifndef REENTRANT
 #undef REENTRANT
+#endif
+#ifndef _REENTRANT
 #undef _REENTRANT
+#endif
 
 /* define this if needed to get threadsafe functions */
+#ifndef THREADSAFE
 #undef THREADSAFE
+#endif
+#ifndef _THREADSAFE
 #undef _THREADSAFE
+#endif
+#ifndef THREAD_SAFE
 #undef THREAD_SAFE
+#endif
+#ifndef _THREAD_SAFE
 #undef _THREAD_SAFE
+#endif
 
 /* define this if cross compiling */
 #undef CROSS_COMPILING
@@ -25,7 +42,7 @@
 /* define this if toupper() requires tolower() check */
 #undef C_UPPER_LOWER
 
-/* define this to the number of arguments ctime_r() expects
+/* define this to the number of arguments ctime_r() expects */
 #undef CTIME_R_NARGS
 
 /* define this if sys_errlist is not defined in stdio.h or errno.h */
@@ -88,6 +105,12 @@
 /* define if you have ptrdiff_t */
 #undef HAVE_PTRDIFF_T
 
+/* define if you have res_search() */
+#ifdef __notdef__
+/* see second res_search define */
+#undef HAVE_RES_SEARCH
+#endif
+
 /* define if you have sched_yield() */
 #ifdef __notdef__
 /* see second sched_yield define */
@@ -160,6 +183,9 @@
 /* define this for ACL Group support */
 #undef SLAPD_ACLGROUPS
 
+/* define this to use SLAPD Berkeley DB2 backend */
+#undef SLAPD_BDB2
+
 /* define this for ClearText password support */
 #undef SLAPD_CLEARTEXT
 
@@ -172,6 +198,9 @@
 /* define this to use SLAPD passwd backend */
 #undef SLAPD_PASSWD
 
+/* define this to use SLAPD perl backend */
+#undef SLAPD_PERL
+
 /* define this for phonetic support */
 #undef SLAPD_PHONETIC
 
@@ -197,3 +226,15 @@
 
 \f
 /* Leave that blank line there!!  Autoheader needs it. */
+
+@BOTTOM@
+/* begin of postamble */
+
+#ifdef HAVE_STDDEF_H
+#      include <stddef.h>
+#endif
+
+#include "ldap_cdefs.h"
+#include "ldap_features.h"
+
+#endif /* _LDAP_PORTABLE_H */