From cb0e04d1200a820371be149ac6885d1872fe4462 Mon Sep 17 00:00:00 2001
From: Tiago de Paula Peixoto <tiago@skewed.de>
Date: Sun, 11 Mar 2012 18:48:03 +0100
Subject: [PATCH] Improve autoconf checking of boost_python

---
 m4/ax_boost_python.m4 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/m4/ax_boost_python.m4 b/m4/ax_boost_python.m4
index 55d4775b..f95c208e 100644
--- a/m4/ax_boost_python.m4
+++ b/m4/ax_boost_python.m4
@@ -70,7 +70,7 @@ ac_cv_boost_python,
  using namespace boost::python;
  BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]],
  			   [[return 0;]]),
-  			   ac_cv_boost_python=yes, ac_cv_boost_python=no)
+                           ac_cv_boost_python=yes, ac_cv_boost_python=no)
  AC_LANG_RESTORE
  CPPFLAGS="$CPPFLAGS_SAVE"
 ])
@@ -82,8 +82,12 @@ if test "$ac_cv_boost_python" = "yes"; then
      ax_python_lib=$with_boost_python
      ax_boost_python_lib=boost_python-$with_boost_python
    fi])
-  for ax_lib in $ax_python_lib $ax_boost_python_lib boost_python boost_python-mt boost_python-mt-py2.5; do
+  for ax_lib in $ax_python_lib $ax_boost_python_lib boost_python boost_python-mt; do
     AC_CHECK_LIB($ax_lib, exit, [BOOST_PYTHON_LIB=$ax_lib break])
+    ax_lib_alt=${ax_lib}-py$PYTHON_VERSION
+    AC_CHECK_LIB($ax_lib_alt, exit, [BOOST_PYTHON_LIB=$ax_lib_alt break])
+    ax_lib_alt=${ax_lib}-$PYTHON_VERSION
+    AC_CHECK_LIB($ax_lib_alt, exit, [BOOST_PYTHON_LIB=$ax_lib_alt break])
   done
   AC_SUBST(BOOST_PYTHON_LIB)
 fi
-- 
GitLab