From 24271fe60619a3ded1c23a8b35eb4ebc1f98b26f Mon Sep 17 00:00:00 2001
From: Hugh McMaster <hugh.mcmaster@outlook.com>
Date: Feb 03 2019 06:58:57 +0000
Subject: Ticket 50111: Use pkg-config to detect icu


Use of icu-config is deprecated upstream and no longer supported
in Debian, Ubuntu and Linux Mint.

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>

---

diff --git a/Makefile.am b/Makefile.am
index a2af646..617ab45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -172,7 +172,6 @@ ldaplib_defs = @ldaplib_defs@
 
 DB_LINK = @db_lib@ -ldb-@db_libver@
 SASL_LINK = @sasl_lib@ -lsasl2
-ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata
 PCRE_LINK = @pcre_lib@ -lpcre
 NETSNMP_LINK = @netsnmp_lib@ @netsnmp_link@
 PAM_LINK = -lpam
@@ -1614,8 +1613,8 @@ libcollation_plugin_la_SOURCES = ldap/servers/plugins/collation/collate.c \
         ldap/servers/plugins/collation/config.c \
         ldap/servers/plugins/collation/orfilter.c
 
-libcollation_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) @icu_inc@
-libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LINK) $(LIBCSTD) $(LIBCRUN)
+libcollation_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(ICU_CFLAGS)
+libcollation_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSPR_LINK) $(ICU_LIBS) $(LIBCSTD) $(LIBCRUN)
 libcollation_plugin_la_DEPENDENCIES = libslapd.la
 libcollation_plugin_la_LDFLAGS = -avoid-version
 # libcollation_plugin_la_LINK = $(CXXLINK) -avoid-version
@@ -1857,8 +1856,8 @@ libreplication_plugin_la_SOURCES = ldap/servers/plugins/replication/cl5_api.c \
 	ldap/servers/plugins/replication/windows_protocol_util.c \
 	ldap/servers/plugins/replication/windows_tot_protocol.c
 
-libreplication_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) @icu_inc@ @db_inc@
-libreplication_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) $(ICU_LINK) $(DB_LINK)
+libreplication_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DSPLUGIN_CPPFLAGS) $(ICU_CFLAGS) @db_inc@
+libreplication_plugin_la_LIBADD = libslapd.la $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) $(ICU_LIBS) $(DB_LINK)
 libreplication_plugin_la_DEPENDENCIES = libslapd.la
 libreplication_plugin_la_LDFLAGS = -avoid-version
 
diff --git a/configure.ac b/configure.ac
index db80560..ba4396e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AM_PROG_AS
 AC_PROG_CC_STDC
+PKG_PROG_PKG_CONFIG
 
 # disable static libs by default - we only use a couple
 AC_DISABLE_STATIC
@@ -822,7 +823,9 @@ m4_include(m4/openldap.m4)
 m4_include(m4/mozldap.m4)
 m4_include(m4/db.m4)
 m4_include(m4/sasl.m4)
-m4_include(m4/icu.m4)
+
+PKG_CHECK_MODULES([ICU], [icu-i18n >= 60.2])
+
 m4_include(m4/netsnmp.m4)
 m4_include(m4/kerberos.m4)
 m4_include(m4/pcre.m4)
diff --git a/m4/icu.m4 b/m4/icu.m4
deleted file mode 100644
index 9aa7140..0000000
--- a/m4/icu.m4
+++ /dev/null
@@ -1,100 +0,0 @@
-# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2006 Red Hat, Inc.
-# All rights reserved.
-#
-# License: GPL (version 3 or any later version).
-# See LICENSE for details. 
-# END COPYRIGHT BLOCK
-
-AC_CHECKING(for LIBICU)
-
-# check for --with-icu
-AC_MSG_CHECKING(for --with-icu)
-AC_ARG_WITH(icu, AS_HELP_STRING([--with-icu@<:@=PATH@:>@],[ICU directory]),
-[
-  if test "$withval" = "yes"
-  then
-    AC_MSG_RESULT(yes)
-  elif test "$withval" = "no"
-  then
-    AC_MSG_RESULT(no)
-    AC_MSG_ERROR([ICU is required.])
-  elif test -d "$withval"/lib
-  then
-    AC_MSG_RESULT([using $withval])
-    ICUDIR=$withval
-    icu_lib="-L$ICUDIR/lib"
-    icu_inc="-I$withval/include"
-    icu_bin="$withval/bin"
-  else
-    echo
-    AC_MSG_ERROR([$withval not found])
-  fi
-],
-AC_MSG_RESULT(yes))
-
-# check for --with-icu-inc
-AC_MSG_CHECKING(for --with-icu-inc)
-AC_ARG_WITH(icu-inc, AS_HELP_STRING([--with-icu-inc=PATH],[ICU include directory]),
-[
-  if test -d "$withval"
-  then
-    AC_MSG_RESULT([using $withval])
-    icu_inc="-I$withval"
-  else
-    echo
-    AC_MSG_ERROR([$withval not found])
-  fi
-],
-AC_MSG_RESULT(no))
-
-# check for --with-icu-lib
-AC_MSG_CHECKING(for --with-icu-lib)
-AC_ARG_WITH(icu-lib, AS_HELP_STRING([--with-icu-lib=PATH],[ICU library directory]),
-[
-  if test -d "$withval"
-  then
-    AC_MSG_RESULT([using $withval])
-    icu_lib="-L$withval"
-  else
-    echo
-    AC_MSG_ERROR([$withval not found])
-  fi
-],
-AC_MSG_RESULT(no))
-
-# check for --with-icu-bin
-AC_MSG_CHECKING(for --with-icu-bin)
-AC_ARG_WITH(icu-bin, AS_HELP_STRING([--with-icu-bin=PATH],[ICU binary directory]),
-[
-  if test -d "$withval"
-  then
-    AC_MSG_RESULT([using $withval])
-    icu_bin="$withval"
-  else
-    echo
-    AC_MSG_ERROR([$withval not found])
-  fi
-],
-AC_MSG_RESULT(no))
-# if ICU is not found yet, try pkg-config
-
-# last resort
-if test -z "$icu_lib"; then
-  AC_PATH_PROG(ICU_CONFIG, icu-config)
-  AC_MSG_CHECKING(for icu with icu-config)
-  if test -n "$ICU_CONFIG"; then
-    icu_lib=`$ICU_CONFIG --ldflags-searchpath`
-    icu_inc=`$ICU_CONFIG --cppflags-searchpath`
-    icu_bin=`$ICU_CONFIG --bindir`
-    AC_MSG_RESULT([using system ICU])
-  else
-    AC_MSG_ERROR([ICU not found, specify with --with-icu.])
-  fi
-fi
-
-
-AC_SUBST(icu_lib)
-AC_SUBST(icu_inc)
-AC_SUBST(icu_bin)
-