- Fix #738: Swig should not be invoked with CPPFLAGS.

git-svn-id: file:///svn/unbound/trunk@3603 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/Makefile.in b/Makefile.in
index fca2f0b17db0cf22663dea380a5f79e8c49ffe1e..100be5a56a4c8abbd3c6e0ef75c13e7ac2124281 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,6 +54,7 @@ LEX=@LEX@
 STRIP=@STRIP@
 CC=@CC@
 CPPFLAGS=-I. @CPPFLAGS@
+PYTHON_CPPFLAGS=-I. @PYTHON_CPPFLAGS@
 CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@
 LIBS=@LIBS@
@@ -389,13 +390,13 @@ pythonmod.lo pythonmod.o: $(srcdir)/pythonmod/pythonmod.c config.h \
 
 pythonmod/interface.h: $(srcdir)/pythonmod/interface.i config.h
        @-if test ! -d pythonmod; then $(INSTALL) -d pythonmod; fi
-       $(SWIG) $(CPPFLAGS) -o $@ -python $(srcdir)/pythonmod/interface.i
+       $(SWIG) $(PYTHON_CPPFLAGS) -o $@ -python $(srcdir)/pythonmod/interface.i
 
 libunbound_wrap.lo libunbound_wrap.o: libunbound/python/libunbound_wrap.c \
        unbound.h
 libunbound/python/libunbound_wrap.c:   $(srcdir)/libunbound/python/libunbound.i unbound.h
        @-if test ! -d libunbound/python; then $(INSTALL) -d libunbound/python; fi
-       $(SWIG) -python -o $@ $(CPPFLAGS) -DPY_MAJOR_VERSION=$(PY_MAJOR_VERSION) $(srcdir)/libunbound/python/libunbound.i
+       $(SWIG) -python -o $@ $(PYTHON_CPPFLAGS) -DPY_MAJOR_VERSION=$(PY_MAJOR_VERSION) $(srcdir)/libunbound/python/libunbound.i
 
 # Pyunbound python unbound wrapper
 _unbound.la:   libunbound_wrap.lo libunbound.la

diff --git a/doc/Changelog b/doc/Changelog
index b92d37a1a9ef13ae99f6da350b9d9e925d9f57ae..97319a046b7f3e71f320b59d3cdb45f7bd12e88d 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+25 January 2016: Wouter
+       - Fix #738: Swig should not be invoked with CPPFLAGS.
+
 19 January 2016: Wouter
        - Squelch 'cannot assign requested address' log messages unless
          verbosity is high, it was spammed after network down.