diff options
| author | joerg <joerg> | 2010-09-11 18:47:09 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2010-09-11 18:47:09 +0000 |
| commit | c2b9d679c0d22d44d86dabf65ea0b4392c8fe47a (patch) | |
| tree | 0ed453c515cc9f1272c8bd0b7228d4dbc6ddf0ea /x11 | |
| parent | 09b95f816bd37cfbe4596e6941ecbd8afe8aa633 (diff) | |
| download | pkgsrc-c2b9d679c0d22d44d86dabf65ea0b4392c8fe47a.tar.gz | |
Only pull in xcb if it this is modular Xorg or the native one has it.
First half of PR 43868, builtin.mk for libxcb is the rest.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libX11/buildlink3.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/x11/libX11/buildlink3.mk b/x11/libX11/buildlink3.mk index 41792f351bb..1171854e6bc 100644 --- a/x11/libX11/buildlink3.mk +++ b/x11/libX11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2010/09/10 20:28:03 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2010/09/11 18:47:09 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -21,7 +21,11 @@ X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX11}/lib .include "../../x11/kbproto/buildlink3.mk" .include "../../x11/libXau/buildlink3.mk" .include "../../x11/libXdmcp/buildlink3.mk" + +.if ${X11_TYPE} == "modular" || exists(${X11BASE}/lib/pkgconfig/xcb.pc) .include "../../x11/libxcb/buildlink3.mk" +.endif + .include "../../x11/xproto/buildlink3.mk" .endif # LIBX11_BUILDLINK3_MK |