diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:45:09 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:45:09 +0000 |
| commit | 4ca3e88603fb30c38226749949d666590d77d63c (patch) | |
| tree | 9bc96b918899212d64a39bde4c2cfff1b4815369 /scp2/util | |
| parent | 2476f8130beeddf6529b47e7f9c5a82f83b5ef4a (diff) | |
INTEGRATION: CWS sb91 (1.54.4); FILE MERGED
2008/07/21 10:56:13 sb 1.54.4.2: RESYNC: (1.54-1.56); FILE MERGED
2008/07/17 15:58:23 sb 1.54.4.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/util')
| -rw-r--r-- | scp2/util/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index 57652dba4bc4..627bf9b366c0 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.56 $ +# $Revision: 1.57 $ # # This file is part of OpenOffice.org. # @@ -149,7 +149,7 @@ SCP1FILES += \ .ENDIF .IF "$(GUI)"=="UNX" -.IF "$(ENABLE_GNOMEVFS)" != "" || "$(ENABLE_GIO)" != "" +.IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!="" SCP1FILES += \ module_gnome.par \ file_gnome.par @@ -299,7 +299,7 @@ SCP2FILES += \ .ENDIF .IF "$(GUI)"=="UNX" -.IF "$(ENABLE_GNOMEVFS)" != "" || "$(ENABLE_GIO)" != "" +.IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!="" SCP2FILES += \ module_gnome.par \ file_gnome.par |