Update ICU to 54.1 step 1

source/icudefs.mk.in

Index: source/icudefs.mk.in
diff --git a/source/icudefs.mk.in b/source/icudefs.mk.in
index c0a1607bb3855832db6e1f98d35eca52e319fffd..7be5a4307eba59a24bd42db2622535772f3c8445 100644
--- a/source/icudefs.mk.in
+++ b/source/icudefs.mk.in
@@ -2,12 +2,12 @@
 #
 # Yves Arrouye.
 #
-# Copyright (C) 2000-2013, International Business Machines Corporation and others.
+# Copyright (C) 2000-2014, International Business Machines Corporation and others.
 # All Rights Reserved.
 
 #
 # Some of these variables are overridden in the config/mh-* files.
-# 
+#
 # Please be sure to update config/Makefile.inc.in  if you add something here.
 #
 
@@ -249,11 +249,27 @@ IO_STUBNAME = io
 TOOLUTIL_STUBNAME = tu
 CTESTFW_STUBNAME = test
 
+# get these from pkg-config, if available
+ICULEHB_CFLAGS=@ICULEHB_CFLAGS@
+ICULEHB_LIBS=@ICULEHB_LIBS@
+ifneq ($(ICULEHB_CFLAGS),)
+USING_ICULEHB=yes
+ICULEHB_TRUE=
+ICULEHB_FALSE=#
+ICULIBS_LE=$(ICULEHB_LIBS)
+ICULE_CFLAGS=$(ICULEHB_CFLAGS) -DUSING_ICULEHB
+else
+USING_ICULEHB=no
+ICULEHB_TRUE=#
+ICULEHB_FALSE=
+ICULIBS_LE	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUT_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
+ICULE_CFLAGS=-I$(top_srcdir)
+endif
+
 # Just the libs.
 ICULIBS_DT	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(DATA_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
 ICULIBS_UC	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(COMMON_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
 ICULIBS_I18N	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(I18N_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
-ICULIBS_LE	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUT_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
 ICULIBS_LX	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(LAYOUTEX_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
 ICULIBS_IO	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(IO_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
 ICULIBS_CTESTFW	= -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
@@ -266,7 +282,7 @@ LCTESTFW	= -L$(top_builddir)/tools/ctestfw
 LIBICUDT	= $(LLIBDIR) $(LSTUBDIR) $(ICULIBS_DT)
 LIBICUUC	= $(LLIBDIR) $(ICULIBS_UC) $(LSTUBDIR) $(ICULIBS_DT)
 LIBICUI18N	= $(LLIBDIR) $(ICULIBS_I18N)
-LIBICULE	= $(LLIBDIR) $(ICULIBS_LE)
+LIBICULE	= $(ICULEHB_CFLAGS) $(LLIBDIR) $(ICULIBS_LE)
 LIBICULX	= $(LLIBDIR) $(ICULIBS_LX)
 LIBCTESTFW	= $(LCTESTFW) $(ICULIBS_CTESTFW)
 LIBICUTOOLUTIL	= $(LLIBDIR) $(ICULIBS_TOOLUTIL)