mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-11-27 02:22:00 +08:00
ITS#9323 - Regenerate configure
This commit is contained in:
Quanah Gibson-Mount
parent
e3faae939c
commit
8889f905b5
4
aclocal.m4
vendored
4
aclocal.m4
vendored
@ -1,6 +1,6 @@
|
||||
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
|
||||
# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
|
||||
|
||||
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This file is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
|
||||
110
configure
vendored
110
configure
vendored
@ -1,5 +1,5 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: 204912307d975dd96fc94006f128dbcfbf63167b .
|
||||
# From configure.in Id: d933f50e2851e805117785cbbb948028b5e50264 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69.
|
||||
#
|
||||
@ -737,7 +737,6 @@ DSYMUTIL
|
||||
MANIFEST_TOOL
|
||||
AWK
|
||||
RANLIB
|
||||
STRIP
|
||||
ac_ct_AR
|
||||
LN_S
|
||||
NM
|
||||
@ -759,6 +758,7 @@ SET_MAKE
|
||||
OBJDUMP
|
||||
DLLTOOL
|
||||
AS
|
||||
STRIP
|
||||
AR
|
||||
CC
|
||||
ldap_subdir
|
||||
@ -2712,7 +2712,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
|
||||
|
||||
ac_aux_dir=
|
||||
for ac_dir in build "$srcdir"/build; do
|
||||
if test -f "$ac_dir/install-sh"; then
|
||||
@ -4744,6 +4743,57 @@ test -n "$AR" || AR="missing"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -z "${STRIP}"; then
|
||||
for ac_prog in strip
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_prog_STRIP+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
if test -n "$STRIP"; then
|
||||
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_STRIP="$ac_prog"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
fi
|
||||
fi
|
||||
STRIP=$ac_cv_prog_STRIP
|
||||
if test -n "$STRIP"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
|
||||
$as_echo "$STRIP" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$STRIP" && break
|
||||
done
|
||||
test -n "$STRIP" || STRIP="missing"
|
||||
|
||||
|
||||
if test "${STRIP}" = "missing" ; then
|
||||
as_fn_error $? "Unable to locate strip(1) or suitable replacement. Check PATH or set STRIP." "$LINENO" 5
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
enable_win32_dll=yes
|
||||
|
||||
case $host in
|
||||
@ -17227,6 +17277,23 @@ done
|
||||
|
||||
|
||||
if test $ac_cv_header_openssl_ssl_h = yes ; then
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <openssl/opensslv.h>
|
||||
#if OPENSSL_VERSION_NUMBER < 0x1000200fL
|
||||
#error "OpenSSL is too old"
|
||||
#endif
|
||||
_ACEOF
|
||||
if ac_fn_c_try_cpp "$LINENO"; then :
|
||||
|
||||
else
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
as_fn_error $? "OpenSSL 1.0.2a or newer required
|
||||
See \`config.log' for more details" "$LINENO" 5; }
|
||||
fi
|
||||
rm -f conftest.err conftest.i conftest.$ac_ext
|
||||
|
||||
{ $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 ${ac_cv_lib_ssl_SSL_CTX_set_msg_callback+:} false; then :
|
||||
@ -17335,43 +17402,6 @@ $as_echo "#define HAVE_RSAREF 1" >>confdefs.h
|
||||
else
|
||||
TLS_LIBS="-lssl -lcrypto"
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL library version (CRL checking capability)" >&5
|
||||
$as_echo_n "checking OpenSSL library version (CRL checking capability)... " >&6; }
|
||||
if ${ol_cv_ssl_crl_compat+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
#ifdef HAVE_OPENSSL_SSL_H
|
||||
#include <openssl/ssl.h>
|
||||
#endif
|
||||
|
||||
/* Require 0.9.7d+ */
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x0090704fL
|
||||
char *__ssl_compat = "0.9.7d";
|
||||
#endif
|
||||
|
||||
_ACEOF
|
||||
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
||||
$EGREP "__ssl_compat" >/dev/null 2>&1; then :
|
||||
ol_cv_ssl_crl_compat=yes
|
||||
else
|
||||
ol_cv_ssl_crl_compat=no
|
||||
fi
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_ssl_crl_compat" >&5
|
||||
$as_echo "$ol_cv_ssl_crl_compat" >&6; }
|
||||
|
||||
if test $ol_cv_ssl_crl_compat = yes ; then
|
||||
|
||||
$as_echo "#define HAVE_OPENSSL_CRL 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user