From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 7 Jun 2016 08:18:20 +0000 (+0000)
Subject: - Fix #773: Non-standard Python location build failure with pyunbound.
X-Git-Tag: release-1.5.10~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ea03d9ee261e737e1ae61f3b452ac54594a4a2f;p=thirdparty%2Funbound.git

- Fix #773: Non-standard Python location build failure with pyunbound.


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

diff --git a/acx_python.m4 b/acx_python.m4
index 254ff2096..4e83d7764 100644
--- a/acx_python.m4
+++ b/acx_python.m4
@@ -54,7 +54,7 @@ $ac_distutils_result])
         AC_MSG_CHECKING([for Python library path])
         if test -z "$PYTHON_LDFLAGS"; then
                 PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
-                        print(get_config_var('BLDLIBRARY'));"`
+                        print('-L'+get_config_var('LIBDIR')+' -L'+get_config_var('LIBDEST')+' '+get_config_var('BLDLIBRARY'));"`
         fi
         AC_MSG_RESULT([$PYTHON_LDFLAGS])
         AC_SUBST([PYTHON_LDFLAGS])
diff --git a/configure b/configure
index 12da31a23..a1666a83b 100755
--- a/configure
+++ b/configure
@@ -16714,7 +16714,7 @@ $as_echo "$PYTHON_CPPFLAGS" >&6; }
 $as_echo_n "checking for Python library path... " >&6; }
         if test -z "$PYTHON_LDFLAGS"; then
                 PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
-                        print(get_config_var('BLDLIBRARY'));"`
+                        print('-L'+get_config_var('LIBDIR')+' -L'+get_config_var('LIBDEST')+' '+get_config_var('BLDLIBRARY'));"`
         fi
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_LDFLAGS" >&5
 $as_echo "$PYTHON_LDFLAGS" >&6; }
diff --git a/doc/Changelog b/doc/Changelog
index 527995228..660157147 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+7 June 2016: Wouter
+	- Fix #773: Non-standard Python location build failure with pyunbound.
+
 6 June 2016: Wouter
 	- Better help text from -h (from Ray Griffith).
 	- access-control-tag config directive.