RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (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.
This commit is contained in:
Darren Tucker 2009-09-01 18:26:00 +10:00
parent 427adf1538
commit dad48e7a96
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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.

13
configure.ac
View File

@ -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)