diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2014-01-07 14:00:41 -0500 |
|---|---|---|
| committer | Arnaud Fontaine <arnau@debian.org> | 2014-01-30 12:09:35 +0900 |
| commit | 517cb0e888eca4030b4bd00c316619db925032ea (patch) | |
| tree | 6ff476a520b8674e4cb36ba78d8cbc6a4022e4bb | |
| parent | 0a17b61a8971d3c4600a5c19fa7d753e7196abfb (diff) | |
autoconf: comment and layout the initialization section
No functional changes. Trying to make it clearer.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index cd3cbd9..cba8ade 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,4 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. +dnl Process this file with autoconf to produce a configure script. # Initialize Autoconf AC_PREREQ([2.60]) @@ -9,22 +8,18 @@ AC_INIT([libxcb],[1.10], AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([xcb.pc.in]) +AC_CONFIG_HEADERS([src/config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_PATH_PYTHON([2.6]) # Set common system defines for POSIX extensions, such as _GNU_SOURCE # Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) # to avoid autoconf errors. AC_USE_SYSTEM_EXTENSIONS -AM_PATH_PYTHON([2.6]) - -PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) -AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes) - -AC_CONFIG_HEADERS([src/config.h]) - +# Initialize libtool AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL @@ -34,6 +29,9 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.18) XORG_DEFAULT_OPTIONS +PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) +AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes) + XSLTPROC=no HTML_CHECK_RESULT=no if test x"$HAVE_CHECK" = xyes; then |