Change again to handle mising gssapi_krb5.h file. This time fix corre…

…lates to QAS bug# 308185. vas-config was fixed to return the correct include paths needed to find gssapi_krb5.h and other gssapi headers.

configure.ac

@@ -89,7 +89,7 @@ else
 fi
 
 AC_MSG_CHECKING([what the Apache version is])
-apache_version=$(`$APXS -q SBINDIR`/`$APXS -q TARGET` -V | grep '^Server version' | cut -d/ -f2)
+apache_version=$(`$APXS -q SBINDIR`/`$APXS -q TARGET` -v | grep '^Server version' | cut -d/ -f2)
 AC_MSG_RESULT([$apache_version])
 APACHE_MAJOR_VERSION=`echo $apache_version | cut -d. -f1`
 APACHE_MINOR_VERSION=`echo $apache_version | cut -d. -f2`
@@ -333,8 +333,8 @@ fi
 if test -n "$APR_CONFIG"; then
     APR_INCLUDES=`$APR_CONFIG --includes`
     APR_LIBS=`$APR_CONFIG --link-libtool --libs`
-    APR_CFLAGS=`$APR_CONFIG --cflags`
-    APR_CPPFLAGS=`$APR_CONFIG --cppflags`
+    APR_CFLAGS=`$APR_CONFIG --cflags --includes`
+    APR_CPPFLAGS=`$APR_CONFIG --cppflags --includes`
     APR_LDFLAGS=`$APR_CONFIG --ldflags`
 fi
 
@@ -403,8 +403,8 @@ AC_SUBST([VAS_LIBS])
 
 # Try vasapi functions
 LIBS_save="$LIBS"
-CFLAGS="$CFLAGS $VAS_CFLAGS $APXS_CFLAGS" LIBS="$LIBS $VAS_LIBS"
-CPPFLAGS="$CPPFLAGS $APXS_CPPFLAGS" LIBS="$LIBS $VAS_LIBS"
+CFLAGS="$CFLAGS $VAS_CFLAGS $APXS_CFLAGS $APR_INCLUDES" LIBS="$LIBS $VAS_LIBS"
+CPPFLAGS="$CPPFLAGS $APXS_CPPFLAGS $APR_INCLUDES" LIBS="$LIBS $VAS_LIBS"
 AC_CHECK_FUNC([vas_ctx_alloc],,[
 	       # Prevent the cached "no" being reused
 	       $as_unset ac_cv_func_vas_ctx_alloc

mod_auth_vas4.c

@@ -45,7 +45,7 @@
 
 #include <vas.h>
 #include <vas_gss.h>
-#include <gssapi/gssapi_krb5.h>
+#include <gssapi_krb5.h>
 #include <pwd.h>
 
 #include <httpd.h>