diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-18 12:26:32 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-18 12:26:32 +0000 |
| commit | 75d152c1051e4d9ffcc44a878fd34ce4c4428552 (patch) | |
| tree | 42d6fdc41183143afb8ad3d936b5ae95464a7c7d /fpicker/util | |
| parent | 8d00f9a986a948461cacbeb79c2ea8631f036bb6 (diff) | |
INTEGRATION: CWS gtkfpicker2 (1.5.2); FILE MERGED
2004/12/20 09:54:27 cmc 1.5.2.3: RESYNC: (1.5-1.9); FILE MERGED
2004/10/06 17:48:13 cmc 1.5.2.2: #i34219# update to using pkg_config.mk
2004/09/16 11:42:47 cmc 1.5.2.1: #i34219# another cut at getting the gtk fpicker to not break the Hamburg build
Diffstat (limited to 'fpicker/util')
| -rw-r--r-- | fpicker/util/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fpicker/util/makefile.mk b/fpicker/util/makefile.mk index 53d26b5a94..e010edd84e 100644 --- a/fpicker/util/makefile.mk +++ b/fpicker/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: hjs $ $Date: 2004-12-17 13:27:40 $ +# last change: $Author: kz $ $Date: 2005-01-18 13:26:32 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -76,6 +76,8 @@ USE_LDUMP2=TRUE .IF "$(ENABLE_GTK)" == "TRUE" PKGCONFIG_MODULES=gtk+-2.0 .INCLUDE: pkg_config.mk +#check gtk version +GTK_TWO_FOUR:=$(shell +-$(PKGCONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo ok) .ENDIF # "$(ENABLE_GTK)" == "TRUE" .ENDIF #.IF "$(GUI)"!="WNT" @@ -110,6 +112,7 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) .ELSE .IF "$(ENABLE_GTK)" == "TRUE" +.IF "$(GTK_TWO_FOUR)" == "ok" SHL1NOCHECK=TRUE SHL1TARGET=fps_gnome SHL1LIBS=$(SLB)$/fps_gnome.lib @@ -120,6 +123,7 @@ LINKFLAGS!:=$(LINKFLAGSAPP:s/-z defs/-z nodefs/) .ENDIF # "$(OS)"=="SOLARIS" DEF1NAME=$(SHL1TARGET) +.ENDIF .ENDIF # "$(ENABLE_GTK)" == "TRUE" .ENDIF # ELSE "$(GUI)"=="WNT" |