summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-02-02 11:43:45 -0500
committerGaetan Nadon <memsize@videotron.ca>2011-02-03 16:58:00 -0500
commitad5a4792e35b63c5b193f09303bcc41b322750d0 (patch)
tree389999735e2e8edcf5cb0e0d6200bd9aaf04e14d
parent97d7aa6c8108800d3ccd30ce907ef32e769370a9 (diff)
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout Quote statements where appropriate. Autoconf recommends not using dnl instead of # for comments Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters. Add AC_CONFIG_SRCDIR([Makefile.am]) This helps automated maintenance and release activities. Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
-rw-r--r--configure.ac31
1 files changed, 17 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index 6578e7b..a02451e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,27 +1,30 @@
-AC_PREREQ([2.60])
+# Initialize Autoconf
+AC_PREREQ([2.60])
AC_INIT([libXxf86vm], [1.1.1],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- [libXxf86vm])
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXxf86vm])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS(src/config.h)
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Initialize libtool
+AC_PROG_LIBTOOL
+
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
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(src/config.h)
-
-# Check for progs
-AC_PROG_LIBTOOL
+XORG_CHECK_MALLOC_ZERO
-# Checks for pkg-config packages
+# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext [xf86vidmodeproto >= 2.2.99.1])
-XORG_CHECK_MALLOC_ZERO
-
-AC_OUTPUT([Makefile
- src/Makefile
- man/Makefile
- xxf86vm.pc])
+AC_CONFIG_FILES([Makefile
+ src/Makefile
+ man/Makefile
+ xxf86vm.pc])
+AC_OUTPUT