From: Roy Marples <roy@marples.name>
Date: Wed, 13 Apr 2016 16:45:52 +0000 (+0000)
Subject: Set -DHAVE_CONFIG_H after it's blanked on user config. Fixes [ceb1077c23].
X-Git-Tag: v6.10.3~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb808ae016c949ebd8026da584e809563ff21e57;p=thirdparty%2Fdhcpcd.git

Set -DHAVE_CONFIG_H after it's blanked on user config. Fixes [ceb1077c23].
---

diff --git a/configure b/configure
index 60548c2d..955b87b9 100755
--- a/configure
+++ b/configure
@@ -236,7 +236,6 @@ fi
 echo "Configuring dhcpcd for ... $OS"
 rm -f $CONFIG_H $CONFIG_MK
 echo "# $OS" >$CONFIG_MK
-echo "CPPFLAGS+=	-DHAVE_CONFIG_H" >>$CONFIG_MK
 echo "/* $OS */" >$CONFIG_H
 
 for x in SYSCONFDIR SBINDIR LIBDIR LIBEXECDIR DBDIR RUNDIR; do
@@ -296,6 +295,8 @@ if [ -n "$LDFLAGS" ]; then
 	echo "LDFLAGS+=	$LDFLAGS" >>$CONFIG_MK
 fi
 
+echo "CPPFLAGS+=	-DHAVE_CONFIG_H" >>$CONFIG_MK
+
 # NetBSD: Even if we build for $PREFIX, the clueless user might move us to /
 LDELF=/libexec/ld.elf_so
 if [ -e "$LDELF" ]; then