Kaydet (Commit) 9fc9e9cf authored tarafından Michael Stahl's avatar Michael Stahl

normalize values of SYSTEM_HUNSPELL, SYSTEM_HYPH

Change-Id: Ib11dcf94263aefc68ae2e831baeeb957231793ae
üst 187194b8
...@@ -511,7 +511,7 @@ $(call gb_LinkTarget__use_expat_impl,$(1),expat_x64) ...@@ -511,7 +511,7 @@ $(call gb_LinkTarget__use_expat_impl,$(1),expat_x64)
endef endef
ifeq ($(SYSTEM_HYPH),YES) ifneq ($(SYSTEM_HYPH),)
define gb_LinkTarget__use_hyphen define gb_LinkTarget__use_hyphen
$(call gb_LinkTarget_add_libs,$(1),$(HYPHEN_LIB)) $(call gb_LinkTarget_add_libs,$(1),$(HYPHEN_LIB))
...@@ -540,7 +540,7 @@ endef ...@@ -540,7 +540,7 @@ endef
endif # SYSTEM_HYPH endif # SYSTEM_HYPH
ifeq ($(SYSTEM_HUNSPELL),YES) ifneq ($(SYSTEM_HUNSPELL),)
define gb_LinkTarget__use_hunspell define gb_LinkTarget__use_hunspell
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
......
...@@ -9483,7 +9483,7 @@ dnl =================================================================== ...@@ -9483,7 +9483,7 @@ dnl ===================================================================
AC_MSG_CHECKING([which libhunspell to use]) AC_MSG_CHECKING([which libhunspell to use])
if test "$with_system_hunspell" = "yes"; then if test "$with_system_hunspell" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_HUNSPELL=YES SYSTEM_HUNSPELL=TRUE
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
PKG_CHECK_MODULES(HUNSPELL, hunspell, HUNSPELL_PC="TRUE", HUNSPELL_PC="" ) PKG_CHECK_MODULES(HUNSPELL, hunspell, HUNSPELL_PC="TRUE", HUNSPELL_PC="" )
if test "$HUNSPELL_PC" != "TRUE"; then if test "$HUNSPELL_PC" != "TRUE"; then
...@@ -9501,7 +9501,7 @@ if test "$with_system_hunspell" = "yes"; then ...@@ -9501,7 +9501,7 @@ if test "$with_system_hunspell" = "yes"; then
HUNSPELL_CFLAGS=$(printf '%s' "$HUNSPELL_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") HUNSPELL_CFLAGS=$(printf '%s' "$HUNSPELL_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_HUNSPELL=NO SYSTEM_HUNSPELL=
HUNSPELL_CFLAGS="-I${WORKDIR}/UnpackedTarball/hunspell/src/hunspell" HUNSPELL_CFLAGS="-I${WORKDIR}/UnpackedTarball/hunspell/src/hunspell"
if test "$COM" = "MSC"; then if test "$COM" = "MSC"; then
HUNSPELL_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/hunspell.lib" HUNSPELL_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/hunspell.lib"
...@@ -9520,7 +9520,7 @@ dnl =================================================================== ...@@ -9520,7 +9520,7 @@ dnl ===================================================================
AC_MSG_CHECKING([which altlinuxhyph to use]) AC_MSG_CHECKING([which altlinuxhyph to use])
if test "$with_system_altlinuxhyph" = "yes"; then if test "$with_system_altlinuxhyph" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_HYPH=YES SYSTEM_HYPH=TRUE
AC_CHECK_HEADER(hyphen.h, [], AC_CHECK_HEADER(hyphen.h, [],
[ AC_MSG_ERROR(altlinuxhyph headers not found.)], []) [ AC_MSG_ERROR(altlinuxhyph headers not found.)], [])
AC_CHECK_MEMBER(struct _HyphenDict.cset, [], AC_CHECK_MEMBER(struct _HyphenDict.cset, [],
...@@ -9539,7 +9539,7 @@ if test "$with_system_altlinuxhyph" = "yes"; then ...@@ -9539,7 +9539,7 @@ if test "$with_system_altlinuxhyph" = "yes"; then
libo_MINGW_CHECK_DLL([libhyphen]) libo_MINGW_CHECK_DLL([libhyphen])
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_HYPH=NO SYSTEM_HYPH=
BUILD_TYPE="$BUILD_TYPE HYPHEN" BUILD_TYPE="$BUILD_TYPE HYPHEN"
if test "$COM" = "MSC"; then if test "$COM" = "MSC"; then
HYPHEN_LIB="${WORKDIR}/LinkTarget/StaticLibrary/hyphen.lib" HYPHEN_LIB="${WORKDIR}/LinkTarget/StaticLibrary/hyphen.lib"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,hyphen)) $(eval $(call gb_Module_Module,hyphen))
ifeq ($(SYSTEM_HYPH),NO) ifeq ($(SYSTEM_HYPH),)
$(eval $(call gb_Module_add_targets,hyphen,\ $(eval $(call gb_Module_add_targets,hyphen,\
UnpackedTarball_hyphen \ UnpackedTarball_hyphen \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment