lagertonne/tinc
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Wiki Activity

Import Upstream version 1.0.34

Browse source
This commit is contained in:
Guus Sliepen 2019-08-26 13:44:48 +02:00
parent 5969674c46
commit b28bb7b29b
36 changed files with 878 additions and 1106 deletions
Download patch file Download diff file Expand all files Collapse all files

218
configure vendored
View file

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for tinc 1.0.33.
# Generated by GNU Autoconf 2.69 for tinc 1.0.34.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='tinc'
PACKAGE_TARNAME='tinc'
PACKAGE_VERSION='1.0.33'
PACKAGE_STRING='tinc 1.0.33'
PACKAGE_VERSION='1.0.34'
PACKAGE_STRING='tinc 1.0.34'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@ -625,6 +625,8 @@ LTLIBOBJS
LIBOBJS
GETOPT_FALSE
GETOPT_TRUE
WITH_SYSTEMD_FALSE
WITH_SYSTEMD_TRUE
TUNEMU_FALSE
TUNEMU_TRUE
VDE_FALSE
@ -641,9 +643,7 @@ BSD_FALSE
BSD_TRUE
LINUX_FALSE
LINUX_TRUE
HAVE_SYSTEMD_FALSE
HAVE_SYSTEMD_TRUE
systemdsystemunitdir
systemd_path
host_os
host_vendor
host_cpu
@ -652,9 +652,6 @@ build_os
build_vendor
build_cpu
build
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
EGREP
GREP
CPP
@ -750,7 +747,7 @@ enable_uml
enable_vde
enable_tunemu
with_windows2000
with_systemdsystemunitdir
with_systemd
enable_hardening
enable_zlib
with_zlib
@ -773,10 +770,7 @@ CFLAGS
LDFLAGS
LIBS
CPPFLAGS
CPP
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR'
CPP'
# Initialize some variables set by options.
@ -1327,7 +1321,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures tinc 1.0.33 to adapt to many kinds of systems.
\`configure' configures tinc 1.0.34 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1398,7 +1392,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of tinc 1.0.33:";;
short | recursive ) echo "Configuration of tinc 1.0.34:";;
esac
cat <<\_ACEOF
@ -1426,8 +1420,7 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-windows2000 compile with support for Windows 2000. This disables
support for tunneling over existing IPv6 networks.
--with-systemdsystemunitdir=DIR
Directory for systemd service files
--with-systemd[=DIR] install systemd service files [to DIR if specified]
--with-zlib=DIR zlib base directory, or:
--with-zlib-include=DIR zlib headers directory
--with-zlib-lib=DIR zlib library directory
@ -1449,11 +1442,6 @@ Some influential environment variables:
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
PKG_CONFIG_PATH
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@ -1521,7 +1509,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
tinc configure 1.0.33
tinc configure 1.0.34
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1986,7 +1974,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by tinc $as_me 1.0.33, which was
It was created by tinc $as_me 1.0.34, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2850,7 +2838,7 @@ fi
# Define the identity of the package.
PACKAGE='tinc'
VERSION='1.0.33'
VERSION='1.0.34'
cat >>confdefs.h <<_ACEOF
@ -4811,127 +4799,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
$as_echo "$PKG_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
fi
if test -z "$ac_cv_path_PKG_CONFIG"; then
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x$ac_pt_PKG_CONFIG" = x; then
PKG_CONFIG=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
PKG_CONFIG=$ac_pt_PKG_CONFIG
fi
else
PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
fi
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
fi
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@ -5155,37 +5022,24 @@ fi
# Check whether --with-systemdsystemunitdir was given.
if test "${with_systemdsystemunitdir+set}" = set; then :
withval=$with_systemdsystemunitdir;
# Check whether --with-systemd was given.
if test "${with_systemd+set}" = set; then :
withval=$with_systemd; systemd=true; systemd_path="$with_systemd"
else
with_systemdsystemunitdir=auto
systemd=false
fi
if test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"; then :
def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
if test "x$def_systemdsystemunitdir" = "x"; then :
if test "x$with_systemdsystemunitdir" = "xyes"; then :
as_fn_error $? "systemd support requested but pkg-config unable to query systemd package" "$LINENO" 5
fi
with_systemdsystemunitdir=no
if test "x$with_systemd" = "xyes"; then :
systemd_path="\${libdir}/systemd/system"
else
with_systemdsystemunitdir="$def_systemdsystemunitdir"
if test "x$with_systemd" = "xno"; then :
systemd=false
fi
fi
if test "x$with_systemdsystemunitdir" != "xno"; then :
systemdsystemunitdir=$with_systemdsystemunitdir
fi
if test "x$with_systemdsystemunitdir" != "xno"; then
HAVE_SYSTEMD_TRUE=
HAVE_SYSTEMD_FALSE='#'
else
HAVE_SYSTEMD_TRUE='#'
HAVE_SYSTEMD_FALSE=
fi
systemd_path=$systemd_path
if test "$linux" = true; then
@ -5252,6 +5106,14 @@ else
TUNEMU_FALSE=
fi
if test "$systemd" = true; then
WITH_SYSTEMD_TRUE=
WITH_SYSTEMD_FALSE='#'
else
WITH_SYSTEMD_TRUE='#'
WITH_SYSTEMD_FALSE=
fi
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -6898,7 +6760,7 @@ if test "x$runstatedir" = "x"; then
fi
ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile distro/Makefile"
ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile systemd/Makefile"
cat >confcache <<\_ACEOF
@ -7034,10 +6896,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_SYSTEMD_TRUE}" && test -z "${HAVE_SYSTEMD_FALSE}"; then
as_fn_error $? "conditional \"HAVE_SYSTEMD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${LINUX_TRUE}" && test -z "${LINUX_FALSE}"; then
as_fn_error $? "conditional \"LINUX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -7070,6 +6928,10 @@ if test -z "${TUNEMU_TRUE}" && test -z "${TUNEMU_FALSE}"; then
as_fn_error $? "conditional \"TUNEMU\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${WITH_SYSTEMD_TRUE}" && test -z "${WITH_SYSTEMD_FALSE}"; then
as_fn_error $? "conditional \"WITH_SYSTEMD\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GETOPT_TRUE}" && test -z "${GETOPT_FALSE}"; then
as_fn_error $? "conditional \"GETOPT\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@ -7471,7 +7333,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by tinc $as_me 1.0.33, which was
This file was extended by tinc $as_me 1.0.34, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -7537,7 +7399,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
tinc config.status 1.0.33
tinc config.status 1.0.34
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@ -7671,7 +7533,7 @@ do
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"distro/Makefile") CONFIG_FILES="$CONFIG_FILES distro/Makefile" ;;
"systemd/Makefile") CONFIG_FILES="$CONFIG_FILES systemd/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac