[src/trunk]: src/usr.bin Make it possible to omit libutil from the link. It'...

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

details:   https://anonhg.NetBSD.org/src/rev/07534f03fd8d
branches:  trunk
changeset: 789855:07534f03fd8d
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Sep 10 18:22:55 2013 +0000

description:
Make it possible to omit libutil from the link.  It's used only for
disklabel stuff, and is only harmful on platforms that don't currently
provide user namespace disklabel interfaces.

diffstat:

 usr.bin/rump_allserver/Makefile |  4 +++-
 usr.bin/rump_server/Makefile    |  9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 3126f89b3bb7 -r 07534f03fd8d usr.bin/rump_allserver/Makefile
--- a/usr.bin/rump_allserver/Makefile   Tue Sep 10 17:59:52 2013 +0000
+++ b/usr.bin/rump_allserver/Makefile   Tue Sep 10 18:22:55 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2011/02/04 20:06:23 pooka Exp $
+#      $NetBSD: Makefile,v 1.5 2013/09/10 18:22:55 pooka Exp $
 #
 
 PROG=  rump_allserver
@@ -14,7 +14,9 @@
 LDADD+=        ${RUMPDEVLDADD} ${RUMPFSLDADD} ${RUMPKERNLDADD} ${RUMPNETLDADD}
 LDADD+= -lrumpdev -lrumpvfs -lrumpnet -lrump -lrumpuser -lpthread
 
+.if ${RUMP_SERVER_LIBUTIL:Uyes} == "yes"
 DPADD+=        ${LIBUTIL}
 LDADD+=        -lutil
+.endif
 
 .include <bsd.prog.mk>
diff -r 3126f89b3bb7 -r 07534f03fd8d usr.bin/rump_server/Makefile
--- a/usr.bin/rump_server/Makefile      Tue Sep 10 17:59:52 2013 +0000
+++ b/usr.bin/rump_server/Makefile      Tue Sep 10 18:22:55 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2011/02/04 20:06:23 pooka Exp $
+#      $NetBSD: Makefile,v 1.4 2013/09/10 18:22:55 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../rump_allserver
@@ -7,6 +7,11 @@
 SRCS=          rump_allserver.c
 NOMAN=         installed by ../rump_allserver
 
-LDADD+= -lrump -lrumpuser -lpthread -lutil
+LDADD+= -lrump -lrumpuser -lpthread
+
+.if ${RUMP_SERVER_LIBUTIL:Uyes} == "yes"
+DPADD+=        ${LIBUTIL}
+LDADD+=        -lutil
+.endif
 
 .include <bsd.prog.mk>