Explicitely link libxcb when needed for static arches.

13 files changed, 66 insertions, 26 deletions

diff --git a/app/cwm/Makefile b/app/cwm/Makefile
index 3ac25189e..94fc85fb8 100644
--- a/app/cwm/Makefile
+++ b/app/cwm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2009/01/19 20:23:19 todd Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/27 14:25:47 matthieu Exp $
 
 .include <bsd.xconf.mk>
 
@@ -11,8 +11,11 @@ SRCS=		calmwm.c screen.c xmalloc.c client.c menu.c \
 CPPFLAGS+=	-I${X11BASE}/include -I${X11BASE}/include/freetype2 -I${.CURDIR}
 
 CFLAGS+=	-Wall
+.if ${XENOCARA_BUILD_XCB:L} != "no"
+LIBXCB=		-lxcb
+.endif
 
-LDADD+=		-L${X11BASE}/lib -lXft -lXrender -lX11 -lXau -lXdmcp \
+LDADD+=		-L${X11BASE}/lib -lXft -lXrender -lX11 ${LIBXCB} -lXau -lXdmcp \
 		-lfontconfig -lexpat -lfreetype -lz -lXinerama -lXrandr -lXext
 
 MANDIR=		${X11BASE}/man/cat
diff --git a/app/fvwm/Makefile.inc b/app/fvwm/Makefile.inc
index 7c1b07eda..a034ad307 100644
--- a/app/fvwm/Makefile.inc
+++ b/app/fvwm/Makefile.inc
@@ -1,5 +1,5 @@
 # -*- makefile -*- 
-# $OpenBSD: Makefile.inc,v 1.5 2008/03/25 23:41:50 matthieu Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2010/11/27 14:25:47 matthieu Exp $
 
 .ifndef FVWM_MAKEFILE_INC
 FVWM_MAKEFILE_INC = done
@@ -9,6 +9,10 @@ CFLAGS+=	-I${X11BASE}/include -I${.CURDIR} -I${.CURDIR}/.. \
 		-I${.CURDIR}/../libs
 LDADD+=		-L${X11BASE}/lib
 
+.if ${XENOCARA_BUILD_XCB:L} != "no"
+LIBXCB= -lxcb
+.endif
+
 FVWMLIBDIR=	${X11BASE}/lib/X11/fvwm
 MANDIR=		${X11BASE}/man/cat
 
diff --git a/app/fvwm/fvwm/Makefile b/app/fvwm/fvwm/Makefile
index 773d68db5..df420c0e8 100644
--- a/app/fvwm/fvwm/Makefile
+++ b/app/fvwm/fvwm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2007/07/05 22:20:55 matthieu Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/27 14:25:47 matthieu Exp $
 
 .include "../Makefile.inc"
 
@@ -14,7 +14,7 @@ CPPFLAGS+= -DFVWM_MODULEDIR=\"$(FVWMLIBDIR)\" \
 	-DFVWMRC=\".fvwmrc\" \
 	-DFVWM_CONFIGDIR=\"$(FVWMLIBDIR)\"
 
-LDADD+= -lXpm -lXt -lICE -lSM -lXext -lX11 -lXdmcp -lXau
+LDADD+= -lXpm -lXt -lICE -lSM -lXext -lX11 ${LIBXCB} -lXdmcp -lXau
 
 fvwm.1tbl: fvwm2.1
 	sed -e "s,__projectroot__,${X11BASE}," ${.CURDIR}/fvwm2.1 > fvwm.1tbl
diff --git a/app/fvwm/modules/Makefile.inc b/app/fvwm/modules/Makefile.inc
index 76968daf4..9c523ca3b 100644
--- a/app/fvwm/modules/Makefile.inc
+++ b/app/fvwm/modules/Makefile.inc
@@ -1,16 +1,19 @@
 # -*- makefile -*- 
-# $OpenBSD: Makefile.inc,v 1.5 2007/04/09 18:59:57 matthieu Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2010/11/27 14:25:47 matthieu Exp $
 
 .ifndef FVWM_MAKEFILE_INC
 FVWM_MAKEFILE_INC = done
-.include <bsd.own.mk>
+.include <bsd.xconf.mk>
 
 X11BASE?=	/usr/X11R6
 
 CFLAGS+=	-I${X11BASE}/include -I${.CURDIR}/../.. -I${.CURDIR}/../../libs
 LDADD+=		-L${X11BASE}/lib
 
-XLIB=		-lX11 -lXau -lXdmcp
+.if ${XENOCARA_BUILD_XCB:L} != "no"
+LIBXCB=		-lxcb
+.endif
+XLIB=		-lX11 ${LIBXCB} -lXau -lXdmcp
 
 FVWMLIBDIR=	${X11BASE}/lib/X11/fvwm
 MANDIR=		${X11BASE}/man/cat
