Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/ntp Putting () around conditionals avoids the e...



details:   https://anonhg.NetBSD.org/src/rev/ad64fd76fb6b
branches:  trunk
changeset: 335072:ad64fd76fb6b
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Dec 23 19:11:14 2014 +0000

description:
Putting () around conditionals avoids the error when the variables are
undefined, OTOH it does the wrong thing when comparing when "no".

diffstat:

 external/bsd/ntp/Makefile.inc |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r d2d1738cd33c -r ad64fd76fb6b external/bsd/ntp/Makefile.inc
--- a/external/bsd/ntp/Makefile.inc     Tue Dec 23 19:05:58 2014 +0000
+++ b/external/bsd/ntp/Makefile.inc     Tue Dec 23 19:11:14 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.14 2014/07/05 19:22:41 dholland Exp $
+#      $NetBSD: Makefile.inc,v 1.15 2014/12/23 19:11:14 christos Exp $
 
 .if !defined(NTP_MAKEFILE_INC)
 NTP_MAKEFILE_INC=yes
@@ -38,12 +38,12 @@
 LDADD+=                -L${LIBNTP} -lntp -L${LIBOPTS} -lopts
 DPADD+=                ${LIBNTP}/libntp.a ${LIBOPTS}/libopts.a
 
-.if (${MKCRYPTO} != "no")
+.if ${MKCRYPTO:Uno} != "no"
 LDADD+=                -lcrypto -lcrypt
 DPADD+=                ${LIBCRYPTO} ${LIBCRYPT}
 .endif
 
-.if ("${MKMDNS}" != "no")
+.if ${MKMDNS:Uno} != "no"
 CPPFLAGS+=-DHAVE_DNSREGISTRATION=1
 LDADD+=-ldns_sd
 .endif
@@ -57,11 +57,11 @@
 
 .endif # defined(PROG)
 
-.if (${MKCRYPTO} != "no")
+.if ${MKCRYPTO:Uno} != "no"
 CPPFLAGS+=-DOPENSSL
 .endif
 
-.if ("${MKINET6}" != "no")
+.if ${MKINET6:Uno} != "no"
 CPPFLAGS+=-DWANT_IPV6
 .else
 CPPFLAGS+=-DISC_PLATFORM_NEEDIN6ADDRANY



Home | Main Index | Thread Index | Old Index