mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

liblangtag: harmonize ENABLE_* variable to use TRUE/<nothing>

Browse Source 
Change-Id: I6e231516476f3b9512e239ccf678048c87d25aa5
Reviewed-on: https://gerrit.libreoffice.org/5682
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
This commit is contained in:
Norbert Thiebaud
2013-08-29 10:38:00 -05:00
committed by Fridrich Strba
parent ffaad89e05
commit 587d9693bd
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RepositoryExternal.mk
View File

@@ -825,7 +825,7 @@ define gb_LinkTarget__use_glib
$(error gb_LinkTarget__use_glib should not be called any more) $(error gb_LinkTarget__use_glib should not be called any more)
endef endef
ifeq ($(ENABLE_LIBLANGTAG),YES) ifeq ($(ENABLE_LIBLANGTAG),TRUE)
ifeq ($(SYSTEM_LIBLANGTAG),YES) ifeq ($(SYSTEM_LIBLANGTAG),YES)

3
configure.ac
View File

@@ -11621,7 +11621,7 @@ ENABLE_LIBLANGTAG=
SYSTEM_LIBLANGTAG= SYSTEM_LIBLANGTAG=
AC_MSG_CHECKING([whether to use liblangtag]) AC_MSG_CHECKING([whether to use liblangtag])
if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os != Android -a $_os != iOS \); then 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_RESULT([yes])
AC_MSG_CHECKING([whether to use system liblangtag]) AC_MSG_CHECKING([whether to use system liblangtag])
if test "$with_system_liblangtag" = yes; then 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" BUILD_TYPE="$BUILD_TYPE LIBLANGTAG"
fi fi
else else
ENABLE_LIBLANGTAG=NO
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_SUBST(ENABLE_LIBLANGTAG) AC_SUBST(ENABLE_LIBLANGTAG)

2
i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
View File

@@ -22,7 +22,7 @@ $(eval $(call gb_CppunitTest_use_libraries,i18nlangtag_test_languagetag,\
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
ifeq ($(ENABLE_LIBLANGTAG),YES) ifeq ($(ENABLE_LIBLANGTAG),TRUE)
$(eval $(call gb_CppunitTest_use_externals,i18nlangtag_test_languagetag,\ $(eval $(call gb_CppunitTest_use_externals,i18nlangtag_test_languagetag,\
liblangtag \ liblangtag \
libxml2 \ libxml2 \

2
i18nlangtag/Library_i18nlangtag.mk
View File

@@ -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_add_defs,i18nlangtag,-DENABLE_LIBLANGTAG))
$(eval $(call gb_Library_use_external,i18nlangtag,liblangtag)) $(eval $(call gb_Library_use_external,i18nlangtag,liblangtag))
$(eval $(call gb_Library_use_external,i18nlangtag,libxml2)) $(eval $(call gb_Library_use_external,i18nlangtag,libxml2))

2
liblangtag/Module_liblangtag.mk
View File

@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,liblangtag)) $(eval $(call gb_Module_Module,liblangtag))
ifeq ($(ENABLE_LIBLANGTAG),YES) ifeq ($(ENABLE_LIBLANGTAG),TRUE)
ifeq ($(SYSTEM_LIBLANGTAG),NO) ifeq ($(SYSTEM_LIBLANGTAG),NO)
$(eval $(call gb_Module_add_targets,liblangtag,\ $(eval $(call gb_Module_add_targets,liblangtag,\