diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-08 15:05:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-08 15:05:49 +0200 |
| commit | 71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec (patch) | |
| tree | ea689cdd51f395980ddc37dc33781635976f3a16 /apps/xwininfo/configure.ac | |
| parent | aec798fb4dc72d616732d0fa711faffaa8cd7590 (diff) | |
| parent | 2acb86c9b086bdb9a3897db0b93820652e07cb59 (diff) | |
| download | vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.tar.gz vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.tar.bz2 vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
apps/xwininfo/xwininfo.c
xorg-server/hw/xwin/glx/indirect.c
Diffstat (limited to 'apps/xwininfo/configure.ac')
| -rw-r--r-- | apps/xwininfo/configure.ac | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/xwininfo/configure.ac b/apps/xwininfo/configure.ac index b28dd894a..3149a5fe6 100644 --- a/apps/xwininfo/configure.ac +++ b/apps/xwininfo/configure.ac @@ -31,7 +31,6 @@ AC_USE_SYSTEM_EXTENSIONS # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE AM_ICONV # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS @@ -67,7 +66,7 @@ PKG_CHECK_MODULES(XWININFO, [xcb >= 1.6] xcb-shape ${xcb_icccm_pc}) # Even when using xcb, xproto is still required for Xfuncproto.h # and libX11 headers for cursorfont.h -PKG_CHECK_MODULES(XLIB, x11 [xproto >= 7.0.17]) +PKG_CHECK_MODULES(XLIB, x11 [xproto >= 7.0.25]) XWININFO_CFLAGS="${XWININFO_CFLAGS} ${XLIB_CFLAGS}" XWININFO_LIBS="${XWININFO_LIBS} ${LIBICONV}" |