From 06ad9a53b5f89e88b577ec86581057bb99860542 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 29 Oct 2013 20:31:25 +0100
Subject: [PATCH] Pass existing CFLAGS and LDFLAGS through

Useful when dependencies are installed at custom locations
---
 src/Makefile.in         | 5 ++---
 src/example/Makefile.in | 4 ++--
 src/test/Makefile.in    | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index b5abc5ce..f4e652c9 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -6,7 +6,6 @@ package = @PACKAGE_NAME@
 version = @PACKAGE_VERSION@
 tarname = @PACKAGE_TARNAME@
 distdir = $(tarname)-$(version)
-cflags = @CFLAGS@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -16,8 +15,8 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 CC=gcc
-CFLAGS=-Wall -g -fPIC -I$(srcdir)/ -I /usr/local/include -std=c99
-LDFLAGS=-levent_core -lldns -lunbound
+CFLAGS=@CFLAGS@ -Wall -g -fPIC -I$(srcdir)/ -I/usr/local/include -std=c99
+LDFLAGS=@LDFLAGS@ -levent_core -lldns -lunbound
 # PROGRAMS=example-simple-answers example-tree example-all-functions example-synchronous
 
 .SUFFIXES: .c .o .a .lo .h
diff --git a/src/example/Makefile.in b/src/example/Makefile.in
index 2bbf3ad6..8ee83bd3 100644
--- a/src/example/Makefile.in
+++ b/src/example/Makefile.in
@@ -15,8 +15,8 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 CC=gcc
-CFLAGS=-Wall -g -fPIC -I$(srcdir)/ -I$(srcdir)/../ -I/usr/local/include -std=c99
-LDFLAGS=-L. -L$(srcdir)/.. -L/usr/local/lib 
+CFLAGS=@CFLAGS@ -Wall -g -fPIC -I$(srcdir)/ -I$(srcdir)/../ -I/usr/local/include -std=c99
+LDFLAGS=@LDFLAGS@ -L. -L$(srcdir)/.. -L/usr/local/lib 
 LDLIBS=-lgetdns -lldns -levent_core -lunbound
 PROGRAMS=example_simple_answers example_tree example_all_functions example_synchronous
 
diff --git a/src/test/Makefile.in b/src/test/Makefile.in
index 369f8820..d4964d4a 100644
--- a/src/test/Makefile.in
+++ b/src/test/Makefile.in
@@ -6,7 +6,6 @@ package = @PACKAGE_NAME@
 version = @PACKAGE_VERSION@
 tarname = @PACKAGE_TARNAME@
 distdir = $(tarname)-$(version)
-cflags = @CFLAGS@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -16,8 +15,8 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 CC=gcc
-CFLAGS=-Wall -g -fPIC -I$(srcdir)/ -I$(srcdir)/../ -I/usr/local/include -std=c99 $(cflags)
-LDFLAGS=-L. -L$(srcdir)/.. -L/usr/local/lib 
+CFLAGS=@CFLAGS@ -Wall -g -fPIC -I$(srcdir)/ -I$(srcdir)/../ -I/usr/local/include -std=c99 $(cflags)
+LDFLAGS=@LDFLAGS@ -L. -L$(srcdir)/.. -L/usr/local/lib 
 LDLIBS=-lgetdns -lldns -levent_core -lunbound
 PROGRAMS=tests_dict tests_list tests_stub_async tests_stub_sync