X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=0d52e9a1f9da40ad628373c363948f4145c91b5e;hb=f16d10103396885663f671690602d51e07842619;hp=712ab422c9ee8409161eed6c0bf69b6c6a2d09f0;hpb=339b9c371ec07b5125fed23e4bac1cdca2790525;p=openldap

diff --git a/configure.in b/configure.in
index 712ab422c9..0d52e9a1f9 100644
--- a/configure.in
+++ b/configure.in
@@ -27,6 +27,7 @@ AC_COPYRIGHT([[Copyright 1998-2006 The OpenLDAP Foundation. All rights reserved.
 Restrictions apply, see COPYRIGHT and LICENSE files.]])
 AC_REVISION([$OpenLDAP$])
 AC_INIT([OpenLDAP],,[http://www.openldap.org/its/])
+m4_define([AC_PACKAGE_BUGREPORT],[<http://www.openldap.org/its/>])
 AC_CONFIG_SRCDIR(build/version.sh)dnl
 dnl ----------------------------------------------------------------
 dnl OpenLDAP Autoconf Macros
@@ -432,7 +433,10 @@ if test $ol_enable_slapd = no ; then
 	if test $ol_enable_rlookups = yes ; then
 		AC_MSG_WARN([slapd disabled, ignoring --enable-rlookups argument])
 	fi
-	if test $ol_enable_aci = yes ; then
+	if test $ol_enable_dynacl = yes ; then
+		AC_MSG_WARN([slapd disabled, ignoring --enable-dynacl argument])
+	fi
+	if test $ol_enable_aci != no ; then
 		AC_MSG_WARN([slapd disabled, ignoring --enable-aci argument])
 	fi
 	if test $ol_enable_ldbm_api != auto ; then
@@ -861,11 +865,11 @@ AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
 AC_HEADER_TIOCGWINSZ
 
-AC_CHECK_HEADERS(		\
+AC_CHECK_HEADERS(	\
 	arpa/inet.h		\
-	arpa/nameser.h		\
+	arpa/nameser.h	\
 	assert.h		\
-	bits/types.h		\
+	bits/types.h	\
 	conio.h			\
 	crypt.h			\
 	direct.h		\
@@ -878,7 +882,6 @@ AC_CHECK_HEADERS(		\
 	libutil.h		\
 	limits.h		\
 	locale.h		\
-	netinet/tcp.h		\
 	malloc.h		\
 	memory.h		\
 	psap.h			\
@@ -895,11 +898,11 @@ AC_CHECK_HEADERS(		\
 	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		\
@@ -912,11 +915,16 @@ AC_CHECK_HEADERS(		\
 )
 
 AC_CHECK_HEADERS( resolv.h, [], [],
-[$ac_includes_default]
+[$ac_includes_default
 #include <netinet/in.h>
-)
+])
+
+AC_CHECK_HEADERS( netinet/tcp.h, [], [],
+[$ac_includes_default
+#include <netinet/in.h>
+])
 
-AC_CHECK_HEADERS(sys/ucred.h, [], [],
+AC_CHECK_HEADERS( sys/ucred.h, [], [],
 [$ac_includes_default
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
@@ -1596,6 +1604,7 @@ dnl			[ol_cv_pthread_lpthread_lexc])
 			ol_replace_broken_yield=no
 			case "$target" in
 			*-*-linux*) 
+				AC_CHECK_FUNCS(nanosleep)
 				ol_replace_broken_yield=yes
 			;;
 			esac