summaryrefslogtreecommitdiff
blob: 0cc3e8cf64f09f95ef87527e90001b39c6203e97 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
--- a/m4/ax_boost_python.m4
+++ b/m4/ax_boost_python.m4
@@ -82,10 +82,11 @@
      ax_python_lib=$with_boost_python
      ax_boost_python_lib=boost_python-$with_boost_python
    fi])
-  BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-  for ax_lib in `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;' ` $ax_python_lib $ax_boost_python_lib boost_python; do
-    AC_CHECK_LIB($ax_lib, exit, [BOOST_PYTHON_LIB=$ax_lib break], , [$PYTHON_LDFLAGS])
-  done
+  LDFLAGS_SAVED="$LDFLAGS"
+  LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+  export LDFLAGS
+  AC_CHECK_LIB($ax_python_lib, exit, [BOOST_PYTHON_LIB=-l$ax_python_lib], , [$PYTHON_LDFLAGS])
+  LDFLAGS="$LDFLAGS_SAVED"
   AC_SUBST(BOOST_PYTHON_LIB)
 fi
 ])dnl