Make sure to actually use config.h

4 files changed, 2 insertions, 9 deletions

diff --git a/net/fetch/files/Makefile.in b/net/fetch/files/Makefile.in
index 3794592d655..4205247693a 100644
--- a/net/fetch/files/Makefile.in
+++ b/net/fetch/files/Makefile.in
@@ -4,5 +4,6 @@
 
 PROG=		fetch
 LDADD+=		-lfetch @LIBS@
+CPPFLAGS+=	-DHAVE_CONFIG_H
 
 .include <bsd.prog.mk>
diff --git a/net/fetch/files/config.h.in b/net/fetch/files/config.h.in
index 7895d82a05a..00fd491315e 100644
--- a/net/fetch/files/config.h.in
+++ b/net/fetch/files/config.h.in
@@ -1,8 +1,5 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Include config.h */
-#undef HAVE_CONFIG_H
-
 /* Define to 1 if you have the <err.h> header file. */
 #undef HAVE_ERR_H
 
diff --git a/net/fetch/files/configure b/net/fetch/files/configure
index b5142ac4cbd..4966267ebc5 100755
--- a/net/fetch/files/configure
+++ b/net/fetch/files/configure
@@ -3798,8 +3798,6 @@ $as_echo "#define PREFER_GETPASS /**/" >>confdefs.h
 esac
 
 
-$as_echo "#define HAVE_CONFIG_H /**/" >>confdefs.h
-
 ac_config_files="$ac_config_files Makefile"
 
 cat >confcache <<\_ACEOF
@@ -3881,8 +3879,6 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-DEFS=-DHAVE_CONFIG_H
-
 ac_libobjs=
 ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
diff --git a/net/fetch/files/configure.ac b/net/fetch/files/configure.ac
index 44675a25a27..ba2d7b541a8 100644
--- a/net/fetch/files/configure.ac
+++ b/net/fetch/files/configure.ac
@@ -1,4 +1,4 @@
-dnl $NetBSD: configure.ac,v 1.4 2010/06/24 22:51:00 joerg Exp $
+dnl $NetBSD: configure.ac,v 1.5 2011/12/05 22:54:22 joerg Exp $
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
@@ -25,6 +25,5 @@ netbsd)
 	;;
 esac
 
-AC_DEFINE([HAVE_CONFIG_H], [], [Include config.h])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT