diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2009-09-01 18:26:00 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2009-09-01 18:26:00 +1000 |
| commit | dad48e7a96385f8a1bdadd9196e00cefa2a9b702 (patch) | |
| tree | 5a8f9b5d5245a512cafc258ea06e0baca9bf20c6 | |
| parent | 427adf1538d3e6e3c2ec059c52fa116942bf334a (diff) | |
- (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for
krb5-config if it's not in the location specified by --with-kerberos5.
Patch from jchadima at redhat.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 13 |
2 files changed, 11 insertions, 7 deletions
@@ -1,3 +1,8 @@ +20090901 + - (dtucker) [configure.ac] Bug #1639: use AC_PATH_PROG to search the path for + krb5-config if it's not in the location specified by --with-kerberos5. + Patch from jchadima at redhat. + 20090829 - (dtucker) [README.platform] Add text about development packages, based on text from Chris Pepper in bug #1631. diff --git a/configure.ac b/configure.ac index 00aefac2..a0b781ee 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.425 2009/08/28 05:01:20 dtucker Exp $ +# $Id: configure.ac,v 1.426 2009/09/01 08:26:00 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.425 $) +AC_REVISION($Revision: 1.426 $) AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_HEADER(config.h) @@ -3404,10 +3404,10 @@ AC_ARG_WITH(kerberos5, AC_DEFINE(KRB5, 1, [Define if you want Kerberos 5 support]) KRB5_MSG="yes" - AC_MSG_CHECKING(for krb5-config) - if test -x $KRB5ROOT/bin/krb5-config ; then - KRB5CONF=$KRB5ROOT/bin/krb5-config - AC_MSG_RESULT($KRB5CONF) + AC_PATH_PROG([KRB5CONF],[krb5-config], + [$KRB5ROOT/bin/krb5-config], + [$KRB5ROOT/bin:$PATH]) + if test -x $KRB5CONF ; then AC_MSG_CHECKING(for gssapi support) if $KRB5CONF | grep gssapi >/dev/null ; then @@ -3433,7 +3433,6 @@ AC_ARG_WITH(kerberos5, AC_MSG_RESULT(no) ) else - AC_MSG_RESULT(no) CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include" LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib" AC_MSG_CHECKING(whether we are using Heimdal) |