Removed use of AM_PYTHON_PATH...
as it makes autotools fail if no python is present.
This commit is contained in:
parent
f3c4939a01
commit
64ddf173c2
2 changed files with 6 additions and 1 deletions
|
@ -144,8 +144,10 @@ ACLOCAL_AMFLAGS = -I m4
|
|||
|
||||
EXTRA_DIST = config/config.rpath config/mkinstalldirs config/py-compile
|
||||
|
||||
if PYTHON
|
||||
pkgpython_PYTHON = data/tools/wmltools.py data/tools/wmldata.py data/tools/wmlparser.py \
|
||||
data/tools/__init__.py
|
||||
endif
|
||||
|
||||
update-po:
|
||||
@cd po && make $@ || exit $?
|
||||
|
|
|
@ -54,7 +54,6 @@ AC_CANONICAL_TARGET
|
|||
AM_INIT_AUTOMAKE([1.9 tar-ustar foreign])
|
||||
AM_GNU_GETTEXT([external])
|
||||
AC_PROG_RANLIB
|
||||
AM_PATH_PYTHON
|
||||
|
||||
#######################################################################
|
||||
# Configuration options #
|
||||
|
@ -408,6 +407,10 @@ if test "x$python" = "xyes"; then
|
|||
AC_MSG_WARN(*** Python development libraries required, Python support disabled)
|
||||
fi
|
||||
AC_SUBST([PYTHON_LIBS])
|
||||
|
||||
AC_SUBST(pkgpythondir)
|
||||
pkgpythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION"/site-packages"
|
||||
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
Loading…
Add table
Reference in a new issue