diff options
| author | David Tardon <dtardon@redhat.com> | 2017-09-08 19:26:16 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-09-08 19:51:07 +0200 |
| commit | d6b3911a7145c3712fb2a21347d9057fb9204c49 (patch) | |
| tree | ef49e5236e16f8d010715aaf41478b0258944526 /configure.ac | |
| parent | 5c877eb154c80585ed09d7614964c3ae1c931004 (diff) | |
assume modern enough ICU is available
Change-Id: Id1699583cf123ac48e9fdb93ff0e9fd64201633e
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 1 insertions, 15 deletions
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) |