Tweak CPPFLAGS in patch configure.ac (not GPT version) to fix build

problem on macos.  (Basically, revert to revision 1.64.)

diff --git a/openssh/configure.ac b/openssh/configure.ac
index 92d90c8d6b3066c8abae0a373c1b74857c427522..2cccf746dc623798f3a4b2a27d598689b35f95fc 100644 (file)
--- a/openssh/configure.ac
+++ b/openssh/configure.ac
@@ -1158,6 +1158,12 @@ if test "x$gsi_path" != "xno" ; then
                 AC_MSG_ERROR(--with-globus-flavor=TYPE must specify a flavor type)
        fi
 
+       GLOBUS_INCLUDE="${gsi_path}/include/${globus_flavor_type}"
+       if test ! -d "$GLOBUS_INCLUDE" ; then
+               AC_MSG_ERROR(Cannot find Globus flavor-specific include directory: ${GLOBUS_INCLUDE})
+       fi
+       GSI_CPPFLAGS="-I${GLOBUS_INCLUDE}"
+       
        if test -x ${gsi_path}/bin/globus-makefile-header ; then
                ${gsi_path}/bin/globus-makefile-header --flavor=${globus_flavor_type} ${gsi_static} globus_gss_assist | sed 's/ = \(.*\)/="\1"/' > ./gpt_build_tmp.sh
        elif test -x ${gsi_path}/sbin/globus-makefile-header ; then
@@ -1165,7 +1171,7 @@ if test "x$gsi_path" != "xno" ; then
        else
                AC_MSG_ERROR(Cannot find globus-makefile-header: Globus installation is incomplete)
        fi
-    . ./gpt_build_tmp.sh
+       . ./gpt_build_tmp.sh
        if test -n "${need_dash_r}"; then
                GSI_LDFLAGS="-L${gsi_path}/lib -R${gsi_path}/lib"
        else
@@ -1179,7 +1185,7 @@ if test "x$gsi_path" != "xno" ; then
 
        LIBS="$LIBS $GLOBUS_LIBS $GLOBUS_PKG_LIBS"
        LDFLAGS="$LDFLAGS $GSI_LDFLAGS"
-       CPPFLAGS="$CPPFLAGS $GLOBUS_INCLUDES"
+       CPPFLAGS="$CPPFLAGS $GSI_CPPFLAGS"
 
        # test that we got the libraries OK
        AC_TRY_LINK(