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

[David Tardon]

 configure.ac              |   28 ++++++++++------------------
 src/conv/raw/Makefile.am  |    2 ++
 src/conv/svg/Makefile.am  |    2 ++
 src/conv/text/Makefile.am |    2 ++
 4 files changed, 16 insertions(+), 18 deletions(-)

New commits:
commit d6b3911a7145c3712fb2a21347d9057fb9204c49
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Sep 8 19:26:16 2017 +0200

    assume modern enough ICU is available
    
    Change-Id: Id1699583cf123ac48e9fdb93ff0e9fd64201633e

diff --git a/configure.ac b/configure.ac
index 79573ae..0286ae1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,21 +111,7 @@ AC_SUBST(ZLIB_LIBS)
 # ========
 # 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 024ab8d..7fd9bd2 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -13,6 +13,7 @@ cdr2raw_DEPENDENCIES = @CDR2RAW_WIN32_RESOURCE@
 
 cdr2raw_LDADD = \
 	../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la \
+	$(ICU_LIBS) \
 	$(REVENGE_GENERATORS_LIBS) \
 	$(REVENGE_LIBS) \
 	$(REVENGE_STREAM_LIBS) \
@@ -25,6 +26,7 @@ cmx2raw_DEPENDENCIES = @CMX2RAW_WIN32_RESOURCE@
 
 cmx2raw_LDADD = \
 	../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_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 e1a9d73..57ad634 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -12,6 +12,7 @@ cdr2xhtml_DEPENDENCIES = @CDR2XHTML_WIN32_RESOURCE@
 
 cdr2xhtml_LDADD = \
 	../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la \
+	$(ICU_LIBS) \
 	$(REVENGE_LIBS) \
 	$(REVENGE_STREAM_LIBS) \
 	@CDR2XHTML_WIN32_RESOURCE@ 
@@ -23,6 +24,7 @@ cmx2xhtml_DEPENDENCIES = @CMX2XHTML_WIN32_RESOURCE@
 
 cmx2xhtml_LDADD = \
 	../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la \
+	$(ICU_LIBS) \
 	$(REVENGE_GENERATORS_LIBS) \
 	$(REVENGE_LIBS) \
 	$(REVENGE_STREAM_LIBS) \
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index f52e6bb..5618cdc 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -13,6 +13,7 @@ cdr2text_DEPENDENCIES = @CDR2TEXT_WIN32_RESOURCE@
 
 cdr2text_LDADD = \
 	../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la \
+	$(ICU_LIBS) \
 	$(REVENGE_GENERATORS_LIBS) \
 	$(REVENGE_LIBS) \
 	$(REVENGE_STREAM_LIBS) \
@@ -25,6 +26,7 @@ cmx2text_DEPENDENCIES = @CMX2TEXT_WIN32_RESOURCE@
 
 cmx2text_LDADD = \
 	../../lib/libcdr- at CDR_MAJOR_VERSION@. at CDR_MINOR_VERSION@.la \
+	$(ICU_LIBS) \
 	$(REVENGE_GENERATORS_LIBS) \
 	$(REVENGE_LIBS) \
 	$(REVENGE_STREAM_LIBS) \
commit 5c877eb154c80585ed09d7614964c3ae1c931004
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Sep 8 19:29:08 2017 +0200

    tests need librevenge-stream too
    
    Change-Id: I3e5ddf2c19f27fe3201952d3ea2b732e4ebeda09

diff --git a/configure.ac b/configure.ac
index 39770dd..79573ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,7 @@ AC_ARG_ENABLE([tools],
 	[enable_tools=yes]
 )
 AM_CONDITIONAL(BUILD_TOOLS, [test "x$enable_tools" = "xyes"])
+AS_IF([test "x$enable_tools" = "xyes"], [need_stream=yes; need_generators=yes])
 
 # =======
 # Fuzzers
@@ -68,17 +69,21 @@ AC_ARG_ENABLE([fuzzers],
 	[enable_fuzzers=no]
 )
 AM_CONDITIONAL(BUILD_FUZZERS, [test "x$enable_fuzzers" = "xyes"])
+AS_IF([test "x$enable_fuzzers" = "xyes"], [need_stream=yes; need_generators=yes])
 
-AS_IF([test "x$enable_tools" = "xyes" -o "x$enable_fuzzers" = "xyes"], [
+AS_IF([test "x$need_stream" = "xyes"], [
 	PKG_CHECK_MODULES([REVENGE_STREAM],[
 		librevenge-stream-0.0
 	])
+])
+AC_SUBST([REVENGE_STREAM_CFLAGS])
+AC_SUBST([REVENGE_STREAM_LIBS])
+
+AS_IF([test "x$need_generators" = "xyes"], [
 	PKG_CHECK_MODULES([REVENGE_GENERATORS],[
 		librevenge-generators-0.0
 	])
 ])
-AC_SUBST([REVENGE_STREAM_CFLAGS])
-AC_SUBST([REVENGE_STREAM_LIBS])
 AC_SUBST([REVENGE_GENERATORS_CFLAGS])
 AC_SUBST([REVENGE_GENERATORS_LIBS])
 
@@ -325,6 +330,7 @@ AS_IF([test "x$enable_tests" = "xyes"], [
 AC_SUBST([CPPUNIT_CFLAGS])
 AC_SUBST([CPPUNIT_LIBS])
 AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" = "xyes"])
+AS_IF([test "x$enable_tests" = "xyes"], [need_stream=yes])
 
 # =============
 # Documentation