X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=be8a6f487d68321c70746301f14184373916fec9;hb=c4c6a38a0b8b48a3a733a43357b9eda7bf6d3acf;hp=17f4af9220009c211edcfecd5d39c96fc721b974;hpb=9201971c59d33bb32b6a40b759abd31de1d906f7;p=openldap diff --git a/configure.in b/configure.in index 17f4af9220..be8a6f487d 100644 --- a/configure.in +++ b/configure.in @@ -1,14 +1,19 @@ dnl $OpenLDAP$ +dnl This work is part of OpenLDAP Software . +dnl +dnl Copyright 1998-2003 The OpenLDAP Foundation. +dnl All rights reserved. dnl -dnl Copyright 1998-2003 The OpenLDAP Foundation. All Rights Reserved. -dnl dnl Redistribution and use in source and binary forms, with or without dnl modification, are permitted only as authorized by the OpenLDAP -dnl Public License. A copy of this license is available at -dnl http://www.OpenLDAP.org/license.html or in file LICENSE in the -dnl top-level directory of the distribution. +dnl Public License. +dnl +dnl A copy of this license is available in the file LICENSE in the +dnl top-level directory of the distribution or, alternatively, at +dnl . dnl dnl ---------------------------------------------------------------- +dnl dnl Redefine AC_INIT_BINSH to provide RCS IDs and copyright notice dnl at top of generated configure script. Prints simple copyright. define([AC_INIT_BINSH], @@ -16,15 +21,20 @@ define([AC_INIT_BINSH], # $]OpenLDAP[$ # from] translit([$OpenLDAP$], $")] [ -# Copyright 1998-2003 The OpenLDAP Foundation. All Rights Reserved. -# +# This work is part of OpenLDAP Software . +# +# Copyright 1998-2003 The OpenLDAP Foundation. +# All rights reserved. +# # Redistribution and use in source and binary forms, with or without # modification, are permitted only as authorized by the OpenLDAP -# Public License. A copy of this license is available at -# http://www.OpenLDAP.org/license.html or in file LICENSE in the -# top-level directory of the distribution. +# Public License. +# +# A copy of this license is available in the file LICENSE in the +# top-level directory of the distribution or, alternatively, at +# . -echo "Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved." +echo "Copyright 1998-2003 The OpenLDAP Foundation. All rights reserved." echo " Restrictions apply, see COPYRIGHT and LICENSE files." ])dnl dnl ---------------------------------------------------------------- @@ -228,9 +238,17 @@ 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 +AC_ARG_WITH(xxslapoverlays,[ +SLAPD Overlay Options:]) +OL_ARG_WITH(dyngroup,[ --with-dyngroup Dynamic Group overlay no|yes|mod], no, + [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 @@ -286,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 @@ -346,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 @@ -358,6 +370,15 @@ if test $ol_enable_slapd = no ; then if test $ol_enable_rewrite = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-rewrite argument]) fi + if test $ol_with_dyngroup != no ; then + AC_MSG_WARN([slapd disabled, ignoring --with-dyngroup argument]) + fi + 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 @@ -372,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 @@ -380,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 @@ -396,13 +415,16 @@ 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 ol_enable_rewrite=no + ol_with_dyngroup=no + ol_with_proxycache=no + ol_with_rwm=no + elif test $ol_enable_ldbm = no ; then dnl SLAPD without LDBM @@ -429,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]) @@ -520,7 +541,6 @@ AC_MSG_RESULT(done) dnl ---------------------------------------------------------------- dnl Initialize vars LDAP_LIBS= -LDIF_LIBS= LDBM_LIBS= LTHREAD_LIBS= LUTIL_LIBS= @@ -543,13 +563,11 @@ BUILD_LDAP=no BUILD_LDBM=no BUILD_META=no BUILD_MONITOR=no -BUILD_CACHE=no BUILD_NULL=no BUILD_PASSWD=no BUILD_PERL=no BUILD_SHELL=no BUILD_SQL=no -BUILD_TCL=no BUILD_BDB_DYNAMIC=static BUILD_DNSSRV_DYNAMIC=static @@ -562,9 +580,14 @@ 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= + SLAPD_MODULES_LDFLAGS= SLAPD_MODULES_CPPFLAGS= @@ -579,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= @@ -682,11 +703,12 @@ if test $ol_enable_perl != no ; then else PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`" - PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/\ -lc\ //g -e s/\ -lc\$// `" + PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e 's/ -lc / /' -e 's/ -lc$//'`" + if test x"$ol_with_perl_module" = "xstatic" ; then - SLAPD_PERL_LDFLAGS="$PERL_LDFLAGS"" + SLAPD_PERL_LDFLAGS="$PERL_LDFLAGS" else - MOD_PERL_LDFLAGS="$PERL_LDFLAGS"" + MOD_PERL_LDFLAGS="$PERL_LDFLAGS" fi dnl should check perl version ol_link_perl=yes @@ -790,8 +812,19 @@ 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]) + ol_with_dyngroup = yes + fi + if test $ol_with_proxycache = mod ; then + 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 ---------------------------------------------------------------- @@ -814,6 +847,7 @@ AC_CHECK_HEADERS( \ arpa/inet.h \ arpa/nameser.h \ assert.h \ + bits/types.h \ conio.h \ crypt.h \ direct.h \ @@ -1311,8 +1345,10 @@ else AC_WARN([TLS data protection not supported!]) fi +WITH_TLS=no if test $ol_link_tls = yes ; then AC_DEFINE(HAVE_TLS, 1, [define if you have TLS]) + WITH_TLS=yes elif test $ol_with_tls = auto ; then AC_WARN([Could not locate TLS/SSL package]) @@ -2084,7 +2120,7 @@ hosts_access(req) AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap]) WRAP_LIBS="-lwrap" elif test $ol_enable_wrappers = yes ; then - AC_MSG_ERROR([could not find TCP wrappers, select apppropriate options ore disable]) + AC_MSG_ERROR([could not find TCP wrappers, select apppropriate options or disable]) else AC_MSG_WARN([could not find TCP wrappers, support disabled]) WRAP_LIBS="" @@ -2133,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 @@ -2274,7 +2253,7 @@ if test $ol_with_fetch != no ; then OL_LIB_FETCH if test $ol_cv_lib_fetch != no ; then - LDIF_LIBS="$LDIF_LIBS $ol_link_fetch" + LUTIL_LIBS="$LUTIL_LIBS $ol_link_fetch" ol_link_fetch=freebsd elif test $ol_with_fetch != auto ; then @@ -2584,6 +2563,9 @@ if test "$ol_link_modules" != no ; then SLAPD_MODULES_LDFLAGS="-dlopen self" fi +AC_DEFINE(SLAPD_MOD_STATIC,1,[statically linked module]) +AC_DEFINE(SLAPD_MOD_DYNAMIC,2,[dynamically linked module]) + if test "$ol_enable_bdb" != no ; then AC_DEFINE(SLAPD_BDB,1,[define to support BDB backend]) BUILD_SLAPD=yes @@ -2670,10 +2652,6 @@ if test "$ol_enable_meta" != no ; then BUILD_SLAPD=yes BUILD_META=yes BUILD_REWRITE=yes - if test $ol_enable_ldbm = yes -o \ - $ol_enable_bdb = yes ; then - BUILD_CACHE=yes - fi if test "$ol_with_meta_module" != static ; then AC_DEFINE(SLAPD_META_DYNAMIC,1, [define to support dynamic LDAP Metadirectory backend]) @@ -2763,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 @@ -2793,6 +2756,40 @@ if test "$ol_link_sql" != no ; then fi fi +if test "$ol_with_dyngroup" != no ; then + BUILD_DYNGROUP=$ol_with_dyngroup + if test "$ol_with_dyngroup" = mod ; then + MFLAG=SLAPD_MOD_DYNAMIC + SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS dyngroup.la" + else + MFLAG=SLAPD_MOD_STATIC + fi + AC_DEFINE_UNQUOTED(SLAPD_OVER_DYNGROUP,$MFLAG,[define for Dynamic Group overlay]) +fi + +if test "$ol_with_proxycache" != no ; then + BUILD_PROXYCACHE=$ol_with_proxycache + if test "$ol_with_proxycache" = mod ; then + MFLAG=SLAPD_MOD_DYNAMIC + SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS pcache.la" + else + MFLAG=SLAPD_MOD_STATIC + fi + 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 @@ -2831,6 +2828,7 @@ fi AC_SUBST(LIBSRCS) AC_SUBST(PLAT) +AC_SUBST(WITH_TLS) AC_SUBST(BUILD_LIBS_DYNAMIC) AC_SUBST(BUILD_SLAPD) @@ -2843,13 +2841,11 @@ AC_SUBST(BUILD_SLAPD) AC_SUBST(BUILD_LDBM) AC_SUBST(BUILD_META) AC_SUBST(BUILD_MONITOR) - AC_SUBST(BUILD_CACHE) AC_SUBST(BUILD_NULL) AC_SUBST(BUILD_PASSWD) 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) @@ -2862,18 +2858,18 @@ 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) -AC_SUBST(LDIF_LIBS) AC_SUBST(SLAPD_LIBS) AC_SUBST(SLURPD_LIBS) 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) @@ -2881,6 +2877,7 @@ AC_SUBST(SLAPD_MODULES_LDFLAGS) AC_SUBST(SLAPD_NO_STATIC) AC_SUBST(SLAPD_STATIC_BACKENDS) AC_SUBST(SLAPD_DYNAMIC_BACKENDS) +AC_SUBST(SLAPD_DYNAMIC_OVERLAYS) AC_SUBST(PERL_CPPFLAGS) AC_SUBST(SLAPD_PERL_LDFLAGS) @@ -2889,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) @@ -2924,12 +2920,9 @@ clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk \ clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \ include/Makefile:build/top.mk:include/Makefile.in \ libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk \ -libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk:build/lib-static.mk \ libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk \ libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk \ 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 \ libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk \ @@ -2947,14 +2940,16 @@ 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 \ 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 \ +tests/run \ tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \ ,[ +chmod +x tests/run date > stamp-h echo Please run \"make depend\" to build dependencies ])