[Libreoffice-commits] libmspub.git: configure.ac src/conv

[David Tardon]

 configure.ac             |   16 +---------------
 src/conv/raw/Makefile.am |    1 +
 src/conv/svg/Makefile.am |    1 +
 3 files changed, 3 insertions(+), 15 deletions(-)

New commits:
commit e0e504e866a875d77eacf7f4e42a2c9da13b2993
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Sep 8 19:34:30 2017 +0200

    assume modern enough ICU is available
    
    Change-Id: I89e778d035103b2d5c60f80f379406d3ca391722

diff --git a/configure.ac b/configure.ac
index c058bca..42b8ffc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,21 +106,7 @@ AC_CHECK_HEADERS(
 # ========
 # Find icu
 # ========
-AS_IF([test "${ICU_CFLAGS+set}" = set],[
-	ICU_CFLAGS_overriden=yes],[
-	ICU_CFLAGS_overriden=no])
-PKG_CHECK_MODULES([ICU],[icu-i18n],[
-	AS_IF([test "${ICU_CFLAGS_overriden}" = no], [
-		ICU_CFLAGS="${ICU_CFLAGS} `${PKG_CONFIG} icu-i18n --variable=CXXFLAGS`"])
-	], [
-	AC_PATH_PROG([ICU_CONFIG],[icu-config])
-	AC_MSG_CHECKING([ICU installation])
-	AS_IF([${ICU_CONFIG} --cflags >/dev/null 2>&1],[
-		ICU_CFLAGS=`${ICU_CONFIG} --cppflags-searchpath --cxxflags`
-		ICU_LIBS=`${ICU_CONFIG} --ldflags`
-		AC_MSG_RESULT([found])],[
-		AC_MSG_ERROR([libicu config program icu-config not found])])]
-)
+PKG_CHECK_MODULES([ICU], [icu-i18n])
 AC_SUBST(ICU_CFLAGS)
 AC_SUBST(ICU_LIBS)
 
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index 1184461..5fbafa6 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -10,6 +10,7 @@ pub2raw_DEPENDENCIES = @PUB2RAW_WIN32_RESOURCE@
 
 pub2raw_LDADD = \
 	$(top_builddir)/src/lib/libmspub- at MSPUB_MAJOR_VERSION@. at MSPUB_MINOR_VERSION@.la \
+	$(ICU_LIBS) \
 	$(REVENGE_GENERATORS_LIBS) \
 	$(REVENGE_LIBS) \
 	$(REVENGE_STREAM_LIBS) \
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index 07fe792..2127256 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -9,6 +9,7 @@ pub2xhtml_DEPENDENCIES = @PUB2XHTML_WIN32_RESOURCE@
 
 pub2xhtml_LDADD = \
 	$(top_builddir)/src/lib/libmspub- at MSPUB_MAJOR_VERSION@. at MSPUB_MINOR_VERSION@.la \
+	$(ICU_LIBS) \
 	$(REVENGE_LIBS) \
 	$(REVENGE_STREAM_LIBS) \
 	@PUB2XHTML_WIN32_RESOURCE@