From e09bbb49a993d2c19e03e284ab4c08c33a3def4c Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 14 Oct 2010 22:39:48 +0000 Subject: [PATCH] No need to have this AC_ARG_WITH in every component configure.m4 -- just put it up in the framework-level configure.m4. This commit was SVN r23890. --- opal/mca/timer/aix/configure.m4 | 4 ---- opal/mca/timer/altix/configure.m4 | 4 ---- opal/mca/timer/catamount/configure.m4 | 4 ---- opal/mca/timer/configure.m4 | 6 ++++++ opal/mca/timer/darwin/configure.m4 | 4 ---- opal/mca/timer/linux/configure.m4 | 4 ---- opal/mca/timer/solaris/configure.m4 | 4 ---- opal/mca/timer/windows/configure.m4 | 4 ---- 8 files changed, 6 insertions(+), 28 deletions(-) diff --git a/opal/mca/timer/aix/configure.m4 b/opal/mca/timer/aix/configure.m4 index 0c744fa570..6820de5775 100644 --- a/opal/mca/timer/aix/configure.m4 +++ b/opal/mca/timer/aix/configure.m4 @@ -33,10 +33,6 @@ AC_DEFUN([MCA_opal_timer_aix_COMPILE_MODE], [ AC_DEFUN([MCA_opal_timer_aix_CONFIG],[ AC_CONFIG_FILES([opal/mca/timer/aix/Makefile]) - AC_ARG_WITH([timer], - [AC_HELP_STRING([--with-timer=TYPE], - [Build high resolution timer component TYPE])]) - AS_IF([test "$with_timer" = "aix"], [timer_aix_happy="yes" timer_aix_should_use=1], diff --git a/opal/mca/timer/altix/configure.m4 b/opal/mca/timer/altix/configure.m4 index 761da119a4..3c67fb8e31 100644 --- a/opal/mca/timer/altix/configure.m4 +++ b/opal/mca/timer/altix/configure.m4 @@ -32,10 +32,6 @@ AC_DEFUN([MCA_opal_timer_altix_COMPILE_MODE], [ AC_DEFUN([MCA_opal_timer_altix_CONFIG],[ AC_CONFIG_FILES([opal/mca/timer/altix/Makefile]) - AC_ARG_WITH([timer], - [AC_HELP_STRING([--with-timer=TYPE], - [Build high resolution timer component TYPE])]) - AS_IF([test "$with_timer" = "altix"], [timer_altix_happy="yes" timer_altix_should_use=1], diff --git a/opal/mca/timer/catamount/configure.m4 b/opal/mca/timer/catamount/configure.m4 index 135e6c4bf7..25b1cb88bb 100644 --- a/opal/mca/timer/catamount/configure.m4 +++ b/opal/mca/timer/catamount/configure.m4 @@ -32,10 +32,6 @@ AC_DEFUN([MCA_opal_timer_catamount_COMPILE_MODE], [ AC_DEFUN([MCA_opal_timer_catamount_CONFIG],[ AC_CONFIG_FILES([opal/mca/timer/catamount/Makefile]) - AC_ARG_WITH([timer], - [AC_HELP_STRING([--with-timer=TYPE], - [Build high resolution timer component TYPE])]) - AS_IF([test "$with_timer" = "catamount"], [timer_catamount_happy="yes" timer_catamount_should_use=1], diff --git a/opal/mca/timer/configure.m4 b/opal/mca/timer/configure.m4 index 081f75afef..6813c75bce 100644 --- a/opal/mca/timer/configure.m4 +++ b/opal/mca/timer/configure.m4 @@ -10,6 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. +dnl Copyright (c) 2010 Cisco Systems, Inc. All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -23,6 +24,11 @@ m4_define(MCA_opal_timer_CONFIGURE_MODE, STOP_AT_FIRST) AC_DEFUN([MCA_opal_timer_CONFIG],[ timer_base_include= + # All components look at this value + AC_ARG_WITH([timer], + [AC_HELP_STRING([--with-timer=TYPE], + [Build high resolution timer component TYPE])]) + # first, compile all the components MCA_CONFIGURE_FRAMEWORK($1, $2, 1) diff --git a/opal/mca/timer/darwin/configure.m4 b/opal/mca/timer/darwin/configure.m4 index 21ef28aaea..c35e894af6 100644 --- a/opal/mca/timer/darwin/configure.m4 +++ b/opal/mca/timer/darwin/configure.m4 @@ -32,10 +32,6 @@ AC_DEFUN([MCA_opal_timer_darwin_COMPILE_MODE], [ AC_DEFUN([MCA_opal_timer_darwin_CONFIG],[ AC_CONFIG_FILES([opal/mca/timer/darwin/Makefile]) - AC_ARG_WITH([timer], - [AC_HELP_STRING([--with-timer=TYPE], - [Build high resolution timer component TYPE])]) - AS_IF([test "$with_timer" = "darwin"], [timer_darwin_happy="yes" timer_darwin_should_use=1], diff --git a/opal/mca/timer/linux/configure.m4 b/opal/mca/timer/linux/configure.m4 index 07ff1348cb..a4f9eebfaa 100644 --- a/opal/mca/timer/linux/configure.m4 +++ b/opal/mca/timer/linux/configure.m4 @@ -32,10 +32,6 @@ AC_DEFUN([MCA_opal_timer_linux_COMPILE_MODE], [ AC_DEFUN([MCA_opal_timer_linux_CONFIG],[ AC_CONFIG_FILES([opal/mca/timer/linux/Makefile]) - AC_ARG_WITH([timer], - [AC_HELP_STRING([--with-timer=TYPE], - [Build high resolution timer component TYPE])]) - AS_IF([test "$with_timer" = "linux"], [timer_linux_happy="yes" timer_linux_should_use=1], diff --git a/opal/mca/timer/solaris/configure.m4 b/opal/mca/timer/solaris/configure.m4 index 0d1a0b1f2b..d6fb21ce47 100644 --- a/opal/mca/timer/solaris/configure.m4 +++ b/opal/mca/timer/solaris/configure.m4 @@ -32,10 +32,6 @@ AC_DEFUN([MCA_opal_timer_solaris_COMPILE_MODE], [ AC_DEFUN([MCA_opal_timer_solaris_CONFIG],[ AC_CONFIG_FILES([opal/mca/timer/solaris/Makefile]) - AC_ARG_WITH([timer], - [AC_HELP_STRING([--with-timer=TYPE], - [Build high resolution timer component TYPE])]) - AS_IF([test "$with_timer" = "solaris"], [timer_solaris_happy="yes" timer_solaris_should_use=1], diff --git a/opal/mca/timer/windows/configure.m4 b/opal/mca/timer/windows/configure.m4 index 49cb8232e7..fa5ee346e6 100644 --- a/opal/mca/timer/windows/configure.m4 +++ b/opal/mca/timer/windows/configure.m4 @@ -32,10 +32,6 @@ AC_DEFUN([MCA_opal_timer_windows_COMPILE_MODE], [ AC_DEFUN([MCA_opal_timer_windows_CONFIG],[ AC_CONFIG_FILES([opal/mca/timer/windows/Makefile]) - AC_ARG_WITH([timer], - [AC_HELP_STRING([--with-timer=TYPE], - [Build high resolution timer component TYPE])]) - AS_IF([test "$with_timer" = "windows"], [timer_windows_happy="yes" timer_windows_should_use=1],