X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=be8a6f487d68321c70746301f14184373916fec9;hb=c4c6a38a0b8b48a3a733a43357b9eda7bf6d3acf;hp=e87134d6641eb597bcae8c189d1155094f4d1f03;hpb=27616a70667250a46f0a1e74cea60bfbdad2b5a2;p=openldap

diff --git a/configure.in b/configure.in
index e87134d664..be8a6f487d 100644
--- a/configure.in
+++ b/configure.in
@@ -238,9 +238,6 @@ OL_ARG_WITH(shell_module,[    --with-shell-module	  module type static|dynamic],
 OL_ARG_ENABLE(sql,[    --enable-sql	  enable sql backend], no)dnl
 OL_ARG_WITH(sql_module,[    --with-sql-module	  module type static|dynamic], 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|dynamic], static,
-	[static dynamic])
 
 dnl ----------------------------------------------------------------
 dnl SLAPD Overlay Options
@@ -250,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
@@ -305,9 +304,6 @@ if test $ol_enable_slapd = no ; then
 	if test $ol_enable_shell = yes ; then
 		AC_MSG_WARN([slapd disabled, ignoring --enable-shell argument])
 	fi
-	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
@@ -365,9 +361,6 @@ if test $ol_enable_slapd = no ; then
 	if test $ol_with_shell_module != static ; then
 		AC_MSG_WARN([slapd disabled, ignoring --with-shell-module argument])
 	fi
-	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
@@ -383,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
@@ -397,7 +393,6 @@ if test $ol_enable_slapd = no ; then
 	ol_enable_passwd=no
 	ol_enable_perl=no
 	ol_enable_shell=no
-	ol_enable_tcl=no
 	ol_enable_sql=no
 
 	ol_enable_modules=no
@@ -405,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
@@ -421,7 +415,6 @@ if test $ol_enable_slapd = no ; then
 	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
@@ -430,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
@@ -457,8 +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 \
-		$ol_enable_tcl = no ; then
+		$ol_enable_sql = no ; then
 
 		if test $ol_enable_slapd = yes ; then
 			AC_MSG_ERROR([slapd requires a backend])
@@ -575,7 +568,6 @@ BUILD_PASSWD=no
 BUILD_PERL=no
 BUILD_SHELL=no
 BUILD_SQL=no
-BUILD_TCL=no
 
 BUILD_BDB_DYNAMIC=static
 BUILD_DNSSRV_DYNAMIC=static
@@ -588,11 +580,11 @@ BUILD_NULL_DYNAMIC=static
 BUILD_PASSWD_DYNAMIC=static
 BUILD_PERL_DYNAMIC=static
 BUILD_SHELL_DYNAMIC=static
-BUILD_TCL_DYNAMIC=static
 BUILD_SQL_DYNAMIC=static
 
 BUILD_DYNGROUP=no
 BUILD_PROXYCACHE=no
+BUILD_RWM=no
 
 SLAPD_DYNAMIC_OVERLAYS=
 
@@ -610,11 +602,9 @@ SLAPD_SQL_LDFLAGS=
 SLAPD_SQL_LIBS=
 SLAPD_SQL_INCLUDES=
 
-MOD_TCL_LIB=
 KRB4_LIBS=
 KRB5_LIBS=
 SASL_LIBS=
-TERMCAP_LIBS=
 TLS_LIBS=
 MODULES_LIBS=
 SLAPI_LIBS=
@@ -822,7 +812,6 @@ else
 	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
 	if test $ol_with_dyngroup = mod ; then
 		AC_MSG_WARN([building static dyngroup overlay])
