From: Jamey Sharp <jamey@minilop.net>
Date: Fri, 17 Nov 2006 01:02:17 +0000 (-0800)
Subject: Switch from the old AM_PATH_CHECK macro to pkg-config.
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=3634299ecc5223e8505d19468cf04770ac08ec14;p=free-sw%2Fxcb%2Flibxcb

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.
---

diff --git a/configure.ac b/configure.ac
index 7ad8321..2846184 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,11 +8,7 @@ AC_INIT([libxcb],
 AC_CONFIG_SRCDIR([xcb.pc.in])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
-dnl This ifdef has no useful effect prior to automake 1.9, but in 1.9
-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])
-])
+PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=true], [HAVE_CHECK=false])
 AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xtrue)
 
 AC_CONFIG_HEADERS([src/config.h])