X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=configure.in;h=223997691a6322e33a4f716515311054390d67e3;hp=6959e2854a0cd610dbc2437190da82e3a9340b76;hb=28be7fc6d923d51eff492fd4da5c011bf4a70c1f;hpb=44bdf5ac73d8a3a0849a0ae400caf4edc07a53e2

diff --git a/configure.in b/configure.in
index 6959e28..2239976 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,22 @@
 dnl Process this file with autoconf to produce a configure script.
 
+dnl This file is part of secnet.
+dnl See README for full list of copyright holders.
+dnl
+dnl secnet is free software; you can redistribute it and/or modify it
+dnl under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl secnet is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl version 3 along with secnet; if not, see
+dnl https://www.gnu.org/licenses/gpl.html.
+
 sinclude(ac_prog_cc_no_writeable_strings.m4)
 
 AC_INIT(secnet,0.1.18+,secnet@chiark.greenend.org.uk)
@@ -27,7 +44,7 @@ AC_STDC_HEADERS
 AC_CHECK_HEADERS([stdint.h inttypes.h])
 AC_CHECK_HEADERS([net/if.h net/route.h])
 AC_CHECK_HEADERS([sys/socket.h])
-AC_CHECK_HEADERS([linux/if.h], [], [], 
+AC_CHECK_HEADERS([linux/if_tun.h], [], [], 
 [#if HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
@@ -60,20 +77,26 @@ AC_CHECK_LIB(gmp2,mpz_init_set_str)
 AC_CHECK_LIB(gmp,__gmpz_init_set_str)
 REQUIRE_HEADER([gmp.h])
 dnl Would love to barf if no gmp was found, but how to test? Requiring the header will do for now.
-AC_CHECK_LIB(fl,yywrap)
-if test "$ac_cv_lib_fl_yywrap" != yes; then
-  AC_MSG_ERROR([A compatible libfl is required])
-fi
-AC_CHECK_LIB(nsl,inet_ntoa)
+SECNET_C_GETFUNC(inet_ntoa,nsl)
 AC_CHECK_LIB(socket,socket)
-AC_CHECK_LIB(resolv,inet_aton)
+SECNET_C_GETFUNC(inet_aton,resolv)
 AC_CHECK_LIB(adns,adns_init)
 REQUIRE_HEADER([adns.h])
 
-dnl check for getopt in standard library
-AC_REPLACE_FUNCS([snprintf])
+AC_MSG_NOTICE([Checking requirements for IPv6 support...])
+enable_ipv6=true
+m4_define(NO_IPV6,[enable_ipv6=false])
+AC_CHECK_DECL(AF_INET6,        [],[NO_IPV6],[#include <netinet/in.h>])
+AC_CHECK_FUNC(adns_addr2text,  [],[NO_IPV6])
+if $enable_ipv6; then
+    AC_MSG_NOTICE([Enabling IPv6 support])
+    AC_DEFINE(CONFIG_IPV6, 1,
+              [Define to 1 to use IPv6 support in system and adns])
+else
+    AC_MSG_WARN([Disabling IPv6 support])
+fi
 
-AC_OUTPUT(Makefile,echo timestamp >stamp-h)
+AC_OUTPUT(Makefile common.make, echo timestamp >stamp-h)
 
 AH_TOP([
 #ifndef _CONFIG_H
@@ -132,12 +155,6 @@ typedef unsigned char uint8_t;
 #endif
 #endif
 
-#ifndef HAVE_SNPRINTF
-#include <stdio.h>
-#include <stdarg.h>
-#include "snprintf.h"
-#endif
-
 #ifdef __GNUC__
 #define NORETURN(_x) void _x __attribute__ ((noreturn))
 #define FORMAT(_a,_b,_c) __attribute__ ((format (_a,_b,_c)))