Prefer openssl binary from --with-ssl-dir directory.

Use openssl in the directory specified by --with-ssl-dir as long
as it's functional.  Reported by The Doctor.

diff --git a/configure.ac b/configure.ac
index c1af4b42329b35b423c844e459671beeff6957c8..82e8bb7c14103535b8cfa8a5899f238dc498b6d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2743,7 +2743,15 @@ AC_ARG_WITH([ssl-dir],
                        else
                                CPPFLAGS="-I${withval} ${CPPFLAGS}"
                        fi
-                       openssl_bin_PATH="${PATH}${PATH_SEPARATOR}${withval}/bin${PATH_SEPARATOR}${withval}/apps"
+                       dnl Ensure specified openssl binary works, eg it can
+                       dnl find its runtime libraries, before trying to use.
+                       if test -x "${withval}/bin/openssl" && \
+                           "${withval}/bin/openssl" version >/dev/null 2>&1; then
+                               openssl_bin_PATH="${withval}/bin${PATH_SEPARATOR}${PATH}"
+                       elif test -x "${withval}/apps/openssl" && \
+                           "${withval}/apps/openssl" version >/dev/null 2>&1; then
+                               openssl_bin_PATH="${withval}/apps${PATH_SEPARATOR}${PATH}"
+                       fi
                fi
        ]
 )