From 207f030a4f7085c1d2935e551ac9320cc44b24f7 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 20 Feb 2016 17:17:51 +0000
Subject: [PATCH] configure.ac, Makefile.am: More subsetting based on module
 availability.

Also check the mLib and CDB modules.
---
 Makefile.am  | 12 +++++++++++-
 configure.ac |  6 +++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dbfa5121..4c9a749c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,20 +50,30 @@ endif
 
 ## Services.
 if HAVE_PYTHON
-SUBDIRS			+= svc
+if HAVE_PYMLIB
 SUBDIRS			+= py
+if HAVE_PYCDB
 SUBDIRS			+= peerdb
+SUBDIRS			+= svc
+endif
+endif
 endif
 
 ## Key-management.
+if HAVE_PYTHON
 if HAVE_PYCATACOMB
 SUBDIRS			+= keys
 endif
+endif
 
 ## Graphical monitor.
+if HAVE_PYTHON
+if HAVE_PYMLIB
 if HAVE_PYGTK
 SUBDIRS			+= mon
 endif
+endif
+endif
 
 ## Contributed stuff.
 SUBDIRS			+= contrib
diff --git a/configure.ac b/configure.ac
index 004304cd..6f11c663 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,12 +181,16 @@ dnl Find out whether Python exists at all.
 AM_PATH_PYTHON([2.4], [python=yes], [python=no])
 AM_CONDITIONAL([HAVE_PYTHON], [test $python = yes])
 
-dnl Find out whether we can use Catacomb and GTK.
+dnl Find out whether we can use the various external modules.
 if test $python = yes; then
   AC_PYTHON_MODULE([pygtk])
+  AC_PYTHON_MODULE([cdb])
+  AC_PYTHON_MODULE([mLib])
   AC_PYTHON_MODULE([catacomb])
 fi
 AM_CONDITIONAL([HAVE_PYGTK], [test ${HAVE_PYMOD_PYGTK-no} = yes])
+AM_CONDITIONAL([HAVE_PYCDB], [test ${HAVE_PYMOD_CDB-no} = yes])
+AM_CONDITIONAL([HAVE_PYMLIB], [test ${HAVE_PYMOD_MLIB-no} = yes])
 AM_CONDITIONAL([HAVE_PYCATACOMB], [test ${HAVE_PYMOD_CATACOMB-no} = yes])
 
 dnl--------------------------------------------------------------------------
-- 
2.11.0