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 Configure.in for OpenLDAP
-dnl
-AC_INIT(include/ldap.h)
-dnl
-dnl
-AC_PREREQ(2.10)dnl Required Autoconf version
+AC_INIT(include/ldap.h)dnl
+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_CONFIG_AUX_DIR(build)
-AC_CONFIG_HEADER(include/portable.h)dnl
+AC_PREREQ(2.10)dnl Required Autoconf version
+
+AC_CONFIG_HEADER(include/portable.h include/ldap_features.h)dnl
+
dnl
dnl Start Args
AC_MSG_CHECKING(configure arguments)
AC_PREFIX_DEFAULT(/usr/local)
-dnl General "enable" options
-OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)dnl
+top_builddir=`pwd`
+AC_SUBST(top_builddir)dnl
+
+ldap_subdir="openldap"
+
+AC_ARG_WITH(subdir, [ --with-subdir=DIR change default subdirectory used for installs], [
+ if test "$withval" = "no"; then
+ ldap_subdir=""
+ elif test "$withval" != "yes"; then
+ ldap_subdir="$withval"
+ fi
+])dnl
+
+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
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
-OL_ARG_ENABLE(dns,[ --enable-dns enable dns support], no)dnl
-OL_ARG_ENABLE(referrals,[ --enable-referrals enable referrals], yes)dnl
+OL_ARG_ENABLE(dns,[ --enable-dns enable V2 DNS extension], no)dnl
+OL_ARG_ENABLE(referrals,[ --enable-referrals enable V2 Referrals extension], yes)dnl
OL_ARG_ENABLE(cldap,[ --enable-cldap enable connectionless ldap], no)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
+
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] )
-OL_ARG_WITH(preemptive,[ --with-preemptive thread implementation is preemptive],
+OL_ARG_WITH(yielding_select,[ --with-yielding-select with implicitly yielding select],
auto, [auto yes no manual] )
dnl Server options
dnl LDAPD OPTIONS
+AC_ARG_WITH(xxldapdoptions,[LDAPD Options:])
OL_ARG_ENABLE(ldapd,[ --enable-ldapd enable building ldapd], no)dnl
dnl SLAPD OPTIONS
+AC_ARG_WITH(xxslapdoptions,[SLAPD Options:])
OL_ARG_ENABLE(slapd,[ --enable-slapd enable building slapd], yes)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(md5,[ --enable-md5 enable MD5 passwords], auto)dnl
-OL_ARG_ENABLE(sha1,[ --enable-sha1 enable SHA1 passwords], auto)dnl
OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper 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(shell,[ --enable-shell enable shell backend], no)dnl
dnl SLURPD OPTIONS
+AC_ARG_WITH(xxslurpdoptions,[SLURPD Options:])
OL_ARG_ENABLE(slurpd,[ --enable-slurpd enable building slurpd], auto)dnl
+AC_ARG_WITH(xxliboptions,[Library Generation & Linking Options])
+AM_ENABLE_STATIC
+dnl AM_DISABLE_SHARED
+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])
+ fi
+ ol_enable_dns=no
+fi
+
if test $ol_enable_slapd = no ; then
dnl SLAPD was specificallly disabled
if test $ol_enable_ldbm = yes ; then
if test $ol_enable_aclgroups = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable_aclgroups argument])
fi
- if test $ol_enable_crypt = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_crypt argument])
- fi
- if test $ol_enable_md5 = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_md5 argument])
- fi
- if test $ol_enable_sha1 = yes ; then
- AC_MSG_WARN([slapd disabled, ignoring --enable_sha1 argument])
- fi
if test $ol_enable_wrappers = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable_wrappers argument])
fi
ol_enable_shell=no
ol_enable_passwd=no
ol_enable_aclgroups=no
- ol_enable_crypt=no
- ol_enable_md5=no
- ol_enable_sha1=no
ol_enable_wrappers=no
ol_enable_phonetic=no
ol_enable_rlookups=no
AC_MSG_RESULT(done)
+AC_CANONICAL_HOST
+
## Initialize vars
LDAP_LIBS=
LDBM_LIBS=
dnl ----------------------------------------------------------------
dnl Checks for programs
-AC_PROG_LN_S
AC_PROG_INSTALL
-AC_PROG_RANLIB
-AC_PROG_MAKE_SET
+AM_PROG_LIBTOOL
+dnl AC_PROG_MAKE_SET
AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail,
$PATH:/usr/libexec:/usr/lib:/usr/sbin:/usr/etc:/etc)
AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb)
dnl Checks the compiler and UNIX Variants
-AC_PROG_CC
if test $cross_compiling = yes -a $ol_enable_x_compile = yes; then
- AC_WARN([cross compiling.... go for it])
+ AC_MSG_WARN([cross compiling.... some functionality will be removed.])
elif test $cross_compiling = no -a $ol_enable_x_compile = yes; then
- AC_WARN([programs compiled here do run here...])
- AC_ERROR([ if not cross compiling, use --disable-x-compile.])
+ AC_MSG_WARN([programs compiled here do run here...])
+ AC_MSG_ERROR([ if not cross compiling, use --disable-x-compile.])
elif test $cross_compiling = yes -a $ol_enable_x_compile = no; then
- AC_WARN([programs compiled here do not run here...])
- AC_ERROR([ if cross compiling, add --enable-x-compile.])
+ AC_MSG_WARN([programs compiled here do not run here...])
+ AC_MSG_ERROR([ if cross compiling, add --enable-x-compile.])
fi
-dnl OpenLDAP requires STDC features
-dnl AC_PROG_GCC_TRADITIONAL
AC_PROG_CPP
-
AC_AIX
AC_ISC_POSIX
AC_MINIX
+dnl OpenLDAP requires STDC features
+AM_PROG_CC_STDC
+if test "X${am_cv_prog_cc_stdc}" = "Xno" ; then
+ AC_MSG_ERROR([OpenLDAP requires compiler to support STDC prototypes.])
+fi
+
+dnl AM_C_PROTOTYPES
+
dnl Checks for libraries
dnl Find socket()
dnl -lsocket [ -lnsl_s | -lnsl ]
dnl -linet
-AC_CHECK_FUNC(socket, :, [
+AC_CHECK_FUNC(socket, [have_socket=yes], [
dnl
dnl hopefully we won't include too many libraries
dnl
AC_CHECK_LIB(gen, main)
])
-dnl need to add check for -lresolv
-dnl only needed for LDAP_DNS?
+dnl Check for resolv
+AC_CHECK_LIB(resolv, res_search)
dnl HP-UX requires -lV3
AC_CHECK_LIB(V3, sigset)
AC_CHECK_LIB(xtpp, main, [
ol_link_isode=yes
AC_DEFINE(HAVE_XTPP,1)
- LDAPD_LIBS="$LDAPD_LIBS -lxtpp -lresolv -lxtdsap -lxtisode -losi"
- ],:,[-lresolv -lxtdsap -lxtisode -losi])
+ 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_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_link_kerberos=yes
AC_DEFINE(HAVE_KERBEROS)
-
KRB_LIBS="-lkrb4 -lkrb5 -ldes425"
fi
fi
fi
+
if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then
AC_CHECK_HEADERS(krb.h des.h)
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
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
dnl Now the hard part, how to link
- dnl A few platforms have pthread support in standard libraries
+ dnl Check for pthread support in current $LIBS
AC_CHECK_FUNC(pthread_create,[ol_link_threads=yes])
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 CPPFLAGS
+ dnl save the flags
save_LIBS="$LIBS"
LIBS="-pthread $LIBS"
- AC_TRY_LINK([#include <pthread.h>],[
- pthread_create((pthread_t*) 0,
- (pthread_attr_t*) 0, 0, 0);
+ AC_TRY_LINK([char pthread();],[
+ pthread_create();
], 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([char pthread();],[
+ pthread_create();
+ ], 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();],[
+ 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 -lexc
+ save_LIBS="$LIBS"
+ AC_CHECK_LIB(pthread, pthread_join, [
+ 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
+
+ if test $ol_link_threads = no ; then
+ dnl try DEC Threads -lpthreads -lmach -lexc -lc_r
+ save_LIBS="$LIBS"
+ AC_CHECK_LIB(pthreads, pthread_join, [
+ 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 -lpthread
save_LIBS="$LIBS"
fi
if test $ol_link_threads = no ; then
- dnl try DEC Threads
+ dnl try -lpthreads
save_LIBS="$LIBS"
- AC_CHECK_LIB(pthread, pthread_create, [
- AC_DEFINE(HAVE_DCE)
+ AC_CHECK_LIB(pthreads, pthread_create, [
ol_link_threads=posix
- LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc -lc"
- if test $ol_with_preemptive = auto ; then
- ol_with_preemptive=yes
- fi
- ],,[-lmach -lexc -lc])
+ LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"])
LIBS="$save_LIBS"
fi
if test $ol_link_threads != no ; then
AC_DEFINE(HAVE_PTHREADS)
- dnl save DEFS/LIBS
+ dnl save flags
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
LIBS="$LTHREAD_LIBS $LIBS"
dnl Check functions for compatibility
AC_CHECK_FUNCS(pthread_kill)
-dnl AC_CHECK_FUNCS( \
-dnl pthread_attr_create pthread_attr_init \
-dnl pthread_attr_destroy pthread_attr_delete \
-dnl pthread_attr_setdetachstate pthread_attr_setdetach_np \
-dnl )
+ 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 setconcurreny functions
AC_CHECK_FUNCS( \
thr_setconcurrency \
)
- dnl Check PREEMPTIVE Implementation
- if test $ol_with_preemptive = auto ; then
- AC_MSG_CHECKING([for preemptive Pthread implementation])
+ AC_MSG_CHECKING([if pthread_create() works])
+ AC_CACHE_VAL(ol_cv_pthread_create_works,[
+ AC_TRY_RUN([
+#include <pthread.h>
+#ifndef NULL
+#define NULL (void*)0
+#endif
+
+static void *task(p)
+ void *p;
+{
+ return (void *) (p == NULL);
+}
+
+int main(argc, argv)
+ int argc;
+ char **argv;
+{
+ pthread_t t;
+ exit(pthread_create(&t, NULL, task, NULL));
+}
+],
+ [ol_cv_pthread_create_works=yes],
+ [ol_cv_pthread_create_works=no],
+ [dnl assume yes
+ ol_cv_pthread_create_works=yes])])
+ AC_MSG_RESULT($ol_cv_pthread_create_works)
+
+ if test $ol_cv_pthread_create_works = no ; then
+ AC_MSG_ERROR([pthread.h and pthread_create are not compatible])
+ fi
+
+ dnl Check if select causes an yield
+ if test $ol_with_yielding_select = auto ; then
+ AC_MSG_CHECKING([if select yields when using pthreads])
+ AC_CACHE_VAL(ol_cv_pthread_select_yields,[
AC_TRY_RUN([
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
#include <pthread.h>
#ifndef NULL
-#define NULL 0
+#define NULL (void*) 0
#endif
-int task(arg)
- int *arg;
+static int fildes[2];
+
+static void *task(p)
+ void *p;
{
+ int i;
struct timeval tv;
- tv.tv_sec=4;
- tv.tv_usec=0;
- select(0, NULL, NULL, NULL, &tv);
+ fd_set rfds;
- tv.tv_sec=6;
+ tv.tv_sec=10;
tv.tv_usec=0;
- select(0, NULL, NULL, NULL, &tv);
- exit(1); /* if we exit here, the select blocked the whole process */
+ FD_ZERO(&rfds);
+ FD_SET(fildes[0], &rfds);
+
+ /* we're not interested in any fds */
+ i = select(FD_SETSIZE, &rfds, NULL, NULL, &tv);
+
+ if(i < 0) {
+ perror("select");
+ exit(10);
+ }
+
+ exit(0); /* if we exit here, the select blocked the whole process */
}
-main(argc, argv)
-int argc; char **argv;
+int main(argc, argv)
+ int argc;
+ char **argv;
{
pthread_t t;
+ /* create a pipe to select */
+ if(pipe(&fildes[0])) {
+ perror("select");
+ exit(1);
+ }
+
#ifdef HAVE_PTHREAD_SETCONCURRENCY
(void) pthread_setconcurrency(2);
-#elif HAVE_THR_SETCONCURRENCY
+#else
+#ifdef HAVE_THR_SETCONCURRENCY
/* Set Solaris LWP concurrency to 2 */
thr_setconcurrency(2);
+#endif
#endif
- pthread_create(&t, NULL, (void *) task, NULL);
+ pthread_create(&t, NULL, task, NULL);
#if HAVE_SCHED_YIELD
sched_yield(); /* make sure task runs first */
#else
-#if defined(HAVE_PTHREAD_YIELD)
+#ifdef HAVE_PTHREAD_YIELD
pthread_yield(); /* make sure task runs first */
#endif
#endif
- exit(0);
-}
- ], [ol_pthread_preemptive=yes], [ol_pthread_preemptive=no], [
- AC_MSG_ERROR([crossing compiling: use --with-preemptive=yes|no|manual])])
- AC_MSG_RESULT($ol_pthread_preemptive)
- if test $ol_pthread_preemptive = yes ; then
- AC_DEFINE(HAVE_PREEMPTIVE_PTHREADS)
- ol_with_preemptive=yes
+ exit(2);
+}],
+ [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)
+
+ if test $ol_cv_pthread_select_yields = yes ; then
+ ol_with_yielding_select=yes
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 DEFS/LIBS
+ dnl restore flags
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
else
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
ol_with_threads=found
- dnl A few platforms have cthread support in standard libraries
+ dnl check for cthread support in current $LIBS
AC_CHECK_FUNC(cthread_fork,[ol_link_threads=yes])
if test $ol_link_threads = no ; then
dnl this test needs work
AC_CACHE_CHECK([for cthread_fork with -all_load],
[ol_cv_cthread_all_load], [
- dnl save the CPPFLAGS
+ dnl save the flags
save_LIBS="$LIBS"
LIBS="-all_load $LIBS"
AC_TRY_LINK([#include <mach/cthreads.h>],[
if test $ol_link_threads != no ; then
: check for cthread specific functionality here
+ AC_DEFINE(HAVE_MACH_CTHREADS,1)
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 = 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_lwp=yes], [have_lwp=no])
+ AC_CHECK_LIB(thread, thr_create, [have_thr=yes], [have_thr=no])
- if test $have_lwp = yes ; then
+ if test $have_thr = yes ; then
AC_DEFINE(HAVE_THR)
- LTHREAD_LIBS="$LTHREAD_LIBS -llwp"
+ LTHREAD_LIBS="$LTHREAD_LIBS -lthread"
+ ol_link_threads=thr
- if test $ol_with_preemptive = auto ; then
- ol_with_preemptive=yes
+ if test $ol_with_yielding_select = auto ; then
+ ol_with_yielding_select=yes
fi
fi
fi
if test $have_lwp = yes ; then
AC_DEFINE(HAVE_LWP)
LTHREAD_LIBS="$LTHREAD_LIBS -llwp"
+ ol_link_threads=lwp
- if test $ol_with_preemptive = auto ; then
- ol_with_preemptive=no
+ if test $ol_with_yielding_select = auto ; then
+ ol_with_yielding_select=no
fi
fi
fi
fi
-if test $ol_with_preemptive = yes ; then
- AC_DEFINE(PREEMPTIVE_THREADS,1)
+if test $ol_with_yielding_select = yes ; then
+ AC_DEFINE(HAVE_YIELDING_SELECT,1)
fi
if test $ol_with_threads = manual ; then
AC_CHECK_HEADERS(thread.h synch.h)
fi
-if test $ol_with_threads = yes ; then
+if test $ol_link_threads != no ; then
dnl needed to get reentrant/threadsafe versions
dnl
- dnl hopefully this will not cause problems with
- dnl non-threaded apps
- dnl
+ AC_DEFINE(REENTRANT,1)
AC_DEFINE(_REENTRANT,1)
+ AC_DEFINE(THREAD_SAFE,1)
AC_DEFINE(_THREAD_SAFE,1)
-fi
+ 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
+ AC_CACHE_CHECK([for thread specific errno],
+ [ol_cv_errno_thread_specific], [
+ AC_TRY_LINK([
+#include <errno.h>
+ ], [
+int x = errno;
+ ],
+ [ol_cv_errno_thread_specific=yes],
+ [ol_cv_errno_thread_specific=no])
+ ])
+
+ if test $ol_cv_errno_thread_specific != yes ; then
+ LIBS="$LTHREAD_LIBS $LIBS"
+ LTHREAD_LIBS=""
+ fi
+
+dnl When in thread environment, use
+dnl #if defined( HAVE_REENTRANT_FUNCTIONS ) \
+dnl || defined( HAVE_FUNC_R )
+dnl func_r(...);
+dnl #else
+dnl # if defined( HAVE_THREADS )
+dnl /* lock */
+dnl # endif
+dnl func(...);
+dnl # if defined( HAVE_THREADS )
+dnl /* unlock */
+dnl # endif
+dnl #endif
+dnl
+dnl HAVE_REENTRANT_FUNCTIONS is derived from:
+dnl _POSIX_REENTRANT_FUNCTIONS
+dnl _POSIX_THREAD_SAFE_FUNCTIONS
+dnl _POSIX_THREADSAFE_FUNCTIONS
+dnl
+dnl and is currently defined in lthread.h
+dnl
+dnl HAVE_THREADS is defined by lthread.h iff -UNO_THREADS
+dnl
+dnl libldap/*.c should only include <lthread.h> iff
+dnl LDAP_R_COMPILE is defined. ie:
+dnl #ifdef LDAP_R_COMPILE
+dnl # include LDAP_R_COMPILE
+dnl #endif
+dnl
+dnl LDAP_R_COMIPLE is defined by libldap_r/Makefile.in
+dnl specifically for compiling the threadsafe version of
+dnl the ldap library (-lldap_r).
+dnl
+dnl dnl check for reentrant/threadsafe functions
+dnl dnl
+dnl dnl note: these should only be used when linking
+dnl dnl with $LTHREAD_LIBS
+dnl dnl
+dnl save_CPPFLAGS="$CPPFLAGS"
+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 \
+dnl putc_unlocked unlocked_putc \
+dnl flockfile ftrylockfile \
+dnl )
+dnl CPPFLAGS="$save_CPPFLAGS"
+dnl LIBS="$save_LIBS"
+fi
dnl ----------------------------------------------------------------
fi
AC_DEFINE(NO_THREADS,1)
- AC_DEFINE(PREEMPTIVE_THREADS,1)
LTHREAD_LIBS=""
fi
fi
fi
-if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = ndbm ; then
+if test $ol_with_ldbm_api = auto ; then
+ AC_MSG_WARN([skipping automatic checking for NDBM, must be manually enabled.])
+elif 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
- if test $ol_with_ldbm_api = ndbm ; then
- AC_WARN([Attempting to use NDBM. Functionality will be limited.])
- fi
-
if test $ol_cv_lib_ndbm != yes ; then
LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_ndbm"
fi
ol_enable_ldbm=no
fi
-if test $ol_enable_wrappers = yes ; then
- AC_CHECK_LIB(wrap, hosts_access,
+if test $ol_enable_wrappers != no ; then
+ AC_CHECK_LIB(wrap, main,
[have_wrappers=yes], [have_wrappers=no])
if test $have_wrappers = yes ; then
fi
+if test $ol_enable_syslog != no ; then
+ AC_CHECK_FUNC(openlog)
+ if test $ac_cv_func_openlog = no -a $ol_enable_syslog = yes; then
+ AC_MSG_ERROR(could not find syslog, select appropriate options or disable)
+ fi
+ ol_enable_syslog=$ac_cv_func_openlog
+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)
ol_link_termcap=no
AC_CHECK_HEADERS(termcap.h ncurses.h)
AC_HEADER_STDC
if test $ac_cv_header_stdc != yes; then
- AC_MSG_WARN([could not locate Standard C headers])
+ AC_MSG_WARN([could not Standard C compliant headers])
fi
AC_HEADER_DIRENT
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)
+fi
+
AC_CHECK_HEADERS( \
- stdarg.h \
- stddef.h \
+ crypt.h \
errno.h \
fcntl.h \
filio.h \
libutil.h \
limits.h \
malloc.h \
+ memory.h \
regex.h \
+ psap.h \
+ pwd.h \
sgtty.h \
+ stdarg.h \
+ stddef.h \
+ string.h \
+ strings.h \
sys/file.h \
sys/filio.h \
sys/errno.h \
sys/ioctl.h \
sys/param.h \
+ sys/resource.h \
sys/socket.h \
sys/syslog.h \
sys/time.h \
dnl ----------------------------------------------------------------
dnl Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_GETGROUPS
+AC_TYPE_GETGROUPS dnl requires AC_TYPE_UID_T
AC_TYPE_MODE_T
AC_TYPE_OFF_T
AC_TYPE_PID_T
+AM_TYPE_PTRDIFF_T
AC_TYPE_SIGNAL
+OL_TYPE_SIG_ATOMIC_T
AC_TYPE_SIZE_T
-AC_TYPE_UID_T
AC_STRUCT_ST_BLKSIZE
AC_HEADER_TIME
AC_STRUCT_TM
OL_C_UPPER_LOWER
AC_C_CONST
+OL_C_VOLATILE
-dnl AC_CHECK_SIZEOF(short)
-dnl AC_CHECK_SIZEOF(int)
-dnl AC_CHECK_SIZEOF(long)
+if test $cross_compiling = yes ; then
+ AC_DEFINE(CROSS_COMPILING, 1)
+else
+ AC_C_BIGENDIAN
+ AC_CHECK_SIZEOF(short)
+ AC_CHECK_SIZEOF(int)
+ AC_CHECK_SIZEOF(long)
+fi
dnl ----------------------------------------------------------------
dnl Checks for library functions.
AC_FUNC_MEMCMP
+dnl AM_FUNC_MKTIME dnl checks for sys/time.h and unistd.h
AC_FUNC_STRFTIME
+dnl AM_FUNC_STRTOD
AC_FUNC_VPRINTF
if test $ac_cv_func_vprintf = yes ; then
AC_CHECK_FUNCS( \
bcopy \
- getopt \
flock \
+ getdtablesize \
gethostname \
+ getpwuid \
gettimeofday \
- getdtablesize \
lockf \
memcpy \
memmove \
mkstemp \
- mktime \
+ res_search \
select \
setpwfile \
setsid \
snprintf \
socket \
strerror \
- strstr \
+ strpbrk \
strrchr \
strsep \
- strtod \
+ strstr \
+ strtok \
strtol \
strtoul \
sysconf \
- tempnam \
waitpid \
)
+# these functions are required to build a thread_safe -lldap
+AC_CHECK_FUNCS( \
+ strtok_r \
+ ctime_r \
+ gethostbyaddr_r \
+ gethostbyname_r \
+)
+
+if test $ac_cv_func_strtok_r = yes \
+ -a $ac_cv_func_ctime_r = yes \
+ -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
+
+if test $ol_link_threads != no ; then
+ AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE, 1)
+fi
+
+dnl We actually may need to replace more than this.
AC_REPLACE_FUNCS(getopt strdup tempnam)
dnl ----------------------------------------------------------------
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_syslog = yes ; then
+ AC_DEFINE(LDAP_SYSLOG,1)
+fi
if test $ol_enable_libui = yes ; then
AC_DEFINE(LDAP_LIBUI,1)
fi
AC_DEFINE(LDAP_NOCACHE,1)
fi
if test $ol_enable_dns != no ; then
- AC_DEFINE(LDAP_DNS,1)
+ AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_DNS,LDAP_API_VENDOR_VERSION,1)
fi
if test $ol_enable_proctitle != no ; then
AC_DEFINE(LDAP_PROCTITLE,1)
fi
if test $ol_enable_referrals != no ; then
- AC_DEFINE(LDAP_REFERRALS,1)
+ AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_API_VENDOR_VERSION,1)
fi
if test $ol_enable_cldap != no ; then
AC_DEFINE(LDAP_CONNECTIONLESS,1)
if test $ol_enable_crypt != no ; then
AC_DEFINE(SLAPD_CRYPT,1)
fi
-if test $ol_enable_md5 != no ; then
- AC_DEFINE(SLAPD_MD5,1)
-fi
-if test $ol_enable_sha1 != no ; then
- AC_DEFINE(SLAPD_SHA1,1)
+if test $ol_enable_cleartext != no ; then
+ AC_DEFINE(SLAPD_CLEARTEXT,1)
fi
if test $ol_enable_phonetic != no ; then
AC_DEFINE(SLAPD_PHONETIC,1)
dnl final output
dnl
-dnl AC_OUTPUT( \
-dnl contrib/Makefile:build/top.mk:contrib/Makefile.in:build/dir.mk \
-dnl contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \
-dnl contrib/whois++/Makefile:build/top.mk:contrib/whois++/Makefile.in:build/rules.mk \
-dnl [date > stamp-h])
-
AC_OUTPUT( \
Makefile:build/top.mk:Makefile.in:build/dir.mk \
doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk \
clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \
include/Makefile:build/top.mk:include/Makefile.in \
libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk \
-libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk \
-libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk \
-libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk \
-libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.mk \
-libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk \
-libraries/liblthread/Makefile:build/top.mk:libraries/liblthread/Makefile.in:build/lib.mk \
-libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk \
+libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk:build/lib-static.mk \
+libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk \
+libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk \
+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 \
projects / openldap / blobdiff