diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 19:04:20 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:08 +0100 |
| commit | 23647595d77b85b5dac0d5762987a3ba2533ffd9 (patch) | |
| tree | f7fe77edb89792eabd184f2d2aa7ec27513b0dfb | |
| parent | e3abec3f07f2a710bfce66f77b33f494e2aa4972 (diff) | |
normalize values of SYSTEM_LIBATOMIC_OPS, SYSTEM_FIREBIRD
Change-Id: I89802da0ad7f7bf838a8937430825b0adf42a6ee
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 6 | ||||
| -rw-r--r-- | external/libatomic_ops/Module_libatomic_ops.mk | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0e7794bb14f3..24300dbe3bab 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -728,7 +728,7 @@ gb_LinkTarget__use_jawt := endif # $(OS)$(COM) = WNTGCC -ifeq ($(SYSTEM_LIBATOMIC_OPS),YES) +ifneq ($(SYSTEM_LIBATOMIC_OPS),) define gb_LinkTarget__use_libatomic_ops $(call gb_LinkTarget_set_include,$(1),\ @@ -2299,7 +2299,7 @@ endif # SYSTEM_OPENLDAP ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE) -ifeq ($(SYSTEM_FIREBIRD),YES) +ifneq ($(SYSTEM_FIREBIRD),) define gb_LinkTarget__use_libfbembed $(call gb_LinkTarget_set_include,$(1),\ diff --git a/configure.ac b/configure.ac index 18def26b0916..c936927ac3dc 100644 --- a/configure.ac +++ b/configure.ac @@ -8589,7 +8589,7 @@ if test "x$enable_firebird_sdbc" = "xyes"; then AC_MSG_CHECKING([which Firebird to use]) if test "$with_system_firebird" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_FIREBIRD=YES + SYSTEM_FIREBIRD=TRUE AC_PATH_PROG(FIREBIRDCONFIG, [fb_config]) if test -z "$FIREBIRDCONFIG"; then AC_MSG_NOTICE([No fb_config -- using pkg-config]) @@ -8635,11 +8635,11 @@ if test "x$enable_firebird_sdbc" = "xyes"; then dnl =================================================================== libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops >= 0.7.2]) if test "$with_system_libatomic_ops" = "yes"; then - SYSTEM_LIBATOMIC_OPS=YES + SYSTEM_LIBATOMIC_OPS=TRUE AC_CHECK_HEADERS(atomic_ops.h, [], [AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], []) else - SYSTEM_LIBATOMIC_OPS=NO + SYSTEM_LIBATOMIC_OPS= LIBATOMIC_OPS_CFLAGS="-I${WORKDIR}/UnpackedTarball/libatomic_ops/include" LIBATOMIC_OPS_LIBS="-latomic_ops" BUILD_TYPE="$BUILD_TYPE LIBATOMIC_OPS" @@ -8647,7 +8647,7 @@ if test "x$enable_firebird_sdbc" = "xyes"; then fi AC_MSG_RESULT([internal]) - SYSTEM_FIREBIRD=NO + SYSTEM_FIREBIRD= FIREBIRD_CFLAGS="-I${WORKDIR}/UnpackedTarball/firebird/include" FIREBIRD_LIBS="-lfbembed" diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index cb3e35d10b38..692a81a78a8d 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -30,9 +30,9 @@ $(call gb_ExternalProject_get_state_target,firebird,build): unset MAKEFLAGS \ && export PKG_CONFIG="" \ && export CPPFLAGS=" \ - $(if $(filter NO,$(SYSTEM_LIBATOMIC_OPS)), \ - -I$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \ - ,$(LIBATOMIC_OPS_CFLAGS)) \ + $(if $(SYSTEM_LIBATOMIC_OPS),$(LIBATOMIC_OPS_CFLAGS), \ + -I$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src \ + ) \ " \ && export CXXFLAGS=" \ $(if $(filter NO,$(SYSTEM_BOOST)), \ diff --git a/external/libatomic_ops/Module_libatomic_ops.mk b/external/libatomic_ops/Module_libatomic_ops.mk index 0a9a534630de..2ea7e546be66 100644 --- a/external/libatomic_ops/Module_libatomic_ops.mk +++ b/external/libatomic_ops/Module_libatomic_ops.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,libatomic_ops)) -ifeq ($(SYSTEM_LIBATOMIC_OPS),NO) +ifeq ($(SYSTEM_LIBATOMIC_OPS),) $(eval $(call gb_Module_add_targets,libatomic_ops,\ ExternalProject_libatomic_ops \ |