diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.ac | 8 |
2 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20040218 | ||
2 | - (dtucker) [configure.ac] Handle case where krb5-config --libs returns a | ||
3 | path with a "-" in it. From Sergio.Gelato at astro.su.se. | ||
4 | |||
1 | 20040217 | 5 | 20040217 |
2 | - (djm) Simplify the license on code I have written. No code changes. | 6 | - (djm) Simplify the license on code I have written. No code changes. |
3 | - (djm) OpenBSD CVS Sync | 7 | - (djm) OpenBSD CVS Sync |
@@ -1866,4 +1870,4 @@ | |||
1866 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1870 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1867 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1871 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1868 | 1872 | ||
1869 | $Id: ChangeLog,v 1.3233 2004/02/17 12:20:07 dtucker Exp $ | 1873 | $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 @@ | |||
1 | # $Id: configure.ac,v 1.198 2004/02/12 17:27:21 tim Exp $ | 1 | # $Id: configure.ac,v 1.199 2004/02/18 00:21:12 dtucker Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -2085,9 +2085,9 @@ AC_ARG_WITH(kerberos5, | |||
2085 | if $KRB5CONF | grep gssapi >/dev/null ; then | 2085 | if $KRB5CONF | grep gssapi >/dev/null ; then |
2086 | AC_MSG_RESULT(yes) | 2086 | AC_MSG_RESULT(yes) |
2087 | K5CFLAGS="`$KRB5CONF --cflags gssapi`" | 2087 | K5CFLAGS="`$KRB5CONF --cflags gssapi`" |
2088 | dnl m4 quadragraphs: "sed 's/-l[^- ]*//g'" | 2088 | dnl m4 quadragraphs: "sed 's/-l[^ ]* //g'" |
2089 | K5LDFLAGS="`$KRB5CONF --libs gssapi | sed 's/-l@<:@^- @:>@*//g'`" | 2089 | K5LDFLAGS="`$KRB5CONF --libs gssapi | sed 's/-l@<:@^ @:>@* //g'`" |
2090 | K5LIBS="`$KRB5CONF --libs gssapi | sed 's/-L@<:@^- @:>@*//g'`" | 2090 | K5LIBS="`$KRB5CONF --libs gssapi | sed 's/-L@<:@^ @:>@* //g'`" |
2091 | else | 2091 | else |
2092 | AC_MSG_RESULT(no) | 2092 | AC_MSG_RESULT(no) |
2093 | K5CFLAGS="`$KRB5CONF --cflags`" | 2093 | K5CFLAGS="`$KRB5CONF --cflags`" |