Skip to content

Commit c5d71be

Browse files
grimreapergrimreaper
committed
regen
1 parent 2748dba commit c5d71be

File tree

2 files changed

+77
-217
lines changed

2 files changed

+77
-217
lines changed

‎aclocal.m4

Lines changed: 76 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
22

3-
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
3+
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
44

55
# This file is free software; the Free Software Foundation
66
# gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,7 @@
1313

1414
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
1515
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
16-
# serial 12 (pkg-config-0.29.2)
16+
# serial 11 (pkg-config-0.29.1)
1717

1818
dnl Copyright © 2004 Scott James Remnant <[email protected]>.
1919
dnl Copyright © 2012-2015 Dan Nicholson <[email protected]>
@@ -55,7 +55,7 @@ dnl
5555
dnl See the "Since" comment for each macro you use to see what version
5656
dnl of the macros you require.
5757
m4_defun([PKG_PREREQ],
58-
[m4_define([PKG_MACROS_VERSION], [0.29.2])
58+
[m4_define([PKG_MACROS_VERSION], [0.29.1])
5959
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
6060
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
6161
])dnl PKG_PREREQ
@@ -156,7 +156,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
156156
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
157157
158158
pkg_failed=no
159-
AC_MSG_CHECKING([for $2])
159+
AC_MSG_CHECKING([for $1])
160160
161161
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
162162
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -166,11 +166,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
166166
See the pkg-config man page for more details.])
167167
168168
if test $pkg_failed = yes; then
169-
AC_MSG_RESULT([no])
169+
AC_MSG_RESULT([no])
170170
_PKG_SHORT_ERRORS_SUPPORTED
171171
if test $_pkg_short_errors_supported = yes; then
172172
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
173-
else
173+
else
174174
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
175175
fi
176176
# Put the nasty error message in config.log where it belongs
@@ -187,7 +187,7 @@ installed software in a non-standard prefix.
187187
_PKG_TEXT])[]dnl
188188
])
189189
elif test $pkg_failed = untried; then
190-
AC_MSG_RESULT([no])
190+
AC_MSG_RESULT([no])
191191
m4_default([$4], [AC_MSG_FAILURE(
192192
[The pkg-config script could not be found or is too old. Make sure it
193193
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -288,4 +288,71 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
288288
AS_VAR_IF([$1], [""], [$5], [$4])dnl
289289
])dnl PKG_CHECK_VAR
290290

291-
m4_include([m4/ax_check_openssl.m4])
291+
dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
292+
dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
293+
dnl [DESCRIPTION], [DEFAULT])
294+
dnl ------------------------------------------
295+
dnl
296+
dnl Prepare a "--with-" configure option using the lowercase
297+
dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
298+
dnl PKG_CHECK_MODULES in a single macro.
299+
AC_DEFUN([PKG_WITH_MODULES],
300+
[
301+
m4_pushdef([with_arg], m4_tolower([$1]))
302+
303+
m4_pushdef([description],
304+
[m4_default([$5], [build with ]with_arg[ support])])
305+
306+
m4_pushdef([def_arg], [m4_default([$6], [auto])])
307+
m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
308+
m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
309+
310+
m4_case(def_arg,
311+
[yes],[m4_pushdef([with_without], [--without-]with_arg)],
312+
[m4_pushdef([with_without],[--with-]with_arg)])
313+
314+
AC_ARG_WITH(with_arg,
315+
AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
316+
[AS_TR_SH([with_]with_arg)=def_arg])
317+
318+
AS_CASE([$AS_TR_SH([with_]with_arg)],
319+
[yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
320+
[auto],[PKG_CHECK_MODULES([$1],[$2],
321+
[m4_n([def_action_if_found]) $3],
322+
[m4_n([def_action_if_not_found]) $4])])
323+
324+
m4_popdef([with_arg])
325+
m4_popdef([description])
326+
m4_popdef([def_arg])
327+
328+
])dnl PKG_WITH_MODULES
329+
330+
dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
331+
dnl [DESCRIPTION], [DEFAULT])
332+
dnl -----------------------------------------------
333+
dnl
334+
dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
335+
dnl check._[VARIABLE-PREFIX] is exported as make variable.
336+
AC_DEFUN([PKG_HAVE_WITH_MODULES],
337+
[
338+
PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
339+
340+
AM_CONDITIONAL([HAVE_][$1],
341+
[test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
342+
])dnl PKG_HAVE_WITH_MODULES
343+
344+
dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
345+
dnl [DESCRIPTION], [DEFAULT])
346+
dnl ------------------------------------------------------
347+
dnl
348+
dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
349+
dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
350+
dnl and preprocessor variable.
351+
AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
352+
[
353+
PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
354+
355+
AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
356+
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
357+
])dnl PKG_HAVE_DEFINE_WITH_MODULES
358+

‎configure

Lines changed: 1 addition & 208 deletions
Original file line numberDiff line numberDiff line change
@@ -623,9 +623,6 @@ ac_includes_default="\
623623
#endif"
624624

625625
ac_subst_vars='LTLIBOBJS
626-
OPENSSL_LDFLAGS
627-
OPENSSL_LIBS
628-
OPENSSL_INCLUDES
629626
ENSUREPIP
630627
SRCDIRS
631628
THREADHEADERS
@@ -837,7 +834,6 @@ with_libc
837834
enable_big_digits
838835
with_computed_gotos
839836
with_ensurepip
840-
with_openssl
841837
with_ssl_default_suites
842838
'
843839
ac_precious_vars='build_alias
@@ -1535,7 +1531,6 @@ Optional Packages:
15351531
default on supported compilers)
15361532
--with(out)-ensurepip=[=upgrade]
15371533
"install" or "upgrade" using bundled pip
1538-
--with-openssl=DIR root of the OpenSSL directory
15391534
--with-ssl-default-suites=[python|openssl|STRING]
15401535
Override default cipher suites string, python: use
15411536
Python's preferred selection (default), openssl:
@@ -16196,209 +16191,7 @@ $as_echo "#define HAVE_GETRANDOM 1" >>confdefs.h
1619616191
fi
1619716192

