Various fixes for autoconf and OpenSSL 0.9.7 and a missing header.

[tinc] / configure.in

diff --git a/configure.in b/configure.in
index 9f9849d..0477c21 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl $Id: configure.in,v 1.13.2.54 2002/08/24 12:11:38 guus Exp $
+dnl $Id: configure.in,v 1.13.2.60 2003/01/17 00:43:56 guus Exp $
 
-AC_PREREQ(2.50)
+AC_PREREQ(2.53)
 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)
@@ -29,14 +30,13 @@ AC_PROG_AWK
 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_CANONICAL_HOST
+#AC_CANONICAL_HOST
 
 case $host_os in
   *linux*)
@@ -86,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 \
-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], [], [],
+       [#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
@@ -128,8 +133,7 @@ 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 \
-freeaddrinfo gai_strerror getaddrinfo getnameinfo])
+putenv select strdup strerror strsignal strtol unsetenv mlockall])
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
@@ -142,6 +146,8 @@ AC_CHECK_FUNC(gethostbyname, [], [
   AC_CHECK_LIB(nsl, gethostbyname)
 ])
 
+AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo])
+
 AC_CACHE_SAVE
 
 dnl These are defined in files in m4/
@@ -163,11 +169,11 @@ AC_ARG_ENABLE(tracing,
 
 AC_SUBST(INCLUDES)
 
-AC_OUTPUT(Makefile po/Makefile.in  
+AC_OUTPUT(Makefile 
 src/Makefile
 doc/Makefile
 doc/es/Makefile
 lib/Makefile
-m4/Makefile
 po/Makefile.in
+m4/Makefile
 )