X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/63efe3ef63f9446848c3cfdc0600ed8301edf8c2..6005ef9bfba49124a25825a5b044d4f4cbf02792:/configure.ac

diff --git a/configure.ac b/configure.ac
index 40fa5827..ac12dbec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,8 @@ AX_CFLAGS_WARN_ALL
 AC_CANONICAL_HOST
 AM_PROG_LIBTOOL
 
+AC_CHECK_PROGS([AUTOM4TE], [autom4te])
+
 dnl--------------------------------------------------------------------------
 dnl C programming environment.
 
@@ -55,11 +57,10 @@ case "$host_os" in
     ;;
 esac
 
-PKG_CHECK_MODULES([mLib], [mLib >= 2.0.4])
+PKG_CHECK_MODULES([mLib], [mLib >= 2.1.0])
 PKG_CHECK_MODULES([catacomb], [catacomb >= 2.1.1])
 
 CFLAGS="$CFLAGS $mLib_CFLAGS $catacomb_CFLAGS"
-LIBS="$LIBS $mLib_LIBS"
 
 dnl--------------------------------------------------------------------------
 dnl Directories to install things into.
@@ -95,6 +96,15 @@ TRIPE_DEFINE_PATH(
   [logfile], [FILE], [logging output [[./tripe.log]]], [tripe.log])
 
 dnl--------------------------------------------------------------------------
+dnl Privilege-separation helper.
+
+mdw_DEFINE_PATHS([
+  AC_DEFINE_UNQUOTED([PRIVSEP_HELPER],
+    ["mdw_PATH([$libexecdir])/mdw_PROG([tripe-privhelper])"],
+    [Pathname of privilege-separation helper.])
+])
+
+dnl--------------------------------------------------------------------------
 dnl Other options.
 
 AC_ARG_WITH([tracing],
@@ -106,6 +116,19 @@ AC_ARG_WITH([tracing],
 	    [:])
 
 dnl--------------------------------------------------------------------------
+dnl Path MTU discovery.
+
+case $host_os in
+  linux*)
+    pmtu=yes
+    ;;
+  *)
+    pmtu=no
+    ;;
+esac
+AM_CONDITIONAL([PATHMTU], [test $pmtu = yes])
+
+dnl--------------------------------------------------------------------------
 dnl Tunnel devices.
 
 dnl Provide the user with a choice.
@@ -225,7 +248,7 @@ esac
 
 dnl If we're still interested, find Glib.
 case "$haveshark" in
-  yes) AM_PATH_GLIB([1.2.0], [], haveshark=false, [gmodule]) ;;
+  yes) AM_PATH_GLIB_2_0([2.4.0], [], [haveshark=false], [gmodule]) ;;
 esac
 
 dnl Find the include directory.  This would be much easier if they just
@@ -283,18 +306,26 @@ dnl--------------------------------------------------------------------------
 dnl Produce output.
 
 AC_CONFIG_HEADER([config/config.h])
+AC_CONFIG_TESTDIR([t])
 
 AC_CONFIG_FILES(
   [Makefile]
   [common/Makefile]
+  [uslip/Makefile]
+  [pathmtu/Makefile]
   [client/Makefile]
+  [priv/Makefile]
   [server/Makefile]
   [proxy/Makefile]
   [pkstream/Makefile]
   [wireshark/Makefile]
   [init/Makefile]
+  [py/Makefile]
+  [peerdb/Makefile]
   [keys/Makefile]
-  [mon/Makefile])
+  [svc/Makefile]
+  [mon/Makefile]
+  [t/Makefile t/atlocal])
 AC_OUTPUT
 
 dnl ----- That's all, folks -------------------------------------------------