diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-02-24 10:37:33 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-02-24 10:37:33 +1100 |
commit | 0d27ed1c19d6de6bd50ab1f5096aee1c1ee97f69 (patch) | |
tree | 96bf92158b339f80c990b2f52e536781912dc8bf /configure.ac | |
parent | a6ea420c38160bf06f97bd6169597594dabee982 (diff) |
- (dtucker) [configure.ac gss-serv-krb5.c ssh-gss.h] Define GSSAPI when found
with krb5-config, hunt down gssapi.h and friends. Based partially on patch
from deengert at anl.gov.
For the MIT Kerberos bug against krb5-config related to this see:
http://krbdev.mit.edu/rt/Ticket/Display.html?id=2240
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 15bb53322..3769a739e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.200 2004/02/22 00:37:48 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.201 2004/02/23 23:37:33 dtucker Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -2084,18 +2084,15 @@ AC_ARG_WITH(kerberos5, | |||
2084 | AC_MSG_CHECKING(for gssapi support) | 2084 | AC_MSG_CHECKING(for gssapi support) |
2085 | if $KRB5CONF | grep gssapi >/dev/null ; then | 2085 | if $KRB5CONF | grep gssapi >/dev/null ; then |
2086 | AC_MSG_RESULT(yes) | 2086 | AC_MSG_RESULT(yes) |
2087 | K5CFLAGS="`$KRB5CONF --cflags gssapi`" | 2087 | AC_DEFINE(GSSAPI) |
2088 | dnl m4 quadragraphs: "sed 's/-l[^ ]* //g'" | 2088 | k5confopts=gssapi |
2089 | K5LDFLAGS="`$KRB5CONF --libs gssapi | sed 's/-l@<:@^ @:>@* //g'`" | ||
2090 | K5LIBS="`$KRB5CONF --libs gssapi | sed 's/-L@<:@^ @:>@* //g'`" | ||
2091 | else | 2089 | else |
2092 | AC_MSG_RESULT(no) | 2090 | AC_MSG_RESULT(no) |
2093 | K5CFLAGS="`$KRB5CONF --cflags`" | 2091 | k5confopts="" |
2094 | K5LDFLAGS="`$KRB5CONF --libs | sed 's/-l@<:@^ @:>@* //g'`" | ||
2095 | K5LIBS="`$KRB5CONF --libs | sed 's/-L@<:@^ @:>@* //g'`" | ||
2096 | fi | 2092 | fi |
2093 | K5CFLAGS="`$KRB5CONF --cflags $k5confopts`" | ||
2094 | K5LIBS="`$KRB5CONF --libs $k5confopts`" | ||
2097 | CPPFLAGS="$CPPFLAGS $K5CFLAGS" | 2095 | CPPFLAGS="$CPPFLAGS $K5CFLAGS" |
2098 | LDFLAGS="$LDFLAGS $K5LDFLAGS" | ||
2099 | AC_MSG_CHECKING(whether we are using Heimdal) | 2096 | AC_MSG_CHECKING(whether we are using Heimdal) |
2100 | AC_TRY_COMPILE([ #include <krb5.h> ], | 2097 | AC_TRY_COMPILE([ #include <krb5.h> ], |
2101 | [ char *tmp = heimdal_version; ], | 2098 | [ char *tmp = heimdal_version; ], |
@@ -2152,14 +2149,16 @@ AC_ARG_WITH(kerberos5, | |||
2152 | if test ! -z "$blibpath" ; then | 2149 | if test ! -z "$blibpath" ; then |
2153 | blibpath="$blibpath:${KRB5ROOT}/lib" | 2150 | blibpath="$blibpath:${KRB5ROOT}/lib" |
2154 | fi | 2151 | fi |
2155 | fi ] | 2152 | fi |
2156 | AC_SEARCH_LIBS(k_hasafs, kafs, | 2153 | |
2157 | [ AC_DEFINE(USE_AFS) | 2154 | AC_CHECK_HEADERS(gssapi.h gssapi/gssapi.h) |
2158 | K5LIBS="-lkafs $K5LIBS" | 2155 | AC_CHECK_HEADERS(gssapi_krb5.h gssapi/gssapi_krb5.h) |
2159 | ] | 2156 | AC_CHECK_HEADERS(gssapi_generic.h gssapi/gssapi_generic.h) |
2160 | ) | 2157 | |
2158 | LIBS="$LIBS $K5LIBS" | ||
2159 | AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS)) | ||
2160 | ] | ||
2161 | ) | 2161 | ) |
2162 | LIBS="$LIBS $K5LIBS" | ||
2163 | 2162 | ||
2164 | # Looking for programs, paths and files | 2163 | # Looking for programs, paths and files |
2165 | 2164 | ||