Update ICU to 54.1 step 1

source/icudefs.mk.in

 # Make definitions that are shared by the different subprojects of ICU.
 #
 # 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.
 #
 
 # Shell to use
 
 SHELL = @SHELL@
 
 # Standard directories
 
 prefix = @prefix@
@@ skipping 221 matching lines @@
 # be made in the mh- file for the specific platform.
 DATA_STUBNAME = data
 COMMON_STUBNAME = uc
 I18N_STUBNAME = i18n
 LAYOUT_STUBNAME = le
 LAYOUTEX_STUBNAME = lx
 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)
 ICULIBS_TOOLUTIL = -l$(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)$(TOOLUTIL_STUBNAME)$(ICULIBSUFFIX)$(SO_TARGET_VERSION_SUFFIX)
 # Link commands to link to ICU libs
 LLIBDIR         = -L$(LIBDIR)
 LSTUBDIR        = -L$(top_builddir)/stubdata
 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)
 LIBICUIO        = $(LLIBDIR) $(ICULIBS_IO)
 
 # Invoke, set library path for all ICU libraries.
 # overridden by icucross.mk
 INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)$(LIBDIR):$(top_builddir)/stubdata:$(top_builddir)/tools/ctestfw:$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER)
 # prefer stubdata
 PKGDATA_INVOKE = $(LDLIBRARYPATH_ENVVAR)=$(top_builddir)/stubdata:$(top_builddir)/tools/ctestfw:$(LIBRARY_PATH_PREFIX)$(LIBDIR):$$$(LDLIBRARYPATH_ENVVAR) $(LEAK_CHECKER)
@@ skipping 26 matching lines @@
 cross_buildroot = $(top_builddir)
 endif
 
 # for tests
 ifneq ($(TEST_STATUS_FILE),)
 TEST_OUTPUT_OPTS="-E$(TEST_STATUS_FILE)"
 endif
 
 # optional include at top
 -include $(top_builddir)/icudefs.local