1619816193
# Check for usable OpenSSL
16199-
16200-
found=false
16201-
16202-
# Check whether --with-openssl was given.
16203-
if test "${with_openssl+set}" = set; then :
16204-
withval=$with_openssl;
16205-
case "$withval" in
16206-
"" | y | ye | yes | n | no)
16207-
as_fn_error $? "Invalid --with-openssl value" "$LINENO" 5
16208-
;;
16209-
*) ssldirs="$withval"
16210-
;;
16211-
esac
16212-
16213-
else
16214-
16215-
# if pkg-config is installed and openssl has installed a .pc file,
16216-
# then use that information and don't search ssldirs
16217-
if test -n "$ac_tool_prefix"; then
16218-
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
16219-
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
16220-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16221-
$as_echo_n "checking for $ac_word... " >&6; }
16222-
if ${ac_cv_prog_PKG_CONFIG+:} false; then :
16223-
$as_echo_n "(cached) " >&6
16224-
else
16225-
if test -n "$PKG_CONFIG"; then
16226-
ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
16227-
else
16228-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16229-
for as_dir in $PATH
16230-
do
16231-
IFS=$as_save_IFS
16232-
test -z "$as_dir" && as_dir=.
16233-
for ac_exec_ext in '' $ac_executable_extensions; do
16234-
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16235-
ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
16236-
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16237-
break 2
16238-
fi
16239-
done
16240-
done
16241-
IFS=$as_save_IFS
16242-
16243-
fi
16244-
fi
16245-
PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
16246-
if test -n "$PKG_CONFIG"; then
16247-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
16248-
$as_echo "$PKG_CONFIG" >&6; }
16249-
else
16250-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16251-
$as_echo "no" >&6; }
16252-
fi
16253-
16254-
16255-
fi
16256-
if test -z "$ac_cv_prog_PKG_CONFIG"; then
16257-
ac_ct_PKG_CONFIG=$PKG_CONFIG
16258-
# Extract the first word of "pkg-config", so it can be a program name with args.
16259-
set dummy pkg-config; ac_word=$2
16260-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
16261-
$as_echo_n "checking for $ac_word... " >&6; }
16262-
if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
16263-
$as_echo_n "(cached) " >&6
16264-
else
16265-
if test -n "$ac_ct_PKG_CONFIG"; then
16266-
ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
16267-
else
16268-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
16269-
for as_dir in $PATH
16270-
do
16271-
IFS=$as_save_IFS
16272-
test -z "$as_dir" && as_dir=.
16273-
for ac_exec_ext in '' $ac_executable_extensions; do
16274-
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
16275-
ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
16276-
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
16277-
break 2
16278-
fi
16279-
done
16280-
done
16281-
IFS=$as_save_IFS
16282-
16283-
fi
16284-
fi
16285-
ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
16286-
if test -n "$ac_ct_PKG_CONFIG"; then
16287-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
16288-
$as_echo "$ac_ct_PKG_CONFIG" >&6; }
16289-
else
16290-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16291-
$as_echo "no" >&6; }
16292-
fi
16293-
16294-
if test "x$ac_ct_PKG_CONFIG" = x; then
16295-
PKG_CONFIG=""
16296-
else
16297-
case $cross_compiling:$ac_tool_warned in
16298-
yes:)
16299-
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
16300-
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
16301-
ac_tool_warned=yes ;;
16302-
esac
16303-
PKG_CONFIG=$ac_ct_PKG_CONFIG
16304-
fi
16305-
else
16306-
PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
16307-
fi
16308-
16309-
if test x"$PKG_CONFIG" != x""; then
16310-
OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
16311-
if test $? = 0; then
16312-
OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
16313-
OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
16314-
found=true
16315-
fi
16316-
fi
16317-
16318-
# no such luck; use some default ssldirs
16319-
if ! $found; then
16320-
ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr"
16321-
fi
16322-
16323-
16324-
fi
16325-
16326-
16327-
16328-
# note that we #include <openssl/foo.h>, so the OpenSSL headers have to be in
16329-
# an 'openssl' subdirectory
16330-
16331-
if ! $found; then
16332-
OPENSSL_INCLUDES=
16333-
for ssldir in $ssldirs; do
16334-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl/ssl.h in $ssldir" >&5
16335-
$as_echo_n "checking for openssl/ssl.h in $ssldir... " >&6; }
16336-
if test -f "$ssldir/include/openssl/ssl.h"; then
16337-
OPENSSL_INCLUDES="-I$ssldir/include"
16338-
OPENSSL_LDFLAGS="-L$ssldir/lib"
16339-
OPENSSL_LIBS="-lssl -lcrypto"
16340-
found=true
16341-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
16342-
$as_echo "yes" >&6; }
16343-
break
16344-
else
16345-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16346-
$as_echo "no" >&6; }
16347-
fi
16348-
done
16349-
16350-
# if the file wasn't found, well, go ahead and try the link anyway -- maybe
16351-
# it will just work!
16352-
fi
16353-
16354-
# try the preprocessor and linker with our new flags,
16355-
# being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS
16356-
16357-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiling and linking against OpenSSL works" >&5
16358-
$as_echo_n "checking whether compiling and linking against OpenSSL works... " >&6; }
16359-
echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \
16360-
"OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&5
16361-
16362-
save_LIBS="$LIBS"
16363-
save_LDFLAGS="$LDFLAGS"
16364-
save_CPPFLAGS="$CPPFLAGS"
16365-
LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
16366-
LIBS="$OPENSSL_LIBS $LIBS"
16367-
CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS"
16368-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16369-
/* end confdefs.h. */
16370-
#include <openssl/ssl.h>
16371-
int
16372-
main ()
16373-
{
16374-
SSL_new(NULL)
16375-
;
16376-
return 0;
16377-
}
16378-
_ACEOF
16379-
if ac_fn_c_try_link "$LINENO"; then :
16380-
16381-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
16382-
$as_echo "yes" >&6; }
16383-
have_openssl=yes
16384-
16385-
else
16386-
16387-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16388-
$as_echo "no" >&6; }
16389-
have_openssl=no
16390-
16391-
fi
16392-
rm -f core conftest.err conftest.$ac_objext \
16393-
conftest$ac_exeext conftest.$ac_ext
16394-
CPPFLAGS="$save_CPPFLAGS"
16395-
LDFLAGS="$save_LDFLAGS"
16396-
LIBS="$save_LIBS"
16397-
16398-
16399-
16400-
16401-
16194+
AX_CHECK_OPENSSL(have_openssl=yes,have_openssl=no)
1640216195

1640316196
if test "$have_openssl" = yes; then
1640416197
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X509_VERIFY_PARAM_set1_host in libssl" >&5

0 commit comments

Comments
 (0)