From 675a2f5c4820d26c299bfd06d42abe4b200d6dc1 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 11 Jan 2013 20:20:02 +0000 Subject: [PATCH] Updates for Automake 1.13.x. Without these changes, Automake 1.13.x will error out, due to use of the previously-deprecated-and-now-removed AM_CONFIG_HEADER macro. This commit was SVN r27790. --- configure.ac | 8 ++++---- ompi/contrib/vt/vt/configure.ac | 2 +- ompi/contrib/vt/vt/extlib/otf/configure.ac | 2 +- ompi/mca/io/romio/romio/configure.in | 5 +++-- opal/mca/event/libevent2019/libevent/configure.in | 9 ++++++--- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 379747bce2..002e780b11 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# * Copyright (c) 2006-2012 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2006-2013 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2006-2008 Sun Microsystems, Inc. All rights reserved. # Copyright (c) 2006-2011 Los Alamos National Security, LLC. All rights # reserved. @@ -155,11 +155,11 @@ AC_MSG_RESULT([$ltversion]) # List header files to generate -AM_CONFIG_HEADER([opal/include/opal_config.h]) +AC_CONFIG_HEADERS([opal/include/opal_config.h]) m4_ifdef([project_orte], - [AM_CONFIG_HEADER([orte/include/orte_config.h])]) + [AC_CONFIG_HEADERS([orte/include/orte_config.h])]) m4_ifdef([project_ompi], - [AM_CONFIG_HEADER([ompi/include/ompi_config.h ompi/include/mpi.h])]) + [AC_CONFIG_HEADERS([ompi/include/ompi_config.h ompi/include/mpi.h])]) # override/fixup the version numbers set by AC_INIT, since on # developer builds, there's no good way to know what the version is diff --git a/ompi/contrib/vt/vt/configure.ac b/ompi/contrib/vt/vt/configure.ac index 5db3577deb..11fd81b8c5 100644 --- a/ompi/contrib/vt/vt/configure.ac +++ b/ompi/contrib/vt/vt/configure.ac @@ -6,7 +6,7 @@ AC_INIT([VampirTrace], [m4_normalize(esyscmd([cat VERSION]))], [vampirsupport@zi AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR(config/m4) AM_INIT_AUTOMAKE([foreign]) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS(config.h) # If Automake supports silent rules, enable them. m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/ompi/contrib/vt/vt/extlib/otf/configure.ac b/ompi/contrib/vt/vt/extlib/otf/configure.ac index 1003d4417d..3a3c397739 100644 --- a/ompi/contrib/vt/vt/extlib/otf/configure.ac +++ b/ompi/contrib/vt/vt/extlib/otf/configure.ac @@ -9,7 +9,7 @@ AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR(config/m4) AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE([foreign]) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) # If Automake supports silent rules, enable them. m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/ompi/mca/io/romio/romio/configure.in b/ompi/mca/io/romio/romio/configure.in index 0c54b4ab5e..d23c30ed53 100644 --- a/ompi/mca/io/romio/romio/configure.in +++ b/ompi/mca/io/romio/romio/configure.in @@ -20,7 +20,8 @@ AC_PREREQ(2.59) # if this blows up, it's because you forgot to run autoheader -AC_INIT(adio/include/romioconf.h.in) +# Open MPI: changed to 4 arg AC INIT +AC_INIT([romio], [Open MPI 1.2.6], [http://www.mpich.org], [romio]) # VERSION=1.2.6 # AC_MSG_RESULT([Configuring ROMIO Version $VERSION]) CONFIGURE_ARGS="$*" @@ -207,7 +208,7 @@ AC_CONFIG_AUX_DIR(confdb) PAC_PROG_MAKE # Open MPI: Init automake -AM_INIT_AUTOMAKE(io-romio, 1.2.6, 'no') +AM_INIT_AUTOMAKE([foreign]) # Open MPI: If Automake supports silent rules, enable them. m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/opal/mca/event/libevent2019/libevent/configure.in b/opal/mca/event/libevent2019/libevent/configure.in index 2d590a5e76..8f415b46f8 100644 --- a/opal/mca/event/libevent2019/libevent/configure.in +++ b/opal/mca/event/libevent2019/libevent/configure.in @@ -7,12 +7,15 @@ dnl dnl Original version Dug Song AC_PREREQ(2.59c) -AC_INIT(event.c) +# Open MPI: changed to 4 arg AC INIT +AC_INIT([libevent], [2.0.19-stable], [http://libevent.org], [libevent]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE(libevent,2.0.19-stable) -AM_CONFIG_HEADER(config.h) +# Open MPI: changed to one 1 arg AM INIT_AUTOMAKE +AM_INIT_AUTOMAKE([foreign]) +# Open MPI: changed AM CONFIG_HEADER to AC CONFIG_HEADERS +AC_CONFIG_HEADERS(config.h) AC_DEFINE(NUMERIC_VERSION, 0x02001300, [Numeric representation of the version]) dnl Initialize prefix.