ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

set -DENABLE_LIBNJUMBERTEXT after pkg-config

Browse Source 
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
This commit is contained in:
Rene Engelhard
2018-05-04 10:56:16 +02:00
parent e046c36776
commit 672501c91f
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+1 -1
View File
@@ -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
lingucomponent/source/numbertext/numbertext.cxx
-4
View File
@@ -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;