X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=configure.in;h=0c0c545aded3b2d86cf46e047cfc5f0de95057b8;hp=0f88daca5a920a273b97b8ea1cc0a9ff13b3ce08;hb=a0fac2f1c903f765c8b8596f1ec93beb52b72c7a;hpb=e1b81bd68228f908e7e69794386947d7f7f98451 diff --git a/configure.in b/configure.in index 0f88dac..0c0c545 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. sinclude(ac_prog_cc_no_writeable_strings.m4) -AC_INIT(secnet,0.1.16+,secnet@chiark.greenend.org.uk) +AC_INIT(secnet,0.1.18+,secnet@chiark.greenend.org.uk) AC_CONFIG_SRCDIR(secnet.c) AC_CONFIG_HEADER(config.h) @@ -11,6 +11,14 @@ AC_REVISION($Id: configure.in,v 1.4 2002/09/09 22:05:02 steve Exp $) AC_LANG_C +# If fink is on the path then it is assumed we should use it. +AC_PATH_PROG([FINK],[fink]) +if test "x$FINK" != x; then + finkdir=`echo $FINK|sed 's,/[[^/]]*/[[^/]]*$,,'` + CPPFLAGS="-I$finkdir/include ${CPPFLAGS}" + LDFLAGS="-L$finkdir/lib ${LDFLAGS}" +fi + AC_PROG_MAKE_SET AC_PROG_CC AC_PROG_INSTALL @@ -57,17 +65,23 @@ if test "$ac_cv_lib_fl_yywrap" != yes; then AC_MSG_ERROR([A compatible libfl is required]) fi AC_CHECK_LIB(nsl,inet_ntoa) -AC_CHECK_LIB(getopt,getopt_long) -AC_CHECK_LIB(gnugetopt,getopt_long) AC_CHECK_LIB(socket,socket) AC_CHECK_LIB(resolv,inet_aton) AC_CHECK_LIB(adns,adns_init) REQUIRE_HEADER([adns.h]) -dnl check for getopt in standard library -AC_REPLACE_FUNCS([snprintf]) -AC_CHECK_FUNC([getopt_long], [], [AC_LIBOBJ([getopt]) - AC_LIBOBJ([getopt1])]) +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 ]) +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) @@ -128,12 +142,6 @@ typedef unsigned char uint8_t; #endif #endif -#ifndef HAVE_SNPRINTF -#include -#include -#include "snprintf.h" -#endif - #ifdef __GNUC__ #define NORETURN(_x) void _x __attribute__ ((noreturn)) #define FORMAT(_a,_b,_c) __attribute__ ((format (_a,_b,_c)))