~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'privsep'
[tripe]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
5b5eaa2
..
61ed4a8
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"
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.
dnl--------------------------------------------------------------------------
dnl Directories to install things into.
@@
-117,6
+116,19
@@
AC_ARG_WITH([tracing],
[:])
dnl--------------------------------------------------------------------------
[:])
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.
dnl Tunnel devices.
dnl Provide the user with a choice.
@@
-236,7
+248,7
@@
esac
dnl If we're still interested, find Glib.
case "$haveshark" in
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
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]
[Makefile]
[common/Makefile]
[uslip/Makefile]
+ [pathmtu/Makefile]
[client/Makefile]
[priv/Makefile]
[server/Makefile]
[client/Makefile]
[priv/Makefile]
[server/Makefile]