X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure;h=620260ea05c9b8dc300407c8e2fd2b90e00e90b9;hb=0d7489b9089c8cb5766cc689d8c414f166b4d84e;hp=4ace07c5fc17789f3b9f12bad039e6777f4e1d83;hpb=e1da338c7858b2e2fd1a3af512cbd0b5563aebb6;p=openldap diff --git a/configure b/configure index 4ace07c5fc..620260ea05 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh -# From configure.in Id: dcf25e3f8301a00a1aac9034d2381bdc4d8ee274 . +# From configure.in Id: 41cd0a5df892091d70e4deae4b86a9d022f4302b . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65. # -# Copyright 1998-2016 The OpenLDAP Foundation. All rights reserved. +# Copyright 1998-2017 The OpenLDAP Foundation. All rights reserved. # Restrictions apply, see COPYRIGHT and LICENSE files. # # @@ -803,6 +803,7 @@ BUILD_DENYOP BUILD_DDS BUILD_CONSTRAINT BUILD_COLLECT +BUILD_AUTOCA BUILD_AUDITLOG BUILD_ACCESSLOG BUILD_WT @@ -997,6 +998,7 @@ enable_xxslapoverlays enable_overlays enable_accesslog enable_auditlog +enable_autoca enable_collect enable_constraint enable_dds @@ -1699,6 +1701,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-autoca Automatic Certificate Authority 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] @@ -1828,7 +1831,7 @@ Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -Copyright 1998-2016 The OpenLDAP Foundation. All rights reserved. +Copyright 1998-2017 The OpenLDAP Foundation. All rights reserved. Restrictions apply, see COPYRIGHT and LICENSE files. _ACEOF exit @@ -4459,6 +4462,7 @@ fi Overlays="accesslog \ auditlog \ + autoca \ collect \ constraint \ dds \ @@ -4547,6 +4551,28 @@ fi # end --enable-auditlog +# OpenLDAP --enable-autoca + + # Check whether --enable-autoca was given. +if test "${enable_autoca+set}" = set; then : + enableval=$enable_autoca; + 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-autoca" "$LINENO" 5 + fi + ol_enable_autoca="$ol_arg" + +else + ol_enable_autoca=${ol_enable_overlays:-no} +fi + +# end --enable-autoca + # OpenLDAP --enable-collect # Check whether --enable-collect was given. @@ -5155,6 +5181,7 @@ BUILD_WT=no BUILD_ACCESSLOG=no BUILD_AUDITLOG=no +BUILD_AUTOCA=no BUILD_CONSTRAINT=no BUILD_DDS=no BUILD_DENYOP=no @@ -6971,7 +6998,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6974 "configure"' > conftest.$ac_ext + echo '#line 7001 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8652,11 +8679,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:8655: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8682: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8659: \$? = $ac_status" >&5 + echo "$as_me:8686: \$? = $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. @@ -8914,11 +8941,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:8917: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8944: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8921: \$? = $ac_status" >&5 + echo "$as_me:8948: \$? = $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. @@ -8976,11 +9003,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:8979: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9006: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8983: \$? = $ac_status" >&5 + echo "$as_me:9010: \$? = $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 @@ -10848,7 +10875,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 -$as_echo_n "checking for SSL_library_init in -lssl... " >&6; } -if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_msg_callback in -lssl" >&5 +$as_echo_n "checking for SSL_CTX_set_msg_callback in -lssl... " >&6; } +if test "${ac_cv_lib_ssl_SSL_CTX_set_msg_callback+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -15552,27 +15579,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char SSL_library_init (); +char SSL_CTX_set_msg_callback (); int main () { -return SSL_library_init (); +return SSL_CTX_set_msg_callback (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ssl_SSL_library_init=yes + ac_cv_lib_ssl_SSL_CTX_set_msg_callback=yes else - ac_cv_lib_ssl_SSL_library_init=no + ac_cv_lib_ssl_SSL_CTX_set_msg_callback=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_ssl_SSL_library_init" >&5 -$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; } -if test "x$ac_cv_lib_ssl_SSL_library_init" = x""yes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_set_msg_callback" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_CTX_set_msg_callback" >&6; } +if test "x$ac_cv_lib_ssl_SSL_CTX_set_msg_callback" = x""yes; then : have_openssl=yes need_rsaref=no else @@ -24464,11 +24491,11 @@ _ACEOF fi -if test "$ol_enable_meta_async" != no ; then +if test "$ol_enable_asyncmeta" != no ; then BUILD_SLAPD=yes - BUILD_ASYNCMETA=$ol_enable_meta_async + BUILD_ASYNCMETA=$ol_enable_asyncmeta BUILD_REWRITE=yes - if test "$ol_enable_meta_async" = mod ; then + if test "$ol_enable_asyncmeta" = mod ; then SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-asyncmeta" MFLAG=SLAPD_MOD_DYNAMIC else @@ -24671,6 +24698,22 @@ _ACEOF fi +if test "$ol_enable_autoca" != no ; then + BUILD_AUTOCA=$ol_enable_autoca + if test "$ol_enable_autoca" = mod ; then + MFLAG=SLAPD_MOD_DYNAMIC + SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS autoca.la" + else + MFLAG=SLAPD_MOD_STATIC + SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS autoca.o" + fi + +cat >>confdefs.h <<_ACEOF +#define SLAPD_OVER_AUTOCA $MFLAG +_ACEOF + +fi + if test "$ol_enable_collect" != no ; then BUILD_COLLECT=$ol_enable_collect if test "$ol_enable_collect" = mod ; then @@ -25077,6 +25120,7 @@ fi + # Check whether --with-xxinstall was given. @@ -26445,7 +26489,7 @@ rm -f $BACKENDSC cat > $BACKENDSC << ENDX /* This work is part of OpenLDAP Software . * - * Copyright 1998-2016 The OpenLDAP Foundation. + * Copyright 1998-2017 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26496,7 +26540,7 @@ rm -f $OVERLAYSC cat > $OVERLAYSC << ENDX /* This work is part of OpenLDAP Software . * - * Copyright 1998-2016 The OpenLDAP Foundation. + * Copyright 1998-2017 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without