Overview
Comment: | Added a separate M4 file for doing OpenSSL checks |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | tls-1-7 |
Files: | files | file ages | folders |
SHA1: |
c4983df96578129d34102b05117d1f72 |
User & Date: | rkeene on 2016-12-05 16:44:07 |
Other Links: | branch diff | manifest | tags |
Context
2016-12-05
| ||
16:44 | Moved OpenSSL and LibreSSL checks to an external file check-in: 07852b1ee9 user: rkeene tags: tls-1-7 | |
16:44 | Added a separate M4 file for doing OpenSSL checks check-in: c4983df965 user: rkeene tags: tls-1-7 | |
2016-12-02
| ||
21:29 | Updated to fail if we are unable to get OpenSSL configuration check-in: d5323765c7 user: rkeene tags: tls-1-7 | |
Changes
Added aclocal/tcltls_openssl.m4 version [01c1c3f418].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | AC_DEFUN([TCLTLS_SSL_OPENSSL], [ dnl Use pkg-config to find the libraries TCLTLS_SSL_LIBS="`"${PKGCONFIG}" openssl --libs`" || AC_MSG_ERROR([Unable to get OpenSSL Configuration]) TCLTLS_SSL_CFLAGS="`"${PKGCONFIG}" openssl --cflags-only-other`" || AC_MSG_ERROR([Unable to get OpenSSL Configuration]) TCLTLS_SSL_CPPFLAGS="`"${PKGCONFIG}" openssl --cflags-only-I`" || AC_MSG_ERROR([Unable to get OpenSSL Configuration]) dnl Save compile-altering variables we are changing SAVE_LIBS="${LIBS}" SAVE_CFLAGS="${CFLAGS}" SAVE_CPPFLAGS="${CPPFLAGS}" dnl Update compile-altering variables to include the OpenSSL libraries LIBS="${SAVE_LIBS} ${TCLTLS_SSL_LIBS}" CFLAGS="${SAVE_CFLAGS} ${TCLTLS_SSL_CFLAGS}" CPPFLAGS="${SAVE_CPPFLAGS} ${TCLTLS_SSL_CPPFLAGS}" dnl Verify that basic functionality is there AC_LANG_PUSH(C) AC_MSG_CHECKING([if a basic OpenSSL program works]) AC_LINK_IFELSE([AC_LANG_PROGRAM([ #include <openssl/ssl.h> #if (SSLEAY_VERSION_NUMBER >= 0x0907000L) # include <openssl/conf.h> #endif ], [ (void)SSL_library_init(); SSL_load_error_strings(); OPENSSL_config(NULL); ])], [ AC_MSG_RESULT([yes]) ], [ AC_MSG_RESULT([no]) AC_MSG_ERROR([Unable to compile a basic program using OpenSSL]) ]) AC_LANG_POP([C]) dnl Determine if SSLv2 is supported AC_CHECK_FUNC(SSLv2_method,, [ AC_DEFINE(NO_SSL2, [1], [Define this to disable SSLv2 in OpenSSL support]) ]) dnl Determine if SSLv3 is supported AC_CHECK_FUNC(SSLv3_method,, [ AC_DEFINE(NO_SSL3, [1], [Define this to disable SSLv3 in OpenSSL support]) ]) dnl Determine if TLSv1.0 is supported AC_CHECK_FUNC(TLSv1_method,, [ AC_DEFINE(NO_TLS1, [1], [Define this to disable TLSv1.0 in OpenSSL support]) ]) dnl Determine if TLSv1.1 is supported AC_CHECK_FUNC(TLSv1_1_method,, [ AC_DEFINE(NO_TLS1_1, [1], [Define this to disable TLSv1.1 in OpenSSL support]) ]) dnl Determine if TLSv1.2 is supported AC_CHECK_FUNC(TLSv1_2_method,, [ AC_DEFINE(NO_TLS1_2, [1], [Define this to disable TLSv1.2 in OpenSSL support]) ]) dnl Restore compile-altering variables LIBS="${SAVE_LIBS}" CFLAGS="${SAVE_CFLAGS}" CPPFLAGS="${SAVE_CPPFLAGS}" ]) |
Modified autogen.sh from [c6e14774e1] to [7cd79754ca].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | #! /usr/bin/env bash urls=( http://chiselapp.com/user/rkeene/repository/autoconf/doc/trunk/tcl.m4 http://chiselapp.com/user/rkeene/repository/autoconf/doc/trunk/shobj.m4 http://chiselapp.com/user/rkeene/repository/autoconf/doc/trunk/versionscript.m4 ) cd "$(dirname "$(which "$0")")" || exit 1 mkdir aclocal >/dev/null 2>/dev/null files=() for url in "${urls[@]}"; do file="aclocal/$(echo "${url}" | sed '[email protected]^.*/@@')" curl -lsS "${url}" > "${file}.new" || exit 1 if diff "${file}.new" "${file}" >/dev/null 2>/dev/null; then rm -f "${file}.new" else mv "${file}.new" "${file}" fi files=("${files[@]}" "${file}") done | > > > > | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | #! /usr/bin/env bash urls=( http://chiselapp.com/user/rkeene/repository/autoconf/doc/trunk/tcl.m4 http://chiselapp.com/user/rkeene/repository/autoconf/doc/trunk/shobj.m4 http://chiselapp.com/user/rkeene/repository/autoconf/doc/trunk/versionscript.m4 ) localFiles=( aclocal/tcltls_openssl.m4 ) cd "$(dirname "$(which "$0")")" || exit 1 mkdir aclocal >/dev/null 2>/dev/null files=() for url in "${urls[@]}"; do file="aclocal/$(echo "${url}" | sed '[email protected]^.*/@@')" curl -lsS "${url}" > "${file}.new" || exit 1 if diff "${file}.new" "${file}" >/dev/null 2>/dev/null; then rm -f "${file}.new" else mv "${file}.new" "${file}" fi files=("${files[@]}" "${file}") done for file in "${files[@]}" "${localFiles[@]}"; do cat "${file}" done > aclocal.m4.new if diff aclocal.m4.new aclocal.m4 >/dev/null 2>/dev/null; then rm -f aclocal.m4.new else mv aclocal.m4.new aclocal.m4 |
︙ | ︙ |