diff options
author | Jörg Mayer <jmayer@loplof.de> | 2004-05-13 22:09:52 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2004-05-13 22:09:52 +0000 |
commit | 47b8d71aecaec4be6ad8efadc2f8cf731b499b39 (patch) | |
tree | d115d7583830a2195e61865e8ceb022e02a18d1d /acinclude.m4 | |
parent | d5b62ad1e0fc3411644c0cba9ca47dcd8311b968 (diff) | |
download | wireshark-47b8d71aecaec4be6ad8efadc2f8cf731b499b39.tar.gz wireshark-47b8d71aecaec4be6ad8efadc2f8cf731b499b39.tar.bz2 wireshark-47b8d71aecaec4be6ad8efadc2f8cf731b499b39.zip |
Fix --with-krb5 when given a directory
svn path=/trunk/; revision=10881
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 18b0238378..e9b75d4911 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2,7 +2,7 @@ dnl Macros that test for specific features. dnl This file is part of the Autoconf packaging for Ethereal. dnl Copyright (C) 1998-2000 by Gerald Combs. dnl -dnl $Id: acinclude.m4,v 1.73 2004/05/13 16:57:43 jmayer Exp $ +dnl $Id: acinclude.m4,v 1.74 2004/05/13 22:09:52 jmayer Exp $ dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by @@ -882,8 +882,7 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK], #LIBS="$LIBS -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lresolv" ethereal_save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$krb5_dir/lib" - # XXX: we should find a way to determine ac_krb5_version, - # otherwise we'll bail later + ac_krb5_version=`grep -i heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/i'` else AC_PATH_PROG(KRB5_CONFIG, krb5-config) if test -x $KRB5_CONFIG |