diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2013-02-22 10:43:15 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2013-02-22 10:43:15 +1100 |
| commit | a2b5a4c746871bd32a12a00548ccf1a9c3c21101 (patch) | |
| tree | b892df2e399ea394ef471ea6047dc78972aa029a | |
| parent | 964de184a8bbb85b1992176c28963f6115c780e1 (diff) | |
- (dtucker) [configure.ac] bz#2073: look for Solaris' differently-named
libgss too. Patch from Pierre Ossman, ok djm.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 10 insertions, 4 deletions
@@ -1,6 +1,8 @@ 20120222 - (dtucker) [Makefile.in configure.ac] bz#2072: don't link krb5 libs to - ssh(1) since they're not needed. Patch from Pierre Ossman. + ssh(1) since they're not needed. Patch from Pierre Ossman, ok djm. + - (dtucker) [configure.ac] bz#2073: look for Solaris' differently-named + libgss too. Patch from Pierre Ossman, ok djm. 20130221 - (tim) [regress/forward-control.sh] shell portability fix. diff --git a/configure.ac b/configure.ac index 088bcb65..6c11f0b9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.506 2013/02/21 23:40:00 dtucker Exp $ +# $Id: configure.ac,v 1.507 2013/02/21 23:43:16 dtucker Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) -AC_REVISION($Revision: 1.506 $) +AC_REVISION($Revision: 1.507 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -3675,7 +3675,11 @@ AC_ARG_WITH([kerberos5], [ AC_CHECK_LIB([gssapi], [gss_init_sec_context], [ AC_DEFINE([GSSAPI]) GSSLIBS="-lgssapi" ], - AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail])) + [ AC_CHECK_LIB([gss], [gss_init_sec_context], + [ AC_DEFINE([GSSAPI]) + GSSLIBS="-lgss" ], + AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail])) + ]) ]) AC_CHECK_HEADER([gssapi.h], , |