From f6b3d9d0ac7dfce373cbbd6083fdb9985aed1d06 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 9 Jan 2020 17:33:57 +0000
Subject: [PATCH] ITS#9144 - Regenerate configure

---
 configure | 92 ++++++-------------------------------------------------
 1 file changed, 10 insertions(+), 82 deletions(-)

diff --git a/configure b/configure
index ef0efec230..37ee33c526 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: 2bd2a4382b8c88241024e1ececa486f31150bbea .
+# From configure.in Id: f2c3ad25242d5550c0e5ab985b6cbfefbbce2965 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65.
 #
@@ -754,7 +754,6 @@ SLAPD_SQL_LIBS
 SLAPD_SQL_LDFLAGS
 SLAPD_GMP_LIBS
 SLAPD_SLP_LIBS
-ICU_LIBS
 AUTH_LIBS
 LIBSLAPI
 SLAPI_LIBS
@@ -2829,7 +2828,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
 
 
 ac_aux_dir=
@@ -5139,7 +5137,6 @@ MODULES_LIBS=
 SLAPI_LIBS=
 LIBSLAPI=
 AUTH_LIBS=
-ICU_LIBS=
 
 SLAPD_SLP_LIBS=
 SLAPD_GMP_LIBS=
@@ -6910,7 +6907,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6913 "configure"' > conftest.$ac_ext
+  echo '#line 6910 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8591,11 +8588,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:8594: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8591: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8598: \$? = $ac_status" >&5
+   echo "$as_me:8595: \$? = $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.
@@ -8853,11 +8850,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:8856: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8853: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8860: \$? = $ac_status" >&5
+   echo "$as_me:8857: \$? = $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.
@@ -8915,11 +8912,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:8918: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8915: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8922: \$? = $ac_status" >&5
+   echo "$as_me:8919: \$? = $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
@@ -10787,7 +10784,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10790 "configure"
+#line 10787 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10885,7 +10882,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10888 "configure"
+#line 10885 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21969,74 +21966,6 @@ fi
 	fi
 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
@@ -24866,7 +24795,6 @@ fi
 
 
 
-
 
 
 # Check whether --with-xxinstall was given.
-- 
2.47.2