Import Upstream version 1.0.13
This commit is contained in:
Guus Sliepen
parent
c54d214bf2
commit
3f0ae998e8
34 changed files with 861 additions and 375 deletions
56
configure
vendored
56
configure
vendored
|
|
@ -702,9 +702,11 @@ with_windows2000
|
|||
with_openssl
|
||||
with_openssl_include
|
||||
with_openssl_lib
|
||||
enable_zlib
|
||||
with_zlib
|
||||
with_zlib_include
|
||||
with_zlib_lib
|
||||
enable_lzo
|
||||
with_lzo
|
||||
with_lzo_include
|
||||
with_lzo_lib
|
||||
|
|
@ -1341,6 +1343,8 @@ Optional Features:
|
|||
--disable-dependency-tracking speeds up one-time build
|
||||
--enable-dependency-tracking do not reject slow dependency extractors
|
||||
--enable-tunemu enable support for the tunemu driver
|
||||
--disable-zlib disable zlib compression support
|
||||
--disable-lzo disable lzo compression support
|
||||
--enable-jumbograms enable support for jumbograms (packets up to 9000
|
||||
bytes)
|
||||
|
||||
|
|
@ -2704,7 +2708,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE=tinc
|
||||
VERSION=1.0.12
|
||||
VERSION=1.0.13
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -5001,7 +5005,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
|
|||
|
||||
fi
|
||||
|
||||
for ac_header in stdbool.h syslog.h sys/file.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/time.h sys/uio.h sys/wait.h netdb.h arpa/inet.h
|
||||
for ac_header in stdbool.h syslog.h sys/file.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/time.h sys/uio.h sys/wait.h netdb.h arpa/inet.h dirent.h
|
||||
do :
|
||||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
||||
|
|
@ -6347,12 +6351,22 @@ fi
|
|||
|
||||
|
||||
|
||||
# Check whether --enable-zlib was given.
|
||||
if test "${enable_zlib+set}" = set; then :
|
||||
enableval=$enable_zlib;
|
||||
fi
|
||||
|
||||
if test "x$enable_zlib" != "xno"; then :
|
||||
|
||||
|
||||
$as_echo "#define HAVE_ZLIB 1" >>confdefs.h
|
||||
|
||||
|
||||
# Check whether --with-zlib was given.
|
||||
if test "${with_zlib+set}" = set; then :
|
||||
withval=$with_zlib; zlib="$withval"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/include"
|
||||
LDFLAGS="$LDFLAGS -L$withval/lib"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/include"
|
||||
LDFLAGS="$LDFLAGS -L$withval/lib"
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -6361,7 +6375,7 @@ fi
|
|||
# Check whether --with-zlib-include was given.
|
||||
if test "${with_zlib_include+set}" = set; then :
|
||||
withval=$with_zlib_include; zlib_include="$withval"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval"
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -6370,12 +6384,12 @@ fi
|
|||
# Check whether --with-zlib-lib was given.
|
||||
if test "${with_zlib_lib+set}" = set; then :
|
||||
withval=$with_zlib_lib; zlib_lib="$withval"
|
||||
LDFLAGS="$LDFLAGS -L$withval"
|
||||
LDFLAGS="$LDFLAGS -L$withval"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
for ac_header in zlib.h
|
||||
for ac_header in zlib.h
|
||||
do :
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_zlib_h" = x""yes; then :
|
||||
|
|
@ -6391,7 +6405,7 @@ fi
|
|||
done
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress2 in -lz" >&5
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress2 in -lz" >&5
|
||||
$as_echo_n "checking for compress2 in -lz... " >&6; }
|
||||
if test "${ac_cv_lib_z_compress2+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
|
|
@ -6435,13 +6449,25 @@ else
|
|||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --enable-lzo was given.
|
||||
if test "${enable_lzo+set}" = set; then :
|
||||
enableval=$enable_lzo;
|
||||
fi
|
||||
|
||||
if test "x$enable_lzo" != "xno"; then :
|
||||
|
||||
|
||||
$as_echo "#define HAVE_LZO 1" >>confdefs.h
|
||||
|
||||
|
||||
# Check whether --with-lzo was given.
|
||||
if test "${with_lzo+set}" = set; then :
|
||||
withval=$with_lzo; lzo="$withval"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/include"
|
||||
LDFLAGS="$LDFLAGS -L$withval/lib"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/include"
|
||||
LDFLAGS="$LDFLAGS -L$withval/lib"
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -6450,7 +6476,7 @@ fi
|
|||
# Check whether --with-lzo-include was given.
|
||||
if test "${with_lzo_include+set}" = set; then :
|
||||
withval=$with_lzo_include; lzo_include="$withval"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval"
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -6459,12 +6485,12 @@ fi
|
|||
# Check whether --with-lzo-lib was given.
|
||||
if test "${with_lzo_lib+set}" = set; then :
|
||||
withval=$with_lzo_lib; lzo_lib="$withval"
|
||||
LDFLAGS="$LDFLAGS -L$withval"
|
||||
LDFLAGS="$LDFLAGS -L$withval"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzo1x_1_compress in -llzo2" >&5
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzo1x_1_compress in -llzo2" >&5
|
||||
$as_echo_n "checking for lzo1x_1_compress in -llzo2... " >&6; }
|
||||
if test "${ac_cv_lib_lzo2_lzo1x_1_compress+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
|
|
@ -6550,7 +6576,7 @@ fi
|
|||
fi
|
||||
|
||||
|
||||
for ac_header in lzo/lzo1x.h
|
||||
for ac_header in lzo/lzo1x.h
|
||||
do :
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "lzo/lzo1x.h" "ac_cv_header_lzo_lzo1x_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_lzo_lzo1x_h" = x""yes; then :
|
||||
|
|
@ -6600,6 +6626,8 @@ fi
|
|||
done
|
||||
|
||||
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --enable-jumbograms was given.
|
||||
if test "${enable_jumbograms+set}" = set; then :
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue