diff options
Diffstat (limited to 'net/wireshark/files/patch-configure')
| -rw-r--r-- | net/wireshark/files/patch-configure | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/net/wireshark/files/patch-configure b/net/wireshark/files/patch-configure index da831bbcb12a..6962120d124c 100644 --- a/net/wireshark/files/patch-configure +++ b/net/wireshark/files/patch-configure @@ -1,24 +1,20 @@ ---- configure.orig Thu Aug 12 22:04:27 2004 -+++ configure Fri Aug 13 18:40:18 2004 -@@ -15934,7 +15934,7 @@ - KRB5_LIBS="-lkrb5 -lasn1 $SSL_LIBS -lroken -lcrypt -lresolv" - ethereal_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -L$krb5_dir/lib" -- ac_krb5_version=`grep -i heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/i'` -+ ac_krb5_version=`grep -i heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'` - else - # Extract the first word of "krb5-config", so it can be a program name with args. - set dummy krb5-config; ac_word=$2 -@@ -15977,10 +15977,10 @@ +--- configure.orig Tue Dec 14 15:39:30 2004 ++++ configure Sat Dec 18 00:17:55 2004 +@@ -16120,7 +16120,7 @@ + # + CFLAGS="$CFLAGS -I$krb5_dir/include" + CPPFLAGS="$CPPFLAGS -I$krb5_dir/include" +- ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'` ++ ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'` + ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'` + ac_krb5_version="$ac_heimdal_version$ac_mit_version" + if test "x$ac_krb5_version" = "xHEIMDAL" +@@ -16178,7 +16178,7 @@ if test -x "$KRB5_CONFIG" then - KRB5_FLAGS=`"$KRB5_CONFIG" --cflags` + KRB5_FLAGS=`"$KRB5_CONFIG" --cflags | sed -e 's/@INCLUDE_des@//g'` + KRB5_LIBS=`"$KRB5_CONFIG" --libs` CFLAGS="$CFLAGS $KRB5_FLAGS" - CPPFLAGS="$CPPFLAGS $KRB5_FLAGS" -- KRB5_LIBS=`"$KRB5_CONFIG" --libs | sed 's/-lcrypto//'` -+ KRB5_LIBS=`"$KRB5_CONFIG" --libs | sed 's/-lcrypto//' | sed -e 's/@INCLUDE_des@//g'` - KRB5_LIBS="$KRB5_LIBS $SSL_LIBS" - # Looks like krb5-config is lacking -lresolv on some systems - echo "$as_me:$LINENO: checking whether library list looks OK" >&5 + CPPFLAGS="$CPPFLAGS $KRB5_FLAGS" |