[Libreoffice-commits] libvisio.git: 2 commits - configure.ac

[David Tardon]

 configure.ac |   18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

New commits:
commit 0089be571831d162c6460aea7be2003822bdc91d
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Sep 8 19:13:06 2017 +0200

    tests need librevenge-stream
    
    Change-Id: I54aad8e63223f9dd40e2a8a9a60c887b65dc5f56

diff --git a/configure.ac b/configure.ac
index 70b9e9f..e4751ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,7 @@ AS_IF([test "x$enable_tests" = "xyes"], [
 AC_SUBST([CPPUNIT_CFLAGS])
 AC_SUBST([CPPUNIT_LIBS])
 AM_CONDITIONAL([ENABLE_TESTS], [test "x$enable_tests" = "xyes"])
-AS_IF([test "x$enable_tests" = "xyes"], [need_generators=yes])
+AS_IF([test "x$enable_tests" = "xyes"], [need_stream=yes])
 
 AS_IF([test "x$need_stream" = "xyes"], [
 	PKG_CHECK_MODULES([REVENGE_STREAM],[
commit 7eeb092a87c3e233769aa292e9d012aff06c1927
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Sep 8 19:12:22 2017 +0200

    assume modern enough ICU is available
    
    Change-Id: I07a995aaa13af07f44642afd38d711555d23c37b

diff --git a/configure.ac b/configure.ac
index b635e1c..70b9e9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,21 +61,7 @@ PKG_CHECK_MODULES([LIBXML],[
 # ========
 # 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-uc])
 AC_SUBST(ICU_CFLAGS)
 AC_SUBST(ICU_LIBS)