From d44eb8a024899dafdcdef2ac3cead61e6e6a7711 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Sat, 24 Oct 2015 13:25:12 -0700
Subject: [PATCH] configury: fix autogen.pl --no-ompi

The Makefile.ompi-rules trim options previously used AM_CONDITIONALs
that were defined only when the OMPI project was configured.  Hence,
if you ran "autogen.pl --no-ompi", autogen would fail with lots of
messages about undefined AM_CONDITIONALs.

This commit makes new AM_CONDITIONALs outside of the project
configuration that can be safely used elsewhere.
---
 Makefile.ompi-rules |  8 ++++----
 configure.ac        | 12 ++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Makefile.ompi-rules b/Makefile.ompi-rules
index 007875ec93..118ee80843 100644
--- a/Makefile.ompi-rules
+++ b/Makefile.ompi-rules
@@ -1,5 +1,5 @@
 # -*- makefile -*-
-# Copyright (c) 2008-2014 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2008-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
 # $COPYRIGHT$
 #
@@ -9,13 +9,13 @@
 #
 
 TRIM_OPTIONS=
-if ! OMPI_BUILD_MPI_CXX_BINDINGS
+if ! MAN_PAGE_BUILD_MPI_CXX_BINDINGS
     TRIM_OPTIONS += --nocxx
 endif
-if ! OMPI_BUILD_FORTRAN_MPIFH_BINDINGS
+if ! MAN_PAGE_BUILD_MPIFH_BINDINGS
     TRIM_OPTIONS += --nofortran
 endif
-if ! OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS
+if ! MAN_PAGE_BUILD_USEMPIF08_BINDINGS
     TRIM_OPTIONS += --nof08
 endif
 
diff --git a/configure.ac b/configure.ac
index f27fe9a712..1d754232d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -502,8 +502,12 @@ OPAL_CHECK_OFFSETOF
 # sets up the C++ MPI bindings, etc.).  Perhaps it was moved to OPAL
 # just on the rationale that all compiler setup should be done in
 # OPAL...?  Shrug.
+WANT_MPI_CXX_SUPPORT=0
 m4_ifdef([project_ompi], [OPAL_SETUP_CXX
                           OMPI_SETUP_CXX])
+# Used in Makefile.ompi-rules
+AM_CONDITIONAL(MAN_PAGE_BUILD_MPI_CXX_BINDINGS,
+               [test "$WANT_MPI_CXX_SUPPORT" = 1])
 
 ##################################
 # Only after setting up both
@@ -547,8 +551,16 @@ OPAL_CONFIG_ASM
 # Fortran
 ##################################
 
+OMPI_BUILD_FORTRAN_BINDINGS=0
+
 m4_ifdef([project_ompi], [OMPI_SETUP_MPI_FORTRAN], [ompi_fortran_happy=0])
 
+# Used in Makefile.ompi-rules
+AM_CONDITIONAL(MAN_PAGE_BUILD_MPIFH_BINDINGS,
+              [test $OMPI_BUILD_FORTRAN_BINDINGS -gt $OMPI_FORTRAN_NO_BINDINGS])
+AM_CONDITIONAL(MAN_PAGE_BUILD_USEMPIF08_BINDINGS,
+              [test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS])
+
 AM_CONDITIONAL(OSHMEM_BUILD_FORTRAN_BINDINGS,
     [test "$enable_oshmem" = "yes" && \
      test "$ompi_fortran_happy" = "1" && \