diff --git a/configure.ac b/configure.ac index 9b0e1d43f..9cc38f7fc 100644 --- a/configure.ac +++ b/configure.ac @@ -520,13 +520,7 @@ AS_CASE(["$ARG_ENABLE_PYTHON_BINDING"], AC_MSG_RESULT([yes]) AM_PATH_PYTHON([2.4], [], AC_MSG_ERROR([Python interpreter not found.])) - AX_PYTHON_DEVEL([>= '2.4']) - - #AX_PYTHON() - # binary: ${PYTHON_BIN} - # library: ${PYTHON_LIB} - # include dir: ${PYTHON_INCLUDE_DIR} AX_BOOST_PYTHON() AS_IF([test -z "$BOOST_PYTHON_LIB"], diff --git a/m4/ax_boost_python.m4 b/m4/ax_boost_python.m4 index 914133c3d..90dfa0ec0 100644 --- a/m4/ax_boost_python.m4 +++ b/m4/ax_boost_python.m4 @@ -21,7 +21,11 @@ # In order to ensure that the Python headers are specified on the include # path, this macro requires AX_PYTHON to be called. # -# EDIT: 2009-09-07 Cristian Greco +# EDIT: +# 2009-09-14 Cristian Greco +# - Require AX_PYTHON_DEVEL to be called before this macro to properly +# detect python include path, instead of AX_PYTHON. +# 2009-09-07 Cristian Greco # - Prefix BOOST_PYTHON_LIB with a `-l` for consistency with other # ax_boost_libname.m4 scripts. # diff --git a/m4/ax_python.m4 b/m4/ax_python.m4 deleted file mode 100644 index 5c0409655..000000000 --- a/m4/ax_python.m4 +++ /dev/null @@ -1,112 +0,0 @@ -# =========================================================================== -# http://www.nongnu.org/autoconf-archive/ax_python.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PYTHON -# -# DESCRIPTION -# -# This macro does a complete Python development environment check. -# -# It recurses through several python versions (from 2.1 to 2.6 in this -# version), looking for an executable. When it finds an executable, it -# looks to find the header files and library. -# -# It sets PYTHON_BIN to the name of the python executable, -# PYTHON_INCLUDE_DIR to the directory holding the header files, and -# PYTHON_LIB to the name of the Python library. -# -# This macro calls AC_SUBST on PYTHON_BIN (via AC_CHECK_PROG), -# PYTHON_INCLUDE_DIR and PYTHON_LIB. -# -# EDIT: 2009.09.05 - Modified by Cristian Greco -# Dirty hack on the for loop in order to avoid problems with caching in -# AC_CHECK_ARGS, and a special test for ${host} in darwin (MacOS). -# Note that now the macro calls directly AC_SUBST on PYTHON_BIN. -# -# LICENSE -# -# Copyright (c) 2008 Michael Tindal -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -AC_DEFUN([AX_PYTHON], -[AC_MSG_CHECKING(for python build information) -AC_MSG_RESULT([]) - -found="no" -m4_foreach_w([PYVER], [ 2_6 2_5 2_4 ], [ -if test "x$found" != "xyes"; then - python="python`echo PYVER | sed -e 's/_/./'`" - AC_CHECK_PROGS(PYTHON_BIN_[]PYVER, [$python]) - ax_python_bin=$PYTHON_BIN_[]PYVER - if test "x$ax_python_bin" != "x"; then - AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no) - - if test `echo ${host} | grep '.*-darwin.*'`; then - python_prefix=/System/Library/Frameworks/Python.framework/*/ - fi - AC_CHECK_HEADER([$ax_python_bin/Python.h], - [[ax_python_header=`locate $python_prefix$ax_python_bin/Python.h | sed -e s,/Python.h,,`]], - [ax_python_header="no"]) - if test "x$ax_python_lib" != "xno" -a "x$ax_python_header" != "xno"; then - found="yes"; - fi - fi -fi -]) - -if test "x$ax_python_bin" = "x"; then - ax_python_bin="no" -fi -if test "x$ax_python_header" = "x"; then - ax_python_header="no" -fi -if test "x$ax_python_lib" = "x"; then - ax_python_lib="no" -fi - -#AC_MSG_RESULT([ results of the Python check:]) -#AC_MSG_RESULT([ Binary: $ax_python_bin]) -#AC_MSG_RESULT([ Library: $ax_python_lib]) -#AC_MSG_RESULT([ Include Dir: $ax_python_header]) - -if test "x$ax_python_bin" != "xno"; then - PYTHON_BIN=$ax_python_bin - AC_SUBST(PYTHON_BIN) -fi -if test "x$ax_python_header" != "xno"; then - PYTHON_INCLUDE_DIR=$ax_python_header - AC_SUBST(PYTHON_INCLUDE_DIR) -fi -if test "x$ax_python_lib" != "xno"; then - PYTHON_LIB=$ax_python_lib - AC_SUBST(PYTHON_LIB) -fi -])dnl