X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=configure.in;h=9a584b76b22414cc07ed7c502b0f1a1163434880;hp=7fc317f29443681ed5c0037c79f546ee45199d60;hb=f2c2443bbcfd5e09518bd87f3fd8d4a727d73ae2;hpb=cd3601c5df57c7544ece00bf79e82b36499a26ff

diff --git a/configure.in b/configure.in
index 7fc317f2..9a584b76 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl $Id: configure.in,v 1.13.2.49 2002/06/09 15:58:05 zarq Exp $
+dnl $Id: configure.in,v 1.13.2.55 2002/08/24 12:54:55 guus Exp $
 
+AC_PREREQ(2.50)
 AC_INIT(src/tincd.c)
 AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
 AM_CONFIG_HEADER(config.h)
@@ -9,10 +10,14 @@ AM_CONFIG_HEADER(config.h)
 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.
-AC_DEFINE([_GNU_SOURCE], [__USE_BSD])
+AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU extenstions])
+AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
 
 ALL_LINGUAS="nl"
 
@@ -24,8 +29,7 @@ AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-jm_PERL
-
+AC_PROG_RANLIB
 
 AC_ISC_POSIX
 
@@ -35,29 +39,33 @@ AC_CANONICAL_HOST
 
 case $host_os in
   *linux*)
-    AC_DEFINE(HAVE_LINUX)
+    AC_DEFINE(HAVE_LINUX, 1, [Linux])
     [ rm -f src/device.c; ln -sf linux/device.c src/device.c ]
   ;;
   *freebsd*)
-    AC_DEFINE(HAVE_FREEBSD)
+    AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD])
     [ rm -f src/device.c; ln -sf freebsd/device.c src/device.c ]
   ;;
   *darwin*)
-    AC_DEFINE(HAVE_FREEBSD)
-    [ rm -f src/device.c; ln -sf freebsd/device.c src/device.c ]
+    AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
+    [ rm -f src/device.c; ln -sf darwin/device.c src/device.c ]
   ;;
   *solaris*)
-    AC_DEFINE(HAVE_SOLARIS)
+    AC_DEFINE(HAVE_SOLARIS, 1, [Solaris/SunOS])
     [ rm -f src/device.c; ln -sf solaris/device.c src/device.c ]
   ;;
   *openbsd*)
-    AC_DEFINE(HAVE_OPENBSD)
+    AC_DEFINE(HAVE_OPENBSD, 1, [OpenBSD])
     [ rm -f src/device.c; ln -sf openbsd/device.c src/device.c ]
   ;;
   *netbsd*)
-    AC_DEFINE(HAVE_NETBSD)
+    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.")
   ;;
@@ -97,7 +105,21 @@ AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
   ac_cv_type_socklen_t=no)
 ])
 if test $ac_cv_type_socklen_t = yes; then
-  AC_DEFINE(HAVE_SOCKLEN_T)
+  AC_DEFINE(HAVE_SOCKLEN_T, 1, [socklen_t available])
+fi
+
+AC_CACHE_CHECK([for struct addrinfo], ac_cv_struct_addrinfo,
+[
+  AC_TRY_COMPILE(
+  [#include <sys/types.h>
+  #include <sys/socket.h>
+  #include <netdb.h>],
+  [struct addrinfo ai; ai.ai_family = AF_INET; return ai.ai_family;],
+  ac_cv_struct_addrinfo=yes,
+  ac_cv_struct_addrinfo=no)
+])
+if test $ac_cv_struct_addrinfo = yes; then
+  AC_DEFINE(HAVE_STRUCT_ADDRINFO, 1, [struct addrinfo available])
 fi
 
 dnl Checks for library functions.
@@ -105,12 +127,11 @@ 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 \
+freeaddrinfo gai_strerror getaddrinfo getnameinfo])
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
-AM_GNU_GETTEXT
-
 dnl Support for SunOS
 
 AC_CHECK_FUNC(socket, [], [
@@ -130,22 +151,21 @@ tinc_ZLIB
 dnl Check if support for jumbograms is requested 
 AC_ARG_ENABLE(jumbograms,
   [  --enable-jumbograms     enable support for jumbograms (packets up to 9000 bytes)],
-  [ AC_DEFINE(ENABLE_JUMBOGRAMS) ]
+  [ 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,
   [  --enable-tracing        enable checkpoint tracing (debugging only)],
-  [ AC_DEFINE(ENABLE_TRACING) ]
+  [ AC_DEFINE(ENABLE_TRACING, 1, [Checkpoint tracing]) ]
 )
 
 AC_SUBST(INCLUDES)
 
-AC_OUTPUT(Makefile
+AC_OUTPUT(Makefile po/Makefile.in  
 src/Makefile
 doc/Makefile
 doc/es/Makefile
-intl/Makefile
 lib/Makefile
 m4/Makefile
 po/Makefile.in