From 4370b98bb1dfa9eb1e400549cb6fcb6711aa1b29 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Tue, 29 Jul 2003 11:50:39 +0000 Subject: [PATCH] Update configure scripts. --- configure.in | 18 ++++++++++----- m4/lzo.m4 | 12 ++++++++-- m4/openssl.m4 | 46 +++++++++++++++++++++++++------------ m4/tuntap.m4 | 63 +++++++++++++++++++++++++-------------------------- m4/zlib.m4 | 12 ++++++++-- 5 files changed, 95 insertions(+), 56 deletions(-) diff --git a/configure.in b/configure.in index def2423a..1e2b802c 100644 --- a/configure.in +++ b/configure.in @@ -1,8 +1,8 @@ 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) @@ -12,7 +12,7 @@ dnl Include the macros from the m4/ directory 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 @@ -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/ -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, - [ --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, - [ --enable-tracing enable checkpoint tracing (debugging only)], + AC_HELP_STRING([--enable-tracing], [enable checkpoint tracing (debugging only)]), [ AC_DEFINE(ENABLE_TRACING, 1, [Checkpoint tracing]) ] ) diff --git a/m4/lzo.m4 b/m4/lzo.m4 index 58011f1a..147318fe 100644 --- a/m4/lzo.m4 +++ b/m4/lzo.m4 @@ -4,15 +4,23 @@ AC_DEFUN(tinc_LZO, [ 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, - [ --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, - [ --with-lzo-lib=DIR lzo library directory], + AC_HELP_STRING([--with-lzo-lib=DIR], [lzo library directory]), [lzo_lib="$withval" LIBS="$LIBS -L$withval"] ) diff --git a/m4/openssl.m4 b/m4/openssl.m4 index 1a61a8b5..32e41de7 100644 --- a/m4/openssl.m4 +++ b/m4/openssl.m4 @@ -4,15 +4,23 @@ AC_DEFUN(tinc_OPENSSL, [ 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, - [ --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, - [ --with-openssl-lib=DIR OpenSSL library directory], + AC_HELP_STRING([--with-openssl-lib=DIR], [OpenSSL library directory]), [openssl_lib="$withval" LIBS="$LIBS -L$withval"] ) @@ -24,10 +32,28 @@ AC_DEFUN(tinc_OPENSSL, 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], @@ -37,12 +63,4 @@ AC_DEFUN(tinc_OPENSSL, [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break], [#include ] ) - - 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 cd3a485a..dcf3a152 100644 --- 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_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 ], - [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 ], + [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 -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 d5fbc675..d6913263 100644 --- a/m4/zlib.m4 +++ b/m4/zlib.m4 @@ -4,15 +4,23 @@ AC_DEFUN(tinc_ZLIB, [ 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, - [ --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, - [ --with-zlib-lib=DIR zlib library directory], + AC_HELP_STRING([--with-zlib-lib=DIR], [zlib library directory]), [zlib_lib="$withval" LIBS="$LIBS -L$withval"] ) -- 2.39.5