X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=aba593f2ca8230ae6d9bed760c8f09244cdb10d9;hb=73b48936a7fc57f77de66260df699f22bf01aa26;hp=626109ae3083bbc59240a7a41f886912c1632b46;hpb=0426431639b8e160df0e9deeb0dda55939517db7;p=openldap diff --git a/configure.in b/configure.in index 626109ae30..aba593f2ca 100644 --- a/configure.in +++ b/configure.in @@ -135,13 +135,13 @@ OL_ARG_ENABLE(slapd,[ --enable-slapd enable building slapd], yes)dnl OL_ARG_ENABLE(cleartext,[ --enable-cleartext enable cleartext passwords], yes)dnl OL_ARG_ENABLE(crypt,[ --enable-crypt enable crypt(3) passwords], auto)dnl OL_ARG_ENABLE(kpasswd,[ --enable-kpasswd enable kerberos password verification], no)dnl +OL_ARG_ENABLE(spasswd,[ --enable-spasswd enable (Cyrus) SASL password verification], no)dnl OL_ARG_ENABLE(modules,[ --enable-modules enable dynamic module support], no)dnl OL_ARG_ENABLE(multimaster,[ --enable-multimaster enable multimaster replication], no)dnl OL_ARG_ENABLE(phonetic,[ --enable-phonetic enable phonetic/soundex], no)dnl OL_ARG_ENABLE(quipu,[ --enable-quipu build quipu migration tools], no)dnl 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 @@ -149,17 +149,19 @@ dnl SLAPD Backend options OL_ARG_ENABLE(bdb2,[ --enable-bdb2 enable bdb2 backend], no)dnl OL_ARG_WITH(bdb2_module,[ --with-bdb2-module module type], static, [static dynamic]) +OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable bdb2 backend], no)dnl +OL_ARG_WITH(dnssrv_module,[ --with-dnssrv-module module type], 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, [static dynamic]) 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 mdbm gdbm ndbm manual]) + [auto db2 db mdbm gdbm manual]) OL_ARG_WITH(ldbm_module,[ --with-ldbm-module module type], static, [static dynamic]) 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_WITH(passwd_module,[ --with-passwd-module module type], static, [static dynamic]) @@ -169,6 +171,9 @@ OL_ARG_WITH(perl_module,[ --with-perl-module module type], static, OL_ARG_ENABLE(shell,[ --enable-shell enable shell backend], no)dnl OL_ARG_WITH(shell_module,[ --with-shell-module module type], static, [static dynamic]) +OL_ARG_ENABLE(sql,[ --enable-sql enable sql backend], no)dnl +OL_ARG_WITH(sql_module,[ --with-sql-module module type], static, + [static dynamic]) OL_ARG_ENABLE(tcl,[ --enable-tcl enable tcl backend], no)dnl OL_ARG_WITH(tcl_module,[ --with-tcl-module module type], static, [static dynamic]) @@ -203,6 +208,9 @@ if test $ol_enable_slapd = no ; then if test $ol_enable_bdb2 = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-bdb2 argument]) fi + if test $ol_enable_dnssrv = yes ; then + AC_MSG_WARN([slapd disabled, ignoring --enable-dnssrv argument]) + fi if test $ol_enable_ldap = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-ldap argument]) fi @@ -221,6 +229,9 @@ if test $ol_enable_slapd = no ; then if test $ol_enable_tcl = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-tcl argument]) fi + if test $ol_enable_sql = yes ; then + AC_MSG_WARN([slapd disabled, ignoring --enable-sql argument]) + fi if test $ol_enable_modules = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-modules argument]) fi @@ -242,9 +253,6 @@ if test $ol_enable_slapd = no ; then if test $ol_enable_aci = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-aci argument]) fi - if test $ol_enable_discreteaci = yes ; then - AC_MSG_WARN([slapd disabled, ignoring --enable-discreteaci argument]) - fi if test $ol_with_ldbm_api != auto ; then AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-api argument]) fi @@ -254,6 +262,9 @@ if test $ol_enable_slapd = no ; then if test $ol_with_bdb2_module != static ; then AC_MSG_WARN([slapd disabled, ignoring --with-bdb2-module argument]) fi + if test $ol_with_dnssrv_module != static ; then + AC_MSG_WARN([slapd disabled, ignoring --with-dnssrv-module argument]) + fi if test $ol_with_ldap_module != static ; then AC_MSG_WARN([slapd disabled, ignoring --with-ldap-module argument]) fi @@ -272,18 +283,23 @@ if test $ol_enable_slapd = no ; then if test $ol_with_tcl_module != static ; then AC_MSG_WARN([slapd disabled, ignoring --with-tcl-module argument]) fi + if test $ol_with_sql_module != static ; then + AC_MSG_WARN([slapd disabled, ignoring --with-sql-module argument]) + fi if test $ol_enable_slurpd = yes ; then AC_MSG_ERROR([slurpd requires slapd]) fi # force settings to no ol_enable_bdb2=no + ol_enable_dnssrv=no ol_enable_ldap=no ol_enable_ldbm=no ol_enable_passwd=no ol_enable_perl=no ol_enable_shell=no ol_enable_tcl=no + ol_enable_sql=no ol_enable_modules=no ol_enable_multimaster=no @@ -291,7 +307,6 @@ if test $ol_enable_slapd = no ; then ol_enable_quipu=no ol_enable_rlookups=no ol_enable_aci=no - ol_enable_discreteaci=no ol_enable_wrappers=no ol_enable_dynamic=no @@ -299,12 +314,14 @@ if test $ol_enable_slapd = no ; then ol_with_ldbm_type=no ol_with_bdb2_module=static + ol_with_dnssrv_module=static ol_with_ldap_module=static ol_with_ldbm_module=static ol_with_passwd_module=static ol_with_perl_module=static ol_with_shell_module=static ol_with_tcl_module=static + ol_with_sql_module=static ol_enable_slurpd=no @@ -328,10 +345,12 @@ elif test $ol_enable_ldbm = no ; then fi if test $ol_enable_modules != yes -a \ + $ol_enable_dnssrv = no -a \ $ol_enable_ldap = no -a \ $ol_enable_passwd = no -a \ $ol_enable_perl = no -a \ $ol_enable_shell = no -a \ + $ol_enable_sql = no -a \ $ol_enable_tcl = no ; then AC_MSG_ERROR([slapd requires a backend]) fi @@ -394,6 +413,13 @@ elif test $ol_enable_kbind = no -o $ol_enable_kpasswd = no ; then fi fi +if test $ol_enable_spasswd = yes ; then + if test $ol_with_cyrus_sasl = no ; then + AC_MSG_ERROR([options require --with-cyrus-sasl]) + fi + ol_link_spasswd=yes +fi + AC_MSG_RESULT(done) dnl ---------------------------------------------------------------- @@ -412,23 +438,28 @@ BUILD_LDAPD=no BUILD_SLAPD=no BUILD_SLURPD=no +BUILD_QUIPU=no +BUILD_THREAD=no + BUILD_BDB2=no +BUILD_DNSSRV=no BUILD_LDAP=no BUILD_LDBM=no BUILD_PASSWD=no BUILD_PERL=no -BUILD_QUIPU=no BUILD_SHELL=no +BUILD_SQL=no BUILD_TCL=no -BUILD_THREAD=no BUILD_BDB2_DYNAMIC=static +BUILD_DNSSRV_DYNAMIC=static BUILD_LDAP_DYNAMIC=static BUILD_LDBM_DYNAMIC=static BUILD_PASSWD_DYNAMIC=static BUILD_PERL_DYNAMIC=static BUILD_SHELL_DYNAMIC=static BUILD_TCL_DYNAMIC=static +BUILD_SQL_DYNAMIC=static SLAPD_MODULES_LDFLAGS= SLAPD_MODULES_CPPFLAGS= @@ -438,6 +469,10 @@ SLAPD_PERL_LDFLAGS= MOD_PERL_LDFLAGS= PERL_CPPFLAGS= +SLAPD_SQL_LDFLAGS= +SLAPD_SQL_LIBS= +SLAPD_SQL_INCLUDES= + MOD_TCL_LIB= KRB4_LIBS= KRB5_LIBS= @@ -446,6 +481,7 @@ SASL_LIBS= TERMCAP_LIBS= TLS_LIBS= MODULES_LIBS= +AUTH_LIBS= dnl ================================================================ dnl Checks for programs @@ -598,6 +634,13 @@ if test "${ol_cv_mkdep}" = no ; then AC_MSG_WARN([do not know how to generate dependencies]) fi +dnl ---------------------------------------------------------------- +dnl Check for AIX security library +AC_CHECK_LIB(s, afopen, [ + AUTH_LIBS=-ls + AC_DEFINE(HAVE_AIX_SECURITY,1,[define if you have AIX security lib]) +]) + dnl ---------------------------------------------------------------- dnl Check for module support ol_link_modules=no @@ -619,12 +662,14 @@ if test $ol_enable_modules != no ; then ol_link_modules=yes else ol_with_bdb2_module=static + ol_with_dnssrv_module=static ol_with_ldap_module=static ol_with_ldbm_module=static ol_with_passwd_module=static ol_with_perl_module=static ol_with_shell_module=static ol_with_tcl_module=static + ol_with_sql_module=static fi dnl ---------------------------------------------------------------- @@ -1741,9 +1786,7 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then fi fi -if test $ol_with_ldbm_api = auto ; then - AC_MSG_WARN([skipping automatic checking for NDBM, must be manually enabled.]) -elif test $ol_with_ldbm_api = ndbm ; then +if test $ol_with_ldbm_api = ndbm ; then OL_NDBM if test $ol_cv_ndbm = yes ; then @@ -1882,6 +1925,7 @@ dnl dnl Check for Cyrus SASL dnl ol_link_sasl=no +ol_link_spasswd=no if test $ol_with_cyrus_sasl != no ; then AC_CHECK_HEADER(sasl.h) @@ -2086,6 +2130,7 @@ fi AC_CHECK_FUNCS( \ bcopy \ closesocket \ + chroot \ endgrent \ endpwent \ flock \ @@ -2196,6 +2241,9 @@ fi if test "$ol_link_kpasswd" != no ; then AC_DEFINE(SLAPD_KPASSWD,1,[define to support Kerberos passwords]) fi +if test "$ol_link_spasswd" != no ; then + AC_DEFINE(SLAPD_SPASSWD,1,[define to support SASL passwords]) +fi if test "$ol_enable_multimaster" != no ; then AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication]) fi @@ -2208,9 +2256,6 @@ fi if test "$ol_enable_aci" != no ; then AC_DEFINE(SLAPD_ACI_ENABLED,1,[define to support per-object ACIs]) fi -if test "$ol_enable_discreteaci" != no ; then - AC_DEFINE(SLAPD_ACI_DISCRETE_RIGHTS,1,[define to support discrete rights in ACIs]) -fi if test "$ol_link_modules" != no ; then AC_DEFINE(SLAPD_MODULES,1,[define to support modules]) @@ -2231,6 +2276,19 @@ if test "$ol_link_bdb2" != no ; then fi fi +if test "$ol_enable_dnssrv" != no ; then + AC_DEFINE(SLAPD_DNSSRV,1,[define to support DNS SRV backend]) + BUILD_SLAPD=yes + BUILD_DNSSRV=yes + if test "$ol_with_dnssrv_module" != static ; then + AC_DEFINE(SLAPD_DNSSRV_DYNAMIC,1, + [define to support dynamic DNS SRV backend]) + BUILD_DNSSRV=mod + BUILD_DNSSRV_DYNAMIC=shared + SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-dnssrv/back_dnssrv.la" + fi +fi + if test "$ol_enable_ldap" != no ; then AC_DEFINE(SLAPD_LDAP,1,[define to support LDAP backend]) BUILD_SLAPD=yes @@ -2309,6 +2367,20 @@ if test "$ol_enable_tcl" != no ; then fi fi +if test "$ol_enable_sql" != no ; then + AC_DEFINE(SLAPD_SQL,1,[define to support SQL backend]) + BUILD_SLAPD=yes + BUILD_SQL=yes + SLAPD_SQL_LIBS=-liodbc + if test "$ol_with_sql_module" != static; then + AC_DEFINE(SLAPD_SQL_DYNAMIC,1, + [define to support dynamic SQL backend]) + BUILD_SQL=mod + BUILD_SQL_DYNAMIC=shared + SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-sql/back_sql.la" + fi +fi + if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \ $BUILD_SLAPD = yes ; then BUILD_SLURPD=yes @@ -2346,19 +2418,23 @@ AC_SUBST(DYN_EXT) AC_SUBST(BUILD_LDAPD) AC_SUBST(BUILD_SLAPD) AC_SUBST(BUILD_BDB2) + AC_SUBST(BUILD_DNSSRV) AC_SUBST(BUILD_LDAP) AC_SUBST(BUILD_LDBM) AC_SUBST(BUILD_PASSWD) AC_SUBST(BUILD_PERL) AC_SUBST(BUILD_QUIPU) AC_SUBST(BUILD_SHELL) + AC_SUBST(BUILD_SQL) AC_SUBST(BUILD_TCL) AC_SUBST(BUILD_BDB2_DYNAMIC) + AC_SUBST(BUILD_DNSSRV_DYNAMIC) AC_SUBST(BUILD_LDAP_DYNAMIC) AC_SUBST(BUILD_LDBM_DYNAMIC) AC_SUBST(BUILD_PASSWD_DYNAMIC) AC_SUBST(BUILD_PERL_DYNAMIC) AC_SUBST(BUILD_SHELL_DYNAMIC) + AC_SUBST(BUILD_SQL_DYNAMIC) AC_SUBST(BUILD_TCL_DYNAMIC) AC_SUBST(BUILD_SLURPD) @@ -2389,6 +2465,11 @@ AC_SUBST(SASL_LIBS) AC_SUBST(TERMCAP_LIBS) AC_SUBST(TLS_LIBS) AC_SUBST(MODULES_LIBS) +AC_SUBST(AUTH_LIBS) + +AC_SUBST(SLAPD_SQL_LDFLAGS) +AC_SUBST(SLAPD_SQL_LIBS) +AC_SUBST(SLAPD_SQL_INCLUDES) dnl ---------------------------------------------------------------- dnl final output @@ -2418,16 +2499,19 @@ libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib. libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk \ libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.mk:build/lib-static.mk \ libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk:build/lib-static.mk \ +libraries/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 \ servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk \ servers/ldapd/Makefile:build/top.mk:servers/ldapd/Makefile.in:build/srv.mk \ servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \ servers/slapd/back-bdb2/Makefile:build/top.mk:servers/slapd/back-bdb2/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-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-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk \ servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk \ servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk \ +servers/slapd/back-sql/Makefile:build/top.mk:servers/slapd/back-sql/Makefile.in:build/mod.mk \ servers/slapd/back-tcl/Makefile:build/top.mk:servers/slapd/back-tcl/Makefile.in:build/mod.mk \ servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk \ servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \