server/keyexch.c: Check that all of the algorithms match when setting up.

[tripe] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c3d5bf6726453f92a9d2af64f3318aed0c4496a5..e00e796bf64314cc0f66f3550fccc3794487cae9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,9 +41,7 @@ SUBDIRS                       += pkstream
 SUBDIRS                        += init
 
 ## Path MTU discovery.
-if PATHMTU
 SUBDIRS                        += pathmtu
-endif
 
 ## Wireshark.
 if HAVE_WIRESHARK
@@ -52,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
@@ -74,7 +82,7 @@ SUBDIRS                       += contrib
 SUBDIRS                        += t
 
 ###--------------------------------------------------------------------------
-### The pkg-config file.
+### Package-configuration file.
 
 pkgconfigdir            = $(libdir)/pkgconfig
 pkgconfig_DATA          = tripe.pc
@@ -86,7 +94,7 @@ tripe.pc: tripe.pc.in Makefile
                mv $@.new $@
 
 ###--------------------------------------------------------------------------
-### Release tweaking.
+### Distribution.
 
 ## Distcheck tweaks.
 DISTCHECK_TUNNELS       = slip
@@ -111,6 +119,8 @@ EXTRA_DIST          += debian/rules
 EXTRA_DIST             += debian/control
 EXTRA_DIST             += debian/changelog
 EXTRA_DIST             += debian/copyright
+EXTRA_DIST             += debian/compat
+EXTRA_DIST             += debian/source/format
 
 ## pkstream
 EXTRA_DIST             += debian/pkstream.copyright
@@ -137,8 +147,8 @@ EXTRA_DIST          += debian/tripe-keys.install
 EXTRA_DIST             += debian/python-tripe.install
 
 ## peer services
-EXTRA_DIST             += debian/tripe-peer-services.dirs
 EXTRA_DIST             += debian/tripe-peer-services.install
+EXTRA_DIST             += debian/tripe-peer-services.postinst
 
 ## monitor
 EXTRA_DIST             += debian/tripemon.install