ref: 27b06c5711ad73900f01727b335aef5e8049be84
parent: 5bf73c4864fedb6b97b27bf302435a1168ba8f4c
parent: cfc56fa6a5809c2dbc7276df3579836e586d9193
author: Simon Howard <fraggle@soulsphere.org>
date: Tue Jun 23 16:04:02 EDT 2020
Merge pull request #1294 from vilhelmgray/breakout_HAVE_PYTHON Introduce configure options for bash-completion, doc, fonts, and icons
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,7 @@
DIST_SUBDIRS=pkg $(SUBDIRS)
-if HAVE_PYTHON
+if HAVE_DOC
INSTALL : man/INSTALL.template man/simplecpp
./man/simplecpp -DDOOM -DHERETIC -DHEXEN -DSTRIFE \
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,50 @@
PKG_CHECK_MODULES(SDLMIXER, [SDL2_mixer >= 2.0.0])
PKG_CHECK_MODULES(SDLNET, [SDL2_net >= 2.0.0])
+# Check for bash-completion.
+AC_ARG_ENABLE([bash-completion],
+AS_HELP_STRING([--disable-bash-completion], [Disable bash-completion])
+)
+AS_IF([test "x$enable_bash_completion" != xno], [
+ AS_IF([test HAVE_PYTHON = false], [
+ AC_MSG_WARN([Building bash-completion requires Python, but Python not found])
+ enable_bash_completion=no
+ ])
+])
+
+# Check for doc.
+AC_ARG_ENABLE([doc],
+AS_HELP_STRING([--disable-doc], [Disable documentation])
+)
+AS_IF([test "x$enable_doc" != xno], [
+ AS_IF([test HAVE_PYTHON = false], [
+ AC_MSG_WARN([Building documentation requires Python, but Python not found])
+ enable_doc=no
+ ])
+])
+
+# Check for fonts.
+AC_ARG_ENABLE([fonts],
+AS_HELP_STRING([--disable-fonts], [Disable fonts])
+)
+AS_IF([test "x$enable_fonts" != xno], [
+ AS_IF([test HAVE_PYTHON = false], [
+ AC_MSG_WARN([Building fonts require Python, but Python not found])
+ enable_fonts=no
+ ])
+])
+
+# Check for icons.
+AC_ARG_ENABLE([icons],
+AS_HELP_STRING([--disable-icons], [Disable icons])
+)
+AS_IF([test "x$enable_icons" != xno], [
+ AS_IF([test HAVE_PYTHON = false], [
+ AC_MSG_WARN([Building icons require Python, but Python not found])
+ enable_icons=no
+ ])
+])
+
# Check for libsamplerate.
AC_ARG_WITH([libsamplerate],
AS_HELP_STRING([--without-libsamplerate],
@@ -106,7 +150,10 @@
])
AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "")
-AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON)
+AM_CONDITIONAL(HAVE_BASH_COMPLETION, [test "x$enable_bash_completion" != xno])
+AM_CONDITIONAL(HAVE_DOC, [test "x$enable_doc" != xno])
+AM_CONDITIONAL(HAVE_FONTS, [test "x$enable_fonts" != xno])
+AM_CONDITIONAL(HAVE_ICONS, [test "x$enable_icons" != xno])
dnl Automake v1.8.0 is required, please upgrade!
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -15,7 +15,7 @@
hexendocsdir = ${docdir}/../${PROGRAM_PREFIX}hexen strifedocsdir = ${docdir}/../${PROGRAM_PREFIX}strife-if HAVE_PYTHON
+if HAVE_DOC
GENERATED_MAN_PAGES = \
@PROGRAM_PREFIX@doom.6 \
--- a/man/bash-completion/Makefile.am
+++ b/man/bash-completion/Makefile.am
@@ -6,7 +6,7 @@
hexen.template \
strife.template
-if HAVE_PYTHON
+if HAVE_BASH_COMPLETION
BASH_COMPLETION_SCRIPTLETS = \
@PROGRAM_PREFIX@doom \
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -271,7 +271,7 @@
%.o : %.rc
$(WINDRES) $< -o $@
-if HAVE_PYTHON
+if HAVE_ICONS
icon.c : $(top_builddir)/data/doom.png
$(top_builddir)/data/convert-icon $(top_builddir)/data/doom.png $@
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -33,7 +33,7 @@
@PACKAGE_RDNS@.Setup.desktop : Setup.desktop
cp Setup.desktop $@
-if HAVE_PYTHON
+if HAVE_ICONS
setup_icon.c : $(top_builddir)/data/setup.png
$(top_builddir)/data/convert-icon $(top_builddir)/data/setup.png $@
--- a/textscreen/fonts/Makefile.am
+++ b/textscreen/fonts/Makefile.am
@@ -3,7 +3,7 @@
noinst_DATA = $(FONT_HDRS)
-if HAVE_PYTHON
+if HAVE_FONTS
small.h: small.png convert-font
./convert-font small small.png small.h