Clear wrapper CPPFLAGS before populating

The wrapper compiler infrastructure enforces using
OPAL_WRAPPER_FLAGS_ADD rather than modifying environment variables
directly, in part by overwriting the values of
{OPAL,OMPI}_WRAPPER_EXTRA_<flag> before using.  The
WRAPPER_EXTRA_CPPFLAGS variable was not properly cleared in the case
where install headers were not installed, so properly initialize them.

Signed-off-by: Brian Barrett <bbarrett@amazon.com>
(cherry picked from commit bab5d2d)

Author: bwbarrett

config/opal_setup_wrappers.m4

@@ -340,6 +340,8 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
        AC_MSG_CHECKING([for OPAL CPPFLAGS])
        if test "$WANT_INSTALL_HEADERS" = "1" ; then
            OPAL_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi'
+       else
+           OPAL_WRAPPER_EXTRA_CPPFLAGS=
        fi
        OPAL_WRAPPER_EXTRA_CPPFLAGS="$OPAL_WRAPPER_EXTRA_CPPFLAGS $opal_mca_wrapper_extra_cppflags $wrapper_extra_cppflags $with_wrapper_cppflags"
        AC_SUBST([OPAL_WRAPPER_EXTRA_CPPFLAGS])
@@ -391,6 +393,8 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
        AC_MSG_CHECKING([for OMPI CPPFLAGS])
        if test "$WANT_INSTALL_HEADERS" = "1" ; then
            OMPI_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi'
+       else
+           OPAL_WRAPPER_EXTRA_CPPFLAGS=
        fi
        OMPI_WRAPPER_EXTRA_CPPFLAGS="$OMPI_WRAPPER_EXTRA_CPPFLAGS $ompi_mca_wrapper_extra_cppflags $wrapper_extra_cppflags $with_wrapper_cppflags"
        AC_SUBST([OMPI_WRAPPER_EXTRA_CPPFLAGS])