Sort gitignore, adjust pattern for config.h

[free-sw/xcb/libxcb] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3ad5f7b..6c107bc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,10 +2,12 @@
 # Process this file with autoconf to produce a configure script.
 
 # Initialize Autoconf
-AC_PREREQ(2.57)
+AC_PREREQ([2.60])
 AC_INIT([libxcb],
         1.9,
         [xcb@lists.freedesktop.org])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([xcb.pc.in])
 
 # Initialize Automake
@@ -138,13 +140,6 @@ AC_SUBST(CWARNFLAGS)
 
 XCB_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}'])
-])])
-
 XCB_CHECK_DOXYGEN()
 
 AC_CHECK_FUNC(getaddrinfo, [AC_DEFINE(HAVE_GETADDRINFO, 1, [getaddrinfo() function is available])], )