--- /dev/null
+dnl Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.61)
+AC_INIT([tinc], [1.1pre7])
+AC_CONFIG_SRCDIR([src/tincd.c])
+AC_GNU_SOURCE
+AM_INIT_AUTOMAKE([check-news dist-bzip2 std-options subdir-objects])
+AC_CONFIG_HEADERS([config.h])
+AM_MAINTAINER_MODE
+
+# 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_GNU_SOURCE
+AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
+
+dnl Checks for programs.
+AC_PROG_CC_C99
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_RANLIB
+
+dnl Check and set OS
+
+AC_CANONICAL_HOST
+
+case $host_os in
+ *linux*)
+ AC_DEFINE(HAVE_LINUX, 1, [Linux])
+ [ rm -f src/device.c; ln -sf linux/device.c src/device.c ]
+ ;;
+ *freebsd*)
+ AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD])
+ [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
+ ;;
+ *darwin*)
+ AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
+ [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
+ ;;
+ *solaris*)
+ AC_DEFINE(HAVE_SOLARIS, 1, [Solaris/SunOS])
+ [ rm -f src/device.c; ln -sf solaris/device.c src/device.c ]
+ ;;
+ *openbsd*)
+ AC_DEFINE(HAVE_OPENBSD, 1, [OpenBSD])
+ [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
+ ;;
+ *netbsd*)
+ 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])
+ [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
+ ;;
+ *cygwin*)
+ AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
+ [ rm -f src/device.c; ln -sf cygwin/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 -lgdi32 -lcrypt32"
+ ;;
+ *)
+ AC_MSG_ERROR("Unknown operating system.")
+ ;;
+esac
+
+AC_ARG_ENABLE(uml,
+ AS_HELP_STRING([--enable-uml], [enable support for User Mode Linux]),
+ [ AS_IF([test "x$enable_uml" = "xyes"],
+ [ AC_DEFINE(ENABLE_UML, 1, [Support for UML])
+ uml=true
+ ],
+ [uml=false])
+ ],
+ [uml=false]
+)
+
+AC_ARG_ENABLE(vde,
+ AS_HELP_STRING([--enable-vde], [enable support for Virtual Distributed Ethernet]),
+ [ AS_IF([test "x$enable_vde" = "xyes"],
+ [ AC_CHECK_HEADERS(libvdeplug_dyn.h, [], [AC_MSG_ERROR([VDE plug header files not found.]); break])
+ AC_DEFINE(ENABLE_VDE, 1, [Support for VDE])
+ vde=true
+ ],
+ [vde=false])
+ ],
+ [vde=false]
+)
+
+AC_ARG_ENABLE(tunemu,
+ AS_HELP_STRING([--enable-tunemu], [enable support for the tunemu driver]),
+ [ AS_IF([test "x$enable_tunemu" = "xyes"],
+ [ AC_DEFINE(ENABLE_TUNEMU, 1, [Support for tunemu])
+ tunemu=true
+ ],
+ [tunemu=false])
+ ],
+ [tunemu=false]
+)
+
+AC_ARG_WITH(windows2000,
+ AS_HELP_STRING([--without-windows2000], [compile with support for Windows 2000. This disables support for tunneling over existing IPv6 networks.]),
+ [ AS_IF([test "x$with_windows2000" = "xyes"],
+ [AC_DEFINE(WITH_WINDOWS2000, 1, [Compile with support for Windows 2000])])
+ ]
+)
+
+AM_CONDITIONAL(UML, test "$uml" = true)
+AM_CONDITIONAL(VDE, test "$vde" = true)
+AM_CONDITIONAL(TUNEMU, test "$tunemu" = true)
+
+AC_CACHE_SAVE
+
+if test -d /sw/include ; then
+ CPPFLAGS="$CPPFLAGS -I/sw/include"
+fi
+if test -d /sw/lib ; then
+ LIBS="$LIBS -L/sw/lib"
+fi
+
+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/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 netpacket/packet.h],
+ [], [], [#include "have.h"]
+)
+AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h],
+ [], [], [#include "have.h"]
+)
+AC_CHECK_HEADERS([netinet/tcp.h netinet/ip_icmp.h netinet/icmp6.h],
+ [], [], [#include "have.h"]
+)
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_VOLATILE
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_HEADER_TIME
+AC_STRUCT_TM
+
+tinc_ATTRIBUTE(__malloc__)
+
+AC_CHECK_TYPES([socklen_t, struct ether_header, struct arphdr, struct ether_arp, struct in_addr, struct addrinfo, struct ip, struct icmp, struct in6_addr, struct sockaddr_in6, struct ip6_hdr, struct icmp6_hdr, struct nd_neighbor_solicit, struct nd_opt_hdr], , ,
+ [#include "have.h"]
+)
+
+dnl Checks for library functions.
+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 time usleep unsetenv vsyslog writev],
+ [], [], [#include "have.h"]
+)
+
+dnl Support for SunOS
+
+AC_CHECK_FUNC(socket, [], [
+ AC_CHECK_LIB(socket, connect)
+])
+AC_CHECK_FUNC(gethostbyname, [], [
+ AC_CHECK_LIB(nsl, gethostbyname)
+])
+
+AC_CHECK_DECLS([freeaddrinfo, gai_strerror, getaddrinfo, getnameinfo],
+ [], [], [#include "have.h"]
+)
+
+AC_CACHE_SAVE
+
+dnl These are defined in files in m4/
+
+dnl AC_ARG_WITH(libgcrypt, AC_HELP_STRING([--with-libgcrypt], [enable use of libgcrypt instead of OpenSSL])], [])
+
+tinc_CURSES
+tinc_READLINE
+tinc_ZLIB
+tinc_LZO
+
+if test "$with_libgcrypt" = yes; then
+ AM_PATH_LIBGCRYPT([1.4.0], [], [])
+ ln -sf gcrypt/cipher.c gcrypt/cipher.h gcrypt/crypto.c gcrypt/crypto.h gcrypt/digest.c gcrypt/digest.h gcrypt/ecdh.c gcrypt/ecdh.h gcrypt/ecdsa.c gcrypt/ecdsa.h gcrypt/ecdsagen.c gcrypt/ecdsagen.h gcrypt/prf.c gcrypt/prf.h gcrypt/rsa.c gcrypt/rsa.h gcrypt/rsagen.c gcrypt/rsagen.h src/
+else
+ tinc_OPENSSL
+ ln -sf openssl/cipher.c openssl/cipher.h openssl/crypto.c openssl/crypto.h openssl/digest.c openssl/digest.h openssl/ecdh.c openssl/ecdh.h openssl/ecdsa.c openssl/ecdsa.h openssl/ecdsagen.c openssl/ecdsagen.h openssl/prf.c openssl/prf.h openssl/rsa.c openssl/rsa.h openssl/rsagen.c openssl/rsagen.h src/
+fi
+
+
+dnl Check if support for jumbograms is requested
+AC_ARG_ENABLE(jumbograms,
+ AS_HELP_STRING([--disable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
+ [ AS_IF([test "x$enable_jumbograms" = "xyes"],
+ [ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ])
+ ]
+)
+
+AC_SUBST(INCLUDES)
+
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile m4/Makefile gui/Makefile])
+
+AC_OUTPUT
+++ /dev/null
-dnl Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.61)
-AC_INIT
-AC_CONFIG_SRCDIR([src/tincd.c])
-AC_GNU_SOURCE
-AM_INIT_AUTOMAKE(tinc, 1.1pre7)
-AC_CONFIG_HEADERS([config.h])
-AM_MAINTAINER_MODE
-
-# 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_GNU_SOURCE
-AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
-
-dnl Checks for programs.
-AC_PROG_CC_C99
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_RANLIB
-
-dnl Check and set OS
-
-AC_CANONICAL_HOST
-
-case $host_os in
- *linux*)
- AC_DEFINE(HAVE_LINUX, 1, [Linux])
- [ rm -f src/device.c; ln -sf linux/device.c src/device.c ]
- ;;
- *freebsd*)
- AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD])
- [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
- ;;
- *darwin*)
- AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
- [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
- ;;
- *solaris*)
- AC_DEFINE(HAVE_SOLARIS, 1, [Solaris/SunOS])
- [ rm -f src/device.c; ln -sf solaris/device.c src/device.c ]
- ;;
- *openbsd*)
- AC_DEFINE(HAVE_OPENBSD, 1, [OpenBSD])
- [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
- ;;
- *netbsd*)
- 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])
- [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
- ;;
- *cygwin*)
- AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
- [ rm -f src/device.c; ln -sf cygwin/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 -lgdi32 -lcrypt32"
- ;;
- *)
- AC_MSG_ERROR("Unknown operating system.")
- ;;
-esac
-
-AC_ARG_ENABLE(uml,
- AS_HELP_STRING([--enable-uml], [enable support for User Mode Linux]),
- [ AS_IF([test "x$enable_uml" = "xyes"],
- [ AC_DEFINE(ENABLE_UML, 1, [Support for UML])
- uml=true
- ],
- [uml=false])
- ],
- [uml=false]
-)
-
-AC_ARG_ENABLE(vde,
- AS_HELP_STRING([--enable-vde], [enable support for Virtual Distributed Ethernet]),
- [ AS_IF([test "x$enable_vde" = "xyes"],
- [ AC_CHECK_HEADERS(libvdeplug_dyn.h, [], [AC_MSG_ERROR([VDE plug header files not found.]); break])
- AC_DEFINE(ENABLE_VDE, 1, [Support for VDE])
- vde=true
- ],
- [vde=false])
- ],
- [vde=false]
-)
-
-AC_ARG_ENABLE(tunemu,
- AS_HELP_STRING([--enable-tunemu], [enable support for the tunemu driver]),
- [ AS_IF([test "x$enable_tunemu" = "xyes"],
- [ AC_DEFINE(ENABLE_TUNEMU, 1, [Support for tunemu])
- tunemu=true
- ],
- [tunemu=false])
- ],
- [tunemu=false]
-)
-
-AC_ARG_WITH(windows2000,
- AS_HELP_STRING([--without-windows2000], [compile with support for Windows 2000. This disables support for tunneling over existing IPv6 networks.]),
- [ AS_IF([test "x$with_windows2000" = "xyes"],
- [AC_DEFINE(WITH_WINDOWS2000, 1, [Compile with support for Windows 2000])])
- ]
-)
-
-AM_CONDITIONAL(UML, test "$uml" = true)
-AM_CONDITIONAL(VDE, test "$vde" = true)
-AM_CONDITIONAL(TUNEMU, test "$tunemu" = true)
-
-AC_CACHE_SAVE
-
-if test -d /sw/include ; then
- CPPFLAGS="$CPPFLAGS -I/sw/include"
-fi
-if test -d /sw/lib ; then
- LIBS="$LIBS -L/sw/lib"
-fi
-
-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/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 netpacket/packet.h],
- [], [], [#include "have.h"]
-)
-AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h],
- [], [], [#include "have.h"]
-)
-AC_CHECK_HEADERS([netinet/tcp.h netinet/ip_icmp.h netinet/icmp6.h],
- [], [], [#include "have.h"]
-)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_VOLATILE
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_STRUCT_TM
-
-tinc_ATTRIBUTE(__malloc__)
-
-AC_CHECK_TYPES([socklen_t, struct ether_header, struct arphdr, struct ether_arp, struct in_addr, struct addrinfo, struct ip, struct icmp, struct in6_addr, struct sockaddr_in6, struct ip6_hdr, struct icmp6_hdr, struct nd_neighbor_solicit, struct nd_opt_hdr], , ,
- [#include "have.h"]
-)
-
-dnl Checks for library functions.
-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 time usleep unsetenv vsyslog writev],
- [], [], [#include "have.h"]
-)
-
-dnl Support for SunOS
-
-AC_CHECK_FUNC(socket, [], [
- AC_CHECK_LIB(socket, connect)
-])
-AC_CHECK_FUNC(gethostbyname, [], [
- AC_CHECK_LIB(nsl, gethostbyname)
-])
-
-AC_CHECK_DECLS([freeaddrinfo, gai_strerror, getaddrinfo, getnameinfo],
- [], [], [#include "have.h"]
-)
-
-AC_CACHE_SAVE
-
-dnl These are defined in files in m4/
-
-dnl AC_ARG_WITH(libgcrypt, AC_HELP_STRING([--with-libgcrypt], [enable use of libgcrypt instead of OpenSSL])], [])
-
-tinc_CURSES
-tinc_READLINE
-tinc_ZLIB
-tinc_LZO
-
-if test "$with_libgcrypt" = yes; then
- AM_PATH_LIBGCRYPT([1.4.0], [], [])
- ln -sf gcrypt/cipher.c gcrypt/cipher.h gcrypt/crypto.c gcrypt/crypto.h gcrypt/digest.c gcrypt/digest.h gcrypt/ecdh.c gcrypt/ecdh.h gcrypt/ecdsa.c gcrypt/ecdsa.h gcrypt/ecdsagen.c gcrypt/ecdsagen.h gcrypt/prf.c gcrypt/prf.h gcrypt/rsa.c gcrypt/rsa.h gcrypt/rsagen.c gcrypt/rsagen.h src/
-else
- tinc_OPENSSL
- ln -sf openssl/cipher.c openssl/cipher.h openssl/crypto.c openssl/crypto.h openssl/digest.c openssl/digest.h openssl/ecdh.c openssl/ecdh.h openssl/ecdsa.c openssl/ecdsa.h openssl/ecdsagen.c openssl/ecdsagen.h openssl/prf.c openssl/prf.h openssl/rsa.c openssl/rsa.h openssl/rsagen.c openssl/rsagen.h src/
-fi
-
-
-dnl Check if support for jumbograms is requested
-AC_ARG_ENABLE(jumbograms,
- AS_HELP_STRING([--disable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]),
- [ AS_IF([test "x$enable_jumbograms" = "xyes"],
- [ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ])
- ]
-)
-
-AC_SUBST(INCLUDES)
-
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile m4/Makefile gui/Makefile])
-
-AC_OUTPUT