-dnl Copyright 1998 The OpenLDAP Foundation. All Rights Reserved.
+dnl
+dnl Copyright 1998,1999 The OpenLDAP Foundation. All Rights Reserved.
dnl
dnl Redistribution and use in source and binary forms are permitted only
dnl as authorized by the OpenLDAP Public License. A copy of this
dnl license is available at http://www.OpenLDAP.org/license.html or
dnl in file LICENSE in the top-level directory of the distribution.
-dnl ----
+dnl
+dnl Disable config.cache!
+define([AC_CACHE_LOAD], )dnl
+define([AC_CACHE_SAVE], )dnl
dnl Configure.in for OpenLDAP
AC_INIT(include/ldap.h)dnl
+
+# set unset (borrowed from autoconf 2.14a)
+if (unset FOO) >/dev/null 2>&1; then
+ ol_unset=unset
+else
+ ol_unset=false
+fi
+# unset CDPATH
+$ol_unset CDPATH || test "${CDPATH+set}" != set || CDPATH=: && export CDPATH
+
AC_CONFIG_AUX_DIR(build)dnl
-AM_INIT_AUTOMAKE(OpenLDAP,[1.1-beta], [no ac_define])dnl
+AM_INIT_AUTOMAKE(openldap,[1.2], [no ac_define])dnl
-dnl Do not use AutoConf 2.12; it produces a configuration script
-dnl that causes an "internal 2K buffer" error on HPUX when run
-dnl with /bin/sh. Autoconf 2.10 seems to be okay.
-AC_PREREQ(2.10)dnl Required Autoconf version
+dnl We use autoconf features new to 2.13.1
+dnl aclocal.m4 should be built using aclocal from automake 1.4
+AC_PREREQ(2.13.1)dnl Required Autoconf version
AC_CONFIG_HEADER(include/portable.h)dnl
AC_SUBST(ldap_subdir)dnl
OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)dnl
-dnl OL_ARG_ENABLE(syslog,[ --enable-syslog enable syslog support], auto)dnl
OL_ARG_ENABLE(proctitle,[ --enable-proctitle enable proctitle support], yes)dnl
OL_ARG_ENABLE(libui,[ --enable-libui enable library user interface], yes)dnl
OL_ARG_ENABLE(cache,[ --enable-cache enable caching], yes)dnl
no, [yes no])dnl
dnl General "with" options
+OL_ARG_ENABLE(dmalloc,[ --enable-dmalloc enable debug malloc support], no)dnl
+
OL_ARG_WITH(kerberos,[ --with-kerberos use Kerberos],
auto, [auto k5 k4 afs yes no])
OL_ARG_WITH(threads,[ --with-threads use threads],
- auto, [auto posix mach lwp yes no manual] )
+ auto, [auto posix mach pth lwp yes no manual] )
OL_ARG_WITH(yielding_select,[ --with-yielding-select with implicitly yielding select],
auto, [auto yes no manual] )
dnl SLAPD Backend options
OL_ARG_ENABLE(ldbm,[ --enable-ldbm enable ldbm backend], yes)dnl
OL_ARG_WITH(ldbm_api,[ --with-ldbm-api use LDBM API], auto,
- [auto db2 db gdbm ndbm manual])
+ [auto db2 db mdbm gdbm manual])
OL_ARG_WITH(ldbm_type,[ --with-ldbm-type use LDBM type], auto,
[auto btree hash])
AC_ARG_WITH(xxliboptions,[Library Generation & Linking Options])
AM_ENABLE_STATIC
-dnl AM_DISABLE_SHARED
-AM_ENABLE_SHARED
+AM_DISABLE_SHARED
+dnl AM_ENABLE_SHARED
dnl General "enable" options
# validate options
-if test $ol_enable_referrals = no ; then
- if test $ol_enable_dns = yes ; then
- AC_MSG_WARN([dns disabled, ignoring --enable-dns argument])
+if test $ol_enable_dns = yes ; then
+ if test $ol_enable_referrals = no ; then
+ AC_MSG_ERROR([DNS requires --enable-referrals])
+ fi
+ if test $ol_enable_referrals = auto ; then
+ AC_MSG_WARN([DNS requires referrals, adding --enable-referrals])
+ ol_enable_referrals=yes
fi
- ol_enable_dns=no
fi
if test $ol_enable_slapd = no ; then
$ol_with_ldbm_type = btree ; then
AC_MSG_ERROR([GDBM only supports LDBM type hash])
fi
+ if test $ol_with_ldbm_api = mdbm -a \
+ $ol_with_ldbm_type = btree ; then
+ AC_MSG_ERROR([MDBM only supports LDBM type hash])
+ fi
if test $ol_with_ldbm_api = ndbm -a \
$ol_with_ldbm_type = btree ; then
AC_MSG_ERROR([NDBM only supports LDBM type hash])
AC_ISC_POSIX
AC_MINIX
+dnl BeOS requires -lbe -lroot -lnet
+AC_CHECK_LIB(be, be_app,
+ [LIBS="$LIBS -lbe -lroot -lnet"], :,
+ [-lroot -lnet])
+
dnl OpenLDAP requires STDC features
AM_PROG_CC_STDC
if test "X${am_cv_prog_cc_stdc}" = "Xno" ; then
AC_CHECK_LIB(gen, main)
])
-dnl Check for resolv
-AC_CHECK_LIB(resolv, res_search)
+dnl Check for resolver routines
+AC_CHECK_FUNCS(res_search)
+if test $ac_cv_func_res_search = "no" ; then
+ AC_CHECK_LIB(bind, res_search)
+ ac_cv_func_res_search=$ac_cv_lib_bind_res_search
+fi
+if test $ac_cv_func_res_search = "no" ; then
+ AC_CHECK_LIB(bind, __res_search)
+ ac_cv_func_res_search=$ac_cv_lib_bind___res_search
+fi
+if test $ac_cv_func_res_search = "no" ; then
+ AC_CHECK_LIB(resolv, res_search)
+ ac_cv_func_res_search=$ac_cv_lib_resolv_res_search
+fi
+if test $ac_cv_func_res_search = "yes" ; then
+ AC_DEFINE(HAVE_RES_SEARCH,1)
+fi
dnl HP-UX requires -lV3
AC_CHECK_LIB(V3, sigset)
# ISODE tests
ol_link_isode=no
if test $ol_enable_ldapd != no ; then
+ AC_MSG_WARN([ldapd support deprecated. Manual intervention required.])
dnl look for ISODE libraries
AC_CHECK_LIB(xtpp, main, [
ol_link_isode=yes
- AC_DEFINE(HAVE_XTPP,1)
+ AC_DEFINE(HAVE_XTPP,1, [define if you have -lxttp])
LDAPD_LIBS="$LDAPD_LIBS -lxtpp -lxtdsap -lxtisode -losi"
],:,[-lxtdsap -lxtisode -losi])
AC_CHECK_LIB(dsap, main, [
ol_link_isode=yes
- AC_DEFINE(HAVE_DSAP,1)
+ AC_DEFINE(HAVE_DSAP,1, [define if you have -ldsap])
LDAPD_LIBS="$LDAPD_LIBS -ldsap"
],:,[-lisode])
AC_CHECK_LIB(isode, main, [
ol_link_isode=yes
- AC_DEFINE(HAVE_ISODE,1)
+ AC_DEFINE(HAVE_ISODE,1, [define if you have -lisode])
LDAPD_LIBS="$LDAPD_LIBS -lisode"
],:)
fi
if test $ol_link_isode != no; then
AC_CHECK_LIB(pp, main, [
- AC_DEFINE(HAVE_PP,1)
+ AC_DEFINE(HAVE_PP,1, [define if you have -lpp])
LDAPD_LIBS="-lpp $LDAPD_LIBS"
],:)
AC_PATH_PROG(PEPSY, pepsy)
fi
+dnl
+dnl check for kerberos
+dnl
+ol_link_kerberos=no
+
if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 ; then
AC_CHECK_HEADERS(kerberosIV/krb.h kerberosIV/des.h)
ol_with_kerberos=found
ol_link_kerberos=yes
- AC_DEFINE(HAVE_KERBEROS)
-
KRB_LIBS="-lkrb4 -lkrb5 -ldes425"
+
+ LIBS="$KRB_LIBS $LIBS"
+
+ AC_CACHE_CHECK([for des_debug in Kerberos libraries],
+ [ol_cv_var_des_debug], [
+ dnl save the flags
+ save_LIBS="$LIBS"
+ LIBS="$KRB_LIBS $LIBS"
+ AC_TRY_LINK([
+#include <kerberosIV/krb.h>
+#include <kerberosIV/des.h>
+extern int des_debug;
+],[
+des_debug = 1;
+], ol_cv_var_des_debug=yes, ol_cv_var_des_debug=no)
+ dnl restore the LIBS
+ LIBS="$save_LIBS"
+ ])
+
+ if test $ol_cv_var_des_debug = yes ; then
+ AC_DEFINE(HAVE_DES_DEBUG,1,
+ [define if you have Kerberos des_debug])
+ fi
+
+ LIBS="$save_LIBS"
fi
fi
fi
+
if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then
AC_CHECK_HEADERS(krb.h des.h)
ol_with_kerberos=found
ol_link_kerberos=yes
- AC_DEFINE(HAVE_KERBEROS)
KRB_LIBS="-lkrb -ldes"
-
- AC_CHECK_FUNCS(des_string_to_key)
fi
fi
fi
+if test $ol_link_kerberos = yes ; then
+ AC_DEFINE(HAVE_KERBEROS, 1, [define if you have Kerberos])
+fi
+
ol_link_threads=no
-if test $ol_with_threads = auto -o $ol_with_threads = posix ; then
+if test $ol_with_threads = auto -o $ol_with_threads = yes \
+ -o $ol_with_threads = posix ; then
+
AC_CHECK_HEADERS(pthread.h sched.h)
if test $ac_cv_header_pthread_h = yes ; then
OL_POSIX_THREAD_VERSION
if test $ol_cv_pthread_version = final ; then
- AC_DEFINE(HAVE_PTHREADS_FINAL)
+ AC_DEFINE(HAVE_PTHREADS_FINAL,1,
+ [define if pthreads API compatible with final spec])
elif test $ol_cv_pthread_version = draft4 ; then
- AC_DEFINE(HAVE_PTHREADS_D4)
+ AC_DEFINE(HAVE_PTHREADS_D4,1,
+ [define if pthreads API compatible with draft4 spec])
else
AC_MSG_ERROR([unknown pthread version])
fi
OL_LINUX_THREADS
if test $ol_cv_linux_threads = yes ; then
- AC_DEFINE(HAVE_LINUX_THREADS,1)
+ AC_DEFINE(HAVE_LINUX_THREADS,1,
+ [define if you have LinuxThreads])
fi
- dnl Now the hard part, how to link
-
- dnl Check for pthread support in current $LIBS
+ dnl Now the hard part, how to link?
+ dnl
+ dnl currently supported checks:
+ dnl
+ dnl Check for no flags
+ dnl pthread_create() in $LIBS
+ dnl
+ dnl Check special pthread (final) flags
+ dnl pthread_create() with -kthread (FreeBSD)
+ dnl pthread_create() with -pthread (FreeBSD/Digital Unix)
+ dnl pthread_create() with -pthreads (?)
+ dnl pthread_create() with -thread (?)
+ dnl pthread_create() with -mt (Solaris)
+ dnl
+ dnl Check pthread (final) libraries
+ dnl pthread_mutex_unlock() in -lpthread -lmach -lexc -lc_r (OSF/1)
+ dnl pthread_mutex_lock() in -lpthread -lmach -lexc (OSF/1)
+ dnl pthread_mutex_trylock() in -lpthread -lexc (OSF/1)
+ dnl pthread_create() in -lpthread (many)
+ dnl pthread_create() in -lc_r (FreeBSD)
+ dnl pthread_create() in -lpthreads (many)
+ dnl pthread_join() -Wl,-woff,85 -lpthreads (IRIX)
+ dnl pthread_create() in HP-UX -lpthread (HP-UX 11)
+ dnl
+ dnl Check pthread (draft4) flags (to be depreciated)
+ dnl pthread_create() with -threads (OSF/1)
+ dnl
+ dnl Check pthread (final) libraries (to be depreciated)
+ dnl pthread_mutex_unlock() in -lpthreads -lmach -lexc -lc_r (OSF/1)
+ dnl pthread_mutex_lock() in -lpthreads -lmach -lexc (OSF/1)
+ dnl pthread_mutex_trylock() in -lpthreads -lexc (OSF/1)
+ dnl
+
+ dnl pthread_create in $LIBS
AC_CHECK_FUNC(pthread_create,[ol_link_threads=yes])
+ if test $ol_link_threads = no ; then
+ dnl try -kthread
+ AC_CACHE_CHECK([for pthread_create with -kthread],
+ [ol_cv_kthread_flag], [
+ dnl save the flags
+ save_LIBS="$LIBS"
+ LIBS="-kthread $LIBS"
+ AC_TRY_LINK([#include <pthread.h>],
+ [pthread_create(NULL,NULL,NULL,NULL);],
+ [ol_cv_kthread_flag=yes], [ol_cv_kthread_flag=no])
+ dnl restore the LIBS
+ LIBS="$save_LIBS"
+ ])
+
+ if test $ol_cv_kthread_flag = yes ; then
+ LTHREAD_LIBS="$LTHREAD_LIBS -kthread"
+ ol_link_threads=posix
+ fi
+ fi
+
if test $ol_link_threads = no ; then
dnl try -pthread
AC_CACHE_CHECK([for pthread_create with -pthread],
dnl save the flags
save_LIBS="$LIBS"
LIBS="-pthread $LIBS"
- AC_TRY_LINK([char pthread();],[
- pthread_create();
- ], ol_cv_pthread_flag=yes, ol_cv_pthread_flag=no)
+ AC_TRY_LINK([#include <pthread.h>],
+ [pthread_create(NULL,NULL,NULL,NULL);],
+ [ol_cv_pthread_flag=yes], [ol_cv_pthread_flag=no])
dnl restore the LIBS
LIBS="$save_LIBS"
])
fi
fi
+ if test $ol_link_threads = no ; then
+ dnl try -pthreads
+ AC_CACHE_CHECK([for pthread_create with -pthreads],
+ [ol_cv_pthreads_flag], [
+ dnl save the flags
+ save_LIBS="$LIBS"
+ LIBS="-pthreads $LIBS"
+ AC_TRY_LINK([#include <pthread.h>],
+ [pthread_create(NULL,NULL,NULL,NULL);],
+ [ol_cv_pthreads_flag=yes], [ol_cv_pthreads_flag=no])
+ dnl restore the LIBS
+ LIBS="$save_LIBS"
+ ])
+
+ if test $ol_cv_pthreads_flag = yes ; then
+ LTHREAD_LIBS="$LTHREAD_LIBS -pthreads"
+ ol_link_threads=posix
+ fi
+ fi
+
if test $ol_link_threads = no ; then
dnl try -thread
AC_CACHE_CHECK([for pthread_create with -thread],
dnl save the flags
save_LIBS="$LIBS"
LIBS="-thread $LIBS"
- AC_TRY_LINK([char pthread();],[
- pthread_create();
- ], ol_cv_thread_flag=yes, ol_cv_thread_flag=no)
+ AC_TRY_LINK([char pthread_create();],
+ [pthread_create();],
+ [ol_cv_thread_flag=yes], [ol_cv_thread_flag=no])
dnl restore the LIBS
LIBS="$save_LIBS"
])
fi
if test $ol_link_threads = no ; then
- dnl try DEC Threads -lpthread -lexc
+ dnl try -mt
+ AC_CACHE_CHECK([for pthread_create with -mt],
+ [ol_cv_thread_flag], [
+ dnl save the flags
+ save_LIBS="$LIBS"
+ LIBS="-mt $LIBS"
+ AC_TRY_LINK([char pthread_create();],
+ [pthread_create();],
+ [ol_cv_thread_flag=yes], [ol_cv_thread_flag=no])
+ dnl restore the LIBS
+ LIBS="$save_LIBS"
+ ])
+
+ if test $ol_cv_thread_flag = yes ; then
+ LTHREAD_LIBS="$LTHREAD_LIBS -mt"
+ ol_link_threads=posix
+ fi
+ fi
+
+ if test $ol_link_threads = no ; then
+ dnl try DEC Threads -lpthread -lmach -lexc -lc_r
save_LIBS="$LIBS"
- AC_CHECK_LIB(pthread, pthread_join, [
+ AC_CHECK_LIB(pthread, pthread_mutex_unlock, [
ol_link_threads=posix
- LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lexc"
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc -lc_r"
if test $ol_with_yielding_select = auto ; then
ol_with_yielding_select=yes
fi
- ],,[-lexc])
+ ],:,[-lmach -lexc -lc_r])
LIBS="$save_LIBS"
fi
if test $ol_link_threads = no ; then
- dnl try DEC Threads -lpthreads -lmach -lexc -lc_r
+ dnl try DEC Threads -lpthread -lmach -lexc
save_LIBS="$LIBS"
- AC_CHECK_LIB(pthreads, pthread_join, [
+ AC_CHECK_LIB(pthread, pthread_mutex_lock, [
ol_link_threads=posix
- LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lmach -lexc -lc_r"
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc"
+ if test $ol_with_yielding_select = auto ; then
+ ol_with_yielding_select=yes
+ fi
+ ],:,[-lmach -lexc])
+ LIBS="$save_LIBS"
+ fi
+
+ if test $ol_link_threads = no ; then
+ dnl try DEC Threads -lpthread -lexc
+ save_LIBS="$LIBS"
+ AC_CHECK_LIB(pthread, pthread_mutex_trylock, [
+ ol_link_threads=posix
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lexc"
if test $ol_with_yielding_select = auto ; then
ol_with_yielding_select=yes
fi
- ],,[-lmach -lexc -lc_r])
+ ],:,[-lexc])
LIBS="$save_LIBS"
fi
save_LIBS="$LIBS"
AC_CHECK_LIB(pthread, pthread_create, [
ol_link_threads=posix
- LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"])
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"],:)
LIBS="$save_LIBS"
fi
save_LIBS="$LIBS"
AC_CHECK_LIB(c_r, pthread_create, [
ol_link_threads=posix
- LTHREAD_LIBS="$LTHREAD_LIBS -lc_r"])
+ LTHREAD_LIBS="$LTHREAD_LIBS -lc_r"],:)
+ LIBS="$save_LIBS"
+ fi
+
+ if test $ol_link_threads = no ; then
+ dnl try -lpthreads
+ save_LIBS="$LIBS"
+ AC_CHECK_LIB(pthreads, pthread_create, [
+ ol_link_threads=posix
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"],:)
+ LIBS="$save_LIBS"
+ fi
+
+ dnl IRIX Pthread check
+ if test $ol_link_threads = no ; then
+ dnl try IRIX Pthreads -Wl,-woff,85 -lpthreads
+ save_LIBS="$LIBS"
+ AC_CHECK_LIB(pthreads, pthread_join, [
+ ol_link_threads=posix
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"
+ ],:,[-Wl,-woff,85])
+ LIBS="$save_LIBS"
+ fi
+
+ dnl HP-UX 11 Pthread check
+ if test $ol_link_threads = no; then
+ save_LIBS="$LIBS"
+ LIBS="$LIBS -lpthread"
+ AC_MSG_CHECKING([for pthread_create() in HP-UX -lpthread])
+ ol_try_pthread_hpux_11=no
+ AC_CACHE_VAL(ol_cv_pthread_hpux_11,[
+ AC_TRY_LINK([
+#include <pthread.h>
+#include <elf.h>
+#ifndef ELFABI_HPUX_REL11
+ die horribly
+#endif
+ ], [pthread_create(NULL, NULL, NULL, NULL);],
+ ol_try_pthread_hpux_11=yes
+ ol_cv_pthread_hpux_11=yes,
+ ol_cv_pthread_hpux_11=no)])
+ AC_MSG_RESULT(yes)
+ LIBS="$save_LIBS"
+
+ if test $ol_cv_pthread_hpux_11=yes ; then
+ ol_link_threads=posix
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"
+ if test $ol_try_pthread_hpux_11=yes ; then
+ dnl Some tests below may fail, cause we aint including
+ dnl pthread.h. Force appropriate ones to yes
+ ac_cv_func_pthread_attr_init=yes
+ fi
+ fi
+ fi
+
+ if test $ol_link_threads = no ; then
+ dnl try -threads
+ AC_CACHE_CHECK([for pthread_create with -threads],
+ [ol_cv_thread_flag], [
+ dnl save the flags
+ save_LIBS="$LIBS"
+ LIBS="-threads $LIBS"
+ AC_TRY_LINK([char pthread_create();],[
+ pthread_create();
+ ], ol_cv_thread_flag=yes, ol_cv_thread_flag=no)
+ dnl restore the LIBS
+ LIBS="$save_LIBS"
+ ])
+
+ if test $ol_cv_thread_flag = yes ; then
+ LTHREAD_LIBS="$LTHREAD_LIBS -threads"
+ ol_link_threads=posix
+ fi
+ fi
+
+ if test $ol_link_threads = no ; then
+ dnl try DEC Threads -lpthreads -lmach -lexc -lc_r
+ save_LIBS="$LIBS"
+ AC_CHECK_LIB(pthreads, pthread_mutex_unlock, [
+ ol_link_threads=posix
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lmach -lexc -lc_r"
+ if test $ol_with_yielding_select = auto ; then
+ ol_with_yielding_select=yes
+ fi
+ ],:,[-lmach -lexc -lc_r])
+ LIBS="$save_LIBS"
+ fi
+
+ if test $ol_link_threads = no ; then
+ dnl try DEC Threads -lpthreads -lmach -lexc
+ save_LIBS="$LIBS"
+ AC_CHECK_LIB(pthreads, pthread_mutex_lock, [
+ ol_link_threads=posix
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lmach -lexc"
+ if test $ol_with_yielding_select = auto ; then
+ ol_with_yielding_select=yes
+ fi
+ ],:,[-lmach -lexc])
+ LIBS="$save_LIBS"
+ fi
+
+ if test $ol_link_threads = no ; then
+ dnl try DEC Threads -lpthreads -lexc
+ save_LIBS="$LIBS"
+ AC_CHECK_LIB(pthreads, pthread_mutex_trylock, [
+ ol_link_threads=posix
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lexc"
+ if test $ol_with_yielding_select = auto ; then
+ ol_with_yielding_select=yes
+ fi
+ ],:,[-lexc])
LIBS="$save_LIBS"
fi
if test $ol_link_threads != no ; then
- AC_DEFINE(HAVE_PTHREADS)
+ AC_DEFINE(HAVE_PTHREADS,1,
+ [define if you have POSIX Threads])
dnl save flags
save_CPPFLAGS="$CPPFLAGS"
if test $ac_cv_func_sched_yield = no -a \
$ac_cv_func_pthread_yield = no ; then
dnl Solaris has sched_yield() in -lposix4
- AC_CHECK_LIB(posix4, sched_yield,
- [LTHREAD_LIBS="$LTHREAD_LIBS -lposix4"
- AC_DEFINE(HAVE_SCHED_YIELD,1)
- ac_cv_func_sched_yield=yes],
- [ac_cv_func_sched_yield=no])
+ dnl but we'll use thr_yield instead.
+ AC_CHECK_FUNCS(thr_yield)
fi
if test $ac_cv_func_sched_yield = no -a \
- $ac_cv_func_pthread_yield = no ; then
+ $ac_cv_func_pthread_yield = no -a \
+ "$ac_cv_func_thr_yield" = no ; then
AC_MSG_WARN([could not locate sched_yield() or pthread_yield()])
- AC_MSG_ERROR([POSIX Threads are not usable])
fi
dnl Check functions for compatibility
AC_CHECK_FUNCS(pthread_kill)
- AC_CHECK_FUNCS( \
- pthread_attr_create pthread_attr_init \
- pthread_attr_destroy pthread_attr_delete \
- pthread_attr_setdetachstate pthread_attr_setdetach_np \
- )
+
+ dnl Check for pthread_detach with <pthread.h> inclusion
+ dnl as it's symbol may have been mangled.
+ AC_CACHE_CHECK([for pthread_detach with <pthread.h>],
+ [ol_cv_func_pthread_detach], [
+ dnl save the flags
+ AC_TRY_LINK([#include <pthread.h>],
+ [pthread_detach(NULL);],
+ [ol_cv_func_pthread_detach=yes],
+ [ol_cv_func_pthread_detach=no])
+ ])
+
+ if test $ol_cv_func_pthread_detach = no ; then
+ AC_MSG_ERROR([could not locate pthread_detach()])
+ fi
+
+ AC_DEFINE(HAVE_PTHREAD_DETACH,1,
+ [define if you have pthread_detach function])
dnl Check for setconcurreny functions
AC_CHECK_FUNCS( \
pthread_setconcurrency \
+ pthread_getconcurrency \
thr_setconcurrency \
+ thr_getconcurrency \
)
AC_MSG_CHECKING([if pthread_create() works])
if(i < 0) {
perror("select");
- exit(0);
+ exit(10);
}
- exit(1); /* if we exit here, the select blocked the whole process */
+ exit(0); /* if we exit here, the select blocked the whole process */
}
int main(argc, argv)
/* create a pipe to select */
if(pipe(&fildes[0])) {
perror("select");
- exit(0);
+ exit(1);
}
#ifdef HAVE_PTHREAD_SETCONCURRENCY
pthread_yield(); /* make sure task runs first */
#endif
#endif
- exit(0);
+
+ exit(2);
}],
- [ol_cv_pthread_select_yields=yes],
- [ol_cv_pthread_select_yields=no], [
+ [ol_cv_pthread_select_yields=no],
+ [ol_cv_pthread_select_yields=yes], [
AC_MSG_ERROR([crossing compiling: use --with-yielding_select=yes|no|manual])])])
AC_MSG_RESULT($ol_cv_pthread_select_yields)
fi
fi
-dnl dnl check for reentrant/threadsafe functions
-dnl AC_CHECK_FUNCS( \
-dnl feof_unlocked \
-dnl unlocked_feof \
-dnl ftrylockfile \
-dnl flockfile \
-dnl putc_unlocked \
-dnl gmtime_r \
-dnl strtok_r \
-dnl )
-
dnl restore flags
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
fi
fi
-if test $ol_with_threads = auto -o $ol_with_threads = mach ; then
+if test $ol_with_threads = auto -o $ol_with_threads = yes \
+ -o $ol_with_threads = mach ; then
+
dnl check for Mach CThreads
AC_CHECK_HEADERS(mach/cthreads.h)
if test $ac_cv_header_mach_cthreads_h = yes ; then
if test $ol_link_threads != no ; then
: check for cthread specific functionality here
- AC_DEFINE(HAVE_MACH_CTHREADS,1)
+ AC_DEFINE(HAVE_MACH_CTHREADS,1,
+ [define if you have Mach Cthreads])
else
AC_MSG_ERROR([could not link with Mach CThreads])
fi
fi
fi
-if test $ol_with_threads = auto -o $ol_with_threads = lwp ; then
+if test $ol_with_threads = auto -o $ol_with_threads = yes \
+ -o $ol_with_threads = pth ; then
+
+ dnl check for GNU Pth
+ AC_CHECK_HEADERS(pth.h)
+ if test $ac_cv_header_pth_h = yes ; then
+
+ dnl check for pth lib
+ AC_CHECK_LIB(pth,pth_version,[have_pth=yes],[have_pth=no])
+
+ if test $have_pth = yes ; then
+ AC_DEFINE(HAVE_GNU_PTH,1,[if you have GNU Pth])
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpth"
+ ol_link_threads=pth
+ fi
+
+ if test $ol_with_yielding_select = auto ; then
+ ol_with_yielding_select=yes
+ fi
+ fi
+fi
+
+if test $ol_with_threads = auto -o $ol_with_threads = yes \
+ -o $ol_with_threads = lwp ; then
+
dnl check for SunOS5 LWP
AC_CHECK_HEADERS(thread.h synch.h)
if test $ac_cv_header_thread_h = yes -a $ac_cv_header_synch_h = yes ; then
AC_CHECK_LIB(thread, thr_create, [have_thr=yes], [have_thr=no])
if test $have_thr = yes ; then
- AC_DEFINE(HAVE_THR)
+ AC_DEFINE(HAVE_THR,1,
+ [if you have Solaris LWP (thr) package])
LTHREAD_LIBS="$LTHREAD_LIBS -lthread"
ol_link_threads=thr
if test $ol_with_yielding_select = auto ; then
ol_with_yielding_select=yes
fi
+
+ dnl Check for setconcurreny functions
+ AC_CHECK_FUNCS( \
+ thr_setconcurrency \
+ thr_getconcurrency \
+ )
fi
fi
AC_CHECK_LIB(lwp, lwp_create, [have_lwp=yes], [have_lwp=no])
if test $have_lwp = yes ; then
- AC_DEFINE(HAVE_LWP)
+ AC_DEFINE(HAVE_LWP,1,
+ [if you have SunOS LWP package])
LTHREAD_LIBS="$LTHREAD_LIBS -llwp"
ol_link_threads=lwp
fi
if test $ol_with_yielding_select = yes ; then
- AC_DEFINE(HAVE_YIELDING_SELECT,1)
+ AC_DEFINE(HAVE_YIELDING_SELECT,1,
+ [define if select implicitly yields])
fi
if test $ol_with_threads = manual ; then
AC_CHECK_HEADERS(thread.h synch.h)
fi
-if test $ol_with_threads != no ; then
+if test $ol_link_threads != no ; then
dnl needed to get reentrant/threadsafe versions
dnl
AC_DEFINE(REENTRANT,1)
AC_DEFINE(_THREAD_SAFE,1)
AC_DEFINE(THREADSAFE,1)
AC_DEFINE(_THREADSAFE,1)
+ AC_DEFINE(_SGI_MP_SOURCE,1)
dnl this might cause the errno symbol to be
dnl replaced with a function to get a thread specific errno.
dnl with the thread libraries
AC_CACHE_CHECK([for thread specific errno],
[ol_cv_errno_thread_specific], [
- AC_TRY_LINK([
-#include <errno.h>
- ], [
-int x = errno;
- ],
+ AC_TRY_LINK([#include <errno.h>], [int x = errno;],
[ol_cv_errno_thread_specific=yes],
[ol_cv_errno_thread_specific=no])
])
ol_with_threads=no
fi
- AC_DEFINE(NO_THREADS,1)
+ AC_DEFINE(NO_THREADS,1,
+ [define if you have (or want) no threads])
LTHREAD_LIBS=""
fi
fi
fi
-if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = ndbm ; then
- OL_NDBM
+if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = mdbm ; then
+ OL_MDBM
- if test $ol_cv_ndbm = yes ; then
- if test $ol_with_ldbm_api = auto ; then
- AC_MSG_WARN([Attempting to use NDBM. Functionality will be limited.])
+ if test $ol_cv_mdbm = yes ; then
+ ol_link_ldbm=mdbm
+ ol_with_ldbm_api=mdbm
+ if test $ol_cv_lib_mdbm != yes ; then
+ LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_mdbm"
fi
+ fi
+fi
+if test $ol_with_ldbm_api = ndbm ; then
+ OL_NDBM
+
+ if test $ol_cv_ndbm = yes ; then
ol_link_ldbm=ndbm
ol_with_ldbm_api=ndbm
ol_enable_ldbm=no
fi
-if test $ol_enable_wrappers = yes ; then
- AC_CHECK_LIB(wrap, hosts_access,
- [have_wrappers=yes], [have_wrappers=no])
+if test $ol_enable_wrappers != no ; then
+ AC_CHECK_HEADERS(tcpd.h)
+
+ if test $ac_cv_header_tcpd_h != yes ; then
+ have_wrappers=no
+ else
+ AC_TRY_COMPILE([
+int allow_severity = 0;
+int deny_severity = 0;
+ ],[hosts_access()],[have_wrappers=yes],[have_wrappers=no])
+ fi
if test $have_wrappers = yes ; then
- AC_DEFINE(HAVE_TCPD)
- SLAPD_LIBS="$SLAPD_LIBS -lwrap"
+ AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap])
+ WRAP_LIBS="-lwrap"
+
+ dnl We add another check for -lnsl since some libwrap's
+ dnl need it, but it isn't always included from above
+ AC_CHECK_LIB(nsl, main)
else
AC_MSG_WARN(could not find -lwrap)
if test $ol_enable_wrappers = yes ; then
AC_MSG_WARN(disabling wrappers support)
ol_enable_wrappers=no
+ WRAP_LIBS=""
fi
+fi
+if test $ol_enable_dmalloc != no ; then
+ AC_CHECK_HEADERS(dmalloc.h)
+ AC_CHECK_LIB(dmalloc, dmalloc_shutdown)
fi
# ud needs termcap (should insert check here)
if test $ol_link_termcap = no ; then
AC_CHECK_LIB(termcap, tputs, [have_termcap=yes], [have_termcap=no])
if test $have_termcap = yes ; then
- AC_DEFINE(HAVE_TERMCAP)
+ AC_DEFINE(HAVE_TERMCAP, 1, [define if you have -ltermcap])
ol_link_termcap=yes
TERMCAP_LIBS=-ltermcap
fi
if test $ol_link_termcap = no ; then
AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
if test $have_ncurses = yes ; then
- AC_DEFINE(HAVE_NCURSES)
+ AC_DEFINE(HAVE_NCURSES, 1, [define if you have -lncurses])
ol_link_termcap=yes
TERMCAP_LIBS=-lncurses
fi
fi
if test $ol_link_termcap = no ; then
- AC_DEFINE(NO_TERMCAP,1)
+ AC_DEFINE(NO_TERMCAP,1, [define if you have no termcap support])
TERMCAP_LIBS=
fi
AC_HEADER_SYS_WAIT
AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
if test $am_cv_sys_posix_termios = yes ; then
- AC_DEFINE(HAVE_POSIX_TERMIOS,1)
+ AC_DEFINE(HAVE_POSIX_TERMIOS,1,
+ [define if you have POSIX termios])
fi
AC_CHECK_HEADERS( \
+ arpa/nameser.h \
crypt.h \
errno.h \
fcntl.h \
limits.h \
malloc.h \
memory.h \
+ netinet/tcp.h \
regex.h \
psap.h \
pwd.h \
+ resolv.h \
sgtty.h \
stdarg.h \
stddef.h \
sys/ioctl.h \
sys/param.h \
sys/resource.h \
+ sys/select.h \
sys/socket.h \
sys/syslog.h \
sys/time.h \
AC_C_CONST
if test $cross_compiling = yes ; then
- AC_DEFINE(CROSS_COMPILING, 1)
+ AC_DEFINE(CROSS_COMPILING, 1, [define if cross compiling])
else
AC_C_BIGENDIAN
AC_CHECK_SIZEOF(short)
if test $ac_cv_func_vprintf = yes ; then
dnl check for vsnprintf
- AC_CHECK_FUNCS(vsnprintf)
+ AC_CHECK_FUNCS(vsnprintf vsprintf)
fi
-AC_FUNC_WAIT3
-
AC_CHECK_FUNCS( \
bcopy \
+ closesocket \
flock \
+ getpass \
+ getpassphrase \
getdtablesize \
gethostname \
getpwuid \
memcpy \
memmove \
mkstemp \
- res_search \
select \
setpwfile \
setsid \
dnl ----------------------------------------------------------------
dnl Sort out defines
-if test $ol_enable_debug != no ; then
+if test "$ol_enable_debug" != no ; then
AC_DEFINE(LDAP_DEBUG,1)
fi
-dnl if test $ol_enable_syslog != no ; then
-dnl AC_DEFINE(LDAP_SYSLOG,1)
-dnl fi
-if test $ol_enable_libui = yes ; then
+if test "$ol_enable_libui" = yes ; then
AC_DEFINE(LDAP_LIBUI,1)
fi
-if test $ol_enable_cache = no ; then
+if test "$ol_enable_cache" = no ; then
AC_DEFINE(LDAP_NOCACHE,1)
fi
-if test $ol_enable_dns != no ; then
+if test "$ol_enable_dns" != no ; then
AC_DEFINE(LDAP_DNS,1)
fi
-if test $ol_enable_proctitle != no ; then
+if test "$ol_enable_proctitle" != no ; then
AC_DEFINE(LDAP_PROCTITLE,1)
fi
-if test $ol_enable_referrals != no ; then
+if test "$ol_enable_referrals" != no ; then
AC_DEFINE(LDAP_REFERRALS,1)
fi
-if test $ol_enable_cldap != no ; then
+if test "$ol_enable_cldap" != no ; then
AC_DEFINE(LDAP_CONNECTIONLESS,1)
fi
-if test $ol_enable_aclgroups != no ; then
+if test "$ol_enable_aclgroups" != no ; then
AC_DEFINE(SLAPD_ACLGROUPS,1)
fi
-if test $ol_enable_crypt != no ; then
+if test "$ol_enable_crypt" != no ; then
AC_DEFINE(SLAPD_CRYPT,1)
fi
-if test $ol_enable_cleartext != no ; then
+if test "$ol_enable_cleartext" != no ; then
AC_DEFINE(SLAPD_CLEARTEXT,1)
fi
-if test $ol_enable_phonetic != no ; then
+if test "$ol_enable_phonetic" != no ; then
AC_DEFINE(SLAPD_PHONETIC,1)
fi
-if test $ol_enable_rlookups != no ; then
+if test "$ol_enable_rlookups" != no ; then
AC_DEFINE(SLAPD_RLOOKUPS,1)
fi
-if test $ol_link_ldbm != no ; then
+if test "$ol_link_ldbm" != no ; then
AC_DEFINE(SLAPD_LDBM,1)
BUILD_SLAPD=yes
BUILD_LDBM=yes
fi
-if test $ol_enable_passwd != no ; then
+if test "$ol_enable_passwd" != no ; then
AC_DEFINE(SLAPD_PASSWD,1)
BUILD_SLAPD=yes
BUILD_PASSWD=yes
fi
-if test $ol_enable_shell != no ; then
+if test "$ol_enable_shell" != no ; then
AC_DEFINE(SLAPD_SHELL,1)
BUILD_SLAPD=yes
BUILD_SHELL=yes
fi
-if test $ol_enable_slurpd != no -a $ol_link_threads != no -a \
+if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \
$BUILD_SLAPD = yes ; then
BUILD_SLURPD=yes
fi
-if test $ol_link_isode != no ; then
+if test "$ol_link_isode" != no ; then
BUILD_LDAPD=yes
fi
AC_SUBST(BUILD_SHELL)
AC_SUBST(BUILD_SLURPD)
-
AC_SUBST(LDAP_LIBS)
AC_SUBST(LDAPD_LIBS)
AC_SUBST(SLAPD_LIBS)
AC_SUBST(LDBM_LIBS)
AC_SUBST(LTHREAD_LIBS)
AC_SUBST(LUTIL_LIBS)
-
+AC_SUBST(WRAP_LIBS)
AC_SUBST(KRB_LIBS)
AC_SUBST(TERMCAP_LIBS)
projects / openldap / blobdiff