osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Workaround for (at least) some RedHat platforms: 

Add -lresolv in case it's missing but required by the heimdal libs.

svn path=/trunk/; revision=10420
This commit is contained in:
Jörg Mayer 2004-03-20 10:32:02 +00:00
parent b88934db25
commit 1e1de04ffc
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
acinclude.m4
View File

@ -2,7 +2,7 @@ dnl Macros that test for specific features.
dnl This file is part of the Autoconf packaging for Ethereal.
dnl Copyright (C) 1998-2000 by Gerald Combs.
dnl
dnl $Id: acinclude.m4,v 1.69 2004/03/17 18:20:57 jmayer Exp $
dnl $Id: acinclude.m4,v 1.70 2004/03/20 10:32:02 jmayer Exp $
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@ -886,6 +886,16 @@ AC_DEFUN(AC_ETHEREAL_KRB5_CHECK,
CFLAGS="$CFLAGS $KRB5_FLAGS"
CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
KRB5_LIBS=`$KRB5_CONFIG --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
then
AC_MSG_RESULT(yes)
else
KRB5_LIBS="$KRB5_LIBS -lresolv"
AC_MSG_RESULT(Adding -lresolv to libs)
fi
LIBS="$LIBS $KRB5_LIBS"
ac_krb5_version=`$KRB5_CONFIG --version | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/i'`
fi

12
epan/acinclude.m4
View File

@ -2,7 +2,7 @@ dnl Macros that test for specific features.
dnl This file is part of the Autoconf packaging for Ethereal.
dnl Copyright (C) 1998-2000 by Gerald Combs.
dnl
dnl $Id: acinclude.m4,v 1.7 2004/03/17 18:20:58 jmayer Exp $
dnl $Id: acinclude.m4,v 1.8 2004/03/20 10:32:02 jmayer Exp $
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@ -325,6 +325,16 @@ AC_DEFUN(AC_ETHEREAL_KRB5_CHECK,
CFLAGS="$CFLAGS $KRB5_FLAGS"
CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
KRB5_LIBS=`$KRB5_CONFIG --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
then
AC_MSG_RESULT(yes)
else
KRB5_LIBS="$KRB5_LIBS -lresolv"
AC_MSG_RESULT(Adding -lresolv to libs)
fi
LIBS="$LIBS $KRB5_LIBS"
ac_krb5_version=`$KRB5_CONFIG --version | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/i'`
fi