diff options
| author | Peter Simons <simons@cryp.to> | 2014-10-16 10:43:29 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-10-16 10:43:29 +0200 |
| commit | db46196ac3dcfca2ea438db624685d7b6fc33397 (patch) | |
| tree | faf7404ef9b4ca9c7b5c5d593087a9c71c978496 /m4/ax_boost_python.m4 | |
| parent | af0eacb99bcdcc7b008e669ef7f4711c1da58f1a (diff) | |
| download | autoconf-archive-db46196ac3dcfca2ea438db624685d7b6fc33397.tar.gz | |
AX_BOOST_PYTHON: use unique names for local variables
Diffstat (limited to 'm4/ax_boost_python.m4')
| -rw-r--r-- | m4/ax_boost_python.m4 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/m4/ax_boost_python.m4 b/m4/ax_boost_python.m4 index 77f7db5..5a40f61 100644 --- a/m4/ax_boost_python.m4 +++ b/m4/ax_boost_python.m4 @@ -53,15 +53,15 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 19 +#serial 20 AC_DEFUN([AX_BOOST_PYTHON], [AC_REQUIRE([AX_PYTHON_DEVEL])dnl AC_REQUIRE([AX_BOOST_BASE])dnl AC_LANG_PUSH([C++]) -CPPFLAGS_SAVE="$CPPFLAGS" -LDFLAGS_SAVE="$LDFLAGS" -LIBS_SAVE="$LIBS" +ax_boost_python_save_CPPFLAGS="$CPPFLAGS" +ax_boost_python_save_LDFLAGS="$LDFLAGS" +ax_boost_python_save_LIBS="$LIBS" if test "x$PYTHON_CPPFLAGS" != "x"; then CPPFLAGS="$PYTHON_CPPFLAGS $CPPFLAGS" fi @@ -93,7 +93,7 @@ if test "$ac_cv_boost_python" = "yes"; then 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 $LIBS_SAVE" + [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."; }]], [])], @@ -104,8 +104,8 @@ BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]], [])], done AC_SUBST(BOOST_PYTHON_LIB) fi -CPPFLAGS="$CPPFLAGS_SAVE" -LDFLAGS="$LDFLAGS_SAVE" -LIBS="$LIBS_SAVE" +CPPFLAGS="$ax_boost_python_save_CPPFLAGS" +LDFLAGS="$ax_boost_python_save_LDFLAGS" +LIBS="$ax_boost_python_save_LIBS" AC_LANG_POP([C++]) ])dnl |