server/admin.c, server/tripe-admin.5.in: Fix PEERINFO segfault.

[tripe] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3984556b47f68aed0efc473b445e4793e9c8c475..1576daa99d918a851efd8be2b513083240a4a517 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
@@ -67,6 +65,9 @@ if HAVE_PYGTK
 SUBDIRS                        += mon
 endif
 
+## Contributed stuff.
+SUBDIRS                        += contrib
+
 ## Testing.
 SUBDIRS                        += t
 
@@ -86,7 +87,7 @@ tripe.pc: tripe.pc.in Makefile
 ### Release tweaking.
 
 ## Distcheck tweaks.
-DISTCHECK_TUNNELS       = linux bsd unet slip
+DISTCHECK_TUNNELS       = slip
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-tunnel='$(DISTCHECK_TUNNELS)' \