diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2012-01-22 20:19:45 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2012-01-25 08:49:46 -0500 |
| commit | 70c0bd30f0f77e70910d10f91ecca617d6b5acb7 (patch) | |
| tree | 5627cb88c4fce0d7541fb930680f81dafea1834b | |
| parent | 395f3573fe0124991eb9a2f33473ea2ed2fd422c (diff) | |
configure.ac: regroup statements and comment
Add missing AC_CONFIG_SRCDIR([Makefile.am])
Move AC_USE_SYSTEM_EXTENSIONS higher up in Autoconf init section
which must come before XORG_DEFAULT_OPTIONS
Move XORG_DEFAULT_OPTIONS to its usual place with X.Org macros
Note that AC_FUNC_STRNLEN calls AC_REQUIRE(AC_USE_SYSTEM_EXTENSIONS)
Comment the strnlen function replacement.
http://pubs.opengroup.org/onlinepubs/9699919799/functions/strlen.html
No functional changes. Following the layout in
http://www.x.org/wiki/NewModuleGuidelines
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 0ac554e..2f9c369 100644 --- a/configure.ac +++ b/configure.ac @@ -21,10 +21,15 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xlsclients], [1.1.2], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - [xlsclients]) + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xlsclients]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([config.h]) +AC_USE_SYSTEM_EXTENSIONS + +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE @@ -32,19 +37,15 @@ AM_MAINTAINER_MODE m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS -AC_CONFIG_HEADERS([config.h]) - -# Check for functional strnlen -AC_USE_SYSTEM_EXTENSIONS +# Use POSIX strnlen or the implementation supplied in this module AC_FUNC_STRNLEN if test "x$ac_cv_func_strnlen_working" = xyes; then AC_DEFINE(HAVE_STRNLEN, 1, [Define to 1 if you have a working strnlen function.]) fi -XORG_DEFAULT_OPTIONS - -# Checks for pkg-config packages +# Obtain compiler/linker options for xlsclients dependencies PKG_CHECK_MODULES(XLSCLIENTS, xcb >= 1.6) AC_CONFIG_FILES([ |