AC_CONFIG_AUX_DIR(build)dnl
AM_INIT_AUTOMAKE(OpenLDAP,[2.0-devel], [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.
+dnl aclocal.m4 should be built using aclocal from automake 1.4
+AC_PREREQ(2.13)dnl Required Autoconf version
AC_CONFIG_HEADER(include/portable.h include/ldap_features.h)dnl
OL_ARG_ENABLE(x_compile,[ --enable-x-compile enable cross compiling],
no, [yes no])dnl
-
dnl General "with" options
OL_ARG_ENABLE(dmalloc,[ --enable-dmalloc enable debug malloc support], no)dnl
auto, [auto posix mach lwp yes no manual] )
OL_ARG_WITH(yielding_select,[ --with-yielding-select with implicitly yielding select],
auto, [auto yes no manual] )
+OL_ARG_WITH(tls,[ --with-tls use tls/ssl],
+ auto, [auto ssleay openssl yes no] )
dnl Server options
OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups], auto)dnl
dnl SLAPD Backend options
+OL_ARG_ENABLE(bdb2,[ --enable-bdb2 enable bdb2 backend], no)dnl
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])
OL_ARG_ENABLE(passwd,[ --enable-passwd enable passwd backend], no)dnl
OL_ARG_ENABLE(perl,[ --enable-perl enable perl backend], no)dnl
OL_ARG_ENABLE(shell,[ --enable-shell enable shell backend], no)dnl
+OL_ARG_ENABLE(tcl,[ --enable-tcl enable tcl backend], no)dnl
dnl SLURPD OPTIONS
AC_ARG_WITH(xxslurpdoptions,[SLURPD Options:])
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
dnl SLAPD was specificallly disabled
+ if test $ol_enable_bdb2 = yes ; then
+ AC_MSG_WARN([slapd disabled, ignoring --enable_bdb2 argument])
+ fi
if test $ol_enable_ldbm = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable_ldbm argument])
fi
if test $ol_enable_shell = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable_shell argument])
fi
+ if test $ol_enable_tcl = yes ; then
+ AC_MSG_WARN([slapd disabled, ignoring --enable_tcl argument])
+ fi
if test $ol_enable_aclgroups = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable_aclgroups argument])
fi
fi
# force settings to no
+ ol_enable_bdb2=no
ol_enable_ldbm=no
ol_enable_passwd=no
ol_enable_perl=no
ol_enable_shell=no
+ ol_enable_tcl=no
ol_enable_aclgroups=no
ol_enable_wrappers=no
ol_enable_phonetic=no
AC_MSG_WARN([LDBM disabled, ignoring --with_ldbm_type argument])
fi
+ if test $ol_enable_bdb2 = yes ; then
+ AC_MSG_ERROR([BDB2 requires --enable-ldbm])
+ fi
+
if test $ol_enable_passwd = no -a \
- $ol_enable_perl = no -a
- $ol_enable_shell = no ; then
+ $ol_enable_perl = no -a \
+ $ol_enable_shell = no -a \
+ $ol_enable_tcl = no ; then
AC_MSG_ERROR([slapd requires a backend])
fi
ol_with_ldbm_api=no
ol_with_ldbm_type=no
+elif test $ol_enable_bdb2 = yes ; then
+ dnl SLAPD with BDB2
+
+ if test $ol_with_ldbm_api != auto -a \
+ $ol_with_ldbm_api != db2 ; then
+ AC_MSG_ERROR([BDB2 requires LDBM API DB2])
+ fi
+
+ ol_with_ldbm_api=db2
+
else
dnl SLAPD with LDBM
+ if test $ol_enable_bdb2 != no ; then
+ if test $ol_with_ldbm_api != auto -a \
+ $ol_with_ldbm_api != db2 ; then
+ AC_MSG_WARN([BDB2 requires LDBM api db2 or auto])
+ ol_enable_bdb2=no
+ fi
+ fi
+
if test $ol_with_ldbm_api = gdbm -a \
$ol_with_ldbm_type = btree ; then
AC_MSG_ERROR([GDBM only supports LDBM type hash])
BUILD_SLAPD=no
BUILD_SLURPD=no
+BUILD_BDB2=no
BUILD_LDBM=no
BUILD_PASSWD=no
BUILD_PERL=no
BUILD_SHELL=no
+BUILD_TCL=no
BUILD_THREAD=no
SLAPD_PERL_LDFLAGS=
KRB_LIBS=
TERMCAP_LIBS=
+TLS_LIBS=
dnl ----------------------------------------------------------------
dnl Checks for programs
AM_PROG_LIBTOOL
dnl AC_PROG_MAKE_SET
+AC_PROG_AWK
+AC_PROG_LN_S
+
AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail,
$PATH:/usr/libexec:/usr/lib:/usr/sbin:/usr/etc:/etc)
AC_PATH_PROG(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb)
SLAPD_PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e perl_inc`"
fi
-dnl Checks the compiler and UNIX Variants
+AC_PROG_CPP
if test $cross_compiling = yes -a $ol_enable_x_compile = yes; then
AC_MSG_WARN([cross compiling.... some functionality will be removed.])
AC_MSG_ERROR([ if cross compiling, add --enable-x-compile.])
fi
-AC_PROG_CPP
-
+dnl Checks for UNIX Variants
AC_AIX
AC_ISC_POSIX
AC_MINIX
+dnl Checks for system services
+AC_CYGWIN
+AC_MINGW32
+AC_EXEEXT
+AC_OBJEXT
+
dnl OpenLDAP requires STDC features
AM_PROG_CC_STDC
if test "X${am_cv_prog_cc_stdc}" = "Xno" ; then
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"
],:)
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
ol_with_kerberos=found
ol_link_kerberos=yes
- AC_DEFINE(HAVE_KERBEROS)
KRB_LIBS="-lkrb -ldes"
fi
fi
fi
-dnl if test $ol_link_kerberos = yes ; then
-dnl save_LIBS=$LIBS
-dnl LIBS="$KRB_LIBS $LIBS"
-dnl AC_CHECK_FUNCS(des_string_to_key)
-dnl LIBS=$save_LIBS
-dnl fi
+if test $ol_link_kerberos = yes ; then
+ AC_DEFINE(HAVE_KERBEROS, 1, [define if you have Kerberos])
+fi
+
+dnl
+dnl Check for SSL/TLS
+dnl
+ol_link_tls=no
+if test $ol_with_tls = auto -o $ol_with_tls = ssleay \
+ -o $ol_with_tls = openssl ; then
+
+ AC_CHECK_HEADERS(ssl.h)
+
+ if test $ac_cv_header_ssl_h = yes ; then
+ AC_CHECK_LIB( ssl, SSLeay_add_ssl_algorithms,
+ [have_ssleay=yes], [have_ssleay=no], [-lcrypto])
+
+ if test $have_ssleay = yes ; then
+ ol_with_tls=found
+ ol_link_tls=yes
+
+ AC_DEFINE( HAVE_SSLEAY, 1,
+ [define if you have SSLeay] )
+
+ TLS_LIBS="-lssl -lcrypto"
+ fi
+ fi
+fi
+
+if test $ol_link_tls = yes ; then
+ AC_DEFINE( HAVE_TLS, 1, [define if you have TLS] )
+fi
ol_link_threads=no
if test $ol_with_threads = auto -o $ol_with_threads = yes \
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
+ dnl Check pthread (draft4) flags (depreciated)
+ dnl pthread_create() with -threads (OSF/1)
+ dnl
+ dnl Check pthread (final) libraries (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 save the flags
save_LIBS="$LIBS"
LIBS="-kthread $LIBS"
- AC_TRY_LINK([char pthread();],[
- pthread_create();
- ], ol_cv_kthread_flag=yes, ol_cv_kthread_flag=no)
+ 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"
])
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"
])
dnl save the flags
save_LIBS="$LIBS"
LIBS="-pthreads $LIBS"
- AC_TRY_LINK([char pthread();],[
- pthread_create();
- ], ol_cv_pthreads_flag=yes, ol_cv_pthreads_flag=no)
+ 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"
])
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_mutex_unlock, [
+ ol_link_threads=posix
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -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 -lpthread -lmach -lexc
save_LIBS="$LIBS"
AC_CHECK_LIB(pthread, pthread_mutex_lock, [
ol_link_threads=posix
- LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lexc"
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc"
if test $ol_with_yielding_select = auto ; then
ol_with_yielding_select=yes
fi
- ],,[-lexc])
+ ],:,[-lmach -lexc])
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 -lexc
save_LIBS="$LIBS"
- AC_CHECK_LIB(pthreads, pthread_mutex_unlock, [
+ AC_CHECK_LIB(pthread, pthread_mutex_trylock, [
ol_link_threads=posix
- LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lmach -lexc -lc_r"
+ 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
save_LIBS="$LIBS"
AC_CHECK_LIB(pthreads, pthread_create, [
ol_link_threads=posix
- LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"])
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"],:)
LIBS="$save_LIBS"
fi
AC_CHECK_LIB(pthreads, pthread_join, [
ol_link_threads=posix
LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"
- ],[-Wl,-woff,85])
+ ],:,[-Wl,-woff,85])
+ LIBS="$save_LIBS"
+ 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
- dnl HP-UX 11 Pthread check
- if test $ol_link_threads = no; then
+ if test $ol_link_threads = no ; then
+ dnl try DEC Threads -lpthreads -lmach -lexc
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)
+ 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_cv_pthread_hpux_11=yes ; then
+ 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 -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
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lexc"
+ if test $ol_with_yielding_select = auto ; then
+ ol_with_yielding_select=yes
fi
- 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()])
fi
dnl Check functions for compatibility
- AC_CHECK_FUNCS(pthread_kill pthread_detach)
+ 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 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
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
ol_with_yielding_select=yes
fi
- AC_CACHE_CHECK([for misplaced posix thread in headers],
- [ol_cv_header_misplaced_pthreads], [
- AC_TRY_COMPILE([
-#include <sys/types.h>
-typedef double pthread_t;
- ], [
- pthread_t thread = 0.0;
- ],
- [ol_cv_header_misplaced_pthreads=no],
- [ol_cv_header_misplaced_pthreads=yes])
- ])
-
- if test "$ol_cv_header_misplaced_pthreads" = yes ; then
- AC_MSG_ERROR([pthread types are misplaced, use --with-threads=posix]);
- 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
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])
])
dnl save_LIBS="$LIBS"
dnl LIBS="$LTHREAD_LIBS $LIBS"
dnl AC_CHECK_FUNCS( \
-dnl strtok_r \
dnl gmtime_r \
dnl gethostbyaddr_r gethostbyname_r \
dnl feof_unlocked unlocked_feof \
ol_with_threads=no
fi
- AC_CACHE_CHECK([for misplaced posix thread in headers],
- [ol_cv_header_misplaced_pthreads], [
- AC_TRY_COMPILE([
-#include <sys/types.h>
-typedef double pthread_t;
- ], [
- pthread_t thread = 0.0;
- ],
- [ol_cv_header_misplaced_pthreads=no],
- [ol_cv_header_misplaced_pthreads=yes])
- ])
-
- if test "$ol_cv_header_misplaced_pthreads" = yes ; then
- AC_MSG_ERROR([pthread types are misplaced, use --with-threads=posix]);
- fi
-
- AC_DEFINE(NO_THREADS,1)
+ AC_DEFINE(NO_THREADS,1,
+ [define if you have (or want) no threads])
LTHREAD_LIBS=""
fi
fi
fi
+ol_link_bdb2=no
+if test $ol_link_ldbm = db2 -a $ol_enable_bdb2 != no ; then
+ ol_link_bdb2=yes
+fi
+
if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db ; then
OL_BERKELEY_DB
fi
if test $ol_enable_wrappers != no ; then
- AC_CHECK_LIB(wrap, main,
- [have_wrappers=yes], [have_wrappers=no])
+ AC_CHECK_HEADERS(tcpd.h)
+
+ if test $ac_cv_header_tcpd_h != yes ; then
+ have_wrappers=no
+ else
+ AC_CHECK_LIB(wrap, main,
+ [have_wrappers=yes], [have_wrappers=no])
+ fi
if test $have_wrappers = yes ; then
- AC_DEFINE(HAVE_TCPD)
+ AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap])
SLAPD_LIBS="$SLAPD_LIBS -lwrap"
else
AC_MSG_WARN(could not find -lwrap)
AC_MSG_WARN(disabling wrappers support)
ol_enable_wrappers=no
fi
-
fi
if test $ol_enable_syslog != no ; then
AC_CHECK_LIB(dmalloc, dmalloc_shutdown)
fi
+if test $ol_enable_tcl != no ; then
+ AC_CHECK_HEADERS(tcl.h)
+
+ if test $ac_cv_header_tcl_h != yes ; then
+ have_tcl=no
+ else
+ AC_CHECK_LIB(tcl,main,
+ [have_tcl=yes; SLAPD_LIBS="$SLAPD_LIBS -ltcl"],
+ [have_tcl=no])
+
+ if test $have_tcl != yes; then
+ AC_CHECK_LIB(tcl7.6,main,
+ [have_tcl=yes; SLAPD_LIBS="$SLAPD_LIBS -ltcl7.6"],
+ [have_tcl=no])
+ fi
+
+ if test $have_tcl != yes; then
+ AC_CHECK_LIB(tcl8.0,main,
+ [have_tcl=yes; SLAPD_LIBS="$SLAPD_LIBS -ltcl8.0"],
+ [have_tcl=no])
+ fi
+ fi
+
+ if test $have_tcl != yes ; then
+ AC_MSG_WARN([could not find -ltcl])
+ if test $ol_enable_tcl = yes ; then
+ AC_MSG_ERROR([could not find tcl, select appropriate options or disable])
+ fi
+
+ ol_enable_tcl=no
+ fi
+fi
+
# ud needs termcap (should insert check here)
ol_link_termcap=no
AC_CHECK_HEADERS(termcap.h ncurses.h)
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 \
getopt.h \
libutil.h \
limits.h \
+ locale.h \
malloc.h \
memory.h \
regex.h \
psap.h \
pwd.h \
+ resolv.h \
sgtty.h \
stdarg.h \
stddef.h \
string.h \
strings.h \
+ sysexits.h \
sys/file.h \
sys/filio.h \
sys/errno.h \
OL_C_VOLATILE
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)
AC_CHECK_FUNCS(vsnprintf vsprintf)
fi
-AC_FUNC_WAIT3
-
AC_CHECK_FUNCS( \
bcopy \
flock \
sigset \
snprintf \
socket \
+ strdup \
strerror \
strpbrk \
strrchr \
strsep \
strstr \
- strtok \
strtol \
strtoul \
strspn \
# these functions are required to build a thread_safe -lldap
AC_CHECK_FUNCS( \
- strtok_r \
ctime_r \
gethostbyaddr_r \
gethostbyname_r \
)
-OL_FUNC_CTIME_R_NARGS
+if test "$ac_cv_func_ctime_r" = yes ; then
+ OL_FUNC_CTIME_R_NARGS
+else
+ ol_cv_func_ctime_r=0
+fi
-if test $ac_cv_func_strtok_r = yes \
- -a $ac_cv_func_ctime_r = yes \
- -a $ol_cv_func_ctime_r_nargs -ge 2 -a $ol_cv_func_ctime_r_nargs -le 3 \
- -a $ac_cv_func_gethostbyaddr_r = yes \
- -a $ac_cv_func_gethostbyname_r = yes \
+if test "$ac_cv_func_gethostbyname_r" = yes ; then
+ OL_FUNC_GETHOSTBYNAME_R_NARGS
+else
+ ol_cv_func_gethostbyname_r=0
+fi
+
+if test "$ac_cv_func_gethostbyaddr_r" = yes ; then
+ OL_FUNC_GETHOSTBYADDR_R_NARGS
+else
+ ol_cv_func_gethostbyaddr_r=0
+fi
+
+if test "$ac_cv_func_ctime_r" = yes \
+ -a "$ol_cv_func_ctime_r_nargs" -ge 2 -a "$ol_cv_func_ctime_r_nargs" -le 3 \
+ -a "$ol_cv_func_gethostbyname_r_nargs" -ge 5 -a "$ol_cv_func_gethostbyname_r_nargs" -le 6 \
+ -a "$ol_cv_func_gethostbyaddr_r_nargs" -ge 5 -a "$ol_cv_func_gethostbyaddr_r_nargs" -le 6 \
+ -a "$ac_cv_func_gethostbyaddr_r" = yes \
+ -a "$ac_cv_func_gethostbyname_r" = yes \
; then
AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_REENTRANT, 1)
fi
dnl We actually may need to replace more than this.
-AC_REPLACE_FUNCS(getopt strdup tempnam)
+AC_REPLACE_FUNCS(getopt tempnam)
dnl ----------------------------------------------------------------
# Check Configuration
AC_DEFINE(LDAP_NOCACHE,1)
fi
if test "$ol_enable_dns" != no ; then
- AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_DNS,LDAP_API_VENDOR_VERSION,1)
+ AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_DNS,LDAP_VENDOR_VERSION)
fi
if test "$ol_enable_proctitle" != no ; then
AC_DEFINE(LDAP_PROCTITLE,1)
fi
if test "$ol_enable_referrals" != no ; then
- AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_API_VENDOR_VERSION,1)
+ AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_VENDOR_VERSION)
fi
if test "$ol_enable_cldap" != no ; then
AC_DEFINE(LDAP_CONNECTIONLESS,1)
AC_DEFINE(SLAPD_RLOOKUPS,1)
fi
+if test "$ol_link_bdb2" != no ; then
+ AC_DEFINE(SLAPD_BDB2,1)
+ BUILD_SLAPD=yes
+ BUILD_BDB2=yes
+fi
+
if test "$ol_link_ldbm" != no ; then
AC_DEFINE(SLAPD_LDBM,1)
BUILD_SLAPD=yes
BUILD_SHELL=yes
fi
+if test "$ol_enable_tcl" != no ; then
+ AC_DEFINE(SLAPD_TCL,1)
+ BUILD_SLAPD=yes
+ BUILD_TCL=yes
+fi
+
if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \
$BUILD_SLAPD = yes ; then
BUILD_SLURPD=yes
AC_SUBST(BUILD_LDAPD)
AC_SUBST(BUILD_SLAPD)
+ AC_SUBST(BUILD_BDB2)
AC_SUBST(BUILD_LDBM)
AC_SUBST(BUILD_PASSWD)
AC_SUBST(BUILD_PERL)
AC_SUBST(BUILD_SHELL)
+ AC_SUBST(BUILD_TCL)
AC_SUBST(BUILD_SLURPD)
AC_SUBST(LDAP_LIBS)
AC_SUBST(KRB_LIBS)
AC_SUBST(TERMCAP_LIBS)
+AC_SUBST(TLS_LIBS)
dnl ----------------------------------------------------------------
dnl final output
libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk \
libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.mk:build/lib-static.mk \
libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk:build/lib-static.mk \
-libraries/liblthread/Makefile:build/top.mk:libraries/liblthread/Makefile.in:build/lib.mk:build/lib-static.mk \
libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk \
servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk \
servers/ldapd/Makefile:build/top.mk:servers/ldapd/Makefile.in:build/srv.mk \
servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \
+servers/slapd/back-bdb2/Makefile:build/top.mk:servers/slapd/back-bdb2/Makefile.in:build/srv.mk \
servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/srv.mk \
servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/srv.mk \
servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/srv.mk \
servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/srv.mk \
+servers/slapd/back-tcl/Makefile:build/top.mk:servers/slapd/back-tcl/Makefile.in:build/srv.mk \
servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk \
servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \
servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \
-tests/Makefile:build/top.mk:tests/Makefile.in \
+tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \
+tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \
,[
date > stamp-h
echo Please \"make depend\" to build dependencies
projects / openldap / blobdiff