[Libreoffice-commits] core.git: config_host.mk.in configure.ac

[Rene Engelhard]

 config_host.mk.in |    3 ++-
 configure.ac      |    2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 887481755949e6313e12d6e9ab04c95f84884830
Author: Rene Engelhard <rene at debian.org>
Date:   Thu May 3 23:55:25 2018 +0200

    fix system-libnumbertext build
    
    actually export SYSTEM_LIBNUMBERTEXT
    
    Change-Id: I758ef7ee868c5b06fc4e8ae43e6f2091925232aa

diff --git a/config_host.mk.in b/config_host.mk.in
index 3085de0c4767..b5e2dc00f8f5 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -332,7 +332,7 @@ export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@
 export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
 export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
 export LIBLOADER_JAR=@LIBLOADER_JAR@
-export LIBNUMBERTEXT_CXXFLAGS=$(gb_SPACE)@LIBNUMBERTEXT_CXXFLAGS@
+export LIBNUMBERTEXT_CFLAGS=$(gb_SPACE)@LIBNUMBERTEXT_CFLAGS@
 export LIBNUMBERTEXT_LIBS=$(gb_SPACE)@LIBNUMBERTEXT_LIBS@
 export ENABLE_LIBNUMBERTEXT=@ENABLE_LIBNUMBERTEXT@
 export LIBO_BIN_FOLDER=@LIBO_BIN_FOLDER@
@@ -549,6 +549,7 @@ export SYSTEM_LIBEOT=@SYSTEM_LIBEOT@
 export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@
 export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@
 export SYSTEM_LIBLANGTAG=@SYSTEM_LIBLANGTAG@
+export SYSTEM_LIBNUMBERTEXT=@SYSTEM_LIBNUMBERTEXT@
 export SYSTEM_LIBORCUS=@SYSTEM_LIBORCUS@
 export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@
 export SYSTEM_LIBXML=@SYSTEM_LIBXML@
diff --git a/configure.ac b/configure.ac
index eda8f07c0df3..a840bed74350 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9657,6 +9657,7 @@ LIBNUMBERTEXT_CFLAGS="-DENABLE_LIBNUMBERTEXT"
 libo_CHECK_SYSTEM_MODULE([libnumbertext],[LIBNUMBERTEXT],[libnumbertext >= 1.0.0])
 if test "$with_system_libnumbertext" = "yes"; then
     SYSTEM_LIBNUMBERTEXT_DATA=file://`$PKG_CONFIG --variable=pkgdatadir libnumbertext`
+    SYSTEM_LIBNUMBERTEXT=YES
 else
     AC_LANG_PUSH([C++])
     save_CXXFLAGS=$CXXFLAGS
@@ -9671,6 +9672,7 @@ else
     CXXFLAGS=$save_CXXFLAGS
     AC_LANG_POP([C++])
 fi
+AC_SUBST(SYSTEM_LIBNUMBERTEXT)
 AC_SUBST(SYSTEM_LIBNUMBERTEXT_DATA)
 AC_SUBST(ENABLE_LIBNUMBERTEXT)
 AC_SUBST(LIBNUMBERTEXT_CFLAGS)