Update configure scripts.

diff --git a/configure.in b/configure.in
index def2423a66a8df5f5bbfe537f219bfae89af1f66..1e2b802c39936638015df11e8fc35806e683a2bb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 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.72 2003/07/28 22:06:08 guus Exp $
+dnl $Id: configure.in,v 1.13.2.73 2003/07/29 11:50:39 guus Exp $

 
 

-AC_PREREQ(2.53)
+AC_PREREQ(2.57)

 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)


@@ -12,7 +12,7 @@ dnl Include the macros from the m4/ directory
 AM_ACLOCAL_INCLUDE(m4)
 
 AM_GNU_GETTEXT([external])
 AM_ACLOCAL_INCLUDE(m4)
 
 AM_GNU_GETTEXT([external])

-AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT_VERSION(0.12.1)

 
 # Enable GNU extensions.
 # Define this here, not in acconfig's @TOP@ section, since definitions
 
 # Enable GNU extensions.
 # Define this here, not in acconfig's @TOP@ section, since definitions


@@ -173,20 +173,26 @@ AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo inet_aton])
 AC_CACHE_SAVE
 
 dnl These are defined in files in m4/
 AC_CACHE_SAVE
 
 dnl These are defined in files in m4/

-tinc_TUNTAP
+
+case $host_os in
+  *linux*)
+    tinc_TUNTAP
+  ;;
+esac
+

 tinc_OPENSSL
 tinc_ZLIB
 tinc_LZO
 
 dnl Check if support for jumbograms is requested 
 AC_ARG_ENABLE(jumbograms,
 tinc_OPENSSL
 tinc_ZLIB
 tinc_LZO
 
 dnl Check if support for jumbograms is requested 
 AC_ARG_ENABLE(jumbograms,

-  [  --enable-jumbograms     enable support for jumbograms (packets up to 9000 bytes)],
+  AC_HELP_STRING([--enable-jumbograms], [enable 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,
   [ 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_HELP_STRING([--enable-tracing], [enable checkpoint tracing (debugging only)]),

   [ AC_DEFINE(ENABLE_TRACING, 1, [Checkpoint tracing]) ]
 )
 
   [ AC_DEFINE(ENABLE_TRACING, 1, [Checkpoint tracing]) ]
 )
 

diff --git a/m4/lzo.m4 b/m4/lzo.m4
index 58011f1a57afac18974a1cccc7962a866b14f3e8..147318fe05c0af5e4346e29786517e4f0fb3e49f 100644 (file)
--- a/m4/lzo.m4
+++ b/m4/lzo.m4
@@ -4,15 +4,23 @@ AC_DEFUN(tinc_LZO,
 [
   tinc_ac_save_CPPFLAGS="$CPPFLAGS"
 
 [
   tinc_ac_save_CPPFLAGS="$CPPFLAGS"
 

+  AC_ARG_WITH(lzo,
+    AC_HELP_STRING([--with-lzo=DIR], [lzo base directory, or:]),
+    [lzo="$withval"
+     CFLAGS="$CFLAGS -I$withval/include"
+     CPPFLAGS="$CPPFLAGS -I$withval/include"
+     LIBS="$LIBS -L$withval/lib"]
+  )
+

   AC_ARG_WITH(lzo-include,
   AC_ARG_WITH(lzo-include,

-    [  --with-lzo-include=DIR lzo headers directory],
+    AC_HELP_STRING([--with-lzo-include=DIR], [lzo headers directory]),

     [lzo_include="$withval"
      CFLAGS="$CFLAGS -I$withval"
      CPPFLAGS="$CPPFLAGS -I$withval"]
   )
 
   AC_ARG_WITH(lzo-lib,
     [lzo_include="$withval"
      CFLAGS="$CFLAGS -I$withval"
      CPPFLAGS="$CPPFLAGS -I$withval"]
   )
 
   AC_ARG_WITH(lzo-lib,

-    [  --with-lzo-lib=DIR     lzo library directory],
+    AC_HELP_STRING([--with-lzo-lib=DIR], [lzo library directory]),

     [lzo_lib="$withval"
      LIBS="$LIBS -L$withval"]
   )
     [lzo_lib="$withval"
      LIBS="$LIBS -L$withval"]
   )

diff --git a/m4/openssl.m4 b/m4/openssl.m4
index 1a61a8b586c244ecb6e5f06d44d49c419b724fb1..32e41de76db75c55ecab6c75f862ac739f8c9761 100644 (file)
--- a/m4/openssl.m4
+++ b/m4/openssl.m4
@@ -4,15 +4,23 @@ AC_DEFUN(tinc_OPENSSL,
 [
   tinc_ac_save_CPPFLAGS="$CPPFLAGS"
 
 [
   tinc_ac_save_CPPFLAGS="$CPPFLAGS"
 

+  AC_ARG_WITH(openssl,
+    AC_HELP_STRING([--with-openssl=DIR], [OpenSSL base directory, or:]),
+    [openssl="$withval"
+     CFLAGS="$CFLAGS -I$withval/include"
+     CPPFLAGS="$CPPFLAGS -I$withval/include"
+     LIBS="$LIBS -L$withval/lib"]
+  )
+

   AC_ARG_WITH(openssl-include,
   AC_ARG_WITH(openssl-include,

-    [  --with-openssl-include=DIR  OpenSSL headers directory (without trailing /openssl)],
+    AC_HELP_STRING([--with-openssl-include=DIR], [OpenSSL headers directory (without trailing /openssl)]),

     [openssl_include="$withval"
      CFLAGS="$CFLAGS -I$withval"
      CPPFLAGS="$CPPFLAGS -I$withval"]
   )
 
   AC_ARG_WITH(openssl-lib,
     [openssl_include="$withval"
      CFLAGS="$CFLAGS -I$withval"
      CPPFLAGS="$CPPFLAGS -I$withval"]
   )
 
   AC_ARG_WITH(openssl-lib,

-    [  --with-openssl-lib=DIR  OpenSSL library directory],
+    AC_HELP_STRING([--with-openssl-lib=DIR], [OpenSSL library directory]),

     [openssl_lib="$withval"
      LIBS="$LIBS -L$withval"]
   )
     [openssl_lib="$withval"
      LIBS="$LIBS -L$withval"]
   )


@@ -24,10 +32,28 @@ AC_DEFUN(tinc_OPENSSL,
 
   CPPFLAGS="$tinc_ac_save_CPPFLAGS"
 
 
   CPPFLAGS="$tinc_ac_save_CPPFLAGS"
 

-  AC_CHECK_LIB(crypto, SHA1_version,
-    [LIBS="$LIBS -lcrypto"],
-    [AC_MSG_ERROR([OpenSSL libraries not found.])]
-  )
+case $host_os in
+  *mingw*)
+    AC_CHECK_LIB(crypto, SHA1_version,
+      [LIBS="$LIBS -lcrypto -lgdi32"],
+      [AC_MSG_ERROR([OpenSSL libraries not found.])]
+    )
+  ;;
+  *)
+    AC_CHECK_LIB(crypto, SHA1_version,
+      [LIBS="$LIBS -lcrypto"],
+      [AC_MSG_ERROR([OpenSSL libraries not found.])]
+    )
+
+    AC_CHECK_FUNC(dlopen,
+      [],
+      [AC_CHECK_LIB(dl, dlopen,
+        [LIBS="$LIBS -ldl"],
+        [AC_MSG_ERROR([OpenSSL depends on libdl.]); break]
+      )]
+    )
+  ;;
+esac

 
   AC_CHECK_FUNCS([RAND_pseudo_bytes EVP_EncryptInit_ex], ,
     [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break],
 
   AC_CHECK_FUNCS([RAND_pseudo_bytes EVP_EncryptInit_ex], ,
     [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break],


@@ -37,12 +63,4 @@ AC_DEFUN(tinc_OPENSSL,
     [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break],
     [#include <openssl/evp.h>]
   )
     [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break],
     [#include <openssl/evp.h>]
   )

-
-  AC_CHECK_FUNC(dlopen,
-    [],
-    [AC_CHECK_LIB(dl, dlopen,
-      [LIBS="$LIBS -ldl"],
-      [AC_MSG_ERROR([OpenSSL depends on libdl.]); break]
-    )]
-  )

 ])
 ])

diff --git a/m4/tuntap.m4 b/m4/tuntap.m4
index cd3a485ae617a200b99a1c559acbfb65d2d5356d..dcf3a15273c6fbfee3ea6e44446a9160b07ab65f 100644 (file)
--- a/m4/tuntap.m4
+++ b/m4/tuntap.m4
@@ -2,38 +2,37 @@ dnl Check to find out whether the running kernel has support for TUN/TAP
 
 AC_DEFUN(tinc_TUNTAP,
 [
 
 AC_DEFUN(tinc_TUNTAP,
 [

-AC_ARG_WITH(kernel,
-  [  --with-kernel=dir       give the directory with kernel sources]
-  [                        (default: /usr/src/linux)],
-  kerneldir="$withval",
-  kerneldir="/usr/src/linux"
-)
-
-AC_CACHE_CHECK([for linux/if_tun.h], tinc_cv_linux_if_tun_h,
-[ 
-  AC_TRY_COMPILE([#include "$kerneldir/include/linux/if_tun.h"],
-    [int a = IFF_TAP;],
-    if_tun_h="\"$kerneldir/include/linux/if_tun.h\"",
-    [AC_TRY_COMPILE([#include <linux/if_tun.h>],
-      [int a = IFF_TAP;],
-      if_tun_h="default",
-      if_tun_h="no"
-    )]
+  AC_ARG_WITH(kernel,
+    AC_HELP_STRING([--with-kernel=DIR], [give the directory with kernel sources (default: /usr/src/linux)]),
+    kerneldir="$withval",
+    kerneldir="/usr/src/linux"

   )
   )

-
-  if test $if_tun_h = no; then
-    tinc_cv_linux_if_tun_h=none
-  else
-    tinc_cv_linux_if_tun_h="$if_tun_h"
-  fi
-])
-
-if test $tinc_cv_linux_if_tun_h != none; then
-  AC_DEFINE(HAVE_TUNTAP, 1, [Universal tun/tap driver present])
-  if test $tinc_cv_linux_if_tun_h != default; then
-   AC_DEFINE_UNQUOTED(LINUX_IF_TUN_H, $tinc_cv_linux_if_tun_h, [Location of if_tun.h])
+  
+  AC_CACHE_CHECK([for linux/if_tun.h], tinc_cv_linux_if_tun_h,
+  [ 
+    AC_TRY_COMPILE([#include "$kerneldir/include/linux/if_tun.h"],
+      [int a = IFF_TAP;],
+      if_tun_h="\"$kerneldir/include/linux/if_tun.h\"",
+      [AC_TRY_COMPILE([#include <linux/if_tun.h>],
+        [int a = IFF_TAP;],
+        if_tun_h="default",
+        if_tun_h="no"
+      )]
+    )
+  
+    if test $if_tun_h = no; then
+      tinc_cv_linux_if_tun_h=none
+    else
+      tinc_cv_linux_if_tun_h="$if_tun_h"
+    fi
+  ])
+  
+  if test $tinc_cv_linux_if_tun_h != none; then
+    AC_DEFINE(HAVE_TUNTAP, 1, [Universal tun/tap driver present])
+    if test $tinc_cv_linux_if_tun_h != default; then
+     AC_DEFINE_UNQUOTED(LINUX_IF_TUN_H, $tinc_cv_linux_if_tun_h, [Location of if_tun.h])
+    fi

   fi
   fi

-fi
-AC_SUBST(LINUX_IF_TUN_H)
-AC_SUBST(HAVE_TUNTAP)
+  AC_SUBST(LINUX_IF_TUN_H)
+  AC_SUBST(HAVE_TUNTAP)

 ])
 ])

diff --git a/m4/zlib.m4 b/m4/zlib.m4
index d5fbc675cf04f9a05b6b4c4e9fe9c2957625309b..d69132639282d2baf3de72d9ce922aca531ecead 100644 (file)
--- a/m4/zlib.m4
+++ b/m4/zlib.m4
@@ -4,15 +4,23 @@ AC_DEFUN(tinc_ZLIB,
 [
   tinc_ac_save_CPPFLAGS="$CPPFLAGS"
 
 [
   tinc_ac_save_CPPFLAGS="$CPPFLAGS"
 

+  AC_ARG_WITH(zlib,
+    AC_HELP_STRING([--with-zlib=DIR], [zlib base directory, or:]),
+    [zlib="$withval"
+     CFLAGS="$CFLAGS -I$withval/include"
+     CPPFLAGS="$CPPFLAGS -I$withval/include"
+     LIBS="$LIBS -L$withval/lib"]
+  )
+

   AC_ARG_WITH(zlib-include,
   AC_ARG_WITH(zlib-include,

-    [  --with-zlib-include=DIR zlib headers directory],
+    AC_HELP_STRING([--with-zlib-include=DIR], [zlib headers directory]),

     [zlib_include="$withval"
      CFLAGS="$CFLAGS -I$withval"
      CPPFLAGS="$CPPFLAGS -I$withval"]
   )
 
   AC_ARG_WITH(zlib-lib,
     [zlib_include="$withval"
      CFLAGS="$CFLAGS -I$withval"
      CPPFLAGS="$CPPFLAGS -I$withval"]
   )
 
   AC_ARG_WITH(zlib-lib,

-    [  --with-zlib-lib=DIR     zlib library directory],
+    AC_HELP_STRING([--with-zlib-lib=DIR], [zlib library directory]),

     [zlib_lib="$withval"
      LIBS="$LIBS -L$withval"]
   )
     [zlib_lib="$withval"
      LIBS="$LIBS -L$withval"]
   )