Minor fixes and improvements.

diff --git a/macros/ssl-check.m4 b/macros/ssl-check.m4
index 62ef137e8e6797c1bba4a508bf285186f875fb91..c9fbbe813dde71b7d09382f0e326bf20149a114a 100644 (file)
--- a/macros/ssl-check.m4
+++ b/macros/ssl-check.m4
@@ -1,15 +1,15 @@
-dnl $Id: ssl-check.m4,v 1.2 2001-10-28 12:09:17 srittau Exp $
+dnl $Id: ssl-check.m4,v 1.3 2001-11-13 15:43:41 srittau Exp $
 dnl Autoconf macro to check for SSL or OpenSSL
 
 AC_DEFUN([AC_PATH_SSL], [
        tryssl=yes
+       tryssldir=
 
-       AC_ARG_WITH(ssl-dir, [
-  --with-ssl-dir=PATH     specify path to OpenSSL installation (must contain
+       AC_ARG_WITH(ssl-dir, [  --with-ssl-dir=PATH     specify path to OpenSSL installation (must contain
                           lib and include dirs)],
                [
                        if test "x$withval" != "xno"; then
-                               tryssldir=$withval
+                               tryssldir="$withval"
                        else
                                tryssl=no
                        fi
@@ -26,11 +26,12 @@ AC_DEFUN([AC_PATH_SSL], [
                        if test -f "$ssldir/include/openssl/cast.h" ; then
                                SSL_CFLAGS="$SSL_CFLAGS -I$ssldir/include -I$ssldir/include/openssl"
                                SSL_LIBS="$SSL_LIBS -L$ssldir/lib -L$ssldir -lcrypto"
-                               if test "$need_dash_r" = "yes"; then
+                               if test "x$need_dash_r" = "xyes"; then
                                        SSL_LIBS="$SSL_LIBS -R$ssldir/lib -R$ssldir"
                                fi
                                AC_MSG_RESULT([$ssldir (enabling RANDNUM and DHX support)])
 
+dnl FIXME: The following looks crude and probably doesn't work properly.
                                dnl Check for the crypto library:
                                AC_CHECK_LIB(crypto, main)
                                dnl Check for "DES" library (for SSLeay, not openssl):