X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/63efe3ef63f9446848c3cfdc0600ed8301edf8c2..b2ff8dd7bd5315a286b862b7846a34f540c89425:/configure.ac diff --git a/configure.ac b/configure.ac index 40fa5827..c285d619 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. @@ -225,7 +227,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,10 +285,12 @@ dnl-------------------------------------------------------------------------- dnl Produce output. AC_CONFIG_HEADER([config/config.h]) +AC_CONFIG_TESTDIR([t]) AC_CONFIG_FILES( [Makefile] [common/Makefile] + [uslip/Makefile] [client/Makefile] [server/Makefile] [proxy/Makefile] @@ -294,7 +298,8 @@ AC_CONFIG_FILES( [wireshark/Makefile] [init/Makefile] [keys/Makefile] - [mon/Makefile]) + [mon/Makefile] + [t/Makefile t/atlocal]) AC_OUTPUT dnl ----- That's all, folks -------------------------------------------------