move copy/pasted ICU_CFLAGS/ICU_LIBS to configure

Change-Id: I078cccd57331d40118bcc40fb4eb66b113848caf

config_host.mk.in

@@ -236,6 +236,8 @@ export HUNSPELL_LIBS=$(gb_SPACE)@HUNSPELL_LIBS@
 export HYPHEN_LIB=$(gb_SPACE)@HYPHEN_LIB@
 export HYPH_SYSTEM_DIR=@HYPH_SYSTEM_DIR@
 export ICECREAM_RUN=@ICECREAM_RUN@
+export ICU_CFLAGS=$(gb_SPACE)@ICU_CFLAGS@
+export ICU_LIBS=$(gb_SPACE)@ICU_LIBS@
 export ICU_MAJOR=@ICU_MAJOR@
 export ICU_MINOR=@ICU_MINOR@
 export ICU_RECLASSIFIED_CLOSE_PARENTHESIS=@ICU_RECLASSIFIED_CLOSE_PARENTHESIS@

configure.ac

@@ -8395,6 +8395,11 @@ else
     AC_MSG_RESULT([internal])
     SYSTEM_ICU="NO"
     BUILD_TYPE="$BUILD_TYPE ICU"
+    # surprisingly set these only for "internal" (to be used by various other
+    # external libs): the system icu-config is quite unhelpful and spits out
+    # dozens of weird flags and also default path -I/usr/include
+    ICU_CFLAGS="-I${WORKDIR}/UnpackedTarball/icu/source/i18n -I${WORKDIR}/UnpackedTarball/icu/source/common"
+    ICU_LIBS=""
 fi
 AC_SUBST(SYSTEM_ICU)
 AC_SUBST(SYSTEM_GENBRK)
@@ -8406,6 +8411,8 @@ AC_SUBST(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)
 AC_SUBST(ICU_RECLASSIFIED_PREPEND_SET_EMPTY)
 AC_SUBST(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER)
 AC_SUBST(ICU_RECLASSIFIED_HEBREW_LETTER)
+AC_SUBST(ICU_CFLAGS)
+AC_SUBST(ICU_LIBS)
 
 dnl ===================================================================
 dnl Graphite

harfbuzz/ExternalProject_harfbuzz.mk

@@ -21,11 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,harfbuzz,\
 
 $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
 	$(call gb_ExternalProject_run,build,\
-		export ICU_LIBS=" " \
-		&& export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\
-			-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-			-I$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \
-		&& ./configure \
+		./configure \
 			--enable-static \
 			--disable-shared \
 			--with-pic \

libcdr/ExternalProject_libcdr.mk

@@ -27,10 +27,6 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\
 $(call gb_ExternalProject_get_state_target,libcdr,build) :
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
-		&& export ICU_LIBS=" " \
-		&& export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\
-			-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-			-I$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \
 		&& ./configure \
 			--with-pic \
 			--enable-static \

libmspub/ExternalProject_libmspub.mk

@@ -25,10 +25,6 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\
 $(call gb_ExternalProject_get_state_target,libmspub,build) :
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
-		&& export ICU_LIBS=" " \
-		&& export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\
-			-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-			-I$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \
 		&& ./configure \
 			--with-pic \
 			--enable-static \

libvisio/ExternalProject_libvisio.mk

@@ -27,10 +27,6 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\
 $(call gb_ExternalProject_get_state_target,libvisio,build) :
 	$(call gb_ExternalProject_run,build,\
 		export PKG_CONFIG="" \
-		&& export ICU_LIBS=" " \
-		&& export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),\
-			-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-			-I$(call gb_UnpackedTarball_get_dir,icu)/source/common, )" \
 		&& ./configure \
 			--with-pic \
 			--enable-static \