X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=349b82b08a08d322ef2ace2fab9292f8d9d5d675;hb=8ebec49d9ddb5c5d69b5a5e383f20125e416180e;hp=91d9b746aabad1d3ebf34d643401efa80b6db74a;hpb=2614a4095f90ac85ea9ea141a61737047af90d46;p=openldap diff --git a/configure.in b/configure.in index 91d9b746aa..349b82b08a 100644 --- a/configure.in +++ b/configure.in @@ -1,52 +1,78 @@ -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 Configure.in for OpenLDAP -dnl -AC_INIT(include/ldap.h) -dnl dnl -AC_PREREQ(2.10)dnl Required Autoconf version + +dnl Configure.in for OpenLDAP +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(libui,[ --enable-libui enable library user interface], yes)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 dns support], no)dnl -OL_ARG_ENABLE(referrals,[ --enable-referrals enable referrals], yes)dnl -OL_ARG_ENABLE(cldap,[ --enable-clapd enable connectionless ldap], no)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(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(aclgroup,[ --enable-aclgroup enable ACL group support], auto)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 @@ -62,58 +88,61 @@ OL_ARG_ENABLE(passwd,[ --enable-passwd enable passwd backend], no)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 - 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_shell = yes ; then - AC_MSG_WARN([slapd disabled, ignoring --enable_shell argument]); - fi - if test $ol_enable_aclgroup = yes ; then - AC_MSG_WARN([slapd disabled, ignoring --enable_aclgroup argument]); - fi - if test $ol_enable_crypt = yes ; then - AC_MSG_WARN([slapd disabled, ignoring --enable_crypt argument]); + AC_MSG_WARN([slapd disabled, ignoring --enable_shell 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]); + if test $ol_enable_aclgroups = yes ; then + AC_MSG_WARN([slapd disabled, ignoring --enable_aclgroups 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]); + AC_MSG_ERROR([slurpd requires slapd]) fi # force settings to no ol_enable_ldbm=no ol_enable_shell=no ol_enable_passwd=no - ol_enable_aclgroup=no - ol_enable_crypt=no - ol_enable_md5=no - ol_enable_sha1=no + ol_enable_aclgroups=no ol_enable_wrappers=no ol_enable_phonetic=no ol_enable_rlookups=no @@ -125,15 +154,15 @@ 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_passwd = no -a $ol_enable_shell = no ; then - AC_MSG_ERROR([slapd requires a backend]); + AC_MSG_ERROR([slapd requires a backend]) fi ol_with_ldbm_api=no @@ -144,38 +173,33 @@ else if test $ol_with_ldbm_api = gdbm -a \ $ol_with_ldbm_type = btree ; then - AC_MSG_ERROR([GDBM only supports LDBM type hash]); + AC_MSG_ERROR([GDBM 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_MSG_ERROR([NDBM only supports LDBM type hash]) fi fi if test $ol_enable_slurpd = yes ; then dnl SLURPD was specifically enabled if test $ol_with_threads = no ; then - AC_MSG_ERROR([slurpd requires threads]); + AC_MSG_ERROR([slurpd requires threads]) fi fi AC_MSG_RESULT(done) +AC_CANONICAL_HOST + ## Initialize vars -LDAP_DEFS= LDAP_LIBS= -LDBM_DEFS= LDBM_LIBS= -LTHREAD_DEFS= LTHREAD_LIBS= -LUTIL_DEFS= LUTIL_LIBS= -LDAPD_DEFS= LDAPD_LIBS= -SLAPD_DEFS= SLAPD_LIBS= -SLURPD_DEFS= SLURPD_LIBS= BUILD_LDAPD=no @@ -185,29 +209,51 @@ BUILD_SLURPD=no BUILD_LDBM=no BUILD_PASSWD=no BUILD_SHELL=no +BUILD_THREAD=no -KRB_DEFS= KRB_LIBS= -TERMCAP_DEFS= TERMCAP_LIBS= dnl ---------------------------------------------------------------- dnl Checks for programs -AC_PROG_CC -AC_PROG_GCC_TRADITIONAL - -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(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb) AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb) -dnl ---------------------------------------------------------------- +dnl Checks the compiler and UNIX Variants + +if test $cross_compiling = yes -a $ol_enable_x_compile = yes; then + AC_MSG_WARN([cross compiling.... some functionality will be removed.]) + +elif test $cross_compiling = no -a $ol_enable_x_compile = yes; then + 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_MSG_WARN([programs compiled here do not run here...]) + AC_MSG_ERROR([ if cross compiling, add --enable-x-compile.]) +fi + +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() @@ -215,7 +261,7 @@ dnl Likely combinations: 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 @@ -227,9 +273,47 @@ dnl AC_CHECK_LIB(gen, main) ]) +dnl Check for resolv +AC_CHECK_LIB(resolv, res_search) + dnl HP-UX requires -lV3 AC_CHECK_LIB(V3, sigset) +# ISODE tests +ol_link_isode=no +if test $ol_enable_ldapd != no ; then + dnl look for ISODE libraries + AC_CHECK_LIB(xtpp, main, [ + ol_link_isode=yes + AC_DEFINE(HAVE_XTPP,1) + 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) + LDAPD_LIBS="$LDAPD_LIBS -ldsap" + ],:,[-lisode]) + AC_CHECK_LIB(isode, main, [ + ol_link_isode=yes + AC_DEFINE(HAVE_ISODE,1) + LDAPD_LIBS="$LDAPD_LIBS -lisode" + ],:) +fi + +if test $ol_link_isode != no; then + AC_CHECK_LIB(pp, main, [ + AC_DEFINE(HAVE_PP,1) + 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) @@ -241,11 +325,12 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 ; then ol_with_kerberos=found ol_link_kerberos=yes - KRB_DEFS="-DKERBEROS" + 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) @@ -256,24 +341,32 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then ol_with_kerberos=found ol_link_kerberos=yes - KRB_DEFS="-DKERBEROS" + 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 OL_POSIX_THREAD_VERSION if test $ol_cv_pthread_version = final ; then - LTHREAD_DEFS="$LTHREAD_DEFS -DPOSIX_THREADS" + AC_DEFINE(HAVE_PTHREADS_FINAL) elif test $ol_cv_pthread_version = draft4 ; then - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_MIT_PTHREADS" + AC_DEFINE(HAVE_PTHREADS_D4) else AC_MSG_ERROR([unknown pthread version]) fi @@ -284,25 +377,23 @@ if test $ol_with_threads = auto -o $ol_with_threads = posix ; then OL_LINUX_THREADS if test $ol_cv_linux_threads = yes ; then -dnl AC_DEFINE(HAVE_LINUX_THREADS,1) - LTHREAD_DEFS="$LTHREAD_DEFS -DHAVE_LINUX_THREADS" + AC_DEFINE(HAVE_LINUX_THREADS,1) fi 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_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" @@ -314,6 +405,72 @@ dnl AC_DEFINE(HAVE_LINUX_THREADS,1) 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" @@ -333,17 +490,50 @@ dnl AC_DEFINE(HAVE_LINUX_THREADS,1) 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_CHECK_LIB(pthreads, pthread_create, [ ol_link_threads=posix - LTHREAD_DEFS="$LTHREAD_DEFS -DDEC_THREADS" - LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc -lc"],, - [-lmach -lexc -lc]) + LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"]) LIBS="$save_LIBS" fi + dnl HP-UX 11 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 +#include +#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 + AC_DEFINE(HAVE_PTHREADS) + + dnl save flags + save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" LIBS="$LTHREAD_LIBS $LIBS" @@ -354,18 +544,159 @@ dnl AC_DEFINE(HAVE_LINUX_THREADS,1) if test $ac_cv_func_sched_yield = no -a \ $ac_cv_func_pthread_yield = no ; then - + dnl Digital UNIX has sched_yield() in -lrt + AC_CHECK_LIB(rt, sched_yield, + [LTHREAD_LIBS="$LTHREAD_LIBS -lrt" + AC_DEFINE(HAVE_SCHED_YIELD,1) + ac_cv_func_sched_yield=yes], + [ac_cv_func_sched_yield=no]) + fi + 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]) + fi + if test $ac_cv_func_sched_yield = no -a \ + $ac_cv_func_pthread_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 \ - pthread_attr_init pthread_attr_create \ + 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 setconcurreny functions + AC_CHECK_FUNCS( \ + pthread_setconcurrency \ + thr_setconcurrency \ + ) + + AC_MSG_CHECKING([if pthread_create() works]) + AC_CACHE_VAL(ol_cv_pthread_create_works,[ + AC_TRY_RUN([ +#include +#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 +#include +#include +#include +#ifndef NULL +#define NULL (void*) 0 +#endif + +static int fildes[2]; + +static void *task(p) + void *p; +{ + int i; + struct timeval tv; + + fd_set rfds; + + tv.tv_sec=10; + tv.tv_usec=0; + + 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 */ +} + +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); +#else +#ifdef HAVE_THR_SETCONCURRENCY + /* Set Solaris LWP concurrency to 2 */ + thr_setconcurrency(2); +#endif +#endif + + pthread_create(&t, NULL, task, NULL); + +#if HAVE_SCHED_YIELD + sched_yield(); /* make sure task runs first */ +#else +#ifdef HAVE_PTHREAD_YIELD + pthread_yield(); /* make sure task runs first */ +#endif +#endif + + 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 restore flags + CPPFLAGS="$save_CPPFLAGS" LIBS="$save_LIBS" else AC_MSG_ERROR([could not link with POSIX Threads]) @@ -377,54 +708,191 @@ dnl AC_DEFINE(HAVE_LINUX_THREADS,1) fi fi -if test $ol_with_threads = auto -o $ol_with_threads = cthreads ; 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_lwp_lwp_h = yes ; then - AC_CHECK_LIB(lwp, cthread_fork, [have_cthreads=yes], [have_cthreads=no]) + if test $ac_cv_header_mach_cthreads_h = yes ; then + ol_with_threads=found - if test $have_cthreads = yes ; then - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_NEXT_CTHREADS" - LTHREAD_LIBS="$LTHREAD_LIBS -llwp" + 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 try -all_load + dnl this test needs work + AC_CACHE_CHECK([for cthread_fork with -all_load], + [ol_cv_cthread_all_load], [ + dnl save the flags + save_LIBS="$LIBS" + LIBS="-all_load $LIBS" + AC_TRY_LINK([#include ],[ + cthread_fork((void *)0, (void *)0); + ], ol_cv_cthread_all_load=yes, ol_cv_cthread_all_load=no) + dnl restore the LIBS + LIBS="$save_LIBS" + ]) + + if test $ol_cv_cthread_all_load = yes ; then + LTHREAD_LIBS="$LTHREAD_LIBS -all_load" + ol_link_threads=mach + fi + fi + + 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 + + if test $ol_with_threads = mach ; then + AC_MSG_ERROR([could not locate Mach CThreads]) + 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(lwp/lwp.h) - if test $ac_cv_header_lwp_lwp_h = yes ; then - AC_CHECK_LIB(thread, thr_create, [have_lwp=yes], [have_lwp=no]) + 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_lwp = yes ; then - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_SUNOS5_LWP" - LTHREAD_LIBS="$LTHREAD_LIBS -llwp" + if test $have_thr = yes ; then + AC_DEFINE(HAVE_THR) + LTHREAD_LIBS="$LTHREAD_LIBS -lthread" + ol_link_threads=thr + + if test $ol_with_yielding_select = auto ; then + ol_with_yielding_select=yes + fi fi fi dnl check for SunOS4 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_HEADERS(lwp/lwp.h) + if test $ac_cv_header_lwp_lwp_h = yes ; then AC_CHECK_LIB(lwp, lwp_create, [have_lwp=yes], [have_lwp=no]) if test $have_lwp = yes ; then - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_SUNOS4_LWP" + AC_DEFINE(HAVE_LWP) LTHREAD_LIBS="$LTHREAD_LIBS -llwp" + ol_link_threads=lwp + + if test $ol_with_yielding_select = auto ; then + ol_with_yielding_select=no + fi fi fi fi +if test $ol_with_yielding_select = yes ; then + AC_DEFINE(HAVE_YIELDING_SELECT,1) +fi + if test $ol_with_threads = manual ; then dnl User thinks he can manually configure threads. - $ol_link_threads=yes + ol_link_threads=yes AC_MSG_WARN([thread defines and link options must be set manually]) AC_CHECK_HEADERS(pthread.h sched.h) AC_CHECK_FUNCS(sched_yield pthread_yield) OL_LINUX_THREADS + + AC_CHECK_HEADERS(mach/cthreads.h) + AC_CHECK_HEADERS(lwp/lwp.h) + AC_CHECK_HEADERS(thread.h synch.h) fi +if test $ol_link_threads != no ; then + dnl needed to get reentrant/threadsafe versions + dnl + AC_DEFINE(REENTRANT,1) + AC_DEFINE(_REENTRANT,1) + AC_DEFINE(THREAD_SAFE,1) + AC_DEFINE(_THREAD_SAFE,1) + 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 + ], [ +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 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 ---------------------------------------------------------------- + if test $ol_link_threads = no ; then if test $ol_with_threads = yes ; then AC_MSG_ERROR([no suitable thread support]) @@ -432,10 +900,10 @@ if test $ol_link_threads = no ; then if test $ol_with_threads = auto ; then AC_MSG_WARN([no suitable thread support, disabling threads]) - $ol_with_threads = no + ol_with_threads=no fi - LTHREAD_DEFS="-DNO_THREADS" + AC_DEFINE(NO_THREADS,1) LTHREAD_LIBS="" fi @@ -447,12 +915,10 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db2 ; then ol_link_ldbm=db2 ol_with_ldbm_api=db2 - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DB2" - if test $ol_with_ldbm_type = hash ; then - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBHASH" + AC_DEFINE(LDBM_USE_DBHASH,1) else - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBBTREE" + AC_DEFINE(LDBM_USE_DBBTREE,1) fi dnl $ol_cv_lib_db2 should be yes or -ldb @@ -470,14 +936,10 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db ; then ol_link_ldbm=db ol_with_ldbm_api=db - if test $ac_cv_header_db_185_h = yes ; then - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DB2_COMPAT185" - fi - if test $ol_with_ldbm_type = hash ; then - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBHASH" + AC_DEFINE(LDBM_USE_DBHASH,1) else - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBBTREE" + AC_DEFINE(LDBM_USE_DBBTREE,1) fi dnl $ol_cv_lib_db should be yes or -ldb @@ -490,7 +952,7 @@ fi if test $ol_with_ldbm_api = manual ; then dnl User thinks he can manually configure LDBM api. - $ol_link_ldbm=yes + ol_link_ldbm=yes AC_MSG_WARN([LDBM defines and link options must be set manually]) @@ -498,8 +960,8 @@ if test $ol_with_ldbm_api = manual ; then fi if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then - AC_MSG_WARN(Could not find LDBM with BTREE support); - $ol_with_ldbm_api=none + AC_MSG_WARN(Could not find LDBM with BTREE support) + ol_with_ldbm_api=none fi if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then @@ -509,27 +971,21 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then ol_link_ldbm=gdbm ol_with_ldbm_api=gdbm - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_GDBM" - if test $ol_cv_lib_gdbm != yes ; then LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_gdbm" 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 - - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_NDBM" - if test $ol_cv_lib_ndbm != yes ; then LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_ndbm" fi @@ -543,17 +999,15 @@ if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then fi AC_MSG_WARN(disabling LDBM) - $ol_enable_ldbm=no + 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 -dnl LIBTCPD="-lwrap" -dnl AC_DEFINE(HAVE_TCPD) - SLAPD_DEFS="$SLAPD_DEFS -DTCP_WRAPPERS" + AC_DEFINE(HAVE_TCPD) SLAPD_LIBS="$SLAPD_LIBS -lwrap" else AC_MSG_WARN(could not find -lwrap) @@ -567,14 +1021,27 @@ dnl AC_DEFINE(HAVE_TCPD) 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) 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) ol_link_termcap=yes TERMCAP_LIBS=-ltermcap fi @@ -583,13 +1050,14 @@ 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) ol_link_termcap=yes TERMCAP_LIBS=-lncurses fi fi if test $ol_link_termcap = no ; then - TERMCAP_DEFS="-DNOTERMCAP" + AC_DEFINE(NO_TERMCAP,1) TERMCAP_LIBS= fi @@ -600,8 +1068,7 @@ if test $ol_enable_crypt != no ; then have_crypt=yes], [have_crypt=no])]) if test $have_crypt = yes ; then -dnl AC_DEFINE(SLAPD_CRYPT,1) - LUTIL_DEFS="$LUTIL_DEFS -DLDAP_CRYPT" + AC_DEFINE(HAVE_CRYPT,1) else AC_MSG_WARN(could not find crypt) if test $ol_enable_crypt = yes ; then @@ -613,74 +1080,164 @@ dnl AC_DEFINE(SLAPD_CRYPT,1) fi fi +# FreeBSD (and others) have setproctitle(3) in -lutil +if test $ol_enable_proctitle != no ; then + AC_CHECK_FUNC(setproctitle, [have_setproctitle=yes], [ + AC_CHECK_LIB(util, setproctitle, + [have_setproctitle=yes + LUTIL_LIBS="$LUTIL_LIBS -lutil"], + [have_setproctitle=no + LIBOBJS="$LIBOBJS setproctitle.o"])]) + + if test $have_setproctitle = yes ; then + AC_DEFINE(HAVE_SETPROCTITLE,1) + fi +fi + dnl ---------------------------------------------------------------- dnl Checks for header files. AC_HEADER_STDC + +if test $ac_cv_header_stdc != yes; then + AC_MSG_WARN([could not Standard C compliant headers]) +fi + AC_HEADER_DIRENT AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS( \ - stddef.h \ - fcntl.h \ - filio.h \ - limits.h \ - malloc.h \ - sgtty.h \ - sys/file.h \ - sys/ioctl.h \ - sys/time.h \ - syslog.h \ - termio.h \ - unistd.h \ +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( \ + crypt.h \ + errno.h \ + fcntl.h \ + filio.h \ + getopt.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 \ + sys/types.h \ + syslog.h \ + termios.h \ + unistd.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 -dnl AC_C_BIGENDIAN +OL_C_UPPER_LOWER AC_C_CONST +OL_C_VOLATILE + +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 + dnl check for vsnprintf + AC_CHECK_FUNCS(vsnprintf vsprintf) +fi + AC_FUNC_WAIT3 AC_CHECK_FUNCS( \ + bcopy \ flock \ + getdtablesize \ gethostname \ + getpwuid \ gettimeofday \ - getdtablesize \ lockf \ memcpy \ - mktime \ + memmove \ + mkstemp \ + res_search \ select \ setpwfile \ setsid \ signal \ sigset \ + snprintf \ socket \ strerror \ - strstr \ + strpbrk \ strrchr \ strsep \ - strtod \ + strstr \ + strtok \ strtol \ strtoul \ sysconf \ + waitpid \ ) -AC_REPLACE_FUNCS(strdup) +# 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 ---------------------------------------------------------------- # Check Configuration @@ -689,79 +1246,74 @@ OL_SYS_ERRLIST dnl ---------------------------------------------------------------- dnl Sort out defines -if test $ol_enable_debug != no ; then - LDAP_DEFS="$LDAP_DEFS -DLDAP_DEBUG" +if test "$ol_enable_debug" != no ; then + AC_DEFINE(LDAP_DEBUG,1) fi -dnl if test $ol_enable_syslog != no ; then -dnl LDAP_DEFS="$LDAP_DEFS -DLDAP_SYSLOG" -dnl fi -if test $ol_enable_libui = no ; then - LDAP_DEFS="$LDAP_DEFS -DNO_USERINTERFACE" +if test "$ol_enable_syslog" = yes ; then + AC_DEFINE(LDAP_SYSLOG,1) fi -if test $ol_enable_cache = no ; then - LDAP_DEFS="$LDAP_DEFS -DNO_CACHE" +if test "$ol_enable_libui" = yes ; then + AC_DEFINE(LDAP_LIBUI,1) fi -if test $ol_enable_dns != no ; then - LDAP_DEFS="$LDAP_DEFS -DLDAP_DNS" +if test "$ol_enable_cache" = no ; then + AC_DEFINE(LDAP_NOCACHE,1) fi -if test $ol_enable_referrals != no ; then - LDAP_DEFS="$LDAP_DEFS -DLDAP_REFERRALS" +if test "$ol_enable_dns" != no ; then + AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_DNS,LDAP_API_VENDOR_VERSION,1) fi -if test $ol_enable_cldap != no ; then - LDAP_DEFS="$LDAP_DEFS -DCLDAP" +if test "$ol_enable_proctitle" != no ; then + AC_DEFINE(LDAP_PROCTITLE,1) fi - -if test $ol_enable_aclgroup != no ; then - AC_DEFINE(SLAPD_ACLGROUP,1) - SLAPD_DEFS="$SLAPD_DEFS -DACLGROUP" +if test "$ol_enable_referrals" != no ; then + AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_API_VENDOR_VERSION,1) fi - -if test $ol_enable_md5 != no ; then -dnl AC_DEFINE(SLAPD_MD5,1) - LUTIL_DEFS="$LUTIL_DEFS -DLDAP_MD5" +if test "$ol_enable_cldap" != no ; then + AC_DEFINE(LDAP_CONNECTIONLESS,1) fi -if test $ol_enable_sha1 != no ; then -dnl AC_DEFINE(SLAPD_SHA1,1) - LUTIL_DEFS="$LUTIL_DEFS -DLDAP_SHA1" +if test "$ol_enable_aclgroups" != no ; then + AC_DEFINE(SLAPD_ACLGROUPS,1) fi - -if test $ol_enable_phonetic != no ; then +if test "$ol_enable_crypt" != no ; then + AC_DEFINE(SLAPD_CRYPT,1) +fi +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) - SLAPD_DEFS="$SLAPD_DEFS -DSOUNDEX" fi - -if test $ol_enable_rlookups != no ; then +if test "$ol_enable_rlookups" != no ; then AC_DEFINE(SLAPD_RLOOKUPS,1) - SLAPD_DEFS="$SLAPD_DEFS -DREVERSE_LOOKUPS" fi -if test $ol_link_ldbm != no ; then -dnl AC_DEFINE(SLAPD_LDBM,1) +if test "$ol_link_ldbm" != no ; then + AC_DEFINE(SLAPD_LDBM,1) BUILD_SLAPD=yes BUILD_LDBM=yes - LDBM_DEFS="-DLDAP_LDBM $LDBM_DEFS" fi -if test $ol_enable_passwd != no ; then -dnl AC_DEFINE(SLAPD_PASSWD,1) +if test "$ol_enable_passwd" != no ; then + AC_DEFINE(SLAPD_PASSWD,1) BUILD_SLAPD=yes BUILD_PASSWD=yes - SLAPD_DEFS="-DLDAP_PASSWD $SLAPD_DEFS" fi -if test $ol_enable_shell != no ; then -dnl AC_DEFINE(SLAPD_SHELL,1) +if test "$ol_enable_shell" != no ; then + AC_DEFINE(SLAPD_SHELL,1) BUILD_SLAPD=yes BUILD_SHELL=yes - SLAPD_DEFS="-DLDAP_SHELL $SLAPD_DEFS" 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 + BUILD_LDAPD=yes +fi + dnl ---------------------------------------------------------------- AC_SUBST(BUILD_LDAPD) @@ -772,36 +1324,21 @@ AC_SUBST(BUILD_SLAPD) AC_SUBST(BUILD_SLURPD) -AC_SUBST(LDAP_DEFS) AC_SUBST(LDAP_LIBS) -AC_SUBST(LDAPD_DEFS) AC_SUBST(LDAPD_LIBS) -AC_SUBST(SLAPD_DEFS) AC_SUBST(SLAPD_LIBS) -AC_SUBST(SLURPD_DEFS) AC_SUBST(SLURPD_LIBS) -AC_SUBST(LDBM_DEFS) AC_SUBST(LDBM_LIBS) -AC_SUBST(LTHREAD_DEFS) AC_SUBST(LTHREAD_LIBS) -AC_SUBST(LUTIL_DEFS) AC_SUBST(LUTIL_LIBS) -AC_SUBST(KRB_DEFS) AC_SUBST(KRB_LIBS) -AC_SUBST(TERMCAP_DEFS) AC_SUBST(TERMCAP_LIBS) dnl ---------------------------------------------------------------- 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 \ @@ -820,13 +1357,14 @@ clients/ud/Makefile:build/top.mk:clients/ud/Makefile.in:build/rules.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 \ @@ -837,4 +1375,7 @@ servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/ 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 \ -,[date > stamp-h]) +,[ +date > stamp-h +echo Please \"make depend\" to build dependencies +])