configure.ac | 2 +- lingucomponent/source/numbertext/numbertext.cxx | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-)
New commits: commit 672501c91feab21824e77f3087dc3e69a14f5f0b Author: Rene Engelhard <r...@debian.org> Date: Fri May 4 10:55:42 2018 +0200 set -DENABLE_LIBNJUMBERTEXT after pkg-config so that we don't "loose" the pkg-config --cflags info. That also makes the #ifdef in lingucomponent/source/numbertext/numbertext.cxx not needed anymore Change-Id: Ia5771859a4a181f1a8a450d9ad4130b1e53abf8e diff --git a/configure.ac b/configure.ac index a840bed74350..657c11001367 100644 --- a/configure.ac +++ b/configure.ac @@ -9653,8 +9653,8 @@ dnl =================================================================== dnl Checking for libnumbertext dnl =================================================================== ENABLE_LIBNUMBERTEXT=TRUE -LIBNUMBERTEXT_CFLAGS="-DENABLE_LIBNUMBERTEXT" libo_CHECK_SYSTEM_MODULE([libnumbertext],[LIBNUMBERTEXT],[libnumbertext >= 1.0.0]) +LIBNUMBERTEXT_CFLAGS="$LIBNUMBERTEXT_CFLAGS -DENABLE_LIBNUMBERTEXT" if test "$with_system_libnumbertext" = "yes"; then SYSTEM_LIBNUMBERTEXT_DATA=file://`$PKG_CONFIG --variable=pkgdatadir libnumbertext` SYSTEM_LIBNUMBERTEXT=YES diff --git a/lingucomponent/source/numbertext/numbertext.cxx b/lingucomponent/source/numbertext/numbertext.cxx index 237aaa46ba01..ec841a4bcab2 100644 --- a/lingucomponent/source/numbertext/numbertext.cxx +++ b/lingucomponent/source/numbertext/numbertext.cxx @@ -37,13 +37,9 @@ #include <sal/macros.h> -#ifdef SYSTEM_LIBNUMBERTEXT -#include <libnumbertext/Numbertext.hxx> -#else #ifdef ENABLE_LIBNUMBERTEXT #include <Numbertext.hxx> #endif -#endif using namespace ::osl; using namespace ::cppu; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits