Skip to content

Commit 1391d16

Browse files
committed
Fix m4 quoting on configure error messages.
The error message quoting for the Sphinx check failure was removed in c2d4999, but is actually needed. If you omit the quoting, the error turns into this: checking for python3 script directory (pythondir)... ${PYTHON_PREFIX}/lib/python3.11/site-packages checking for python3 extension module directory (pyexecdir)... ${PYTHON_EXEC_PREFIX}/lib/python3.11/site-packages checking for ... /usr/local/bin/python3 -m sphinx checking for sphinx version >= 1.7.5... No module named 'sphinx' ./configure: line 441: test: check: integer expression expected configure: error: Sphinx ./configure: line 312: return: check: numeric argument required ./configure: line 322: exit: check: numeric argument required Signed-off-by: James Peach <jpeach@apache.org>
1 parent 3887623 commit 1391d16

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

configure.ac

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -345,13 +345,13 @@ AC_ARG_ENABLE([docs],
345345
TS_MAN8_MANPAGES=`cd $srcdir/doc && $PYTHON manpages.py --section=8 | $AWK '{print "$(BUILDDIR)/man/" $0 }' | tr '\n' ' '`
346346
], [
347347
enable_doc_build=no
348-
AC_MSG_ERROR(Doc building disabled, Python 3.4 or better required)
348+
AC_MSG_ERROR([Doc building disabled, Python 3.4 or better required])
349349
])
350350
351351
AS_IF([test -z "$JAVA"],
352352
[
353353
enable_doc_build=no
354-
AC_MSG_ERROR(Doc building disabled, Java required but not found)
354+
AC_MSG_ERROR([Doc building disabled, Java required but not found])
355355
])
356356
AC_ARG_VAR(SPHINXBUILD, [the sphinx-build documentation generator])
357357
AC_ARG_VAR(SPHINXOPTS, [additional sphinx-build options])
@@ -362,7 +362,7 @@ AC_ARG_ENABLE([docs],
362362
],[
363363
sphinx_version_check=no
364364
enable_doc_build=no
365-
AC_MSG_ERROR(Doc building disabled, check Sphinx installation)
365+
AC_MSG_ERROR([Doc building disabled, check Sphinx installation])
366366
])
367367
368368
@@ -704,7 +704,7 @@ AC_COMPILE_IFELSE([
704704
AC_MSG_RESULT(yes)
705705
], [
706706
AC_MSG_RESULT(no)
707-
AC_MSG_ERROR([*** A compiler with support for -std=c++$CXXSTD is required.])
707+
AC_MSG_ERROR([A compiler with support for -std=c++$CXXSTD is required])
708708
])
709709
AC_LANG_POP
710710
CXX="$ac_save_CXX"
@@ -1011,13 +1011,13 @@ fi
10111011
# Flags for ASAN
10121012
if test "x${enable_asan}" = "xyes"; then
10131013
if test "x${enable_tsan}" = "xyes" -o "x${enable_tsan}" = "xstatic"; then
1014-
AC_MSG_ERROR(Cannot have ASAN and TSAN options at the same time, pick one)
1014+
AC_MSG_ERROR([Cannot have ASAN and TSAN options at the same time, pick one])
10151015
fi
10161016
TS_ADDTO(AM_CFLAGS, [-fno-omit-frame-pointer -fsanitize=address])
10171017
TS_ADDTO(AM_CXXFLAGS, [-fno-omit-frame-pointer -fsanitize=address])
10181018
elif test "x${enable_asan}" = "xstatic"; then
10191019
if test "x${enable_tsan}" = "xyes" -o "x${enable_tsan}" = "xstatic"; then
1020-
AC_MSG_ERROR(Cannot have ASAN and TSAN options at the same time, pick one)
1020+
AC_MSG_ERROR([Cannot have ASAN and TSAN options at the same time, pick one])
10211021
fi
10221022
asan_CXXFLAGS="$CXXFLAGS"
10231023
CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -fsanitize=address -static-libasan"
@@ -1028,7 +1028,7 @@ elif test "x${enable_asan}" = "xstatic"; then
10281028
[AC_MSG_RESULT([yes])],
10291029
[
10301030
AC_MSG_RESULT([no])
1031-
AC_MSG_ERROR(Cannot find static ASAN library.)
1031+
AC_MSG_ERROR([Cannot find static ASAN library])
10321032
]
10331033
)
10341034
AC_LANG_POP
@@ -1040,23 +1040,23 @@ fi
10401040
# Flags for LSAN stand-alone mode
10411041
if test "x${enable_lsan}" = "xyes"; then
10421042
if test "x${enable_asan}" = "xyes" -o "x${enable_asan}" = "xstatic"; then
1043-
AC_MSG_ERROR(ASAN already specified, --enable-lsan is meant only for LSAN stand-alone mode)
1043+
AC_MSG_ERROR([ASAN already specified, --enable-lsan is meant only for LSAN stand-alone mode])
10441044
fi
10451045
if test "x${enable_tsan}" = "xyes" -o "x${enable_tsan}" = "xstatic"; then
1046-
AC_MSG_ERROR(Cannot have LSAN and TSAN options at the same time, pick one)
1046+
AC_MSG_ERROR([Cannot have LSAN and TSAN options at the same time, pick one])
10471047
fi
10481048
TS_ADDTO(AM_CFLAGS, [-fno-omit-frame-pointer -fsanitize=leak])
10491049
TS_ADDTO(AM_CXXFLAGS, [-fno-omit-frame-pointer -fsanitize=leak])
10501050
elif test "x${enable_lsan}" = "xstatic"; then
10511051
if test "x${enable_asan}" = "xyes" -o "x${enable_asan}" = "xstatic"; then
1052-
AC_MSG_ERROR(ASAN already specified, --enable-lsan is meant only for LSAN stand-alone mode)
1052+
AC_MSG_ERROR([ASAN already specified, --enable-lsan is meant only for LSAN stand-alone mode])
10531053
fi
10541054
if test "x${enable_tsan}" = "xyes" -o "x${enable_tsan}" = "xstatic"; then
1055-
AC_MSG_ERROR(Cannot have LSAN and TSAN options at the same time, pick one)
1055+
AC_MSG_ERROR([Cannot have LSAN and TSAN options at the same time, pick one])
10561056
fi
10571057
AC_CHECK_LIB(lsan, _init, [lsan_have_libs=yes], [lsan_have_libs=no])
10581058
if test "x${lsan_have_libs}" == "xno"; then
1059-
AC_MSG_ERROR(Cannot find LSAN static library)
1059+
AC_MSG_ERROR([Cannot find LSAN static library])
10601060
fi
10611061
lsan_CXXFLAGS="$CXXFLAGS"
10621062
CXXFLAGS="$CXXFLAGS -fno-omit-frame-pointer -fsanitize=leak -static-liblsan"
@@ -1067,7 +1067,7 @@ elif test "x${enable_lsan}" = "xstatic"; then
10671067
[AC_MSG_RESULT([yes])],
10681068
[
10691069
AC_MSG_RESULT([no])
1070-
AC_MSG_ERROR(Cannot find static LSAN library.)
1070+
AC_MSG_ERROR([Cannot find static LSAN library])
10711071
]
10721072
)
10731073
AC_LANG_POP
@@ -1083,7 +1083,7 @@ if test "x${enable_tsan}" = "xyes"; then
10831083
elif test "x${enable_tsan}" = "xstatic"; then
10841084
AC_CHECK_LIB(tsan, _init, [tsan_have_libs=yes], [tsan_have_libs=no])
10851085
if test "x${tsan_have_libs}" == "xno"; then
1086-
AC_MSG_ERROR(Cannot find TSAN static library)
1086+
AC_MSG_ERROR([Cannot find TSAN static library])
10871087
fi
10881088
tsan_CXXFLAGS="$CXXFLAGS"
10891089
CXXFLAGS="$CXXFLAGS -fsanitize=thread -static-libtsan"
@@ -1094,7 +1094,7 @@ elif test "x${enable_tsan}" = "xstatic"; then
10941094
[AC_MSG_RESULT([yes])],
10951095
[
10961096
AC_MSG_RESULT([no])
1097-
AC_MSG_ERROR(Cannot find static TSAN library.)
1097+
AC_MSG_ERROR([Cannot find static TSAN library])
10981098
]
10991099
)
11001100
AC_LANG_POP
@@ -1107,15 +1107,15 @@ fi
11071107
# TODO: Later this is irrelevant, and we should just bail on 32-bit platforms always
11081108
AC_CHECK_SIZEOF([void*])
11091109
if test "x$ac_cv_sizeof_voidp" == "x"; then
1110-
AC_MSG_ERROR(Cannot determine size of void*)
1110+
AC_MSG_ERROR([Cannot determine size of void*])
11111111
fi
11121112

