Address bug #9296 by adding a switch to disable Python module installation.
This commit is contained in:
parent
40ea4c02ff
commit
822439e8ee
2 changed files with 7 additions and 14 deletions
|
@ -140,7 +140,7 @@ ACLOCAL_AMFLAGS = -I m4
|
|||
|
||||
EXTRA_DIST = config/config.rpath config/mkinstalldirs config/py-compile
|
||||
|
||||
if PYTHON
|
||||
if PYTHON_INSTALL
|
||||
pkgpython_PYTHON = data/tools/wesnoth/wmltools.py \
|
||||
data/tools/wesnoth/wmldata.py \
|
||||
data/tools/wesnoth/wmlparser.py \
|
||||
|
|
19
configure.ac
19
configure.ac
|
@ -79,6 +79,11 @@ AC_ARG_ENABLE([python],
|
|||
[python=$enableval],
|
||||
[python=yes])
|
||||
|
||||
AC_ARG_ENABLE([python_install],
|
||||
AS_HELP_STRING([--disable-python-install], [disable installation of Python developer tools]),
|
||||
[python_install=$enableval],
|
||||
[python_install=yes])
|
||||
|
||||
AC_ARG_ENABLE([lite],
|
||||
AS_HELP_STRING([--enable-lite], [enable lite version of wesnoth (without music or large images)]),
|
||||
[lite=$enableval],
|
||||
|
@ -241,6 +246,7 @@ AC_ARG_ENABLE([display-revision],
|
|||
[svnrev=no])
|
||||
|
||||
AM_CONDITIONAL([STATIC], [test x$static = xyes])
|
||||
AM_CONDITIONAL([PYTHON_INSTALL], [test x$python_install = xyes])
|
||||
AM_CONDITIONAL([GAME], [test x$game = xyes])
|
||||
AM_CONDITIONAL([SERVER], [test x$server = xyes])
|
||||
AM_CONDITIONAL([CAMPAIGNSERVER], [test x$campaignserver = xyes])
|
||||
|
@ -807,19 +813,6 @@ if test "x$lite" = "xno"; then
|
|||
fi
|
||||
fi
|
||||
|
||||
#######################################################################
|
||||
# Make UNUSED available for suppressing warnings of unused parameters #
|
||||
#######################################################################
|
||||
|
||||
AH_VERBATIM([_GNU_SOURCE],
|
||||
[/* Macro for declaring function arguments unused. */
|
||||
#if defined(__GNUC__)
|
||||
# define UNUSED __attribute__((unused)) /* Flag variable as unused */
|
||||
#else /* not __GNUC__ */
|
||||
# define UNUSED
|
||||
#endif
|
||||
])
|
||||
|
||||
#######################################################################
|
||||
# Tune gettext stuff for our needs #
|
||||
#######################################################################
|
||||
|
|
Loading…
Add table
Reference in a new issue