From 76f6e80f764c62e5cfdfe4b9fe89369ab74339b7 Mon Sep 17 00:00:00 2001
From: knodlseder <>
Date: Wed, 6 Jul 2011 19:30:09 +0000
Subject: [PATCH] use WITH_PYTHON instead of multiple conditions

---
 pyext/Makefile.am | 8 ++------
 test/Makefile.am  | 6 +-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/pyext/Makefile.am b/pyext/Makefile.am
index bee50c1..6c43a87 100755
--- a/pyext/Makefile.am
+++ b/pyext/Makefile.am
@@ -3,9 +3,7 @@
 # The actual implemented logic is to use swig if swig is
 # available on the system
 
-if ENABLE_PYTHON_BINDING
-if HAVE_PYTHON
-if WITH_PYTHON_BINDING
+if WITH_PYTHON
 
 # Set SWIG interface filename
 SWIG_INTERFACE = ctatools.i
@@ -43,6 +41,4 @@ ctatools_wrap.cpp ctatools.py: $(SWIG_INTERFACE)
 	$(SWIG) -c++ -python -Wall -I$(prefix)/share/gammalib/swig -I$(GAMMALIB)/share/gammalib/swig -o ctatools_wrap.cpp -outdir . $(srcdir)/$(SWIG_INTERFACE)
 endif # HAVE_SWIG
 
-endif # WITH_PYTHON_BINDING
-endif # HAVE_PYTHON
-endif # ENABLE_PYTHON_BINDING
+endif # WITH_PYTHON
diff --git a/test/Makefile.am b/test/Makefile.am
index 82bb471..dda793b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -5,14 +5,10 @@
 # we use builddir/src for the generated include files to get found
 
 # Optional python bindings
-if ENABLE_PYTHON_BINDING
-if HAVE_PYTHON
-if WITH_PYTHON_BINDING
+if WITH_PYTHON
   TEST_PYTHON_SCRIPT = test_python.py
   TEST_PYTHON_ENV    = PYTHONPATH=$(top_builddir)/pyext/build:$(pythondir):$(PYTHONPATH)
 endif
-endif
-endif
 
 # Include directories
 INCLUDES = -I$(top_srcdir)/include \
--
libgit2 0.21.4