2 files changed, 9 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index aa9e26c22..e150ef6f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20040218
+ - (dtucker) [configure.ac] Handle case where krb5-config --libs returns a
+   path with a "-" in it.  From Sergio.Gelato at astro.su.se.
+
 20040217
  - (djm) Simplify the license on code I have written. No code changes.
  - (djm) OpenBSD CVS Sync
@@ -1866,4 +1870,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3233 2004/02/17 12:20:07 dtucker Exp $
+$Id: ChangeLog,v 1.3234 2004/02/18 00:21:12 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 6b1c3137f..601cd7537 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.198 2004/02/12 17:27:21 tim Exp $
+# $Id: configure.ac,v 1.199 2004/02/18 00:21:12 dtucker Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -2085,9 +2085,9 @@ AC_ARG_WITH(kerberos5,
                         if $KRB5CONF | grep gssapi >/dev/null ; then
                                 AC_MSG_RESULT(yes)
                                 K5CFLAGS="`$KRB5CONF --cflags gssapi`"
-                                dnl  m4 quadragraphs: "sed 's/-l[^- ]*//g'"
-                                K5LDFLAGS="`$KRB5CONF --libs gssapi | sed 's/-l@<:@^- @:>@*//g'`"
-                                K5LIBS="`$KRB5CONF --libs gssapi | sed 's/-L@<:@^- @:>@*//g'`"
+                                dnl  m4 quadragraphs: "sed 's/-l[^ ]* //g'"
+                                K5LDFLAGS="`$KRB5CONF --libs gssapi | sed 's/-l@<:@^ @:>@* //g'`"
+                                K5LIBS="`$KRB5CONF --libs gssapi | sed 's/-L@<:@^ @:>@* //g'`"
                         else
                                 AC_MSG_RESULT(no)
                                 K5CFLAGS="`$KRB5CONF --cflags`"