[Libreoffice-commits] core.git: 18 commits - configure.ac connectivity/Library_postgresql-sdbc-impl.mk desktop/Pagein_common.mk extensions/StaticLibrary_plugcon.mk external/cairo external/curl external/firebird external/glm external/hyphen external/jfreereport external/jpeg external/libabw external/libatomic_ops external/libcdr external/libebook external/libetonyek external/liblangtag external/libmspub external/libmwaw external/libodfgen external/liborcus external/libpng external/libvisio external/libwps external/libxmlsec external/libxslt external/nss external/openldap external/openssl external/poppler external/postgresql external/python3 external/redland external/vigra external/zlib i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk instsetoo_native/CustomTarget_setup.mk lingucomponent/StaticLibrary_ulingu.mk m4/libo_externals.m4 mysqlc/Extension_mysql-connector-ooo.mk mysqlc/Library_mysqlc.mk package/Library_package2.mk pyuno/CustomTarget_zipcore.mk pyuno/Module_pyuno.mk RepositoryExterna l.mk sc/Library_scfilt.mk sc/Library_sc.mk sc/Library_scqahelper.mk scp2/InstallModule_extensions.mk scp2/InstallModule_ooo.mk scp2/InstallModule_python.mk solenv/gbuild swext/Extension_wiki-publisher.mk sw/Library_swui.mk
Michael Stahl
mstahl at redhat.com
Wed Feb 12 00:56:54 PST 2014
RepositoryExternal.mk | 182 ++++------
configure.ac | 174 ++++-----
connectivity/Library_postgresql-sdbc-impl.mk | 2
desktop/Pagein_common.mk | 2
extensions/StaticLibrary_plugcon.mk | 2
external/cairo/ExternalProject_cairo.mk | 4
external/curl/ExternalProject_curl.mk | 4
external/firebird/ExternalProject_firebird.mk | 14
external/glm/Module_glm.mk | 2
external/hyphen/Module_hyphen.mk | 2
external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 2
external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 2
external/jpeg/Module_jpeg.mk | 2
external/libabw/ExternalProject_libabw.mk | 5
external/libatomic_ops/Module_libatomic_ops.mk | 2
external/libcdr/ExternalProject_libcdr.mk | 2
external/libebook/ExternalProject_libebook.mk | 4
external/libetonyek/ExternalProject_libetonyek.mk | 4
external/liblangtag/ExternalProject_langtag.mk | 6
external/libmspub/ExternalProject_libmspub.mk | 2
external/libmwaw/ExternalProject_libmwaw.mk | 2
external/libodfgen/ExternalProject_libodfgen.mk | 2
external/liborcus/ExternalProject_liborcus.mk | 12
external/libpng/Module_libpng.mk | 2
external/libvisio/ExternalProject_libvisio.mk | 4
external/libwps/ExternalProject_libwps.mk | 2
external/libxmlsec/ExternalProject_xmlsec.mk | 6
external/libxslt/ExternalProject_xslt.mk | 2
external/nss/Module_nss.mk | 2
external/nss/nss.patch | 2
external/openldap/ExternalProject_openldap.mk | 2
external/openldap/Module_openldap.mk | 2
external/openssl/Module_openssl.mk | 2
external/poppler/Module_poppler.mk | 2
external/postgresql/ExternalProject_postgresql.mk | 6
external/postgresql/Module_postgresql.mk | 2
external/python3/ExternalProject_python3.mk | 8
external/python3/Module_python3.mk | 2
external/redland/ExternalProject_raptor.mk | 6
external/redland/ExternalProject_rasqal.mk | 4
external/redland/ExternalProject_redland.mk | 4
external/redland/Module_redland.mk | 2
external/vigra/Module_vigra.mk | 2
external/zlib/Module_zlib.mk | 2
i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk | 2
instsetoo_native/CustomTarget_setup.mk | 4
lingucomponent/StaticLibrary_ulingu.mk | 2
m4/libo_externals.m4 | 4
mysqlc/Extension_mysql-connector-ooo.mk | 2
mysqlc/Library_mysqlc.mk | 4
package/Library_package2.mk | 2
pyuno/CustomTarget_zipcore.mk | 2
pyuno/Module_pyuno.mk | 4
sc/Library_sc.mk | 2
sc/Library_scfilt.mk | 2
sc/Library_scqahelper.mk | 2
scp2/InstallModule_extensions.mk | 4
scp2/InstallModule_ooo.mk | 12
scp2/InstallModule_python.mk | 2
solenv/gbuild/PythonTest.mk | 2
sw/Library_swui.mk | 2
swext/Extension_wiki-publisher.mk | 2
62 files changed, 275 insertions(+), 282 deletions(-)
New commits:
commit 49dde4cd421181021e2d211514788b495b94c95b
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 19:42:28 2014 +0100
normalize values of SYSTEM_RHINO, SYSTEM_LIBLANGTAG
Change-Id: I656e90024d35ef8189727e6a39815ef4e4fb330b
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a5fa3e9..23fce06 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -917,7 +917,7 @@ endef
ifeq ($(ENABLE_LIBLANGTAG),TRUE)
-ifeq ($(SYSTEM_LIBLANGTAG),YES)
+ifneq ($(SYSTEM_LIBLANGTAG),)
define gb_LinkTarget__use_liblangtag
$(call gb_LinkTarget_set_include,$(1),\
@@ -2945,7 +2945,7 @@ endef
endif # SYSTEM_BSH
-ifeq ($(SYSTEM_RHINO),YES)
+ifneq ($(SYSTEM_RHINO),)
define gb_Jar__use_rhino
$(call gb_Jar_use_system_jar,$(1),$(RHINO_JAR))
diff --git a/configure.ac b/configure.ac
index 5009422..e21d49e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10876,7 +10876,7 @@ if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then
AC_MSG_CHECKING([which rhino to use])
if test "$with_system_rhino" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_RHINO=YES
+ SYSTEM_RHINO=TRUE
if test -z $RHINO_JAR; then
RHINO_JAR=/usr/share/java/js.jar
fi
@@ -10884,7 +10884,7 @@ if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then
[AC_MSG_ERROR(js.jar not found.)], [])
else
AC_MSG_RESULT([internal])
- SYSTEM_RHINO=NO
+ SYSTEM_RHINO=
BUILD_TYPE="$BUILD_TYPE RHINO"
fi
else
@@ -11870,13 +11870,13 @@ if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os !=
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([whether to use system liblangtag])
if test "$with_system_liblangtag" = yes; then
- SYSTEM_LIBLANGTAG=YES
+ SYSTEM_LIBLANGTAG=TRUE
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.4.0)
LIBLANGTAG_CFLAGS=$(printf '%s' "$LIBLANGTAG_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
libo_MINGW_CHECK_DLL([liblangtag])
else
- SYSTEM_LIBLANGTAG=NO
+ SYSTEM_LIBLANGTAG=
AC_MSG_RESULT([no])
BUILD_TYPE="$BUILD_TYPE LIBLANGTAG"
if test "$COM" = "MSC"; then
diff --git a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
index b50653c..849d94b 100644
--- a/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
+++ b/i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_use_externals,i18nlangtag_test_languagetag,\
))
$(eval $(call gb_CppunitTest_add_defs,i18nlangtag_test_languagetag,-DENABLE_LIBLANGTAG))
-ifeq ($(SYSTEM_LIBLANGTAG),YES)
+ifneq ($(SYSTEM_LIBLANGTAG),)
$(eval $(call gb_CppunitTest_add_defs,i18nlangtag_test_languagetag,-DSYSTEM_LIBLANGTAG))
else
$(eval $(call gb_CppunitTest_use_package,i18nlangtag_test_languagetag,liblangtag_data))
diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk
index 3e7f410..7250d12 100644
--- a/scp2/InstallModule_extensions.mk
+++ b/scp2/InstallModule_extensions.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/extensions,\
$(if $(SYSTEM_BSH),\
-DBSH_JAR=\""$(call gb_Helper_make_url,$(BSH_JAR))"\" \
) \
- $(if $(filter YES,$(SYSTEM_RHINO)),\
+ $(if $(SYSTEM_RHINO),\
-DRHINO_JAR=\""$(call gb_Helper_make_url,$(RHINO_JAR))"\" \
) \
))
commit 7d2f7c6d7eab19fd8d692ed0f162c70103b091f0
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 19:39:18 2014 +0100
normalize values of SYSTEM_APACHE_COMMONS, SYSTEM_BSH
Change-Id: Ia6adb8ae07ec80e83bc67084dfbd0bc6136ed8b7
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2960d84..a5fa3e9 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2926,7 +2926,7 @@ endef
endif # SYSTEM_HSQLDB
-ifeq ($(SYSTEM_BSH),YES)
+ifneq ($(SYSTEM_BSH),)
define gb_Jar__use_bsh
$(call gb_Jar_use_system_jar,$(1),$(BSH_JAR))
@@ -2963,7 +2963,7 @@ endef
endif # SYSTEM_RHINO
-ifeq ($(SYSTEM_APACHE_COMMONS),YES)
+ifneq ($(SYSTEM_APACHE_COMMONS),)
define gb_Jar__use_commons-codec
$(call gb_Jar_use_system_jar,$(1),$(COMMONS_CODEC_JAR))
diff --git a/configure.ac b/configure.ac
index ce2caf2..5009422 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10756,7 +10756,7 @@ AC_SUBST(LIBSERIALIZER_JAR)
if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then
AC_MSG_CHECKING([which Apache commons-* libs to use])
if test "$with_system_apache_commons" = "yes"; then
- SYSTEM_APACHE_COMMONS=YES
+ SYSTEM_APACHE_COMMONS=TRUE
AC_MSG_RESULT([external])
if test "$ENABLE_MEDIAWIKI" = "TRUE"; then
if test -z $COMMONS_CODEC_JAR; then
@@ -10822,7 +10822,7 @@ if test "$ENABLE_MEDIAWIKI" = "TRUE" -o "$ENABLE_REPORTBUILDER" = "TRUE"; then
fi
else
AC_MSG_RESULT([internal])
- SYSTEM_APACHE_COMMONS=NO
+ SYSTEM_APACHE_COMMONS=
BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT"
fi
fi
@@ -10844,7 +10844,7 @@ if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then
AC_MSG_CHECKING([which beanshell to use])
if test "$with_system_beanshell" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_BSH=YES
+ SYSTEM_BSH=TRUE
if test -z $BSH_JAR; then
BSH_JAR=/usr/share/java/bsh.jar
fi
@@ -10852,7 +10852,7 @@ if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then
[AC_MSG_ERROR(bsh.jar not found.)], [])
else
AC_MSG_RESULT([internal])
- SYSTEM_BSH=NO
+ SYSTEM_BSH=
BUILD_TYPE="$BUILD_TYPE BSH"
fi
else
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
index e93cc0b..d2efb32 100644
--- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -23,7 +23,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) :
-q \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
- $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\
+ $(if $(SYSTEM_APACHE_COMMONS),\
-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \
-Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar") \
-Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \
diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
index e6248f0..861d25a 100644
--- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) :
-q \
-f build.xml \
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
- $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\
+ $(if $(SYSTEM_APACHE_COMMONS),\
-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \
-Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar") \
-Dflute.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_flute)/dist/flute-$(FLUTE_VERSION).jar \
diff --git a/scp2/InstallModule_extensions.mk b/scp2/InstallModule_extensions.mk
index 181d2af..3e7f410 100644
--- a/scp2/InstallModule_extensions.mk
+++ b/scp2/InstallModule_extensions.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/extensions,\
))
$(eval $(call gb_InstallModule_add_defs,scp2/extensions,\
- $(if $(filter YES,$(SYSTEM_BSH)),\
+ $(if $(SYSTEM_BSH),\
-DBSH_JAR=\""$(call gb_Helper_make_url,$(BSH_JAR))"\" \
) \
$(if $(filter YES,$(SYSTEM_RHINO)),\
diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
index aeaff27..6656442 100644
--- a/swext/Extension_wiki-publisher.mk
+++ b/swext/Extension_wiki-publisher.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Extension_use_unpacked,wiki-publisher,xsltml))
$(eval $(call gb_Extension_use_default_description,wiki-publisher,swext/mediawiki/src/description-en-US.txt))
$(eval $(call gb_Extension_use_default_license,wiki-publisher))
-ifneq ($(SYSTEM_APACHE_COMMONS),YES)
+ifeq ($(SYSTEM_APACHE_COMMONS),)
$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_logging))
$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_codec))
$(eval $(call gb_Extension_use_external_project,wiki-publisher,apache_commons_httpclient))
commit 32db4993c469613362211e7ef8423da6d7f4b182
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 19:35:22 2014 +0100
normalize values of SYSTEM_POPPLER, SYSTEM_JFREEREPORT
Change-Id: I8034b6fdf85697b6b409143396983ef3170257b2
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9a38e31..2960d84 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2136,7 +2136,7 @@ endef
endif # ENABLE_VALGRIND
-ifeq ($(SYSTEM_POPPLER),YES)
+ifneq ($(SYSTEM_POPPLER),)
define gb_LinkTarget__use_poppler
$(call gb_LinkTarget_set_include,$(1),\
@@ -3031,7 +3031,7 @@ endef
endif # SYSTEM_APACHE_COMMONS
-ifeq ($(SYSTEM_JFREEREPORT),YES)
+ifneq ($(SYSTEM_JFREEREPORT),)
define gb_Jar__use_flow-engine
$(call gb_Jar_use_system_jar,$(1),$(JFREEREPORT_JAR))
diff --git a/configure.ac b/configure.ac
index e16508a..ce2caf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10521,7 +10521,7 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_
AC_MSG_CHECKING([which PDF import backend to use])
if test "$with_system_poppler" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_POPPLER=YES
+ SYSTEM_POPPLER=TRUE
PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS
@@ -10537,7 +10537,7 @@ if test $_os != Android -a $_os != iOS -a \( -z "$enable_pdfimport" -o "$enable_
POPPLER_CFLAGS=$(printf '%s' "$POPPLER_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
else
AC_MSG_RESULT([internal])
- SYSTEM_POPPLER=NO
+ SYSTEM_POPPLER=
BUILD_TYPE="$BUILD_TYPE POPPLER"
fi
else
@@ -10569,7 +10569,7 @@ if test "$enable_report_builder" != "no" -a "$with_java" != "no"; then
ENABLE_REPORTBUILDER=TRUE
AC_MSG_CHECKING([which jfreereport libs to use])
if test "$with_system_jfreereport" = "yes"; then
- SYSTEM_JFREEREPORT=YES
+ SYSTEM_JFREEREPORT=TRUE
AC_MSG_RESULT([external])
if test -z $SAC_JAR; then
SAC_JAR=/usr/share/java/sac.jar
@@ -10729,13 +10729,13 @@ if test "$enable_report_builder" != "no" -a "$with_java" != "no"; then
else
AC_MSG_RESULT([internal])
- SYSTEM_JFREEREPORT=NO
+ SYSTEM_JFREEREPORT=
BUILD_TYPE="$BUILD_TYPE JFREEREPORT"
fi
else
AC_MSG_RESULT([no])
ENABLE_REPORTBUILDER=
- SYSTEM_JFREEREPORT=NO
+ SYSTEM_JFREEREPORT=
fi
AC_SUBST(ENABLE_REPORTBUILDER)
AC_SUBST(SYSTEM_JFREEREPORT)
@@ -12670,7 +12670,7 @@ if test "$enable_mpl_subset" = "yes"; then
AC_MSG_ERROR([need to --disable-ext-mariadb-connector - mariadb/mysql support.])
fi
if test -n "$ENABLE_PDFIMPORT"; then
- if test "x$SYSTEM_POPPLER" != "xNO"; then
+ if test "x$SYSTEM_POPPLER" != "x"; then
AC_MSG_ERROR([need to disable PDF import via poppler or use system library])
fi
fi
diff --git a/external/poppler/Module_poppler.mk b/external/poppler/Module_poppler.mk
index 910145a..357bc6d 100644
--- a/external/poppler/Module_poppler.mk
+++ b/external/poppler/Module_poppler.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,poppler))
-ifeq ($(SYSTEM_POPPLER),NO)
+ifeq ($(SYSTEM_POPPLER),)
$(eval $(call gb_Module_add_targets,poppler,\
ExternalProject_poppler \
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 9299aed..af0a262 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -8,7 +8,7 @@
#
ifeq ($(ENABLE_REPORTBUILDER),TRUE)
-ifneq ($(SYSTEM_JFREEREPORT),YES)
+ifeq ($(SYSTEM_JFREEREPORT),)
include $(SRCDIR)/external/jfreereport/version.mk
endif
endif
@@ -134,7 +134,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
))
endif
-ifneq ($(SYSTEM_JFREEREPORT),YES)
+ifeq ($(SYSTEM_JFREEREPORT),)
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DFLUTE_VERSION=$(FLUTE_VERSION) \
commit 8555b378596b19c122fa29a22f77a576a211c1fc
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 19:28:33 2014 +0100
normalize values of SYSTEM_BLUEZ, SYSTEM_MESA_HEADERS
Change-Id: I166de66dd8cd58a05e1a9e8d2f25bf95b98297fb
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d85e4bc..9a38e31 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -29,11 +29,11 @@
# External headers
-ifeq ($(SYSTEM_MESA_HEADERS),YES)
+ifneq ($(SYSTEM_MESA_HEADERS),)
gb_LinkTarget__use_mesa_headers :=
-else
+else # !SYSTEM_MESA_HEADERS
define gb_LinkTarget__use_mesa_headers
$(call gb_LinkTarget_set_include,$(1),\
@@ -43,7 +43,7 @@ $(call gb_LinkTarget_set_include,$(1),\
endef
-endif
+endif # SYSTEM_MESA_HEADERS
ifneq ($(SYSTEM_NPAPI_HEADERS),)
@@ -159,7 +159,7 @@ gb_LinkTarget__use_sane_headers :=
endif
-ifeq ($(SYSTEM_BLUEZ),YES)
+ifneq ($(SYSTEM_BLUEZ),)
gb_LinkTarget__use_bluez_bluetooth_headers :=
diff --git a/configure.ac b/configure.ac
index eb8bee5..e16508a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10193,29 +10193,29 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
AC_MSG_RESULT([external])
AC_CHECK_HEADER(bluetooth/bluetooth.h, [],
[AC_MSG_ERROR(bluetooth.h not found. install bluez)], [])
- SYSTEM_BLUEZ=YES
+ SYSTEM_BLUEZ=TRUE
else
AC_MSG_RESULT([internal])
- SYSTEM_BLUEZ=NO
+ SYSTEM_BLUEZ=
fi
else
AC_MSG_RESULT([no, dbus disabled])
ENABLE_SDREMOTE_BLUETOOTH=
- SYSTEM_BLUEZ=NO
+ SYSTEM_BLUEZ=
fi
else
AC_MSG_RESULT([yes])
ENABLE_SDREMOTE_BLUETOOTH=TRUE
- SYSTEM_BLUEZ=NO
+ SYSTEM_BLUEZ=
fi
else
AC_MSG_RESULT([no])
ENABLE_SDREMOTE_BLUETOOTH=
- SYSTEM_BLUEZ=NO
+ SYSTEM_BLUEZ=
fi
else
ENABLE_SDREMOTE=
- SYSTEM_BLUEZ=NO
+ SYSTEM_BLUEZ=
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_SDREMOTE)
@@ -10437,14 +10437,14 @@ elif test "$_os" = "Darwin"; then
ENABLE_OPENGL=TRUE
ENABLE_OPENGL_CANVAS=
add_warning "openGL canvas not adapted for Mac yet - disabling"
- SYSTEM_MESA_HEADERS=YES
+ SYSTEM_MESA_HEADERS=TRUE
AC_MSG_RESULT([yes])
elif test $_os = WINNT; then
# Experimental: try to use OpenGL on Windows
ENABLE_OPENGL=TRUE
ENABLE_OPENGL_CANVAS=TRUE
# We need the internal "Mesa" headers.
- SYSTEM_MESA_HEADERS=NO
+ SYSTEM_MESA_HEADERS=
BUILD_TYPE="$BUILD_TYPE MESA"
AC_MSG_RESULT([yes])
else
@@ -10469,7 +10469,7 @@ else
AC_MSG_CHECKING([which Mesa headers to use])
if test "$with_system_mesa_headers" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_MESA_HEADERS=YES
+ SYSTEM_MESA_HEADERS=TRUE
AC_LANG_PUSH(C)
AC_CHECK_HEADER(GL/glxext.h, [],
[ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
@@ -10478,7 +10478,7 @@ else
AC_LANG_POP(C)
else
AC_MSG_RESULT([internal])
- SYSTEM_MESA_HEADERS=NO
+ SYSTEM_MESA_HEADERS=
BUILD_TYPE="$BUILD_TYPE MESA"
fi
fi
commit ab586f14e0b3104c0c5c9e483bceb9d937ff1b3c
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 19:25:30 2014 +0100
normalize valuse of SYSTEM_MYTHES, SYSTEM_LPSOLVE
Change-Id: Ie61f6a0e572dcc3cdc4cbca698fb90d67f9a87ad
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b0cc2d1..d85e4bc 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -430,7 +430,7 @@ endef
endif # SYSTEM_JPEG
-ifeq ($(SYSTEM_MYTHES),YES)
+ifneq ($(SYSTEM_MYTHES),)
define gb_LinkTarget__use_mythes
$(call gb_LinkTarget_set_include,$(1),\
@@ -1842,7 +1842,7 @@ endif # ANDROID
endif # SYSTEM_LCMS2
-ifeq ($(SYSTEM_LPSOLVE),YES)
+ifneq ($(SYSTEM_LPSOLVE),)
define gb_LinkTarget__use_lpsolve
$(call gb_LinkTarget_add_libs,$(1),-llpsolve55)
diff --git a/configure.ac b/configure.ac
index be850d6..eb8bee5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9556,7 +9556,7 @@ dnl ===================================================================
AC_MSG_CHECKING([which mythes to use])
if test "$with_system_mythes" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_MYTHES=YES
+ SYSTEM_MYTHES=TRUE
AC_LANG_PUSH([C++])
PKG_CHECK_MODULES(MYTHES, mythes, MYTHES_PKGCONFIG=yes, MYTHES_PKGCONFIG=no)
if test "$MYTHES_PKGCONFIG" = "no"; then
@@ -9577,7 +9577,7 @@ if test "$with_system_mythes" = "yes"; then
MYTHES_CFLAGS=$(printf '%s' "$MYTHES_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
else
AC_MSG_RESULT([internal])
- SYSTEM_MYTHES=NO
+ SYSTEM_MYTHES=
BUILD_TYPE="$BUILD_TYPE MYTHES"
if test "$COM" = "MSC"; then
MYTHES_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/mythes.lib"
@@ -9605,7 +9605,7 @@ AC_SUBST(ENABLE_LPSOLVE)
AC_MSG_CHECKING([which lpsolve to use])
if test "$with_system_lpsolve" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_LPSOLVE=YES
+ SYSTEM_LPSOLVE=TRUE
AC_CHECK_HEADER(lpsolve/lp_lib.h, [],
[ AC_MSG_ERROR(lpsolve headers not found.)], [])
save_LIBS=$LIBS
@@ -9618,7 +9618,7 @@ if test "$with_system_lpsolve" = "yes"; then
libo_MINGW_CHECK_DLL([lpsolve55])
else
AC_MSG_RESULT([internal])
- SYSTEM_LPSOLVE=NO
+ SYSTEM_LPSOLVE=
BUILD_TYPE="$BUILD_TYPE LPSOLVE"
fi
AC_SUBST(SYSTEM_LPSOLVE)
commit 9fc9e9cfec84de414fd59239203745fd458ac753
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 19:21:36 2014 +0100
normalize values of SYSTEM_HUNSPELL, SYSTEM_HYPH
Change-Id: Ib11dcf94263aefc68ae2e831baeeb957231793ae
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c9ed72f..b0cc2d1 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 f090ddb..be850d6 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 80dae1f..5d32fb8 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 \
commit 187194b8aea14350e38bf181dc97c2f1019222f0
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 19:17:42 2014 +0100
normalize values of SYSTEM_NPAPI_HEADERS, SYSTEM_ICU
Change-Id: I7f1153e4a07a4116417a7734d867f2d0feda1ee4
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ae186b7..c9ed72f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -45,7 +45,7 @@ endef
endif
-ifeq ($(SYSTEM_NPAPI_HEADERS),YES)
+ifneq ($(SYSTEM_NPAPI_HEADERS),)
# yes this uses internal headers too...
# they are split across 2 dirs for this reason
@@ -1200,7 +1200,7 @@ endef
endif # SYSTEM_GRAPHITE
-ifeq ($(SYSTEM_ICU),YES)
+ifneq ($(SYSTEM_ICU),)
gb_LinkTarget__use_icu_headers:=
gb_ExternalProject__use_icu:=
@@ -3202,7 +3202,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
)
endef
-ifneq ($(SYSTEM_ICU),YES)
+ifeq ($(SYSTEM_ICU),)
define gb_Executable__register_gendict
$(call gb_Executable_add_runtime_dependencies,gendict,\
diff --git a/configure.ac b/configure.ac
index f660a9b..f090ddb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8961,7 +8961,7 @@ AC_MSG_CHECKING([which NPAPI headers to use])
if test "$with_system_npapi_headers" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_NPAPI_HEADERS=YES
+ SYSTEM_NPAPI_HEADERS=TRUE
# First try npapi-sdk:
PKG_CHECK_MODULES(NPAPI_HEADERS, npapi-sdk, [LOCATED=yes], [LOCATED=no])
# Then go with libxul:
@@ -8998,7 +8998,7 @@ else
AC_MSG_RESULT([internal])
dnl ...but will not be built/used unless ENABLE_NPAPI_FROM_BROWSER or
dnl ENABLE_NPAPI_INTO_BROWSER is TRUE
- SYSTEM_NPAPI_HEADERS=NO
+ SYSTEM_NPAPI_HEADERS=
fi
AC_SUBST(NPAPI_HEADERS_CFLAGS)
AC_SUBST(SYSTEM_NPAPI_HEADERS)
@@ -9033,7 +9033,7 @@ ICU_RECLASSIFIED_HEBREW_LETTER="YES"
AC_MSG_CHECKING([which icu to use])
if test "$with_system_icu" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_ICU=YES
+ SYSTEM_ICU=TRUE
AC_LANG_PUSH([C++])
AC_MSG_CHECKING([for unicode/rbbi.h])
AC_PREPROC_IFELSE([AC_LANG_SOURCE([[unicode/rbbi.h]])],[AC_MSG_RESULT(checked.)],[AC_MSG_ERROR(icu headers not found.)])
@@ -9118,7 +9118,7 @@ You can use --with-system-icu-for-build=force to use it anyway.])
libo_MINGW_CHECK_DLL([icuuc][$ICU_MAJOR][$ICU_MINOR])
else
AC_MSG_RESULT([internal])
- SYSTEM_ICU="NO"
+ SYSTEM_ICU=
BUILD_TYPE="$BUILD_TYPE ICU"
# surprisingly set these only for "internal" (to be used by various other
# external libs): the system icu-config is quite unhelpful and spits out
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
index 1ba1b94..cabd4f5 100644
--- a/desktop/Pagein_common.mk
+++ b/desktop/Pagein_common.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Pagein_add_objects,common,\
$(if $(MERGELIBS),merged) \
$(if $(URELIBS),urelibs) \
i18nlangtag \
- $(if $(findstring YES,$(SYSTEM_ICU)),,\
+ $(if $(SYSTEM_ICU),,\
icui18n \
icuuc \
) \
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 5bfb998..470500f 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -39,12 +39,12 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
-I$(call gb_UnpackedTarball_get_dir,boost) \
-L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \
) \
- $(if $(filter NO,$(SYSTEM_ICU)), \
+ $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \
-I$(call gb_UnpackedTarball_get_dir,icu)/source \
-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
-I$(call gb_UnpackedTarball_get_dir,icu)/source/common \
-L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \
- ,$(ICU_CPPFLAGS)) \
+ ) \
" \
&& ./configure \
--without-editline \
commit 5378deaea3a499003be14f97bd1a9fb3e729a698
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 19:11:47 2014 +0100
normalize values of SYSTEM_ODBC_HEADERS, SYSTEM_OPENLDAP
Change-Id: I913c38878a110625747fbf32ad9c43ad0dab30d3
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 3f95771..ae186b7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -71,7 +71,7 @@ endef
endif #SYSTEM_NPAPI_HEADERS
-ifeq ($(SYSTEM_ODBC_HEADERS),YES)
+ifneq ($(SYSTEM_ODBC_HEADERS),)
define gb_LinkTarget__use_odbc_headers
$(call gb_LinkTarget_add_defs,$(1),\
@@ -80,7 +80,7 @@ $(call gb_LinkTarget_add_defs,$(1),\
endef
-else
+else # !SYSTEM_ODBC_HEADERS
define gb_LinkTarget__use_odbc_headers
$(call gb_LinkTarget_set_include,$(1),\
@@ -90,7 +90,7 @@ $(call gb_LinkTarget_set_include,$(1),\
endef
-endif
+endif # SYSTEM_ODBC_HEADERS
ifneq ($(SYSTEM_VIGRA),)
@@ -2255,7 +2255,7 @@ endef
endif # SYSTEM_HSQLDB
-ifeq ($(SYSTEM_OPENLDAP),YES)
+ifneq ($(SYSTEM_OPENLDAP),)
define gb_LinkTarget__use_openldap
@@ -2268,7 +2268,7 @@ endef
gb_ExternalProject__use_openldap :=
-else ifeq ($(SYSTEM_OPENLDAP),NO)
+else # !SYSTEM_OPENLDAP
define gb_LinkTarget__use_openldap
$(call gb_LinkTarget_use_unpacked,$(1),openldap)
@@ -2289,11 +2289,6 @@ $(call gb_ExternalProject_use_external_project,$(1),openldap)
endef
-else # no openldap
-
-gb_LinkTarget__use_openldap :=
-gb_ExternalProject__use_openldap :=
-
endif # SYSTEM_OPENLDAP
diff --git a/configure.ac b/configure.ac
index 8a4c243..f660a9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8839,7 +8839,7 @@ dnl ===================================================================
AC_MSG_CHECKING([which odbc headers to use])
if test "$with_system_odbc" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_ODBC_HEADERS=YES
+ SYSTEM_ODBC_HEADERS=TRUE
AC_CHECK_HEADER(sqlext.h, [],
[AC_MSG_ERROR(odbc not found. install odbc)], [])
@@ -8847,7 +8847,7 @@ elif test "$enable_database_connectivity" != yes; then
AC_MSG_RESULT([none])
else
AC_MSG_RESULT([internal])
- SYSTEM_ODBC_HEADERS=NO
+ SYSTEM_ODBC_HEADERS=
fi
AC_SUBST(SYSTEM_ODBC_HEADERS)
@@ -8860,13 +8860,13 @@ if test "$_os" != "WINNT" -a "$_os" != "iOS" -a "$_os" != "Android"; then
AC_MSG_CHECKING([which openldap library to use])
if test "$with_system_openldap" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_OPENLDAP=YES
+ SYSTEM_OPENLDAP=TRUE
AC_CHECK_HEADERS(ldap.h, [], [AC_MSG_ERROR(ldap.h not found. install openldap libs)], [])
AC_CHECK_LIB([ldap], [ldap_simple_bind_s], [:], [AC_MSG_ERROR(openldap lib not found or functional)], [])
AC_CHECK_LIB([ldap], [ldap_set_option], [:], [AC_MSG_ERROR(openldap lib not found or functional)], [])
else
AC_MSG_RESULT([internal])
- SYSTEM_OPENLDAP=NO
+ SYSTEM_OPENLDAP=
BUILD_TYPE="$BUILD_TYPE OPENLDAP"
fi
fi
diff --git a/external/openldap/Module_openldap.mk b/external/openldap/Module_openldap.mk
index cb3f0ce..c9203b4 100644
--- a/external/openldap/Module_openldap.mk
+++ b/external/openldap/Module_openldap.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,openldap))
-ifeq ($(SYSTEM_OPENLDAP),NO)
+ifeq ($(SYSTEM_OPENLDAP),)
$(eval $(call gb_Module_add_targets,openldap,\
ExternalProject_openldap \
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk
index cd9d8a2..c89cebd 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -38,7 +38,7 @@ postgresql_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl)/
endif
endif
-ifeq ($(SYSTEM_OPENLDAP),NO)
+ifeq ($(SYSTEM_OPENLDAP),)
postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openldap)/include
postgresql_LDFLAGS += \
-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap_r/.libs \
commit ff69e725c218a36d64153b36eb1fecd2b6057803
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 19:08:10 2014 +0100
normalize values of SYSTEM_GLM, SYSTEM_VIGRA
Change-Id: Idc28f8be610aae57477f18c26ffcb97a24a2ab82
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 769e014..3f95771 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 574c920..8a4c243 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 71ec270..e9ab006 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 af2369f..d78ce4b 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 \
commit 5866b33bdd4be5dbe7981b4775ffa66430e75ad2
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 18:56:33 2014 +0100
normalize values of SYSTEM_HSQLDB, SYSTEM_POSTGRESQL
Change-Id: Ia29a173ab6bb3442f98cd6db4db67ad27e7fa9a1
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9823fe9..769e014 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 75e188a..574c920 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 bdb96c5..d8a888c 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 80c8356..c57260d 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 5ab9079..9299aed 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)) \
commit adddbbc4c6cfdcb120eb2f51ee3b88409a2d09b4
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 18:40:09 2014 +0100
normalize values of SYSTEM_BOOST
Change-Id: I2fce6545d7f279e0e2d6f3ff53eee1ab82314135
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 74ac190..9823fe9 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -584,7 +584,7 @@ endef
endif # SYSTEM_HUNSPELL
-ifeq ($(SYSTEM_BOOST),YES)
+ifneq ($(SYSTEM_BOOST),)
define gb_LinkTarget__use_boostdatetime
$(call gb_LinkTarget_set_include,$(1),\
@@ -2692,7 +2692,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.6$(gb_StaticLibrary_PLAINEXT) \
)
-$(if $(filter YES,$(SYSTEM_BOOST)), \
+$(if $(SYSTEM_BOOST), \
$(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
$(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
)
diff --git a/configure.ac b/configure.ac
index 90e43ce..75e188a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8738,7 +8738,7 @@ dnl ===================================================================
AC_MSG_CHECKING([which boost to use])
if test "$with_system_boost" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_BOOST=YES
+ SYSTEM_BOOST=TRUE
AX_BOOST_BASE(1.47)
AX_BOOST_DATE_TIME
mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 's/\.dll$//'`
@@ -8770,7 +8770,7 @@ if test "$with_system_boost" = "yes"; then
else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE BOOST"
- SYSTEM_BOOST=NO
+ SYSTEM_BOOST=
fi
AC_SUBST(SYSTEM_BOOST)
@@ -9169,7 +9169,7 @@ if test -z "$enable_orcus" -o "$enable_orcus" != no; then
libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.6 >= 0.5.0])
if test "$with_system_orcus" != "yes"; then
- if test "$SYSTEM_BOOST" = "YES"; then
+ if test "$SYSTEM_BOOST" = "TRUE"; then
# ===========================================================
# Determine if we are going to need to link with Boost.System
# ===========================================================
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 692a81a..5bfb998 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -35,10 +35,10 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
) \
" \
&& export CXXFLAGS=" \
- $(if $(filter NO,$(SYSTEM_BOOST)), \
+ $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \
-I$(call gb_UnpackedTarball_get_dir,boost) \
-L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \
- ,$(BOOST_CPPFLAGS)) \
+ ) \
$(if $(filter NO,$(SYSTEM_ICU)), \
-I$(call gb_UnpackedTarball_get_dir,icu)/source \
-I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \
diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk
index 66be64f..6afcfb8 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -33,7 +33,8 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
--disable-tools \
--disable-debug \
--disable-werror \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS)) \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\
+ -I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \
$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk
index 9ec9154..087adbf 100644
--- a/external/libcdr/ExternalProject_libcdr.mk
+++ b/external/libcdr/ExternalProject_libcdr.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
--disable-debug \
--disable-werror \
--disable-weffc \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk
index 242777f..6da1870 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
--disable-werror \
--disable-weffc \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
XML_LIBS="$(LIBXML_LIBS)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index c081d3d..cbd0a9e 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
--disable-werror \
--disable-weffc \
--without-tools \
- BOOST_CFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
+ BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
XML_LIBS="$(LIBXML_LIBS)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk
index f0b862a..1a2c84e 100644
--- a/external/libmspub/ExternalProject_libmspub.mk
+++ b/external/libmspub/ExternalProject_libmspub.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
--disable-debug \
--disable-werror \
--disable-weffc \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk
index c1b5c8d..478dc7d 100644
--- a/external/libmwaw/ExternalProject_libmwaw.mk
+++ b/external/libmwaw/ExternalProject_libmwaw.mk
@@ -31,7 +31,7 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
--without-docs \
--disable-debug \
--disable-werror \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk
index dfc44b4..dd31144 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
--disable-debug \
--disable-werror \
--disable-weffc \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src && \
$(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index 432423a..a62855d4e 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -35,7 +35,7 @@ liborcus_LIBS=
ifneq ($(SYSTEM_ZLIB),)
liborcus_LIBS+=-lz
endif
-ifeq ($(SYSTEM_BOOST),YES)
+ifneq ($(SYSTEM_BOOST),)
liborcus_LIBS+=$(BOOST_SYSTEM_LIB)
else
liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboostsystem
@@ -52,7 +52,7 @@ ifeq ($(SYSTEM_ZLIB),)
liborcus_CPPFLAGS+=$(ZLIB_CFLAGS)
endif
# patched boost needs to find config_global.h
-ifeq ($(SYSTEM_BOOST),NO)
+ifeq ($(SYSTEM_BOOST),)
liborcus_CPPFLAGS += -I$(BUILDDIR)/config_$(gb_Side)
endif
#
@@ -73,7 +73,7 @@ liborcus_LDFLAGS=$(LDFLAGS)
ifeq ($(COM),MSC)
liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
endif
-ifeq ($(SYSTEM_BOOST),NO)
+ifeq ($(SYSTEM_BOOST),)
liborcus_CXXFLAGS+=-I$(WORKDIR)/UnpackedTarball/boost
else
liborcus_LDFLAGS+=$(BOOST_LDFLAGS)
@@ -96,7 +96,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
--disable-spreadsheet-model \
--disable-werror \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- $(if $(filter NO,$(SYSTEM_BOOST)),--with-boost-system=boostsystem) \
+ $(if $(SYSTEM_BOOST),,--with-boost-system=boostsystem) \
&& $(if $(VERBOSE)$(verbose),V=1) \
$(MAKE) \
)
diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index 26859e8..cbdea64 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
--without-docs \
--disable-debug \
--disable-werror \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS)) \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side)) \
$(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk
index abfd006..855c683 100644
--- a/external/libwps/ExternalProject_libwps.mk
+++ b/external/libwps/ExternalProject_libwps.mk
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
--without-docs \
--disable-debug \
--disable-werror \
- CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
commit 5c0e6d86a8c9566249df0c0a4bbecc1ca8124a64
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 17:03:53 2014 +0100
normalize values of SYSTEM_CAIRO
Change-Id: I7ba86a2606d585b7b4351bc1fcd6d8ceebca5fd7
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 43202ca..74ac190 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1073,7 +1073,7 @@ endif # ANDROID
endif # SYSTEM_REDLAND
-ifeq ($(SYSTEM_CAIRO),YES)
+ifneq ($(SYSTEM_CAIRO),)
define gb_LinkTarget__use_cairo
$(call gb_LinkTarget_set_include,$(1),\
@@ -1085,7 +1085,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(CAIRO_LIBS))
endef
-else ifeq ($(SYSTEM_CAIRO),NO)
+else # !SYSTEM_CAIRO
define gb_LinkTarget__use_cairo
$(call gb_LinkTarget_use_package,$(1),cairo)
diff --git a/configure.ac b/configure.ac
index c95a723..90e43ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11809,7 +11809,7 @@ if test "$test_cairo" = "yes"; then
: ${with_system_cairo:=$with_system_libs}
if test "$with_system_cairo" = "yes"; then
- SYSTEM_CAIRO=YES
+ SYSTEM_CAIRO=TRUE
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
@@ -11833,7 +11833,7 @@ if test "$test_cairo" = "yes"; then
libo_MINGW_TRY_DLL([libpixman])
libo_MINGW_TRY_DLL([libpng15])
else
- SYSTEM_CAIRO=NO
+ SYSTEM_CAIRO=
AC_MSG_RESULT([no])
BUILD_TYPE="$BUILD_TYPE CAIRO"
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index 3547593..417dfa2 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_StaticLibrary_use_external,plugcon,gtk))
# pick up our cairo libs before they're fully ready, causing problems
# (e.g. using our libpixman and system libcairo). Depend on cairo
# to delay build until cairo is done.
-ifeq ($(SYSTEM_CAIRO),NO)
+ifeq ($(SYSTEM_CAIRO),)
$(eval $(call gb_StaticLibrary_use_external,plugcon,cairo))
endif
endif # ENABLE_GTK=TRUE
commit 0443d0a90ecb9ac54484c1c2c6b9d74892eb35ae
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 16:57:35 2014 +0100
normalize values of SYSTEM_PYTHON, SYSTEM_MYSQL_CPPCONN
Change-Id: I8932febdd39c35f23fb3a89703b69e25302f5678
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 80d9125..43202ca 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -316,7 +316,7 @@ endef
endif
-ifeq ($(SYSTEM_MYSQL_CPPCONN),YES)
+ifneq ($(SYSTEM_MYSQL_CPPCONN),)
define gb_LinkTarget__use_mysqlcppconn
$(call gb_LinkTarget_add_libs,$(1),\
@@ -2604,7 +2604,7 @@ endif # ENABLE_GCONF
# PYTHON
# extra python_headers external because pyuno wrapper must not link python
-ifeq ($(SYSTEM_PYTHON),YES)
+ifneq ($(SYSTEM_PYTHON),)
define gb_LinkTarget__use_python_headers
$(call gb_LinkTarget_add_defs,$(1),\
diff --git a/configure.ac b/configure.ac
index fc59e5a..c95a723 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8170,7 +8170,7 @@ fi
dnl By now enable_python should be "system", "internal" or "no"
case $enable_python in
system)
- SYSTEM_PYTHON=YES
+ SYSTEM_PYTHON=TRUE
if test "$CROSS_COMPILING" != YES; then
dnl Check if the headers really work
@@ -8201,7 +8201,7 @@ int main(int argc, char **argv) {
;;
internal)
- SYSTEM_PYTHON=NO
+ SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=3
PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
@@ -8220,7 +8220,7 @@ internal)
;;
no)
DISABLE_PYTHON=TRUE
- SYSTEM_PYTHON=NO
+ SYSTEM_PYTHON=
;;
*)
AC_MSG_ERROR([Internal configure script error, invalid enable_python value "$enable_python"])
@@ -8336,7 +8336,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
AC_MSG_CHECKING([MySQL Connector/C++])
if test "$with_system_mysql_cppconn" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_MYSQL_CPPCONN=YES
+ SYSTEM_MYSQL_CPPCONN=TRUE
AC_LANG_PUSH([C++])
AC_CHECK_HEADER(mysql_driver.h, [],
[AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++ Connectivity)], [])
@@ -8365,7 +8365,7 @@ int main(int argc, char **argv) {
else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN"
- SYSTEM_MYSQL_CPPCONN=NO
+ SYSTEM_MYSQL_CPPCONN=
fi
AC_LANG_POP([C++])
fi
diff --git a/external/python3/Module_python3.mk b/external/python3/Module_python3.mk
index eb2ec39..65e1356 100644
--- a/external/python3/Module_python3.mk
+++ b/external/python3/Module_python3.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_Module_Module,python3))
ifneq ($(DISABLE_PYTHON),TRUE)
-ifeq ($(SYSTEM_PYTHON),NO)
+ifeq ($(SYSTEM_PYTHON),)
$(eval $(call gb_Module_add_targets,python3,\
UnpackedTarball_python3 \
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index 81d48b6..a213f46 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -86,7 +86,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
printf '[Bootstrap]\n' && \
- $(if $(filter YES,$(SYSTEM_PYTHON)),, \
+ $(if $(SYSTEM_PYTHON),, \
printf 'PYUNO_LOADER_PYTHONHOME=%s\n' \
$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE), \
'$$ORIGIN/../Frameworks/LibreOfficePython.framework', \
@@ -94,7 +94,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
'$$ORIGIN/LibreOfficePython.framework', \
'$$ORIGIN/python-core-$(PYTHON_VERSION)')) &&) \
printf 'PYUNO_LOADER_PYTHONPATH=%s$$ORIGIN\n' \
- $(if $(filter YES,$(SYSTEM_PYTHON)), \
+ $(if $(SYSTEM_PYTHON), \
'', \
$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE), \
'$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)$(dir))) ', \
diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk
index 1ca1f58..a4a2232 100644
--- a/mysqlc/Extension_mysql-connector-ooo.mk
+++ b/mysqlc/Extension_mysql-connector-ooo.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Extension_add_files,mysql-connector-ooo,images,\
$(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \
))
-ifeq ($(SYSTEM_MYSQL_CPPCONN),NO)
+ifeq ($(SYSTEM_MYSQL_CPPCONN),)
$(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlcppconn))
endif
diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk
index 151c493..01de4e4 100644
--- a/mysqlc/Library_mysqlc.mk
+++ b/mysqlc/Library_mysqlc.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Library_use_externals,mysqlc,\
mysqlcppconn \
))
-ifeq ($(SYSTEM_MYSQL_CPPCONN),NO)
+ifeq ($(SYSTEM_MYSQL_CPPCONN),)
$(eval $(call gb_Library_add_libs,mysqlc,\
$(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz -lm,\
-rdynamic -lz -lcrypt -lnsl -lm)) \
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_add_defs,mysqlc,\
-DMARIADBC_VERSION_MAJOR=$(MARIADBC_MAJOR) \
-DMARIADBC_VERSION_MINOR=$(MARIADBC_MINOR) \
-DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \
- $(if $(filter NO,$(SYSTEM_MYSQL_CPPCONN)),\
+ $(if $(SYSTEM_MYSQL_CPPCONN),,\
-DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \
$(if $(filter YES,$(BUNDLE_MARIADB)),\
-DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \
diff --git a/pyuno/CustomTarget_zipcore.mk b/pyuno/CustomTarget_zipcore.mk
index 3f4bbeb..0efd830 100644
--- a/pyuno/CustomTarget_zipcore.mk
+++ b/pyuno/CustomTarget_zipcore.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_CustomTarget_CustomTarget,pyuno/zipcore))
# system python (only mingw)
-ifeq ($(SYSTEM_PYTHON),YES)
+ifneq ($(SYSTEM_PYTHON),)
# mingw: MINGW_SYSROOT is defined in configure
ifeq ($(OS)$(COM),WNTGCC)
pyuno_PYTHON_LIB_DIR=$(MINGW_SYSROOT)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index a91c58b..28aef71 100644
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -28,7 +28,7 @@ endif
# Windows: only --enable-python=internal possible
# mingw: both cases possible: internal && system
# that why it makes sense to handle the next 3 targets
-# with SYSTEM_PYTHON=YES and SYSTEM_PYTHON=NO
+# with SYSTEM_PYTHON=TRUE and SYSTEM_PYTHON=
# zipcore: pyuno/python.exe on Windows
ifeq ($(OS),WNT)
@@ -37,7 +37,7 @@ $(eval $(call gb_Module_add_targets,pyuno,\
))
endif
-ifneq ($(SYSTEM_PYTHON),YES)
+ifeq ($(SYSTEM_PYTHON),)
# zipcore: python.sh on Unix
ifneq ($(OS),WNT)
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 7f53d5f..5ab9079 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -109,7 +109,7 @@ ifeq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DDISABLE_PYUNO \
))
-else ifeq ($(SYSTEM_PYTHON),YES)
+else ifneq ($(SYSTEM_PYTHON),)
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DSYSTEM_PYTHON \
))
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
index 21bc3ef..3c79ed1 100644
--- a/scp2/InstallModule_python.mk
+++ b/scp2/InstallModule_python.mk
@@ -13,7 +13,7 @@ ifeq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_InstallModule_add_defs,scp2/python,\
-DDISABLE_PYUNO \
))
-else ifeq ($(SYSTEM_PYTHON),YES)
+else ifneq ($(SYSTEM_PYTHON),)
$(eval $(call gb_InstallModule_add_defs,scp2/python,\
-DSYSTEM_PYTHON \
))
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 76af68e..f8c13d2 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -9,7 +9,7 @@
# PythonTest class
-ifeq ($(SYSTEM_PYTHON),NO)
+ifeq ($(SYSTEM_PYTHON),)
gb_PythonTest_EXECUTABLE := $(gb_Python_INSTALLED_EXECUTABLE)
gb_PythonTest_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE_GDB)
else
commit 379f978387a8b017a41c2682c0b39444f17a2230
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 16:49:19 2014 +0100
normalize values of SYSTEM_FREETYPE, SYSTEM_LIBXML, SYSTEM_MARIADB
Change-Id: Iffcc671ca41c5880579effe0786a3b4d3be0dab0
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ffe0dde..80d9125 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -254,7 +254,7 @@ $(call gb_LinkTarget_add_libs,$(1),-liconv)
endef
-ifeq ($(SYSTEM_MARIADB),YES)
+ifneq ($(SYSTEM_MARIADB),)
define gb_LinkTarget__use_mariadb
$(call gb_LinkTarget_set_include,$(1),\
@@ -286,7 +286,7 @@ endef
endif # SYSTEM_MARIADB
-ifeq ($(SYSTEM_MARIADB),YES)
+ifneq ($(SYSTEM_MARIADB),)
define gb_LinkTarget__use_mysql
@@ -805,7 +805,7 @@ endef
endif # SYSTEM_LIBEXTTEXTCAT
-ifeq ($(SYSTEM_LIBXML),YES)
+ifneq ($(SYSTEM_LIBXML),)
define gb_LinkTarget__use_libxml2
$(call gb_LinkTarget_add_defs,$(1),\
@@ -1107,7 +1107,7 @@ endef
endif # SYSTEM_CAIRO
-ifeq ($(SYSTEM_FREETYPE),YES)
+ifneq ($(SYSTEM_FREETYPE),)
define gb_LinkTarget__use_freetype_headers
$(call gb_LinkTarget_set_include,$(1),\
@@ -3261,7 +3261,7 @@ endef
# External executables
-ifneq ($(SYSTEM_LIBXML_FOR_BUILD),YES)
+ifneq ($(SYSTEM_LIBXML_FOR_BUILD),)
gb_ExternalExecutable__register_xmllint :=
diff --git a/configure.ac b/configure.ac
index 4fecc7b..fc59e5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7877,7 +7877,7 @@ if test "$test_freetype" = "yes"; then
# 9.9.3 is 2.2.0
PKG_CHECK_MODULES(FREETYPE, freetype2 >= 9.9.3)
FREETYPE_CFLAGS=$(printf '%s' "$FREETYPE_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
- SYSTEM_FREETYPE=YES
+ SYSTEM_FREETYPE=TRUE
_save_libs="$LIBS"
_save_cflags="$CFLAGS"
LIBS="$LIBS $FREETYPE_LIBS"
@@ -7980,7 +7980,7 @@ AC_SUBST(XSLTPROC)
AC_MSG_CHECKING([which libxml to use])
if test "$with_system_libxml" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_LIBXML=YES
+ SYSTEM_LIBXML=TRUE
if test "$_os" = "Darwin"; then
dnl make sure to use SDK path
LIBXML_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2"
@@ -8006,7 +8006,7 @@ if test "$with_system_libxml" = "yes"; then
libo_MINGW_TRY_DLL([zlib1])
else
AC_MSG_RESULT([internal])
- SYSTEM_LIBXML=NO
+ SYSTEM_LIBXML=
BUILD_TYPE="$BUILD_TYPE LIBXML2"
fi
AC_SUBST(SYSTEM_LIBXML)
@@ -8262,7 +8262,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
AC_MSG_CHECKING([which MariaDB to use])
if test "$with_system_mariadb" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_MARIADB=YES
+ SYSTEM_MARIADB=TRUE
#AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
if test -z "$MARIADBCONFIG"; then
AC_PATH_PROG(MARIADBCONFIG, [mysql_config])
@@ -8314,7 +8314,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
else
AC_MSG_RESULT([internal])
AC_MSG_ERROR([libmariadb is known to be broken as of 2013-10; use libmysqlclient])
- SYSTEM_MARIADB=NO
+ SYSTEM_MARIADB=
MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb/include"
MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib"
BUILD_TYPE="$BUILD_TYPE MARIADB"
diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk
index d3b3b9f..66be64f 100644
--- a/external/libabw/ExternalProject_libabw.mk
+++ b/external/libabw/ExternalProject_libabw.mk
@@ -34,7 +34,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) :
--disable-debug \
--disable-werror \
CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS)) \
- $(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
+ $(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk
index 05f8566..242777f 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
--disable-werror \
--disable-weffc \
CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
- XML_CFLAGS="$(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include,$(LIBXML_CFLAGS))" \
+ XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
XML_LIBS="$(LIBXML_LIBS)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& cd src/lib \
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index b4b5589..c081d3d 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
--disable-weffc \
--without-tools \
BOOST_CFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS))" \
- XML_CFLAGS="$(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include,$(LIBXML_CFLAGS))" \
+ XML_CFLAGS="$(if $(SYSTEM_LIBXML),$(LIBXML_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
XML_LIBS="$(LIBXML_LIBS)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) $(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk
index b4f17ce..1770815 100644
--- a/external/liblangtag/ExternalProject_langtag.mk
+++ b/external/liblangtag/ExternalProject_langtag.mk
@@ -26,10 +26,10 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
$(if $(filter WNTMSC,$(OS)$(COM)),--disable-rebuild-data) \
$(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
- $(if $(filter NO,$(SYSTEM_LIBXML)),\
+ $(if $(SYSTEM_LIBXML),\
+ $(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)"), \
LIBXML2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" \
- LIBXML2_LIBS=$(if $(filter WNTMSC,$(OS)$(COM)),"-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2","-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2"),\
- $(if $(filter MACOSX,$(OS)),LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)")) \
+ LIBXML2_LIBS=$(if $(filter WNTMSC,$(OS)$(COM)),"-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2","-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
$(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk
index ea6b851..26859e8 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
--disable-debug \
--disable-werror \
CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side),$(BOOST_CPPFLAGS)) \
- $(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
+ $(if $(SYSTEM_LIBXML),,-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(if $(VERBOSE)$(verbose),V=1) \
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
index 851a268..06043ac 100644
--- a/external/libxmlsec/ExternalProject_xmlsec.mk
+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
@@ -59,7 +59,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) :
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(SYSTEM_NSS),,$(if $(filter MACOSX,$(OS)),--disable-pkgconfig)) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML_LIBS="-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")\
+ $(if $(SYSTEM_LIBXML),,LIBXML_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML_LIBS="-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")\
$(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \
LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib)) \
&& $(MAKE) \
diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk
index 2b5e89c..3fd0b86 100644
--- a/external/libxslt/ExternalProject_xslt.mk
+++ b/external/libxslt/ExternalProject_xslt.mk
@@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
$(if $(filter IOS,$(OS)),LIBS="-liconv") \
--disable-shared,--disable-static) \
- $(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-src=$(call gb_UnpackedTarball_get_dir,xml2)) \
+ $(if $(SYSTEM_LIBXML),,--with-libxml-src=$(call gb_UnpackedTarball_get_dir,xml2)) \
&& chmod 777 xslt-config \
&& $(MAKE) \
)
diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk
index 70d6fe7..49a1cdc 100644
--- a/external/redland/ExternalProject_raptor.mk
+++ b/external/redland/ExternalProject_raptor.mk
@@ -21,14 +21,14 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L,$(ILIB))" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
- $(if $(and $(filter YES,$(SYSTEM_LIBXML)),$(filter GCC,$(COM))),PATH="$(MINGW_SYSROOT)/bin:$$PATH") \
+ $(if $(and $(SYSTEM_LIBXML),$(filter GCC,$(COM))),PATH="$(MINGW_SYSROOT)/bin:$$PATH") \
./configure --disable-static --enable-shared --disable-gtk-doc \
--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
--with-www=xml \
--without-xslt-config \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \
lt_cv_cc_dll_switch="-shared" \
- $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
+ $(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
&& $(MAKE) \
)
else
@@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
- $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
+ $(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
&& $(MAKE) \
)
endif
diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk
index 6b695de..35b46d3 100644
--- a/external/redland/ExternalProject_rasqal.mk
+++ b/external/redland/ExternalProject_rasqal.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
--with-digest-library=internal \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
lt_cv_cc_dll_switch="-shared" \
- $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
+ $(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
&& $(MAKE) \
)
else
@@ -57,7 +57,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
- $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
+ $(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk
index 9b96c9c..552d242 100644
--- a/external/redland/ExternalProject_redland.mk
+++ b/external/redland/ExternalProject_redland.mk
@@ -29,7 +29,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
PKG_CONFIG="" \
RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \
+ $(if $(SYSTEM_LIBXML),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \
RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \
RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \
./configure --disable-static --disable-gtk-doc \
@@ -52,7 +52,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
PKG_CONFIG="" \
RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \
- $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \
+ $(if $(SYSTEM_LIBXML),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \
RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \
RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \
./configure --disable-gtk-doc \
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index ab0c264..b9ef786 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Library_use_custom_headers,swui,\
$(eval $(call gb_Library_use_sdk_api,swui))
-ifeq ($(SYSTEM_LIBXML),YES)
+ifneq ($(SYSTEM_LIBXML),)
$(eval $(call gb_Library_add_cxxflags,swui,\
$(LIBXML_CFLAGS) \
))
commit 46648159bfc18cf29196ae8eba5a64decf10c45b
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 16:33:18 2014 +0100
normalize values of SYSTEM_CLUCENE, SYSTEM_EXPAT, SYSTEM_JPEG
Change-Id: I343dae79b01e1369722c7bbd1ab2c36e2bfa96ac
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e3b6fc2..ffe0dde 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -404,7 +404,7 @@ endef
endif # SYSTEM_ZLIB
-ifeq ($(SYSTEM_JPEG),YES)
+ifneq ($(SYSTEM_JPEG),)
define gb_LinkTarget__use_jpeg
$(call gb_LinkTarget_add_libs,$(1),-ljpeg)
@@ -463,7 +463,7 @@ endef
endif # SYSTEM_MYTHES
-ifeq ($(SYSTEM_EXPAT),YES)
+ifneq ($(SYSTEM_EXPAT),)
define gb_LinkTarget__use_expat_impl
$(if $(2),,$(error gb_LinkTarget__use_expat_impl needs additional parameter))
@@ -2184,7 +2184,7 @@ endef
endif # SYSTEM_POPPLER
-ifeq ($(SYSTEM_CLUCENE),YES)
+ifneq ($(SYSTEM_CLUCENE),)
define gb_LinkTarget__use_clucene
$(call gb_LinkTarget_add_defs,$(1),\
diff --git a/configure.ac b/configure.ac
index 2f3c87d..4fecc7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7700,7 +7700,7 @@ fi
if test "$with_system_jpeg" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_JPEG=YES
+ SYSTEM_JPEG=TRUE
AC_CHECK_HEADER(jpeglib.h, [],
[AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
@@ -7708,7 +7708,7 @@ if test "$with_system_jpeg" = "yes"; then
libo_MINGW_CHECK_DLL([libjpeg])
else
AC_MSG_RESULT([internal])
- SYSTEM_JPEG=NO
+ SYSTEM_JPEG=
BUILD_TYPE="$BUILD_TYPE JPEG"
fi
AC_SUBST(SYSTEM_JPEG)
@@ -7723,7 +7723,7 @@ dnl but the contribs-lib check seems tricky
AC_MSG_CHECKING([which clucene to use])
if test "$with_system_clucene" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_CLUCENE=YES
+ SYSTEM_CLUCENE=TRUE
PKG_CHECK_MODULES(CLUCENE, libclucene-core)
CLUCENE_CFLAGS=[$(printf '%s' "$CLUCENE_CFLAGS" | sed -e 's at -I[^ ]*/CLucene/ext@@' -e "s/-I/${ISYSTEM?}/g")]
AC_LANG_PUSH([C++])
@@ -7742,7 +7742,7 @@ if test "$with_system_clucene" = "yes"; then
CLUCENE_LIBS="$CLUCENE_LIBS -lclucene-contribs-lib"
else
AC_MSG_RESULT([internal])
- SYSTEM_CLUCENE=NO
+ SYSTEM_CLUCENE=
BUILD_TYPE="$BUILD_TYPE CLUCENE"
fi
AC_SUBST(SYSTEM_CLUCENE)
@@ -7757,7 +7757,7 @@ dnl proper pkg-config for it. It should really be fixed on the tinderbox though.
AC_MSG_CHECKING([which expat to use])
if test "$with_system_expat" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_EXPAT=YES
+ SYSTEM_EXPAT=TRUE
AC_CHECK_HEADER(expat.h, [],
[AC_MSG_ERROR(expat.h not found. install expat)], [])
AC_CHECK_LIB([expat], [XML_ParserCreate], [:],
@@ -7765,7 +7765,7 @@ if test "$with_system_expat" = "yes"; then
libo_MINGW_CHECK_DLL([libexpat])
else
AC_MSG_RESULT([internal])
- SYSTEM_EXPAT=NO
+ SYSTEM_EXPAT=
BUILD_TYPE="$BUILD_TYPE EXPAT"
fi
AC_SUBST(SYSTEM_EXPAT)
diff --git a/external/jpeg/Module_jpeg.mk b/external/jpeg/Module_jpeg.mk
index fea0f0b..0b45932 100644
--- a/external/jpeg/Module_jpeg.mk
+++ b/external/jpeg/Module_jpeg.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,jpeg))
-ifeq ($(SYSTEM_JPEG),NO)
+ifeq ($(SYSTEM_JPEG),)
$(eval $(call gb_Module_add_targets,jpeg,\
UnpackedTarball_jpeg \
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk
index 9d620b7..6254cda 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -75,13 +75,13 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
CC="$(strip $(CC) \
$(if $(SYSTEM_OPENSSL),,-I$(call gb_UnpackedTarball_get_dir,openssl)/include \
$(if $(DISABLE_OPENSSL),,-I$(call gb_UnpackedTarball_get_dir,openssl)/include)) \
- $(if $(filter NO,$(SYSTEM_EXPAT)),-I$(call gb_UnpackedTarball_get_dir,expat)/lib) \
+ $(if $(SYSTEM_EXPAT),,-I$(call gb_UnpackedTarball_get_dir,expat)/lib) \
$(if $(SYSBASE), -I$(SYSBASE)/usr/include) \
)" \
$(if $(python3_cflags),CFLAGS='$(python3_cflags)') \
LDFLAGS="$(strip $(LDFLAGS) \
$(if $(SYSTEM_OPENSSL),,-L$(call gb_UnpackedTarball_get_dir,openssl)) \
- $(if $(filter YES,$(SYSTEM_EXPAT)),, -L$(gb_StaticLibrary_WORKDIR)) \
+ $(if $(SYSTEM_EXPAT),,-L$(gb_StaticLibrary_WORKDIR)) \
$(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \
$(if $(filter WNT-GCC,$(OS)-$(COM)), -shared-libgcc \
$(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols)) \
commit 04ff535f72c1fbc5f7dbc8cc54ed9b23f7e130f9
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 16:21:04 2014 +0100
normalize values of SYSTEM_ZLIB, SYSTEM_DICTS, SYSTEM_FONTCONFIG
Change-Id: I7530cb9d0797df5fc86695b0379cc44c159d2ab5
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 24300db..e3b6fc2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -353,7 +353,7 @@ endef
endif
-ifeq ($(SYSTEM_ZLIB),YES)
+ifneq ($(SYSTEM_ZLIB),)
define gb_LinkTarget__use_zlib
$(call gb_LinkTarget_add_defs,$(1),\
@@ -1148,7 +1148,7 @@ endef
endif # SYSTEM_FREETYPE
-ifeq ($(SYSTEM_FONTCONFIG),YES)
+ifneq ($(SYSTEM_FONTCONFIG),)
define gb_LinkTarget__use_fontconfig
$(call gb_LinkTarget_set_include,$(1),\
diff --git a/configure.ac b/configure.ac
index c936927..2f3c87d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4720,7 +4720,7 @@ AC_SUBST(ENABLE_CUPS)
# fontconfig checks
if test "$test_fontconfig" = "yes"; then
PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.4.1])
- SYSTEM_FONTCONFIG=YES
+ SYSTEM_FONTCONFIG=TRUE
fi
AC_SUBST(FONTCONFIG_CFLAGS)
AC_SUBST(FONTCONFIG_LIBS)
@@ -4794,7 +4794,7 @@ fi
AC_MSG_CHECKING([whether to use dicts from external paths])
if test -z "$with_system_dicts" -o "$with_system_dicts" != "no"; then
AC_MSG_RESULT([yes])
- SYSTEM_DICTS=YES
+ SYSTEM_DICTS=TRUE
AC_MSG_CHECKING([for spelling dictionary directory])
if test -n "$with_external_dict_dir"; then
DICT_SYSTEM_DIR=file://$with_external_dict_dir
@@ -4821,7 +4821,7 @@ if test -z "$with_system_dicts" -o "$with_system_dicts" != "no"; then
AC_MSG_RESULT([$THES_SYSTEM_DIR])
else
AC_MSG_RESULT([no])
- SYSTEM_DICTS=NO
+ SYSTEM_DICTS=
fi
AC_SUBST(SYSTEM_DICTS)
AC_SUBST(DICT_SYSTEM_DIR)
@@ -7667,14 +7667,14 @@ dnl libo_CHECK_SYSTEM_MODULE([zlib],[ZLIB],[zlib])
AC_MSG_CHECKING([which zlib to use])
if test "$with_system_zlib" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_ZLIB=YES
+ SYSTEM_ZLIB=TRUE
AC_CHECK_HEADER(zlib.h, [],
[AC_MSG_ERROR(zlib.h not found. install zlib)], [])
AC_CHECK_LIB(z, deflate, [ ZLIB=-lz ],
[AC_MSG_ERROR(zlib not found or functional)], [])
else
AC_MSG_RESULT([internal])
- SYSTEM_ZLIB=NO
+ SYSTEM_ZLIB=
BUILD_TYPE="$BUILD_TYPE ZLIB"
ZLIB_CFLAGS="-I${WORKDIR}/UnpackedTarball/zlib"
ZLIB_LIBS="-lzlib"
diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk
index 90420f6..d055db0 100644
--- a/external/cairo/ExternalProject_cairo.mk
+++ b/external/cairo/ExternalProject_cairo.mk
@@ -36,8 +36,8 @@ $(call gb_ExternalProject_get_state_target,cairo,build) :
$(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \
pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \
pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
- COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \
- ZLIB3RDLIB="$(if $(filter YES,$(SYSTEM_ZLIB)),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \
+ COMPRESS=$(if $(SYSTEM_ZLIB),compress,z_compress) \
+ ZLIB3RDLIB="$(if $(SYSTEM_ZLIB),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \
png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \
png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \
$(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk
index 171ea59..432423a 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_ExternalProject_register_targets,liborcus,\
#$(if $(filter MSC,$(COM)),CPPFLAGS+="-DBOOST_ALL_NO_LIB") CXXFLAGS+="$(BOOST_CXXFLAGS))
liborcus_LIBS=
-ifeq ($(SYSTEM_ZLIB),YES)
+ifneq ($(SYSTEM_ZLIB),)
liborcus_LIBS+=-lz
endif
ifeq ($(SYSTEM_BOOST),YES)
@@ -48,7 +48,7 @@ liborcus_CPPCLAGS=$(CPPFLAGS)
ifeq ($(COM),MSC)
liborcus_CPPFLAGS+=-DBOOST_ALL_NO_LIB
endif
-ifeq ($(SYSTEM_ZLIB),NO)
+ifeq ($(SYSTEM_ZLIB),)
liborcus_CPPFLAGS+=$(ZLIB_CFLAGS)
endif
# patched boost needs to find config_global.h
diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index 37caae0..95a0049 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -48,7 +48,7 @@
endif
endif
-+ifeq ($(SYSTEM_ZLIB),YES)
++ifneq ($(SYSTEM_ZLIB),)
+# Currently (3.12.4) only the tools modutil and signtool are linked with libz
+# If USE_SYSTEM_ZLIB is not set then the tools link statically libzlib.a which
+# is also build in nss.
diff --git a/external/zlib/Module_zlib.mk b/external/zlib/Module_zlib.mk
index 7241df0..8f71c50 100644
--- a/external/zlib/Module_zlib.mk
+++ b/external/zlib/Module_zlib.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,zlib))
-ifeq ($(SYSTEM_ZLIB),NO)
+ifeq ($(SYSTEM_ZLIB),)
$(eval $(call gb_Module_add_targets,zlib,\
StaticLibrary_zlib \
diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk
index f5f8ed9..4347759 100644
--- a/lingucomponent/StaticLibrary_ulingu.mk
+++ b/lingucomponent/StaticLibrary_ulingu.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_StaticLibrary_use_api,ulingu,\
offapi \
))
-ifeq ($(SYSTEM_DICTS),YES)
+ifneq ($(SYSTEM_DICTS),)
$(eval $(call gb_StaticLibrary_add_defs,ulingu,\
-DSYSTEM_DICTS -DDICT_SYSTEM_DIR=\"$(DICT_SYSTEM_DIR)\" -DHYPH_SYSTEM_DIR=\"$(HYPH_SYSTEM_DIR)\" -DTHES_SYSTEM_DIR=\"$(THES_SYSTEM_DIR)\" \
))
diff --git a/package/Library_package2.mk b/package/Library_package2.mk
index a47e1b8..4f3a215 100644
--- a/package/Library_package2.mk
+++ b/package/Library_package2.mk
@@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_exception_objects,package2,\
package/source/zippackage/ZipPackageStream \
))
-ifeq ($(SYSTEM_ZLIB),YES)
+ifneq ($(SYSTEM_ZLIB),)
$(eval $(call gb_Library_add_defs,package2,\
-DSYSTEM_ZLIB \
))
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index eb0d5d2..061e054 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -231,7 +231,7 @@ $(eval $(call gb_Library_use_externals,scfilt,\
zlib \
))
-ifeq ($(SYSTEM_ZLIB),YES)
+ifneq ($(SYSTEM_ZLIB),)
$(eval $(call gb_Library_add_defs,scfilt,\
-DSYSTEM_ZLIB \
))
commit 23647595d77b85b5dac0d5762987a3ba2533ffd9
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 19:04:20 2014 +0100
normalize values of SYSTEM_LIBATOMIC_OPS, SYSTEM_FIREBIRD
Change-Id: I89802da0ad7f7bf838a8937430825b0adf42a6ee
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0e7794b..24300db 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 18def26..c936927 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 cb3e35d..692a81a 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 0a9a534..2ea7e54 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 \
commit e3abec3f07f2a710bfce66f77b33f494e2aa4972
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Feb 11 15:57:18 2014 +0100
fdo#74825: fix missing lcms2/libxslt/curl in installation sets
The assumption that all configure variables had been normalized to
TRUE/<empty> turned out not to hold; convert a bit more in that
direction.
(regression from 4af38b099c741c3676aefeb20c515913aaeed666)
Change-Id: I2127c515e8a833a07c9b26ed9d693ce5a1853fe4
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d0cb1fb..0e7794b 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -109,11 +109,11 @@ endef
endif
-ifeq ($(SYSTEM_MDDS),YES)
+ifneq ($(SYSTEM_MDDS),)
gb_LinkTarget__use_mdds_headers :=
-else
+else # !SYSTEM_MDDS
define gb_LinkTarget__use_mdds_headers
$(call gb_LinkTarget_use_unpacked,$(1),mdds)
@@ -124,7 +124,7 @@ $(call gb_LinkTarget_set_include,$(1),\
endef
-endif
+endif # SYSTEM_MDDS
ifeq ($(SYSTEM_GLM),YES)
@@ -177,7 +177,7 @@ endif # SYSTEM_BLUEZ
# External libraries
-ifeq ($(SYSTEM_CPPUNIT),YES)
+ifneq ($(SYSTEM_CPPUNIT),)
define gb_LinkTarget__use_cppunit
$(call gb_LinkTarget_set_include,$(1),\
@@ -191,7 +191,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
endef
-else
+else # !SYSTEM_CPPUNIT
define gb_LinkTarget__use_cppunit
$(call gb_LinkTarget_use_external_project,$(1),cppunit)
@@ -213,9 +213,9 @@ endif
endef
-endif
+endif # SYSTEM_CPPUNIT
-ifeq ($(SYSTEM_GLEW),YES)
+ifneq ($(SYSTEM_GLEW),)
define gb_LinkTarget__use_glew
$(call gb_LinkTarget_set_include,$(1),\
@@ -226,7 +226,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(GLEW_LIBS))
endef
-else
+else # !SYSTEM_GLEW
define gb_LinkTarget__use_glew
$(call gb_LinkTarget_use_external_project,$(1),glew)
@@ -247,7 +247,7 @@ endif
endef
-endif
+endif # SYSTEM_GLEW
define gb_LinkTarget__use_iconv
$(call gb_LinkTarget_add_libs,$(1),-liconv)
@@ -686,7 +686,7 @@ endef
endif # SYSTEM_BOOST
-ifeq ($(SYSTEM_CMIS),YES)
+ifneq ($(SYSTEM_CMIS),)
define gb_LinkTarget__use_cmis
$(call gb_LinkTarget_set_include,$(1),\
@@ -766,7 +766,7 @@ endef
endif # SYSTEM_LIBATOMIC_OPS
-ifeq ($(SYSTEM_LIBEXTTEXTCAT),YES)
+ifneq ($(SYSTEM_LIBEXTTEXTCAT),)
define gb_LinkTarget__use_libexttextcat
$(call gb_LinkTarget_set_include,$(1),\
@@ -848,7 +848,7 @@ endef
endif # SYSTEM_LIBXML
-ifeq ($(SYSTEM_LIBXSLT),YES)
+ifneq ($(SYSTEM_LIBXSLT),)
define gb_LinkTarget__use_libxslt
$(call gb_LinkTarget_set_include,$(1),\
@@ -951,7 +951,7 @@ gb_LinkTarget__use_liblangtag :=
endif # ENABLE_LIBLANGTAG
-ifeq ($(SYSTEM_NEON),YES)
+ifneq ($(SYSTEM_NEON),)
define gb_LinkTarget__use_neon
$(call gb_LinkTarget_add_defs,$(1),\
@@ -988,7 +988,7 @@ endef
endif # SYSTEM_NEON
-ifeq ($(SYSTEM_REDLAND),YES)
+ifneq ($(SYSTEM_REDLAND),)
define gb_LinkTarget__use_librdf
$(call gb_LinkTarget_add_defs,$(1),\
@@ -1173,7 +1173,7 @@ endef
endif # SYSTEM_FONTCONFIG
-ifeq ($(SYSTEM_GRAPHITE),YES)
+ifneq ($(SYSTEM_GRAPHITE),)
define gb_LinkTarget__use_graphite
$(call gb_LinkTarget_set_include,$(1),\
@@ -1184,7 +1184,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(GRAPHITE_LIBS))
endef
-else ifeq ($(SYSTEM_GRAPHITE),NO)
+else # !SYSTEM_GRAPHITE
define gb_LinkTarget__use_graphite
$(call gb_LinkTarget_use_unpacked,$(1),graphite)
@@ -1198,10 +1198,6 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
endef
-else # DISABLED GRAPHITE
-
-gb_LinkTarget__use_graphite :=
-
endif # SYSTEM_GRAPHITE
ifeq ($(SYSTEM_ICU),YES)
@@ -1295,7 +1291,7 @@ endef
endif # SYSTEM_ICU
ifeq ($(ENABLE_HARFBUZZ),TRUE)
-ifeq ($(SYSTEM_HARFBUZZ),YES)
+ifneq ($(SYSTEM_HARFBUZZ),)
define gb_LinkTarget__use_harfbuzz
$(call gb_LinkTarget_set_include,$(1),\
@@ -1306,7 +1302,7 @@ $(call gb_LinkTarget_add_libs,$(1),$(HARFBUZZ_LIBS))
endef
-else # SYSTEM_HARFBUZZ != YES
+else # SYSTEM_HARFBUZZ != TRUE
define gb_LinkTarget__use_harfbuzz
$(call gb_LinkTarget_set_include,$(1),\
@@ -1333,7 +1329,7 @@ gb_LinkTarget__use_openssl:=
else # !DISABLE_OPENSSL
-ifeq ($(SYSTEM_OPENSSL),YES)
+ifneq ($(SYSTEM_OPENSSL),)
gb_LinkTarget__use_openssl_headers:=
gb_ExternalProject__use_openssl:=
@@ -1423,7 +1419,7 @@ gb_LinkTarget__use_libgcrypt:=
endif # DISABLE_OPENSSL
-ifeq ($(SYSTEM_CDR),YES)
+ifneq ($(SYSTEM_CDR),)
define gb_LinkTarget__use_cdr
$(call gb_LinkTarget_set_include,$(1),\
@@ -1450,7 +1446,7 @@ endef
endif # SYSTEM_CDR
-ifeq ($(SYSTEM_EBOOK),YES)
+ifneq ($(SYSTEM_EBOOK),)
define gb_LinkTarget__use_ebook
$(call gb_LinkTarget_set_include,$(1),\
@@ -1485,7 +1481,7 @@ endef
endif # SYSTEM_EBOOK
-ifeq ($(SYSTEM_ETONYEK),YES)
+ifneq ($(SYSTEM_ETONYEK),)
define gb_LinkTarget__use_etonyek
$(call gb_LinkTarget_set_include,$(1),\
@@ -1520,7 +1516,7 @@ endef
endif # SYSTEM_ETONYEK
-ifeq ($(SYSTEM_FREEHAND),YES)
+ifneq ($(SYSTEM_FREEHAND),)
define gb_LinkTarget__use_freehand
$(call gb_LinkTarget_set_include,$(1),\
@@ -1555,7 +1551,7 @@ endef
endif # SYSTEM_FREEHAND
-ifeq ($(SYSTEM_ODFGEN),YES)
+ifneq ($(SYSTEM_ODFGEN),)
define gb_LinkTarget__use_odfgen
$(call gb_LinkTarget_set_include,$(1),\
@@ -1583,7 +1579,7 @@ endef
endif # SYSTEM_ODFGEN
-ifeq ($(SYSTEM_ABW),YES)
+ifneq ($(SYSTEM_ABW),)
define gb_LinkTarget__use_abw
$(call gb_LinkTarget_set_include,$(1),\
@@ -1616,7 +1612,7 @@ endef
endif # SYSTEM_ABW
-ifeq ($(SYSTEM_MSPUB),YES)
+ifneq ($(SYSTEM_MSPUB),)
define gb_LinkTarget__use_mspub
$(call gb_LinkTarget_set_include,$(1),\
@@ -1644,7 +1640,7 @@ endef
endif # SYSTEM_MSPUB
-ifeq ($(SYSTEM_VISIO),YES)
+ifneq ($(SYSTEM_VISIO),)
define gb_LinkTarget__use_visio
$(call gb_LinkTarget_set_include,$(1),\
@@ -1672,7 +1668,7 @@ endef
endif # SYSTEM_VISIO
-ifeq ($(SYSTEM_WPD),YES)
+ifneq ($(SYSTEM_WPD),)
define gb_LinkTarget__use_wpd
$(call gb_LinkTarget_set_include,$(1),\
@@ -1705,7 +1701,7 @@ endef
endif # SYSTEM_WPD
-ifeq ($(SYSTEM_WPG),YES)
+ifneq ($(SYSTEM_WPG),)
define gb_LinkTarget__use_wpg
$(call gb_LinkTarget_set_include,$(1),\
@@ -1738,7 +1734,7 @@ endef
endif # SYSTEM_WPG
-ifeq ($(SYSTEM_WPS),YES)
+ifneq ($(SYSTEM_WPS),)
define gb_LinkTarget__use_wps
$(call gb_LinkTarget_set_include,$(1),\
@@ -1771,7 +1767,7 @@ endef
endif # SYSTEM_WPS
-ifeq ($(SYSTEM_MWAW),YES)
+ifneq ($(SYSTEM_MWAW),)
define gb_LinkTarget__use_mwaw
$(call gb_LinkTarget_set_include,$(1),\
@@ -1799,7 +1795,7 @@ endef
endif # SYSTEM_MWAW
-ifeq ($(SYSTEM_LCMS2),YES)
+ifneq ($(SYSTEM_LCMS2),)
define gb_LinkTarget__use_lcms2
$(call gb_LinkTarget_set_include,$(1),\
@@ -2053,7 +2049,7 @@ define gb_LinkTarget__use_pixbuf
$(error gb_LinkTarget__use_pixbuf should not be used any more)
endef
-ifeq ($(SYSTEM_LIBPNG),YES)
+ifneq ($(SYSTEM_LIBPNG),)
define gb_LinkTarget__use_png
$(call gb_LinkTarget_set_include,$(1),\
@@ -2084,7 +2080,7 @@ endef
endif # !SYSTEM_LIBPNG
-ifeq ($(SYSTEM_CURL),YES)
+ifneq ($(SYSTEM_CURL),)
define gb_LinkTarget__use_curl
$(call gb_LinkTarget_set_include,$(1),\
@@ -2352,7 +2348,7 @@ endef
endif # SYSTEM_FIREBIRD
else # !ENABLE_FIREBIRD_SDBC
-
+n
gb_LinkTarget__use_firebird :=
# gb_LinkTarget__use_atomic_ops :=
# gb_LinkTarget__use_tommath :=
@@ -2670,7 +2666,7 @@ endif # SYSTEM_PYTHON
# ORCUS
ifeq ($(ENABLE_ORCUS),TRUE)
-ifeq ($(SYSTEM_LIBORCUS),YES)
+ifneq ($(SYSTEM_LIBORCUS),)
define gb_LinkTarget__use_orcus
$(call gb_LinkTarget_set_include,$(1),\
@@ -2726,7 +2722,7 @@ endif
ifeq ($(ENABLE_EOT),TRUE)
-ifeq ($(SYSTEM_LIBEOT),YES)
+ifneq ($(SYSTEM_LIBEOT),)
define gb_LinkTarget__use_libeot
$(call gb_LinkTarget_set_include,$(1),\
@@ -2816,7 +2812,7 @@ gb_LinkTarget__use_nss3:=
else
-ifeq ($(SYSTEM_NSS),YES)
+ifneq ($(SYSTEM_NSS),)
define gb_LinkTarget__use_nss3
$(call gb_LinkTarget_add_defs,$(1),\
@@ -2844,7 +2840,7 @@ $(call gb_LinkTarget__use_nss3,$(1))
endef
-else
+else # !SYSTEM_NSS
define gb_LinkTarget__use_nss3
$(call gb_LinkTarget_use_package,$(1),nss)
@@ -2904,7 +2900,8 @@ $(call gb_ExternalProject_use_package,$(1),nss)
endef
-endif
+endif # SYSTEM_NSS
+
endif # DESKTOP
### Jars ############################################################
@@ -3278,7 +3275,7 @@ endef
endif # SYSTEM_LIBXML_FOR_BUILD
-ifeq ($(SYSTEM_LIBXSLT_FOR_BUILD),YES)
+ifneq ($(SYSTEM_LIBXSLT_FOR_BUILD),)
gb_ExternalExecutable__register_xsltproc :=
diff --git a/configure.ac b/configure.ac
index a09e177..18def26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7846,7 +7846,7 @@ dnl ===================================================================
if test "$with_system_lcms2" = "yes"; then
libo_MINGW_CHECK_DLL([liblcms2])
else
- SYSTEM_LCMS2=NO
+ SYSTEM_LCMS2=
fi
libo_CHECK_SYSTEM_MODULE([lcms2],[LCMS2],[lcms2],["-I${WORKDIR}/UnpackedTarball/lcms2/include"],["-L${WORKDIR}/UnpackedTarball/lcms2/src/.libs -llcms2"])
if test "$GCC" = "yes"; then
@@ -7924,7 +7924,7 @@ fi
AC_MSG_CHECKING([which libxslt to use])
if test "$with_system_libxml" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_LIBXSLT=YES
+ SYSTEM_LIBXSLT=TRUE
if test "$_os" = "Darwin"; then
dnl make sure to use SDK path
LIBXSLT_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2"
@@ -7950,7 +7950,7 @@ if test "$with_system_libxml" = "yes"; then
libo_MINGW_TRY_DLL([iconv])
else
AC_MSG_RESULT([internal])
- SYSTEM_LIBXSLT=NO
+ SYSTEM_LIBXSLT=
LIBXSLT_MAJOR=1
BUILD_TYPE="$BUILD_TYPE LIBXSLT"
@@ -8676,7 +8676,7 @@ fi
if test "$with_system_curl" = "yes"; then
AC_MSG_RESULT([external])
- SYSTEM_CURL=YES
+ SYSTEM_CURL=TRUE
AC_MSG_CHECKING([whether libcurl is >= 7.19.4])
@@ -8723,7 +8723,7 @@ elif test $_os = iOS; then
ENABLE_CURL=
else
AC_MSG_RESULT([internal])
- SYSTEM_CURL=NO
+ SYSTEM_CURL=
BUILD_TYPE="$BUILD_TYPE CURL"
ENABLE_CURL=TRUE
fi
@@ -8783,7 +8783,7 @@ dnl ===================================================================
dnl Determine which hash container mdds shall use
dnl ===================================================================
AC_MSG_CHECKING([which hash container mdds shall use])
-if test "x$HAVE_CXX11" = "xTRUE" -a "x$SYSTEM_MDDS" = "xYES"; then
+if test "x$HAVE_CXX11" = "xTRUE" -a "x$SYSTEM_MDDS" = "xTRUE"; then
MDDS_CPPFLAGS=$CXXFLAGS_CXX11
AC_MSG_RESULT([std::unordered_map])
else
@@ -9413,7 +9413,7 @@ if test "$enable_openssl" = "yes"; then
elif test "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o "$_os" = "DragonFly" \
&& test "$with_system_openssl" != "no"; then
with_system_openssl=yes
- SYSTEM_OPENSSL=YES
+ SYSTEM_OPENSSL=TRUE
OPENSSL_CFLAGS=
OPENSSL_LIBS="-lssl -lcrypto"
else
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk
index 23161a0..e67fdf2 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -31,7 +31,7 @@ endif
endif
# there are 2 include paths, the other one is passed to --with-nss below
-ifeq ($(SYSTEM_NSS),NO)
+ifeq ($(SYSTEM_NSS),)
curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss
endif
@@ -43,7 +43,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
./configure \
$(if $(filter MACOSX IOS,$(OS)),\
--with-darwinssl, \
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list