projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use only rand(), not random().
[tinc]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
c951637
..
eff93a0
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-2,7
+2,7
@@
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_INIT
AC_CONFIG_SRCDIR([src/tincd.c])
AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
@@
-10,25
+10,23
@@
AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
AM_GNU_GETTEXT([external])
AM_MAINTAINER_MODE
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"
dnl Checks for programs.
AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
ALL_LINGUAS="nl"
dnl Checks for programs.
-AC_PROG_CC
+AC_PROG_CC
_C99
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_RANLIB
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_RANLIB
-AC_ISC_POSIX
-
dnl Check and set OS
#AC_CANONICAL_HOST
dnl Check and set OS
#AC_CANONICAL_HOST
@@
-77,6
+75,15
@@
case $host_os in
;;
esac
;;
esac
+AC_ARG_ENABLE(tunemu,
+ AS_HELP_STRING([--enable-tunemu], [enable support for the tunemu driver]),
+ [ AC_DEFINE(ENABLE_TUNEMU, 1, [Support for tunemu])
+ tunemu=true
+ ]
+)
+
+AM_CONDITIONAL(TUNEMU, test "$tunemu" = true)
+
AC_CACHE_SAVE
if test -d /sw/include ; then
AC_CACHE_SAVE
if test -d /sw/include ; then
@@
-93,7
+100,7
@@
dnl We do this in multiple stages, because unlike Linux all the other operating
AC_HEADER_STDC
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_HEADER_STDC
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 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],
+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],
@@
-124,8
+131,8
@@
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 writev],
[], [], [#include "have.h"]
)
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"]
)
-
jm
_FUNC_MALLOC
-
jm
_FUNC_REALLOC
+
AC
_FUNC_MALLOC
+
AC
_FUNC_REALLOC
dnl Support for SunOS
dnl Support for SunOS
@@
-144,12
+151,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