- (dtucker) [Makefile.in acconfig.h auth-krb5.c auth-pam.c auth-pam.h

   configure.ac defines.h gss-serv-krb5.c session.c ssh-gss.h sshconnect1.c
   sshconnect2.c] Add Portable GSSAPI support, patch by Simon Wilkinson.

1 files changed, 27 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index 600155ccd..bbc00e703 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.142 2003/08/25 03:27:40 dtucker Exp $
+# $Id: configure.ac,v 1.143 2003/08/26 01:58:16 dtucker Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -831,6 +831,7 @@ AC_ARG_WITH(pam,
                         AC_CHECK_LIB(dl, dlopen, , )
                         AC_CHECK_LIB(pam, pam_set_item, , AC_MSG_ERROR([*** libpam missing]))
                         AC_CHECK_FUNCS(pam_getenvlist)
+                        AC_CHECK_FUNCS(pam_putenv)
 
                         disable_shadow=yes
                         PAM_MSG="yes"
@@ -1946,6 +1947,31 @@ AC_ARG_WITH(kerberos5,
                         fi
                         AC_SEARCH_LIBS(dn_expand, resolv)
 
+                        AC_CHECK_LIB(gssapi,gss_init_sec_context,
+                                [ AC_DEFINE(GSSAPI)
+                                  K5LIBS="-lgssapi $K5LIBS" ],
+                                [ AC_CHECK_LIB(gssapi_krb5,gss_init_sec_context,
+                                        [ AC_DEFINE(GSSAPI)
+                                          K5LIBS="-lgssapi_krb5 $K5LIBS" ],
+                                        AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]),
+                                        $K5LIBS)
+                                ],
+                                $K5LIBS)
+                        
+                        AC_CHECK_HEADER(gssapi.h, ,
+                                [ unset ac_cv_header_gssapi_h
+                                  CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi" 
+                                  AC_CHECK_HEADERS(gssapi.h, ,
+                                        AC_MSG_WARN([Cannot find any suitable gss-api header - build may fail])
+                                  ) 
+                                ]
+                        )
+
+                        oldCPP="$CPPFLAGS"
+                        CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
+                        AC_CHECK_HEADER(gssapi_krb5.h, ,
+                                        [ CPPFLAGS="$oldCPP" ])
+
                         KRB5=yes
                 fi
         ]