Commit 76f6e80f764c62e5cfdfe4b9fe89369ab74339b7
1 parent
644649dd
use WITH_PYTHON instead of multiple conditions
Showing
2 changed files
with
3 additions
and
11 deletions
pyext/Makefile.am
| ... | ... | @@ -3,9 +3,7 @@ |
| 3 | 3 | # The actual implemented logic is to use swig if swig is |
| 4 | 4 | # available on the system |
| 5 | 5 | |
| 6 | -if ENABLE_PYTHON_BINDING | |
| 7 | -if HAVE_PYTHON | |
| 8 | -if WITH_PYTHON_BINDING | |
| 6 | +if WITH_PYTHON | |
| 9 | 7 | |
| 10 | 8 | # Set SWIG interface filename |
| 11 | 9 | SWIG_INTERFACE = ctatools.i |
| ... | ... | @@ -43,6 +41,4 @@ ctatools_wrap.cpp ctatools.py: $(SWIG_INTERFACE) |
| 43 | 41 | $(SWIG) -c++ -python -Wall -I$(prefix)/share/gammalib/swig -I$(GAMMALIB)/share/gammalib/swig -o ctatools_wrap.cpp -outdir . $(srcdir)/$(SWIG_INTERFACE) |
| 44 | 42 | endif # HAVE_SWIG |
| 45 | 43 | |
| 46 | -endif # WITH_PYTHON_BINDING | |
| 47 | -endif # HAVE_PYTHON | |
| 48 | -endif # ENABLE_PYTHON_BINDING | |
| 44 | +endif # WITH_PYTHON | ... | ... |
test/Makefile.am
| ... | ... | @@ -5,14 +5,10 @@ |
| 5 | 5 | # we use builddir/src for the generated include files to get found |
| 6 | 6 | |
| 7 | 7 | # Optional python bindings |
| 8 | -if ENABLE_PYTHON_BINDING | |
| 9 | -if HAVE_PYTHON | |
| 10 | -if WITH_PYTHON_BINDING | |
| 8 | +if WITH_PYTHON | |
| 11 | 9 | TEST_PYTHON_SCRIPT = test_python.py |
| 12 | 10 | TEST_PYTHON_ENV = PYTHONPATH=$(top_builddir)/pyext/build:$(pythondir):$(PYTHONPATH) |
| 13 | 11 | endif |
| 14 | -endif | |
| 15 | -endif | |
| 16 | 12 | |
| 17 | 13 | # Include directories |
| 18 | 14 | INCLUDES = -I$(top_srcdir)/include \ | ... | ... |