[src/netbsd-7]: src/external/bsd/dhcp Pull up following revision(s) (requeste...

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

details:   https://anonhg.NetBSD.org/src/rev/b7f530d25b9a
branches:  netbsd-7
changeset: 798407:b7f530d25b9a
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Oct 11 16:22:28 2014 +0000

description:
Pull up following revision(s) (requested by christos in ticket #133):
        external/bsd/dhcp/Makefile.inc: revision 1.12
The crypto-enabled dhclient command needs more libraries burned in so that
it does not depend on /usr/lib

diffstat:

 external/bsd/dhcp/Makefile.inc |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 9755b7fad727 -r b7f530d25b9a external/bsd/dhcp/Makefile.inc
--- a/external/bsd/dhcp/Makefile.inc    Sat Oct 11 16:16:44 2014 +0000
+++ b/external/bsd/dhcp/Makefile.inc    Sat Oct 11 16:22:28 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2014/07/12 12:11:22 spz Exp $
+# $NetBSD: Makefile.inc,v 1.11.2.1 2014/10/11 16:22:28 snj Exp $
 
 WARNS?=        1       # XXX -Wshadow -Wcast-qual -Wsign-compare
 
@@ -36,9 +36,6 @@
 .endif
 LDADD+= -lirs -lisccfg -ldns -lisc
 LDADD+=-lpthread
-.if defined(PROG) && ${PROG} == "dhclient"
-LDADD+=-Wl,-Bdynamic
-.endif
 .if (${MKCRYPTO} != "no")
 .if (${MKKERBEROS} != "no")
 LDADD+= -lgssapi -lkrb5 -lhx509 -lheimntlm -lheimbase \
@@ -46,6 +43,9 @@
 DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
        ${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND}
 .endif
+.if defined(PROG) && ${PROG} == "dhclient"
+LDADD+=-Wl,-Bdynamic
+.endif
 LDADD+= -lcrypto -lipsec -lcrypt
 DPADD+= ${LIBCRYPTO} ${LIBIPSEC} ${LIBCRYPT}
 .endif