[src/trunk]: src/usr.sbin/ntp Only #define WANT_IPV6 if ${USE_INET6} != "no".

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/345c44e9c5eb
branches:  trunk
changeset: 572676:345c44e9c5eb
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Jan 10 03:03:28 2005 +0000

description:
Only #define WANT_IPV6 if ${USE_INET6} != "no".
(Otherwise #define ISC_PLATFORM_NEEDIN6ADDRANY.)

diffstat:

 usr.sbin/ntp/Makefile.inc     |  10 ++++++++--
 usr.sbin/ntp/include/config.h |   4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r c8a8baec7cad -r 345c44e9c5eb usr.sbin/ntp/Makefile.inc
--- a/usr.sbin/ntp/Makefile.inc Mon Jan 10 03:01:18 2005 +0000
+++ b/usr.sbin/ntp/Makefile.inc Mon Jan 10 03:03:28 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.13 2004/01/27 02:17:46 lukem Exp $
+#      $NetBSD: Makefile.inc,v 1.14 2005/01/10 03:03:28 lukem Exp $
 
 .if !defined(NTP_MAKEFILE_INC)
 NTP_MAKEFILE_INC=1
@@ -13,6 +13,12 @@
 CPPFLAGS+=     -DOPENSSL
 .endif
 
+.if (${USE_INET6} != "no")
+CPPFLAGS+=     -DWANT_IPV6
+.else
+CPPFLAGS+=     -DISC_PLATFORM_NEEDIN6ADDRANY
+.endif
+
 .if defined(PROG)
 LIBNTP!=       cd ${.CURDIR}/../libntp && ${PRINTOBJDIR}
 LIBISC!=       cd ${.CURDIR}/../libisc && ${PRINTOBJDIR}
@@ -30,7 +36,7 @@
        ${_MKTARGET_CREATE}
        ${HOST_SH} ${.CURDIR}/../scripts/mkver ${PROG} > /dev/null
 version.c: .version ${LIBNTP}/libntp.a
-.endif
+.endif # defined(PROG)
 
 NTPSRCDIR?= ${PROG}
 .PATH:         ${DIST}/${NTPSRCDIR}
diff -r c8a8baec7cad -r 345c44e9c5eb usr.sbin/ntp/include/config.h
--- a/usr.sbin/ntp/include/config.h     Mon Jan 10 03:01:18 2005 +0000
+++ b/usr.sbin/ntp/include/config.h     Mon Jan 10 03:03:28 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: config.h,v 1.7 2004/01/04 00:04:52 lukem Exp $ */
+/* $NetBSD: config.h,v 1.8 2005/01/10 03:03:28 lukem Exp $ */
 /* manually edited - check "XXX" comments */
 
 /* config.h.  Generated by configure.  */
@@ -1079,8 +1079,10 @@
 /* Version number of package */
 #define VERSION "4.2.0"
 
+#if 0  /* We'll define this in each Makefile as necessary */
 /* ISC: Want IPv6? */
 #define WANT_IPV6 
+#endif
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */