- (dtucker) [configure.ac] Handle case where krb5-config --libs returns a

   path with a "-" in it.  From Sergio.Gelato at astro.su.se.

diff --git a/ChangeLog b/ChangeLog
index 6a6af20d978e3b0555ab82e772e05fa626c153ef..4cf4543a5d5810c4c8f4eab476d1588c83005afa 100644 (file)
--- 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

diff --git a/configure.ac b/configure.ac
index 51d486dfdd3ded6f5435c40181ab57d352e98f24..740e6e0134b7d51fdfb79a18e7b1601dd17df001 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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`"