summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-01-13 21:58:02 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-01-13 22:00:06 -0800
commit48d08f09e36d4aa8e02812874794937d7c778b43 (patch)
tree5d973cda080d4caecb40fe5f922bf94d71be5e1c
parent066032e08407311cfc24dbc1db3245cf8133ad94 (diff)
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Regroup AC statements under the Autoconf initialization section. Regroup AM statements under the Automake initialization section. Add missing AC_CONFIG_SRCDIR Replace obsolete argument to AC_OUTPUT with AC_CONFIG_FILES Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac11
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 47cd733..873a514 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,9 +22,14 @@ dnl DEALINGS IN THE SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
+# Initialize Autoconf
AC_PREREQ([2.60])
+AC_INIT([libpciaccess],[0.12.0],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess],[libpciaccess])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
-AC_INIT(libpciaccess, 0.12.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=libpciaccess], libpciaccess)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -33,7 +38,6 @@ m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
@@ -122,9 +126,10 @@ AC_SUBST(PCIACCESS_CFLAGS)
AC_SUBST(PCIACCESS_LIBS)
-AC_OUTPUT([Makefile
+AC_CONFIG_FILES([Makefile
include/Makefile
man/Makefile
src/Makefile
scanpci/Makefile
pciaccess.pc])
+AC_OUTPUT