diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 19:21:36 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:11 +0100 |
| commit | 9fc9e9cfec84de414fd59239203745fd458ac753 (patch) | |
| tree | 46ae50303c6869e5aa621a8531ec27a942fd36de | |
| parent | 187194b8aea14350e38bf181dc97c2f1019222f0 (diff) | |
normalize values of SYSTEM_HUNSPELL, SYSTEM_HYPH
Change-Id: Ib11dcf94263aefc68ae2e831baeeb957231793ae
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | external/hyphen/Module_hyphen.mk | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c9ed72fc45cf..b0cc2d1cbcbd 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -511,7 +511,7 @@ $(call gb_LinkTarget__use_expat_impl,$(1),expat_x64) endef -ifeq ($(SYSTEM_HYPH),YES) +ifneq ($(SYSTEM_HYPH),) define gb_LinkTarget__use_hyphen $(call gb_LinkTarget_add_libs,$(1),$(HYPHEN_LIB)) @@ -540,7 +540,7 @@ endef endif # SYSTEM_HYPH -ifeq ($(SYSTEM_HUNSPELL),YES) +ifneq ($(SYSTEM_HUNSPELL),) define gb_LinkTarget__use_hunspell $(call gb_LinkTarget_set_include,$(1),\ diff --git a/configure.ac b/configure.ac index f090ddb7f593..be850d602ef0 100644 --- a/configure.ac +++ b/configure.ac @@ -9483,7 +9483,7 @@ dnl =================================================================== AC_MSG_CHECKING([which libhunspell to use]) if test "$with_system_hunspell" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_HUNSPELL=YES + SYSTEM_HUNSPELL=TRUE AC_LANG_PUSH([C++]) PKG_CHECK_MODULES(HUNSPELL, hunspell, HUNSPELL_PC="TRUE", HUNSPELL_PC="" ) if test "$HUNSPELL_PC" != "TRUE"; then @@ -9501,7 +9501,7 @@ if test "$with_system_hunspell" = "yes"; then HUNSPELL_CFLAGS=$(printf '%s' "$HUNSPELL_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") else AC_MSG_RESULT([internal]) - SYSTEM_HUNSPELL=NO + SYSTEM_HUNSPELL= HUNSPELL_CFLAGS="-I${WORKDIR}/UnpackedTarball/hunspell/src/hunspell" if test "$COM" = "MSC"; then HUNSPELL_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/hunspell.lib" @@ -9520,7 +9520,7 @@ dnl =================================================================== AC_MSG_CHECKING([which altlinuxhyph to use]) if test "$with_system_altlinuxhyph" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_HYPH=YES + SYSTEM_HYPH=TRUE AC_CHECK_HEADER(hyphen.h, [], [ AC_MSG_ERROR(altlinuxhyph headers not found.)], []) AC_CHECK_MEMBER(struct _HyphenDict.cset, [], @@ -9539,7 +9539,7 @@ if test "$with_system_altlinuxhyph" = "yes"; then libo_MINGW_CHECK_DLL([libhyphen]) else AC_MSG_RESULT([internal]) - SYSTEM_HYPH=NO + SYSTEM_HYPH= BUILD_TYPE="$BUILD_TYPE HYPHEN" if test "$COM" = "MSC"; then HYPHEN_LIB="${WORKDIR}/LinkTarget/StaticLibrary/hyphen.lib" diff --git a/external/hyphen/Module_hyphen.mk b/external/hyphen/Module_hyphen.mk index 80dae1f219ed..5d32fb8f9b21 100644 --- a/external/hyphen/Module_hyphen.mk +++ b/external/hyphen/Module_hyphen.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,hyphen)) -ifeq ($(SYSTEM_HYPH),NO) +ifeq ($(SYSTEM_HYPH),) $(eval $(call gb_Module_add_targets,hyphen,\ UnpackedTarball_hyphen \ |