[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-0' - configure.ac RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |    2 +-
 configure.ac          |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f52464d93c45917800aa4cfe3aa4664e2276a210
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jan 13 14:21:10 2016 +0100

    move def. of liblangtag inc. path to configure
    
    Change-Id: Idef3015bf7b7bb5e0d984ac0b0a2163172cacc17
    (cherry picked from commit 345135002ae030bd3cd3d4bde594c14affc860a2)
    Reviewed-on: https://gerrit.libreoffice.org/21543
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    (cherry picked from commit 17ee83f108c4e7c00218ea09dbbffdf9989da0ae)
    Reviewed-on: https://gerrit.libreoffice.org/21778
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2a80542..8361961 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1069,7 +1069,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 define gb_LinkTarget__use_liblangtag
 $(call gb_LinkTarget_use_unpacked,$(1),langtag)
 $(call gb_LinkTarget_set_include,$(1),\
-	-I$(call gb_UnpackedTarball_get_dir,langtag) \
+	$(LIBLANGTAG_CFLAGS) \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),$(LIBLANGTAG_LIBS))
diff --git a/configure.ac b/configure.ac
index 6e5abf8..128daf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11853,6 +11853,7 @@ if test "$enable_liblangtag" = "yes" -o \
         SYSTEM_LIBLANGTAG=
         AC_MSG_RESULT([no])
         BUILD_TYPE="$BUILD_TYPE LIBLANGTAG"
+        LIBLANGTAG_CFLAGS="-I${WORKDIR}/UnpackedTarball/langtag"
         if test "$COM" = "MSC"; then
             LIBLANGTAG_LIBS="${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.lib"
         else