X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Fopenldap.m4;h=81a7c8c66d8a0011afbf2953bf20c8c19b391db6;hb=902350f991fabc9fb070587ecf404af50bfa6a43;hp=1135be94855f8fb49abce04e32d4e8d7f9e2d225;hpb=8411a5319a3019ee85b594c66137fdd761f59a88;p=openldap diff --git a/build/openldap.m4 b/build/openldap.m4 index 1135be9485..81a7c8c66d 100644 --- a/build/openldap.m4 +++ b/build/openldap.m4 @@ -1,7 +1,13 @@ dnl $OpenLDAP$ dnl -dnl Copyright 1998-2000 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 @@ -266,6 +272,26 @@ AC_DEFUN([OL_BERKELEY_DB_TRY], #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); @@ -286,6 +312,7 @@ 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_db4,[-ldb4]) OL_BERKELEY_DB_TRY(ol_cv_db_db,[-ldb]) OL_BERKELEY_DB_TRY(ol_cv_db_db3,[-ldb3]) OL_BERKELEY_DB_TRY(ol_cv_db_db2,[-ldb2]) @@ -313,9 +340,44 @@ AC_DEFUN([OL_BERKELEY_DB_THREAD], 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 ); @@ -324,6 +386,10 @@ main() db_appexit( &env ); } + unlink("__db_mpool.share"); + unlink("__db_lock.share"); +#endif + return rc; }], [ol_cv_berkeley_db_thread=yes], @@ -351,12 +417,29 @@ if test $ac_cv_header_db_h = yes; then fi fi ]) -dnl +dnl -------------------------------------------------------------------- +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 + + /* 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 Find old Berkeley DB 1.85/1.86 AC_DEFUN([OL_BERKELEY_COMPAT_DB], -[ol_cv_berkeley_db=no -AC_CHECK_HEADERS(db_185.h db.h) +[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,[ @@ -376,7 +459,7 @@ if test $ac_cv_header_db_185_h = yes -o $ac_cv_header_db_h = yes; then #endif ], [ol_cv_header_db1=yes], [ol_cv_header_db1=no])]) - if test ol_cv_header_db1=yes ; then + 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 @@ -585,40 +668,65 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[ /* pthread test function */ pthread_t t; int status; -#if HAVE_PTHREADS_FINAL && defined(PTHREAD_CREATE_UNDETACHED) - /* This system (e.g. AIX) defaults detached; must override */ + int detach = 1; + +#ifdef HAVE_PTHREADS_FINAL + /* Final pthreads */ pthread_attr_t attr; status = pthread_attr_init(&attr); - if( status ) exit( status ); - - status = pthread_attr_setdetachstate(&attr,PTHREAD_CREATE_UNDETACHED); - if( status ) exit( status ); + if( status ) return status; -#define ATTR &attr +#if defined( PTHREAD_CREATE_JOINABLE ) || defined( PTHREAD_UNDETACHED ) + if( !detach ) { +#if defined( PTHREAD_CREATE_JOINABLE ) + status = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE); #else -#if HAVE_PTHREADS_D4 -#define ATTR pthread_attr_default -#else -#define ATTR 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 + + 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_create() isn't just a stub */ - status = pthread_create(&t, ATTR, task, NULL); - if( status ) exit( status ); - /* 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], @@ -680,14 +788,11 @@ AC_DEFUN([OL_HEADER_GNU_PTH_PTHREAD_H], [ dnl ==================================================================== dnl Check for NT Threads AC_DEFUN([OL_NT_THREADS], [ - AC_CACHE_CHECK([for NT Threads], [ol_cv_nt_threads], [ - AC_CHECK_FUNC(_beginthread, - [ol_cv_nt_threads=yes], - [ol_cv_nt_threads=no]) - ]) + AC_CHECK_FUNC(_beginthread) - if test $ol_cv_nt_threads = yes ; then + 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 ==================================================================== @@ -717,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])