@@ -832,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 ----------------------------------------------------------------
@@ -854,6 +847,7 @@ AC_CHECK_HEADERS(	\
 	arpa/inet.h		\
 	arpa/nameser.h	\
 	assert.h		\
+	bits/types.h	\
 	conio.h			\
 	crypt.h			\
 	direct.h		\
@@ -2175,63 +2169,6 @@ if test $ol_enable_sql != no ; then
 	fi
 fi
 
-dnl ----------------------------------------------------------------
-dnl TCL
-if test $ol_enable_tcl != no ; then
-	AC_CHECK_HEADERS(tcl.h)
-
-	if test $ac_cv_header_tcl_h != yes ; then
-		have_tcl=no
-	else
-		for lib in tcl tcl7.6 tcl8.0 tcl8.2 ; do
-			AC_CHECK_LIB($lib,main,
-			  [have_tcl=yes
-			   if test x"$ol_with_tcl_module" = "xstatic" ; then
-					SLAPD_LIBS="$SLAPD_LIBS -l${lib}"
-			   else
-					MOD_TCL_LIB="-l${lib}"
-			   fi;break],[have_tcl=no])
-		done
-	fi
-
-	if test $have_tcl != yes ; then
-		AC_MSG_WARN([could not find -ltcl])
-		if test $ol_enable_tcl = yes ; then
-			AC_MSG_ERROR([could not find tcl, select appropriate options or disable])
-		fi
-
-		ol_enable_tcl=no
-	fi
-fi
-
-dnl ----------------------------------------------------------------
-dnl ud needs termcap (should insert check here)
-ol_link_termcap=no
-AC_CHECK_HEADERS(termcap.h ncurses.h)
-
-if test $ol_link_termcap = no ; then
-	AC_CHECK_LIB(termcap, tputs, [have_termcap=yes], [have_termcap=no])
-	if test $have_termcap = yes ; then
-		AC_DEFINE(HAVE_TERMCAP, 1, [define if you have -ltermcap])
-		ol_link_termcap=yes
-		TERMCAP_LIBS=-ltermcap
-	fi
-fi
-
-if test $ol_link_termcap = no ; then
-	AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
-	if test $have_ncurses = yes ; then
-		AC_DEFINE(HAVE_NCURSES, 1, [define if you have -lncurses])
-		ol_link_termcap=yes
-		TERMCAP_LIBS=-lncurses
-	fi
-fi
-
-if test $ol_link_termcap = no ; then
-	AC_DEFINE(NO_TERMCAP,1, [define if you have no termcap support])
-	TERMCAP_LIBS=
-fi
-
 dnl ----------------------------------------------------------------
 dnl
 dnl Check for Cyrus SASL
@@ -2804,21 +2741,6 @@ if test "$ol_enable_shell" != no ; then
 	fi
 fi
 
-if test "$ol_enable_tcl" != no ; then
-	AC_DEFINE(SLAPD_TCL,1,[define to support TCL backend])
-	BUILD_SLAPD=yes
-	BUILD_TCL=yes
-	if test "$ol_with_tcl_module" != static; then
-		AC_DEFINE(SLAPD_TCL_DYNAMIC,1,
-			[define to support dynamic TCL backend])
-		BUILD_TCL=mod
-		BUILD_TCL_DYNAMIC=shared
-		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-tcl"
-	else
-		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-tcl"
-	fi
-fi
-
 if test "$ol_link_sql" != no ; then
 	AC_DEFINE(SLAPD_SQL,1,[define to support SQL backend])
 	BUILD_SLAPD=yes
@@ -2856,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
@@ -2912,7 +2846,6 @@ AC_SUBST(BUILD_SLAPD)
   AC_SUBST(BUILD_PERL)
   AC_SUBST(BUILD_SHELL)
   AC_SUBST(BUILD_SQL)
-  AC_SUBST(BUILD_TCL)
   AC_SUBST(BUILD_BDB_DYNAMIC)
   AC_SUBST(BUILD_DNSSRV_DYNAMIC)
   AC_SUBST(BUILD_HDB_DYNAMIC)
@@ -2925,9 +2858,9 @@ AC_SUBST(BUILD_SLAPD)
   AC_SUBST(BUILD_PERL_DYNAMIC)
   AC_SUBST(BUILD_SHELL_DYNAMIC)
   AC_SUBST(BUILD_SQL_DYNAMIC)
-  AC_SUBST(BUILD_TCL_DYNAMIC)
   AC_SUBST(BUILD_DYNGROUP)
   AC_SUBST(BUILD_PROXYCACHE)
+  AC_SUBST(BUILD_RWM)
 AC_SUBST(BUILD_SLURPD)
 
 AC_SUBST(LDAP_LIBS)
@@ -2937,7 +2870,6 @@ AC_SUBST(LDBM_LIBS)
 AC_SUBST(LTHREAD_LIBS)
 AC_SUBST(LUTIL_LIBS)
 AC_SUBST(WRAP_LIBS)
-AC_SUBST(MOD_TCL_LIB)
 
 AC_SUBST(SLAPD_MODULES_CPPFLAGS)
 AC_SUBST(SLAPD_MODULES_LDFLAGS)
@@ -2954,7 +2886,6 @@ AC_SUBST(MOD_PERL_LDFLAGS)
 AC_SUBST(KRB4_LIBS)
 AC_SUBST(KRB5_LIBS)
 AC_SUBST(SASL_LIBS)
-AC_SUBST(TERMCAP_LIBS)
 AC_SUBST(TLS_LIBS)
 AC_SUBST(MODULES_LIBS)
 AC_SUBST(SLAPI_LIBS)
@@ -3009,10 +2940,9 @@ servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefi
 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/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 \