chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/privsep.c: Bring SIGCHLD handler in-line.
[tripe]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 5b5eaa2cb94fbe791f9bf785c4ce89a7e5212764..3ca6cf6cb04526ef18c4d15cb7d89125f7e5acd3 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-31,6
+31,7
@@
AC_INIT([tripe], AUTO_VERSION, [mdw@distorted.org.uk])
AC_CONFIG_SRCDIR([server/tripe.h])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_SRCDIR([server/tripe.h])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([foreign])
+mdw_SILENT_RULES
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CC
AM_PROG_CC_C_O
@@
-40,6
+41,11
@@
AM_PROG_LIBTOOL
AC_CHECK_PROGS([AUTOM4TE], [autom4te])
AC_CHECK_PROGS([AUTOM4TE], [autom4te])
+mdw_ORIG_CFLAGS=$CFLAGS
+mdw_ORIG_CPPFLAGS=$CPPFLAGS
+AC_SUBST(AM_CFLAGS)
+AC_SUBST(AM_CPPFLAGS)
+
dnl--------------------------------------------------------------------------
dnl C programming environment.
dnl--------------------------------------------------------------------------
dnl C programming environment.
@@
-50,18
+56,17
@@
AC_SEARCH_LIBS([socket], [socket])
case "$host_os" in
linux)
AC_ARG_WITH([linux-includes],
case "$host_os" in
linux)
AC_ARG_WITH([linux-includes],
- AS_HELP_STRING(
+ AS_HELP_STRING(
[--with-linux-includes=DIR],
[Linux kernel includes]),
[--with-linux-includes=DIR],
[Linux kernel includes]),
- [
CFLAGS="$C
FLAGS -I$withval"], [:])
+ [
AM_CPPFLAGS="AM_CPP
FLAGS -I$withval"], [:])
;;
esac
;;
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])
PKG_CHECK_MODULES([catacomb], [catacomb >= 2.1.1])
-CFLAGS="$CFLAGS $mLib_CFLAGS $catacomb_CFLAGS"
-LIBS="$LIBS $mLib_LIBS"
+AM_CFLAGS="$AM_CFLAGS $mLib_CFLAGS $catacomb_CFLAGS"
dnl--------------------------------------------------------------------------
dnl Directories to install things into.
dnl--------------------------------------------------------------------------
dnl Directories to install things into.
@@
-90,8
+95,9
@@
TRIPE_DEFINE_PATH(
[pidfile], [FILE], [process-id [[./tripectl.pid]]], [tripectl.pid])
TRIPE_DEFINE_PATH(
[pidfile], [FILE], [process-id [[./tripectl.pid]]], [tripectl.pid])
TRIPE_DEFINE_PATH(
- [initconfig], [FILE], [configuration for init script [[/etc/tripe.conf]]],
- [/etc/tripe.conf])
+ [initconfig], [FILE],
+ [configuration for init script [[SYSCONFDIR/tripe.conf]]],
+ ['${sysconfdir}/tripe.conf'])
TRIPE_DEFINE_PATH(
[logfile], [FILE], [logging output [[./tripe.log]]], [tripe.log])
TRIPE_DEFINE_PATH(
[logfile], [FILE], [logging output [[./tripe.log]]], [tripe.log])
@@
-116,6
+122,19
@@
AC_ARG_WITH([tracing],
AC_DEFINE([NTRACE], [1], [Disable all 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.
dnl--------------------------------------------------------------------------
dnl Tunnel devices.
@@
-236,7
+255,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
@@
-282,7
+301,7
@@
case "$haveshark,$needshark" in
AC_MSG_ERROR([failed to configure Wireshark plugin])
;;
yes,*)
AC_MSG_ERROR([failed to configure Wireshark plugin])
;;
yes,*)
- WIRESHARK_CFLAGS="$
CFLAGS $
GLIB_CFLAGS $mdw_cv_wireshark_includes"
+ WIRESHARK_CFLAGS="$GLIB_CFLAGS $mdw_cv_wireshark_includes"
AC_SUBST(WIRESHARK_CFLAGS)
AC_SUBST(wireshark_plugindir)
;;
AC_SUBST(WIRESHARK_CFLAGS)
AC_SUBST(wireshark_plugindir)
;;
@@
-293,6
+312,9
@@
AM_CONDITIONAL([HAVE_WIRESHARK], [test "$haveshark" = yes])
dnl--------------------------------------------------------------------------
dnl Produce output.
dnl--------------------------------------------------------------------------
dnl Produce output.
+CFLAGS=$mdw_ORIG_CFLAGS
+CPPFLAGS=$mdw_ORIG_CPPFLAGS
+
AC_CONFIG_HEADER([config/config.h])
AC_CONFIG_TESTDIR([t])
AC_CONFIG_HEADER([config/config.h])
AC_CONFIG_TESTDIR([t])
@@
-300,6
+322,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]
@@
-307,7
+330,10
@@
AC_CONFIG_FILES(
[pkstream/Makefile]
[wireshark/Makefile]
[init/Makefile]
[pkstream/Makefile]
[wireshark/Makefile]
[init/Makefile]
+ [py/Makefile]
+ [peerdb/Makefile]
[keys/Makefile]
[keys/Makefile]
+ [svc/Makefile]
[mon/Makefile]
[t/Makefile t/atlocal])
AC_OUTPUT
[mon/Makefile]
[t/Makefile t/atlocal])
AC_OUTPUT