projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use splay trees instead of AVL trees.
[tinc]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
4bddb0b
..
a29a88f
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-2,23
+2,20
@@
dnl Process this file with autoconf to produce a configure script.
dnl $Id$
dnl $Id$
-AC_PREREQ(2.
59
)
+AC_PREREQ(2.
61
)
AC_INIT
AC_CONFIG_SRCDIR([src/tincd.c])
AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
AC_INIT
AC_CONFIG_SRCDIR([src/tincd.c])
AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
-dnl Include the macros from the m4/ directory
-AM_ACLOCAL_INCLUDE(m4)
-
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.1
2
.1)
+AM_GNU_GETTEXT_VERSION(0.1
4
.1)
# Enable GNU extensions.
# Define this here, not in acconfig's @TOP@ section, since definitions
# in the latter don't make it into the configure-time tests.
# Enable GNU extensions.
# Define this here, not in acconfig's @TOP@ section, since definitions
# in the latter don't make it into the configure-time tests.
-AC_
DEFINE([_GNU_SOURCE], 1, [Enable GNU extenstions])
+AC_
GNU_SOURCE
AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
ALL_LINGUAS="nl"
AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
ALL_LINGUAS="nl"
@@
-26,15
+23,10
@@
ALL_LINGUAS="nl"
dnl Checks for programs.
AC_PROG_CC
AC_PROG_CPP
dnl Checks for programs.
AC_PROG_CC
AC_PROG_CPP
-AC_PROG_GCC_TRADITIONAL
-AC_PROG_AWK
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_INSTALL
AC_PROG_LN_S
-AC_PROG_MAKE_SET
AC_PROG_RANLIB
AC_PROG_RANLIB
-AC_ISC_POSIX
-
dnl Check and set OS
#AC_CANONICAL_HOST
dnl Check and set OS
#AC_CANONICAL_HOST
@@
-46,11
+38,11
@@
case $host_os in
;;
*freebsd*)
AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD])
;;
*freebsd*)
AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD])
- [ rm -f src/device.c; ln -sf
free
bsd/device.c src/device.c ]
+ [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
;;
*darwin*)
AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
;;
*darwin*)
AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
- [ rm -f src/device.c; ln -sf
darwin
/device.c src/device.c ]
+ [ rm -f src/device.c; ln -sf
bsd
/device.c src/device.c ]
;;
*solaris*)
AC_DEFINE(HAVE_SOLARIS, 1, [Solaris/SunOS])
;;
*solaris*)
AC_DEFINE(HAVE_SOLARIS, 1, [Solaris/SunOS])
@@
-58,11
+50,16
@@
case $host_os in
;;
*openbsd*)
AC_DEFINE(HAVE_OPENBSD, 1, [OpenBSD])
;;
*openbsd*)
AC_DEFINE(HAVE_OPENBSD, 1, [OpenBSD])
- [ rm -f src/device.c; ln -sf
open
bsd/device.c src/device.c ]
+ [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
;;
*netbsd*)
AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
;;
*netbsd*)
AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
- [ rm -f src/device.c; ln -sf netbsd/device.c src/device.c ]
+ [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
+ ;;
+ *bsd*)
+ AC_MSG_WARN("Unknown BSD variant, tinc might not compile or work!")
+ AC_DEFINE(HAVE_BSD, 1, [Unknown BSD variant])
+ [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
;;
*cygwin*)
AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
;;
*cygwin*)
AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
@@
-89,12
+86,15
@@
fi
dnl Checks for libraries.
dnl Checks for libraries.
+AC_CHECK_LIB(event, event_init,
+ [], [AC_MSG_ERROR(libevent is required)])
+
dnl Checks for header files.
dnl We do this in multiple stages, because unlike Linux all the other operating systems really suck and don't include their own dependencies.
AC_HEADER_STDC
dnl Checks for header files.
dnl We do this in multiple stages, because unlike Linux all the other operating systems really suck and don't include their own dependencies.
AC_HEADER_STDC
-AC_CHECK_HEADERS([stdbool.h syslog.h sys/file.h sys/ioctl.h sys/
param.h sys/time.h sys/socket.h sys/wait.h sys/mman
.h netdb.h arpa/inet.h])
-AC_CHECK_HEADERS([net/if.h net/ethernet.h net/if_arp.h netinet/in_systm.h netinet/in.h netinet/in6.h],
+AC_CHECK_HEADERS([stdbool.h syslog.h sys/file.h sys/ioctl.h sys/
mman.h sys/param.h sys/socket.h sys/time.h sys/uio.h sys/wait
.h netdb.h arpa/inet.h])
+AC_CHECK_HEADERS([net/if.h net/
if_types.h linux/if_tun.h net/if_tun.h net/if_tap.h net/
ethernet.h net/if_arp.h netinet/in_systm.h netinet/in.h netinet/in6.h],
[], [], [#include "have.h"]
)
AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h],
[], [], [#include "have.h"]
)
AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h],
@@
-122,11
+122,11
@@
dnl Checks for library functions.
AC_FUNC_MEMCMP
AC_FUNC_ALLOCA
AC_TYPE_SIGNAL
AC_FUNC_MEMCMP
AC_FUNC_ALLOCA
AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system unsetenv vsyslog],
+AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system unsetenv vsyslog
writev
],
[], [], [#include "have.h"]
)
[], [], [#include "have.h"]
)
-
jm
_FUNC_MALLOC
-
jm
_FUNC_REALLOC
+
AC
_FUNC_MALLOC
+
AC
_FUNC_REALLOC
dnl Support for SunOS
dnl Support for SunOS
@@
-145,12
+145,6
@@
AC_CACHE_SAVE
dnl These are defined in files in m4/
dnl These are defined in files in m4/
-case $host_os in
- *linux*)
- tinc_TUNTAP
- ;;
-esac
-
tinc_OPENSSL
tinc_ZLIB
tinc_LZO
tinc_OPENSSL
tinc_ZLIB
tinc_LZO
@@
-169,6
+163,6
@@
AC_ARG_ENABLE(tracing,
AC_SUBST(INCLUDES)
AC_SUBST(INCLUDES)
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile
doc/tincd.8 doc/tinc.conf.5 doc/tincinclude.texi
lib/Makefile po/Makefile.in m4/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile lib/Makefile po/Makefile.in m4/Makefile])
AC_OUTPUT
AC_OUTPUT