Require -D_REENTRANT flag for both CFLAGS and CPPFLAGS if building under Solaris

config/ompi_setup_java.m4

@@ -89,8 +89,6 @@ AC_DEFUN([OMPI_SETUP_JAVA_BINDINGS],[
            AC_MSG_WARN([*** the Java MPI bindings in Open MPI is contingent])
            AC_MSG_WARN([*** upon user interest and developer support.])
            AC_MSG_WARN([******************************************************])
-           CFLAGS="$CFLAGS -D_REENTRANT"
-           CPPFLAGS="$CPPFLAGS -D_REENTRANT"
           ])
 
     AC_CONFIG_FILES([

config/opal_check_os_flavors.m4

@@ -1,6 +1,7 @@
 dnl -*- shell-script -*-
 dnl
 dnl Copyright (c) 2010     Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2014     Intel, Inc. All rights reserved.
 dnl
 dnl $COPYRIGHT$
 dnl
@@ -44,7 +45,9 @@ AC_DEFUN([OPAL_CHECK_OS_FLAVORS],
     OPAL_CHECK_OS_FLAVOR_SPECIFIC([__sun__], [sun])
 
     AS_IF([test "$opal_found_sun" = "yes"],
-          [opal_have_solaris=1],
+          [opal_have_solaris=1
+           CFLAGS="$CFLAGS -D_REENTRANT"
+           CPPFLAGS="$CPPFLAGS -D_REENTRANT"],
           [opal_have_solaris=0])
     AC_DEFINE_UNQUOTED([OPAL_HAVE_SOLARIS],
                        [$opal_have_solaris],