From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 12 Mar 2010 13:21:20 +0000 (+0000)
Subject: Fix solaris python compile.
X-Git-Tag: release-1.4.4rc1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e56a5b72cb0a0735931a3b7ffe3d9e44eaa84478;p=thirdparty%2Funbound.git

Fix solaris python compile.


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

diff --git a/configure b/configure
index 90c63ec1b..8c35b08c7 100755
--- a/configure
+++ b/configure
@@ -18427,7 +18427,7 @@ if test x_$ub_test_python != x_no; then
 
    # Check for Python
    ub_have_python=no
-
+   ac_save_LIBS="$LIBS"
         #
         # Allow the use of a (user set) custom python version
         #
diff --git a/configure.ac b/configure.ac
index 1e357ad78..6eff2bf03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -336,6 +336,7 @@ if test x_$ub_test_python != x_no; then
 
    # Check for Python
    ub_have_python=no
+   ac_save_LIBS="$LIBS" dnl otherwise AC_PYTHON_DEVEL thrashes $LIBS
    AC_PYTHON_DEVEL
    if test ! -z "$PYTHON_VERSION"; then
 	if test `$PYTHON -c "print '$PYTHON_VERSION' >= '2.4.0'"` = "False"; then
diff --git a/doc/Changelog b/doc/Changelog
index 94dfe00cb..264acf0e1 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
 	- iana portlist updated.
 	- ldns tarball updated.
 	- Fix python use when multithreaded.
+	- Fix solaris python compile.
 
 11 March 2010: Wouter
 	- another memory allocation option: --enable-alloc-nonregional.
diff --git a/ldns-src.tar.gz b/ldns-src.tar.gz
index 8f4cb260b..0d35a97f5 100644
Binary files a/ldns-src.tar.gz and b/ldns-src.tar.gz differ