config: replace AC_OUTPUT etc.

configure.ac

@@ -3,7 +3,7 @@
 ##     See COPYRIGHT in top-level directory
 ##
 
-AC_PREREQ(2.63)
+AC_PREREQ([2.69])
 
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -201,7 +201,7 @@ fi
 echo "Running on system: `uname -a`"
 
 dnl Definitions will be placed in this file rather than in the DEFS variable
-AC_CONFIG_HEADER(src/include/mpichconf.h)
+AC_CONFIG_HEADERS([src/include/mpichconf.h])
 AH_TOP([/*
  * Copyright (C) by Argonne National Laboratory
  *     See COPYRIGHT in top-level directory
@@ -5312,7 +5312,7 @@ fi
 
 dnl This includes an experimental pkgconfig file for ch3 in the src/pkgconfig
 dnl directory
-AC_OUTPUT(Makefile \
+AC_CONFIG_FILES([Makefile \
           examples/Makefile \
           test/Makefile \
           test/commands/Makefile \
@@ -5345,7 +5345,8 @@ AC_OUTPUT(Makefile \
           doc/installguide/Makefile \
           doc/refman/Makefile \
           doc/userguide/Makefile \
-          test/commands/cmdtests)
+          test/commands/cmdtests])
+AC_OUTPUT
 
 if test ${device_name} = "ch4" ; then
 cat <<EOF

maint/sampleconf.in

@@ -7,7 +7,7 @@ dnl The file name here refers to a file in the source being configured
 AC_INIT(pick a local file)
 dnl
 dnl Definitions will be placed in this file rather than in the DEFS variable
-AC_CONFIG_HEADER(pick a headef file name)
+AC_CONFIG_HEADERS([pick a headef file name])
 dnl
 dnl Set the directory that contains support scripts such as install-sh and
 dnl config.guess

src/mpi/romio/configure.ac

@@ -7,7 +7,7 @@
 # autoconf --localdir=../confdb configure.ac
 # (or wherever the confdb is)
 #
-AC_PREREQ([2.63])
+AC_PREREQ([2.69])
 
 m4_include([version.m4])
 dnl 2nd arg is intentionally underquoted
@@ -51,7 +51,7 @@ if test -n "$CONFIGURE_ARGS" ; then
     AC_MSG_NOTICE([Configuring with args $CONFIGURE_ARGS])
 fi
 
-AC_CONFIG_HEADER(adio/include/romioconf.h)
+AC_CONFIG_HEADERS([adio/include/romioconf.h])
 AH_TOP([/*
  * Copyright (C) by Argonne National Laboratory
  *     See COPYRIGHT in top-level directory

src/mpl/configure.ac

@@ -3,7 +3,7 @@
 ##     See COPYRIGHT in top-level directory
 ##
 
-AC_PREREQ(2.63)
+AC_PREREQ(2.69)
 
 AC_INIT([MPL], [0.1])
 
@@ -44,7 +44,7 @@ else
    AC_MSG_ERROR([Version information not found. Configuration aborted.])
 fi
 
-AC_CONFIG_HEADER([include/config.h])
+AC_CONFIG_HEADERS([include/config.h])
 AC_CONFIG_COMMANDS([prefix-config],[perl $srcdir/confdb/cmd_prefix_config_h.pl MPL include/config.h include/mplconfig.h])
 
 # Non-verbose make

src/pm/hydra/configure.ac

@@ -27,7 +27,7 @@ AM_INIT_AUTOMAKE([-Wall -Wno-portability-recursive -Werror foreign 1.12.3 subdir
 
 AM_PROG_AR
 
-AC_CONFIG_HEADER(include/hydra_config.h)
+AC_CONFIG_HEADERS([include/hydra_config.h])
 
 # Non-verbose make
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -659,7 +659,8 @@ if test "$ac_cv_func_gethostname" = "yes" ; then
 fi
 
 # Final output
-AC_OUTPUT(Makefile
+AC_CONFIG_FILES([Makefile
 	tools/bootstrap/src/bsci_init.c
 	hydra-doxygen.cfg
-)
+])
+AC_OUTPUT

src/pm/hydra2/configure.ac

@@ -39,7 +39,7 @@ AM_INIT_AUTOMAKE([-Wall -Wno-portability-recursive -Werror foreign 1.12.3 subdir
 
 AM_PROG_AR
 
-AC_CONFIG_HEADER(libhydra/include/hydra_config.h)
+AC_CONFIG_HEADERS([libhydra/include/hydra_config.h])
 
 # Non-verbose make
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

test/mpi/configure.ac

@@ -23,7 +23,7 @@ AC_INIT([mpich-testsuite],
         [mpich-testsuite],
         [http://www.mpich.org/])
 
-AC_CONFIG_HEADER(include/mpitestconf.h)
+AC_CONFIG_HEADERS([include/mpitestconf.h])
 AH_TOP([/*
  * Copyright (C) by Argonne National Laboratory
  *     See COPYRIGHT in top-level directory

test/mpi/dtpools/configure.ac

@@ -3,11 +3,11 @@
 ##     See COPYRIGHT in top-level directory
 ##
 
-AC_PREREQ([2.63])
+AC_PREREQ([2.69])
 AC_INIT([dtpools], [0.0], [discuss@mpich.org])
 AC_CONFIG_SRCDIR([include/dtpools.h])
 
-AC_CONFIG_HEADER(dtpoolsconf.h)
+AC_CONFIG_HEADERS([dtpoolsconf.h])
 AH_TOP([/*
  * Copyright (C) by Argonne National Laboratory
  *     See COPYRIGHT in top-level directory