diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2012-08-10 10:27:54 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2012-08-10 16:44:26 +0200 |
| commit | 6a7b32b09e621364239bca6ec02c858b122e07b8 (patch) | |
| tree | 7e9d6ffa47102cb2d14d115326c9da0dec69c916 /i18npool | |
| parent | 26310504c3c20385caf35f5a703f1d5f1682b4c7 (diff) | |
Implement --disable-liblangtag, to be able to build without that.
Change-Id: Ic38d0282dba99efe2ecc45142a927ba3d8fa167d
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/Library_i18nisolang1.mk | 5 | ||||
| -rw-r--r-- | i18npool/source/languagetag/languagetag.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index e022680790db..d0825034dd89 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -54,12 +54,11 @@ $(eval $(call gb_Library_add_exception_objects,i18nisolang1,\ )) -ifneq ($(OS),ANDROID) -ifneq ($(OS),IOS) +ifeq ($(ENABLE_LIBLANGTAG),YES) +$(eval $(call gb_Library_add_defs,i18nisolang1,-DENABLE_LIBLANGTAG)) $(eval $(call gb_Library_use_external,i18nisolang1,glib)) $(eval $(call gb_Library_use_external,i18nisolang1,liblangtag)) endif -endif $(eval $(call gb_Library_use_external,i18nisolang1,libxml2)) diff --git a/i18npool/source/languagetag/languagetag.cxx b/i18npool/source/languagetag/languagetag.cxx index 8a60d196b220..41923742a2b1 100644 --- a/i18npool/source/languagetag/languagetag.cxx +++ b/i18npool/source/languagetag/languagetag.cxx @@ -15,7 +15,7 @@ //#define erDEBUG -#if !defined(ANDROID) && !defined(IOS) +#ifdef ENABLE_LIBLANGTAG #include <liblangtag/langtag.h> #else /* Replacement code for LGPL phobic and Android systems. |