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

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

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;