From a82d957c46510d22ab90c3b17b90a7742b734b1c Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Wed, 5 Aug 2009 01:25:47 +0000
Subject: [PATCH] A few dirty tricks to ensure that section titles appear
 before their sections.

This commit was SVN r21764.
---
 config/ompi_setup_cxx.m4 |  7 ++++++-
 config/ompi_setup_f77.m4 | 14 ++++++++------
 config/ompi_setup_f90.m4 | 14 ++++++++------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/config/ompi_setup_cxx.m4 b/config/ompi_setup_cxx.m4
index d1767e7d86..afb3c0f3fd 100644
--- a/config/ompi_setup_cxx.m4
+++ b/config/ompi_setup_cxx.m4
@@ -21,13 +21,18 @@ dnl
 dnl $HEADER$
 dnl
 
+# This macro is necessary to get the title to be displayed first.  :-)
+AC_DEFUN([OMPI_SETUP_CXX_BANNER],[
+    ompi_show_subtitle "C++ compiler and preprocessor" 
+])
+
 # OMPI_SETUP_CXX()
 # ----------------
 # Do everything required to setup the C++ compiler.  Safe to AC_REQUIRE
 # this macro.
 AC_DEFUN([OMPI_SETUP_CXX],[
+    AC_REQUIRE([OMPI_SETUP_CXX_BANNER])
 
-    ompi_show_subtitle "C++ compiler and preprocessor" 
     _OMPI_SETUP_CXX_COMPILER
 
     _OMPI_CXX_CHECK_EXCEPTIONS
diff --git a/config/ompi_setup_f77.m4 b/config/ompi_setup_f77.m4
index b858fb60fb..cc4aa0481c 100644
--- a/config/ompi_setup_f77.m4
+++ b/config/ompi_setup_f77.m4
@@ -33,17 +33,19 @@ dnl  OMPI_WANT_F77_BINDINGS :
 dnl am_conditional:
 dnl  OMPI_WANT_F77_BINDINGS :
 
-# See note below about why this macro exists
+# This macro is necessary to get the title to be displayed first.  :-)
+AC_DEFUN([OMPI_SETUP_F77_BANNER],[
+    ompi_show_subtitle "Fortran 77 compiler" 
+])
+
+# This macro is necessary because PROG_FC is REQUIREd by multiple
+# places in SETUP_F90.
 AC_DEFUN([OMPI_PROG_F77],[
     AC_PROG_F77([gfortran g77 f77 xlf frt ifort pgf77 fort77 fl32 af77])
 ])
 
 AC_DEFUN([OMPI_SETUP_F77],[
-
-# Modularize this setup so that sub-configure.in scripts can use this
-# same setup code.
-
-ompi_show_subtitle "Fortran 77 compiler" 
+    AC_REQUIRE([OMPI_SETUP_F77_BANNER])
 
 #
 # Check for the compiler
diff --git a/config/ompi_setup_f90.m4 b/config/ompi_setup_f90.m4
index fd3f5b868d..d3ea7f6fe8 100644
--- a/config/ompi_setup_f90.m4
+++ b/config/ompi_setup_f90.m4
@@ -34,19 +34,21 @@ dnl  OMPI_WANT_F90_BINDINGS :
 dnl am_conditional:
 dnl  OMPI_WANT_F90_BINDINGS :
 
-# See note below about why this macro exists
+# This macro is necessary to get the title to be displayed first.  :-)
+AC_DEFUN([OMPI_SETUP_F90_BANNER],[
+    ompi_show_subtitle "Fortran 90/95 compiler" 
+])
+
+# This macro is necessary because PROG_FC is REQUIREd by multiple
+# places in SETUP_F90.
 AC_DEFUN([OMPI_PROG_FC],[
     AC_PROG_FC([gfortran f95 fort xlf95 ifort ifc efc pgf95 lf95 f90 xlf90 pgf90 epcf90])
 ])dnl
 
 AC_DEFUN([OMPI_SETUP_F90],[
+    AC_REQUIRE([OMPI_SETUP_F90_BANNER])
     AC_REQUIRE([AC_PROG_GREP])
 
-# Modularize this setup so that sub-configure.in scripts can use this
-# same setup code.
-
-ompi_show_subtitle "Fortran 90/95 compiler" 
-
 if test "$OMPI_WANT_F77_BINDINGS" = "0" ; then
     AC_MSG_WARN([*** Fortran 90/95 bindings implicitly disabled (because])
     AC_MSG_WARN([*** Fortran 77 bindings were disabled)])