diff options
Diffstat (limited to '')
| -rw-r--r-- | configure.ac | 85 |
1 files changed, 50 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index b2f24a3..f01b7e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl $OpenLDAP$ dnl This work is part of OpenLDAP Software <http://www.openldap.org/>. dnl -dnl Copyright 1998-2022 The OpenLDAP Foundation. +dnl Copyright 1998-2024 The OpenLDAP Foundation. dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without @@ -23,9 +23,9 @@ define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl dnl ================================================================ dnl Configure.in for OpenLDAP -AC_COPYRIGHT([[Copyright 1998-2022 The OpenLDAP Foundation. All rights reserved. +AC_COPYRIGHT([[Copyright 1998-2024 The OpenLDAP Foundation. All rights reserved. Restrictions apply, see COPYRIGHT and LICENSE files.]]) -AC_REVISION([$Id: 9d37fff6d98b298663abe1f15cf9cc44b936f43c $]) +AC_REVISION([$Id: 381cb601a24a5cba9f1a5a52472d1c5e6b748a76 $]) AC_INIT([OpenLDAP],,[https://bugs.openldap.org],,[https://www.openldap.org]) AC_CONFIG_SRCDIR(build/version.sh)dnl dnl ---------------------------------------------------------------- @@ -94,7 +94,7 @@ AH_TOP([ /* begin of portable.h.pre */ /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * - * Copyright 1998-2022 The OpenLDAP Foundation + * Copyright 1998-2024 The OpenLDAP Foundation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -349,6 +349,7 @@ Overlays="accesslog \ dynlist \ homedir \ memberof \ + nestgroup \ otp \ ppolicy \ proxycache \ @@ -392,6 +393,8 @@ OL_ARG_ENABLE(homedir, [AS_HELP_STRING([--enable-homedir], [Home Directory Manag no, [no yes mod], ol_enable_overlays) OL_ARG_ENABLE(memberof, [AS_HELP_STRING([--enable-memberof], [Reverse Group Membership overlay])], no, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(nestgroup, [AS_HELP_STRING([--enable-nestgroup], [Nested Group overlay])], + no, [no yes mod], ol_enable_overlays) OL_ARG_ENABLE(otp, [AS_HELP_STRING([--enable-otp], [OTP 2-factor authentication overlay])], no, [no yes mod], ol_enable_overlays) OL_ARG_ENABLE(ppolicy, [AS_HELP_STRING([--enable-ppolicy], [Password Policy overlay])], @@ -593,6 +596,7 @@ BUILD_DYNLIST=no BUILD_LASTMOD=no BUILD_HOMEDIR=no BUILD_MEMBEROF=no +BUILD_NESTGROUP=no BUILD_OTP=no BUILD_PPOLICY=no BUILD_PROXYCACHE=no @@ -635,7 +639,6 @@ MODULES_LIBS= SLAPI_LIBS= LIBSLAPI= AUTH_LIBS= -SYSTEMD_LIBS= SLAPD_SLP_LIBS= SLAPD_GMP_LIBS= @@ -732,8 +735,22 @@ if test $ol_enable_perl != no ; then fi else - PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`" - PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e 's/ -lc / /' -e 's/ -lc$//'`" + PERL_CPPFLAGS="" + for opt in `$PERLBIN -MExtUtils::Embed -e ccopts`; do + case "$opt" in + "-flto=auto" | "-Wall" ) + continue;; + esac + PERL_CPPFLAGS="$PERL_CPPFLAGS $opt" + done + PERL_LDFLAGS="" + for opt in `$PERLBIN -MExtUtils::Embed -e ldopts`; do + case "$opt" in + "-lc" ) + continue;; + esac + PERL_LDFLAGS="$PERL_LDFLAGS $opt" + done if test x"$ol_enable_perl" = "xyes" ; then SLAPD_PERL_LDFLAGS="$PERL_LDFLAGS" @@ -2044,42 +2061,29 @@ dnl ---------------------------------------------------------------- dnl dnl Check for systemd (only if we have a server) dnl -WITH_SYSTEMD=no systemdsystemunitdir= -ol_link_systemd=no if test $ol_enable_slapd = no && test $ol_enable_balancer != yes ; then if test $ol_with_systemd != no ; then AC_MSG_WARN([servers disabled, ignoring --with-systemd=$ol_with_systemd argument]) ol_with_systemd=no fi fi -if test $ol_with_systemd != no ; then - AC_CHECK_HEADERS(systemd/sd-daemon.h) +if test $ol_with_systemd = auto; then + AC_CHECK_HEADERS(systemd/sd-daemon.h) if test $ac_cv_header_systemd_sd_daemon_h = yes; then - AC_CHECK_LIB(systemd, sd_notify, - [ol_link_systemd="-lsystemd"]) + ol_with_systemd=yes fi +fi - if test $ol_link_systemd = no ; then - if test $ol_with_systemd != auto ; then - AC_MSG_ERROR([Could not locate systemd]) +if test $ol_with_systemd = yes ; then + AC_DEFINE(HAVE_SYSTEMD,1,[define if you have systemd]) + PKG_CHECK_VAR(systemdsystemunitdir, systemd, systemdsystemunitdir) + if test -z "$systemdsystemunitdir"; then + if test -d /usr/lib/systemd/system; then + systemdsystemunitdir=/usr/lib/systemd/system else - AC_MSG_WARN([Could not locate systemd]) - AC_MSG_WARN([systemd service notification not supported!]) - fi - else - AC_DEFINE(HAVE_SYSTEMD,1,[define if you have systemd]) - SYSTEMD_LIBS="$ol_link_systemd" - WITH_SYSTEMD=yes - - PKG_CHECK_VAR(systemdsystemunitdir, systemd, systemdsystemunitdir) - if test -z "$systemdsystemunitdir"; then - if test -d /usr/lib/systemd/system; then - systemdsystemunitdir=/usr/lib/systemd/system - else - systemdsystemunitdir=/lib/systemd/system - fi + systemdsystemunitdir=/lib/systemd/system fi fi fi @@ -2852,6 +2856,18 @@ if test "$ol_enable_memberof" != no ; then AC_DEFINE_UNQUOTED(SLAPD_OVER_MEMBEROF,$MFLAG,[define for Reverse Group Membership overlay]) fi +if test "$ol_enable_nestgroup" != no ; then + BUILD_NESTGROUP=$ol_enable_nestgroup + if test "$ol_enable_nestgroup" = mod ; then + MFLAG=SLAPD_MOD_DYNAMIC + SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS nestgroup.la" + else + MFLAG=SLAPD_MOD_STATIC + SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS nestgroup.o" + fi + AC_DEFINE_UNQUOTED(SLAPD_OVER_NESTGROUP,$MFLAG,[define for Nested Group overlay]) +fi + if test "$ol_enable_otp" != no ; then if test $ol_with_tls = no ; then AC_MSG_ERROR([--enable-otp=$ol_enable_otp requires --with-tls]) @@ -3115,7 +3131,6 @@ AC_SUBST(WITH_SASL) AC_SUBST(WITH_TLS) AC_SUBST(WITH_MODULES_ENABLED) AC_SUBST(WITH_ACI_ENABLED) -AC_SUBST(WITH_SYSTEMD) AC_SUBST(BUILD_THREAD) AC_SUBST(BUILD_LIBS_DYNAMIC) AC_SUBST(OL_VERSIONED_SYMBOLS) @@ -3154,6 +3169,7 @@ dnl overlays AC_SUBST(BUILD_LASTMOD) AC_SUBST(BUILD_HOMEDIR) AC_SUBST(BUILD_MEMBEROF) + AC_SUBST(BUILD_NESTGROUP) AC_SUBST(BUILD_OTP) AC_SUBST(BUILD_PPOLICY) AC_SUBST(BUILD_PROXYCACHE) @@ -3204,7 +3220,6 @@ AC_SUBST(SLAPI_LIBS) AC_SUBST(LIBSLAPI) AC_SUBST(AUTH_LIBS) AC_SUBST(ARGON2_LIBS) -AC_SUBST(SYSTEMD_LIBS) AC_SUBST(SLAPD_SLP_LIBS) AC_SUBST(SLAPD_GMP_LIBS) @@ -3276,7 +3291,7 @@ rm -f $BACKENDSC cat > $BACKENDSC << ENDX /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -3327,7 +3342,7 @@ rm -f $OVERLAYSC cat > $OVERLAYSC << ENDX /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |