Switch from the old AM_PATH_CHECK macro to pkg-config.
check 0.9.4 is now required to build XCB's unit tests. The version that we were requiring was not actually new enough to let our unit tests compile, and the AM_PATH_CHECK macro is now considered deprecated. We know that versions of check using pkg-config are new enough to work, and the check dependency was optional anyway, so we've dropped support for older versions.
This commit is contained in:
parent
82762555a1
commit
3634299ecc
|
@ -8,11 +8,7 @@ AC_INIT([libxcb],
|
||||||
AC_CONFIG_SRCDIR([xcb.pc.in])
|
AC_CONFIG_SRCDIR([xcb.pc.in])
|
||||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||||
|
|
||||||
dnl This ifdef has no useful effect prior to automake 1.9, but in 1.9
|
PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=true], [HAVE_CHECK=false])
|
||||||
dnl it allows the user to not have check.m4 installed.
|
|
||||||
m4_ifdef([AM_PATH_CHECK],[
|
|
||||||
AM_PATH_CHECK(0.8.2, [HAVE_CHECK=true], [HAVE_CHECK=false])
|
|
||||||
])
|
|
||||||
AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xtrue)
|
AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xtrue)
|
||||||
|
|
||||||
AC_CONFIG_HEADERS([src/config.h])
|
AC_CONFIG_HEADERS([src/config.h])
|
||||||
|
|
Loading…
Reference in New Issue