mirror of
https://github.com/wesnoth/wesnoth
synced 2025-04-30 01:47:13 +00:00
Re-simplification. make install works.
This commit is contained in:
parent
d6317e9315
commit
2125ea0cb9
11
configure.ac
11
configure.ac
@ -414,15 +414,6 @@ if test "x$python" = "xyes"; then
|
||||
PYTHON_VERSION="${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}"
|
||||
AC_MSG_RESULT([$PYTHON, $PYTHON_VERSION, $PYTHON_PREFIX])
|
||||
|
||||
AC_MSG_CHECKING(whether Python is at least 2.4)
|
||||
if test $PYTHON_VERSION_MAJOR -lt 2 -o $PYTHON_VERSION_MAJOR -eq 2 -a $PYTHON_VERSION_MINOR -lt 4; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_WARN([*** Wesnoth requires at least Python 2.4, Python support disabled.])
|
||||
pythonfound=no
|
||||
fi
|
||||
if test "x$pythonfound" = "xyes"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
|
||||
PYTHON_CFLAGS="-DHAVE_PYTHON -I$PYTHON_PREFIX/include/python$PYTHON_VERSION"
|
||||
|
||||
OLD_CPPFLAGS="$CPPFLAGS"
|
||||
@ -461,8 +452,6 @@ if test "x$python" = "xyes"; then
|
||||
if test "x$python_install" = "xyes"; then
|
||||
pkgpythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION"/site-packages/wesnoth"
|
||||
fi
|
||||
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user