configure.ac, Makefile.am: More subsetting based on module availability.

Also check the mLib and CDB modules.

diff --git a/Makefile.am b/Makefile.am
index dbfa5121d93191feadc7d4b2f66128e07c1fc6a4..4c9a749cae352cce192845fd03f5fba4c8c6e290 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,20 +50,30 @@ endif
 
 ## Services.
 if HAVE_PYTHON
 
 ## Services.
 if HAVE_PYTHON

-SUBDIRS                        += svc
+if HAVE_PYMLIB

 SUBDIRS                        += py
 SUBDIRS                        += py

+if HAVE_PYCDB

 SUBDIRS                        += peerdb
 SUBDIRS                        += peerdb

+SUBDIRS                        += svc
+endif
+endif

 endif
 
 ## Key-management.
 endif
 
 ## Key-management.

+if HAVE_PYTHON

 if HAVE_PYCATACOMB
 SUBDIRS                        += keys
 endif
 if HAVE_PYCATACOMB
 SUBDIRS                        += keys
 endif

+endif

 
 ## Graphical monitor.
 
 ## Graphical monitor.

+if HAVE_PYTHON
+if HAVE_PYMLIB

 if HAVE_PYGTK
 SUBDIRS                        += mon
 endif
 if HAVE_PYGTK
 SUBDIRS                        += mon
 endif

+endif
+endif

 
 ## Contributed stuff.
 SUBDIRS                        += contrib
 
 ## Contributed stuff.
 SUBDIRS                        += contrib

diff --git a/configure.ac b/configure.ac
index 004304cde6c997502b1b6ca5526194c039688dc0..6f11c6639c43672bd621ce1717ef3374f120dccc 100644 (file)
--- 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])
 
 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])
 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])
   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--------------------------------------------------------------------------
 AM_CONDITIONAL([HAVE_PYCATACOMB], [test ${HAVE_PYMOD_CATACOMB-no} = yes])
 
 dnl--------------------------------------------------------------------------