diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-06-17 08:29:14 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-06-17 08:29:14 +0000 |
| commit | f6bf4c4d7d549ed086692a86c87a835626d87f74 (patch) | |
| tree | fe74043bbb254af7ec257742e8f94a53bd4cc4fd /vcl/util | |
| parent | 91a63491207a36822e484865f1c9149426733271 (diff) | |
INTEGRATION: CWS moresystemstuff2 (1.65.88); FILE MERGED
2005/06/11 15:35:55 rene 1.65.88.3: RESYNC: (1.66-1.68); FILE MERGED
2005/05/15 14:19:19 rene 1.65.88.2: RESYNC: (1.65-1.66); FILE MERGED
2005/04/01 10:21:42 rene 1.65.88.1: #i46467# add more system stuff and options to link against pam/crypt/xrender
Diffstat (limited to 'vcl/util')
| -rw-r--r-- | vcl/util/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 3b4f4312324e..170e45b40bae 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.68 $ +# $Revision: 1.69 $ # -# last change: $Author: kz $ $Date: 2005-05-31 16:40:28 $ +# last change: $Author: obo $ $Date: 2005-06-17 09:29:14 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -312,6 +312,10 @@ XINERAMALIBS= -Wl,-Bstatic -lXinerama -Wl,-Bdynamic SHL2STDLIBS += $(XINERAMALIBS) +.IF "$(XRENDER_LINK)" == "YES" +SHL2STDLIBS+=`pkg-config --libs xrender` +.ENDIF + .ENDIF # USE_XINERAMA != no .IF "$(ENABLE_PASF)" != "" |