X-Git-Url: https://git.sur5r.net/?p=openldap;a=blobdiff_plain;f=configure;h=29b7ad91dfcc98f5f702b74d9d16b1d93d2c5f75;hp=9981177afc208b9972025a98c1897e468ceaeeaa;hb=HEAD;hpb=1df85d3427c287086df4ef41ef0edb1fa7e5bcec diff --git a/configure b/configure index 9981177afc..29b7ad91df 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh -# From configure.in Id: 97a7d8d69c5231a056a85cedd1c591b0c2e46daa . +# From configure.in Id: 46e5e8cc8f0216bd3fa077597f237c3dbabd3a75 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65. # -# Copyright 1998-2017 The OpenLDAP Foundation. All rights reserved. +# Copyright 1998-2018 The OpenLDAP Foundation. All rights reserved. # Restrictions apply, see COPYRIGHT and LICENSE files. # # @@ -761,6 +761,7 @@ AUTH_LIBS LIBSLAPI SLAPI_LIBS MODULES_LIBS +WITH_TLS_TYPE TLS_LIBS SASL_LIBS KRB5_LIBS @@ -803,6 +804,7 @@ BUILD_DENYOP BUILD_DDS BUILD_CONSTRAINT BUILD_COLLECT +BUILD_AUTOCA BUILD_AUDITLOG BUILD_ACCESSLOG BUILD_WT @@ -997,6 +999,7 @@ enable_xxslapoverlays enable_overlays enable_accesslog enable_auditlog +enable_autoca enable_collect enable_constraint enable_dds @@ -1699,6 +1702,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 +1832,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-2017 The OpenLDAP Foundation. All rights reserved. +Copyright 1998-2018 The OpenLDAP Foundation. All rights reserved. Restrictions apply, see COPYRIGHT and LICENSE files. _ACEOF exit @@ -4459,6 +4463,7 @@ fi Overlays="accesslog \ auditlog \ + autoca \ collect \ constraint \ dds \ @@ -4547,6 +4552,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 +5182,7 @@ BUILD_WT=no BUILD_ACCESSLOG=no BUILD_AUDITLOG=no +BUILD_AUTOCA=no BUILD_CONSTRAINT=no BUILD_DDS=no BUILD_DENYOP=no @@ -5196,6 +5224,7 @@ KRB4_LIBS= KRB5_LIBS= SASL_LIBS= TLS_LIBS= +WITH_TLS_TYPE= MODULES_LIBS= SLAPI_LIBS= LIBSLAPI= @@ -6971,7 +7000,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 +8681,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 +8943,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 +9005,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 +10877,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +if test "${ac_cv_header_sys_event_h}" = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kqueue system call" >&5 +$as_echo_n "checking for kqueue system call... " >&6; } +if test "$cross_compiling" = yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) +{ + int kqfd = kqueue(); + exit (kqfd == -1 ? 1 : 0); +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_KQUEUE 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi + for ac_header in sys/devpoll.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -15629,6 +15703,7 @@ fi if test $have_openssl = yes ; then ol_with_tls=openssl ol_link_tls=yes + WITH_TLS_TYPE=openssl $as_echo "#define HAVE_OPENSSL 1" >>confdefs.h @@ -15763,6 +15838,7 @@ fi if test $have_gnutls = yes ; then ol_with_tls=gnutls ol_link_tls=yes + WITH_TLS_TYPE=gnutls TLS_LIBS="-lgnutls" @@ -21658,7 +21734,7 @@ $as_echo "#define HAVE_TCPD 1" >>confdefs.h WRAP_LIBS="-lwrap" elif test $ol_enable_wrappers = yes ; then - as_fn_error "could not find TCP wrappers, select apppropriate options or disable" "$LINENO" 5 + as_fn_error "could not find TCP wrappers, select appropriate options or disable" "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find TCP wrappers, support disabled" >&5 $as_echo "$as_me: WARNING: could not find TCP wrappers, support disabled" >&2;} @@ -22530,12 +22606,61 @@ fi fi + LIBS="$TLS_LIBS $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt_r in -lcrypt" >&5 +$as_echo_n "checking for crypt_r in -lcrypt... " >&6; } +if test "${ac_cv_lib_crypt_crypt_r+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lcrypt $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 crypt_r (); +int +main () +{ +return crypt_r (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_crypt_crypt_r=yes +else + ac_cv_lib_crypt_crypt_r=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_crypt_crypt_r" >&5 +$as_echo "$ac_cv_lib_crypt_crypt_r" >&6; } +if test "x$ac_cv_lib_crypt_crypt_r" = x""yes; then : + have_crypt_r=yes +else + have_crypt_r=no +fi + + LIBS="$save_LIBS" if test $have_crypt = yes ; then $as_echo "#define HAVE_CRYPT 1" >>confdefs.h + if test $have_crypt_r = yes ; then + +$as_echo "#define HAVE_CRYPT_R 1" >>confdefs.h + + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find crypt" >&5 $as_echo "$as_me: WARNING: could not find crypt" >&2;} @@ -24671,6 +24796,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 +25218,7 @@ fi + # Check whether --with-xxinstall was given. @@ -26445,7 +26587,7 @@ rm -f $BACKENDSC cat > $BACKENDSC << ENDX /* This work is part of OpenLDAP Software . * - * Copyright 1998-2017 The OpenLDAP Foundation. + * Copyright 1998-2018 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26496,7 +26638,7 @@ rm -f $OVERLAYSC cat > $OVERLAYSC << ENDX /* This work is part of OpenLDAP Software . * - * Copyright 1998-2017 The OpenLDAP Foundation. + * Copyright 1998-2018 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without