X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=4e55d873f2ca0dc9626a586979889fbdcd286aac;hb=7e1a91340cc79c8f8aa5810198f7e49dc18883b9;hp=baa380120f374e037d455edf3e4c5113d0e2e3ec;hpb=8f084244552c37a581e091c3a366ee5a7575bbac;p=openldap diff --git a/configure.in b/configure.in index baa380120f..4e55d873f2 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl $OpenLDAP$ dnl -dnl Copyright 1998-2002 The OpenLDAP Foundation. All Rights Reserved. +dnl Copyright 1998-2003 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-2002 The OpenLDAP Foundation. All Rights Reserved. +# Copyright 1998-2003 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,7 +24,7 @@ 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-2002 The OpenLDAP Foundation, All Rights Reserved." +echo "Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved." echo " Restrictions apply, see COPYRIGHT and LICENSE files." ])dnl dnl ---------------------------------------------------------------- @@ -131,10 +131,11 @@ AC_SUBST(ldap_subdir)dnl dnl ---------------------------------------------------------------- dnl General "enable" options OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)dnl +OL_ARG_ENABLE(dynamic,[ --enable-dynamic enable linking built binaries with dynamic libs], no)dnl OL_ARG_ENABLE(syslog,[ --enable-syslog enable syslog support], auto)dnl OL_ARG_ENABLE(proctitle,[ --enable-proctitle enable proctitle support], yes)dnl -OL_ARG_ENABLE(cache,[ --enable-cache enable caching (experimental)], no)dnl -OL_ARG_ENABLE(referrals,[ --enable-referrals enable LDAPv2+ Referrals (experimental)], no)dnl +dnl OL_ARG_ENABLE(referrals,[ --enable-referrals enable LDAPv2+ Referrals (experimental)], no)dnl +ol_enable_referrals=${ol_enable_referrals-no} dnl OL_ARG_ENABLE(kbind,[ --enable-kbind enable LDAPv2+ Kerberos IV bind (deprecated)], no)dnl ol_enable_kbind=${ol_enable_kbind-no} OL_ARG_ENABLE(ipv6,[ --enable-ipv6 enable IPv6 support], auto)dnl @@ -173,7 +174,6 @@ 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 OL_ARG_ENABLE(crypt,[ --enable-crypt enable crypt(3) passwords], no)dnl -OL_ARG_ENABLE(dynamic,[ --enable-dynamic enable linking built binaries with dynamic libs], no)dnl OL_ARG_ENABLE(kpasswd,[ --enable-kpasswd enable Kerberos password verification], no)dnl OL_ARG_ENABLE(lmpasswd,[ --enable-lmpasswd enable LAN Manager passwords], no)dnl OL_ARG_ENABLE(spasswd,[ --enable-spasswd enable (Cyrus) SASL password verification], no)dnl @@ -183,10 +183,10 @@ ol_enable_multimaster=${ol_enable_multimaster-no} OL_ARG_ENABLE(phonetic,[ --enable-phonetic enable phonetic/soundex], no)dnl OL_ARG_ENABLE(rewrite,[ --enable-rewrite enable DN rewriting in back-ldap and back-meta], no)dnl OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups of client hostnames], no)dnl -OL_ARG_ENABLE(slp, [ --enable-slp enable SLPv2 support], no)dnl +OL_ARG_ENABLE(slapi,[ --enable-slapi enable installation of slapi library], no)dnl +OL_ARG_ENABLE(slp,[ --enable-slp enable SLPv2 support], no)dnl OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl -OL_ARG_ENABLE(slapi,[ --enable-slapi enable installation of slapi library], no)dnl dnl SLAPD Backend options OL_ARG_ENABLE(bdb,[ --enable-bdb enable Berkeley DB backend], yes)dnl @@ -195,6 +195,9 @@ OL_ARG_WITH(bdb_module,[ --with-bdb-module module type static|dynamic], s OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend], no)dnl OL_ARG_WITH(dnssrv_module,[ --with-dnssrv-module module type static|dynamic], static, [static dynamic]) +OL_ARG_ENABLE(hdb,[ --enable-hdb enable Hierarchical DB backend], no)dnl +OL_ARG_WITH(hdb_module,[ --with-hdb-module module type static|dynamic], static, + [static dynamic]) OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend], no)dnl OL_ARG_WITH(ldap_module,[ --with-ldap-module module type static|dynamic], static, [static dynamic]) @@ -240,7 +243,6 @@ dnl ---------------------------------------------------------------- AC_ARG_WITH(xxliboptions,[ Library Generation & Linking Options]) AC_ENABLE_STATIC -dnl AC_DISABLE_SHARED AC_ENABLE_SHARED dnl ---------------------------------------------------------------- @@ -258,6 +260,9 @@ if test $ol_enable_slapd = no ; then if test $ol_enable_dnssrv = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-dnssrv argument]) fi + if test $ol_enable_hdb = yes ; then + AC_MSG_WARN([slapd disabled, ignoring --enable-hdb argument]) + fi if test $ol_enable_ldap = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-ldap argument]) fi @@ -318,6 +323,9 @@ if test $ol_enable_slapd = no ; then if test $ol_with_dnssrv_module != static ; then AC_MSG_WARN([slapd disabled, ignoring --with-dnssrv-module argument]) fi + if test $ol_with_hdb_module != static ; then + AC_MSG_WARN([slapd disabled, ignoring --with-hdb-module argument]) + fi if test $ol_with_ldap_module != static ; then AC_MSG_WARN([slapd disabled, ignoring --with-ldap-module argument]) fi @@ -359,6 +367,7 @@ if test $ol_enable_slapd = no ; then ol_enable_slapi=no ol_enable_bdb=no ol_enable_dnssrv=no + ol_enable_hdb=no ol_enable_ldap=no ol_enable_ldbm=no ol_enable_meta=no @@ -383,6 +392,7 @@ if test $ol_enable_slapd = no ; then ol_with_bdb_module=static ol_with_dnssrv_module=static + ol_with_hdb_module=static ol_with_ldap_module=static ol_with_ldbm_module=static ol_with_meta_module=static @@ -416,6 +426,7 @@ elif test $ol_enable_ldbm = no ; then if test $ol_enable_modules != yes -a \ $ol_enable_bdb = no -a \ $ol_enable_dnssrv = no -a \ + $ol_enable_hdb = no -a \ $ol_enable_ldap = no -a \ $ol_enable_meta = no -a \ $ol_enable_monitor = no -a \ @@ -438,7 +449,7 @@ elif test $ol_enable_ldbm = no ; then ol_with_ldbm_type=no ol_with_ldbm_module=static - if test $ol_enable_bdb != no ; then + if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then ol_with_ldbm_api=berkeley fi @@ -457,11 +468,11 @@ else AC_MSG_ERROR([NDBM only supports LDBM type hash]) fi - if test $ol_enable_bdb = yes ; then + if test $ol_enable_bdb = yes -o $ol_enable_hdb = yes ; then if test $ol_with_ldbm_api = auto ; then ol_with_ldbm_api=berkeley elif test $ol_with_ldbm_api != berkeley ; then - AC_MSG_ERROR([LDBM API not compatible with BDB]) + AC_MSG_ERROR([LDBM API not compatible with BDB/HDB]) fi elif test $ol_enable_bdb = auto ; then @@ -532,6 +543,7 @@ SLAPD_SLAPI_DEPEND= BUILD_BDB=no BUILD_DNSSRV=no +BUILD_HDB=no BUILD_LDAP=no BUILD_LDBM=no BUILD_META=no @@ -545,6 +557,7 @@ BUILD_TCL=no BUILD_BDB_DYNAMIC=static BUILD_DNSSRV_DYNAMIC=static +BUILD_HDB_DYNAMIC=static BUILD_LDAP_DYNAMIC=static BUILD_LDBM_DYNAMIC=static BUILD_META_DYNAMIC=static @@ -658,12 +671,6 @@ AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL -LTSTATIC="" -if test -z "$LTDYNAMIC" -a "${OPENLDAP_CVS}"; then - LTSTATIC="-static" -fi -AC_SUBST(LTSTATIC)dnl - OL_PROG_LN_H AC_PROG_LN_S @@ -778,6 +785,7 @@ if test $ol_enable_modules != no ; then else ol_with_bdb_module=static ol_with_dnssrv_module=static + ol_with_hdb_module=static ol_with_ldap_module=static ol_with_ldbm_module=static ol_with_meta_module=static @@ -843,10 +851,12 @@ AC_CHECK_HEADERS( \ sys/resource.h \ sys/select.h \ sys/socket.h \ + sys/stat.h \ sys/syslog.h \ sys/time.h \ sys/types.h \ sys/ucred.h \ + sys/uio.h \ syslog.h \ termios.h \ unistd.h \ @@ -1031,7 +1041,7 @@ fi dnl ---------------------------------------------------------------- dnl PF_INET6 support requires getaddrinfo and INET6_ADDRSTRLEN dnl PF_LOCAL may use getaddrinfo in available -AC_CHECK_FUNCS( getaddrinfo gai_strerror inet_ntop ) +AC_CHECK_FUNCS( getaddrinfo getnameinfo gai_strerror inet_ntop ) ol_link_ipv6=no if test $ac_cv_func_getaddrinfo = no -o $ac_cv_func_inet_ntop = no ; then @@ -1128,7 +1138,7 @@ if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \ else have_krb5=no - AC_MSG_WARN([Unrecongized Kerberos5 Implementation]) + AC_MSG_WARN([Unrecognized Kerberos5 Implementation]) fi if test $have_krb5 = yes ; then @@ -1970,6 +1980,9 @@ elif test $ol_enable_bdb != no -a $ol_link_ldbm = berkeley ; then ol_enable_bdb=no fi fi +if test $ol_enable_hdb = yes -a $ol_link_ldbm != berkeley ; then + AC_MSG_ERROR(HDB: BerkeleyDB not available) +fi if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then AC_MSG_WARN(Could not find LDBM with BTREE support) @@ -2025,12 +2038,16 @@ if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then fi dnl ---------------------------------------------------------------- + if test $ol_enable_dynamic = yes -a $enable_shared = yes ; then BUILD_LIBS_DYNAMIC=shared AC_DEFINE(LDAP_LIBS_DYNAMIC, 1, [define if LDAP libs are dynamic]) + LTSTATIC="" else BUILD_LIBS_DYNAMIC=static + LTSTATIC="-static" fi +AC_SUBST(LTSTATIC)dnl dnl ---------------------------------------------------------------- if test $ol_enable_wrappers != no ; then @@ -2498,6 +2515,7 @@ if test "$ac_cv_func_getopt" != yes; then LIBSRCS="$LIBSRCS getopt.c" fi if test "$ac_cv_func_getpeereid" != yes; then + OL_MSGHDR_MSG_ACCRIGHTS LIBSRCS="$LIBSRCS getpeereid.c" fi if test "$ac_cv_func_snprintf" != yes -o "$ac_cv_func_vsnprintf" != yes; then @@ -2542,10 +2560,6 @@ if test "$ol_enable_syslog" = yes ; then AC_DEFINE(LDAP_SYSLOG,1, [define this to add syslog code]) fi -if test "$ol_enable_cache" = no ; then - AC_DEFINE(LDAP_NOCACHE,1, - [define this to remove -lldap cache support]) -fi if test "$ol_link_kbind" != no ; then AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND,LDAP_VENDOR_VERSION) fi @@ -2623,6 +2637,21 @@ if test "$ol_link_dnssrv" != no ; then fi fi +if test "$ol_enable_hdb" != no ; then + AC_DEFINE(SLAPD_HDB,1,[define to support HDB backend]) + BUILD_SLAPD=yes + BUILD_HDB=yes + if test "$ol_with_hdb_module" != static ; then + AC_DEFINE(SLAPD_HDB_DYNAMIC,1, + [define to support dynamic HDB backend]) + BUILD_HDB=mod + BUILD_HDB_DYNAMIC=shared + SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-hdb" + else + SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-hdb" + fi +fi + if test "$ol_enable_ldap" != no ; then AC_DEFINE(SLAPD_LDAP,1,[define to support LDAP backend]) BUILD_SLAPD=yes @@ -2829,6 +2858,7 @@ AC_SUBST(BUILD_SLAPD) AC_SUBST(SLAPD_SLAPI_DEPEND) AC_SUBST(BUILD_BDB) AC_SUBST(BUILD_DNSSRV) + AC_SUBST(BUILD_HDB) AC_SUBST(BUILD_LDAP) AC_SUBST(BUILD_LDBM) AC_SUBST(BUILD_META) @@ -2841,6 +2871,7 @@ AC_SUBST(BUILD_SLAPD) AC_SUBST(BUILD_TCL) AC_SUBST(BUILD_BDB_DYNAMIC) AC_SUBST(BUILD_DNSSRV_DYNAMIC) + AC_SUBST(BUILD_HDB_DYNAMIC) AC_SUBST(BUILD_LDAP_DYNAMIC) AC_SUBST(BUILD_LDBM_DYNAMIC) AC_SUBST(BUILD_META_DYNAMIC) @@ -2926,6 +2957,7 @@ 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 \ servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk \ +servers/slapd/back-hdb/Makefile:build/top.mk:servers/slapd/back-hdb/Makefile.in:build/mod.mk \ servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk \ servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk \ servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk \