openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-08 18:28:43 +00:00
Code Issues Projects Releases Wiki Activity

Explicitely link libxcb when needed for static arches.

Browse Source
This commit is contained in:
matthieu
2010-11-27 14:25:47 +00:00
parent 07dcad530f
commit 66473b7fbe
13 changed files with 66 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/xlockmore/Makefile.bsd-wrapper
View File

@@ -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 \

4
app/xlockmore/configure.in
View File

@@ -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)