-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
The attached patch fixes 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.
Please apply.
Brad
- --
http://lca2004.linux.org.au - I'm registered. Are you?
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
iD8DBQE/hl2NGwwszQ/PZzgRAkMLAJ9atlTkakZFf1sjbuj6FgVW7vkOwQCggZdF
ypxyHO80uRcXh85TlawWmrU=
=i9a8
-----END PGP SIGNATURE-----
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/ethereal/acinclude.m4,v
retrieving revision 1.58
diff -u -4 -p -r1.58 acinclude.m4
--- acinclude.m4 10 Oct 2003 06:05:48 -0000 1.58
+++ acinclude.m4 10 Oct 2003 07:13:24 -0000
@@ -718,8 +718,9 @@ changequote([, ])dnl
AC_CHECK_LIB(adns, adns_init,
[
ADNS_LIBS=-ladns
AC_DEFINE(HAVE_GNU_ADNS, 1, [Define to use GNU ADNS library])
+ have_good_adns=yes
],,
)
else
AC_MSG_RESULT(not required)
Index: configure.in
===================================================================
RCS file: /cvsroot/ethereal/configure.in,v
retrieving revision 1.224
diff -u -4 -p -r1.224 configure.in
--- configure.in 10 Oct 2003 03:00:09 -0000 1.224
+++ configure.in 10 Oct 2003 07:13:24 -0000
@@ -633,9 +633,9 @@ 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)
AC_ETHEREAL_ADNS_CHECK
@@ -832,12 +832,12 @@ if test "x$want_zlib" = "xno" ; then
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
snmp_libs_message="yes (net-snmp)"