Changeset: 595711e495ee for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=595711e495ee
Modified Files:
configure.ag
Branch: Oct2012
Log Message:
configure: don't set PYTHONX to an absolute path for AC_PATH_PROG
AC_PATH_PROG will not perform its check if the variable is already set
to an absolute path. Hence, don't set PYTHON2 and PYTHON3 to an
absolute path prior to checking for them. I don't understand why it is
necessary to set PYTHONX in "python", since we already do that in the
"python2" and "python3" cases. So this should just work if there is no
pythonX binary, but python is version X.
diffs (34 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1137,28 +1137,15 @@ if test "x$PYTHON" != xno; then
case "`"$PYTHON" -V 2>&1`" in
"Python 2."[[67]]*) # older Pythons don't get Python3 syntax
PYTHON_MAJ=2
- case "$have_python2" in
- yes|auto)
- have_python2=yes
- PYTHON2="$PYTHON"
- ;;
- esac
- AC_MSG_RESULT([2])
;;
"Python 3."*)
PYTHON_MAJ=3
- case "$have_python3" in
- yes|auto)
- have_python3=yes
- PYTHON3="$PYTHON"
- ;;
- esac
- AC_MSG_RESULT([3])
;;
*)
- AC_MSG_ERROR([unknown Python version])
+ AC_MSG_ERROR([unknown or unsupported Python version])
;;
esac
+ AC_MSG_RESULT($PYTHON_MAJ)
fi
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
