[Libreoffice-commits] core.git: config_host/config_liblangtag.h.in configure.ac i18nlangtag/source

[David Tardon]

 config_host/config_liblangtag.h.in             |    6 ++++++
 configure.ac                                   |    5 +++++
 i18nlangtag/source/languagetag/languagetag.cxx |    6 +++---
 3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit c75a575752dd53d4333dd8b937de774a85d00806
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Mar 29 19:52:50 2015 +0200

    WaE: macro "LT_HAVE_INLINE" is not used
    
    Change-Id: I375449ac3068927f525881b0022721130c9c63d6

diff --git a/config_host/config_liblangtag.h.in b/config_host/config_liblangtag.h.in
new file mode 100644
index 0000000..40077d9
--- /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 1edf101..f5c27f8 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 d346148..5501376 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.