diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-04 16:49:08 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-04 16:50:18 +0100 |
| commit | 79ab9d7b6ede19bc494770bba6cc59bd4618d5ae (patch) | |
| tree | 43e91538cf0c75f083ad7fa282acb66ba79b70c5 /scp2 | |
| parent | f985e3add3870c1dee7fe88d37388281a333403a (diff) | |
fdo#74495: gbuild: AutoInstall: add support for ComponentCondition
... via new scp2 macro LIBO_LIB_FILE_COMPONENTCONDITION.
(regression from 2feb756dd5ff486a3972cf676f6f1d07017bf0f6)
Change-Id: I6ab30cc1c14c34bd7dc1325e3f98d972544e7eea
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 2 | ||||
| -rwxr-xr-x | scp2/inc/macros.inc | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 8550649379e9..ca4b99d09ca5 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -17,7 +17,7 @@ $(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,,"ISCHECKFORPRODUCTUPDATES=1")) $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE)) $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE)) diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index d95c364bbe38..1ec649d652c6 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -158,6 +158,13 @@ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); \ End +#define LIBO_LIB_FILE_COMPONENTCONDITION(id,name,cond) \ + File id \ + Name = name; \ + PACKED_LIB_FILE_BODY; \ + ComponentCondition = cond; \ + End + #define STD_LIB_FILE(id,name) \ File id \ Name = LIBNAME(name); \ |