mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-20 22:59:34 -05:00
ITS#9144 - Regenerate configure
This commit is contained in:
Quanah Gibson-Mount
parent
f8427a9b58
commit
edec2e84c2
1 changed files with 16 additions and 85 deletions
101
configure
vendored
101
configure
vendored
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in Id: 8d2ee0e155fee599e34b47353303d7c2c0c65097 .
|
||||
# From configure.in Id: a1f2cd419d8a3be4c692600bef1a69a03d860268 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.65.
|
||||
#
|
||||
|
|
@ -756,7 +756,6 @@ SLAPD_SQL_LIBS
|
|||
SLAPD_SQL_LDFLAGS
|
||||
SLAPD_GMP_LIBS
|
||||
SLAPD_SLP_LIBS
|
||||
ICU_LIBS
|
||||
AUTH_LIBS
|
||||
LIBSLAPI
|
||||
SLAPI_LIBS
|
||||
|
|
@ -2829,8 +2828,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -5171,7 +5168,6 @@ MODULES_LIBS=
|
|||
SLAPI_LIBS=
|
||||
LIBSLAPI=
|
||||
AUTH_LIBS=
|
||||
ICU_LIBS=
|
||||
|
||||
SLAPD_SLP_LIBS=
|
||||
SLAPD_GMP_LIBS=
|
||||
|
|
@ -6942,7 +6938,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 6945 "configure"' > conftest.$ac_ext
|
||||
echo '#line 6941 "configure"' > conftest.$ac_ext
|
||||
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -8623,11 +8619,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:8626: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8622: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8630: \$? = $ac_status" >&5
|
||||
echo "$as_me:8626: \$? = $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.
|
||||
|
|
@ -8885,11 +8881,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:8888: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8884: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:8892: \$? = $ac_status" >&5
|
||||
echo "$as_me:8888: \$? = $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.
|
||||
|
|
@ -8947,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:8950: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:8946: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:8954: \$? = $ac_status" >&5
|
||||
echo "$as_me:8950: \$? = $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
|
||||
|
|
@ -10819,7 +10815,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10822 "configure"
|
||||
#line 10818 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -10917,7 +10913,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10920 "configure"
|
||||
#line 10916 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -15721,8 +15717,8 @@ done
|
|||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include <gnutls/gnutls.h>
|
||||
#if GNUTLS_VERSION_NUMBER < 0x020c00
|
||||
#error "GnuTLS 2.12.0 or newer required"
|
||||
#if GNUTLS_VERSION_NUMBER < 0x030202
|
||||
#error "GnuTLS 3.2.2 or newer required"
|
||||
#endif
|
||||
_ACEOF
|
||||
if ac_fn_c_try_cpp "$LINENO"; then :
|
||||
|
|
@ -20839,74 +20835,6 @@ fi
|
|||
ol_link_wt=yes
|
||||
fi
|
||||
|
||||
ol_icu=no
|
||||
for ac_header in unicode/utypes.h
|
||||
do :
|
||||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
||||
eval as_val=\$$as_ac_Header
|
||||
if test "x$as_val" = x""yes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
if test $ac_cv_header_unicode_utypes_h = yes ; then
|
||||
OL_ICULIBS="-licuuc -licudata"
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ICU libraries" >&5
|
||||
$as_echo_n "checking for ICU libraries... " >&6; }
|
||||
if test "${ol_cv_lib_icu+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
|
||||
ol_LIBS="$LIBS"
|
||||
LIBS="$OL_ICULIBS $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <unicode/utypes.h>
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
(void) u_errorName(0);
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ol_cv_lib_icu=yes
|
||||
else
|
||||
ol_cv_lib_icu=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS="$ol_LIBS"
|
||||
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_lib_icu" >&5
|
||||
$as_echo "$ol_cv_lib_icu" >&6; }
|
||||
|
||||
if test $ol_cv_lib_icu != no ; then
|
||||
ol_icu="$OL_ICULIBS"
|
||||
|
||||
$as_echo "#define HAVE_ICU 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$ol_icu" = no ; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ICU not available" >&5
|
||||
$as_echo "$as_me: WARNING: ICU not available" >&2;}
|
||||
else
|
||||
ICU_LIBS="$ol_icu"
|
||||
fi
|
||||
WITH_SASL=no
|
||||
ol_link_sasl=no
|
||||
ol_link_spasswd=no
|
||||
|
|
@ -23387,6 +23315,10 @@ _ACEOF
|
|||
fi
|
||||
|
||||
if test "$ol_enable_autoca" != no ; then
|
||||
if test $ol_with_tls != openssl ; then
|
||||
as_fn_error "--enable-autoca=$ol_enable_autoca requires --with-tls=openssl" "$LINENO" 5
|
||||
fi
|
||||
|
||||
BUILD_AUTOCA=$ol_enable_autoca
|
||||
if test "$ol_enable_autoca" = mod ; then
|
||||
MFLAG=SLAPD_MOD_DYNAMIC
|
||||
|
|
@ -23807,7 +23739,6 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-xxinstall was given.
|
||||
|
|
|
|||
Loading…
Reference in a new issue