X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=0b5967cc633bf1130c403116936054c092df1481;hb=4bce7aa748e22351b44b5752cce979812bea8ad1;hp=846c08820b18e5841001f90f182f35d8448d1cc8;hpb=b5d6d5e2a8ba30c4b3b5333fa6a5ddcae22e065c;p=openldap diff --git a/configure.in b/configure.in index 846c08820b..0b5967cc63 100644 --- a/configure.in +++ b/configure.in @@ -18,186 +18,174 @@ AC_CONFIG_AUX_DIR(build) AC_CONFIG_HEADER(include/portable.h)dnl dnl dnl Start Args -AC_MSG_CHECKING(arguments) +AC_MSG_CHECKING(configure arguments) AC_PREFIX_DEFAULT(/usr/local) dnl General "enable" options -CF_ARG_OPTION(debug,[ --enable-debug enable debugging (yes)],[ - LDAP_DEBUG=no],[LDAP_DEBUG=yes],yes)dnl -CF_ARG_OPTION(syslog,[ --enable-syslog enable syslog support (no)],[ - LDAP_CLDAP=yes],[LDAP_CLDAP=no],no)dnl -CF_ARG_OPTION(libui,[ --enable-libui enable library user interface (yes)],[ - LDAP_LIBUI=no],[LDAP_LIBUI=yes],yes)dnl -CF_ARG_OPTION(cache,[ --enable-cache enable caching (yes)],[ - LDAP_CACHE=no],[LDAP_CACHE=yes],yes)dnl -CF_ARG_OPTION(dns,[ --enable-dns enable dns support (no)],[ - LDAP_DNS=yes],[LDAP_DNS=no],no)dnl -CF_ARG_OPTION(referrals,[ --enable-referrals enable referrals (yes)],[ - LDAP_REFERRALS=no],[LDAP_REFERRALS=yes],yes)dnl - -CF_ARG_OPTION(cldap,[ --enable-clapd enable connectionless ldap (no)],[ - LDAP_CLDAP=yes],[LDAP_CLDAP=no],no)dnl +OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)dnl +dnl OL_ARG_ENABLE(syslog,[ --enable-syslog enable syslog support], auto)dnl +OL_ARG_ENABLE(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(cldap,[ --enable-cldap enable connectionless ldap], no)dnl dnl General "with" options -AC_ARG_WITH(kerberos,[ --with-kerberos use Kerberos (no)],[ - opt_kerberos=yes],[opt_kerberos=no]) -AC_ARG_WITH(kerberos-afs,[ --with-kerberos-afs use AFS Kerberos (no)],[ - opt_kerberos_afs=yes],[opt_kerberos_afs=no]) -AC_ARG_WITH(threads,[ --with-threads use threads (yes)],[ - opt_threads=yes],[opt_threads=no]) +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], + auto, [auto yes no manual] ) dnl Server options dnl LDAPD OPTIONS -CF_ARG_OPTION(ldapd,[ --enable-ldapd enable building ldapd (no)],[ - BUILD_LDAPD=yes],[BUILD_LDAPD=no],no)dnl +OL_ARG_ENABLE(ldapd,[ --enable-ldapd enable building ldapd], no)dnl dnl SLAPD OPTIONS -CF_ARG_OPTION(slapd,[ --enable-slapd enable building slapd (yes)],[ - BUILD_SLAPD=no],[BUILD_SLAPD=yes],yes)dnl -CF_ARG_OPTION(aclgroup,[ --enable-aclgroup enable ACL group support (yes)],[ - SLAPD_ACLGROUP=no],[SLAPD_ALCGROUP=yes],yes)dnl -CF_ARG_OPTION(crypt,[ --enable-crypt enable crypt(3) passwords (yes)],[ - SLAPD_CRYPT=no],[SLAPD_CRYPT=yes],yes)dnl -CF_ARG_OPTION(md5,[ --enable-md5 enable MD5 passwords (yes)],[ - SLAPD_MD5=no],[SLAPD_MD5=yes],yes)dnl -CF_ARG_OPTION(sha1,[ --enable-sha1 enable SHA1 passwords (yes)],[ - SLAPD_SHA1=no],[SLAPD_SHA1=yes],yes)dnl -CF_ARG_OPTION(wrappers,[ --enable-wrappers enable tcp wrapper support (no)],[ - SLAPD_TCP_WRAPPERS=yes],[SLAPD_TCP_WRAPPERS=no],no)dnl -CF_ARG_OPTION(phonetic,[ --enable-phonetic enable phonetic/soundex (no)],[ - SLAPD_PHONETIC=yes],[SLAPD_PHONETIC=no],no)dnl -CF_ARG_OPTION(rlookups,[ --enable-rlookups enable reverse lookups (yes)],[ - SLAPD_RLOOKUP=no],[SLAPD_RLOOKUP=yes],yes)dnl +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(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 dnl SLAPD Backend options -CF_ARG_OPTION(ldbm,[ --enable-ldbm enable ldbm backend (yes)],[ - SLAPD_LDBM=no],[SLAPD_LDBM=yes],yes)dnl -CF_ARG_OPTION(passwd,[ --enable-passwd enable passwd backend (yes)],[ - SLAPD_PASSWD=no],[SLAPD_PASSWD=yes],yes)dnl -CF_ARG_OPTION(shell,[ --enable-shell enable shell backend (yes)],[ - SLAPD_SHELL=no],[SLAPD_SHELL=yes],yes)dnl - -AC_ARG_WITH(ndbm,[ --with-ndbm use NDB for LDBM backend (any)],[ - opt_ndbm=yes],[opt_ndbm=no]) -AC_ARG_WITH(gdbm,[ --with-gdbm use GDBM for LDBM backend (any)],[ - opt_gdbm=yes],[opt_gdbm=no]) -AC_ARG_WITH(dbhash,[ --with-dbhash use Berkeley DB Hash for LDBM backend (any)],[ - opt_dbhash=yes],[opt_dbhash=no]) -AC_ARG_WITH(dbbtree,[ --with-dbbtree use Berkeley DB Btrees for LDBM backend (any)],[ - opt_dbbtree=yes],[opt_dbbtree=no]) -AC_ARG_WITH(db2,[ --with-db2 use Berkeley DB2 API (any)],[ - opt_db2=yes],[opt_db2=no]) +OL_ARG_ENABLE(ldbm,[ --enable-ldbm enable ldbm backend], yes)dnl +OL_ARG_WITH(ldbm_api,[ --with-ldbm-api use LDBM API], auto, + [auto db2 db gdbm ndbm manual]) +OL_ARG_WITH(ldbm_type,[ --with-ldbm-type use LDBM type], auto, + [auto btree hash]) + +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 -CF_ARG_OPTION(slurpd,[ --enable-slurpd enable building slurpd (yes)],[ - BUILD_SLURPD=no],[BUILD_SLURPD=yes],yes)dnl +OL_ARG_ENABLE(slurpd,[ --enable-slurpd enable building slurpd], auto)dnl -AC_MSG_RESULT(done) +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]); + fi + if test $ol_enable_passwd = yes ; then + 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]); + 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 + if test $ol_enable_phonetic = yes ; then + 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]); + fi + if test $ol_with_ldbm_api != auto ; then + 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]); + fi + if test $ol_enable_slurpd = yes ; then + AC_MSG_ERROR([slurpd requires slapd]); + fi -AC_MSG_CHECKING(LDBM preferences) -ldbm_prefer=any + # 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_wrappers=no + ol_enable_phonetic=no + ol_enable_rlookups=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]); + fi -if test "$opt_ndbm" = yes ; then - ldbm_prefer=ndbm -fi -if test "$opt_gdbm" = yes ; then - ldbm_prefer=gdbm -fi -if test "$opt_dbhash" = yes ; then - ldbm_prefer=dbhash -fi -if test "$opt_dbbtree" = yes ; then - ldbm_prefer=dbbtree + if test $ol_with_ldbm_type != auto ; then + 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]); + fi + + ol_with_ldbm_api=no + ol_with_ldbm_type=no + +else + dnl SLAPD with LDBM + + if test $ol_with_ldbm_api = gdbm -a \ + $ol_with_ldbm_type = btree ; then + 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]); + fi fi -AC_MSG_RESULT($ldbm_prefer) -if test "$BUILD_SLAPD" != "yes" ; then - BUILD_SLURPD="no" - SLAPD_LDBM="no" - SLAPD_PASSWD="no" - SLAPD_SHELL="no" - ldbm_prefer="none" +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]); + fi fi -## general LDAP arguments -LDAP_DEFS= +AC_MSG_RESULT(done) + +## Initialize vars LDAP_LIBS= -LDBM_DEFS= LDBM_LIBS= -LUTIL_DEFS= +LTHREAD_LIBS= LUTIL_LIBS= -if test "$LDAP_DEBUG" = "yes" ; then - LDAP_DEFS="$LDAP_DEFS -DLDAP_DEBUG" -fi -if test "$LDAP_SYSLOG" = "yes" ; then - LDAP_DEFS="$LDAP_DEFS -DLDAP_SYSLOG" -fi -if test "$LDAP_DNS" = "yes" ; then -dnl AC_DEFINE(LDAP_DNS,1) - LDAP_DEFS="$LDAP_DEFS -DLDAP_DNS" -fi -if test "$LDAP_REFERRALS" = "yes" ; then -dnl AC_DEFINE(LDAP_REFERRALS,1) - LDAP_DEFS="$LDAP_DEFS -DLDAP_REFERRALS" -fi -if test "$LDAP_CACHE" = "no" ; then - AC_DEFINE(LDAP_NOCACHE,1) - LDAP_DEFS="$LDAP_DEFS -DNO_CACHE" -fi -if test "$LDAP_CLDAP" = "yes" ; then - AC_DEFINE(LDAP_CONNECTIONLESS,1) - LDAP_DEFS="$LDAP_DEFS -DCLDAP" -fi - -## ldapd arguments -LDAPD_DEFS= LDAPD_LIBS= - -## slapd arguments -SLAPD_DEFS= SLAPD_LIBS= -if test "$SLAPD_PHONETIC" = "yes" ; then - AC_DEFINE(SLAPD_PHONETIC,1) - SLAPD_DEFS="$SLAPD_DEFS -DSOUNDEX" -fi - -if test "$SLAPD_MD5" = "yes" ; then -dnl AC_DEFINE(SLAPD_MD5,1) - LUTIL_DEFS="$LUTIL_DEFS -DLDAP_MD5" -fi +SLURPD_LIBS= -if test "$SLAPD_SHA1" = "yes" ; then -dnl AC_DEFINE(SLAPD_SHA1,1) - LUTIL_DEFS="$LUTIL_DEFS -DLDAP_SHA1" -fi +BUILD_LDAPD=no +BUILD_SLAPD=no +BUILD_SLURPD=no BUILD_LDBM=no -if test "$SLAPD_LDBM" = "yes" ; then -dnl AC_DEFINE(SLAPD_LDBM,1) - BUILD_LDBM=yes - LDBM_DEFS="$LDBM_DEFS -DLDAP_LDBM" -fi -if test "$SLAPD_PASSWD" = "yes" ; then -dnl AC_DEFINE(SLAPD_PASSWD,1) - SLAPD_DEFS="$SLAPD_DEFS -DLDAP_PASSWD" -fi -if test "$SLAPD_SHELL" = "yes" ; then -dnl AC_DEFINE(SLAPD_SHELL,1) - SLAPD_DEFS="$SLAPD_DEFS -DLDAP_SHELL" -fi - -dnl slurpd arguments -SLURPD_DEFS= -SLURPD_LIBS= +BUILD_PASSWD=no +BUILD_SHELL=no -dnl End Args +KRB_LIBS= +TERMCAP_LIBS= dnl ---------------------------------------------------------------- dnl Checks for programs -AC_PROG_CC -AC_PROG_GCC_TRADITIONAL AC_PROG_LN_S AC_PROG_INSTALL @@ -209,269 +197,509 @@ AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail, AC_PATH_PROG(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb) AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb) +dnl Checks the compiler and UNIX Variants +AC_PROG_CC +AC_PROG_GCC_TRADITIONAL + +AC_AIX +AC_ISC_POSIX +AC_MINIX + dnl ---------------------------------------------------------------- dnl Checks for libraries -LTHREAD_LIBS= -if test "$opt_thread" = "no" ; then - LTHREAD_DEFS="-DNO_THREADS" - BUILD_SLURPD=no -else +dnl Find socket() +dnl Likely combinations: +dnl -lsocket [ -lnsl_s | -lnsl ] +dnl -linet + +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(nsl_s, main) + AC_CHECK_LIB(nsl, main) + AC_CHECK_LIB(inet, socket) + AC_CHECK_LIB(gen, main) +]) + +dnl HP-UX requires -lV3 +AC_CHECK_LIB(V3, sigset) + +if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 ; then + AC_CHECK_HEADERS(kerberosIV/krb.h kerberosIV/des.h) + + if test $ac_cv_header_kerberosIV_krb_h = yes ; then + AC_CHECK_LIB(krb4, main, [have_k5=yes], [have_k5=no], + [-lkrb5 -ldes425]) + + if test $have_k5 = yes ; then + ol_with_kerberos=found + 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) + + if test $ac_cv_header_krb_h = yes ; then + AC_CHECK_LIB(krb, main, [have_k4=yes], [have_k4=no], [-ldes]) + + if test $have_k4 = yes ; then + ol_with_kerberos=found + ol_link_kerberos=yes + + AC_DEFINE(HAVE_KERBEROS) + + KRB_LIBS="-lkrb -ldes" + fi + fi +fi + + +ol_link_threads=no +if test $ol_with_threads = auto -o $ol_with_threads = posix ; then AC_CHECK_HEADERS(pthread.h sched.h) - if test "$ac_cv_header_pthread_h" = yes ; then - dnl We have some form of pthreads - AC_CACHE_CHECK([POSIX thread version],cf_cv_pthread_version,[ - AC_EGREP_CPP(final,[ -#include -/* this check could be improved */ -#ifdef PTHREAD_ONCE_INIT - final -#endif - ], pthread_final=yes, pthread_final=no) + if test $ac_cv_header_pthread_h = yes ; then + OL_POSIX_THREAD_VERSION - AC_EGREP_CPP(draft4,[ -#include -/* this check could be improved */ -#ifdef pthread_once_init - draft4 -#endif - ], pthread_draft4=yes, pthread_draft4=no) - - if test $pthread_final = yes -a $pthread_draft4 = no; then - cf_cv_pthread_version=final - elif test $pthread_final = no -a $pthread_draft4 = yes; then - cf_cv_pthread_version=draft4 - else - cf_cv_pthread_version=unknown - fi - ]) - - if test $cf_cv_pthread_version = final ; then - LTHREAD_DEFS="$LTHREAD_DEFS -DPOSIX_THREADS" - elif test $cf_cv_pthread_version = draft4 ; then - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_MIT_PTHREADS" + if test $ol_cv_pthread_version = final ; then + dnl AC_DEFINE(HAVE_PTHREADS_FINAL) + elif test $ol_cv_pthread_version = draft4 ; then + AC_DEFINE(HAVE_PTHREADS_D4) else - AC_MSG_ERROR(unknown pthread version) + AC_MSG_ERROR([unknown pthread version]) fi - AC_CACHE_CHECK([for LinuxThreads], cf_cv_linux_threads, [ - res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l` - if test "$res" -gt 0 ; then - cf_cv_linux_threads=yes - else - cf_cv_linux_threads=no - fi - ]) + # consider threads found + ol_with_threads=found - if test $cf_cv_linux_threads = yes ; then -dnl AC_DEFINE(HAVE_LINUX_THREADS,1) - LTHREAD_DEFS="$LTHREAD_DEFS -DHAVE_LINUX_THREADS" + OL_LINUX_THREADS + + if test $ol_cv_linux_threads = yes ; then + 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 - AC_CHECK_FUNC(pthread_create,pthread_link=yes,pthread_link=no) + AC_CHECK_FUNC(pthread_create,[ol_link_threads=yes]) - if test $pthread_link = no ; then + if test $ol_link_threads = no ; then dnl try -pthread AC_CACHE_CHECK([for pthread_create with -pthread], - cf_cv_pthread_flag, [ + [ol_cv_pthread_flag], [ dnl save the CPPFLAGS save_LIBS="$LIBS" LIBS="-pthread $LIBS" AC_TRY_LINK([#include ],[ pthread_create((pthread_t*) 0, (pthread_attr_t*) 0, 0, 0); - ], cf_cv_pthread_flag=yes, cf_cv_pthread_flag=no) + ], ol_cv_pthread_flag=yes, ol_cv_pthread_flag=no) dnl restore the LIBS LIBS="$save_LIBS" ]) - if test $cf_cv_pthread_flag = yes ; then + if test $ol_cv_pthread_flag = yes ; then LTHREAD_LIBS="$LTHREAD_LIBS -pthread" - pthread_link=yes + ol_link_threads=posix fi fi - if test $pthread_link = no ; then + if test $ol_link_threads = no ; then dnl try -lpthread save_LIBS="$LIBS" AC_CHECK_LIB(pthread, pthread_create, [ - pthread_link=yes + ol_link_threads=posix LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"]) LIBS="$save_LIBS" fi - if test $pthread_link = no ; then + if test $ol_link_threads = no ; then dnl try -lc_r save_LIBS="$LIBS" AC_CHECK_LIB(c_r, pthread_create, [ - pthread_link=yes + ol_link_threads=posix LTHREAD_LIBS="$LTHREAD_LIBS -lc_r"]) LIBS="$save_LIBS" fi - if test $pthread_link = no ; then + if test $ol_link_threads = no ; then dnl try DEC Threads save_LIBS="$LIBS" AC_CHECK_LIB(pthread, pthread_create, [ - pthread_link=yes - LTHREAD_DEFS="$LTHREAD_DEFS -DDEC_THREADS" + AC_DEFINE(HAVE_DCE) + ol_link_threads=posix LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc -lc"],, + if test $with_preemptive = auto ; then + ol_with_preemptive=yes + fi [-lmach -lexc -lc]) LIBS="$save_LIBS" fi - else - LTHREAD_DEFS="-DNO_THREADS" - fi -fi + if test $ol_link_threads != no ; then + AC_DEFINE(HAVE_PTHREADS) -# check for strtok_r (and presumely other reentrant functions) -save_LIBS="$LIBS" -LIBS="$save_LIBS $LTHREAD_LIBS" -AC_CHECK_LIB(pthread,strtok_r) + dnl save DEFS/LIBS + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + LIBS="$LTHREAD_LIBS $LIBS" -if test $ac_cv_lib_pthread_strtok_r = no ; then - LIBS="$save_LIBS $LTHREAD_LIBS" - AC_CHECK_LIB(c_r,strtok_r) - AC_CHECK_FUNCS(strtok_r sched_yield) - if test $ac_cv_lib_c_r_strtok_r = yes ; then - LTHREAD_LIBS="$LTHREAD_LIBS -lc_r" - fi -else - AC_CHECK_FUNCS(strtok_r sched_yield) -fi - -LIBS="$save_LIBS" - - -ldbm_use="none" -if test "$SLAPD_LDBM" = "yes" ; then - if test $ldbm_prefer = any -o $ldbm_prefer = dbbtree \ - -o $ldbm_prefer = dbhash ; then - AC_CHECK_FUNC(dbopen,[ - ldbm_use=$ldbm_prefer - ldbm_prefer=found],[ - AC_CHECK_LIB(db,dbopen,[ - ldbm_use=$ldbm_prefer - ldbm_prefer=found - LDBM_LIBS="$LDBM_LIBS -ldb" - ]) - ]) - - if test $ldbm_prefer = found ; then - if test $ldbm_use = dbhash ; then -dnl AC_DEFINE(LDBM_USE_DBHASH,1) - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBHASH" - else -dnl AC_DEFINE(LDBM_USE_DBBTREE,1) - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBBTREE" + dnl All POSIX Thread (final) implementations should have + dnl sched_yield instead of pthread yield. + dnl check for both + AC_CHECK_FUNCS(sched_yield pthread_yield) + + 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 - fi - AC_CACHE_CHECK(for db2, cf_cv_db2,[ - AC_EGREP_CPP(__db_version_2,[ -#include -/* this check could be improved */ -#ifdef DB_VERSION_MAJOR -#if DB_VERSION_MAJOR == 2 - __db_version_2 + 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 ) + + dnl Check PREEMPTIVE Implementation + if test $ol_with_preemptive = auto ; then + AC_MSG_CHECKING([for preemptive Pthread implementation]) + AC_TRY_RUN([ +#include +#include +#include +#include +#ifndef NULL +#define NULL 0 +#endif + +int task(arg) + int *arg; +{ + struct timeval tv; + + tv.tv_sec=4; + tv.tv_usec=0; + select(0, NULL, NULL, NULL, &tv); + + tv.tv_sec=6; + tv.tv_usec=0; + select(0, NULL, NULL, NULL, &tv); + + exit(1); /* if we exit here, the select blocked the whole process */ +} + +main(argc, argv) +int argc; char **argv; +{ + pthread_t t; + pthread_create(&t, NULL, (void *) task, NULL); + +#if HAVE_SCHED_YIELD + sched_yield(); /* make sure task runs first */ +#else +#if defined(HAVE_PTHREAD_YIELD) + pthread_yield(); /* make sure task runs first */ #endif #endif - ], cf_cv_db2=yes, cf_cv_db2=no)]) - - if test $cf_cv_db2 = yes ; then - if test $opt_db2 = yes ; then - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DB2" - else - AC_CHECK_HEADERS(db_185.h) - if test $ac_cv_header_db_185_h = no ; then - AC_MSG_ERROR([select --with-db2 or install db2 with 1.85 compatibility]) + 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 fi - - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DB2_COMPAT185" fi + + dnl restore DEFS/LIBS + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" else - if test $opt_db2 = yes ; then - AC_MSG_ERROR(could not local DB2) + AC_MSG_ERROR([could not link with POSIX Threads]) + fi + fi + + if test $ol_with_threads = posix ; then + AC_MSG_ERROR([could not locate POSIX Threads]) + fi +fi + +if test $ol_with_threads = auto -o $ol_with_threads = cthreads ; 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 $have_cthreads = yes ; then + AC_DEFINE(HAVE_MACH_CTHREADS) + LTHREAD_LIBS="$LTHREAD_LIBS -llwp" + fi + fi +fi + +if test $ol_with_threads = auto -o $ol_with_threads = lwp ; then + dnl check for SunOS5 LWP + AC_CHECK_HEADERS(thread.h synch.h) + if test $ac_cv_header_lwp_lwp_h = yes ; then + AC_CHECK_LIB(thread, thr_create, [have_lwp=yes], [have_lwp=no]) + + if test $have_lwp = yes ; then + AC_DEFINE(HAVE_LWP) + AC_DEFINE(HAVE_LWP_THR) + LTHREAD_LIBS="$LTHREAD_LIBS -llwp" + fi + fi + + dnl check for SunOS4 LWP + AC_CHECK_HEADERS(lwp/lwp.h) + if test $ac_cv_header_thread_h = yes -a $ac_cv_header_synch_h = yes ; then + AC_CHECK_LIB(lwp, lwp_create, [have_lwp=yes], [have_lwp=no]) + + if test $have_lwp = yes ; then + AC_DEFINE(HAVE_LWP) + LTHREAD_LIBS="$LTHREAD_LIBS -llwp" + + if test $with_preemptive = auto ; then + with_preemptive=yes fi fi fi +fi + +if test $ol_with_preemptive = yes ; then + AC_DEFINE(THREAD_PREEMPTIVE,1) +fi + +if test $ol_with_threads = manual ; then + dnl User thinks he can manually configure threads. + $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 + if test $ol_with_threads = yes ; then + AC_MSG_ERROR([no suitable thread support]) + fi + + if test $ol_with_threads = auto ; then + AC_MSG_WARN([no suitable thread support, disabling threads]) + $ol_with_threads = no + fi + + AC_DEFINE(NO_THREADS,1) + LTHREAD_LIBS="" +fi + +ol_link_ldbm=no +if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db2 ; then + OL_BERKELEY_DB2 + + if test $ol_cv_berkeley_db2 = yes ; then + ol_link_ldbm=db2 + ol_with_ldbm_api=db2 + + if test $ol_with_ldbm_type = hash ; then + AC_DEFINE(LDBM_USE_DBHASH,1) + else + AC_DEFINE(LDBM_USE_DBBTREE,1) + fi + + dnl $ol_cv_lib_db2 should be yes or -ldb + dnl (it could be no, but that would be an error + if test $ol_cv_lib_db2 != yes ; then + LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_db2" + fi + fi +fi + +if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db ; then + OL_BERKELEY_DB + + if test $ol_cv_berkeley_db = yes ; then + ol_link_ldbm=db + ol_with_ldbm_api=db + + if test $ol_with_ldbm_type = hash ; then + AC_DEFINE(LDBM_USE_DBHASH,1) + else + AC_DEFINE(LDBM_USE_DBBTREE,1) + fi - if test $ldbm_prefer = any -o $ldbm_prefer = gdbm ; then - AC_CHECK_LIB(gdbm, gdbm_open,[ - ldbm_use=$ldbm_prefer - ldbm_prefer=found - LDBM_LIBS="$LDBM_LIBS -lgdbm" -dnl AC_DEFINE(LDBM_USE_GDBM,1) - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_GDBM" - ]) + dnl $ol_cv_lib_db should be yes or -ldb + dnl (it could be no, but that would be an error + if test $ol_cv_lib_db != yes ; then + LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_db" + fi fi - if test $ldbm_prefer = any -o $ldbm_prefer = ndbm ; then - AC_CHECK_LIB(dbm,dbm_open,[ - ldbm_use=ndbm - ldbm_prefer=found - LDBM_LIBS="$LDBM_LIBS -ldbm" -dnl AC_DEFINE(LDBM_USE_NDBM,1) - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_NDBM" - ]) +fi + +if test $ol_with_ldbm_api = manual ; then + dnl User thinks he can manually configure LDBM api. + $ol_link_ldbm=yes + + AC_MSG_WARN([LDBM defines and link options must be set manually]) + + AC_CHECK_HEADERS(db.h db_185.h gdbm.h ndbm.h) +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 +fi + +if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then + OL_GDBM + + if test $ol_cv_gdbm = yes ; then + ol_link_ldbm=gdbm + ol_with_ldbm_api=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 + OL_NDBM - if test $ldbm_prefer != found ; then - AC_MSG_ERROR(could not find suitable db for $ldbm_prefer backend) + 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 fi +fi - if test $ldbm_use = ndbm ; then - AC_MSG_WARN(LDBM using NDBM, functionality will be limited) +if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then + AC_MSG_WARN(could not find suitable LDBM backend) + if test $ol_enable_ldbm = yes ; then + AC_MSG_ERROR(select appropriate LDBM options or disable) fi + + AC_MSG_WARN(disabling LDBM) + $ol_enable_ldbm=no fi -if test "$SLAPD_TCP_WRAPPERS" = "yes" ; then - AC_CHECK_LIB(wrap, hosts_access, [ -dnl LIBTCPD="-lwrap" -dnl AC_DEFINE(HAVE_TCPD) - SLAPD_DEFS="$SLAPD_DEFS -DTCP_WRAPPERS" +if test $ol_enable_wrappers = yes ; then + AC_CHECK_LIB(wrap, hosts_access, + [have_wrappers=yes], [have_wrappers=no]) + + if test $have_wrappers = yes ; then + AC_DEFINE(HAVE_TCPD) SLAPD_LIBS="$SLAPD_LIBS -lwrap" - ]) + else + AC_MSG_WARN(could not find -lwrap) + if test $ol_enable_wrappers = yes ; then + AC_MSG_ERROR(could not find wrappers, select appropriate options or disable) + fi + + AC_MSG_WARN(disabling wrappers support) + ol_enable_wrappers=no + fi + fi # ud needs termcap (should insert check here) -LIBTERMCAP="-ltermcap" -AC_SUBST(LIBTERMCAP) +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 +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 + AC_DEFINE(NO_TERMCAP,1) + TERMCAP_LIBS= +fi # FreeBSD (and others) have crypt(3) in -lcrypt -if test "$SLAPD_CRYPT" = "yes" ; then - AC_CHECK_FUNC(crypt, have_crypt=yes, [ +if test $ol_enable_crypt != no ; then + AC_CHECK_FUNC(crypt, [have_crypt=yes], [ AC_CHECK_LIB(crypt, crypt, [LUTIL_LIBS="$LUTIL_LIBS -lcrypt" 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) else - AC_MSG_WARN(could not find crypt, disabling crypt support) + AC_MSG_WARN(could not find crypt) + if test $ol_enable_crypt = yes ; then + AC_MSG_ERROR(could not find crypt, select appropriate options or disable) + fi + + AC_MSG_WARN(disabling crypt support) + ol_enable_crypt=no fi fi dnl ---------------------------------------------------------------- dnl Checks for header files. -AC_HEADER_DIRENT AC_HEADER_STDC +AC_HEADER_DIRENT AC_HEADER_SYS_WAIT AC_CHECK_HEADERS( \ stddef.h \ + errno.h \ fcntl.h \ + filio.h \ + getopt.h \ limits.h \ malloc.h \ + regex.h \ sgtty.h \ sys/file.h \ + sys/errno.h \ sys/ioctl.h \ + sys/param.h \ + sys/socket.h\ sys/time.h \ + sys/types.h \ syslog.h \ - termio.h \ + termios.h \ unistd.h \ ) @@ -488,41 +716,127 @@ AC_STRUCT_ST_BLKSIZE AC_HEADER_TIME AC_STRUCT_TM -dnl AC_C_BIGENDIAN +AC_C_BIGENDIAN AC_C_CONST +dnl AC_CHECK_SIZEOF(short) +dnl AC_CHECK_SIZEOF(int) +dnl AC_CHECK_SIZEOF(long) + dnl ---------------------------------------------------------------- dnl Checks for library functions. AC_FUNC_MEMCMP -AC_TYPE_SIGNAL AC_FUNC_STRFTIME AC_FUNC_VPRINTF AC_FUNC_WAIT3 AC_CHECK_FUNCS( \ + bcopy \ + getopt \ + flock \ gethostname \ gettimeofday \ + getdtablesize \ + lockf \ + memcpy \ + memmove \ mktime \ select \ + setpwfile \ + setsid \ + signal \ + sigset \ socket \ - strdup \ strerror \ strstr \ strrchr \ + strsep \ strtod \ strtol \ strtoul \ - strsep \ - memcpy \ + sysconf \ ) -AC_REPLACE_FUNCS(strdup) +AC_REPLACE_FUNCS(getopt strdup) dnl ---------------------------------------------------------------- # Check Configuration -CF_SYS_ERRLIST +OL_SYS_ERRLIST dnl ---------------------------------------------------------------- +dnl Sort out defines + +if test $ol_enable_debug != no ; then + AC_DEFINE(LDAP_DEBUG,1) +fi +dnl if test $ol_enable_syslog != no ; then +dnl AC_DEFINE(LDAP_SYSLOG,1) +dnl fi +if test $ol_enable_libui = yes ; then + AC_DEFINE(LDAP_LIBUI,1) +fi +if test $ol_enable_cache = no ; then + AC_DEFINE(LDAP_NOCACHE,1) +fi +if test $ol_enable_dns != no ; then + AC_DEFINE(LDAP_DNS,1) +fi +if test $ol_enable_referrals != no ; then + AC_DEFINE(LDAP_REFERRALS,1) +fi +if test $ol_enable_cldap != no ; then + AC_DEFINE(LDAP_CONNECTIONLESS,1) +fi + +if test $ol_enable_aclgroup != no ; then + AC_DEFINE(SLAPD_ACLGROUP,1) +fi + +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) +fi + +if test $ol_enable_phonetic != no ; then + AC_DEFINE(SLAPD_PHONETIC,1) +fi + +if test $ol_enable_rlookups != no ; then + AC_DEFINE(SLAPD_RLOOKUPS,1) +fi + +if test $ol_link_ldbm != no ; then + AC_DEFINE(SLAPD_LDBM,1) + BUILD_SLAPD=yes + BUILD_LDBM=yes +fi + +if test $ol_enable_passwd != no ; then + AC_DEFINE(SLAPD_PASSWD,1) + BUILD_SLAPD=yes + BUILD_PASSWD=yes +fi + +if test $ol_enable_shell != no ; then + AC_DEFINE(SLAPD_SHELL,1) + BUILD_SLAPD=yes + BUILD_SHELL=yes +fi + +if test $ol_enable_slurpd != no -a $ol_link_threads != no -a \ + $BUILD_SLAPD = yes ; then + BUILD_SLURPD=yes +fi + +dnl ---------------------------------------------------------------- + AC_SUBST(BUILD_LDAPD) AC_SUBST(BUILD_SLAPD) AC_SUBST(BUILD_LDBM) @@ -531,24 +845,17 @@ 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(SLAPD_LDBM) - AC_SUBST(SLAPD_PASSWD) - AC_SUBST(SLAPD_SHELL) -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_LIBS) +AC_SUBST(TERMCAP_LIBS) + dnl ---------------------------------------------------------------- dnl final output dnl