projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More missing IPv6 definitions and autoconf checks to make sure it compiles
[tinc]
/
configure.in
diff --git
a/configure.in
b/configure.in
index
e8b9527
..
a51bd29
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-1,14
+1,19
@@
dnl Process this file with autoconf to produce a configure script.
dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.13.2.
51 2002/06/11 11:03:17
guus Exp $
+dnl $Id: configure.in,v 1.13.2.
66 2003/07/11 16:12:58
guus Exp $
+AC_PREREQ(2.53)
AC_INIT(src/tincd.c)
AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
AM_CONFIG_HEADER(config.h)
AC_INIT(src/tincd.c)
AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
dnl Include the macros from the m4/ directory
AM_ACLOCAL_INCLUDE(m4)
dnl Include the macros from the m4/ directory
AM_ACLOCAL_INCLUDE(m4)
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION(0.11.5)
+
# 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.
# 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.
@@
-25,14
+30,13
@@
AC_PROG_AWK
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-jm_PERL
-
+AC_PROG_RANLIB
AC_ISC_POSIX
dnl Check and set OS
AC_ISC_POSIX
dnl Check and set OS
-AC_CANONICAL_HOST
+
#
AC_CANONICAL_HOST
case $host_os in
*linux*)
case $host_os in
*linux*)
@@
-59,6
+63,10
@@
case $host_os in
AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
[ rm -f src/device.c; ln -sf netbsd/device.c src/device.c ]
;;
AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
[ rm -f src/device.c; ln -sf netbsd/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 ]
+ ;;
*)
AC_MSG_ERROR("Unknown operating system.")
;;
*)
AC_MSG_ERROR("Unknown operating system.")
;;
@@
-78,8
+86,13
@@
dnl Checks for libraries.
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \
dnl Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \
-net/ethernet.h net/if.h netinet/in_systm.h netinet/ip.h netinet/tcp.h \
-sys/file.h sys/ioctl.h sys/param.h sys/time.h])
+ sys/file.h sys/ioctl.h sys/param.h sys/time.h netinet/in_systm.h])
+AC_CHECK_HEADERS([net/ethernet.h net/if.h netinet/ip.h netinet/tcp.h netinet/ip6.h], [], [],
+ [#include <sys/types.h>
+ #include <sys/socket.h>
+ #ifdef HAVE_NETINET_IN_SYSTM_H
+ #include <netinet/in_systm.h>
+ #endif])
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@
-88,30
+101,23
@@
AC_TYPE_SIZE_T
AC_HEADER_TIME
AC_STRUCT_TM
AC_HEADER_TIME
AC_STRUCT_TM
-AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
-[
- AC_TRY_COMPILE(
+AC_CHECK_TYPES([socklen_t, struct addrinfo, struct in6_addr, struct sockaddr_in6], , ,
[#include <sys/types.h>
[#include <sys/types.h>
- #include <sys/socket.h>],
- [socklen_t len = 42; return len;],
- ac_cv_type_socklen_t=yes,
- ac_cv_type_socklen_t=no)
-])
-if test $ac_cv_type_socklen_t = yes; then
- AC_DEFINE(HAVE_SOCKLEN_T, 1, [socklen_t available])
-fi
+ #include <sys/socket.h>
+ #include <netdb.h>
+ #include <netinet/in.h>
+ ]
+)
dnl Checks for library functions.
AC_FUNC_MEMCMP
AC_FUNC_ALLOCA
AC_TYPE_SIGNAL
AC_CHECK_FUNCS([asprintf daemon fcloseall flock ftime get_current_dir_name \
dnl Checks for library functions.
AC_FUNC_MEMCMP
AC_FUNC_ALLOCA
AC_TYPE_SIGNAL
AC_CHECK_FUNCS([asprintf daemon fcloseall flock ftime get_current_dir_name \
-putenv select strdup strerror strsignal strtol unsetenv
getnameinfo
])
+putenv select strdup strerror strsignal strtol unsetenv
mlockall vsyslog
])
jm_FUNC_MALLOC
jm_FUNC_REALLOC
jm_FUNC_MALLOC
jm_FUNC_REALLOC
-AM_GNU_GETTEXT
-
dnl Support for SunOS
AC_CHECK_FUNC(socket, [], [
dnl Support for SunOS
AC_CHECK_FUNC(socket, [], [
@@
-121,12
+127,15
@@
AC_CHECK_FUNC(gethostbyname, [], [
AC_CHECK_LIB(nsl, gethostbyname)
])
AC_CHECK_LIB(nsl, gethostbyname)
])
+AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo inet_aton])
+
AC_CACHE_SAVE
dnl These are defined in files in m4/
tinc_TUNTAP
tinc_OPENSSL
tinc_ZLIB
AC_CACHE_SAVE
dnl These are defined in files in m4/
tinc_TUNTAP
tinc_OPENSSL
tinc_ZLIB
+tinc_LZO
dnl Check if support for jumbograms is requested
AC_ARG_ENABLE(jumbograms,
dnl Check if support for jumbograms is requested
AC_ARG_ENABLE(jumbograms,
@@
-142,12
+151,11
@@
AC_ARG_ENABLE(tracing,
AC_SUBST(INCLUDES)
AC_SUBST(INCLUDES)
-AC_OUTPUT(Makefile
+AC_OUTPUT(Makefile
src/Makefile
doc/Makefile
doc/es/Makefile
src/Makefile
doc/Makefile
doc/es/Makefile
-intl/Makefile
lib/Makefile
lib/Makefile
-m4/Makefile
po/Makefile.in
po/Makefile.in
+m4/Makefile
)
)