From bd6a7e7155dc9f78f4a4f79633d7e4447090b369 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com> Date: Fri, 27 Aug 2021 12:16:14 +0300 Subject: [PATCH] =?utf8?q?AC=5FERROR=20=E2=86=92=20AC=5FMSG=5FERROR?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Run autopudate on configure.ac. According to the Autoconf 2.69 manual, AC_ERROR is obsolete: https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Obsolete-Macros.html Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com> --- configure.ac | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index 39c7d776..600acf53 100644 --- a/configure.ac +++ b/configure.ac @@ -159,9 +159,9 @@ if test "$with_vpnc_script" = "yes" || test "$with_vpnc_script" = ""; then fi fi elif test "$with_vpnc_script" = "no"; then - AC_ERROR([You cannot disable vpnc-script.] - [OpenConnect will not function correctly without it.] - [See https://www.infradead.org/openconnect/vpnc-script.html]) + AC_MSG_ERROR(You cannot disable vpnc-script. + OpenConnect will not function correctly without it. + See https://www.infradead.org/openconnect/vpnc-script.html) elif test "$have_win" = "yes"; then # Oh Windows how we hate thee. If user specifies a vpnc-script and it contains # backslashes, double them all up to survive escaping. @@ -278,7 +278,7 @@ if test "$have_win" = yes; then AC_DEFINE(HAVE_LOCALTIME_S, 1, [Have localtime_s() function])], [AC_MSG_RESULT([no])]) else - AC_CHECK_FUNC(socket, [], AC_CHECK_LIB(socket, socket, [], AC_ERROR(Cannot find socket() function))) + AC_CHECK_FUNC(socket, [], AC_CHECK_LIB(socket, socket, [], AC_MSG_ERROR(Cannot find socket() function))) fi have_inet_aton=yes @@ -321,7 +321,7 @@ LIBINTL= if test "$USE_NLS" = "yes"; then AC_PATH_PROG(MSGFMT, msgfmt) if test "$MSGFMT" = ""; then - AC_ERROR([msgfmt could not be found. Try configuring with --disable-nls]) + AC_MSG_ERROR(msgfmt could not be found. Try configuring with --disable-nls) fi fi LIBINTL= @@ -392,7 +392,7 @@ if test "$with_gnutls" = "yes" || test "$with_gnutls" = ""; then ssl_library=GnuTLS fi], [:]) elif test "$with_gnutls" != "no"; then - AC_ERROR([Values other than 'yes' or 'no' for --with-gnutls are not supported]) + AC_MSG_ERROR(Values other than 'yes' or 'no' for --with-gnutls are not supported) fi # Do we need to look for OpenSSL? @@ -416,7 +416,7 @@ if test "$ssl_library" = ""; then AC_SUBST([OPENSSL_CFLAGS], [])] AC_SUBST([openssl_pc_libs], [$OPENSSL_LIBS]), [AC_MSG_RESULT(no) - AC_ERROR([Could not build against OpenSSL])]) + AC_MSG_ERROR(Could not build against OpenSSL)]) LIBS="$oldLIBS"]) ssl_library=OpenSSL PKG_CHECK_MODULES(P11KIT, p11-kit-1, @@ -437,7 +437,7 @@ if test "$ssl_library" = ""; then -r "${with_openssl}/ssl/.libs/libssl.a"; then OPENSSL_LIBS="${with_openssl}/ssl/.libs/libssl.a ${with_openssl}/crypto/.libs/libcrypto.a -ldl -lz -pthread" else - AC_ERROR([Could not find OpenSSL libraries in ${with_openssl}]); + AC_MSG_ERROR(Could not find OpenSSL libraries in ${with_openssl}); fi AC_SUBST(OPENSSL_CFLAGS) AC_SUBST(OPENSSL_LIBS) @@ -491,10 +491,10 @@ case "$ssl_library" in ])], [], [AC_MSG_RESULT(yes) - AC_ERROR([This version of OpenSSL is known to be broken with Cisco DTLS.] -[See http://rt.openssl.org/Ticket/Display.html?id=2984&user=guest&pass=guest] -[Add --without-openssl-version-check to configure args to avoid this check, or] -[perhaps consider building with GnuTLS instead.])]) + AC_MSG_ERROR(This version of OpenSSL is known to be broken with Cisco DTLS. +See http://rt.openssl.org/Ticket/Display.html?id=2984&user=guest&pass=guest +Add --without-openssl-version-check to configure args to avoid this check, or +perhaps consider building with GnuTLS instead.)]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[#if \ (OPENSSL_VERSION_NUMBER == 0x1000200fL) #error Bad OpenSSL @@ -502,11 +502,11 @@ case "$ssl_library" in ])], [], [AC_MSG_RESULT(yes) - AC_ERROR([This version of OpenSSL is known to be broken with Cisco DTLS.] -[See http://rt.openssl.org/Ticket/Display.html?id=3703&user=guest&pass=guest] -[and http://rt.openssl.org/Ticket/Display.html?id=3711&user=guest&pass=guest] -[Add --without-openssl-version-check to configure args to avoid this check, or] -[perhaps consider building with GnuTLS instead.])]) + AC_MSG_ERROR(This version of OpenSSL is known to be broken with Cisco DTLS. +See http://rt.openssl.org/Ticket/Display.html?id=3703&user=guest&pass=guest +and http://rt.openssl.org/Ticket/Display.html?id=3711&user=guest&pass=guest +Add --without-openssl-version-check to configure args to avoid this check, or +perhaps consider building with GnuTLS instead.)]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[#if \ ((OPENSSL_VERSION_NUMBER >= 0x10001110L && OPENSSL_VERSION_NUMBER <= 0x10001150L) || \ (OPENSSL_VERSION_NUMBER >= 0x10002050L && OPENSSL_VERSION_NUMBER <= 0x10002090L)) @@ -515,10 +515,10 @@ case "$ssl_library" in ])], [], [AC_MSG_RESULT(yes) - AC_ERROR([This version of OpenSSL is known to be broken with Cisco DTLS.] -[See http://rt.openssl.org/Ticket/Display.html?id=4631&user=guest&pass=guest] -[Add --without-openssl-version-check to configure args to avoid this check, or] -[perhaps consider building with GnuTLS instead.])]) + AC_MSG_ERROR(This version of OpenSSL is known to be broken with Cisco DTLS. +See http://rt.openssl.org/Ticket/Display.html?id=4631&user=guest&pass=guest +Add --without-openssl-version-check to configure args to avoid this check, or +perhaps consider building with GnuTLS instead.)]) AC_MSG_RESULT(no) fi @@ -852,7 +852,7 @@ AS_IF([test "$with_builtin_json" != "no" && test "$json" = "" ], ]) AS_IF([test "$json" = ""], - AC_ERROR([No json-parser package found and --without-builtin-json specified]) + AC_MSG_ERROR(No json-parser package found and --without-builtin-json specified) ) AM_CONDITIONAL(BUILTIN_JSON, [test "$json" = "builtin"]) @@ -870,7 +870,7 @@ PKG_CHECK_MODULES(ZLIB, zlib, [AC_SUBST(ZLIB_PC, [zlib])], AC_SUBST([ZLIB_LIBS], [-lz]) AC_SUBST([ZLIB_CFLAGS], [])], [AC_MSG_RESULT(no) - AC_ERROR([Could not build against zlib])]) + AC_MSG_ERROR(Could not build against zlib)]) LIBS="$oldLIBS"]) AC_ARG_WITH([libproxy], -- 2.50.1