upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-30 19:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-simplification. make install works.

Browse Source
This commit is contained in:
Eric S. Raymond 2008-01-10 23:09:30 +00:00
parent d6317e9315
commit 2125ea0cb9
1 changed files with 31 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -414,15 +414,6 @@ if test "x$python" = "xyes"; then
PYTHON_VERSION="${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" PYTHON_VERSION="${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}"
AC_MSG_RESULT([$PYTHON, $PYTHON_VERSION, $PYTHON_PREFIX]) 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" PYTHON_CFLAGS="-DHAVE_PYTHON -I$PYTHON_PREFIX/include/python$PYTHON_VERSION"
OLD_CPPFLAGS="$CPPFLAGS" OLD_CPPFLAGS="$CPPFLAGS"
@ -461,8 +452,6 @@ if test "x$python" = "xyes"; then
if test "x$python_install" = "xyes"; then if test "x$python_install" = "xyes"; then
pkgpythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION"/site-packages/wesnoth" pkgpythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION"/site-packages/wesnoth"
fi fi
fi
fi fi
fi fi
fi fi