[glom] AX_BOOST_PYTHON: Revert to upstream version.



commit 5a95def69244babe036772acf0efcaf64b854cb3
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 20 09:49:48 2015 +0200

    AX_BOOST_PYTHON: Revert to upstream version.

 macros/ax_boost_python.m4 |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/macros/ax_boost_python.m4 b/macros/ax_boost_python.m4
index 49d4082..5a40f61 100644
--- a/macros/ax_boost_python.m4
+++ b/macros/ax_boost_python.m4
@@ -65,10 +65,8 @@ ax_boost_python_save_LIBS="$LIBS"
 if test "x$PYTHON_CPPFLAGS" != "x"; then
   CPPFLAGS="$PYTHON_CPPFLAGS $CPPFLAGS"
 fi
-# murrayc: PYTHON_LDFLAGS are really libs
-# See https://savannah.gnu.org/patch/?8701
 if test "x$PYTHON_LDFLAGS" != "x"; then
-  LIBS="$PYTHON_LDFLAGS $LIBS"
+  LDFLAGS="$PYTHON_LDFLAGS $LDFLAGS"
 fi
 if test "x$BOOST_CPPFLAGS" != "x"; then
   CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
@@ -92,12 +90,10 @@ if test "$ac_cv_boost_python" = "yes"; then
      ax_boost_python_lib=boost_python-$with_boost_python
    fi])
   BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-  # murrayc: Note that we use PYTHON_LDFLAGS as libs, because that's what it really is:
-  # See https://savannah.gnu.org/patch/?8701
   for ax_lib in $ax_python_lib $ax_boost_python_lib `ls $BOOSTLIBDIR/libboost_python*.so* 
$BOOSTLIBDIR/libboost_python*.dylib* $BOOSTLIBDIR/libboost_python*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 
's;^lib\(boost_python.*\)\.so.*$;\1;' -e 's;^lib\(boost_python.*\)\.dylib.*$;\1;' -e 
's;^lib\(boost_python.*\)\.a.*$;\1;' ` boost_python boost_python3; do
     AS_VAR_PUSHDEF([ax_Lib], [ax_cv_lib_$ax_lib''_BOOST_PYTHON_MODULE])dnl
     AC_CACHE_CHECK([whether $ax_lib is the correct library], [ax_Lib],
-    [LIBS="-l$ax_lib $ax_boost_python_save_LIBS $PYTHON_LDFLAGS"
+    [LIBS="-l$ax_lib $ax_boost_python_save_LIBS"
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <boost/python/module.hpp>
 BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]], [])],


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]