Module Name: src
Committed By: christos
Date: Tue Dec 23 19:11:14 UTC 2014
Modified Files:
src/external/bsd/ntp: Makefile.inc
Log Message:
Putting () around conditionals avoids the error when the variables are
undefined, OTOH it does the wrong thing when comparing when "no".
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.14 src/external/bsd/ntp/Makefile.inc:1.15
--- src/external/bsd/ntp/Makefile.inc:1.14 Sat Jul 5 15:22:41 2014
+++ src/external/bsd/ntp/Makefile.inc Tue Dec 23 14:11:14 2014
@@ -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 @@ LIBPARSE!= cd ${.CURDIR}/../../lib/libpa
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 @@ version.c: ${LIBNTP}/libntp.a ${.CURDIR}
.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
