X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=a831f3460e41b5a6ca0974ecf7ecd88c1782a521;hb=7fbfebaa3fb3a5ca2d2a307a0a5c40c015e18115;hp=7ad83218157776e308a8efd4e80494a592d4fa99;hpb=e3b7009dc0be6515d23fbda9c744082506df4cb0;p=free-sw%2Fxcb%2Flibxcb

diff --git a/configure.ac b/configure.ac
index 7ad8321..a831f34 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])
@@ -118,6 +114,12 @@ AC_SUBST(CWARNFLAGS)
 
 GCC_CHECK_VISIBILITY()
 
+# htmldir is not defined prior to autoconf 2.59c, so on earlier versions
+# set an equivalent value.
+AC_PREREQ([2.59c], [], [AC_SUBST([htmldir], [m4_ifset([AC_PACKAGE_TARNAME],
+	  ['${datadir}/doc/${PACKAGE_TARNAME}'],
+	  ['${datadir}/doc/${PACKAGE}'])
+])])
 AM_CHECK_DOXYGEN()
 
 AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile doc/Makefile])