diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-11-27 14:25:48 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-11-27 14:25:48 +0000 |
| commit | 997b535a20c1ef991377fb0d1b237efe4e2bb928 (patch) | |
| tree | 3101a99934f20dae3c0fdb30202c568c87560a81 /app/xlockmore | |
| parent | 5aaf76b3bf54896c7779634c10940edc785ca482 (diff) | |
Explicitely link libxcb when needed for static arches.
Diffstat (limited to 'app/xlockmore')
| -rw-r--r-- | app/xlockmore/Makefile.bsd-wrapper | 9 | ||||
| -rw-r--r-- | app/xlockmore/configure.in | 4 |
2 files changed, 10 insertions, 3 deletions
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) |