[src/trunk]: src Include nbtool_config.h as needed. Should fix missing defn ...

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

details:   https://anonhg.NetBSD.org/src/rev/d7305709a232
branches:  trunk
changeset: 750389:d7305709a232
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Dec 29 17:32:18 2009 +0000

description:
Include nbtool_config.h as needed.  Should fix missing defn of __unused in
some host tool environments.

diffstat:

 external/bsd/libelf/dist/libelf.h |  3 ++-
 tools/libelf/Makefile             |  8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r 5d53ac9fe20e -r d7305709a232 external/bsd/libelf/dist/libelf.h
--- a/external/bsd/libelf/dist/libelf.h Tue Dec 29 17:26:50 2009 +0000
+++ b/external/bsd/libelf/dist/libelf.h Tue Dec 29 17:32:18 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: libelf.h,v 1.5 2009/12/21 18:21:17 thorpej Exp $       */
+/*     $NetBSD: libelf.h,v 1.6 2009/12/29 17:32:18 thorpej Exp $       */
 
 /*-
  * Copyright (c) 2006 Joseph Koshy
@@ -36,6 +36,7 @@
 #include <inttypes.h>
 
 #if HAVE_NBTOOL_CONFIG_H
+# include "nbtool_config.h"
 # include <nbinclude/sys/exec_elf.h>
 # define __LIBELF_HAVE_ELF_CAP          1
 # define __LIBELF_HAVE_ELF_MOVE         1
diff -r 5d53ac9fe20e -r d7305709a232 tools/libelf/Makefile
--- a/tools/libelf/Makefile     Tue Dec 29 17:26:50 2009 +0000
+++ b/tools/libelf/Makefile     Tue Dec 29 17:32:18 2009 +0000
@@ -1,4 +1,6 @@
-#      $NetBSD: Makefile,v 1.2 2009/12/23 20:28:29 cegger Exp $
+#      $NetBSD: Makefile,v 1.3 2009/12/29 17:32:18 thorpej Exp $
+
+.include <bsd.own.mk>
 
 HOSTLIB=       elf
 
@@ -64,6 +66,10 @@
 # other file ops, on many systems, without changing function names.
 
 CPPFLAGS+=     -DHAVE_NBTOOL_CONFIG_H=1 -D_FILE_OFFSET_BITS=64
+.ifndef NOCOMPATLIB
+COMPATOBJ!=     cd ${.CURDIR}/../compat && ${PRINTOBJDIR}
+CPPFLAGS+=     -I${COMPATOBJ}
+.endif
 
 .PATH:         ${LIBELF_DIR}