diff options
author | James E. King, III <jking@apache.org> | 2017-09-30 15:44:16 -0700 |
---|---|---|
committer | James E. King, III <jking@apache.org> | 2017-10-19 11:29:04 -0400 |
commit | 0ad20bdbfe9abcbb0cc5332ff95651b5c975da91 (patch) | |
tree | 7e713c9380844afe41019a7c6ebe4e508eba3464 /aclocal/ax_check_openssl.m4 | |
parent | 8b8a8efea13d1c97f856053af0a5c0e6a8a76354 (diff) | |
download | thrift-0ad20bdbfe9abcbb0cc5332ff95651b5c975da91.tar.gz |
THRIFT-4351: use travis build stages to optimize build,
avoiding duplicate rebuilds of the same image, and also
allow personal docker hub repositories for private fork
builds to be optimized. Move ubsan build to artful image
because it catches more stuff and fix what was found.
THRIFT-4345: solidify docker build strategy for maximum
coverage: trusty, xenial, artful as stock as they can be
THRIFT-4344: add top level language summary markdown and
update readme with a new image on the layered architecture
THRIFT-3847: remove VERSION macro from config.h which
was causing a conflict on artful builds.
THRIFT-4359: fix haxe map/set decode when key is binary,
as a missing break statement caused it to use an int
during decode
This closes #1389
Diffstat (limited to 'aclocal/ax_check_openssl.m4')
-rw-r--r-- | aclocal/ax_check_openssl.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/aclocal/ax_check_openssl.m4 b/aclocal/ax_check_openssl.m4 index a87c5a6b6..28e48cbef 100644 --- a/aclocal/ax_check_openssl.m4 +++ b/aclocal/ax_check_openssl.m4 @@ -1,5 +1,5 @@ # =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_check_openssl.html +# https://www.gnu.org/software/autoconf-archive/ax_check_openssl.html # =========================================================================== # # SYNOPSIS @@ -32,7 +32,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 8 +#serial 10 AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL]) AC_DEFUN([AX_CHECK_OPENSSL], [ @@ -51,7 +51,7 @@ AC_DEFUN([AX_CHECK_OPENSSL], [ ], [ # if pkg-config is installed and openssl has installed a .pc file, # then use that information and don't search ssldirs - AC_PATH_PROG([PKG_CONFIG], [pkg-config]) + AC_CHECK_TOOL([PKG_CONFIG], [pkg-config]) if test x"$PKG_CONFIG" != x""; then OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null` if test $? = 0; then |