2 files changed, 4 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e64bf0e75..6509548bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@
    forwarding test is extremely slow copying data on some machines so switch
    back to copying the much smaller ls binary until we can figure out why
    this is.
+ - (dtucker) [Makefile.in] append $CFLAGS to compiler options when building
+   modpipe in case there's anything in there we need.
 
 20130602
  - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy
diff --git a/Makefile.in b/Makefile.in
index 438baaca6..d6f6a7924 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.338 2013/06/02 01:38:23 tim Exp $
+# $Id: Makefile.in,v 1.339 2013/06/05 19:12:35 dtucker Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -385,7 +385,7 @@ regress/modpipe$(EXEEXT): $(srcdir)/regress/modpipe.c
         [ -d `pwd`/regress ]  ||  mkdir -p `pwd`/regress
         [ -f `pwd`/regress/Makefile ]  || \
             ln -s `cd $(srcdir) && pwd`/regress/Makefile `pwd`/regress/Makefile
-        $(CC) $(CPPFLAGS) -o $@ $? \
+        $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $? \
         $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
 tests interop-tests:    $(TARGETS) regress/modpipe$(EXEEXT)