diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-02-02 11:43:43 -0500 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2011-02-02 11:43:43 -0500 |
| commit | 1b376f371c2f866cd1cdf047e50210a5c69772b9 (patch) | |
| tree | 03fa62d922ff36c0455633c60e4cd62f578e919a /configure.ac | |
| parent | faff510fed9733b2860e14490d5a40d70b840eae (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.
Use AC_PROG_LIBTOOL to replace the deprecated AM_PROG_LIBTOOL
Remove redundant AC_SUBST(*_CFLAGS) and/or *_LIBS
Remove redundant AC_PROG_MAKE_SET included with AM_INIT_AUTOMAKE
Remove redundant AC_CANONICAL_HOST included in XORG_DEFAULT_OPTIONS
Add AC_CONFIG_SRCDIR([Makefile.am]) where missing
Update minimum version of util-macros to at least 1.8.
One or more of the above actions were applied
No functional configuration changes
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 19e6bc5..405cd34 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,18 @@ -dnl Process this file with autoconf to create configure. +# Initialize Autoconf AC_PREREQ([2.60]) +AC_INIT([libXi], [1.4.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXi]) +AC_CONFIG_SRCDIR([Makefile.am]) +AC_CONFIG_HEADERS([src/config.h]) -AC_INIT(libXi, 1.4.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi) +# Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Initialize libtool +AC_PROG_LIBTOOL + # Require xorg-macros minimum of 1.10 for DocBook XML documentation m4_ifndef([XORG_MACROS_VERSION], [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) @@ -16,12 +23,9 @@ XORG_WITH_XMLTO(0.0.20) XORG_WITH_FOP XORG_CHECK_SGML_DOCTOOLS(1.5) XORG_WITH_ASCIIDOC(8.4.5) -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(XI, [xproto >= 7.0.13] [x11 >= 1.2.99.1] [xextproto >= 7.0.3] [xext >= 1.0.99.1] [inputproto >= 1.9.99.902]) # Check for xmlto and asciidoc for man page conversion @@ -42,12 +46,10 @@ AM_CONDITIONAL([INSTALL_MANPAGES], [test -f "$srcdir/man/XAllowDeviceEvents.man" || \ test $have_doctools = yes]) -XORG_CHECK_MALLOC_ZERO - -AC_OUTPUT([Makefile - src/Makefile - man/Makefile - doc/Makefile - specs/Makefile - xi.pc]) - +AC_CONFIG_FILES([Makefile + src/Makefile + man/Makefile + doc/Makefile + specs/Makefile + xi.pc]) +AC_OUTPUT |