osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Brad Hards: fix two problems: 

1. the --without-adns case wasn't handled correctly;

	2.  the reporting at the end of the configure didn't deal with
	the case were the configure check failed (as in my example,
	where I only had the libadns package installed, not
	libadns-devel) - it reported that ADNS would be used.

svn path=/trunk/; revision=8663
This commit is contained in:
Guy Harris 2003-10-10 10:12:18 +00:00
parent 645f294232
commit 6670a92e85
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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.58 2003/10/10 06:05:48 guy Exp $
dnl $Id: acinclude.m4,v 1.59 2003/10/10 10:12:18 guy 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
@ -719,6 +719,7 @@ changequote([, ])dnl
[
ADNS_LIBS=-ladns
AC_DEFINE(HAVE_GNU_ADNS, 1, [Define to use GNU ADNS library])
have_good_adns=yes
],,
)
else

10
configure.in
View File

@ -1,4 +1,4 @@
# $Id: configure.in,v 1.224 2003/10/10 03:00:09 guy Exp $
# $Id: configure.in,v 1.225 2003/10/10 10:12:18 guy Exp $
dnl
dnl Process this file with autoconf 2.13 or later to produce a
dnl configure script; 2.12 doesn't generate a "configure" script that
@ -634,7 +634,7 @@ AC_SUBST(SNMP_LIBS)
dnl ADNS Check
ADNS_LIBS=''
AC_MSG_CHECKING(whether to use the GNU ADNS library if available)
if test "x$enable_adns" = "xno" ; then
if test "x$with_adns" = "xno" ; then
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
@ -833,10 +833,10 @@ else
zlib_message="yes"
fi
if test "x$want_adns" = "xno" ; then
adns_message="no"
else
if test "x$have_good_adns" = "xyes" ; then
adns_message="yes"
else
adns_message="no"
fi
if test "x$NETSNMPCONFIG" != "xno" -a "x$NETSNMPCONFIG" != "x" -a -x "$NETSNMPCONFIG" ; then