dnl in file LICENSE in the top-level directory of the distribution.
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
+AC_INIT(build/version)dnl
AC_CONFIG_AUX_DIR(build)dnl
-AM_INIT_AUTOMAKE(OpenLDAP,[2.0-devel], [no ac_define])dnl
+
+OL_VERSION=`cat $ac_aux_dir/version`
+if test -z "$OL_VERSION"; then
+ AC_MSG_ERROR([could not determine version])
+fi
+
+AM_INIT_AUTOMAKE(OpenLDAP,[$OL_VERSION], [no defines])dnl
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
+AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
+AC_DEFINE_UNQUOTED(OPENLDAP_VERSION,"$VERSION",Version)
dnl We use autoconf features new to 2.13.
dnl aclocal.m4 should be built using aclocal from automake 1.4
top_builddir=`pwd`
AC_SUBST(top_builddir)dnl
+AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion])
+
ldap_subdir="openldap"
AC_ARG_WITH(subdir, [ --with-subdir=DIR change default subdirectory used for installs], [
AC_SUBST(ldap_subdir)dnl
OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)dnl
-ol_enable_syslog=no
-dnl OL_ARG_ENABLE(syslog,[ --enable-syslog enable syslog support], auto)dnl
+dnl ol_enable_syslog=no
+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(cache,[ --enable-cache enable caching], yes)dnl
OL_ARG_ENABLE(dns,[ --enable-dns enable V2 DNS extension], no)dnl
OL_ARG_ENABLE(aclgroups,[ --enable-aclgroups enable ACL group support], auto)dnl
OL_ARG_ENABLE(cleartext,[ --enable-cleartext enable cleartext passwords], yes)dnl
OL_ARG_ENABLE(crypt,[ --enable-crypt enable crypt(3) passwords], auto)dnl
-OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl
+OL_ARG_ENABLE(modules,[ --enable-modules enable dynamic module support], no)dnl
OL_ARG_ENABLE(phonetic,[ --enable-phonetic enable phonetic/soundex], no)dnl
OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups], auto)dnl
+OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl
dnl SLAPD Backend options
OL_ARG_ENABLE(bdb2,[ --enable-bdb2 enable bdb2 backend], no)dnl
+OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap 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 mdbm gdbm ndbm manual])
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])
+ AC_MSG_WARN([slapd disabled, ignoring --enable-bdb2 argument])
+ fi
+ if test $ol_enable_ldap = yes ; then
+ AC_MSG_WARN([slapd disabled, ignoring --enable-ldap argument])
fi
if test $ol_enable_ldbm = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_ldbm argument])
+ AC_MSG_WARN([slapd disabled, ignoring --enable-ldbm argument])
fi
if test $ol_enable_passwd = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_passwd argument])
+ AC_MSG_WARN([slapd disabled, ignoring --enable-passwd argument])
fi
if test $ol_enable_perl = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_perl argument])
+ AC_MSG_WARN([slapd disabled, ignoring --enable-perl argument])
fi
if test $ol_enable_shell = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_shell argument])
+ 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])
+ 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])
+ AC_MSG_WARN([slapd disabled, ignoring --enable-aclgroups argument])
+ fi
+ if test $ol_enable_modules = yes ; then
+ AC_MSG_WARN([slapd disabled, ignoring --enable-modules argument])
fi
if test $ol_enable_wrappers = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_wrappers argument])
+ AC_MSG_WARN([slapd disabled, ignoring --enable-wrappers argument])
fi
if test $ol_enable_phonetic = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_phonetic argument])
+ AC_MSG_WARN([slapd disabled, ignoring --enable-phonetic argument])
fi
if test $ol_enable_rlookups = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_rlookups argument])
+ AC_MSG_WARN([slapd disabled, ignoring --enable-rlookups argument])
fi
if test $ol_with_ldbm_api != auto ; then
- AC_MSG_WARN([slapd disabled, ignoring --with_ldbm_api argument])
+ AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-api argument])
fi
if test $ol_with_ldbm_type != auto ; then
- AC_MSG_WARN([slapd disabled, ignoring --with_ldbm_type argument])
+ AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-type argument])
fi
if test $ol_enable_slurpd = yes ; then
AC_MSG_ERROR([slurpd requires slapd])
# force settings to no
ol_enable_bdb2=no
+ ol_enable_ldap=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_modules=no
ol_enable_phonetic=no
ol_enable_rlookups=no
+ ol_enable_wrappers=no
+
ol_with_ldbm_api=no
ol_with_ldbm_type=no
+
ol_enable_slurpd=no
elif test $ol_enable_ldbm = no ; then
dnl SLAPD without LDBM
if test $ol_with_ldbm_api != auto ; then
- AC_MSG_WARN([LDBM disabled, ignoring --with_ldbm_api argument])
+ AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-api argument])
fi
if test $ol_with_ldbm_type != auto ; then
- AC_MSG_WARN([LDBM disabled, ignoring --with_ldbm_type argument])
+ 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 \
+ if test $ol_enable_modules != yes -a \
+ $ol_enable_ldap = no -a \
+ $ol_enable_passwd = no -a \
$ol_enable_perl = no -a \
$ol_enable_shell = no -a \
$ol_enable_tcl = no ; then
BUILD_SLURPD=no
BUILD_BDB2=no
+BUILD_LDAP=no
BUILD_LDBM=no
BUILD_PASSWD=no
BUILD_PERL=no
BUILD_TCL=no
BUILD_THREAD=no
+SLAPD_MODULES_LDFLAGS=
+SLAPD_MODULES_CPPFLAGS=
+
SLAPD_PERL_LDFLAGS=
SLAPD_PERL_CPPFLAGS=
dnl ----------------------------------------------------------------
dnl Checks for programs
-AC_PROG_INSTALL
+dnl AC_PROG_INSTALL
dnl The default compiler is cc (NOT gcc)
-CC=${CC-"cc"}
+dnl (should check to see if 'cc' exists)
+save_CC="$CC"
+if test -z "${CC}"; then
+ AC_CHECK_PROGS(CC,cc)
+fi
+
dnl The default CFLAGS is empty NOT whatever AC_PROG_CC sets.
dnl CFLAGS=${CFLAGS-""}
+dnl
+dnl AIX Thread requires we use cc_r or xlc_r.
+dnl But only do this IF AIX and CC is zero (initially),
+dnl and cc exists and threads are auto|yes|posix.
+dnl
+dnl If we find cc_r|xlc_r, force pthreads and assume
+dnl pthread_create is in $LIBS (ie: don't bring in
+dnl any additional thread libraries)
+dnl If we do not find cc_r|xlc_r, disable threads
+dnl
+AC_CANONICAL_HOST
+
+case "$host" in
+ *-*-aix*) ol_host_os=aix ;;
+esac
+
+ol_aix_threads=no
+if test -z "$save_CC" -a "$CC" = cc -a "$ol_host_os" = aix ; then
+ case "$ol_with_threads" in
+ auto | yes | posix) ol_aix_threads=yes ;;
+ esac
+fi
+
+if test ol_aix_threads = yes ; then
+ CC=
+ AC_CHECK_PROGS(CC,cc_r xlc_r)
+
+ if test "$CC" ; then
+ if test $ol_with_threads != auto ; then
+ AC_MSG_ERROR([--with-threads requires cc_r (or other suitable compiler) on AIX])
+ else
+ AC_MSG_WARN([disabling threads, no cc_r on AIX])
+ fi
+ ol_with_threads=no
+ else
+ ol_with_threads=posix
+ ol_cv_pthread_create=yes
+ fi
+fi
+
AM_PROG_LIBTOOL
dnl AC_PROG_MAKE_SET
AC_PATH_PROG(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb)
AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb)
-if test $ol_enable_perl = yes ; then
+ol_link_modules=no
+if test $ol_enable_modules != no ; then
+ AC_PATH_PROG(GLIBCONFIG, glib-config)
+
+ if test "no$GLIBCONFIG" = "no" ; then
+ if test $ol_enable_modules = yes ; then
+ AC_MSG_ERROR([could not locate glib-config])
+ fi
+
+ else
+ SLAPD_MODULES_VERSION="`$GLIBCONFIG --version gmodule`"
+ SLAPD_MODULES_CPPFLAGS="`$GLIBCONFIG --cflags gmodule`"
+ SLAPD_MODULES_LDFLAGS="`$GLIBCONFIG --libs gmodule`"
+
+ dnl should check glib version
+ ol_link_modules=yes
+ fi
+fi
+
+ol_link_perl=no
+if test $ol_enable_perl != no ; then
AC_PATH_PROG(PERLBIN, perl, /usr/bin/perl)
if test "no$PERLBIN" = "no" ; then
- ol_enable_perl=no
- fi
+ if test $ol_enable_perl = yes ; then
+ AC_MSG_ERROR([could not locate perl])
+ fi
- SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`"
- SLAPD_PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e perl_inc`"
+ else
+ SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`"
+ SLAPD_PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`"
+
+ dnl should check perl version
+ ol_link_perl=yes
+ fi
fi
AC_PROG_CPP
AC_ISC_POSIX
AC_MINIX
-dnl BeOS requires -lbe -lroot
-AC_CHECK_LIB(be, be_app, [LIBS="$LIBS -lbe -lroot"], :, [-lroot])
+dnl BeOS requires -lbe -lroot -lnet
+AC_CHECK_LIB(be, be_app, [LIBS="$LIBS -lbe -lroot -lnet"], :, [-lroot -lnet])
dnl Checks for system services
AC_CYGWIN
AC_EXEEXT
AC_OBJEXT
+AC_DEFINE_UNQUOTED( EXEEXT, "${EXEEXT}", [defined to be the EXE extension])
+
dnl OpenLDAP requires STDC features
AM_PROG_CC_STDC
if test "X${am_cv_prog_cc_stdc}" = "Xno" ; then
dnl AM_C_PROTOTYPES
+dnl Check cc depend flags
+OL_MKDEPEND
+if test "${ol_cv_mkdep}" = no ; then
+ # this will soon become an error
+ AC_MSG_WARN([do not know how to generate dependencies])
+fi
+
dnl Checks for libraries
dnl Find socket()
dnl -lsocket [ -lnsl_s | -lnsl ]
dnl -linet
-AC_CHECK_FUNC(socket, [have_socket=yes], [
+AC_CHECK_FUNC(socket, :, [
dnl
dnl hopefully we won't include too many libraries
dnl
AC_CHECK_LIB(socket, main)
AC_CHECK_LIB(net, main)
+ AC_CHECK_LIB(net, socket)
AC_CHECK_LIB(nsl_s, main)
AC_CHECK_LIB(nsl, main)
AC_CHECK_LIB(inet, socket)
dnl HP-UX requires -lV3
AC_CHECK_LIB(V3, sigset)
+AC_CHECK_HEADERS( regex.h )
+if test "$ac_cv_header_regex_h" != yes ; then
+ AC_MSG_ERROR([POSIX regex.h required.])
+fi
+AC_CHECK_FUNC(regfree, :, AC_MSG_ERROR([POSIX regex required.]))
+
+AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.]))
+
+dnl Select arg types
+dnl (if this detection becomes permenent, it and the select() detection
+dnl should be done before the yielding select test)
+AC_FUNC_SELECT_ARGTYPES
+
# 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
# consider threads found
ol_with_threads=found
- OL_LINUX_THREADS
-
- if test $ol_cv_linux_threads = yes ; then
- AC_DEFINE(HAVE_LINUX_THREADS,1,
- [define if you have LinuxThreads])
- fi
+ OL_HEADER_LINUX_THREADS
dnl Now the hard part, how to link?
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 (skipped) pthread_mutex_trylock() in -lpthread -lexc (OSF/1)
dnl pthread_join() -Wl,-woff,85 -lpthread (IRIX)
dnl pthread_create() in -lpthread (many)
dnl pthread_create() in -lc_r (FreeBSD)
/* make sure pthread_create() isn't just a stub */
#if HAVE_PTHREADS_D4
- status = pthread_create(&t, pthread_attr_default, task, NULL));
+ status = pthread_create(&t, pthread_attr_default, task, NULL);
#else
status = pthread_create(&t, NULL, task, NULL);
#endif
if test $ol_cv_pthread_create != no ; then
ol_link_threads=posix
+ ol_link_pthreads=""
fi
+
+ OL_PTHREAD_TRY_LINK([-mt], [ol_cv_pthread_mt])
+ OL_PTHREAD_TRY_LINK([-kthread], [ol_cv_pthread_kthread])
+ OL_PTHREAD_TRY_LINK([-pthread], [ol_cv_pthread_pthread])
+ OL_PTHREAD_TRY_LINK([-pthreads],[ol_cv_pthread_pthreads])
+ OL_PTHREAD_TRY_LINK([-thread], [ol_cv_pthread_thread])
- if test $ol_link_threads = no ; then
- dnl try -mt
- AC_CACHE_CHECK([for pthread_create with -mt],
- [ol_cv_pthread_mt_flag], [
- dnl save the flags
- save_LIBS="$LIBS"
- LIBS="-mt $LIBS"
- AC_TRY_LINK([char pthread_create();],
- [pthread_create();],
- [ol_cv_pthread_mt_flag=yes], [ol_cv_pthread_mt_flag=no])
- dnl restore the LIBS
- LIBS="$save_LIBS"
- ])
+ OL_PTHREAD_TRY_LINK([-lpthread -lmach -lexc -lc_r],
+ [ol_cv_pthread_lpthread_lmach_lexc_lc_r])
+ OL_PTHREAD_TRY_LINK([-lpthread -lmach -lexc],
+ [ol_cv_pthread_lpthread_lmach_lexc])
+dnl OL_PTHREAD_TRY_LINK([-lpthread -lexc],
+dnl [ol_cv_pthread_lpthread_lexc])
- if test $ol_cv_pthread_mt_flag = yes ; then
- LTHREAD_LIBS="$LTHREAD_LIBS -mt"
- ol_link_threads=posix
- fi
- fi
+ OL_PTHREAD_TRY_LINK([-lpthread -Wl,-woff,85],
+ [ol_cv_pthread_lib_lpthread_woff])
- 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>],[
-#if HAVE_PTHREADS_D4
- pthread_create(NULL,pthread_attr_default,NULL,NULL);
-#else
- pthread_t t;
- pthread_create(&t,NULL,NULL,NULL);
- pthread_detach(t);
-#endif
-],
- [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
+ OL_PTHREAD_TRY_LINK([-lpthread],[ol_cv_pthread_lpthread])
+ OL_PTHREAD_TRY_LINK([-lc_r], [ol_cv_pthread_lc_r])
- if test $ol_link_threads = no ; then
- dnl try -pthread
- AC_CACHE_CHECK([for pthread_create with -pthread],
- [ol_cv_pthread_flag], [
- dnl save the flags
- save_LIBS="$LIBS"
- LIBS="-pthread $LIBS"
- AC_TRY_LINK([#include <pthread.h>],[
-#if HAVE_PTHREADS_D4
- pthread_create(NULL,pthread_attr_default,NULL,NULL);
-#else
- pthread_create(NULL,NULL,NULL,NULL);
-#endif
-],
- [ol_cv_pthread_flag=yes], [ol_cv_pthread_flag=no])
- dnl restore the LIBS
- LIBS="$save_LIBS"
- ])
+ OL_PTHREAD_TRY_LINK([-threads], [ol_cv_pthread_threads])
- if test $ol_cv_pthread_flag = yes ; then
- LTHREAD_LIBS="$LTHREAD_LIBS -pthread"
- ol_link_threads=posix
- fi
- fi
+ OL_PTHREAD_TRY_LINK([-lpthreads -lmach -lexc -lc_r],
+ [ol_cv_pthread_lpthreads_lmach_lexc_lc_r])
+ OL_PTHREAD_TRY_LINK([-lpthreads -lmach -lexc],
+ [ol_cv_pthread_lpthreads_lmach_lexc])
+ OL_PTHREAD_TRY_LINK([-lpthreads -lexc],
+ [ol_cv_pthread_lpthreads_lexc])
- 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>],[
-#if HAVE_PTHREADS_D4
- pthread_create(NULL,pthread_attr_default,NULL,NULL);
-#else
- pthread_create(NULL,NULL,NULL,NULL);
-#endif
-],
- [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],
- [ol_cv_thread_flag], [
- dnl save the flags
- save_LIBS="$LIBS"
- LIBS="-thread $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 -thread"
- 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 -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
- ],:,[-lexc])
- LIBS="$save_LIBS"
- fi
-
- dnl IRIX Pthread check
- if test $ol_link_threads = no ; then
- dnl try IRIX Pthreads -Wl,-woff,85 -lpthread
- save_LIBS="$LIBS"
- AC_CHECK_LIB(pthread, pthread_join, [
- ol_link_threads=posix
- LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"
- ],:,[-Wl,-woff,85])
- LIBS="$save_LIBS"
- fi
-
- if test $ol_link_threads = no ; then
- dnl try -lpthread
- save_LIBS="$LIBS"
- AC_CHECK_LIB(pthread, pthread_create, [
- ol_link_threads=posix
- LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"],:)
- LIBS="$save_LIBS"
- fi
-
- if test $ol_link_threads = no ; then
- dnl try -lc_r
- save_LIBS="$LIBS"
- AC_CHECK_LIB(c_r, pthread_create, [
- ol_link_threads=posix
- LTHREAD_LIBS="$LTHREAD_LIBS -lc_r"],:)
- LIBS="$save_LIBS"
- fi
-
- if test $ol_link_threads = no ; then
- dnl try -threads
- AC_CACHE_CHECK([for pthread_create with -threads],
- [ol_cv_threads_flag], [
- dnl save the flags
- save_LIBS="$LIBS"
- LIBS="-threads $LIBS"
- AC_TRY_LINK([char pthread_create();],[
- pthread_create();
- ], ol_cv_threads_flag=yes, ol_cv_threads_flag=no)
- dnl restore the LIBS
- LIBS="$save_LIBS"
- ])
-
- if test $ol_cv_threads_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
- 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
+ OL_PTHREAD_TRY_LINK([-lpthreads], [ol_cv_pthread_lib_lpthreads])
if test $ol_link_threads != no ; then
AC_DEFINE(HAVE_PTHREADS,1,
[define if you have POSIX Threads])
+ LTHREAD_LIBS="$LTHREAD_LIBS $ol_link_pthreads"
+
dnl save flags
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
fi
if test $ac_cv_func_sched_yield = no -a \
$ac_cv_func_pthread_yield = no ; then
- dnl Solaris has sched_yield() in -lposix4
+ dnl Solaris has sched_yield() stub in -lposix4
dnl but we'll use thr_yield instead.
AC_CHECK_FUNCS(thr_yield)
fi
thr_getconcurrency \
)
+ OL_SYS_LINUX_THREADS
+ OL_LINUX_THREADS
+
+ if test $ol_cv_linux_threads = error; then
+ AC_MSG_ERROR([LinuxThreads header/library mismatch]);
+ fi
+
AC_MSG_CHECKING([if pthread_create() works])
AC_CACHE_VAL(ol_cv_pthread_create_works,[
AC_TRY_RUN([
AC_CHECK_HEADERS(pthread.h sched.h)
AC_CHECK_FUNCS(sched_yield pthread_yield)
- OL_LINUX_THREADS
+ OL_HEADER_LINUX_THREADS
AC_CHECK_HEADERS(mach/cthreads.h)
AC_CHECK_HEADERS(lwp/lwp.h)
AC_DEFINE(THREADSAFE,1)
AC_DEFINE(_THREADSAFE,1)
- dnl this might cause the errno symbol to be
- dnl replaced with a function to get a thread specific errno.
- dnl check to see if everything needs to be compiled
- dnl with the thread libraries
+ dnl The errno declaration may dependent upon _REENTRANT.
+ dnl If it does, we must link with thread support.
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>], [errno = 0;],
[ol_cv_errno_thread_specific=yes],
[ol_cv_errno_thread_specific=no])
])
- if test $ol_cv_errno_thread_specific != yes ; then
+ dnl The h_errno declaration may dependent upon _REENTRANT.
+ dnl If it does, we must link with thread support.
+ AC_CACHE_CHECK([for thread specific h_errno],
+ [ol_cv_h_errno_thread_specific], [
+ AC_TRY_LINK([#include <netdb.h>], [h_errno = 0;],
+ [ol_cv_h_errno_thread_specific=yes],
+ [ol_cv_h_errno_thread_specific=no])
+ ])
+
+ if test $ol_cv_errno_thread_specific != yes \
+ -o $ol_cv_h_errno_thread_specific != yes ; then
LIBS="$LTHREAD_LIBS $LIBS"
LTHREAD_LIBS=""
fi
dnl # include LDAP_R_COMPILE
dnl #endif
dnl
-dnl LDAP_R_COMIPLE is defined by libldap_r/Makefile.in
+dnl LDAP_R_COMPILE is defined by libldap_r/Makefile.in
dnl specifically for compiling the threadsafe version of
dnl the ldap library (-lldap_r).
dnl
if test $have_wrappers = yes ; then
AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap])
SLAPD_LIBS="$SLAPD_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
OL_HEADER_STDC
if test $ol_cv_header_stdc != yes; then
- AC_MSG_WARN([could not Standard C compliant headers])
+ AC_MSG_WARN([could not locate Standard C compliant headers])
fi
AC_HEADER_DIRENT
locale.h \
malloc.h \
memory.h \
- regex.h \
psap.h \
pwd.h \
resolv.h \
sys/ioctl.h \
sys/param.h \
sys/resource.h \
+ sys/select.h \
sys/socket.h \
sys/syslog.h \
sys/time.h \
dnl AM_FUNC_MKTIME dnl checks for sys/time.h and unistd.h
AC_FUNC_STRFTIME
dnl AM_FUNC_STRTOD
+
+dnl we should use vfork instead of fork in a number of places...
+dnl AC_FUNC_VFORK
AC_FUNC_VPRINTF
if test $ac_cv_func_vprintf = yes ; then
AC_CHECK_FUNCS( \
bcopy \
+ closesocket \
endgrent \
endpwent \
flock \
- getdtablesize \
+ getdtablesize \
getgrgid \
gethostname \
getpass \
getpwuid \
- gettimeofday \
+ gettimeofday \
+ initgroups \
lockf \
memcpy \
memmove \
mkstemp \
recv \
recvfrom \
- select \
setpwfile \
+ setgid \
+ setegid \
setsid \
+ setuid \
+ seteuid \
signal \
sigset \
snprintf \
- socket \
strdup \
strerror \
strpbrk \
# Check Configuration
OL_SYS_ERRLIST
-dnl ----------------------------------------------------------------
-dnl Check our declaration of strdup()
-OL_DECL_STRDUP
-
dnl ----------------------------------------------------------------
dnl Sort out defines
AC_DEFINE(SLAPD_RLOOKUPS,1)
fi
+if test "$ol_link_modules" != no ; then
+ AC_DEFINE(SLAPD_MODULES,1)
+ BUILD_SLAPD=yes
+fi
+
if test "$ol_link_bdb2" != no ; then
AC_DEFINE(SLAPD_BDB2,1)
BUILD_SLAPD=yes
BUILD_BDB2=yes
fi
+if test "$ol_enable_ldap" != no ; then
+ AC_DEFINE(SLAPD_LDAP,1)
+ BUILD_SLAPD=yes
+ BUILD_LDAP=yes
+fi
+
if test "$ol_link_ldbm" != no ; then
AC_DEFINE(SLAPD_LDBM,1)
BUILD_SLAPD=yes
BUILD_PASSWD=yes
fi
-if test "$ol_enable_perl" != no ; then
+if test "$ol_link_perl" != no ; then
AC_DEFINE(SLAPD_PERL,1)
BUILD_SLAPD=yes
BUILD_PERL=yes
AC_SUBST(BUILD_LDAPD)
AC_SUBST(BUILD_SLAPD)
AC_SUBST(BUILD_BDB2)
+ AC_SUBST(BUILD_LDAP)
AC_SUBST(BUILD_LDBM)
AC_SUBST(BUILD_PASSWD)
AC_SUBST(BUILD_PERL)
AC_SUBST(LTHREAD_LIBS)
AC_SUBST(LUTIL_LIBS)
+AC_SUBST(SLAPD_MODULES_CPPFLAGS)
+AC_SUBST(SLAPD_MODULES_LDFLAGS)
+
AC_SUBST(SLAPD_PERL_CPPFLAGS)
AC_SUBST(SLAPD_PERL_LDFLAGS)
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-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/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 \
projects / openldap / blobdiff