summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2007-05-02 02:03:44 +0000
committerSimon Howard2007-05-02 02:03:44 +0000
commit85a709203c997834db1cbd8b4d6a979197306111 (patch)
tree2890a3f24f004d5cf6979a780d647ba72e759944
parentd3d5b27ce6830ee2c41256bef2c9b7fc041cfa04 (diff)
downloadchocolate-doom-85a709203c997834db1cbd8b4d6a979197306111.tar.gz
chocolate-doom-85a709203c997834db1cbd8b4d6a979197306111.tar.bz2
chocolate-doom-85a709203c997834db1cbd8b4d6a979197306111.zip
Check in autoconf if python is installed; if not, don't run python
scripts. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 873
-rw-r--r--Makefile.am4
-rw-r--r--configure.in3
-rw-r--r--man/Makefile.am5
-rw-r--r--setup/Makefile.am4
-rw-r--r--src/Makefile.am4
5 files changed, 20 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index df63791b..1e199d1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,10 @@ MAINTAINERCLEANFILES = $(AUX_DIST_GEN)
docdir=$(prefix)/share/doc/@PACKAGE@
SUBDIRS=textscreen pcsound src man setup
+if HAVE_PYTHON
+
CMDLINE : src/
./man/docgen -p src/ > $@
+endif
+
diff --git a/configure.in b/configure.in
index ca9dffe6..9ed01939 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,12 @@
AC_INIT(Chocolate Doom, 0.2.0, fraggle@gmail.com, chocolate-doom)
+
AC_CONFIG_AUX_DIR(autotools)
orig_CFLAGS="$CFLAGS"
AC_PROG_CC
AC_PROG_RANLIB
+AC_CHECK_PROG(HAVE_PYTHON, python, true, false)
OPT_LEVEL=2
@@ -44,6 +46,7 @@ AC_CHECK_LIB(SDL_net,SDLNet_UDP_Send,[
AC_CHECK_TOOL(WINDRES, windres, )
AM_CONDITIONAL(HAVE_WINDRES, test "$WINDRES" != "")
+AM_CONDITIONAL(HAVE_PYTHON, $HAVE_PYTHON)
AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME,AC_PACKAGE_VERSION)
diff --git a/man/Makefile.am b/man/Makefile.am
index 91880e50..6bae790b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -5,6 +5,11 @@ man_MANS=chocolate-doom.6
EXTRA_DIST = $(man_MANS) $(MANPAGE_GEN_FILES)
+
+if HAVE_PYTHON
+
chocolate-doom.6: ../src $(MANPAGE_GEN_FILES)
./docgen -m ../src > $@
+endif
+
diff --git a/setup/Makefile.am b/setup/Makefile.am
index 76120822..d5eebfbf 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -34,6 +34,10 @@ endif
%.o : %.rc
$(WINDRES) $^ -o $@
+if HAVE_PYTHON
+
chocolate_setup_icon.c : ../data/chocolate-setup.png
../data/convert-icon $^ $@
+endif
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 335cf869..b3ef5c25 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -150,6 +150,10 @@ EXTRA_DIST = \
%.o : %.rc
$(WINDRES) $^ -o $@
+if HAVE_PYTHON
+
chocolate_doom_icon.c : ../data/chocolate-doom.png
../data/convert-icon $^ $@
+endif
+