11131113
# Right now, 32-bit platform is a build error, unless we've forced it with --enable-32bit-build
11141114
if test "${ac_cv_sizeof_voidp}" = "4"; then
11151115
AS_IF([test x"$enable_32bit_build" = "xyes"], [
11161116
AC_MSG_NOTICE([Explicitly building on a 32-bit platform, this might be unsupported soon!])
11171117
], [
1118-
AC_MSG_ERROR(You are trying to build on a 32-bit platform, which is unsupported.)
1118+
AC_MSG_ERROR([You are trying to build on a 32-bit platform, which is unsupported])
11191119
])
11201120
fi
11211121

@@ -1379,7 +1379,7 @@ AM_CONDITIONAL([BUILD_JA3_PLUGIN], [test "x${enable_ja3_plugin}" = "xyes"])
13791379
# Check for zlib presence and usability
13801380
TS_CHECK_ZLIB
13811381
if test "x${enable_zlib}" != "xyes"; then
1382-
AC_MSG_ERROR([Cannot find zlib library. Configure --with-zlib=DIR])
1382+
AC_MSG_ERROR([Cannot find zlib library, configure --with-zlib=DIR])
13831383
fi
13841384

13851385
#
@@ -1417,7 +1417,7 @@ AC_CHECK_FUNCS(malloc_usable_size)
14171417
#
14181418
TS_CHECK_PCRE
14191419
if test "x${enable_pcre}" != "xyes"; then
1420-
AC_MSG_ERROR([Cannot find pcre library. Configure --with-pcre=DIR])
1420+
AC_MSG_ERROR([Cannot find pcre library, configure --with-pcre=DIR])
14211421
fi
14221422

14231423
# Check for optional brotli library
@@ -1433,7 +1433,7 @@ if test "${has_quiche}" = "1"; then
14331433
if test "$openssl_is_boringssl" = "1" ; then
14341434
enable_quic=yes
14351435
else
1436-
AC_MSG_ERROR([Use of BoringSSL is required if Quiche is used.])
1436+
AC_MSG_ERROR([Use of BoringSSL is required if Quiche is used])
14371437
fi
14381438
fi
14391439
TS_ARG_ENABLE_VAR([use], [quic])

0 commit comments

Comments
 (0)