diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 144 |
1 files changed, 129 insertions, 15 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for OpenVPN 2.4.8. +# Generated by GNU Autoconf 2.69 for OpenVPN 2.4.9. # # Report bugs to <openvpn-users@lists.sourceforge.net>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='OpenVPN' PACKAGE_TARNAME='openvpn' -PACKAGE_VERSION='2.4.8' -PACKAGE_STRING='OpenVPN 2.4.8' +PACKAGE_VERSION='2.4.9' +PACKAGE_STRING='OpenVPN 2.4.9' PACKAGE_BUGREPORT='openvpn-users@lists.sourceforge.net' PACKAGE_URL='' @@ -673,6 +673,8 @@ OPTIONAL_DL_LIBS TAP_WIN_MIN_MINOR TAP_WIN_MIN_MAJOR TAP_WIN_COMPONENT_ID +OPTIONAL_INOTIFY_LIBS +OPTIONAL_INOTIFY_CFLAGS P11KIT_LIBS P11KIT_CFLAGS libsystemd_LIBS @@ -910,7 +912,9 @@ LZ4_LIBS libsystemd_CFLAGS libsystemd_LIBS P11KIT_CFLAGS -P11KIT_LIBS' +P11KIT_LIBS +OPTIONAL_INOTIFY_CFLAGS +OPTIONAL_INOTIFY_LIBS' # Initialize some variables set by options. @@ -1451,7 +1455,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 OpenVPN 2.4.8 to adapt to many kinds of systems. +\`configure' configures OpenVPN 2.4.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1521,7 +1525,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenVPN 2.4.8:";; + short | recursive ) echo "Configuration of OpenVPN 2.4.9:";; esac cat <<\_ACEOF @@ -1661,6 +1665,10 @@ Some influential environment variables: P11KIT_CFLAGS C compiler flags for P11KIT, overriding pkg-config P11KIT_LIBS linker flags for P11KIT, overriding pkg-config + OPTIONAL_INOTIFY_CFLAGS + C compiler flags for OPTIONAL_INOTIFY, overriding pkg-config + OPTIONAL_INOTIFY_LIBS + linker flags for OPTIONAL_INOTIFY, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1728,7 +1736,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenVPN configure 2.4.8 +OpenVPN configure 2.4.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2567,7 +2575,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 OpenVPN $as_me 2.4.8, which was +It was created by OpenVPN $as_me 2.4.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2931,13 +2939,13 @@ if test -z "${htmldir}"; then fi -$as_echo "#define OPENVPN_VERSION_RESOURCE 2,4,8,0" >>confdefs.h +$as_echo "#define OPENVPN_VERSION_RESOURCE 2,4,9,0" >>confdefs.h OPENVPN_VERSION_MAJOR=2 OPENVPN_VERSION_MINOR=4 -OPENVPN_VERSION_PATCH=.8 +OPENVPN_VERSION_PATCH=.9 $as_echo "#define OPENVPN_VERSION_MAJOR 2" >>confdefs.h @@ -2946,7 +2954,7 @@ $as_echo "#define OPENVPN_VERSION_MAJOR 2" >>confdefs.h $as_echo "#define OPENVPN_VERSION_MINOR 4" >>confdefs.h -$as_echo "#define OPENVPN_VERSION_PATCH \".8\"" >>confdefs.h +$as_echo "#define OPENVPN_VERSION_PATCH \".9\"" >>confdefs.h ac_aux_dir= @@ -3470,7 +3478,7 @@ fi # Define the identity of the package. PACKAGE='openvpn' - VERSION='2.4.8' + VERSION='2.4.9' cat >>confdefs.h <<_ACEOF @@ -17920,7 +17928,109 @@ $as_echo "#define USE_PAM_DLOPEN 1" >>confdefs.h fi if test "${enable_async_push}" = "yes"; then - for ac_header in sys/inotify.h + case "$host" in + *-*-freebsd*) + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPTIONAL_INOTIFY" >&5 +$as_echo_n "checking for OPTIONAL_INOTIFY... " >&6; } + +if test -n "$OPTIONAL_INOTIFY_CFLAGS"; then + pkg_cv_OPTIONAL_INOTIFY_CFLAGS="$OPTIONAL_INOTIFY_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libinotify\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libinotify") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OPTIONAL_INOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libinotify" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$OPTIONAL_INOTIFY_LIBS"; then + pkg_cv_OPTIONAL_INOTIFY_LIBS="$OPTIONAL_INOTIFY_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libinotify\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libinotify") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_OPTIONAL_INOTIFY_LIBS=`$PKG_CONFIG --libs "libinotify" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + OPTIONAL_INOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libinotify" 2>&1` + else + OPTIONAL_INOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libinotify" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$OPTIONAL_INOTIFY_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (libinotify) were not met: + +$OPTIONAL_INOTIFY_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables OPTIONAL_INOTIFY_CFLAGS +and OPTIONAL_INOTIFY_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables OPTIONAL_INOTIFY_CFLAGS +and OPTIONAL_INOTIFY_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details" "$LINENO" 5; } +else + OPTIONAL_INOTIFY_CFLAGS=$pkg_cv_OPTIONAL_INOTIFY_CFLAGS + OPTIONAL_INOTIFY_LIBS=$pkg_cv_OPTIONAL_INOTIFY_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + $as_echo "#define HAVE_SYS_INOTIFY_H 1" >>confdefs.h + + +$as_echo "#define ENABLE_ASYNC_PUSH 1" >>confdefs.h + + + +fi + ;; + *) + for ac_header in sys/inotify.h do : ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default" if test "x$ac_cv_header_sys_inotify_h" = xyes; then : @@ -17937,6 +18047,8 @@ fi done + ;; + esac fi CONFIGURE_DEFINES="`set | grep '^enable_.*=' ; set | grep '^with_.*='`" @@ -17983,6 +18095,8 @@ _ACEOF + + if test "${WIN32}" = "yes"; then WIN32_TRUE= WIN32_FALSE='#' @@ -18699,7 +18813,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 OpenVPN $as_me 2.4.8, which was +This file was extended by OpenVPN $as_me 2.4.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18765,7 +18879,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="\\ -OpenVPN config.status 2.4.8 +OpenVPN config.status 2.4.9 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" |