diff options
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | connectivity/Library_postgresql-sdbc-impl.mk | 2 | ||||
| -rw-r--r-- | external/postgresql/Module_postgresql.mk | 2 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9823fe9e3e9e..769e014be8ec 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2235,7 +2235,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ) endef -ifeq ($(SYSTEM_HSQLDB),YES) +ifneq ($(SYSTEM_HSQLDB),) define gb_LinkTarget__use_hsqldb @@ -2356,7 +2356,7 @@ gb_LinkTarget__use_firebird := endif # ENABLE_FIREBIRD_SDBC -ifeq ($(SYSTEM_POSTGRESQL),YES) +ifneq ($(SYSTEM_POSTGRESQL),) define gb_LinkTarget__use_postgresql @@ -2906,7 +2906,7 @@ endif # DESKTOP ### Jars ############################################################ -ifeq ($(SYSTEM_HSQLDB),YES) +ifneq ($(SYSTEM_HSQLDB),) define gb_Jar__use_hsqldb $(call gb_Jar_use_system_jar,$(1),$(HSQLDB_JAR)) diff --git a/configure.ac b/configure.ac index 75e188afe561..574c92047e65 100644 --- a/configure.ac +++ b/configure.ac @@ -8379,7 +8379,7 @@ HSQLDB_USE_JDBC_4_1= AC_MSG_CHECKING([which hsqldb to use]) if test "$with_system_hsqldb" = "yes"; then AC_MSG_RESULT([external]) - SYSTEM_HSQLDB=YES + SYSTEM_HSQLDB=TRUE if test -z $HSQLDB_JAR; then HSQLDB_JAR=/usr/share/java/hsqldb.jar fi @@ -8414,7 +8414,7 @@ if test "$with_system_hsqldb" = "yes"; then fi else AC_MSG_RESULT([internal]) - SYSTEM_HSQLDB=NO + SYSTEM_HSQLDB= BUILD_TYPE="$BUILD_TYPE HSQLDB" AC_MSG_CHECKING([whether hsqldb should be built with JDBC 4.1]) javanumver=`$JAVAINTERPRETER -version 2>&1 | $AWK -v num=true -f $SRC_ROOT/solenv/bin/getcompver.awk` @@ -8446,7 +8446,7 @@ if test "x$enable_postgresql_sdbc" != "xno"; then AC_MSG_CHECKING([PostgreSQL C interface]) if test "$with_system_postgresql" = "yes"; then AC_MSG_RESULT([external PostgreSQL]) - SYSTEM_POSTGRESQL=YES + SYSTEM_POSTGRESQL=TRUE if test "$_os" = Darwin; then supp_path='' for d in /Library/PostgreSQL/9.*/bin /sw/opt/postgresql/9.*/bin /opt/local/lib/postgresql9*/bin; do @@ -8539,19 +8539,19 @@ if test "x$enable_postgresql_sdbc" != "xno"; then esac if test -n "$with_libpq_path"; then - SYSTEM_POSTGRESQL=YES + SYSTEM_POSTGRESQL=TRUE AC_MSG_RESULT([external libpq]) POSTGRESQL_LIB="-L${with_libpq_path}/lib/" POSTGRESQL_INC=-I"${with_libpq_path}/include/" else - SYSTEM_POSTGRESQL=NO + SYSTEM_POSTGRESQL= AC_MSG_RESULT([internal]) POSTGRESQL_LIB="" POSTGRESQL_INC="%OVERRIDE_ME%" BUILD_TYPE="$BUILD_TYPE POSTGRESQL" fi fi - if test "${SYSTEM_POSTGRESQL}" = "YES"; then + if test "${SYSTEM_POSTGRESQL}" = "TRUE"; then AC_MSG_NOTICE([checking system PostgreSQL prerequisites]) save_CFLAGS=$CFLAGS save_CPPFLAGS=$CPPFLAGS diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index bdb96c5ad027..d8a888c849d9 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -52,7 +52,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ ) \ )) -ifneq ($(SYSTEM_POSTGRESQL),YES) +ifeq ($(SYSTEM_POSTGRESQL),) ifneq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\ diff --git a/external/postgresql/Module_postgresql.mk b/external/postgresql/Module_postgresql.mk index 80c835639717..c57260de8909 100644 --- a/external/postgresql/Module_postgresql.mk +++ b/external/postgresql/Module_postgresql.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,postgresql)) -ifeq ($(SYSTEM_POSTGRESQL),NO) +ifeq ($(SYSTEM_POSTGRESQL),) $(eval $(call gb_Module_add_targets,postgresql,\ ExternalProject_postgresql \ diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 5ab9079f1039..9299aedf268e 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -87,7 +87,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ $(if $(WINDOWS_SDK_HOME),\ -DHAVE_WINDOWS_SDK \ ) \ - $(if $(filter YES,$(SYSTEM_HSQLDB)),\ + $(if $(SYSTEM_HSQLDB),\ -DHSQLDB_JAR=\""$(call gb_Helper_make_path,$(HSQLDB_JAR))"\" \ ) \ $(if $(filter MSC,$(COM)),$(if $(MSVC_USE_DEBUG_RUNTIME),-DMSVC_PKG_DEBUG_RUNTIME)) \ |