diff options
| -rw-r--r-- | config_host/config_liblangtag.h.in | 6 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | i18nlangtag/source/languagetag/languagetag.cxx | 6 |
3 files changed, 14 insertions, 3 deletions
diff --git a/config_host/config_liblangtag.h.in b/config_host/config_liblangtag.h.in new file mode 100644 index 000000000000..40077d99739a --- /dev/null +++ b/config_host/config_liblangtag.h.in @@ -0,0 +1,6 @@ +#ifndef CONFIG_LIBLANGTAG_H +#define CONFIG_LIBLANGTAG_H + +#undef LIBLANGTAG_INLINE_FIX + +#endif 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]) diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index d3461486d9c9..5501376049e3 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -8,6 +8,7 @@ */ #include <config_folders.h> +#include <config_liblangtag.h> #include "i18nlangtag/languagetag.hxx" #include "i18nlangtag/applelangid.hxx" @@ -24,10 +25,9 @@ //#define erDEBUG #if defined(ENABLE_LIBLANGTAG) +#if defined(LIBLANGTAG_INLINE_FIX) #define LT_HAVE_INLINE - // TODO: remove above line again for liblangtag >= 0.5.5, cf. - // <https://bitbucket.org/tagoh/liblangtag/commits/9324836a0d1c> "Fix a - // build issue with inline keyword" +#endif #include <liblangtag/langtag.h> #else /* Replacement code for LGPL phobic and Android systems. |