diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 09:15:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-02 09:15:58 +0000 |
| commit | 7f06beee3ca23dd954d67bcdd0ce0a19d83f83fb (patch) | |
| tree | cfcc31268f64b49f6f91e928b48eca5756544f44 /vcl/util | |
| parent | 4b082170b7d161f46335625f0e4b9fe247db2ba2 (diff) | |
INTEGRATION: CWS vcl90 (1.109.48); FILE MERGED
2008/06/24 09:01:05 pl 1.109.48.1: #i90809# Xrandr link modifications (thanks thb)
Diffstat (limited to 'vcl/util')
| -rw-r--r-- | vcl/util/makefile.mk | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 7718ac97816e..b8a7545347ba 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.109 $ +# $Revision: 1.110 $ # # This file is part of OpenOffice.org. # @@ -307,6 +307,12 @@ SHL2STDLIBS += -lXext -lSM -lICE -lX11 SHL2STDLIBS+= -ldl .ENDIF +.IF "$(ENABLE_RANDR)" != "" +.IF "$(XRANDR_DLOPEN)" == "FALSE" +SHL2STDLIBS+= $(XRANDR_LIBS) +.ENDIF +.ENDIF + .ENDIF # "$(GUIBASE)"=="unx" # gtk plugin @@ -351,6 +357,12 @@ SHL4STDLIBS+=\ $(VOSLIB) \ $(SALLIB) +.IF "$(ENABLE_RANDR)" != "" +.IF "$(XRANDR_DLOPEN)" == "FALSE" +SHL4STDLIBS+= $(XRANDR_LIBS) +.ENDIF +.ENDIF + .ENDIF # "$(ENABLE_GTK)" != "" # KDE plugin @@ -373,6 +385,13 @@ SHL5STDLIBS+=\ $(TOOLSLIB) \ $(VOSLIB) \ $(SALLIB) + +.IF "$(ENABLE_RANDR)" != "" +.IF "$(XRANDR_DLOPEN)" == "FALSE" +SHL5STDLIBS+= $(XRANDR_LIBS) +.ENDIF +.ENDIF + .ENDIF # "$(ENABLE_KDE)" != "" .ENDIF # UNX |