Allow building without python-devel.

The patch below adds a check for presence of Python.h to configure.ac
and applies automake-conditionals to switch off building rpm's python
bindings if Python.h can't be found.

Patch from Ralf Corsepius.

diff --git a/configure.ac b/configure.ac
index 5cef373..005f8f5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -863,13 +863,20 @@ else
   WITH_PYTHON_LIB=`${__PYTHON} -c 'from distutils.sysconfig import *; print get_python_lib(1)'` 
   WITH_PYTHON_SUBDIR=python
   WITH_PYTHON_SUBPACKAGE=1
+  save_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS -I$WITH_PYTHON_INCLUDE"
+  AC_CHECK_HEADER([Python.h],
+    [WITH_PYTHON_SUBPACKAGE=1],
+    [WITH_PYTHON_SUBPACKAGE=0])
+  CPPFLAGS="$save_CPPFLAGS"
 fi
 
 AC_SUBST(WITH_PYTHON_SUBDIR)
-AC_SUBST(WITH_PYTHON_SUBPACKAGE)
 AC_SUBST(WITH_PYTHON_INCLUDE)
 AC_SUBST(WITH_PYTHON_LIB)
 
+AM_CONDITIONAL(PYTHON,[test "$WITH_PYTHON_SUBPACKAGE" = "1"])
+
 AC_PATH_PROG(__DOXYGEN, doxygen, no, $PATH)
 dnl
 dnl Auto-detect whether doxygen generated API docs should be included.

diff --git a/python/Makefile.am b/python/Makefile.am
index a143b2b..b6b647b 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -2,11 +2,10 @@
 
 LINT = splint
 
+if PYTHON
 pylibdir = @WITH_PYTHON_LIB@
 pyincdir = @WITH_PYTHON_INCLUDE@
 
-SUBDIRS = 
-
 EXTRA_DIST = system.h rpmdebug-py.c rpm/__init__.py
 
 AM_CPPFLAGS = -I. \
@@ -61,3 +60,5 @@ splint_srcs = \
 .PHONY:        lint
 lint:
        $(LINT) $(DEFS) $(AM_CPPFLAGS) $(splint_srcs)
+
+endif