[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - RepositoryExternal.mk

2014-05-30 Thread David Tardon 
 RepositoryExternal.mk |8 
 1 file changed, 8 insertions(+)

New commits:
commit f22f58af9dd896ddc958a083ca883a5f2b88b2dc
Author: David Tardon dtar...@redhat.com
Date:   Fri May 30 19:50:24 2014 +0200

only def graphite external if --enable-graphite

Change-Id: I58271b5138b6dda4c448af63146a2f2171cb61a1
(cherry picked from commit 026dc56eb7deb7c49b6d54875a697d4a431082fe)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 240a7fe..ada101e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1321,6 +1321,8 @@ endef
 
 endif # SYSTEM_FONTCONFIG
 
+ifeq ($(ENABLE_GRAPHITE),TRUE)
+
 ifneq ($(SYSTEM_GRAPHITE),)
 
 define gb_LinkTarget__use_graphite
@@ -1348,6 +1350,12 @@ endef
 
 endif # SYSTEM_GRAPHITE
 
+else # !ENABLE_GRAPHITE
+
+gb_LinkTarget__use_graphite :=
+
+endif # ENABLE_GRAPHITE
+
 ifneq ($(SYSTEM_ICU),)
 
 gb_LinkTarget__use_icu_headers:=
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - RepositoryExternal.mk

2014-05-23 Thread Rene Engelhard 
 RepositoryExternal.mk |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit b1dfdf6add0385d4c0cbda9d1a96644454353e89
Author: Rene Engelhard r...@debian.org
Date:   Fri May 23 07:43:19 2014 +0200

don't unconditionally require bsh.jar and js.jar in RepositoryExternal.mk

... as they can be disabled and thus are not there at install

Change-Id: I197b5053971d2721114b2ebc7b3c31db36c3f58e

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2db4c38..8b35b8c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3181,6 +3181,8 @@ endef
 endif # SYSTEM_HSQLDB
 
 
+ifeq ($(ENABLE_SCRIPTING_BEANSHELL),TRUE)
+
 ifneq ($(SYSTEM_BSH),)
 
 define gb_Jar__use_bsh
@@ -3201,6 +3203,9 @@ endef
 
 endif # SYSTEM_BSH
 
+endif
+
+ifeq ($(ENABLE_SCRIPTING_JAVASCRIPT),TRUE)
 
 ifneq ($(SYSTEM_RHINO),)
 
@@ -3222,6 +3227,8 @@ endef
 
 endif # SYSTEM_RHINO
 
+endif
+
 ifneq ($(SYSTEM_APACHE_COMMONS),)
 
 define gb_Jar__use_commons-codec
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits