Dont mention bare oc in list.

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index f14963303209e6a75204325fd8c3716d3ce309c4..be8a6f487d68321c70746301f14184373916fec9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -247,6 +247,8 @@ OL_ARG_WITH(dyngroup,[    --with-dyngroup     Dynamic Group overlay no|yes|mod], n
        [no yes mod])
 OL_ARG_WITH(proxycache,[    --with-proxycache    Proxy Cache overlay no|yes|mod], no,
        [no yes mod])
+OL_ARG_WITH(rwm,[    --with-rwm          Rewrite/Remap overlay no|yes|mod], no,
+       [no yes mod])
 
 dnl ----------------------------------------------------------------
 dnl SLURPD OPTIONS
@@ -374,6 +376,9 @@ if test $ol_enable_slapd = no ; then
        if test $ol_with_proxycache != no ; then
                AC_MSG_WARN([slapd disabled, ignoring --with-proxycache argument])
        fi
+       if test $ol_with_rwm != no ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-rwm argument])
+       fi
 
        # force settings to no
        ol_enable_slapi=no
@@ -395,7 +400,6 @@ if test $ol_enable_slapd = no ; then
        ol_enable_rlookups=no
        ol_enable_aci=no
        ol_enable_wrappers=no
-       ol_enable_dynamic=no
 
        ol_with_ldbm_api=no
        ol_with_ldbm_type=no
@@ -419,6 +423,7 @@ if test $ol_enable_slapd = no ; then
 
        ol_with_dyngroup=no
        ol_with_proxycache=no
+       ol_with_rwm=no
 
 elif test $ol_enable_ldbm = no ; then
        dnl SLAPD without LDBM
@@ -446,7 +451,7 @@ elif test $ol_enable_ldbm = no ; then
                $ol_enable_passwd = no -a \
                $ol_enable_perl = no -a \
                $ol_enable_shell = no -a \
-               $ol_enable_sql = no -a ; then
+               $ol_enable_sql = no ; then
 
                if test $ol_enable_slapd = yes ; then
                        AC_MSG_ERROR([slapd requires a backend])
@@ -579,6 +584,7 @@ BUILD_SQL_DYNAMIC=static
 
 BUILD_DYNGROUP=no
 BUILD_PROXYCACHE=no
+BUILD_RWM=no
 
 SLAPD_DYNAMIC_OVERLAYS=
 
@@ -815,6 +821,10 @@ else
                AC_MSG_WARN([building static proxycache overlay])
                ol_with_proxycache = yes
        fi
+       if test $ol_with_rwm = mod ; then
+               AC_MSG_WARN([building static rwm overlay])
+               ol_with_rwm = yes
+       fi
 fi
 
 dnl ----------------------------------------------------------------
@@ -837,6 +847,7 @@ AC_CHECK_HEADERS(   \
        arpa/inet.h             \
        arpa/nameser.h  \
        assert.h                \
+       bits/types.h    \
        conio.h                 \
        crypt.h                 \
        direct.h                \
@@ -2767,6 +2778,18 @@ if test "$ol_with_proxycache" != no ; then
        AC_DEFINE_UNQUOTED(SLAPD_OVER_PROXYCACHE,$MFLAG,[define for Proxy Cache overlay])
 fi
 
+if test "$ol_with_rwm " != no ; then
+       BUILD_REWRITE=yes
+       BUILD_RWM=$ol_with_rwm
+       if test "$ol_with_rwm" = mod ; then
+               MFLAG=SLAPD_MOD_DYNAMIC
+               SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS rwm.la"
+       else
+               MFLAG=SLAPD_MOD_STATIC
+       fi
+       AC_DEFINE_UNQUOTED(SLAPD_OVER_RWM,$MFLAG,[define for Rewrite/Remap overlay])
+fi
+
 if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \
        $BUILD_SLAPD = yes ; then
        BUILD_SLURPD=yes
@@ -2837,6 +2860,7 @@ AC_SUBST(BUILD_SLAPD)
   AC_SUBST(BUILD_SQL_DYNAMIC)
   AC_SUBST(BUILD_DYNGROUP)
   AC_SUBST(BUILD_PROXYCACHE)
+  AC_SUBST(BUILD_RWM)
 AC_SUBST(BUILD_SLURPD)
 
 AC_SUBST(LDAP_LIBS)
@@ -2918,7 +2942,7 @@ servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile
 servers/slapd/back-sql/Makefile:build/top.mk:servers/slapd/back-sql/Makefile.in:build/mod.mk \
 servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk \
 servers/slapd/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk  \
-servers/slapd/overlays/Makefile:build/top.mk:servers/slapd/overlays/Makefile.in:build/lib.mk:build/lib-shared.mk  \
+servers/slapd/overlays/Makefile:build/top.mk:servers/slapd/overlays/Makefile.in:build/lib.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 \
 tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \