X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=68d7e632745d3aa40a436da09b802aca42338c44;hb=891f987928c5a438f091c1c0ddd9a8131222fa33;hp=3072b9e65682e367091276ce5a2c02ddb3dbb7e5;hpb=01e81666ac22bf1e888e9bcb8581004fd865a3e2;p=openldap diff --git a/configure.in b/configure.in index 3072b9e656..68d7e63274 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl $OpenLDAP$ dnl -dnl Copyright 1998-2001 The OpenLDAP Foundation. All Rights Reserved. +dnl Copyright 1998-2002 The OpenLDAP Foundation. All Rights Reserved. dnl dnl Redistribution and use in source and binary forms, with or without dnl modification, are permitted only as authorized by the OpenLDAP @@ -16,7 +16,7 @@ define([AC_INIT_BINSH], # $]OpenLDAP[$ # from] translit([$OpenLDAP$], $")] [ -# Copyright 1998-2001 The OpenLDAP Foundation. All Rights Reserved. +# Copyright 1998-2002 The OpenLDAP Foundation. All Rights Reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted only as authorized by the OpenLDAP @@ -24,8 +24,8 @@ define([AC_INIT_BINSH], # http://www.OpenLDAP.org/license.html or in file LICENSE in the # top-level directory of the distribution. -echo "Copyright 1998-2001 The OpenLDAP Foundation, All Rights Reserved." -echo "Restrictions apply, see COPYRIGHT and LICENSE files." +echo "Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved." +echo " Restrictions apply, see COPYRIGHT and LICENSE files." ])dnl dnl ---------------------------------------------------------------- dnl Disable config.cache! @@ -51,7 +51,19 @@ if test -z "$OL_STRING"; then AC_MSG_ERROR([could not determine version]) fi -echo "Configuring $OL_STRING ..." +if test -f "$ac_aux_dir/shtool" -a ! -d $ac_aux_dir/shtool; then + ac_cv_shtool="$ac_aux_dir/shtool" +else + AC_MSG_ERROR([no shtool found in $ac_aux_dir]) +fi + +SHTOOL="$ac_cv_shtool" +dnl AC_SUBST(SHTOOL)dnl + +TB=`$SHTOOL echo -e %B` +TN=`$SHTOOL echo -e %b` + +echo "Configuring $TB$OL_STRING$TN ..." dnl Determine host platform dnl we try not to use this for much @@ -73,7 +85,7 @@ AC_SUBST(OPENLDAP_LIBVERSION)dnl dnl We use autoconf features new to 2.13. dnl aclocal.m4 should be built using aclocal from automake 1.4 -dnl libtool 1.3.3 should be installed. +dnl libtool 1.4.2 should be installed. AC_PREREQ(2.13)dnl Required Autoconf version AC_CONFIG_HEADER(include/portable.h include/ldap_features.h include/lber_types.h)dnl @@ -147,7 +159,8 @@ dnl ---------------------------------------------------------------- dnl ---------------------------------------------------------------- dnl SLAPD OPTIONS -AC_ARG_WITH(xxslapdoptions,[SLAPD (Standalone LDAP Daemon) Options:]) +AC_ARG_WITH(xxslapdoptions,[ +SLAPD (Standalone LDAP Daemon) Options:]) OL_ARG_ENABLE(slapd,[ --enable-slapd enable building slapd], yes)dnl OL_ARG_ENABLE(aci,[ --enable-aci enable per-object ACIs (experimental)], no)dnl OL_ARG_ENABLE(cleartext,[ --enable-cleartext enable cleartext passwords], yes)dnl @@ -164,7 +177,7 @@ OL_ARG_ENABLE(slp, [ --enable-slp enable SLPv2 support], no)dnl OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl dnl SLAPD Backend options -OL_ARG_ENABLE(bdb,[ --enable-bdb enable Berkeley DB backend], no)dnl +OL_ARG_ENABLE(bdb,[ --enable-bdb enable Berkeley DB backend], yes)dnl OL_ARG_WITH(bdb_module,[ --with-bdb-module module type], static, [static dynamic]) OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend], no)dnl @@ -173,7 +186,7 @@ OL_ARG_WITH(dnssrv_module,[ --with-dnssrv-module module type], static, OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend], no)dnl OL_ARG_WITH(ldap_module,[ --with-ldap-module module type], static, [static dynamic]) -OL_ARG_ENABLE(ldbm,[ --enable-ldbm enable ldbm backend], yes)dnl +OL_ARG_ENABLE(ldbm,[ --enable-ldbm enable ldbm backend], no)dnl OL_ARG_WITH(ldbm_api,[ --with-ldbm-api with LDBM API], auto, [auto berkeley bcompat mdbm gdbm]) OL_ARG_WITH(ldbm_module,[ --with-ldbm-module module type], static, @@ -204,11 +217,13 @@ OL_ARG_WITH(tcl_module,[ --with-tcl-module module type], static, dnl ---------------------------------------------------------------- dnl SLURPD OPTIONS -AC_ARG_WITH(xxslurpdoptions,[SLURPD (Replication Daemon) 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_ARG_WITH(xxliboptions,[ +Library Generation & Linking Options]) AC_ENABLE_STATIC dnl AC_DISABLE_SHARED AC_ENABLE_SHARED @@ -513,6 +528,9 @@ SLAPD_MODULES_LDFLAGS= SLAPD_MODULES_CPPFLAGS= SLAPD_MODULES_LIST= +SLAPD_STATIC_BACKENDS= +SLAPD_DYNAMIC_BACKENDS= + SLAPD_PERL_LDFLAGS= MOD_PERL_LDFLAGS= PERL_CPPFLAGS= @@ -536,7 +554,7 @@ SLAPD_SLP_LIBS= dnl ================================================================ dnl Checks for programs -dnl AC_PROG_INSTALL +AC_PROG_INSTALL AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion]) @@ -604,10 +622,6 @@ AC_PROG_AWK OL_PROG_LN_H AC_PROG_LN_S -if test "$LN_H" = "cp" -a "$LN_S" = "ln"; then - LN_S="$LN_H" -fi - 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) @@ -654,9 +668,9 @@ fi dnl ---------------------------------------------------------------- dnl Checks for UNIX Variants -AC_AIX -AC_ISC_POSIX -AC_MINIX +dnl AC_AIX +dnl AC_ISC_POSIX +dnl AC_MINIX dnl ---------------------------------------------------------------- dnl Checks for system services @@ -705,8 +719,8 @@ if test $ol_enable_modules != no ; then fi AC_CHECK_LIB(ltdl, lt_dlinit, [ - MODULES_LIBS=-lltdl - AC_DEFINE(HAVE_LIBLTDL,1,[define if you have libtool -ltdl]) + MODULES_LIBS=-lltdl + AC_DEFINE(HAVE_LIBLTDL,1,[define if you have libtool -ltdl]) ]) if test "$ac_cv_lib_ltdl_lt_dlinit" = no ; then @@ -787,6 +801,7 @@ AC_CHECK_HEADERS( \ termios.h \ unistd.h \ winsock.h \ + winsock2.h \ ) @@ -796,26 +811,46 @@ dnl Checks for libraries AC_CHECK_FUNC(dlopen, :, [AC_CHECK_LIB(dl, dlopen)]) dnl HP-UX requires -lV3 +dnl this is not needed on newer versions of HP-UX 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]) +dnl The following is INTENTIONALLY scripted out because shell does not +dnl support variable names with the '@' character, which is what +dnl autoconf would try to generate if one merely used AC_SEARCH_LIBS +AC_MSG_CHECKING(for winsock) +save_LIBS="$LIBS" +for curlib in ws2_32 wsock32; do + LIBS="$LIBS -l$curlib" + AC_TRY_LINK([ + char socket@12(); + char select@20(); + char closesocket@4(); + char gethostname@8(); + ], + [ + socket@12(); + select@20(); + closesocket@4(); + gethostname@8(); + ], + have_winsock=yes, have_winsock=no) + + if test $have_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 + if test $curlib = ws2_32; then + have_winsock=winsock2 + AC_DEFINE(HAVE_WINSOCK2, 1, + [define if you have winsock2]) + fi + break fi -fi + LIBS="$save_LIBS" +done +AC_MSG_RESULT($have_winsock) dnl Find socket() dnl Likely combinations: @@ -836,10 +871,10 @@ dnl require select AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.])) 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 + 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 @@ -851,13 +886,54 @@ AC_CHECK_HEADERS( regex.h ) if test "$ac_cv_header_regex_h" != yes ; then AC_MSG_ERROR([POSIX regex.h required.]) fi -AC_CHECK_FUNC(regfree, :, AC_MSG_ERROR([POSIX regex required.])) +AC_SEARCH_LIBS(regfree, [regex gnuregex], + :, AC_MSG_ERROR([POSIX regex required.])) OL_POSIX_REGEX if test "$ol_cv_c_posix_regex" = no ; then AC_MSG_ERROR([broken POSIX regex!]) fi +dnl ---------------------------------------------------------------- +dnl UUID Support + +have_uuid=no +AC_CHECK_HEADERS(sys/uuid.h) +if test $ac_cv_header_sys_uuid_h = yes ; then + save_LIBS="$LIBS" + AC_SEARCH_LIBS(uuid_to_str, uuid, [have_uuid=yes], :) + LIBS="$save_LIBS" + + if test have_uuid = yes ; then + AC_DEFINE(HAVE_UUID_TO_STR,1, + [define if you have uuid_to_str()]) + + test "$ac_cv_search_uuid_to_str" = "none required" || \ + SLAPD_LIBS="$SLAPD_LIBS $ac_cv_search_uuid_to_str" + fi +fi + +dnl For windows, check for the need of RPCRT for UUID function support +if test $have_uuid = no ; then + AC_MSG_CHECKING(to see if -lrpcrt4 is needed for win32 UUID support) + save_LIBS="$LIBS" + LIBS="$LIBS -lrpcrt4" + AC_TRY_LINK([ + char UuidCreate@4(); + char UuidToStringA@8(); + ], + [ + UuidCreate@4(); + UuidToStringA@8(); + ], + need_rpcrt=yes, need_rpcrt=no) + if test $need_rpcrt = yes; then + SLAPD_LIBS="$SLAPD_LIBS -lrpcrt4" + fi + LIBS="$save_LIBS" + AC_MSG_RESULT($need_rpcrt) +fi + dnl ---------------------------------------------------------------- dnl Check for resolver routines dnl need to check for both res_query and __res_query @@ -905,16 +981,14 @@ fi dnl ---------------------------------------------------------------- dnl PF_INET6 support requires getaddrinfo and INET6_ADDRSTRLEN dnl PF_LOCAL may use getaddrinfo in available -AC_CHECK_FUNCS( getaddrinfo inet_ntop ) +AC_CHECK_FUNCS( getaddrinfo gai_strerror inet_ntop ) ol_link_ipv6=no if test $ac_cv_func_getaddrinfo = no -o $ac_cv_func_inet_ntop = no ; then if test $ol_enable_ipv6 = yes ; then AC_MSG_ERROR([IPv6 support requires getaddrinfo() and inet_ntop()]) fi -else - AC_CHECK_FUNCS( gai_strerror ) - +elif test $ol_enable_ipv6 != no ; then AC_CACHE_CHECK([INET6_ADDRSTRLEN],[ol_cv_inet6_addrstrlen],[ AC_EGREP_CPP(__has_inet6_addrstrlen__,[ # include @@ -1158,7 +1232,7 @@ if test $ol_with_tls != no ; then fi else - AC_WARN([TLS privacy protection not supported!]) + AC_WARN([TLS data protection not supported!]) fi if test $ol_link_tls = yes ; then @@ -1166,7 +1240,7 @@ if test $ol_link_tls = yes ; then elif test $ol_with_tls = auto ; then AC_WARN([Could not locate TLS/SSL package]) - AC_WARN([TLS privacy protection not supported!]) + AC_WARN([TLS data protection not supported!]) elif test $ol_with_tls != no ; then AC_ERROR([Could not locate TLS/SSL package]) @@ -1233,9 +1307,9 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ OL_NT_THREADS if test "$ol_cv_nt_threads" = yes ; then - ol_link_threads=nt - ol_with_threads=found - ol_with_yielding_select=yes + 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]) @@ -1551,11 +1625,11 @@ 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 cthread.h) + AC_CHECK_HEADERS(mach/cthreads.h cthreads.h) if test $ac_cv_header_mach_cthreads_h = yes ; then ol_with_threads=found - dnl check for cthread support in current $LIBS + dnl check for cthreads support in current $LIBS AC_CHECK_FUNC(cthread_fork,[ol_link_threads=yes]) if test $ol_link_threads = no ; then @@ -1576,10 +1650,11 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ if test $ol_cv_cthread_all_load = yes ; then LTHREAD_LIBS="$LTHREAD_LIBS -all_load" ol_link_threads=mach + ol_with_threads=found fi fi - elif test $ac_cv_header_cthreads_h = yes ; then + elif test $ac_cv_header_cthreads_h = yes ; then dnl Hurd variant of Mach Cthreads dnl uses and -lthreads @@ -1594,6 +1669,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ if test $ol_link_threads = yes ; then LTHREAD_LIBS="-lthreads" ol_link_threads=mach + ol_with_threads=found else AC_MSG_ERROR([could not link with Mach CThreads]) fi @@ -1622,6 +1698,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ AC_DEFINE(HAVE_GNU_PTH,1,[if you have GNU Pth]) LTHREAD_LIBS="$LTHREAD_LIBS -lpth" ol_link_threads=pth + ol_with_threads=found if test $ol_with_yielding_select = auto ; then ol_with_yielding_select=yes @@ -1765,7 +1842,7 @@ 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 with $LTHREAD_LIBS dnl dnl dnl save_CPPFLAGS="$CPPFLAGS" dnl save_LIBS="$LIBS" @@ -1837,9 +1914,17 @@ if test $ol_with_ldbm_api = auto \ fi if test $ol_enable_bdb = yes -a $ol_link_ldbm != berkeley ; then - AC_MSG_ERROR(BerkeleyDB not availabl) -elif test $ol_enable_bdb != no -a $ol_link_ldbm != no ; then - ol_enable_bdb=yes + AC_MSG_ERROR(BDB: BerkeleyDB not available) +elif test $ol_enable_bdb != no -a $ol_link_ldbm = berkeley ; then + OL_BDB_COMPAT + + if test $ol_cv_bdb_compat = yes ; then + ol_enable_bdb=yes + elif test $ol_enable_bdb = yes ; then + AC_MSG_ERROR(BDB: BerkeleyDB version incompatible) + else + ol_enable_bdb=no + fi fi if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then @@ -1897,39 +1982,54 @@ fi dnl ---------------------------------------------------------------- if test $ol_enable_dynamic = yes -a $enable_shared = yes ; then - LINK_BINS_DYNAMIC="yes" + BUILD_LIBS_DYNAMIC=shared + AC_DEFINE(LDAP_LIBS_DYNAMIC, 1, [define if LDAP libs are dynamic]) else - LINK_BINS_DYNAMIC="no" + BUILD_LIBS_DYNAMIC=static fi dnl ---------------------------------------------------------------- if test $ol_enable_wrappers != no ; then - AC_CHECK_HEADERS(tcpd.h) + AC_CHECK_HEADERS(tcpd.h,[ + AC_MSG_CHECKING([for TCP wrappers library]) + save_LIBS="$LIBS" + LIBS="$LIBS -lwrap" + AC_TRY_LINK([ +#include +int allow_severity = 0; +int deny_severity = 0; - if test $ac_cv_header_tcpd_h != yes ; then - have_wrappers=no - else - AC_TRY_COMPILE([ +struct request_info *req; + ],[ +hosts_access(req) + ],[AC_MSG_RESULT([-lwrap]) + have_wrappers=yes + LIBS="$save_LIBS"],[ + dnl try with -lnsl + LIBS="$LIBS -lnsl" + AC_TRY_LINK([ +#include int allow_severity = 0; int deny_severity = 0; - ],[hosts_access()],[have_wrappers=yes],[have_wrappers=no]) - fi + +struct request_info *req; + ],[ +hosts_access(req) + ],[AC_MSG_RESULT([-lwrap -lnsl]) + have_wrappers=yes + LIBS="$save_LIBS -lnsl"],[ + AC_MSG_RESULT(no) + have_wrappers=no + LIBS=$save_LIBS])],[ + have_wrappers=no])],[have_wrappers=no]) if test $have_wrappers = yes ; then AC_DEFINE(HAVE_TCPD,1, [define if you have -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 - AC_CHECK_LIB(nsl, main) + elif test $ol_enable_wrappers = yes ; then + AC_MSG_ERROR([could not find TCP wrappers, select apppropriate options ore disable]) 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 + AC_MSG_WARN([could not find TCP wrappers, support disabled]) WRAP_LIBS="" fi fi @@ -1984,9 +2084,9 @@ if test $ol_enable_tcl != no ; then AC_CHECK_LIB($lib,main, [have_tcl=yes if test x"$ol_with_tcl_module" = "xstatic" ; then - SLAPD_LIBS="$SLAPD_LIBS -l${lib}" + SLAPD_LIBS="$SLAPD_LIBS -l${lib}" else - MOD_TCL_LIB="-l${lib}" + MOD_TCL_LIB="-l${lib}" fi;break],[have_tcl=no]) done fi @@ -2036,17 +2136,13 @@ dnl ol_link_sasl=no ol_link_spasswd=no if test $ol_with_cyrus_sasl != no ; then - AC_CHECK_HEADERS(sasl.h) + AC_CHECK_HEADERS(sasl/sasl.h sasl.h) - if test $ac_cv_header_sasl_h = yes ; then - AC_CHECK_LIB(sasl, sasl_client_init, - [have_cyrus_sasl=yes], [have_cyrus_sasl=no]) - - if test $have_cyrus_sasl != no ; then - SASL_LIBS="-lsasl" - AC_DEFINE(HAVE_CYRUS_SASL,1,[define if you have Cyrus SASL]) - ol_link_sasl=yes - fi + if test $ac_cv_header_sasl_sasl_h = yes -o $ac_cv_header_sasl_h = yes; then + AC_CHECK_LIB(sasl2, sasl_client_init, + [ol_link_sasl="-lsasl2"], + [AC_CHECK_LIB(sasl, sasl_client_init, + [ol_link_sasl="-lsasl"])]) fi if test $ol_link_sasl = no ; then @@ -2059,9 +2155,12 @@ if test $ol_with_cyrus_sasl != no ; then AC_MSG_WARN([Strong authentication not supported!]) fi fi - - elif test $ol_enable_spasswd != no ; then - ol_link_spasswd=yes + else + AC_DEFINE(HAVE_CYRUS_SASL,1,[define if you have Cyrus SASL]) + SASL_LIBS="$ol_link_sasl" + if test $ol_enable_spasswd != no ; then + ol_link_spasswd=yes + fi fi else @@ -2073,7 +2172,7 @@ fi dnl ---------------------------------------------------------------- dnl Check for entropy sources -if test $cross_compiling != yes ; then +if test $cross_compiling != yes -a "$ac_cv_mingw32" != yes ; then dev=no if test -r /dev/urandom ; then dev="/dev/urandom"; @@ -2291,6 +2390,8 @@ AC_CHECK_FUNCS( \ lockf \ memcpy \ memmove \ + mkstemp \ + mktemp \ pipe \ read \ recv \ @@ -2326,7 +2427,7 @@ dnl We actually may need to replace more than this. AC_REPLACE_FUNCS(getopt) if test "$ac_cv_func_getopt" != yes; then - LIBSRCS="$LIBSRCS getopt.c" + LIBSRCS="$LIBSRCS getopt.c" fi dnl ---------------------------------------------------------------- @@ -2405,6 +2506,9 @@ if test "$ol_enable_bdb" != no ; then BUILD_BDB=mod BUILD_BDB_DYNAMIC=shared SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-bdb/back_bdb.la" + SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-bdb" + else + SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-bdb" fi fi @@ -2418,6 +2522,9 @@ if test "$ol_link_dnssrv" != no ; then BUILD_DNSSRV=mod BUILD_DNSSRV_DYNAMIC=shared SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-dnssrv/back_dnssrv.la" + SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-dnssrv" + else + SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-dnssrv" fi fi @@ -2431,6 +2538,9 @@ if test "$ol_enable_ldap" != no ; then BUILD_LDAP=mod BUILD_LDAP_DYNAMIC=shared SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-ldap/back_ldap.la" + SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldap" + else + SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldap" fi fi @@ -2445,6 +2555,9 @@ if test "$ol_link_ldbm" != no -a $ol_enable_ldbm != no; then BUILD_LDBM=mod BUILD_LDBM_DYNAMIC=shared SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-ldbm/back_ldbm.la" + SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldbm" + else + SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldbm" fi fi @@ -2464,6 +2577,9 @@ if test "$ol_enable_meta" != no ; then BUILD_META=mod BUILD_META_DYNAMIC=shared SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-meta/back_meta.la" + SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-meta" + else + SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-meta" fi fi @@ -2477,6 +2593,9 @@ if test "$ol_enable_monitor" != no ; then BUILD_MONITOR=mod BUILD_MONITOR_DYNAMIC=shared SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-monitor/back_monitor.la" + SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-monitor" + else + SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-monitor" fi fi @@ -2490,6 +2609,9 @@ if test "$ol_enable_passwd" != no ; then BUILD_PASSWD=mod BUILD_PASSWD_DYNAMIC=shared SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-passwd/back_passwd.la" + SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-passwd" + else + SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-passwd" fi fi @@ -2503,6 +2625,9 @@ if test "$ol_link_perl" != no ; then BUILD_PERL=mod BUILD_PERL_DYNAMIC=shared SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-perl/back_perl.la" + SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-perl" + else + SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-perl" fi fi @@ -2516,6 +2641,9 @@ if test "$ol_enable_shell" != no ; then BUILD_SHELL=mod BUILD_SHELL_DYNAMIC=shared SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-shell/back_shell.la" + SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-shell" + else + SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-shell" fi fi @@ -2529,6 +2657,9 @@ if test "$ol_enable_tcl" != no ; then BUILD_TCL=mod BUILD_TCL_DYNAMIC=shared SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-tcl/back_tcl.la" + SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-tcl" + else + SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-tcl" fi fi @@ -2542,6 +2673,9 @@ if test "$ol_link_sql" != no ; then BUILD_SQL=mod BUILD_SQL_DYNAMIC=shared SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-sql/back_sql.la" + SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-sql" + else + SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-sql" fi fi @@ -2553,33 +2687,26 @@ fi if test "$ol_enable_rewrite" != no ; then AC_DEFINE(ENABLE_REWRITE,1,[define to enable rewriting in back-ldap and back-meta]) BUILD_REWRITE=yes - SLAPD_LIBS="$SLAPD_LIBS -lrewrite" 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 +dnl +dnl For Windows build, we don't want to include -dlopen flags. +dnl They hurt more than they help. +dnl if test "$ac_cv_mingw32" = yes ; then - PLAT=NT - DYN_EXT=dll + PLAT=NT + SLAPD_MODULES_LDFLAGS= + SLAPD_MODULES_LIST= else - PLAT=UNIX - DYN_EXT=so + PLAT=UNIX fi AC_SUBST(LIBSRCS) - AC_SUBST(PLAT) -AC_SUBST(LIB_LINKAGE) -AC_SUBST(LT_LIB_LINKAGE) -AC_SUBST(DYN_EXT) +AC_SUBST(BUILD_LIBS_DYNAMIC) AC_SUBST(BUILD_SLAPD) AC_SUBST(BUILD_BDB) @@ -2617,12 +2744,14 @@ 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_STATIC_BACKENDS) +AC_SUBST(SLAPD_DYNAMIC_BACKENDS) + AC_SUBST(PERL_CPPFLAGS) AC_SUBST(SLAPD_PERL_LDFLAGS) AC_SUBST(MOD_PERL_LDFLAGS) @@ -2642,6 +2771,11 @@ AC_SUBST(SLAPD_SQL_LDFLAGS) AC_SUBST(SLAPD_SQL_LIBS) AC_SUBST(SLAPD_SQL_INCLUDES) +dnl ---------------------------------------------------------------- +dnl final help output +AC_ARG_WITH(xxinstall,[ +See INSTALL file for further details.]) + dnl ---------------------------------------------------------------- dnl final output dnl @@ -2670,7 +2804,7 @@ libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib. libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk:build/lib-static.mk \ libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/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 \ -libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk \ +libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk \ servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk \ servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \ servers/slapd/back-bdb/Makefile:build/top.mk:servers/slapd/back-bdb/Makefile.in:build/mod.mk \ @@ -2691,5 +2825,5 @@ tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \ tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \ ,[ date > stamp-h -echo Please \"make depend\" to build dependencies +echo Please run \"make depend\" to build dependencies ])