server/tripe-admin.5: Describe the quoting convention.

[tripe] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5b5eaa2cb94fbe791f9bf785c4ce89a7e5212764..61ed4a8fd1c1c25119d33bcd6989b15b9cc64d09 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,6 @@ PKG_CHECK_MODULES([mLib], [mLib >= 2.0.4])
 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.
@@ -116,6 +115,19 @@ AC_ARG_WITH([tracing],
              AC_DEFINE([NTRACE], [1], [Disable all 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.
 
@@ -236,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
@@ -300,6 +312,7 @@ AC_CONFIG_FILES(
   [Makefile]
   [common/Makefile]
   [uslip/Makefile]
+  [pathmtu/Makefile]
   [client/Makefile]
   [priv/Makefile]
   [server/Makefile]