diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-29 10:38:00 -0500 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-08-30 07:05:36 +0000 |
| commit | 587d9693bdea45b90331da1c577c017db38f3f39 (patch) | |
| tree | ba9613cb738178d2ac94a0d9a3e9fa0f114ec8b4 | |
| parent | ffaad89e05fdb889d2b18d5914894acb91e1248e (diff) | |
liblangtag: harmonize ENABLE_* variable to use TRUE/<nothing>
Change-Id: I6e231516476f3b9512e239ccf678048c87d25aa5
Reviewed-on: https://gerrit.libreoffice.org/5682
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk | 2 | ||||
| -rw-r--r-- | i18nlangtag/Library_i18nlangtag.mk | 2 | ||||
| -rw-r--r-- | liblangtag/Module_liblangtag.mk | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5962dc40906a..e96e812a23a8 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -825,7 +825,7 @@ define gb_LinkTarget__use_glib $(error gb_LinkTarget__use_glib should not be called any more) endef -ifeq ($(ENABLE_LIBLANGTAG),YES) +ifeq ($(ENABLE_LIBLANGTAG),TRUE) ifeq ($(SYSTEM_LIBLANGTAG),YES) diff --git a/configure.ac b/configure.ac index 75ffd0405f94..cc8721f0b16b 100644 --- a/configure.ac +++ b/configure.ac @@ -11621,7 +11621,7 @@ ENABLE_LIBLANGTAG= SYSTEM_LIBLANGTAG= AC_MSG_CHECKING([whether to use liblangtag]) if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os != Android -a $_os != iOS \); then - ENABLE_LIBLANGTAG=YES + ENABLE_LIBLANGTAG=TRUE AC_MSG_RESULT([yes]) AC_MSG_CHECKING([whether to use system liblangtag]) if test "$with_system_liblangtag" = yes; then @@ -11636,7 +11636,6 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os != BUILD_TYPE="$BUILD_TYPE LIBLANGTAG" fi else - ENABLE_LIBLANGTAG=NO AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_LIBLANGTAG) diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk index f00171747ef3..2eec5a9c672d 100644 --- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk +++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk @@ -22,7 +22,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18nlangtag_test_languagetag,\ $(gb_UWINAPI) \ )) -ifeq ($(ENABLE_LIBLANGTAG),YES) +ifeq ($(ENABLE_LIBLANGTAG),TRUE) $(eval $(call gb_CppunitTest_use_externals,i18nlangtag_test_languagetag,\ liblangtag \ libxml2 \ diff --git a/i18nlangtag/Library_i18nlangtag.mk b/i18nlangtag/Library_i18nlangtag.mk index 4b6acb10ce5d..fd1548b0d882 100644 --- a/i18nlangtag/Library_i18nlangtag.mk +++ b/i18nlangtag/Library_i18nlangtag.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_add_exception_objects,i18nlangtag,\ )) -ifeq ($(ENABLE_LIBLANGTAG),YES) +ifeq ($(ENABLE_LIBLANGTAG),TRUE) $(eval $(call gb_Library_add_defs,i18nlangtag,-DENABLE_LIBLANGTAG)) $(eval $(call gb_Library_use_external,i18nlangtag,liblangtag)) $(eval $(call gb_Library_use_external,i18nlangtag,libxml2)) diff --git a/liblangtag/Module_liblangtag.mk b/liblangtag/Module_liblangtag.mk index 36201f86c782..3d68c54810d6 100644 --- a/liblangtag/Module_liblangtag.mk +++ b/liblangtag/Module_liblangtag.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,liblangtag)) -ifeq ($(ENABLE_LIBLANGTAG),YES) +ifeq ($(ENABLE_LIBLANGTAG),TRUE) ifeq ($(SYSTEM_LIBLANGTAG),NO) $(eval $(call gb_Module_add_targets,liblangtag,\ |