mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-20 22:59:34 -05:00
Regenerate for collect overlay
This commit is contained in:
Howard Chu
parent
03078d5f26
commit
ca62039424
2 changed files with 60 additions and 19 deletions
76
configure
vendored
76
configure
vendored
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.667 2008/09/05 18:59:50 quanah Exp .
|
||||
# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.669 2008/09/10 22:35:12 hyc Exp .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59.
|
||||
#
|
||||
|
|
@ -465,7 +465,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar OPENLDAP_LIBRELEASE OPENLDAP_LIBVERSION OPENLDAP_RELEASE_DATE top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP LIBTOOL PERLBIN OL_MKDEP OL_MKDEP_FLAGS LTSTATIC MYSQL LIBOBJS LIBSRCS PLAT WITH_SASL WITH_TLS WITH_MODULES_ENABLED WITH_ACI_ENABLED BUILD_THREAD BUILD_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_META BUILD_MONITOR BUILD_NDB BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SOCK BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_CONSTRAINT BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_MEMBEROF BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SEQMOD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT LDAP_LIBS SLAPD_LIBS BDB_LIBS SLAPD_NDB_LIBS SLAPD_NDB_INCS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS SLAPD_MODULES_CPPFLAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_BACKENDS SLAPD_DYNAMIC_BACKENDS SLAPD_STATIC_OVERLAYS SLAPD_DYNAMIC_OVERLAYS PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOLS AUTH_LIBS ICU_LIBS SLAPD_SLP_LIBS SLAPD_GMP_LIBS SLAPD_SQL_LDFLAGS SLAPD_SQL_LIBS SLAPD_SQL_INCLUDES LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar OPENLDAP_LIBRELEASE OPENLDAP_LIBVERSION OPENLDAP_RELEASE_DATE top_builddir ldap_subdir CC AR CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP LIBTOOL PERLBIN OL_MKDEP OL_MKDEP_FLAGS LTSTATIC MYSQL LIBOBJS LIBSRCS PLAT WITH_SASL WITH_TLS WITH_MODULES_ENABLED WITH_ACI_ENABLED BUILD_THREAD BUILD_LIBS_DYNAMIC BUILD_SLAPD BUILD_SLAPI SLAPD_SLAPI_DEPEND BUILD_BDB BUILD_DNSSRV BUILD_HDB BUILD_LDAP BUILD_META BUILD_MONITOR BUILD_NDB BUILD_NULL BUILD_PASSWD BUILD_RELAY BUILD_PERL BUILD_SHELL BUILD_SOCK BUILD_SQL BUILD_ACCESSLOG BUILD_AUDITLOG BUILD_COLLECT BUILD_CONSTRAINT BUILD_DDS BUILD_DENYOP BUILD_DYNGROUP BUILD_DYNLIST BUILD_LASTMOD BUILD_MEMBEROF BUILD_PPOLICY BUILD_PROXYCACHE BUILD_REFINT BUILD_RETCODE BUILD_RWM BUILD_SEQMOD BUILD_SYNCPROV BUILD_TRANSLUCENT BUILD_UNIQUE BUILD_VALSORT LDAP_LIBS SLAPD_LIBS BDB_LIBS SLAPD_NDB_LIBS SLAPD_NDB_INCS LTHREAD_LIBS LUTIL_LIBS WRAP_LIBS SLAPD_MODULES_CPPFLAGS SLAPD_MODULES_LDFLAGS SLAPD_NO_STATIC SLAPD_STATIC_BACKENDS SLAPD_DYNAMIC_BACKENDS SLAPD_STATIC_OVERLAYS SLAPD_DYNAMIC_OVERLAYS PERL_CPPFLAGS SLAPD_PERL_LDFLAGS MOD_PERL_LDFLAGS KRB4_LIBS KRB5_LIBS SASL_LIBS TLS_LIBS MODULES_LIBS SLAPI_LIBS LIBSLAPI LIBSLAPITOOLS AUTH_LIBS ICU_LIBS SLAPD_SLP_LIBS SLAPD_GMP_LIBS SLAPD_SQL_LDFLAGS SLAPD_SQL_LIBS SLAPD_SQL_INCLUDES LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -1049,6 +1049,7 @@ SLAPD Overlay Options:
|
|||
--enable-overlays enable all available overlays no|yes|mod
|
||||
--enable-accesslog In-Directory Access Logging overlay no|yes|mod [no]
|
||||
--enable-auditlog Audit Logging overlay no|yes|mod [no]
|
||||
--enable-collect Collect overlay no|yes|mod [no]
|
||||
--enable-constraint Attribute Constraint overlay no|yes|mod [no]
|
||||
--enable-dds Dynamic Directory Services overlay no|yes|mod [no]
|
||||
--enable-dyngroup Dynamic Group overlay no|yes|mod [no]
|
||||
|
|
@ -3146,6 +3147,7 @@ fi;
|
|||
|
||||
Overlays="accesslog \
|
||||
auditlog \
|
||||
collect \
|
||||
constraint \
|
||||
dds \
|
||||
dyngroup \
|
||||
|
|
@ -3237,6 +3239,30 @@ else
|
|||
fi;
|
||||
# end --enable-auditlog
|
||||
|
||||
# OpenLDAP --enable-collect
|
||||
|
||||
# Check whether --enable-collect or --disable-collect was given.
|
||||
if test "${enable_collect+set}" = set; then
|
||||
enableval="$enable_collect"
|
||||
|
||||
ol_arg=invalid
|
||||
for ol_val in no yes mod ; do
|
||||
if test "$enableval" = "$ol_val" ; then
|
||||
ol_arg="$ol_val"
|
||||
fi
|
||||
done
|
||||
if test "$ol_arg" = "invalid" ; then
|
||||
{ { echo "$as_me:$LINENO: error: bad value $enableval for --enable-collect" >&5
|
||||
echo "$as_me: error: bad value $enableval for --enable-collect" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
ol_enable_collect="$ol_arg"
|
||||
|
||||
else
|
||||
ol_enable_collect=${ol_enable_overlays:-no}
|
||||
fi;
|
||||
# end --enable-collect
|
||||
|
||||
# OpenLDAP --enable-constraint
|
||||
|
||||
# Check whether --enable-constraint or --disable-constraint was given.
|
||||
|
|
@ -5650,7 +5676,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 5653 "configure"' > conftest.$ac_ext
|
||||
echo '#line 5679 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -7630,11 +7656,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7633: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7659: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7637: \$? = $ac_status" >&5
|
||||
echo "$as_me:7663: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -7892,11 +7918,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7895: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7921: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7899: \$? = $ac_status" >&5
|
||||
echo "$as_me:7925: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -7954,11 +7980,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7957: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7983: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:7961: \$? = $ac_status" >&5
|
||||
echo "$as_me:7987: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -10202,7 +10228,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10205 "configure"
|
||||
#line 10231 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -10300,7 +10326,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10303 "configure"
|
||||
#line 10329 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -30547,8 +30573,7 @@ rm -f conftest.err conftest.$ac_ext
|
|||
save_LDFLAGS="$LDFLAGS"
|
||||
save_LIBS="$LIBS"
|
||||
LDFLAGS="$SQL_LIB"
|
||||
|
||||
echo "$as_me:$LINENO: checking for ndb_init in -lndbclient" >&5
|
||||
echo "$as_me:$LINENO: checking for ndb_init in -lndbclient" >&5
|
||||
echo $ECHO_N "checking for ndb_init in -lndbclient... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_ndbclient_ndb_init+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
|
|
@ -30613,12 +30638,7 @@ fi
|
|||
echo "$as_me:$LINENO: result: $ac_cv_lib_ndbclient_ndb_init" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_ndbclient_ndb_init" >&6
|
||||
if test $ac_cv_lib_ndbclient_ndb_init = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBNDBCLIENT 1
|
||||
_ACEOF
|
||||
|
||||
LIBS="-lndbclient $LIBS"
|
||||
|
||||
: ok
|
||||
else
|
||||
|
||||
{ { echo "$as_me:$LINENO: error: could not locate ndbclient library" >&5
|
||||
|
|
@ -39125,6 +39145,22 @@ _ACEOF
|
|||
|
||||
fi
|
||||
|
||||
if test "$ol_enable_collect" != no ; then
|
||||
BUILD_COLLECT=$ol_enable_collect
|
||||
if test "$ol_enable_collect" = mod ; then
|
||||
MFLAG=SLAPD_MOD_DYNAMIC
|
||||
SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS collect.la"
|
||||
else
|
||||
MFLAG=SLAPD_MOD_STATIC
|
||||
SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS collect.o"
|
||||
fi
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define SLAPD_OVER_COLLECT $MFLAG
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$ol_enable_constraint" != no ; then
|
||||
BUILD_CONSTRAINT=$ol_enable_constraint
|
||||
if test "$ol_enable_constraint" = mod ; then
|
||||
|
|
@ -39479,6 +39515,7 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-xxinstall or --without-xxinstall was given.
|
||||
|
|
@ -40233,6 +40270,7 @@ s,@BUILD_SOCK@,$BUILD_SOCK,;t t
|
|||
s,@BUILD_SQL@,$BUILD_SQL,;t t
|
||||
s,@BUILD_ACCESSLOG@,$BUILD_ACCESSLOG,;t t
|
||||
s,@BUILD_AUDITLOG@,$BUILD_AUDITLOG,;t t
|
||||
s,@BUILD_COLLECT@,$BUILD_COLLECT,;t t
|
||||
s,@BUILD_CONSTRAINT@,$BUILD_CONSTRAINT,;t t
|
||||
s,@BUILD_DDS@,$BUILD_DDS,;t t
|
||||
s,@BUILD_DENYOP@,$BUILD_DENYOP,;t t
|
||||
|
|
|
|||
|
|
@ -957,6 +957,9 @@
|
|||
/* define for Audit Logging overlay */
|
||||
#undef SLAPD_OVER_AUDITLOG
|
||||
|
||||
/* define for Collect overlay */
|
||||
#undef SLAPD_OVER_COLLECT
|
||||
|
||||
/* define for Attribute Constraint overlay */
|
||||
#undef SLAPD_OVER_CONSTRAINT
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue