From 4badd1e83d9055414ce0ba5a66fea793090e1a3c Mon Sep 17 00:00:00 2001
From: Ryan Tandy <ryan@nardis.ca>
Date: Thu, 19 Dec 2019 14:34:58 -0800
Subject: [PATCH] ITS#9144 Remove unused ICU detection and linking

This reverts commits a956f75924c5d8f2a80ccb899666820cd71a4d6b ("Add (not
yet used) ICU detection") and 1cf5838e081fa3198161c53fb8e783b5f0f24503
("detect ICU and link it into slapd(8)").
---
 build/openldap.m4    | 27 ---------------------------
 build/top.mk         |  3 +--
 configure.in         | 10 ----------
 include/portable.hin |  6 ------
 4 files changed, 1 insertion(+), 45 deletions(-)

diff --git a/build/openldap.m4 b/build/openldap.m4
index 35b37864b9..105bf5a706 100644
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -245,33 +245,6 @@ OL_RESOLVER_TRY(ol_cv_resolver_bind,[-lbind])
 ])
 dnl
 dnl ====================================================================
-dnl International Components for Unicode (ICU)
-AC_DEFUN([OL_ICU],
-[ol_icu=no
-AC_CHECK_HEADERS( unicode/utypes.h )
-if test $ac_cv_header_unicode_utypes_h = yes ; then
-	dnl OL_ICULIBS="-licui18n -licuuc -licudata"
-	OL_ICULIBS="-licuuc -licudata"
-
-	AC_CACHE_CHECK([for ICU libraries], [ol_cv_lib_icu], [
-		ol_LIBS="$LIBS"
-		LIBS="$OL_ICULIBS $LIBS"
-		AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-#include <unicode/utypes.h>
-]], [[
-(void) u_errorName(0);
-]])],[ol_cv_lib_icu=yes],[ol_cv_lib_icu=no])
-		LIBS="$ol_LIBS"
-])
-
-	if test $ol_cv_lib_icu != no ; then
-		ol_icu="$OL_ICULIBS"
-		AC_DEFINE(HAVE_ICU,1,[define if you actually have ICU])
-	fi
-fi
-])
-dnl
-dnl ====================================================================
 dnl Berkeley DB macros
 dnl
 dnl --------------------------------------------------------------------
diff --git a/build/top.mk b/build/top.mk
index e1e8f6bdce..303b1b28ee 100644
--- a/build/top.mk
+++ b/build/top.mk
@@ -190,7 +190,6 @@ SASL_LIBS = @SASL_LIBS@
 TLS_LIBS = @TLS_LIBS@
 AUTH_LIBS = @AUTH_LIBS@
 SECURITY_LIBS = $(SASL_LIBS) $(KRB_LIBS) $(TLS_LIBS) $(AUTH_LIBS)
-ICU_LIBS = @ICU_LIBS@
 
 MODULES_CPPFLAGS = @SLAPD_MODULES_CPPFLAGS@
 MODULES_LDFLAGS = @SLAPD_MODULES_LDFLAGS@
@@ -201,7 +200,7 @@ SLAPD_SQL_LDFLAGS = @SLAPD_SQL_LDFLAGS@
 SLAPD_SQL_INCLUDES = @SLAPD_SQL_INCLUDES@
 SLAPD_SQL_LIBS = @SLAPD_SQL_LIBS@
 
-SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@ $(ICU_LIBS)
+SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@
 
 # Our Defaults
 CC = $(AC_CC)
diff --git a/configure.in b/configure.in
index 9a49bf3a96..f2c3ad2524 100644
--- a/configure.in
+++ b/configure.in
@@ -596,7 +596,6 @@ MODULES_LIBS=
 SLAPI_LIBS=
 LIBSLAPI=
 AUTH_LIBS=
-ICU_LIBS=
 
 SLAPD_SLP_LIBS=
 SLAPD_GMP_LIBS=
@@ -2088,14 +2087,6 @@ if test $ol_enable_ndb != no ; then
 	fi
 fi
 
-dnl ----------------------------------------------------------------
-dnl International Components for Unicode
-OL_ICU
-if test "$ol_icu" = no ; then
-	AC_MSG_WARN([ICU not available])
-else
-	ICU_LIBS="$ol_icu"
-fi
 dnl ----------------------------------------------------------------
 dnl
 dnl Check for Cyrus SASL
@@ -3166,7 +3157,6 @@ AC_SUBST(MODULES_LIBS)
 AC_SUBST(SLAPI_LIBS)
 AC_SUBST(LIBSLAPI)
 AC_SUBST(AUTH_LIBS)
-AC_SUBST(ICU_LIBS)
 
 AC_SUBST(SLAPD_SLP_LIBS)
 AC_SUBST(SLAPD_GMP_LIBS)
diff --git a/include/portable.hin b/include/portable.hin
index 29adb0ad76..bc61c9e4be 100644
--- a/include/portable.hin
+++ b/include/portable.hin
@@ -256,9 +256,6 @@
 /* Define to 1 if you have the `hstrerror' function. */
 #undef HAVE_HSTRERROR
 
-/* define if you actually have ICU */
-#undef HAVE_ICU
-
 /* define to you inet_aton(3) is available */
 #undef HAVE_INET_ATON
 
@@ -756,9 +753,6 @@
 /* define if you have TLS */
 #undef HAVE_TLS
 
-/* Define to 1 if you have the <unicode/utypes.h> header file. */
-#undef HAVE_UNICODE_UTYPES_H
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-- 
2.47.2