texk/upmendex: build system fix by Luigi

git-svn-id: svn://tug.org/texlive/trunk@39691 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 16 insertions, 7 deletions

diff --git a/Build/source/texk/upmendex/Makefile.am b/Build/source/texk/upmendex/Makefile.am
index b8e32568fd2..78765255f9c 100644
--- a/Build/source/texk/upmendex/Makefile.am
+++ b/Build/source/texk/upmendex/Makefile.am
@@ -3,7 +3,7 @@
 ## Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
-AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
+AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(ICU_INCLUDES)
 AM_CFLAGS = $(WARNING_CFLAGS)
 
 bin_PROGRAMS = upmendex
@@ -27,9 +27,15 @@ upmendex_SOURCES = \
 	styfile.c \
 	var.h
 
-$(upmendex_OBJECTS): $(KPATHSEA_DEPEND)
 
-LDADD = $(KPATHSEA_LIBS)
+
+# Force Automake to use CXXLD for linking
+nodist_EXTRA_upmendex_SOURCES = dummy.cxx
+
+
+$(upmendex_OBJECTS): $(KPATHSEA_DEPEND) $(ICU_DEPEND)
+
+LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS)
 
 ## Rebuild libkpathsea
 @KPATHSEA_RULE@
diff --git a/Build/source/texk/upmendex/configure b/Build/source/texk/upmendex/configure
index 5f9b9159ffb..41db1a7e099 100755
--- a/Build/source/texk/upmendex/configure
+++ b/Build/source/texk/upmendex/configure
@@ -14957,7 +14957,6 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
 fi
 
 ## _KPSE_LIB_FLAGS: Setup icu (-licuxxx) flags
-
 # Check whether --with-system-icu was given.
 if test "${with_system_icu+set}" = set; then :
   withval=$with_system_icu;
@@ -15056,14 +15055,16 @@ else
 fi
 if $ICU_CONFIG --version >/dev/null 2>&1; then
   ICU_INCLUDES=`$ICU_CONFIG --cppflags`
-  ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-icuio --ldflags-libsonly --ldflags-system`
+  # Work around bug in icu-config version 4.4
+  ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath `
+  ICU_LIBS="$ICU_LIBS `$ICU_CONFIG --ldflags-libsonly --ldflags-system`"
 elif test "x$need_icu:$with_system_icu" = xyes:yes; then
   as_fn_error $? "did not find icu-config required for system icu libraries" "$LINENO" 5
 fi
 else
   ICU_INCLUDES="-DU_STATIC_IMPLEMENTATION -I$kpse_BLD/libs/icu/include"
-  ICU_LIBS="$kpse_BLD/libs/icu/icu-build/lib/libicuio.a $kpse_BLD/libs/icu/icu-build/lib/libicui18n.a $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a"
-  ICU_DEPEND='${top_builddir}/../../libs/icu/icu-build/lib/libicuio.a ${top_builddir}/../../libs/icu/icu-build/lib/libicui18n.a ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a'
+  ICU_LIBS="$kpse_BLD/libs/icu/icu-build/lib/libicui18n.a $kpse_BLD/libs/icu/icu-build/lib/libicuuc.a $kpse_BLD/libs/icu/icu-build/lib/libicudata.a"
+  ICU_DEPEND='${top_builddir}/../../libs/icu/icu-build/lib/libicui18n.a ${top_builddir}/../../libs/icu/icu-build/lib/libicuuc.a ${top_builddir}/../../libs/icu/icu-build/lib/libicudata.a'
   ICU_RULE='# Rebuild libicuxxx
 $(ICU_DEPEND): ${top_builddir}/../../libs/icu/include/unicode/uversion.h
 	cd ${top_builddir}/../../libs/icu && $(MAKE) $(AM_MAKEFLAGS) rebuild
diff --git a/Build/source/texk/upmendex/configure.ac b/Build/source/texk/upmendex/configure.ac
index 35efae51a9a..810ad46d00c 100644
--- a/Build/source/texk/upmendex/configure.ac
+++ b/Build/source/texk/upmendex/configure.ac
@@ -12,6 +12,8 @@ AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
 AC_CONFIG_MACRO_DIR([../../m4])
 
+AC_PROG_CXX
+
 dnl Common code for all programs using libkpathsea.
 KPSE_COMMON([upmendex], [no-define])