summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2015-03-29 19:52:50 +0200
committerDavid Tardon <dtardon@redhat.com>2015-03-29 20:11:36 +0200
commitc75a575752dd53d4333dd8b937de774a85d00806 (patch)
tree766ef0ba06545417e9ff39110f1ac66dfdc7e078 /configure.ac
parent591a22f41f26335076ef7c53b3d51ecf5b57158b (diff)
WaE: macro "LT_HAVE_INLINE" is not used
Change-Id: I375449ac3068927f525881b0022721130c9c63d6
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 1edf101cf96e..f5c27f81dd24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11831,12 +11831,16 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os !=
SYSTEM_LIBLANGTAG=TRUE
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.4.0)
+ dnl cf. <https://bitbucket.org/tagoh/liblangtag/commits/9324836a0d1c> "Fix a build issue with inline keyword"
+ PKG_CHECK_EXISTS([liblangtag >= 0.5.5], [], [AC_DEFINE([LIBLANGTAG_INLINE_FIX])])
LIBLANGTAG_CFLAGS=$(printf '%s' "$LIBLANGTAG_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
libo_MINGW_CHECK_DLL([liblangtag])
else
SYSTEM_LIBLANGTAG=
AC_MSG_RESULT([no])
BUILD_TYPE="$BUILD_TYPE LIBLANGTAG"
+ dnl TODO: remove when liblangtag is updated to 0.5.5
+ AC_DEFINE([LIBLANGTAG_INLINE_FIX])
if test "$COM" = "MSC"; then
LIBLANGTAG_LIBS="${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.lib"
else
@@ -12929,6 +12933,7 @@ AC_CONFIG_HEADERS([config_host/config_gcc.h])
AC_CONFIG_HEADERS([config_host/config_global.h])
AC_CONFIG_HEADERS([config_host/config_graphite.h])
AC_CONFIG_HEADERS([config_host/config_lgpl.h])
+AC_CONFIG_HEADERS([config_host/config_liblangtag.h])
AC_CONFIG_HEADERS([config_host/config_locales.h])
AC_CONFIG_HEADERS([config_host/config_mpl.h])
AC_CONFIG_HEADERS([config_host/config_orcus.h])