Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Tiago Peixoto
graph-tool
Commits
c4338767
Commit
c4338767
authored
Mar 19, 2011
by
Tiago Peixoto
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix autoconf detection of python
This also fully honors the PYTHON_VERSION environment variable.
parent
19984ec5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
3 deletions
+13
-3
configure.ac
configure.ac
+3
-1
m4/ac_python_module.m4
m4/ac_python_module.m4
+3
-1
m4/ax_python.m4
m4/ax_python.m4
+7
-1
No files found.
configure.ac
View file @
c4338767
...
...
@@ -145,8 +145,10 @@ AC_CHECK_LIB(expat,main)
dnl python
[TEMP_CPPFLAGS="${CPPFLAGS}"]
AM_PATH_PYTHON([2.5])
AC_PYTHON_DEVEL([2.5])
[PYTHON="python${PYTHON_VERSION}"]
AX_PYTHON
AM_PATH_PYTHON([2.5])
[CPPFLAGS="${CPPFLAGS} ${PYTHON_CPPFLAGS}"]
[LDFLAGS="${LDFLAGS} ${PYTHON_LDFLAGS}"]
...
...
m4/ac_python_module.m4
View file @
c4338767
...
...
@@ -25,9 +25,11 @@
# and this notice are preserved.
AC_DEFUN([AC_PYTHON_MODULE],[
if test -z $PYTHON;
if test -z $PYTHON
_BIN
;
then
PYTHON="python"
else
PYTHON=$PYTHON_BIN
fi
PYTHON_NAME=`basename $PYTHON`
AC_MSG_CHECKING($PYTHON_NAME module: $1)
...
...
m4/ax_python.m4
View file @
c4338767
...
...
@@ -58,7 +58,13 @@
AC_DEFUN([AX_PYTHON],
[AC_MSG_CHECKING(for python build information)
AC_MSG_RESULT([])
for python in python2.8 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
if test -z $PYTHON_VERSION
then
python_list="python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python"
else
python_list="python$PYTHON_VERSION"
fi
for python in $python_list; do
AC_CHECK_PROGS(PYTHON_BIN, [$python])
ax_python_bin=$PYTHON_BIN
if test x$ax_python_bin != x; then
...
...
Tiago Peixoto
@count0
mentioned in issue
#52 (closed)
·
Aug 06, 2014
mentioned in issue
#52 (closed)
mentioned in issue #52
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment