summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJames McCoy <jamessan@debian.org>2018-07-31 22:42:12 -0400
committerJames McCoy <jamessan@debian.org>2018-07-31 23:18:51 -0400
commit9fad0d7c16b4181b4a4872d033c20535de35fab2 (patch)
tree2c602751b105b8ef7a3c4d0dbef09021ca5c6352 /debian
parentdfb8d1a3903ac9531fc1a9a5d038a061c6d9af14 (diff)
Refresh patches
Gbp-Dch: Ignore Signed-off-by: James McCoy <jamessan@debian.org>
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/python-builds20
1 files changed, 10 insertions, 10 deletions
diff --git a/debian/patches/python-builds b/debian/patches/python-builds
index b357ba8..fdcaa36 100644
--- a/debian/patches/python-builds
+++ b/debian/patches/python-builds
@@ -16,18 +16,18 @@ Submitted upstream: http://svn.haxx.se/dev/archive-2008-05/0361.shtml
SWIG_PY_LINK = @SWIG_PY_LINK@
--- a/build/ac-macros/swig.m4
+++ b/build/ac-macros/swig.m4
-@@ -107,7 +107,8 @@
- AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[
- ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`"
- ])
-- SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
-+ PYTHON_INCLUDES="$ac_cv_python_includes"
-+ SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) \$(PYTHON_INCLUDES)"
+@@ -108,7 +108,8 @@
+ AC_CACHE_CHECK([for Python includes], [ac_cv_python_includes],[
+ ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`"
+ ])
+- SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) $ac_cv_python_includes"
++ PYTHON_INCLUDES="$ac_cv_python_includes"
++ SWIG_PY_INCLUDES="\$(SWIG_INCLUDES) \$(PYTHON_INCLUDES)"
- if test "$ac_cv_python_includes" = "none"; then
- AC_MSG_WARN([python bindings cannot be built without distutils module])
+ if test "$ac_cv_python_includes" = "none"; then
+ AC_MSG_WARN([python bindings cannot be built without distutils module])
@@ -296,6 +297,7 @@
- fi
+ AC_MSG_RESULT([$SWIG_RB_TEST_VERBOSE])
fi
AC_SUBST(SWIG)
+ AC_SUBST(PYTHON_INCLUDES)