langtag: use ENABLE_LIBLANGTAG in unit test

i18npool/CppunitTest_i18npool_test_languagetag.mk

@@ -23,23 +23,17 @@ $(eval $(call gb_CppunitTest_use_libraries,i18npool_test_languagetag,\
 	$(gb_STDLIBS) \
 ))
 
-ifneq ($(OS),ANDROID)
-ifneq ($(OS),IOS)
+ifeq ($(ENABLE_LIBLANGTAG),YES)
 $(eval $(call gb_CppunitTest_use_externals,i18npool_test_languagetag,\
 	liblangtag \
 	glib \
-))
-endif
-endif
-
-$(eval $(call gb_CppunitTest_use_externals,i18npool_test_languagetag,\
 	libxml2 \
 ))
+$(eval $(call gb_CppunitTest_add_defs,i18npool_test_languagetag,-DENABLE_LIBLANGTAG))
 
 ifeq ($(SYSTEM_LIBLANGTAG),YES)
-$(eval $(call gb_CppunitTest_add_cxxflags,i18npool_test_languagetag,\
-	-DSYSTEM_LIBLANGTAG \
-))
+$(eval $(call gb_CppunitTest_add_defs,i18npool_test_languagetag,-DSYSTEM_LIBLANGTAG))
+endif
 endif
 
 $(eval $(call gb_CppunitTest_set_include,i18npool_test_languagetag,\

i18npool/qa/cppunit/test_languagetag.cxx

@@ -26,7 +26,11 @@ using namespace com::sun::star;
 
 // To test the replacement code add '&& 0' and also in
 // source/languagetag/languagetag.cxx
-#define USE_LIBLANGTAG (!defined(ANDROID) && !defined(IOS))
+#if defined(ENABLE_LIBLANGTAG)
+#define USE_LIBLANGTAG 1
+#else
+#define USE_LIBLANGTAG 0
+#endif
 
 namespace {
 

i18npool/source/languagetag/languagetag.cxx

@@ -15,7 +15,7 @@
 
 //#define erDEBUG
 
-#ifdef ENABLE_LIBLANGTAG
+#if defined(ENABLE_LIBLANGTAG)
 #include <liblangtag/langtag.h>
 #else
 /* Replacement code for LGPL phobic and Android systems.