X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=build%2Fopenldap.m4;h=d160d5e7ec78ea3d3277c44feea949696b0159ce;hb=0ae19ca0a9839c9959a8eaabae87d78e4d2d85c6;hp=8f6648bd68daaf68f6c2c5568297c22124e7abbb;hpb=c598c882fcee59af71558c0d1afdd4d82c485b3d;p=openldap

diff --git a/build/openldap.m4 b/build/openldap.m4
index 8f6648bd68..d160d5e7ec 100644
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -1,7 +1,13 @@
 dnl $OpenLDAP$
 dnl
-dnl Copyright 1998-1999 The OpenLDAP Foundation,  All Rights Reserved.
-dnl COPYING RESTRICTIONS APPLY, See COPYRIGHT file
+dnl Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
+dnl All rights reserved.
+dnl 
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted only as authorized by the OpenLDAP
+dnl Public License.  A copy of this license is available at
+dnl http://www.OpenLDAP.org/license.html or in file LICENSE in the
+dnl top-level directory of the distribution.
 dnl
 dnl OpenLDAP Autoconf Macros
 dnl
@@ -13,7 +19,7 @@ dnl $2 = help-string
 dnl $3 = default value	(auto)
 dnl $4 = allowed values (auto yes no)
 AC_DEFUN([OL_ARG_ENABLE], [# OpenLDAP --enable-$1
-	AC_ARG_ENABLE($1,[$2 (]ifelse($3,,auto,$3)[)],[
+	AC_ARG_ENABLE($1,changequote(<,>)<$2 [>ifelse($3,,auto,$3)<]>changequote([,]),[
 	ol_arg=invalid
 	for ol_val in ifelse($4,,[auto yes no],[$4]) ; do
 		if test "$enableval" = "$ol_val" ; then
@@ -38,7 +44,7 @@ dnl $2 = help-string
 dnl $3 = default value (no)
 dnl $4 = allowed values (yes or no)
 AC_DEFUN([OL_ARG_WITH], [# OpenLDAP --with-$1
-	AC_ARG_WITH($1,[$2 (]ifelse($3,,yes,$3)[)],[
+	AC_ARG_WITH($1,changequote(<,>)<$2 [>ifelse($3,,yes,$3)<]>changequote([,]),[
 	ol_arg=invalid
 	for ol_val in ifelse($4,,[yes no],[$4]) ; do
 		if test "$withval" = "$ol_val" ; then
@@ -56,6 +62,33 @@ dnl AC_VERBOSE(OpenLDAP --with-$1 $ol_with_$1)
 ])dnl
 dnl
 dnl ====================================================================
+dnl
+AC_DEFUN(AC_COMPILE_CHECK_SIZEOF,
+[changequote(<<, >>)dnl 
+dnl The name to #define. 
+define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl 
+dnl The cache variable name. 
+define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl 
+changequote([, ])dnl 
+AC_MSG_CHECKING(size of $1) 
+AC_CACHE_VAL(AC_CV_NAME, 
+[for ac_size in 4 8 1 2 16 $2 ; do # List sizes in rough order of prevalence. 
+  AC_TRY_COMPILE([#include "confdefs.h" 
+#include <sys/types.h> 
+$2 
+], [switch (0) case 0: case (sizeof ($1) == $ac_size):;], AC_CV_NAME=$ac_size) 
+  if test x$AC_CV_NAME != x ; then break; fi 
+done 
+]) 
+if test x$AC_CV_NAME = x ; then 
+  AC_MSG_ERROR([cannot determine a size for $1]) 
+fi 
+AC_MSG_RESULT($AC_CV_NAME) 
+AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1]) 
+undefine([AC_TYPE_NAME])dnl 
+undefine([AC_CV_NAME])dnl 
+])
+dnl ====================================================================
 dnl check if hard links are supported.
 dnl
 AC_DEFUN([OL_PROG_LN_H], [# test for ln hardlink support
@@ -211,92 +244,140 @@ fi
 ])
 dnl
 dnl ====================================================================
-dnl Check if db.h is Berkeley DB2
-dnl
-dnl defines ol_cv_header_db2 to 'yes' or 'no'
+dnl Berkeley DB macros
 dnl
-dnl uses:
-dnl		AC_CHECK_HEADERS(db.h)
-dnl
-AC_DEFUN([OL_HEADER_BERKELEY_DB2],
-[AC_CHECK_HEADERS(db.h)
-if test $ac_cv_header_db_h = yes ; then
-	AC_CACHE_CHECK([if db.h is DB2], [ol_cv_header_db2],[
-		AC_EGREP_CPP(__db_version_2,[
-#			include <db.h>
-			/* this check could be improved */
-#			ifdef DB_VERSION_MAJOR
-#				if DB_VERSION_MAJOR == 2
-					__db_version_2;
-#				endif
-#			endif
-		], ol_cv_header_db2=yes, ol_cv_header_db2=no)])
-else
-	ol_cv_header_db2=no
-fi
-])dnl
 dnl --------------------------------------------------------------------
-dnl Check if Berkeley DB2 library exists
-dnl Check for dbopen in standard libraries or -ldb
-dnl
-dnl defines ol_cv_lib_db2 to '-ldb' or 'no'
-dnl
-dnl uses:
-dnl		AC_CHECK_LIB(db,db_appexit)
-dnl
-AC_DEFUN([OL_LIB_BERKELEY_DB2],
-[AC_CACHE_CHECK([for DB2 library], [ol_cv_lib_db2],
-[	ol_LIBS="$LIBS"
-	AC_CHECK_LIB(db,db_appexit,[ol_cv_lib_db2=-ldb],[ol_cv_lib_db2=no])
+dnl Try to link
+AC_DEFUN([OL_BERKELEY_DB_TRY],
+[if test $ol_cv_lib_db = no ; then
+	AC_CACHE_CHECK([for Berkeley DB link (]ifelse($2,,default,$2)[)],[$1],
+[
+	ol_DB_LIB=ifelse($2,,,$2)
+	ol_LIBS=$LIBS
+	LIBS="$ol_DB_LIB $LIBS"
+
+	AC_TRY_LINK([
+#ifdef HAVE_DB_185_H
+# include <db_185.h>
+#else
+# include <db.h>
+#endif
+
+#ifndef DB_VERSION_MAJOR
+# define DB_VERSION_MAJOR 1
+#endif
+
+#ifndef NULL
+#define NULL ((void*)0)
+#endif
+],[
+#if DB_VERSION_MAJOR > 1
+	{
+		char *version;
+		int major, minor, patch;
+
+		version = db_version( &major, &minor, &patch );
+
+		if( major != DB_VERSION_MAJOR ||
+			minor < DB_VERSION_MINOR )
+		{
+			printf("Berkeley DB version mismatch\n"
+				"\texpected: %s\n\tgot: %s\n",
+				DB_VERSION_STRING, version);
+			return 1;
+		}
+	}
+#endif
+
+#if DB_VERSION_MAJOR > 2
+	db_env_create( NULL, 0 );
+#elif DB_VERSION_MAJOR > 1
+	db_appexit( NULL );
+#else
+	(void) dbopen( NULL, 0, 0, 0, NULL);
+#endif
+],[$1=yes],[$1=no])
+
 	LIBS="$ol_LIBS"
 ])
-])dnl
-dnl
-dnl --------------------------------------------------------------------
-dnl Check if Berkeley db2 exists
-dnl
-dnl defines ol_cv_berkeley_db2 to 'yes' or 'no'
-dnl 
-dnl uses:
-dnl		OL_LIB_BERKELEY_DB2
-dnl		OL_HEADER_BERKELEY_DB2
-dnl
-AC_DEFUN([OL_BERKELEY_DB2],
-[AC_REQUIRE([OL_LIB_BERKELEY_DB2])
- AC_REQUIRE([OL_HEADER_BERKELEY_DB2])
- AC_CACHE_CHECK([for Berkeley DB2], [ol_cv_berkeley_db2], [
-	if test "$ol_cv_lib_db2" = no -o "$ol_cv_header_db2" = no ; then
-		ol_cv_berkeley_db2=no
-	else
-		ol_cv_berkeley_db2=yes
+
+	if test $$1 = yes ; then
+		ol_cv_lib_db=ifelse($2,,yes,$2)
 	fi
+fi
 ])
- if test $ol_cv_berkeley_db2 = yes ; then
-	AC_DEFINE(HAVE_BERKELEY_DB2,1, [define if Berkeley DBv2 is available])
- fi
-])dnl
 dnl
+dnl --------------------------------------------------------------------
+dnl Try to locate appropriate library
+AC_DEFUN([OL_BERKELEY_DB_LINK],
+[ol_cv_lib_db=no
+OL_BERKELEY_DB_TRY(ol_cv_db_none)
+OL_BERKELEY_DB_TRY(ol_cv_db_db,[-ldb])
+OL_BERKELEY_DB_TRY(ol_cv_db_db4,[-ldb4])
+OL_BERKELEY_DB_TRY(ol_cv_db_db3,[-ldb3])
+OL_BERKELEY_DB_TRY(ol_cv_db_db2,[-ldb2])
+OL_BERKELEY_DB_TRY(ol_cv_db_db1,[-ldb1])
+])
 dnl
 dnl --------------------------------------------------------------------
-dnl Check if Berkeley db2 supports DB_THREAD
-AC_DEFUN([OL_BERKELEY_DB2_DB_THREAD],
-[AC_CACHE_CHECK([for DB_THREAD support], [ol_cv_berkeley_db2_db_thread], [
+dnl Check if Berkeley DB supports DB_THREAD
+AC_DEFUN([OL_BERKELEY_DB_THREAD],
+[AC_CACHE_CHECK([for Berkeley DB thread support], [ol_cv_berkeley_db_thread], [
 	ol_LIBS="$LIBS"
-	if test $ol_cv_lib_db2 != yes ; then
-		LIBS="$ol_cv_lib_db2"
+	if test $ol_cv_lib_db != yes ; then
+		LIBS="$ol_cv_lib_db"
 	fi
 
 	AC_TRY_RUN([
+#ifdef HAVE_DB_185_H
+	choke me;
+#else
 #include <db.h>
+#endif
 #ifndef NULL
 #define NULL ((void *)0)
 #endif
 main()
 {
 	int rc;
-	DB_ENV env;
-	u_int32_t flags = DB_CREATE | DB_THREAD;
+	u_int32_t flags = DB_CREATE |
+#ifdef DB_PRIVATE
+		DB_PRIVATE |
+#endif
+		DB_THREAD;
 
+#if DB_VERSION_MAJOR > 2
+	DB_ENV *env = NULL;
+
+	rc = db_env_create( &env, 0 );
+
+	flags |= DB_INIT_MPOOL;
+#ifdef DB_MPOOL_PRIVATE
+	flags |= DB_MPOOL_PRIVATE;
+#endif
+
+	if( rc ) {
+		printf("BerkeleyDB: %s\n", db_strerror(rc) );
+		return rc;
+	}
+
+#if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1)
+	rc = env->open( env, NULL, flags, 0 );
+#else
+	rc = env->open( env, NULL, NULL, flags, 0 );
+#endif
+
+	if ( rc == 0 ) {
+		rc = env->close( env, 0 );
+	}
+
+	if( rc ) {
+		printf("BerkeleyDB: %s\n", db_strerror(rc) );
+		return rc;
+	}
+
+#else
+	DB_ENV env;
 	memset( &env, '\0', sizeof(env) );
 
 	rc = db_appinit( NULL, NULL, &env, flags );
@@ -305,89 +386,87 @@ main()
 		db_appexit( &env );
 	}
 
+	unlink("__db_mpool.share");
+	unlink("__db_lock.share");
+#endif
+
 	return rc;
 }],
-	[ol_cv_berkeley_db2_db_thread=yes],
-	[ol_cv_berkeley_db2_db_thread=no],
-	[ol_cv_berkeley_db2_db_thread=cross])
+	[ol_cv_berkeley_db_thread=yes],
+	[ol_cv_berkeley_db_thread=no],
+	[ol_cv_berkeley_db_thread=cross])
 
 	LIBS="$ol_LIBS"
 
-	if test $ol_cv_berkeley_db2_db_thread != no ; then
-		AC_DEFINE(HAVE_BERKELEY_DB2_DB_THREAD, 1,
-			[define if BerkeleyDB2 has DB_THREAD support])
+	if test $ol_cv_berkeley_db_thread != no ; then
+		AC_DEFINE(HAVE_BERKELEY_DB_THREAD, 1,
+			[define if Berkeley DB has DB_THREAD support])
 	fi
 ])])dnl
-dnl ====================================================================
-dnl Check for db.h/db_185.h is Berkeley DB
-dnl
-dnl defines ol_cv_header_db to 'yes' or 'no'
-dnl
-dnl uses:
-dnl		OL_HEADER_BERKELEY_DB2
-dnl		AC_CHECK_HEADERS(db_185.h)
 dnl
-AC_DEFUN([OL_HEADER_BERKELEY_DB],
-[AC_REQUIRE([OL_HEADER_BERKELEY_DB2])
-AC_CHECK_HEADERS(db_185.h)
-if test "$ol_cv_header_db2" = yes ; then
-	dnl db.h is db2! 
-
-	ol_cv_header_db=$ac_cv_header_db_185_h
-else
-	ol_cv_header_db=$ac_cv_header_db_h
+dnl --------------------------------------------------------------------
+dnl Find any DB
+AC_DEFUN([OL_BERKELEY_DB],
+[ol_cv_berkeley_db=no
+AC_CHECK_HEADERS(db.h)
+if test $ac_cv_header_db_h = yes; then
+	OL_BERKELEY_DB_LINK
+	if test "$ol_cv_lib_db" != no ; then
+		ol_cv_berkeley_db=yes
+		OL_BERKELEY_DB_THREAD
+	fi
 fi
-])dnl
-dnl
+])
 dnl --------------------------------------------------------------------
-dnl Check if Berkeley DB library exists
-dnl Check for dbopen in standard libraries or -ldb
-dnl
-dnl defines ol_cv_lib_db to 'yes' or '-ldb' or 'no'
-dnl		'yes' implies dbopen is in $LIBS
-dnl
-dnl uses:
-dnl		AC_CHECK_FUNC(dbopen)
-dnl		AC_CHECK_LIB(db,dbopen)
-dnl
-AC_DEFUN([OL_LIB_BERKELEY_DB],
-[AC_CACHE_CHECK([for Berkeley DB library], [ol_cv_lib_db],
-[
-	AC_CHECK_HEADERS(db1/db.h)
-	ol_LIBS="$LIBS"
-	AC_CHECK_FUNC(dbopen,[ol_cv_lib_db=yes], [
-		AC_CHECK_LIB(db1,dbopen,[ol_cv_lib_db=-ldb1],[
-			AC_CHECK_LIB(db,dbopen,[ol_cv_lib_db=-ldb],
-			[ol_cv_lib_db=no])
-		])
-	])
-	LIBS="$ol_LIBS"
+dnl Check for version compatility with back-bdb
+AC_DEFUN([OL_BDB_COMPAT],
+[AC_CACHE_CHECK([Berkeley DB version for BDB backend], [ol_cv_bdb_compat],[
+	AC_EGREP_CPP(__db_version_compat,[
+#include <db.h>
+
+ /* this check could be improved */
+#ifndef DB_VERSION_MAJOR
+#	define DB_VERSION_MAJOR 1
+#endif
+
+/* require 4.0 or later */
+#if DB_VERSION_MAJOR >= 4 
+	__db_version_compat
+#endif
+	],	[ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
 ])
-])dnl
-dnl
+
 dnl --------------------------------------------------------------------
-dnl Check if Berkeley DB exists
-dnl
-dnl defines ol_cv_berkeley_db to 'yes' or 'no'
-dnl 
-dnl uses:
-dnl		OL_LIB_BERKELEY_DB
-dnl		OL_HEADER_BERKELEY_DB
-dnl
-AC_DEFUN([OL_BERKELEY_DB],
-[AC_REQUIRE([OL_LIB_BERKELEY_DB])
- AC_REQUIRE([OL_HEADER_BERKELEY_DB])
- AC_CACHE_CHECK([for Berkeley DB], [ol_cv_berkeley_db], [
-	if test "$ol_cv_lib_db" = no -o "$ol_cv_header_db" = no ; then
-		ol_cv_berkeley_db=no
-	else
-		ol_cv_berkeley_db=yes
+dnl Find old Berkeley DB 1.85/1.86
+AC_DEFUN([OL_BERKELEY_COMPAT_DB],
+[AC_CHECK_HEADERS(db_185.h db.h)
+if test $ac_cv_header_db_185_h = yes -o $ac_cv_header_db_h = yes; then
+	AC_CACHE_CHECK([if Berkeley DB header compatibility], [ol_cv_header_db1],[
+		AC_EGREP_CPP(__db_version_1,[
+#if HAVE_DB_185_H
+#	include <db_185.h>
+#else
+#	include <db.h>
+#endif
+
+ /* this check could be improved */
+#ifndef DB_VERSION_MAJOR
+#	define DB_VERSION_MAJOR 1
+#endif
+
+#if DB_VERSION_MAJOR == 1 
+	__db_version_1
+#endif
+],	[ol_cv_header_db1=yes], [ol_cv_header_db1=no])])
+
+	if test $ol_cv_header_db1 = yes ; then
+		OL_BERKELEY_DB_LINK
+		if test "$ol_cv_lib_db" != no ; then
+			ol_cv_berkeley_db=yes
+		fi
 	fi
+fi
 ])
- if test $ol_cv_berkeley_db = yes ; then
-	AC_DEFINE(HAVE_BERKELEY_DB,1, [define if Berkeley DB is available])
- fi
-])dnl
 dnl
 dnl ====================================================================
 dnl Check if GDBM library exists
@@ -589,28 +668,65 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[
 	/* pthread test function */
 	pthread_t t;
 	int status;
+	int detach = 1;
+
+#ifdef HAVE_PTHREADS_FINAL
+	/* Final pthreads */
+	pthread_attr_t attr;
 
-	/* make sure pthread_create() isn't just a stub */
-#if HAVE_PTHREADS_D4
-	status = pthread_create(&t, pthread_attr_default, task, NULL);
+	status = pthread_attr_init(&attr);
+	if( status ) return status;
+
+#if defined( PTHREAD_CREATE_JOINABLE ) || defined( PTHREAD_UNDETACHED )
+	if( !detach ) {
+#if defined( PTHREAD_CREATE_JOINABLE )
+		status = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
 #else
-	status = pthread_create(&t, NULL, task, NULL);
+		status = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_UNDETACHED);
+#endif
+
+#ifdef PTHREAD_CREATE_DETACHED
+	} else {
+		status = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+#endif
+	}
+	if( status ) return status;
 #endif
 
-	if( status ) exit( status );
+	status = pthread_create( &t, &attr, task, NULL );
+	if( status ) return status;
+
+#if !defined( PTHREAD_CREATE_JOINABLE ) && !defined( PTHREAD_UNDETACHED )
+	if( detach ) {
+		/* give thread a chance to complete */
+		/* it should remain joinable and hence detachable */
+		sleep( 1 );
+
+		status = pthread_detach( t );
+		if( status ) return status;
+	}
+#endif
 
-	/* make sure pthread_detach() isn't just a stub */
-#if HAVE_PTHREADS_D4
-	status = pthread_detach( &t );
 #else
-	status = pthread_detach( t );
+	/* Draft 4 pthreads */
+	status = pthread_create( &t, pthread_attr_default, task, NULL );
+	if( status ) return status;
+
+	if( detach ) {
+		/* give thread a chance to complete */
+		/* it should remain joinable and hence detachable */
+		sleep( 1 );
+
+		status = pthread_detach( &t );
+		if( status ) return status;
+	}
 #endif
 
 #ifdef HAVE_LINUX_THREADS
 	pthread_kill_other_threads_np();
 #endif
 
-	exit( status );
+	return 0;
 ])
 
 AC_DEFUN([OL_PTHREAD_TEST_PROGRAM],
@@ -670,6 +786,16 @@ AC_DEFUN([OL_HEADER_GNU_PTH_PTHREAD_H], [
 		])
 ])dnl
 dnl ====================================================================
+dnl Check for NT Threads
+AC_DEFUN([OL_NT_THREADS], [
+	AC_CHECK_FUNC(_beginthread)
+
+	if test $ac_cv_func__beginthread = yes ; then
+		AC_DEFINE(HAVE_NT_THREADS,1,[if you have NT Threads])
+		ol_cv_nt_threads=yes
+	fi
+])
+dnl ====================================================================
 dnl Check LinuxThreads Header
 dnl
 dnl defines ol_cv_header linux_threads to 'yes' or 'no'
@@ -696,7 +822,7 @@ dnl	defines ol_cv_sys_linux_threads to 'yes' or 'no'
 dnl	'no' implies pthreads implementation is not LinuxThreads.
 dnl 
 AC_DEFUN([OL_SYS_LINUX_THREADS], [
-	AC_CHECK_FUNC(pthread_kill_other_threads_np)
+	AC_CHECK_FUNCS(pthread_kill_other_threads_np)
 	AC_CACHE_CHECK([for LinuxThreads implementation],
 		[ol_cv_sys_linux_threads],
 		[ol_cv_sys_linux_threads=$ac_cv_func_pthread_kill_other_threads_np])
@@ -828,7 +954,7 @@ dnl
 dnl ====================================================================
 dnl Look for fetch(3)
 AC_DEFUN([OL_LIB_FETCH],
-[ol=$LIBS
+[ol_LIBS=$LIBS
 LIBS="-lfetch -lcom_err $LIBS"
 AC_CACHE_CHECK([fetch(3) library],ol_cv_lib_fetch,[
 	AC_TRY_LINK([