ITS#4589: code rewrite to use op->o_csn. Bug may still occur.

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index 8a43a15bd61f21638fbf9ff1b8f932f6c82d802e..b5d67fd882cc73827145bc85225f645eb30b69e6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -338,6 +338,7 @@ OL_ARG_ENABLE(sql,[    --enable-sql   enable sql backend],
 dnl ----------------------------------------------------------------
 dnl SLAPD Overlay Options
 Overlays="accesslog \
+       auditlog \
        denyop \
        dyngroup \
        dynlist \
@@ -359,6 +360,8 @@ OL_ARG_ENABLE(overlays,[    --enable-overlays         enable all available overlays],
        --, [no yes mod])dnl
 OL_ARG_ENABLE(accesslog,[    --enable-accesslog          In-Directory Access Logging overlay],
        no, [no yes mod], ol_enable_overlays)
+OL_ARG_ENABLE(auditlog,[    --enable-auditlog    Audit Logging overlay],
+       no, [no yes mod], ol_enable_overlays)
 OL_ARG_ENABLE(denyop,[    --enable-denyop        Deny Operation overlay],
        no, [no yes mod], ol_enable_overlays)
 OL_ARG_ENABLE(dyngroup,[    --enable-dyngroup    Dynamic Group overlay],
@@ -612,6 +615,7 @@ BUILD_SHELL=no
 BUILD_SQL=no
 
 BUILD_ACCESSLOG=no
+BUILD_AUDITLOG=no
 BUILD_DENYOP=no
 BUILD_DYNGROUP=no
 BUILD_DYNLIST=no
@@ -899,10 +903,13 @@ AC_CHECK_HEADERS( \
        termios.h               \
        unistd.h                \
        utime.h                 \
-       winsock.h               \
-       winsock2.h              \
 )
 
+dnl Only check Winsock on MinGW
+if test "$ac_cv_mingw32" = yes ; then
+       AC_CHECK_HEADERS( winsock.h winsock2.h )
+fi
+
 AC_CHECK_HEADERS( resolv.h, [], [],
 [$ac_includes_default
 #include <netinet/in.h>
@@ -934,9 +941,7 @@ fi
 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
-dnl
-dnl Skip Winsock tests on Cygwin
-if test "$ac_cv_cygwin" != yes && test "$ac_cv_header_winsock_h" = yes; then
+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
@@ -2412,7 +2417,7 @@ AC_DEFINE(LBER_TAG_T,long,[define to large integer type])
 dnl ----------------------------------------------------------------
 dnl Check for multiple precision support
 if test $ol_with_mp = longlong || test $ol_with_mp = auto ; then
-       if test $ac_cv_sizeof_long_long > 4 ; then
+       if test $ac_cv_sizeof_long_long -gt 4 ; then
                ol_with_mp=longlong
                AC_DEFINE(USE_MP_LONG_LONG,1,[define to use 'long long' for MP])
        elif test $ol_with_mp = longlong ; then
@@ -2420,7 +2425,7 @@ if test $ol_with_mp = longlong || test $ol_with_mp = auto ; then
        fi
 fi
 if test $ol_with_mp = long || test $ol_with_mp = auto ; then
-       if test $ac_cv_sizeof_long > 4 ; then
+       if test $ac_cv_sizeof_long -gt 4 ; then
                ol_with_mp=long
                AC_DEFINE(USE_MP_LONG,1,[define to use 'long' for MP])
        elif test $ol_with_mp = long ; then
@@ -2442,7 +2447,7 @@ fi
 if test $ol_with_mp = gmp || test $ol_with_mp = auto ; then
        AC_CHECK_HEADERS(gmp.h)
        AC_CHECK_LIB(gmp, __gmpz_add_ui)
-       if test $ac_cv_header_gmp_h = yes && test $ac_cv_lib_gmp = yes ; then
+       if test $ac_cv_header_gmp_h = yes && test $ac_cv_lib_gmp___gmpz_add_ui = yes ; then
                AC_DEFINE(USE_MP_GMP,1,[define to use GMP for MP])
                ol_with_mp=gmp
        elif test $ol_with_mp = gmp ; then
@@ -2835,6 +2840,18 @@ if test "$ol_enable_accesslog" != no ; then
        AC_DEFINE_UNQUOTED(SLAPD_OVER_ACCESSLOG,$MFLAG,[define for In-Directory Access Logging overlay])
 fi
 
+if test "$ol_enable_auditlog" != no ; then
+       BUILD_AUDITLOG=$ol_enable_auditlog
+       if test "$ol_enable_auditlog" = mod ; then
+               MFLAG=SLAPD_MOD_DYNAMIC
+               SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS auditlog.la"
+       else
+               MFLAG=SLAPD_MOD_STATIC
+               SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS auditlog.o"
+       fi
+       AC_DEFINE_UNQUOTED(SLAPD_OVER_AUDITLOG,$MFLAG,[define for Audit Logging overlay])
+fi
+
 if test "$ol_enable_denyop" != no ; then
        BUILD_DENYOP=$ol_enable_denyop
        if test "$ol_enable_denyop" = mod ; then
@@ -3052,6 +3069,7 @@ dnl backends
   AC_SUBST(BUILD_SQL)
 dnl overlays
   AC_SUBST(BUILD_ACCESSLOG)
+  AC_SUBST(BUILD_AUDITLOG)
   AC_SUBST(BUILD_DENYOP)
   AC_SUBST(BUILD_DYNGROUP)
   AC_SUBST(BUILD_DYNLIST)