projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fgets() returns NULL on error, not < 0
[tinc]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
0561af8
..
ccc0d26
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,8
+1,6
@@
dnl Process this file with autoconf to produce a configure script.
dnl Process this file with autoconf to produce a configure script.
-dnl $Id$
-
-AC_PREREQ(2.59)
+AC_PREREQ(2.61)
AC_INIT
AC_CONFIG_SRCDIR([src/tincd.c])
AC_GNU_SOURCE
AC_INIT
AC_CONFIG_SRCDIR([src/tincd.c])
AC_GNU_SOURCE
@@
-10,13
+8,12
@@
AM_INIT_AUTOMAKE(tinc, 1.1-cvs)
AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
AC_CONFIG_HEADERS([config.h])
AM_MAINTAINER_MODE
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.14.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.
+AC_GNU_SOURCE
AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
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
@@
-26,7
+23,7
@@
AC_PROG_RANLIB
dnl Check and set OS
dnl Check and set OS
-
#
AC_CANONICAL_HOST
+AC_CANONICAL_HOST
case $host_os in
*linux*)
case $host_os in
*linux*)
@@
-53,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])
@@
-65,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.")
@@
-95,17
+96,12
@@
if test -d /sw/lib ; then
LIBS="$LIBS -L/sw/lib"
fi
LIBS="$LIBS -L/sw/lib"
fi
-dnl Checks for libraries.
-
-AC_CHECK_LIB(event, event_init,
- [], [AC_MSG_ERROR(libevent is required)])
-
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/ine
t.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 time.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 diren
t.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],
@@
-133,7
+129,7
@@
dnl Checks for library functions.
AC_FUNC_MEMCMP
AC_FUNC_ALLOCA
AC_TYPE_SIGNAL
AC_FUNC_MEMCMP
AC_FUNC_ALLOCA
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 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 u
sleep u
nsetenv vsyslog writev],
[], [], [#include "have.h"]
)
AC_FUNC_MALLOC
[], [], [#include "have.h"]
)
AC_FUNC_MALLOC
@@
-158,6
+154,8
@@
dnl These are defined in files in m4/
AC_ARG_WITH(libgcrypt, AC_HELP_STRING([--with-libgcrypt], [enable use of libgcrypt instead of 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
@@
-176,14
+174,8
@@
AC_ARG_ENABLE(jumbograms,
[ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ]
)
[ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ]
)
-dnl Check if checkpoint tracing has to be enabled
-AC_ARG_ENABLE(tracing,
- AS_HELP_STRING([--enable-tracing], [enable checkpoint tracing (debugging only)]),
- [ AC_DEFINE(ENABLE_TRACING, 1, [Checkpoint tracing]) ]
-)
-
AC_SUBST(INCLUDES)
AC_SUBST(INCLUDES)
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile
lib/Makefile po/Makefile.in
m4/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile m4/Makefile])
AC_OUTPUT
AC_OUTPUT