diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:44:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:44:28 +0000 |
| commit | 5a900869e2c82223cf907028509b9437b64d263f (patch) | |
| tree | 8061fc458961c7de8619dabe700c9060bd0dbb77 /scp2/source/gnome | |
| parent | 615fbc4cde6a1f9436364d00f00b91ce4a39c82b (diff) | |
INTEGRATION: CWS sb91 (1.7.102); FILE MERGED
2008/07/17 15:58:23 sb 1.7.102.1: #i91721# added explicit ENABLE_GCONF (had previously been covered by ENABLE_GNOMEVFS, but unxsolu4 does not support the latter but does support the former)
Diffstat (limited to 'scp2/source/gnome')
| -rw-r--r-- | scp2/source/gnome/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk index a2a7379adc84..ffbcc719144f 100644 --- a/scp2/source/gnome/makefile.mk +++ b/scp2/source/gnome/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # # This file is part of OpenOffice.org. # @@ -43,7 +43,11 @@ TARGETTYPE=CUI SCP_PRODUCT_TYPE=osl -.IF "$(ENABLE_GNOMEVFS)" != "" || "$(ENABLE_GIO)" != "" +.IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!="" + +.IF "$(ENABLE_GCONF)" != "" +SCPDEFS+=-DENABLE_GCONF +.ENDIF .IF "$(ENABLE_GNOMEVFS)" != "" SCPDEFS+=-DENABLE_GNOMEVFS |