"Alfred M. Szmidt" <a...@gnu.org> writes:
> [CCing bug-inetutils so others can chime in a penny]
>
> "Alfred M. Szmidt" <a...@gnu.org> writes:
> > The GNU inetutils team is proud to present version 1.8 of the GNU
> > network utilities suite.
>
> Seems to work -- but if you configure with --disable-ping, "make check"
> still tries to run the ping test and fails. Probably worth adding some
> conditionals to tests/Makefile.am...
>
> Thanks for the report, I'll see if I can fix that todayish.
The patch below should fix this, and also for traceroute. Ok to push?
/Simon
>From b91224ddbac2f1291ff7dbe7a055c87f05de7a63 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <si...@josefsson.org>
Date: Tue, 18 May 2010 19:40:10 +0200
Subject: [PATCH] tests/Makefile.am (dist_check_SCRIPTS): Make testing ping and
traceroute conditioned on ENABLE_ping and ENABLE_traceroute.
Reported by Adam Sampson <a...@offog.org>.
---
ChangeLog | 6 ++++++
tests/Makefile.am | 8 +++++++-
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ddd71e4..3520198 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-18 Simon Josefsson <si...@josefsson.org>
+
+ * tests/Makefile.am (dist_check_SCRIPTS): Make testing ping and
+ traceroute conditioned on ENABLE_ping and ENABLE_traceroute.
+ Reported by Adam Sampson <a...@offog.org>.
+
2010-05-15 Alfred M. Szmidt <a...@gnu.org>
* configure.ac: Bump version number to 1.8.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1d94a5d..74f2c09 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,7 +21,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/libinetutils
-I$(top_srcdir)/lib
LDADD = -L../libinetutils -linetutils ../lib/libgnu.a
check_PROGRAMS = localhost
-dist_check_SCRIPTS = ping-localhost.sh traceroute-localhost.sh
+dist_check_SCRIPTS =
+if ENABLE_ping
+dist_check_SCRIPTS += ping-localhost.sh
+endif
+if ENABLE_traceroute
+dist_check_SCRIPTS += traceroute-localhost.sh
+endif
TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT)
--
1.7.1
