projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Use ping timeout mechanism to close connections that don't authenticate
[tinc]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
7013b99
..
1ca2f79
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,9
+1,9
@@
dnl Process this file with autoconf to produce a configure script.
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.13.2.
24 2000/11/24 23:12:56
guus Exp $
+dnl $Id: configure.in,v 1.13.2.
34 2001/06/29 10:27:57
guus Exp $
AC_INIT(src/tincd.c)
AC_INIT(src/tincd.c)
-AM_INIT_AUTOMAKE(tinc, 1.0
pre4
-cvs)
+AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
AM_CONFIG_HEADER(config.h)
dnl Include the macros from the m4/ directory
AM_CONFIG_HEADER(config.h)
dnl Include the macros from the m4/ directory
@@
-14,7
+14,7
@@
AM_ACLOCAL_INCLUDE(m4)
# in the latter don't make it into the configure-time tests.
AC_DEFINE([_GNU_SOURCE], [__USE_BSD])
# in the latter don't make it into the configure-time tests.
AC_DEFINE([_GNU_SOURCE], [__USE_BSD])
-ALL_LINGUAS="
es
nl"
+ALL_LINGUAS="nl"
dnl Checks for programs.
AC_PROG_CC
dnl Checks for programs.
AC_PROG_CC
@@
-29,6
+29,24
@@
jm_PERL
AC_ISC_POSIX
AC_ISC_POSIX
+dnl Check and set OS
+
+AC_CANONICAL_HOST
+
+case $host_os in
+ *linux*)
+ AC_DEFINE(HAVE_LINUX)
+ ;;
+ *freebsd*)
+ AC_DEFINE(HAVE_FREEBSD)
+ ;;
+ *solaris*)
+ AC_DEFINE(HAVE_SOLARIS)
+ ;;
+esac
+
+AC_CACHE_SAVE
+
dnl Checks for libraries.
dnl Checks for header files.
dnl Checks for libraries.
dnl Checks for header files.
@@
-48,17
+66,13
@@
AC_FUNC_MEMCMP
AC_FUNC_ALLOCA
AC_TYPE_SIGNAL
AC_CHECK_FUNCS([ftime socket select strtol strerror flock unsetenv \
AC_FUNC_ALLOCA
AC_TYPE_SIGNAL
AC_CHECK_FUNCS([ftime socket select strtol strerror flock unsetenv \
-asprintf putenv strdup fcloseall daemon])
+asprintf putenv strdup fcloseall daemon
strsignal get_current_dir_name
])
jm_FUNC_MALLOC
jm_FUNC_REALLOC
AM_GNU_GETTEXT
jm_FUNC_MALLOC
jm_FUNC_REALLOC
AM_GNU_GETTEXT
-dnl Crypto stuff
-tinc_OPENSSL
-
-
dnl Support for SunOS
AC_CHECK_FUNC(socket, [], [
dnl Support for SunOS
AC_CHECK_FUNC(socket, [], [
@@
-68,9
+82,11
@@
AC_CHECK_FUNC(gethostbyname, [], [
AC_CHECK_LIB(nsl, gethostbyname)
])
AC_CHECK_LIB(nsl, gethostbyname)
])
+AC_CACHE_SAVE
-dnl
Check for TUN/TAP support in the kernel
+dnl
These are defined in files in m4/
tinc_TUNTAP
tinc_TUNTAP
+tinc_OPENSSL
dnl Check if checkpoint tracing has to be enabled
AC_ARG_ENABLE(tracing,
dnl Check if checkpoint tracing has to be enabled
AC_ARG_ENABLE(tracing,
@@
-80,6
+96,13
@@
AC_ARG_ENABLE(tracing,
AC_SUBST(INCLUDES)
AC_SUBST(INCLUDES)
-AC_OUTPUT([Makefile src/Makefile
-doc/Makefile doc/es/Makefile intl/Makefile lib/Makefile
-m4/Makefile po/Makefile.in redhat/Makefile debian/Makefile])
+AC_OUTPUT(Makefile
+src/Makefile
+doc/Makefile
+doc/es/Makefile
+intl/Makefile
+lib/Makefile
+m4/Makefile
+po/Makefile.in
+redhat/Makefile
+debian/Makefile)