From 1aef660f0bcf6d2d68cf02de8bc8ac80d1d721df Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Fri, 20 Nov 2020 16:18:15 +0000 Subject: [PATCH] ITS#8747 - Regenreate for lloadd --- configure | 175 ++++++++++++++++++++++++++++++++++++++++++- include/portable.hin | 5 +- 2 files changed, 176 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 811e3da3a4..9d6b58a2e1 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: 43923a51f8a8e37b897c4c7fa207edfbf55040ef . +# From configure.ac Id: 43923a51f8a8e37b897c4c7fa207edfbf55040ef . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # @@ -636,6 +636,7 @@ ac_includes_default="\ #endif" ac_subst_vars='LTLIBOBJS +BALANCER_INCLUDE WT_LIBS WT_INCS SLAPD_SQL_INCLUDES @@ -663,13 +664,16 @@ SLAPD_NO_STATIC SLAPD_MODULES_LDFLAGS SLAPD_MODULES_CPPFLAGS WRAP_LIBS +LEVENT_LIBS LUTIL_LIBS LTHREAD_LIBS SLAPD_NDB_INCS SLAPD_NDB_LIBS +BALANCER_LIBS SLAPD_LIBS CLIENT_LIBS LDAP_LIBS +BUILD_BALANCER BUILD_VALSORT BUILD_UNIQUE BUILD_TRANSLUCENT @@ -885,6 +889,8 @@ enable_syncprov enable_translucent enable_unique enable_valsort +enable_balanceroptions +enable_balancer enable_xxliboptions enable_static enable_shared @@ -1589,6 +1595,9 @@ SLAPD Overlay Options: --enable-unique Attribute Uniqueness overlay no|yes|mod [no] --enable-valsort Value Sorting overlay no|yes|mod [no] +LLOADD (Load Balancer Daemon) Options: + --enable-balancer enable load balancer no|yes|mod [no] + Library Generation & Linking Options --enable-static[=PKGS] build static libraries [default=yes] --enable-shared[=PKGS] build shared libraries [default=yes] @@ -4306,6 +4315,34 @@ fi # end --enable-valsort +# Check whether --enable-balanceroptions was given. +if test "${enable_balanceroptions+set}" = set; then : + enableval=$enable_balanceroptions; +fi + +# OpenLDAP --enable-balancer + + # Check whether --enable-balancer was given. +if test "${enable_balancer+set}" = set; then : + enableval=$enable_balancer; + 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 + as_fn_error $? "bad value $enableval for --enable-balancer" "$LINENO" 5 + fi + ol_enable_balancer="$ol_arg" + +else + ol_enable_balancer=no +fi + +# end --enable-balancer + + # Check whether --enable-xxliboptions was given. if test "${enable_xxliboptions+set}" = set; then : enableval=$enable_xxliboptions; @@ -4394,11 +4431,17 @@ $as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-$i argument" >&2;} eval "ol_enable_$i=no" fi done + + if test $ol_enable_balancer = mod ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: slapd disabled, ignoring --enable-balancer=mod argument" >&5 +$as_echo "$as_me: WARNING: slapd disabled, ignoring --enable-balancer=mod argument" >&2;} + ol_enable_balancer=no + fi else if test $ol_enable_modules = no; then - for i in backends overlays $Backends $Overlays; do + for i in backends overlays balancer $Backends $Overlays; do eval "ol_tmp=\$ol_enable_$i" if test -n "$ol_tmp" && test "$ol_tmp" = mod ; then as_fn_error $? "--enable-$i=mod requires --enable-modules" "$LINENO" 5 @@ -4434,6 +4477,12 @@ if test $ol_enable_modules = yes ; then ol_enable_dynamic=yes fi +if test $ol_enable_balancer != no ; then + if test $ol_with_threads = no ; then + as_fn_error $? "Load balancer requires threads" "$LINENO" 5 + fi +fi + if test $ol_enable_spasswd = yes ; then if test $ol_with_cyrus_sasl = no ; then as_fn_error $? "--enable-spasswd requires --with-cyrus-sasl" "$LINENO" 5 @@ -4456,13 +4505,17 @@ LDAP_LIBS= SLAPD_NDB_LIBS= SLAPD_NDB_INCS= LTHREAD_LIBS= +LEVENT_LIBS= LUTIL_LIBS= CLIENT_LIBS= SLAPD_LIBS= +BALANCER_LIBS= +BALANCER_INCLUDE= BUILD_SLAPD=no +BUILD_BALANCER=no BUILD_THREAD=no @@ -22816,6 +22869,102 @@ $as_echo "#define HAVE_SLP 1" >>confdefs.h fi fi +if test $ol_enable_balancer != no ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for evdns_base_new in -levent_extra" >&5 +$as_echo_n "checking for evdns_base_new in -levent_extra... " >&6; } +if ${ac_cv_lib_event_extra_evdns_base_new+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-levent_extra $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char evdns_base_new (); +int +main () +{ +return evdns_base_new (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_event_extra_evdns_base_new=yes +else + ac_cv_lib_event_extra_evdns_base_new=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_event_extra_evdns_base_new" >&5 +$as_echo "$ac_cv_lib_event_extra_evdns_base_new" >&6; } +if test "x$ac_cv_lib_event_extra_evdns_base_new" = xyes; then : + have_libevent=yes + LEVENT_LIBS="$LEVENT_LIBS -levent_core -levent_extra" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for evdns_base_new in -levent" >&5 +$as_echo_n "checking for evdns_base_new in -levent... " >&6; } +if ${ac_cv_lib_event_evdns_base_new+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-levent $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char evdns_base_new (); +int +main () +{ +return evdns_base_new (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_event_evdns_base_new=yes +else + ac_cv_lib_event_evdns_base_new=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_event_evdns_base_new" >&5 +$as_echo "$ac_cv_lib_event_evdns_base_new" >&6; } +if test "x$ac_cv_lib_event_evdns_base_new" = xyes; then : + have_libevent=yes + LEVENT_LIBS="$LEVENT_LIBS -levent" +else + have_libevent=no +fi + +fi + + + if test $have_libevent = yes ; then + +$as_echo "#define HAVE_LIBEVENT 1" >>confdefs.h + + else + as_fn_error $? "You need libevent 2.0 or later with DNS support to build the load balancer" "$LINENO" 5 + fi +fi + ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" if test "x$ac_cv_type_mode_t" = xyes; then : @@ -25047,6 +25196,18 @@ _ACEOF fi +if test "$ol_enable_balancer" != no \ + -a "$ol_with_threads" != no \ + -a "$have_libevent" = yes ; then + if test "$ol_enable_balancer" = mod; then + BALANCER_INCLUDE=Makefile.module + BUILD_BALANCER=mod + else + BALANCER_INCLUDE=Makefile.server + BUILD_BALANCER=yes + fi +fi + if test "$ol_enable_slapi" != no ; then $as_echo "#define ENABLE_SLAPI 1" >>confdefs.h @@ -25151,6 +25312,11 @@ fi + + + + + @@ -25164,7 +25330,7 @@ fi -ac_config_files="$ac_config_files Makefile:build/top.mk:Makefile.in:build/dir.mk doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk doc/man/Makefile:build/top.mk:doc/man/Makefile.in:build/dir.mk doc/man/man1/Makefile:build/top.mk:doc/man/man1/Makefile.in:build/man.mk doc/man/man3/Makefile:build/top.mk:doc/man/man3/Makefile.in:build/man.mk doc/man/man5/Makefile:build/top.mk:doc/man/man5/Makefile.in:build/man.mk doc/man/man8/Makefile:build/top.mk:doc/man/man8/Makefile.in:build/man.mk 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/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/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 servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk servers/slapd/back-mdb/Makefile:build/top.mk:servers/slapd/back-mdb/Makefile.in:build/mod.mk servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk servers/slapd/back-asyncmeta/Makefile:build/top.mk:servers/slapd/back-asyncmeta/Makefile.in:build/mod.mk servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk servers/slapd/back-ndb/Makefile:build/top.mk:servers/slapd/back-ndb/Makefile.in:build/mod.mk servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk servers/slapd/back-relay/Makefile:build/top.mk:servers/slapd/back-relay/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-sock/Makefile:build/top.mk:servers/slapd/back-sock/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-wt/Makefile:build/top.mk:servers/slapd/back-wt/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 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" +ac_config_files="$ac_config_files Makefile:build/top.mk:Makefile.in:build/dir.mk doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk doc/man/Makefile:build/top.mk:doc/man/Makefile.in:build/dir.mk doc/man/man1/Makefile:build/top.mk:doc/man/man1/Makefile.in:build/man.mk doc/man/man3/Makefile:build/top.mk:doc/man/man3/Makefile.in:build/man.mk doc/man/man5/Makefile:build/top.mk:doc/man/man5/Makefile.in:build/man.mk doc/man/man8/Makefile:build/top.mk:doc/man/man8/Makefile.in:build/man.mk 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/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/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 servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/Makefile.in:build/mod.mk servers/slapd/back-mdb/Makefile:build/top.mk:servers/slapd/back-mdb/Makefile.in:build/mod.mk servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk servers/slapd/back-asyncmeta/Makefile:build/top.mk:servers/slapd/back-asyncmeta/Makefile.in:build/mod.mk servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk servers/slapd/back-ndb/Makefile:build/top.mk:servers/slapd/back-ndb/Makefile.in:build/mod.mk servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/Makefile.in:build/mod.mk servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk servers/slapd/back-relay/Makefile:build/top.mk:servers/slapd/back-relay/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-sock/Makefile:build/top.mk:servers/slapd/back-sock/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-wt/Makefile:build/top.mk:servers/slapd/back-wt/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/lloadd/Makefile:build/top.mk:servers/lloadd/Makefile.in servers/lloadd/Makefile.server:servers/lloadd/Makefile_server.in:build/srv.mk servers/lloadd/Makefile.module:servers/lloadd/Makefile_module.in:build/mod.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" ac_config_commands="$ac_config_commands default" @@ -26114,6 +26280,9 @@ do "servers/slapd/shell-backends/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk" ;; "servers/slapd/slapi/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk" ;; "servers/slapd/overlays/Makefile") CONFIG_FILES="$CONFIG_FILES servers/slapd/overlays/Makefile:build/top.mk:servers/slapd/overlays/Makefile.in:build/lib.mk" ;; + "servers/lloadd/Makefile") CONFIG_FILES="$CONFIG_FILES servers/lloadd/Makefile:build/top.mk:servers/lloadd/Makefile.in" ;; + "servers/lloadd/Makefile.server") CONFIG_FILES="$CONFIG_FILES servers/lloadd/Makefile.server:servers/lloadd/Makefile_server.in:build/srv.mk" ;; + "servers/lloadd/Makefile.module") CONFIG_FILES="$CONFIG_FILES servers/lloadd/Makefile.module:servers/lloadd/Makefile_module.in:build/mod.mk" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk" ;; "tests/run") CONFIG_FILES="$CONFIG_FILES tests/run" ;; "tests/progs/Makefile") CONFIG_FILES="$CONFIG_FILES tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk" ;; diff --git a/include/portable.hin b/include/portable.hin index 6ab0316adb..f41c4f8071 100644 --- a/include/portable.hin +++ b/include/portable.hin @@ -1,4 +1,4 @@ -/* include/portable.hin. Generated from configure.in by autoheader. */ +/* include/portable.hin. Generated from configure.ac by autoheader. */ /* begin of portable.h.pre */ @@ -274,6 +274,9 @@ /* define if your system supports kqueue */ #undef HAVE_KQUEUE +/* define if you have -levent */ +#undef HAVE_LIBEVENT + /* Define to 1 if you have the `gen' library (-lgen). */ #undef HAVE_LIBGEN