Add check for <assert.h> and put include in right file (acconfig.h)

acconfig.h

@@ -243,7 +243,16 @@
 #	include <stddef.h>
 #endif
 
+#if defined(LDAP_DEVEL) && !defined(LDAP_TEST)
+#define LDAP_TEST
+#endif
+#if defined(LDAP_TEST) && !defined(LDAP_DEBUG)
+#define LDAP_DEBUG
+#endif
+
 #include "ldap_cdefs.h"
 #include "ldap_features.h"
 
+#include "ac/assert.h"
+
 #endif /* _LDAP_PORTABLE_H */

configure.in

@@ -1559,9 +1559,10 @@ if test $am_cv_sys_posix_termios = yes ; then
 		[define if you have POSIX termios])
 fi
 
-AC_CHECK_HEADERS(		\
+AC_CHECK_HEADERS(	\
 	arpa/inet.h		\
-	arpa/nameser.h		\
+	arpa/nameser.h	\
+	assert.h		\
 	crypt.h			\
 	errno.h			\
 	fcntl.h			\
@@ -1587,9 +1588,9 @@ AC_CHECK_HEADERS(		\
 	sys/errno.h		\
 	sys/ioctl.h		\
 	sys/param.h		\
-	sys/resource.h		\
-	sys/socket.h		\
-	sys/syslog.h		\
+	sys/resource.h	\
+	sys/socket.h	\
+	sys/syslog.h	\
 	sys/time.h		\
 	sys/types.h		\
 	syslog.h		\

include/portable.h.in

@@ -348,6 +348,9 @@
 /* Define if you have the <arpa/nameser.h> header file.  */
 #undef HAVE_ARPA_NAMESER_H
 
+/* Define if you have the <assert.h> header file.  */
+#undef HAVE_ASSERT_H
+
 /* Define if you have the <crypt.h> header file.  */
 #undef HAVE_CRYPT_H
 
@@ -680,19 +683,15 @@
 
 /* begin of postamble */
 
-/*
- * DEVEL implies TEST implies DEBUG
- */
-#if !defined( LDAP_TEST) && defined( LDAP_DEVEL )
-#define LDAP_TEST
+#ifdef HAVE_STDDEF_H
+#	include <stddef.h>
 #endif
 
-#if !defined( LDAP_DEBUG) && defined( LDAP_TEST )
-#define LDAP_DEBUG
+#if defined(LDAP_DEVEL) && !defined(LDAP_TEST)
+#define LDAP_TEST
 #endif
-
-#ifdef HAVE_STDDEF_H
-#	include <stddef.h>
+#if defined(LDAP_TEST) && !defined(LDAP_DEBUG)
+#define LDAP_DEBUG
 #endif
 
 #include "ldap_cdefs.h"