Fix dynamic linking dependencies for NT and Unix

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index 5c74148bdfe373db26bba838bcdf26dab3d46028..130d6b3e8c2828d309f487eb50d42900d9f4aadf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -137,7 +137,6 @@ 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(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
@@ -150,6 +149,9 @@ 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])
@@ -160,7 +162,6 @@ 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])
@@ -170,12 +171,12 @@ 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(tcl,[    --enable-tcl    enable tcl backend], no)dnl
-OL_ARG_WITH(tcl_module,[      --with-tcl-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])
 
 dnl ----------------------------------------------------------------
 dnl SLURPD OPTIONS
@@ -207,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
@@ -258,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
@@ -285,6 +292,7 @@ if test $ol_enable_slapd = no ; then
 
        # force settings to no
        ol_enable_bdb2=no
+       ol_enable_dnssrv=no
        ol_enable_ldap=no
        ol_enable_ldbm=no
        ol_enable_passwd=no
@@ -306,6 +314,7 @@ 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
@@ -336,12 +345,13 @@ 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_tcl = no -a \
-               $ol_enable_sql = no ; then
+               $ol_enable_sql = no -a \
+               $ol_enable_tcl = no ; then
                AC_MSG_ERROR([slapd requires a backend])
        fi
 
@@ -407,7 +417,7 @@ 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_with_cyrus_sasl=yes
+       ol_link_spasswd=yes
 fi
 
 AC_MSG_RESULT(done)
@@ -428,18 +438,21 @@ 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_TCL=no
 BUILD_SQL=no
-BUILD_THREAD=no
+BUILD_TCL=no
 
 BUILD_BDB2_DYNAMIC=static
+BUILD_DNSSRV_DYNAMIC=static
 BUILD_LDAP_DYNAMIC=static
 BUILD_LDBM_DYNAMIC=static
 BUILD_PASSWD_DYNAMIC=static
@@ -641,6 +654,7 @@ 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
@@ -1903,6 +1917,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)
 
@@ -2107,6 +2122,7 @@ fi
 AC_CHECK_FUNCS(                \
        bcopy                   \
        closesocket             \
+       chroot                  \
        endgrent                \
        endpwent                \
        flock                   \
@@ -2252,6 +2268,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
@@ -2381,22 +2410,24 @@ 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_TCL)
   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_TCL_DYNAMIC)
   AC_SUBST(BUILD_SQL_DYNAMIC)
+  AC_SUBST(BUILD_TCL_DYNAMIC)
 AC_SUBST(BUILD_SLURPD)
 
 AC_SUBST(LDAP_LIBS)
@@ -2465,13 +2496,14 @@ 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-tcl/Makefile:build/top.mk:servers/slapd/back-tcl/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 \
 servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \