diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2004-07-21 22:37:04 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2004-07-21 22:37:04 +0000 |
| commit | 769507d234a530c80f4bea15ddf55b8608d2b7f9 (patch) | |
| tree | a5ad407349777319d17c3b276bcfa7b6caf51d57 /acinclude.m4 | |
| parent | 83b366536a240d512844d1a5829f7b86725440c8 (diff) | |
| download | wireshark-769507d234a530c80f4bea15ddf55b8608d2b7f9.tar.gz wireshark-769507d234a530c80f4bea15ddf55b8608d2b7f9.tar.bz2 wireshark-769507d234a530c80f4bea15ddf55b8608d2b7f9.zip | |
Fix the fix to krb5
svn path=/trunk/; revision=11465
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 3a8585ae31..b60eb143aa 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -957,10 +957,12 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK], AC_PATH_PROG(KRB5_CONFIG, krb5-config) if test -x "$KRB5_CONFIG" then +set -x KRB5_FLAGS=`"$KRB5_CONFIG" --cflags` CFLAGS="$CFLAGS $KRB5_FLAGS" CPPFLAGS="$CPPFLAGS $KRB5_FLAGS" - KRB5_LIBS=`"$KRB5_CONFIG" --libs | sed 's/-lcrypto//'` $SSL_LIBS + KRB5_LIBS=`"$KRB5_CONFIG" --libs | sed 's/-lcrypto//'` + KRB5_LIBS="$KRB5_LIBS $SSL_LIBS" # Looks like krb5-config is lacking -lresolv on some systems AC_MSG_CHECKING(whether library list looks OK) if echo "$KRB5_LIBS" | grep resolv >/dev/null @@ -973,6 +975,7 @@ AC_DEFUN([AC_ETHEREAL_KRB5_CHECK], #LIBS="$LIBS $KRB5_LIBS" ac_krb5_version=`"$KRB5_CONFIG" --version | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/i'` +set +x fi fi |