3 files changed, 5 insertions, 10 deletions
diff --git a/app/xlockmore/Makefile.bsd-wrapper b/app/xlockmore/Makefile.bsd-wrapper
index 8095ca732..02be42e6a 100644
--- a/app/xlockmore/Makefile.bsd-wrapper
+++ b/app/xlockmore/Makefile.bsd-wrapper
@@ -1,17 +1,12 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.9 2010/11/30 20:05:41 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2011/03/08 20:48:59 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} \
 		--datarootdir=${X11BASE} \
diff --git a/app/xlockmore/configure b/app/xlockmore/configure
index a38856544..63dbaa9c4 100644
--- a/app/xlockmore/configure
+++ b/app/xlockmore/configure
@@ -9597,7 +9597,7 @@ $as_echo_n "checking for GL >=1.1... " >&6; }
 ac_save_CFLAGS="$CFLAGS"
 ac_save_LIBS="$LIBS"
 CFLAGS="${CFLAGS} ${XLOCKINC}"
-LIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 $(LIBXCB) -lXext -lXau -lXdmcp -lm"
+LIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 -lxcb -lXext -lXau -lXdmcp -lm"
 if test "${ac_cv_c_gl1_1+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
@@ -13854,7 +13854,7 @@ case "${canonical}" in
     XGLOCKLIBPATHS="-L/usr/lib32 ${XGLOCKLIBPATHS}"
   ;;
 esac
-XLOCKLIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 ${LIBXCB} -lXext -lXau -lXdmcp -lm"
+XLOCKLIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 -lxcb -lXext -lXau -lXdmcp -lm"
 XMLOCKLIBS="${XMLOCKLIBPATHS} ${XMLOCKLIBS} -lX11"
 XGLOCKLIBS="${XGLOCKLIBPATHS} ${XGLOCKLIBS} ${GTK_LIBS}"
 
diff --git a/app/xlockmore/configure.in b/app/xlockmore/configure.in
index d76ff955d..5bfe256c6 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 $(LIBXCB) -lXext -lXau -lXdmcp -lm"
+LIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 -lxcb -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 ${LIBXCB} -lXext -lXau -lXdmcp -lm"
+XLOCKLIBS="${XLOCKLIBPATHS} ${XLOCKLIBS} -lX11 -lxcb -lXext -lXau -lXdmcp -lm"
 XMLOCKLIBS="${XMLOCKLIBPATHS} ${XMLOCKLIBS} -lX11"
 XGLOCKLIBS="${XGLOCKLIBPATHS} ${XGLOCKLIBS} ${GTK_LIBS}"
 AC_SUBST(XLOCKLDFLAGS)