[tor-commits] [tor/master] Remove /usr/athena from search path in configure.ac

[nickm at torproject.org]

commit edc3fe0eb5e590801d2b6d6c390e01bb98b4183e
Author: Fernando Fernandez Mancera <ffernandezmancera at gmail.com>
Date:   Tue Nov 21 16:53:37 2017 +0100

    Remove /usr/athena from search path in configure.ac
    
    Fixes #24363
    
    Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera at gmail.com>
---
 changes/ticket24363 | 2 ++
 configure.ac        | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/changes/ticket24363 b/changes/ticket24363
new file mode 100644
index 000000000..6f90fc066
--- /dev/null
+++ b/changes/ticket24363
@@ -0,0 +1,2 @@
+  o Code simplification and refactoring:
+    - Remove /usr/athena from search path in configure.ac. Closes ticket 24363. 
diff --git a/configure.ac b/configure.ac
index 490d94463..e2990350f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -729,7 +729,7 @@ TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS
     [#include <openssl/ssl.h>],
     [struct ssl_method_st; const struct ssl_method_st *TLSv1_1_method(void);],
     [TLSv1_1_method();], [],
-    [/usr/local/opt/openssl /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl])
+    [/usr/local/opt/openssl /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /opt/openssl])
 
 dnl XXXX check for OPENSSL_VERSION_NUMBER == SSLeay()