X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=34473f51525997153b605d05ef390d06a5c6e8d1;hb=5f6f7d06a6a3d3c4f8f842fae35361efb1bb3cf6;hp=6f82f387969c65b66e3ee56fc2f82cae9f539374;hpb=1ee09a4d09d412c0514a44ec115e0022242d2a04;p=openldap diff --git a/configure.in b/configure.in index 6f82f38796..34473f5152 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id$ +dnl $OpenLDAP$ dnl dnl Copyright 1998,1999 The OpenLDAP Foundation. All Rights Reserved. dnl @@ -7,11 +7,29 @@ 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 ---------------------------------------------------------------- +dnl Redefine AC_INIT_BINSH to provide RCS IDs and copyright notice +dnl at top of generated configure script. Prints simple copyright. +define([AC_INIT_BINSH], +[[#! /bin/sh +# $]OpenLDAP[$ +# from] translit([$OpenLDAP$], $")] [ + +# Copyright 1998,1999 The OpenLDAP Foundation. All Rights Reserved. +# +# Redistribution and use in source and binary forms are permitted only +# as authorized by the OpenLDAP Public License. A copy of this +# license is available at http://www.OpenLDAP.org/license.html or +# in file LICENSE in the top-level directory of the distribution. + +echo "Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved." +echo "Copying restrictions apply, see COPYRIGHT file." +])dnl +dnl ---------------------------------------------------------------- dnl Disable config.cache! define([AC_CACHE_LOAD], )dnl define([AC_CACHE_SAVE], )dnl - +dnl ================================================================ dnl Configure.in for OpenLDAP AC_INIT(build/version)dnl AC_CONFIG_AUX_DIR(build)dnl @@ -21,7 +39,8 @@ if test -z "$OL_VERSION"; then AC_MSG_ERROR([could not determine version]) fi -dnl ---------------------------------------------------------------- +echo "Configuring OpenLDAP $OL_VERSION ..." + dnl Determine host platform dnl we try not to use this for much AC_CANONICAL_SYSTEM @@ -39,7 +58,7 @@ AC_PREREQ(2.13)dnl Required Autoconf version AC_CONFIG_HEADER(include/portable.h include/ldap_features.h include/lber_types.h)dnl -dnl ---------------------------------------------------------------- +dnl ================================================================ dnl Start Args AC_MSG_CHECKING(configure arguments) AC_PREFIX_DEFAULT(/usr/local) @@ -47,6 +66,8 @@ AC_PREFIX_DEFAULT(/usr/local) top_builddir=`pwd` AC_SUBST(top_builddir)dnl +dnl ---------------------------------------------------------------- +dnl --with-subdir ldap_subdir="/openldap" AC_ARG_WITH(subdir, @@ -67,8 +88,9 @@ esac AC_SUBST(ldap_subdir)dnl +dnl ---------------------------------------------------------------- +dnl General "enable" options OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)dnl -dnl ol_enable_syslog=no OL_ARG_ENABLE(syslog,[ --enable-syslog enable syslog support], auto)dnl OL_ARG_ENABLE(proctitle,[ --enable-proctitle enable proctitle support], yes)dnl OL_ARG_ENABLE(cache,[ --enable-cache enable caching], yes)dnl @@ -78,6 +100,7 @@ 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 ---------------------------------------------------------------- dnl General "with" options OL_ARG_ENABLE(dmalloc,[ --enable-dmalloc enable debug malloc support], no)dnl @@ -86,22 +109,24 @@ OL_ARG_WITH(cyrus_sasl,[ --with-cyrus-sasl with Cyrus SASL support], OL_ARG_WITH(fetch,[ --with-fetch with fetch URL support], auto, [auto yes no] ) OL_ARG_WITH(kerberos,[ --with-kerberos with Kerberos support], - auto, [auto k5 k4 afs yes no]) + auto, [auto k5 kth k4 afs yes no]) OL_ARG_WITH(readline,[ --with-readline with readline support], auto, [auto yes no] ) OL_ARG_WITH(threads,[ --with-threads use threads], - auto, [auto posix mach pth lwp yes no manual] ) + auto, [auto nt posix mach pth lwp yes no manual] ) OL_ARG_WITH(tls,[ --with-tls with TLS/SSL support], auto, [auto ssleay openssl yes no] ) OL_ARG_WITH(yielding_select,[ --with-yielding-select with implicitly yielding select], auto, [auto yes no manual] ) +dnl ---------------------------------------------------------------- dnl Server options - +dnl ---------------------------------------------------------------- dnl LDAPD OPTIONS AC_ARG_WITH(xxldapdoptions,[LDAPD (X.500-to-LDAP Gateway) Options:]) OL_ARG_ENABLE(ldapd,[ --enable-ldapd enable building ldapd], no)dnl +dnl ---------------------------------------------------------------- dnl SLAPD OPTIONS AC_ARG_WITH(xxslapdoptions,[SLAPD (Standalone LDAP Daemon) Options:]) OL_ARG_ENABLE(slapd,[ --enable-slapd enable building slapd], yes)dnl @@ -115,6 +140,7 @@ OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups], auto)dnl OL_ARG_ENABLE(aci,[ --enable-aci enable per-object ACIs], no)dnl OL_ARG_ENABLE(discreteaci,[ --enable-discreteaci enable discrete rights in ACIs], no)dnl OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl +OL_ARG_ENABLE(dynamic,[ --enable-dynamic enable linking built binaries with dynamic libs], no)dnl dnl SLAPD Backend options OL_ARG_ENABLE(bdb2,[ --enable-bdb2 enable bdb2 backend], no)dnl @@ -144,15 +170,19 @@ OL_ARG_ENABLE(tcl,[ --enable-tcl enable tcl backend], no)dnl OL_ARG_WITH(tcl_module,[ --with-tcl-module module type], static, [static dynamic]) +dnl ---------------------------------------------------------------- dnl SLURPD OPTIONS -AC_ARG_WITH(xxslurpdoptions,[SLURPD Options:]) +AC_ARG_WITH(xxslurpdoptions,[SLURPD (Replication Daemon) Options:]) OL_ARG_ENABLE(slurpd,[ --enable-slurpd enable building slurpd], auto)dnl +dnl ---------------------------------------------------------------- AC_ARG_WITH(xxliboptions,[Library Generation & Linking Options]) AC_ENABLE_STATIC dnl AC_DISABLE_SHARED AC_ENABLE_SHARED +dnl ---------------------------------------------------------------- + dnl General "enable" options # validate options if test $ol_enable_dns = yes ; then @@ -260,6 +290,7 @@ if test $ol_enable_slapd = no ; then ol_enable_aci=no ol_enable_discreteaci=no ol_enable_wrappers=no + ol_enable_dynamic=no ol_with_ldbm_api=no ol_with_ldbm_type=no @@ -350,7 +381,8 @@ fi AC_MSG_RESULT(done) -## Initialize vars +dnl ---------------------------------------------------------------- +dnl Initialize vars LDAP_LIBS= LDIF_LIBS= LDBM_LIBS= @@ -388,8 +420,10 @@ SLAPD_MODULES_CPPFLAGS= SLAPD_MODULES_LIST= SLAPD_PERL_LDFLAGS= -SLAPD_PERL_CPPFLAGS= +MOD_PERL_LDFLAGS= +PERL_CPPFLAGS= +MOD_TCL_LIB= KRB_LIBS= READLINE_LIBS= SASL_LIBS= @@ -397,14 +431,14 @@ TERMCAP_LIBS= TLS_LIBS= MODULES_LIBS= -dnl ---------------------------------------------------------------- +dnl ================================================================ dnl Checks for programs dnl AC_PROG_INSTALL AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion]) - +dnl ---------------------------------------------------------------- dnl dnl Determine which C translator to use dnl @@ -458,9 +492,9 @@ dnl The default CFLAGS is empty NOT whatever AC_PROG_CC sets. dnl (for now, let autoconf sort this out) dnl CFLAGS=${CFLAGS-""} +AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL -dnl AC_PROG_MAKE_SET AC_PROG_AWK OL_PROG_LN_H @@ -475,6 +509,8 @@ 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 ---------------------------------------------------------------- +dnl Perl ol_link_perl=no if test $ol_enable_perl != no ; then AC_PATH_PROG(PERLBIN, perl, /usr/bin/perl) @@ -485,9 +521,12 @@ if test $ol_enable_perl != no ; then fi else - SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`" - SLAPD_PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`" - + PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`" + if test x"$ol_with_perl_module" = "xstatic" ; then + SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`" + else + MOD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`" + fi dnl should check perl version ol_link_perl=yes fi @@ -495,6 +534,8 @@ fi AC_PROG_CPP +dnl ---------------------------------------------------------------- +dnl Cross compiling checks if test $cross_compiling = yes -a $ol_enable_x_compile = yes; then AC_MSG_WARN([cross compiling.... some functionality will be removed.]) @@ -507,11 +548,13 @@ elif test $cross_compiling = yes -a $ol_enable_x_compile = no; then AC_MSG_ERROR([ if cross compiling, add --enable-x-compile.]) fi +dnl ---------------------------------------------------------------- dnl Checks for UNIX Variants AC_AIX AC_ISC_POSIX AC_MINIX +dnl ---------------------------------------------------------------- dnl Checks for system services AC_CYGWIN AC_MINGW32 @@ -520,15 +563,18 @@ AC_OBJEXT AC_DEFINE_UNQUOTED( EXEEXT, "${EXEEXT}", [defined to be the EXE extension]) +dnl ---------------------------------------------------------------- dnl BeOS requires -lbe -lroot -lnet AC_CHECK_LIB(be, be_app, [LIBS="$LIBS -lbe -lroot -lnet"], :, [-lroot -lnet]) +dnl ---------------------------------------------------------------- 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 constructs.]) fi +dnl ---------------------------------------------------------------- dnl Check cc depend flags OL_MKDEPEND if test "${ol_cv_mkdep}" = no ; then @@ -536,19 +582,21 @@ if test "${ol_cv_mkdep}" = no ; then AC_MSG_WARN([do not know how to generate dependencies]) fi -dnl +dnl ---------------------------------------------------------------- dnl Check for module support -dnl ol_link_modules=no if test $ol_enable_modules != no ; then AC_CHECK_HEADERS(ltdl.h) if test $ac_cv_header_ltdl_h = no ; then AC_MSG_ERROR([could not locate libtool ltdl.h]) - fi - AC_CHECK_LIB(ltdl, lt_dlinit) + AC_CHECK_LIB(ltdl, lt_dlinit, [ + MODULES_LIBS=-lltdl + AC_DEFINE(HAVE_LIBLTDL,1,[define if you have libtool -ltdl]) + ]) + if test "$ac_cv_lib_ltdl_lt_dlinit" = no ; then AC_MSG_ERROR([could not locate libtool -lltdl]) fi @@ -583,12 +631,15 @@ AC_CHECK_HEADERS( \ arpa/inet.h \ arpa/nameser.h \ assert.h \ + conio.h \ crypt.h \ + direct.h \ errno.h \ fcntl.h \ filio.h \ getopt.h \ grp.h \ + io.h \ libutil.h \ limits.h \ locale.h \ @@ -597,6 +648,7 @@ AC_CHECK_HEADERS( \ memory.h \ psap.h \ pwd.h \ + process.h \ resolv.h \ sgtty.h \ shadow.h \ @@ -618,20 +670,42 @@ AC_CHECK_HEADERS( \ syslog.h \ termios.h \ unistd.h \ + winsock.h \ ) + dnl ---------------------------------------------------------------- dnl Checks for libraries +dnl HP-UX requires -lV3 +AC_CHECK_LIB(V3, sigset) + +dnl Gotta check for winsock manually +if test $ac_cv_header_winsock_h = yes; then + AC_CACHE_CHECK([for winsock], [ol_cv_winsock], + AC_TRY_LINK([#include ],[ + socket(0,0,0); + select(0,NULL,NULL,NULL,NULL); + closesocket(0); + gethostname(NULL,0); + ],[ol_cv_winsock=yes],[ol_cv_winsock=no])]) + + if test $ol_cv_winsock = yes ; then + AC_DEFINE(HAVE_WINSOCK,1,[define if you have winsock]) + ac_cv_func_socket=yes + ac_cv_func_select=yes + ac_cv_func_closesocket=yes + ac_cv_func_gethostname=yes + fi +fi + 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(net, socket) @@ -641,14 +715,22 @@ dnl AC_CHECK_LIB(gen, main) ]) +dnl require select AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.])) +dnl AC_CHECK_FUNCS(socketpair) -dnl Select arg types -dnl (if this detection becomes permenent, it and the select() detection -dnl should be done before the yielding select test) -AC_FUNC_SELECT_ARGTYPES +if test "${ac_cv_header_winsock_h}" != yes; then + dnl Select arg types + dnl (if this detection becomes permenent, it and the select() detection + dnl should be done before the yielding select test) + AC_FUNC_SELECT_ARGTYPES +fi +dnl check to see if system call automatically restart +dnl AC_SYS_RESTARTABLE_SYSCALLS +dnl ---------------------------------------------------------------- +dnl require POSIX regex AC_CHECK_HEADERS( regex.h ) if test "$ac_cv_header_regex_h" != yes ; then AC_MSG_ERROR([POSIX regex.h required.]) @@ -660,10 +742,7 @@ if test "$ol_cv_c_posix_regex" = no ; then AC_MSG_ERROR([broken POSIX regex!]) fi - -dnl HP-UX requires -lV3 -AC_CHECK_LIB(V3, sigset) - +dnl ---------------------------------------------------------------- dnl Check for resolver routines AC_CHECK_FUNC(res_search,:) if test $ac_cv_func_res_search = no ; then @@ -691,7 +770,8 @@ elif test $ol_enable_dns != no ; then fi -# ISODE tests +dnl ---------------------------------------------------------------- +dnl ISODE tests ol_link_isode=no if test $ol_enable_ldapd != no ; then AC_MSG_WARN([ldapd is not supported and may suffer from bit rot.]) @@ -723,6 +803,8 @@ if test $ol_link_isode != no; then AC_PATH_PROG(PEPSY, pepsy) fi +dnl ---------------------------------------------------------------- +dnl QUIPU if test $ol_enable_quipu != no ; then AC_CHECK_HEADERS(quipu/commonarg.h) @@ -735,9 +817,8 @@ if test $ol_enable_quipu != no ; then fi fi -dnl -dnl check for kerberos -dnl +dnl ---------------------------------------------------------------- +dnl Kerberos ol_link_kerberos=no if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 ; then @@ -745,13 +826,13 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 ; then if test $ac_cv_header_kerberosIV_krb_h = yes ; then AC_CHECK_LIB(krb4, main, [have_k5=yes], [have_k5=no], - [-lkrb5 -ldes425]) + [-lkrb5 -ldes425 -lcrypto -lcom_err]) if test $have_k5 = yes ; then ol_with_kerberos=found ol_link_kerberos=yes - KRB_LIBS="-lkrb4 -lkrb5 -ldes425" + KRB_LIBS="-lkrb4 -lkrb5 -ldes425 -lcrypto -lcom_err" LIBS="$KRB_LIBS $LIBS" @@ -781,8 +862,10 @@ des_debug = 1; fi fi -if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then - AC_CHECK_HEADERS(krb.h des.h) +if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 \ + -o $ol_with_kerberos = kth ; then + + AC_CHECK_HEADERS(krb.h des.h krb-archaeology.h ) if test $ac_cv_header_krb_h = yes ; then AC_CHECK_LIB(krb, main, [have_k4=yes], [have_k4=no], [-ldes]) @@ -792,17 +875,24 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then ol_link_kerberos=yes KRB_LIBS="-lkrb -ldes" + + if test $ac_cv_header_krb_archaeology_h = yes ; then + AC_DEFINE(HAVE_KTH_KERBEROS, 1, + [define if you have Kth Kerberos]) + fi fi fi fi if test $ol_link_kerberos = yes ; then AC_DEFINE(HAVE_KERBEROS, 1, [define if you have Kerberos]) + +elif test $ol_with_kerberos != auto -a $ol_with_kerberos != no ; then + AC_ERROR([Kerberos detection failed.]) fi -dnl -dnl Check for SSL/TLS -dnl +dnl ---------------------------------------------------------------- +dnl TLS/SSL ol_link_tls=no if test $ol_with_tls != no ; then @@ -852,6 +942,7 @@ if test $ol_link_tls = yes ; then AC_DEFINE(HAVE_TLS, 1, [define if you have TLS]) fi +dnl ---------------------------------------------------------------- dnl Tests for reentrant functions necessary to build a dnl thread_safe -lldap. AC_CHECK_FUNCS( \ @@ -892,7 +983,29 @@ if test "$ac_cv_func_ctime_r" = yes \ AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_REENTRANT,1) fi +dnl ---------------------------------------------------------------- +dnl Threads? ol_link_threads=no + +if test $ol_with_threads = auto -o $ol_with_threads = yes \ + -o $ol_with_threads = nt ; then + + OL_NT_THREADS + + if test "$ol_cv_nt_threads" = yes ; then + ol_link_threads=nt + ol_with_threads=found + ol_with_yielding_select=yes + + AC_DEFINE(HAVE_NT_SERVICE_MANAGER,1,[if you have NT Service Manager]) + AC_DEFINE(HAVE_NT_EVENT_LOG,1,[if you have NT Event Log]) + fi + + if test $ol_with_threads = nt ; then + AC_MSG_ERROR([could not locate NT Threads]) + fi +fi + if test $ol_with_threads = auto -o $ol_with_threads = yes \ -o $ol_with_threads = posix ; then @@ -1324,7 +1437,7 @@ if test $ol_with_threads = manual ; then AC_CHECK_HEADERS(thread.h synch.h) fi -if test $ol_link_threads != no ; then +if test $ol_link_threads != no -a $ol_link_threads != nt ; then dnl needed to get reentrant/threadsafe versions dnl AC_DEFINE(REENTRANT,1) @@ -1448,6 +1561,8 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db2 ; then [define this to use DBBTREE w/ LDBM backend]) fi + OL_BERKELEY_DB2_DB_THREAD + 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 @@ -1458,7 +1573,11 @@ fi ol_link_bdb2=no if test $ol_link_ldbm = db2 -a $ol_enable_bdb2 != no ; then - ol_link_bdb2=yes + if test $ol_cv_berkeley_db2_db_thread != no ; then + ol_link_bdb2=yes + else + AC_MSG_WARN([Installed BerkeleyDB does not provide DB_THREAD support.]) + fi fi if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db ; then @@ -1548,19 +1667,29 @@ if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then ol_enable_ldbm=no fi +dnl ---------------------------------------------------------------- +if test $ol_enable_dynamic = yes -a $enable_shared = yes ; then + LINK_BINS_DYNAMIC="yes" +else + LINK_BINS_DYNAMIC="no" +fi + +dnl ---------------------------------------------------------------- if test $ol_enable_wrappers != no ; then AC_CHECK_HEADERS(tcpd.h) if test $ac_cv_header_tcpd_h != yes ; then have_wrappers=no else - AC_CHECK_LIB(wrap, main, - [have_wrappers=yes], [have_wrappers=no]) + AC_TRY_COMPILE([ +int allow_severity = 0; +int deny_severity = 0; + ],[hosts_access()],[have_wrappers=yes],[have_wrappers=no]) fi if test $have_wrappers = yes ; then AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap]) - SLAPD_LIBS="$SLAPD_LIBS -lwrap" + WRAP_LIBS="-lwrap" dnl We add another check for -lnsl since some libwrap's dnl need it, but it isn't always included from above @@ -1573,9 +1702,11 @@ if test $ol_enable_wrappers != no ; then AC_MSG_WARN(disabling wrappers support) ol_enable_wrappers=no + WRAP_LIBS="" fi fi +dnl ---------------------------------------------------------------- if test $ol_enable_syslog != no ; then AC_CHECK_FUNC(openlog) if test $ac_cv_func_openlog = no -a $ol_enable_syslog = yes; then @@ -1584,32 +1715,29 @@ if test $ol_enable_syslog != no ; then ol_enable_syslog=$ac_cv_func_openlog fi +dnl ---------------------------------------------------------------- if test $ol_enable_dmalloc != no ; then AC_CHECK_HEADERS(dmalloc.h) AC_CHECK_LIB(dmalloc, dmalloc_shutdown) fi +dnl ---------------------------------------------------------------- +dnl TCL if test $ol_enable_tcl != no ; then AC_CHECK_HEADERS(tcl.h) if test $ac_cv_header_tcl_h != yes ; then have_tcl=no else - AC_CHECK_LIB(tcl,main, - [have_tcl=yes; SLAPD_LIBS="$SLAPD_LIBS -ltcl"], - [have_tcl=no]) - - if test $have_tcl != yes; then - AC_CHECK_LIB(tcl7.6,main, - [have_tcl=yes; SLAPD_LIBS="$SLAPD_LIBS -ltcl7.6"], - [have_tcl=no]) - fi - - if test $have_tcl != yes; then - AC_CHECK_LIB(tcl8.0,main, - [have_tcl=yes; SLAPD_LIBS="$SLAPD_LIBS -ltcl8.0"], - [have_tcl=no]) - fi + for lib in tcl tcl7.6 tcl8.0 tcl8.2 ; do + AC_CHECK_LIB($lib,main, + [have_tcl=yes + if test x"$ol_with_tcl_module" = "xstatic" ; then + SLAPD_LIBS="$SLAPD_LIBS -l${lib}" + else + MOD_TCL_LIB="-l${lib}" + fi;break],[have_tcl=no]) + done fi if test $have_tcl != yes ; then @@ -1622,7 +1750,8 @@ if test $ol_enable_tcl != no ; then fi fi -# ud needs termcap (should insert check here) +dnl ---------------------------------------------------------------- +dnl ud needs termcap (should insert check here) ol_link_termcap=no AC_CHECK_HEADERS(termcap.h ncurses.h) @@ -1649,9 +1778,9 @@ if test $ol_link_termcap = no ; then TERMCAP_LIBS= fi +dnl ---------------------------------------------------------------- dnl -dnl Check for fetch URL support -dnl should be extended to support other fetch URL APIs +dnl Check for Cyrus SASL dnl ol_link_sasl=no if test $ol_with_cyrus_sasl != no ; then @@ -1673,6 +1802,28 @@ if test $ol_with_cyrus_sasl != no ; then fi fi +dnl ---------------------------------------------------------------- +dnl Check for entropy sources +if test $cross_compiling != yes ; then + dev=no + if test -r /dev/urandom ; then + dev="/dev/urandom"; + elif test -r /idev/urandom ; then + dev="/idev/urandom"; + elif test -r /dev/srandom ; then + dev="/dev/srandom"; + elif test -r /dev/random ; then + dev="/dev/random"; + elif test -r /idev/random ; then + dev="/idev/random"; + fi + + if test $dev != no ; then + AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) + fi +fi + +dnl ---------------------------------------------------------------- dnl dnl Check for fetch URL support dnl should be extended to support other fetch URL APIs @@ -1690,6 +1841,7 @@ if test $ol_with_fetch != no ; then fi fi +dnl ---------------------------------------------------------------- dnl dnl Check for GNU readline dnl @@ -1718,7 +1870,8 @@ if test $ol_link_readline = yes ; then fi -# FreeBSD (and others) have crypt(3) in -lcrypt +dnl ---------------------------------------------------------------- +dnl FreeBSD (and others) have crypt(3) in -lcrypt if test $ol_enable_crypt != no ; then AC_CHECK_FUNC(crypt, [have_crypt=yes], [ AC_CHECK_LIB(crypt, crypt, [LUTIL_LIBS="$LUTIL_LIBS -lcrypt" @@ -1737,14 +1890,16 @@ if test $ol_enable_crypt != no ; then fi fi -# FreeBSD (and others) have setproctitle(3) in -lutil +dnl ---------------------------------------------------------------- +dnl 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"])]) + LIBOBJS="$LIBOBJS setproctitle.o" + LIBSRCS="$LIBSRCS setproctitle.c"])]) if test $have_setproctitle = yes ; then AC_DEFINE(HAVE_SETPROCTITLE,1, @@ -1754,18 +1909,25 @@ fi dnl ---------------------------------------------------------------- dnl Checks for typedefs, structures, and compiler characteristics. -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_CHECK_TYPE(ssize_t, [signed int]) +AC_CHECK_TYPE(caddr_t, [char *]) + OL_TYPE_SOCKLEN_T AC_STRUCT_ST_BLKSIZE AC_HEADER_TIME AC_STRUCT_TM +AC_TYPE_UID_T +OL_TYPE_SIG_ATOMIC_T + +dnl AC_TYPE_GETGROUPS + OL_STRUCT_PASSWD_PW_GECOS OL_STRUCT_PASSWD_PW_PASSWD @@ -1775,31 +1937,25 @@ OL_C_VOLATILE if test $cross_compiling = yes ; then AC_DEFINE(CROSS_COMPILING, 1, [define if cross compiling]) - - AC_DEFINE(LBER_INT_T,long) - AC_DEFINE(LBER_TAG_T,long) - AC_DEFINE(LBER_SOCKET_T,int) - else AC_C_BIGENDIAN - AC_CHECK_SIZEOF(short) - AC_CHECK_SIZEOF(int) - AC_CHECK_SIZEOF(long) +fi - if test "$ac_cv_sizeof_int" -lt 4 ; then - AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.]) +AC_COMPILE_CHECK_SIZEOF(short) +AC_COMPILE_CHECK_SIZEOF(int) +AC_COMPILE_CHECK_SIZEOF(long) - AC_DEFINE(LBER_INT_T,long) - AC_DEFINE(LBER_TAG_T,long) - AC_DEFINE(LBER_SOCKET_T,int) - else - AC_DEFINE(LBER_INT_T,int) - AC_DEFINE(LBER_TAG_T,long) - AC_DEFINE(LBER_SOCKET_T,int) - fi +if test "$ac_cv_sizeof_int" -lt 4 ; then + AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.]) + + AC_DEFINE(LBER_INT_T,long) +else + AC_DEFINE(LBER_INT_T,int) fi AC_DEFINE(LBER_LEN_T,long) +AC_DEFINE(LBER_SOCKET_T,int) +AC_DEFINE(LBER_TAG_T,long) dnl ---------------------------------------------------------------- dnl Checks for library functions. @@ -1810,8 +1966,17 @@ dnl AM_FUNC_STRTOD OL_FUNC_INET_ATON -dnl we should use vfork instead of fork in a number of places... -dnl AC_FUNC_VFORK +dnl Check for NT specific routines +AC_CHECK_FUNC(_spawnlp, AC_DEFINE(HAVE_SPAWNLP,1,[if you have spawnlp()])) + +AC_CHECK_FUNC(_snprintf, [ac_cv_func_snprintf=yes + AC_DEFINE(snprintf, _snprintf, [define to snprintf routine]) +]) + +AC_CHECK_FUNC(_vsnprintf, [ac_cv_func_vsnprintf=yes + AC_DEFINE(vsnprintf, _vsnprintf, [define to vsnprintf routine]) +]) + AC_FUNC_VPRINTF if test $ac_cv_func_vprintf = yes ; then @@ -1838,6 +2003,7 @@ AC_CHECK_FUNCS( \ memcpy \ memmove \ mkstemp \ + pipe \ read \ recv \ recvfrom \ @@ -1847,6 +2013,7 @@ AC_CHECK_FUNCS( \ setsid \ setuid \ seteuid \ + sigaction \ signal \ sigset \ snprintf \ @@ -1870,6 +2037,14 @@ AC_CHECK_FUNCS( \ dnl We actually may need to replace more than this. AC_REPLACE_FUNCS(getopt tempnam) +if test "$ac_cv_func_getopt" != yes; then + LIBSRCS="$LIBSRCS getopt.c" +fi + +if test "$ac_cv_func_tempnam" != yes; then + LIBSRCS="$LIBSRCS tempnam.c" +fi + dnl ---------------------------------------------------------------- # Check Configuration OL_SYS_ERRLIST @@ -1932,7 +2107,6 @@ fi if test "$ol_link_modules" != no ; then AC_DEFINE(SLAPD_MODULES,1,[define to support modules]) BUILD_SLAPD=yes - MODULES_LIBS=-lltdl SLAPD_MODULES_LDFLAGS="-dlopen self" fi @@ -2038,6 +2212,29 @@ fi dnl ---------------------------------------------------------------- +if test "$LINK_BINS_DYNAMIC" = yes; then + LIB_LINKAGE=DYN + LT_LIB_LINKAGE=shared +else + LIB_LINKAGE=STAT + LT_LIB_LINKAGE=static +fi + +if test "$ac_cv_mingw32" = yes ; then + PLAT=NT + DYN_EXT=dll +else + PLAT=UNIX + DYN_EXT=so +fi + +AC_SUBST(LIBSRCS) + +AC_SUBST(PLAT) +AC_SUBST(LIB_LINKAGE) +AC_SUBST(LT_LIB_LINKAGE) +AC_SUBST(DYN_EXT) + AC_SUBST(BUILD_LDAPD) AC_SUBST(BUILD_SLAPD) AC_SUBST(BUILD_BDB2) @@ -2065,13 +2262,17 @@ AC_SUBST(SLURPD_LIBS) AC_SUBST(LDBM_LIBS) AC_SUBST(LTHREAD_LIBS) AC_SUBST(LUTIL_LIBS) +AC_SUBST(WRAP_LIBS) +AC_SUBST(MOD_TCL_LIB) +AC_SUBST(LINK_BINS_DYNAMIC) AC_SUBST(SLAPD_MODULES_CPPFLAGS) AC_SUBST(SLAPD_MODULES_LDFLAGS) AC_SUBST(SLAPD_MODULES_LIST) -AC_SUBST(SLAPD_PERL_CPPFLAGS) +AC_SUBST(PERL_CPPFLAGS) AC_SUBST(SLAPD_PERL_LDFLAGS) +AC_SUBST(MOD_PERL_LDFLAGS) AC_SUBST(KRB_LIBS) AC_SUBST(READLINE_LIBS)