Preliminary Make rules to allow building backends as modules.

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index 3c41b6a5268813e9ca313602f6375f864ef8a3ce..86182b0c062b841c977ccd957751a97c7dec23a7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -101,6 +101,7 @@ OL_ARG_ENABLE(crypt,[    --enable-crypt     enable crypt(3) passwords], auto)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(wrappers,[    --enable-wrappers  enable tcp wrapper support], no)dnl
 
@@ -188,6 +189,9 @@ if test $ol_enable_slapd = no ; then
        if test $ol_enable_phonetic = yes ; then
                AC_MSG_WARN([slapd disabled, ignoring --enable-phonetic argument])
        fi
+       if test $ol_enable_quipu = yes ; then
+               AC_MSG_WARN([slapd disabled, ignoring --enable-quipu argument])
+       fi
        if test $ol_enable_rlookups = yes ; then
                AC_MSG_WARN([slapd disabled, ignoring --enable-rlookups argument])
        fi
@@ -234,6 +238,7 @@ if test $ol_enable_slapd = no ; then
        ol_enable_modules=no
        ol_enable_multimaster=no
        ol_enable_phonetic=no
+       ol_enable_quipu=no
        ol_enable_rlookups=no
        ol_enable_wrappers=no
 
@@ -346,6 +351,7 @@ BUILD_LDAP=no
 BUILD_LDBM=no
 BUILD_PASSWD=no
 BUILD_PERL=no
+BUILD_QUIPU=no
 BUILD_SHELL=no
 BUILD_TCL=no
 BUILD_THREAD=no
@@ -366,6 +372,7 @@ SLAPD_PERL_CPPFLAGS=
 
 KRB_LIBS=
 READLINE_LIBS=
+SASL_LIBS=
 TERMCAP_LIBS=
 TLS_LIBS=
 
@@ -700,6 +707,18 @@ if test $ol_link_isode != no; then
        AC_PATH_PROG(PEPSY, pepsy)
 fi
 
+if test $ol_enable_quipu != no ; then
+       AC_CHECK_HEADERS(quipu/commonarg.h)
+
+       if test $ac_cv_header_quipu_commonarg_h = yes ; then
+               BUILD_QUIPU=yes
+       elif test $ol_enable_quipu = auto ; then
+               AC_MSG_WARN([no quipu for --enable-quipu=auto, disabling])
+       else
+               AC_MSG_ERROR(no quipu for --enable-quipu=$ol_enable_quipu)
+       fi
+fi
+
 dnl
 dnl check for kerberos
 dnl
@@ -1661,7 +1680,7 @@ if test $ol_with_cyrus_sasl != no ; then
                        [have_cyrus_sasl=yes], [have_cyrus_sasl=no])
 
                if test $have_cyrus_sasl != no ; then
-                       LUTIL_LIBS="$LUTIL_LIBS -lsasl"
+                       SASL_LIBS="-lsasl"
                        AC_DEFINE(HAVE_CYRUS_SASL,1,[define if you have Cyrus SASL])
                        ol_link_sasl=yes
                fi
@@ -2022,6 +2041,7 @@ AC_SUBST(BUILD_SLAPD)
   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_BDB2_DYNAMIC)
@@ -2050,6 +2070,7 @@ AC_SUBST(SLAPD_PERL_LDFLAGS)
 
 AC_SUBST(KRB_LIBS)
 AC_SUBST(READLINE_LIBS)
+AC_SUBST(SASL_LIBS)
 AC_SUBST(TERMCAP_LIBS)
 AC_SUBST(TLS_LIBS)
 
@@ -2086,7 +2107,7 @@ 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/srv.mk \
-servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/srv.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/srv.mk \
 servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/srv.mk \
 servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/srv.mk \