[PATCH app-xfs 1/2] config: AC_USE_SYSTEM_EXTENSIONS must be before any compiler stmt.
Gaetan Nadon
memsize at videotron.ca
Wed Mar 31 13:45:43 PDT 2010
Reorder the initialization section at the top of the file.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
configure.ac | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/configure.ac b/configure.ac
index 29aa0f2..9a4564b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,33 +20,36 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
+# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT(xfs,[1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xfs)
+AC_INIT([xfs],
+ [1.1.0],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [xfs])
+# 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)
+AC_USE_SYSTEM_EXTENSIONS
+# xfs already have a header called config.h
+AC_CONFIG_HEADERS([xfs-config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# xfs already have a header called config.h
-AM_CONFIG_HEADER(xfs-config.h)
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_INSTALL
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Initialize X.Org macros
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.6 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.6)
+XORG_DEFAULT_OPTIONS
XORG_ENABLE_DEVEL_DOCS
XORG_WITH_XMLTO(0.0.20)
XORG_WITH_FOP
-
-# 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
-
-AC_PROG_CC
XORG_PROG_RAWCPP
-AC_PROG_INSTALL
-AC_CANONICAL_HOST
-
-XORG_DEFAULT_OPTIONS
+XORG_WITH_LINT
AC_CHECK_HEADERS([stdint.h])
@@ -127,7 +130,4 @@ AC_SUBST(XFS_LIBS)
# Transport selection macro from xtrans.m4
XTRANS_CONNECTION_FLAGS
-dnl Allow checking code with lint, sparse, etc.
-XORG_WITH_LINT
-
AC_OUTPUT([Makefile])
--
1.6.0.4
More information about the xorg-devel
mailing list