projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Require ExperimentalProtocol = yes for new features, update documentation.
[tinc]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
c8644a9
..
36729a6
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-3,7
+3,8
@@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
AC_INIT
AC_CONFIG_SRCDIR([src/tincd.c])
AC_PREREQ(2.61)
AC_INIT
AC_CONFIG_SRCDIR([src/tincd.c])
-AM_INIT_AUTOMAKE(tinc, 1.0.12+git)
+AC_GNU_SOURCE
+AM_INIT_AUTOMAKE(tinc, 1.1pre1+git)
AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
@@
-13,8
+14,6
@@
AM_MAINTAINER_MODE
AC_GNU_SOURCE
AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
AC_GNU_SOURCE
AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
-ALL_LINGUAS="nl"
-
dnl Checks for programs.
AC_PROG_CC_C99
AC_PROG_CPP
dnl Checks for programs.
AC_PROG_CC_C99
AC_PROG_CPP
@@
-51,6
+50,10
@@
case $host_os in
AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
[ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
;;
AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
[ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
;;
+ *dragonfly*)
+ AC_DEFINE(HAVE_DRAGONFLY, 1, [DragonFly])
+ [ 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])
*bsd*)
AC_MSG_WARN("Unknown BSD variant, tinc might not compile or work!")
AC_DEFINE(HAVE_BSD, 1, [Unknown BSD variant])
@@
-63,7
+66,7
@@
case $host_os in
*mingw*)
AC_DEFINE(HAVE_MINGW, 1, [MinGW])
[ rm -f src/device.c; cp -f src/mingw/device.c src/device.c ]
*mingw*)
AC_DEFINE(HAVE_MINGW, 1, [MinGW])
[ rm -f src/device.c; cp -f src/mingw/device.c src/device.c ]
- LIBS="$LIBS -lws2_32"
+ LIBS="$LIBS -lws2_32
-lgdi32 -lcrypt32
"
;;
*)
AC_MSG_ERROR("Unknown operating system.")
;;
*)
AC_MSG_ERROR("Unknown operating system.")
@@
-93,14
+96,12
@@
if test -d /sw/lib ; then
LIBS="$LIBS -L/sw/lib"
fi
LIBS="$LIBS -L/sw/lib"
fi
-dnl Checks for libraries.
-
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/mman.h sys/param.h sys/
socket.h sys/time.h sys/uio
.h sys/wait.h netdb.h arpa/inet.h dirent.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],
+AC_CHECK_HEADERS([stdbool.h syslog.h sys/file.h sys/ioctl.h sys/mman.h sys/param.h sys/
resource.h sys/socket.h sys/time.h sys/uio.h sys/un
.h sys/wait.h netdb.h arpa/inet.h dirent.h])
+AC_CHECK_HEADERS([net/if.h net/if_types.h linux/if_tun.h net/if_tun.h net/
tun/if_tun.h net/if_tap.h net/tap/if_tap.h net/ethernet.h net/if_arp.h netinet/in_systm.h netinet/in.h netinet/in6.h time
.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],
@@
-125,14
+126,10
@@
AC_CHECK_TYPES([socklen_t, struct ether_header, struct arphdr, struct ether_arp,
)
dnl Checks for library functions.
)
dnl Checks for library functions.
-AC_FUNC_MEMCMP
-AC_FUNC_ALLOCA
AC_TYPE_SIGNAL
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],
+AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system
time usleep
unsetenv vsyslog writev],
[], [], [#include "have.h"]
)
[], [], [#include "have.h"]
)
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
dnl Support for SunOS
dnl Support for SunOS
@@
-151,10
+148,22
@@
AC_CACHE_SAVE
dnl These are defined in files in m4/
dnl These are defined in files in m4/
-tinc_OPENSSL
+AC_ARG_WITH(libgcrypt, AC_HELP_STRING([--with-libgcrypt], [enable use of libgcrypt instead of OpenSSL])], [])
+
+tinc_CURSES
+tinc_LIBEVENT
tinc_ZLIB
tinc_LZO
tinc_ZLIB
tinc_LZO
+if test "$with_libgcrypt" = yes; then
+ AM_PATH_LIBGCRYPT([1.4.0], [], [])
+ ln -sf gcrypt/*.c gcrypt/*.h src/
+else
+ tinc_OPENSSL
+ ln -sf openssl/*.c openssl/*.h src/
+fi
+
+
dnl Check if support for jumbograms is requested
AC_ARG_ENABLE(jumbograms,
AS_HELP_STRING([--enable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
dnl Check if support for jumbograms is requested
AC_ARG_ENABLE(jumbograms,
AS_HELP_STRING([--enable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
@@
-163,6
+172,6
@@
AC_ARG_ENABLE(jumbograms,
AC_SUBST(INCLUDES)
AC_SUBST(INCLUDES)
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile
lib/Makefile m4
/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile
m4/Makefile gui
/Makefile])
AC_OUTPUT
AC_OUTPUT