diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2019-04-03 10:10:16 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2019-04-03 10:10:16 +0200 |
| commit | 6e1708c736b3db01fef175e25b94c7e4cb51fccb (patch) | |
| tree | 4808127c8919f4458cd8387cc8275d37b38e7ad2 | |
| parent | b66f10141b1062865bc7fa89c5e4ff0664665269 (diff) | |
./configure updated with ./autogen.shv1.41
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rwxr-xr-x | configure | 93 | ||||
| -rw-r--r-- | src/Makefile.in | 2 | ||||
| -rw-r--r-- | src/config.h.in | 3 |
3 files changed, 65 insertions, 33 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ptunnel-ng 1.40. +# Generated by GNU Autoconf 2.69 for ptunnel-ng 1.41. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ptunnel-ng' PACKAGE_TARNAME='ptunnel-ng' -PACKAGE_VERSION='1.40' -PACKAGE_STRING='ptunnel-ng 1.40' +PACKAGE_VERSION='1.41' +PACKAGE_STRING='ptunnel-ng 1.41' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -622,10 +622,10 @@ ac_includes_default="\ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +USE_CUSTOMRNG_FALSE +USE_CUSTOMRNG_TRUE HAVE_ARC4RANDOM_FALSE HAVE_ARC4RANDOM_TRUE -HAVE_RANDOM_FALSE -HAVE_RANDOM_TRUE HAVE_ICMPFILTER_FALSE HAVE_ICMPFILTER_TRUE IS_WINDOWS_FALSE @@ -737,6 +737,7 @@ enable_silent_rules enable_dependency_tracking enable_pcap enable_selinux +with_rngdev ' ac_precious_vars='build_alias host_alias @@ -1297,7 +1298,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 ptunnel-ng 1.40 to adapt to many kinds of systems. +\`configure' configures ptunnel-ng 1.41 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1368,7 +1369,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ptunnel-ng 1.40:";; + short | recursive ) echo "Configuration of ptunnel-ng 1.41:";; esac cat <<\_ACEOF @@ -1385,6 +1386,12 @@ Optional Features: --disable-pcap Disable pcap support. (default: enabled if found) --disable-selinux Disable SELINUX support. (default: enabled if found) +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-rngdev Set an alternative random device. (default: + /dev/random) + Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -1461,7 +1468,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ptunnel-ng configure 1.40 +ptunnel-ng configure 1.41 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2120,7 +2127,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 ptunnel-ng $as_me 1.40, which was +It was created by ptunnel-ng $as_me 1.41, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3068,7 +3075,7 @@ fi # Define the identity of the package. PACKAGE='ptunnel-ng' - VERSION='1.40' + VERSION='1.41' cat >>confdefs.h <<_ACEOF @@ -5838,6 +5845,31 @@ case ${selinux_enabled} in *) as_fn_error $? "Unknown option \`${selinux_enabled}\` for --disable-selinux" "$LINENO" 5 ;; esac +use_customrng=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for random device" >&5 +$as_echo_n "checking for random device... " >&6; } + +# Check whether --with-rngdev was given. +if test "${with_rngdev+set}" = set; then : + withval=$with_rngdev; use_customrng=yes +else + with_rngdev="/dev/random" +fi + +case ${with_rngdev} in + yes) with_rngdev="/dev/random" ;; + /dev/random) ;; + /dev/urandom) ;; + *) as_fn_error $? "Unknown random device \`${with_rngdev}\` for --with-rngdev: Only \`/dev/random\` xor \`/dev/urandom\` allowed. This option is unused on Windows targets." "$LINENO" 5 ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_rngdev}" >&5 +$as_echo "${with_rngdev}" >&6; } + +cat >>confdefs.h <<_ACEOF +#define RNGDEV "${with_rngdev}" +_ACEOF + + if test x"${pcap_enabled}" != x -a \ x"${use_msw}" != xyes; then for ac_header in pcap.h @@ -5928,7 +5960,8 @@ done fi -for ac_header in bsd/stdlib.h +if test x"${use_customrng}" != xyes; then + for ac_header in bsd/stdlib.h do : ac_fn_c_check_header_mongrel "$LINENO" "bsd/stdlib.h" "ac_cv_header_bsd_stdlib_h" "$ac_includes_default" if test "x$ac_cv_header_bsd_stdlib_h" = xyes; then : @@ -5936,13 +5969,11 @@ if test "x$ac_cv_header_bsd_stdlib_h" = xyes; then : #define HAVE_BSD_STDLIB_H 1 _ACEOF -else - random_enabled=yes fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing arc4random" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing arc4random" >&5 $as_echo_n "checking for library containing arc4random... " >&6; } if ${ac_cv_search_arc4random+:} false; then : $as_echo_n "(cached) " >&6 @@ -5998,19 +6029,17 @@ if test "$ac_res" != no; then : fi -for ac_func in arc4random + for ac_func in arc4random do : ac_fn_c_check_func "$LINENO" "arc4random" "ac_cv_func_arc4random" if test "x$ac_cv_func_arc4random" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_ARC4RANDOM 1 _ACEOF - random_enabled= + arc4random_enabled=yes fi done -if test x"${random_enabled}" = x; then - arc4random_enabled=yes fi if test x"${selinux_enabled}" != x; then @@ -6213,14 +6242,6 @@ else HAVE_ICMPFILTER_FALSE= fi - if test x"${random_enabled}" = xyes; then - HAVE_RANDOM_TRUE= - HAVE_RANDOM_FALSE='#' -else - HAVE_RANDOM_TRUE='#' - HAVE_RANDOM_FALSE= -fi - if test x"${arc4random_enabled}" = xyes; then HAVE_ARC4RANDOM_TRUE= HAVE_ARC4RANDOM_FALSE='#' @@ -6229,6 +6250,14 @@ else HAVE_ARC4RANDOM_FALSE= fi + if test x"${use_customrng}" = xyes; then + USE_CUSTOMRNG_TRUE= + USE_CUSTOMRNG_FALSE='#' +else + USE_CUSTOMRNG_TRUE='#' + USE_CUSTOMRNG_FALSE= +fi + ac_config_headers="$ac_config_headers src/config.h:src/config.h.in" @@ -6381,14 +6410,14 @@ if test -z "${HAVE_ICMPFILTER_TRUE}" && test -z "${HAVE_ICMPFILTER_FALSE}"; then as_fn_error $? "conditional \"HAVE_ICMPFILTER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${HAVE_RANDOM_TRUE}" && test -z "${HAVE_RANDOM_FALSE}"; then - as_fn_error $? "conditional \"HAVE_RANDOM\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${HAVE_ARC4RANDOM_TRUE}" && test -z "${HAVE_ARC4RANDOM_FALSE}"; then as_fn_error $? "conditional \"HAVE_ARC4RANDOM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_CUSTOMRNG_TRUE}" && test -z "${USE_CUSTOMRNG_FALSE}"; then + as_fn_error $? "conditional \"USE_CUSTOMRNG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -6786,7 +6815,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 ptunnel-ng $as_me 1.40, which was +This file was extended by ptunnel-ng $as_me 1.41, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6852,7 +6881,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="\\ -ptunnel-ng config.status 1.40 +ptunnel-ng config.status 1.41 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/src/Makefile.in b/src/Makefile.in index 4d3bc76..002864c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -93,7 +93,7 @@ bin_PROGRAMS = ptunnel-ng$(EXEEXT) @HAVE_SELINUX_TRUE@am__append_2 = -DHAVE_SELINUX=1 @HAVE_ICMPFILTER_TRUE@am__append_3 = -DHAVE_ICMPFILTER=1 @HAVE_ARC4RANDOM_TRUE@am__append_4 = -DHAVE_ARC4RANDOM=1 -@HAVE_ARC4RANDOM_FALSE@@HAVE_RANDOM_TRUE@am__append_5 = -DHAVE_RANDOM=1 +@USE_CUSTOMRNG_TRUE@am__append_5 = -DUSE_CUSTOMRNG=1 @IS_WINDOWS_TRUE@am__append_6 = -I$(abs_srcdir)/win32/includes @IS_WINDOWS_TRUE@am__append_7 = $(wpcap_IMP) @IS_WINDOWS_TRUE@am__append_8 = $(wpcap_DEF) diff --git a/src/config.h.in b/src/config.h.in index db788b5..87d4c0b 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -228,6 +228,9 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* set the path to the random device you want to use for pt_random */ +#undef RNGDEV + /* The size of `char', as computed by sizeof. */ #undef SIZEOF_CHAR |