summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2021-02-18 11:39:38 -0500
committerNick Mathewson <nickm@torproject.org>2021-02-18 11:39:38 -0500
commit2b8af39d8631c4d83f479685ca7dd8868f1eb465 (patch)
treedcc89a28c1684ec7926d3b2394a087a344d2fd3f
parent0330eeb3e35d2092f4d488a38bcca98db4632fc5 (diff)
parentaebd0a4080559a5c24e580ddf50e5b5c8ff1cc29 (diff)
downloadtor-2b8af39d8631c4d83f479685ca7dd8868f1eb465.tar.gz
tor-2b8af39d8631c4d83f479685ca7dd8868f1eb465.zip
Merge branch 'maint-0.4.5' into release-0.4.5
-rw-r--r--changes/bug402983
-rw-r--r--configure.ac2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug40298 b/changes/bug40298
new file mode 100644
index 0000000000..8b8b0bbc12
--- /dev/null
+++ b/changes/bug40298
@@ -0,0 +1,3 @@
+ o Minor bugfixes (portability):
+ - Fix a non-portable usage of "==" with "test" in the configure script.
+ Fixes bug 40298; bugfix on 0.4.5.1-alpha.
diff --git a/configure.ac b/configure.ac
index a8d95e49eb..e8775a98f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1144,7 +1144,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM([[
]])])], [openssl_ver_mismatch=no], [
# This is a kludge to figure out whether compilation failed, or whether
# running the program failed.
- if test "$ac_retval" == "1"; then
+ if test "$ac_retval" = "1"; then
openssl_ver_mismatch=inconclusive
else
openssl_ver_mismatch=yes