diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 19:08:10 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:10 +0100 |
| commit | ff69e725c218a36d64153b36eb1fecd2b6057803 (patch) | |
| tree | 8a6e06c3804b82c755945c35f6529ba5f707a378 | |
| parent | 5866b33bdd4be5dbe7981b4775ffa66430e75ad2 (diff) | |
normalize values of SYSTEM_GLM, SYSTEM_VIGRA
Change-Id: Idc28f8be610aae57477f18c26ffcb97a24a2ab82
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | external/glm/Module_glm.mk | 2 | ||||
| -rw-r--r-- | external/vigra/Module_vigra.mk | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 769e014be8ec..3f9577167aa6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -92,7 +92,7 @@ endef endif -ifeq ($(SYSTEM_VIGRA),YES) +ifneq ($(SYSTEM_VIGRA),) gb_LinkTarget__use_vigra_headers := @@ -126,7 +126,7 @@ endef endif # SYSTEM_MDDS -ifeq ($(SYSTEM_GLM),YES) +ifneq ($(SYSTEM_GLM),) gb_LinkTarget__use_glm_headers := diff --git a/configure.ac b/configure.ac index 574c92047e65..8a4c2439a6fb 100644 --- a/configure.ac +++ b/configure.ac @@ -8798,7 +8798,7 @@ dnl =================================================================== AC_MSG_CHECKING([which glm to use]) if test "$with_system_glm" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_GLM=YES + SYSTEM_GLM=TRUE AC_LANG_PUSH([C++]) AC_CHECK_HEADER([glm/glm.hpp], [], [AC_MSG_ERROR([glm/glm.hpp not found. install glm])], []) @@ -8806,7 +8806,7 @@ if test "$with_system_glm" = "yes"; then else AC_MSG_RESULT([internal]) BUILD_TYPE="$BUILD_TYPE GLM" - SYSTEM_GLM=NO + SYSTEM_GLM= fi AC_SUBST([SYSTEM_GLM]) @@ -8821,7 +8821,7 @@ dnl =================================================================== AC_MSG_CHECKING([which vigra to use]) if test "$with_system_vigra" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_VIGRA=YES + SYSTEM_VIGRA=TRUE AC_LANG_PUSH([C++]) AC_CHECK_HEADER(vigra/copyimage.hxx, [], [AC_MSG_ERROR(vigra/copyimage.hxx not found. install vigra)], []) @@ -8829,7 +8829,7 @@ if test "$with_system_vigra" = "yes"; then else AC_MSG_RESULT([internal]) BUILD_TYPE="$BUILD_TYPE VIGRA" - SYSTEM_VIGRA=NO + SYSTEM_VIGRA= fi AC_SUBST(SYSTEM_VIGRA) diff --git a/external/glm/Module_glm.mk b/external/glm/Module_glm.mk index 71ec270b889a..e9ab006fba83 100644 --- a/external/glm/Module_glm.mk +++ b/external/glm/Module_glm.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,glm)) -ifeq ($(SYSTEM_GLM),NO) +ifeq ($(SYSTEM_GLM),) $(eval $(call gb_Module_add_targets,glm,\ UnpackedTarball_glm \ diff --git a/external/vigra/Module_vigra.mk b/external/vigra/Module_vigra.mk index af2369f31323..d78ce4b7b243 100644 --- a/external/vigra/Module_vigra.mk +++ b/external/vigra/Module_vigra.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,vigra)) -ifeq ($(SYSTEM_VIGRA),NO) +ifeq ($(SYSTEM_VIGRA),) $(eval $(call gb_Module_add_targets,vigra,\ UnpackedTarball_vigra \ |