configure.ac (hitch-1.5.2) | : | configure.ac (hitch-1.6.0) | ||
---|---|---|---|---|
# -*- Autoconf -*- | # -*- Autoconf -*- | |||
# Process this file with autoconf to produce a configure script. | # Process this file with autoconf to produce a configure script. | |||
AC_PREREQ([2.59]) | AC_PREREQ([2.59]) | |||
AC_INIT([hitch], [1.5.2], [opensource@varnish-software.com]) | AC_INIT([hitch], [1.6.0], [opensource@varnish-software.com]) | |||
AC_CONFIG_SRCDIR([src/configuration.c]) | AC_CONFIG_SRCDIR([src/configuration.c]) | |||
AC_CONFIG_HEADERS([config.h]) | AC_CONFIG_HEADERS([config.h]) | |||
AC_CONFIG_AUX_DIR([build-aux]) | AC_CONFIG_AUX_DIR([build-aux]) | |||
AC_CONFIG_MACRO_DIR([.]) | AC_CONFIG_MACRO_DIR([.]) | |||
AC_USE_SYSTEM_EXTENSIONS | AC_USE_SYSTEM_EXTENSIONS | |||
AM_INIT_AUTOMAKE([ | AM_INIT_AUTOMAKE([ | |||
-Wall | -Wall | |||
-Werror | -Werror | |||
skipping to change at line 42 | skipping to change at line 42 | |||
AC_ARG_WITH([yacc], | AC_ARG_WITH([yacc], | |||
AS_HELP_STRING([--with-yacc], [Build with yacc]), | AS_HELP_STRING([--with-yacc], [Build with yacc]), | |||
[], [with_yacc=no]) | [], [with_yacc=no]) | |||
AC_ARG_ENABLE([documentation], | AC_ARG_ENABLE([documentation], | |||
AS_HELP_STRING([--enable-documentation], [Build the documentation]), | AS_HELP_STRING([--enable-documentation], [Build the documentation]), | |||
[], [enable_documentation=no]) | [], [enable_documentation=no]) | |||
AC_ARG_ENABLE([warnings], | AC_ARG_ENABLE([warnings], | |||
AS_HELP_STRING([--enable-warnings], [Enable warnings]), | AS_HELP_STRING([--enable-warnings], [Enable warnings]), | |||
[], [enable_warnings=no]) | [], [enable_warnings=no]) | |||
test "$with_lex" = yes && AC_PROG_LEX | if test "$with_lex" = yes | |||
test "$with_yacc" = yes && AC_PROG_YACC | then | |||
AC_PROG_LEX | ||||
if test "$LEX" = : | ||||
then | ||||
AC_MSG_ERROR([flex or lex not found]) | ||||
fi | ||||
fi | ||||
if test "$with_yacc" = yes | ||||
then | ||||
AC_PROG_YACC | ||||
if test -z "$YACC" || ! $YACC -V >/dev/null 2>&1 | ||||
then | ||||
AC_MSG_ERROR([bison, byacc or yacc not found]) | ||||
fi | ||||
fi | ||||
AM_CONDITIONAL([ENABLE_DOCUMENTATION], [test "$enable_documentation" = yes]) | AM_CONDITIONAL([ENABLE_DOCUMENTATION], [test "$enable_documentation" = yes]) | |||
AM_CONDITIONAL([ENABLE_WARNINGS], [test "$enable_warnings" = yes]) | AM_CONDITIONAL([ENABLE_WARNINGS], [test "$enable_warnings" = yes]) | |||
AM_COND_IF([ENABLE_DOCUMENTATION], [ | AM_COND_IF([ENABLE_DOCUMENTATION], [ | |||
AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], [no]) | AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], [no]) | |||
if test "$RST2MAN" = no | if test "$RST2MAN" = no | |||
then | then | |||
AC_MSG_ERROR([rst2man is needed to build the documentation]) | AC_MSG_ERROR([rst2man is needed to build the documentation]) | |||
fi | fi | |||
skipping to change at line 192 | skipping to change at line 208 | |||
HITCH_CHECK_FUNC([CRYPTO_get_locking_callback], [$CRYPTO_LIBS], [ | HITCH_CHECK_FUNC([CRYPTO_get_locking_callback], [$CRYPTO_LIBS], [ | |||
AC_DEFINE([OPENSSL_WITH_LOCKS], [1], [OpenSSL needs explicit locking]) | AC_DEFINE([OPENSSL_WITH_LOCKS], [1], [OpenSSL needs explicit locking]) | |||
]) | ]) | |||
HITCH_CHECK_FUNC([X509_NAME_ENTRY_get_data], [$CRYPTO_LIBS], [ | HITCH_CHECK_FUNC([X509_NAME_ENTRY_get_data], [$CRYPTO_LIBS], [ | |||
AC_DEFINE([HAVE_X509_NAME_ENTRY_GET_DATA], [1], | AC_DEFINE([HAVE_X509_NAME_ENTRY_GET_DATA], [1], | |||
[OpenSSL has X509_NAME_ENTRY_get_data()]) | [OpenSSL has X509_NAME_ENTRY_get_data()]) | |||
]) | ]) | |||
HITCH_CHECK_FUNC([X509_STORE_get0_objects], [$CRYPTO_LIBS], [ | ||||
AC_DEFINE([HAVE_X509_STORE_GET0_OBJECTS], [1], | ||||
[OpenSSL has X509_STORE_get0_objects()]) | ||||
]) | ||||
HITCH_CHECK_FUNC([X509_OBJECT_get0_X509], [$CRYPTO_LIBS], [ | ||||
AC_DEFINE([HAVE_X509_OBJECT_GET0_X509], [1], | ||||
[OpenSSL has X509_OBJECT_get0_X509()]) | ||||
]) | ||||
AC_CHECK_MEMBERS([struct ssl_st.s3], [], [], [[#include <openssl/ssl.h>]]) | AC_CHECK_MEMBERS([struct ssl_st.s3], [], [], [[#include <openssl/ssl.h>]]) | |||
AS_VERSION_COMPARE([$($PKG_CONFIG --modversion openssl)], [1.1.1], | ||||
[openssl111=no], | ||||
[openssl111=yes], [openssl111=yes]) | ||||
AS_IF([test "x$openssl111" = xyes], | ||||
[AC_DEFINE([HAVE_TLS_1_3], [1], [Define to 1 if TLSv1.3 is available])], | ||||
[]) | ||||
SH_TESTS="$(cd $srcdir/src && echo tests/test*.sh)" | SH_TESTS="$(cd $srcdir/src && echo tests/test*.sh)" | |||
AC_SUBST(SH_TESTS) | AC_SUBST(SH_TESTS) | |||
dnl Desired CFLAGS | dnl Desired CFLAGS | |||
HITCH_CHECK_FLAGS([HITCH_CFLAGS], [ | HITCH_CHECK_FLAGS([HITCH_CFLAGS], [ | |||
-g | -g | |||
-O2 | -O2 | |||
]) | ]) | |||
AM_COND_IF([ENABLE_WARNINGS], [ | AM_COND_IF([ENABLE_WARNINGS], [ | |||
End of changes. 4 change blocks. | ||||
3 lines changed or deleted | 37 lines changed or added |