diff --git a/app/fvwm/utils/Makefile b/app/fvwm/utils/Makefile
index b9a2a6a7c..bdd3c5b9e 100644
--- a/app/fvwm/utils/Makefile
+++ b/app/fvwm/utils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2006/11/27 19:56:35 matthieu Exp $
+# $OpenBSD: Makefile,v 1.3 2010/11/27 14:25:47 matthieu Exp $
 
 .include "../Makefile.inc"
 
@@ -7,7 +7,7 @@
 PROG=	xpmroot
 SRCS=	xpmroot.c
 
-LDADD+= -lXpm -lXt -lICE -lSM -lXext -lX11 -lXdmcp -lXau
+LDADD+= -lXpm -lXt -lICE -lSM -lXext -lX11 ${LIBXCB} -lXdmcp -lXau
 
 .include <bsd.prog.mk>
-.include <bsd.xorg.mk>
\ No newline at end of file
+.include <bsd.xorg.mk>
diff --git a/app/ssh-askpass/Makefile b/app/ssh-askpass/Makefile
index ab6d5139c..a65e74d44 100644
--- a/app/ssh-askpass/Makefile
+++ b/app/ssh-askpass/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2008/03/25 23:41:50 matthieu Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/27 14:25:47 matthieu Exp $
 .include	<bsd.xconf.mk>
 
 PROG=		ssh-askpass
@@ -10,8 +10,12 @@ VERSION=	1.2.0
 DATE=		February 14, 2001
 APP_DEFAULTS=	$(CLASS)-default.ad
 
+.if ${XENOCARA_BUILD_XCB:L} != "no"
+LIBXCB=		-lxcb
+.endif
+
 CPPFLAGS+=	-I${X11BASE}/include -I.
-LDADD+=		-L${X11BASE}/lib -lXt -lSM -lICE -lXinerama -lX11 -lXau -lXdmcp -lXext
+LDADD+=		-L${X11BASE}/lib -lXt -lSM -lICE -lXinerama -lX11 ${LIBXCB} -lXau -lXdmcp -lXext
 
 CLEANFILES+=	${CLASS}.ad ${CLASS}_ad.h ssh-askpass.1
 
diff --git a/app/video/Makefile b/app/video/Makefile
index 3f23327d3..863a9f4af 100644
--- a/app/video/Makefile
+++ b/app/video/Makefile
@@ -1,10 +1,15 @@
-# $OpenBSD: Makefile,v 1.3 2010/09/25 02:58:00 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.4 2010/11/27 14:25:47 matthieu Exp $
 .include <bsd.xconf.mk>
 
 PROG=	video
 
 CPPFLAGS+= -I${X11BASE}/include
-LDADD+= -L${X11BASE}/lib -lXv -lXext -lX11 -lXau -lXdmcp
+
+.if ${XENOCARA_BUILD_XCB:L} != "no"
+LIBXCB=	-lxcb
+.endif
+
+LDADD+= -L${X11BASE}/lib -lXv -lXext -lX11 ${LIBXCB} -lXau -lXdmcp
 MANDIR=	${X11BASE}/man/cat
 
 obj: _xenocara_obj
diff --git a/app/xidle/Makefile b/app/xidle/Makefile
index 6e1f38e85..8c61aff70 100644
--- a/app/xidle/Makefile
+++ b/app/xidle/Makefile
@@ -1,11 +1,14 @@
-# $OpenBSD: Makefile,v 1.4 2008/03/25 23:41:50 matthieu Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/27 14:25:47 matthieu Exp $
 .include <bsd.xconf.mk>
 
 PROG=	xidle
 
 CPPFLAGS+= -I${X11BASE}/include
 CFLAGS+= -Wall
-LDADD+=	-L${X11BASE}/lib -lXss -lXext -lX11 -lXau -lXdmcp
+.if ${XENOCARA_BUILD_XCB:L} != "no"
+LIBXCB=	-lxcb
+.endif
+LDADD+=	-L${X11BASE}/lib -lXss -lXext -lX11 ${LIBXCB} -lXau -lXdmcp
 
 MANDIR=	${X11BASE}/man/cat
 
diff --git a/app/xlockmore/Makefile.bsd-wrapper b/app/xlockmore/Makefile.bsd-wrapper
index a36cf5638..e9672f5fd 100644
--- a/app/xlockmore/Makefile.bsd-wrapper
+++ b/app/xlockmore/Makefile.bsd-wrapper
@@ -1,10 +1,17 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2010/08/05 06:44:21 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.8 2010/11/27 14:25:47 matthieu Exp $
+
+.include <bsd.xconf.mk>
+
+.if ${XENOCARA_BUILD_XCB:L} != "no"
+LIBXCB=		-lxcb
+.endif
 
 config.status:
 	AUTOMAKE_VERSION="$(AUTOMAKE_VERSION)" \
 	AUTOCONF_VERSION="$(AUTOCONF_VERSION)" \
 	ACLOCAL="aclocal -I ${X11BASE}/share/aclocal" \
 	CFLAGS="${CFLAGS}" \
+	LIBXCB="${LIBXCB}" \
 	PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
 		sh ${.CURDIR}/configure --prefix=${X11BASE} \
 		--enable-appdefaultdir=/etc/X11/app-defaults \
