diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 13:01:23 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 13:01:23 +0000 |
| commit | 2a11febdf5e59ad817306a45e6c5939fbce1ea87 (patch) | |
| tree | a1bb90a09fc5cd154cb976659999beb152f1976b | |
| parent | 10e47a1c2cb987de342ab98be78f2dd4d797fe26 (diff) | |
INTEGRATION: CWS sb91 (1.18.14); FILE MERGED
2008/07/17 15:37:56 sb 1.18.14.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)
| -rw-r--r-- | shell/source/backends/gconfbe/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shell/source/backends/gconfbe/makefile.mk b/shell/source/backends/gconfbe/makefile.mk index bbffc6b4b955..472db4b244a3 100644 --- a/shell/source/backends/gconfbe/makefile.mk +++ b/shell/source/backends/gconfbe/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # # This file is part of OpenOffice.org. # @@ -50,7 +50,7 @@ UCDSRCEXT = txt CFLAGS+=-DENABLE_LOCKDOWN .ENDIF -.IF "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!="" +.IF "$(ENABLE_GCONF)"!="" COMPILER_WARN_ALL=TRUE PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 ORBit-2.0 glib-2.0 .INCLUDE: pkg_config.mk @@ -90,7 +90,7 @@ SHL1VERSIONMAP=exports.map SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) -.ENDIF # "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!="" +.ENDIF # "$(ENABLE_GCONF)"!="" # --- Targets --- |