dnl $OpenLDAP$
dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
dnl
-dnl Copyright 1998-2003 The OpenLDAP Foundation.
+dnl Copyright 1998-2004 The OpenLDAP Foundation.
dnl All rights reserved.
dnl
dnl Redistribution and use in source and binary forms, with or without
# This work is part of OpenLDAP Software <http://www.openldap.org/>.
#
-# Copyright 1998-2003 The OpenLDAP Foundation.
+# Copyright 1998-2004 The OpenLDAP Foundation.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# top-level directory of the distribution or, alternatively, at
# <http://www.OpenLDAP.org/license.html>.
-echo "Copyright 1998-2003 The OpenLDAP Foundation. All rights reserved."
+echo "Copyright 1998-2004 The OpenLDAP Foundation. All rights reserved."
echo " Restrictions apply, see COPYRIGHT and LICENSE files."
])dnl
dnl ----------------------------------------------------------------
[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
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
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
ol_with_dyngroup=no
ol_with_proxycache=no
+ ol_with_rwm=no
elif test $ol_enable_ldbm = no ; then
dnl SLAPD without LDBM
$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])
BUILD_DYNGROUP=no
BUILD_PROXYCACHE=no
+BUILD_RWM=no
SLAPD_DYNAMIC_OVERLAYS=
ol_with_sql_module=static
if test $ol_with_dyngroup = mod ; then
AC_MSG_WARN([building static dyngroup overlay])
- ol_with_dyngroup = yes
+ ol_with_dyngroup=yes
fi
if test $ol_with_proxycache = mod ; then
AC_MSG_WARN([building static proxycache overlay])
- ol_with_proxycache = yes
+ 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
arpa/inet.h \
arpa/nameser.h \
assert.h \
+ bits/types.h \
conio.h \
crypt.h \
direct.h \
dnl ----------------------------------------------------------------
dnl Checks for libraries
-AC_CHECK_FUNC(dlopen, :, [AC_CHECK_LIB(dl, dlopen)])
-
dnl HP-UX requires -lV3
dnl this is not needed on newer versions of HP-UX
AC_CHECK_LIB(V3, sigset)
dnl The following is INTENTIONALLY scripted out because shell does not
dnl support variable names with the '@' character, which is what
dnl autoconf would try to generate if one merely used AC_SEARCH_LIBS
-AC_MSG_CHECKING(for winsock)
+if test "$ac_cv_header_winsock_h" = yes; then
+AC_CACHE_CHECK([for winsock], [ol_cv_winsock],
save_LIBS="$LIBS"
for curlib in ws2_32 wsock32; do
LIBS="$LIBS -l$curlib"
- AC_TRY_LINK([
- char socket@12();
- char select@20();
- char closesocket@4();
- char gethostname@8();
+ AC_TRY_LINK([#include <winsock.h>
],
[
- socket@12();
- select@20();
- closesocket@4();
- gethostname@8();
+ socket(0,0,0);
+ select(0,NULL,NULL,NULL,NULL);
+ closesocket(0);
+ gethostname(NULL,0);
],
- have_winsock=yes, have_winsock=no)
+ ol_cv_winsock=yes, ol_cv_winsock=no)
- if test $have_winsock = yes; then
+ if test $ol_cv_winsock = yes; then
AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])
ac_cv_func_socket=yes
ac_cv_func_select=yes
ac_cv_func_closesocket=yes
ac_cv_func_gethostname=yes
if test $curlib = ws2_32; then
- have_winsock=winsock2
+ ol_cv_winsock=winsock2
AC_DEFINE(HAVE_WINSOCK2, 1,
[define if you have winsock2])
fi
break
fi
LIBS="$save_LIBS"
-done
-AC_MSG_RESULT($have_winsock)
+done)
+fi
dnl Find socket()
dnl Likely combinations:
save_LIBS="$LIBS"
LIBS="$LIBS -lrpcrt4"
AC_TRY_LINK([
- char UuidCreate@4();
- char UuidToStringA@8();
+ int __stdcall UuidCreate(void *);
+ int __stdcall UuidToStringA(void *,void **);
],
[
- UuidCreate@4();
- UuidToStringA@8();
+ UuidCreate(0);
+ UuidToStringA(0,0);
],
need_rpcrt=yes, need_rpcrt=no)
if test $need_rpcrt = yes; 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
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)
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 \
projects / openldap / blobdiff