diff --git a/app/xlockmore/configure.in b/app/xlockmore/configure.in
index 5e09402e8..d76ff955d 100644
--- a/app/xlockmore/configure.in
+++ b/app/xlockmore/configure.in
@@ -2519,7 +2519,7 @@ AC_MSG_CHECKING([for GL >=1.1])
 ac_save_CFLAGS="$CFLAGS"
 ac_save_LIBS="$LIBS"
 CFLAGS="${CFLAGS} ${XLOCKINC}"
-LIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 -lXext -lXau -lXdmcp -lm"
+LIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 $(LIBXCB) -lXext -lXau -lXdmcp -lm"
 AC_CACHE_VAL(ac_cv_c_gl1_1,[
 AC_TRY_LINK([#define _XOPEN_SOURCE 1
 #include <GL/gl.h>], [
@@ -4297,7 +4297,7 @@ case "${canonical}" in
     XGLOCKLIBPATHS="-L/usr/lib32 ${XGLOCKLIBPATHS}"
   ;;
 esac
-XLOCKLIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 -lXext -lXau -lXdmcp -lm"
+XLOCKLIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 ${LIBXCB} -lXext -lXau -lXdmcp -lm"
 XMLOCKLIBS="${XMLOCKLIBPATHS} ${XMLOCKLIBS} -lX11"
 XGLOCKLIBS="${XGLOCKLIBPATHS} ${XGLOCKLIBS} ${GTK_LIBS}"
 AC_SUBST(XLOCKLDFLAGS)
diff --git a/app/xsystrace/Makefile b/app/xsystrace/Makefile
index 5d4e10e25..729cb501a 100644
--- a/app/xsystrace/Makefile
+++ b/app/xsystrace/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2008/03/25 23:41:50 matthieu Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/27 14:25:47 matthieu Exp $
 .include <bsd.xconf.mk>
 
 PROG=	xsystrace
@@ -9,7 +9,10 @@ SUBDIR=		pixmaps
 .endif
 
 CPPFLAGS+=	-I${X11BASE}/include
-LDADD+=		-L${X11BASE}/lib -lXaw -lXt -lSM -lICE -lXmu -lXpm -lX11 -lXext -lXau -lXdmcp
+.if ${XENOCARA_BUILD_XCB:L} != "no"
+LIBXCB=		-lxcb
+.endif
+LDADD+=		-L${X11BASE}/lib -lXaw -lXt -lSM -lICE -lXmu -lXpm -lX11 ${LIBXCB} -lXext -lXau -lXdmcp
 
 SRCS=		main.c interface.c callbacks.c policy.c
 
diff --git a/app/xterm/Makefile b/app/xterm/Makefile
index 6e2a3dcbe..3a85f6e26 100644
--- a/app/xterm/Makefile
+++ b/app/xterm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/05/08 12:20:46 matthieu Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/27 14:25:47 matthieu Exp $
 .include <bsd.xconf.mk>
 
 SUBDIR=	icons resize
@@ -15,8 +15,11 @@ CPPFLAGS+=	-I${.CURDIR} -I${X11BASE}/include \
 		-DFUNCPROTO=15 -DNARROWPROTO -DXFREE86_FT2 -DUTMP \
 		-DDEF_ALLOW_FONT=False -DDEF_ALLOW_TCAP=False \
 		-DDEF_ALLOW_WINDOW=False
+.if ${XENOCARA_BUILD_XCB:L} != "no"
+LIBXCB=		-lxcb
+.endif
 LDADD+=		-L${X11BASE}/lib -lXaw -lXpm -lXt -lSM -lICE \
-		-lXmu -lXft -lXrender -lX11 -lXext -lXau -lXdmcp \
+		-lXmu -lXft -lXrender -lX11 ${LIBXCB} -lXext -lXau -lXdmcp \
 		-lfontconfig -lexpat -lfreetype -lutil -ltermcap -lz
 
 SRCS=	TekPrsTbl.c Tekproc.c VTPrsTbl.c button.c cachedGCs.c \
diff --git a/app/xvctl/Makefile b/app/xvctl/Makefile
index cafc6c9b2..f5054264f 100644
--- a/app/xvctl/Makefile
+++ b/app/xvctl/Makefile
@@ -1,11 +1,16 @@
-# $OpenBSD: Makefile,v 1.4 2008/03/25 23:41:50 matthieu Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/27 14:25:47 matthieu Exp $
 .include <bsd.xconf.mk>
 
 PROG=xvctl
 MAN=xvctl.1
 
 CPPFLAGS+= -I${X11BASE}/include
-LDADD+=-L${X11BASE}/lib -lXv -lXext -lX11 -lXau -lXdmcp
+
+.if ${XENOCARA_BUILD_XCB:L} != "no"
+LIBXCB= -lxcb
+.endif
+
+LDADD+=-L${X11BASE}/lib -lXv -lXext -lX11 ${LIBXCB} -lXau -lXdmcp
 
 MANDIR= ${X11BASE}/man/cat