Make --without-ssl-dir work.

diff --git a/configure.in b/configure.in
index 9ad9a47a0d74cc981517c71180ffe6e4772b0fb4..e6b903c9d97ea931ba1aae1a711eea1ef94d0b3c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.98 2001-08-28 07:13:03 lancel Exp $
+dnl $Id: configure.in,v 1.99 2001-08-30 00:44:47 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -632,40 +632,45 @@ if test x"$this_os" = "xtru64"; then
        LDSHAREDFLAGS="-shared"
 fi
 
-dnl -- look for openssl  
+dnl -- look for openssl
+tryssl=yes
 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
+               else
+                       tryssl=no
                fi
        ]
 )
 
-for ssldir in "" $tryssldir /usr /usr/local/openssl /usr/lib/openssl/ /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl /usr/local/ssl ; do
-       if test -f "$ssldir/include/openssl/cast.h" ; then
-               LDFLAGS="$LDFLAGS -L$ssldir/lib -L$ssldir"
-               CFLAGS="$CFLAGS -I$ssldir/include -I$ssldir/include/openssl"
-               if test "$need_dash_r" = "yes"; then
-                       LIBS="$LIBS -R$ssldir/lib -R$ssldir"
-               fi
+if test "$tryssl" == "yes"; then
+       for ssldir in "" $tryssldir /usr /usr/local/openssl /usr/lib/openssl/ /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl /usr/local/ssl ; do
+               if test -f "$ssldir/include/openssl/cast.h" ; then
+                       LDFLAGS="$LDFLAGS -L$ssldir/lib -L$ssldir"
+                       CFLAGS="$CFLAGS -I$ssldir/include -I$ssldir/include/openssl"
+                       if test "$need_dash_r" = "yes"; then
+                               LIBS="$LIBS -R$ssldir/lib -R$ssldir"
+                       fi
 
-               dnl Check for the crypto library:
-               AC_CHECK_LIB(crypto, main)
-               dnl LIBS="$LIBS -lcrypto"
-               dnl Check for "DES" library (for SSLeay, not openssl):
-               AC_CHECK_LIB(des, main)
-
-               AC_DEFINE(OPENSSL_DHX,  1)
-               AC_DEFINE(UAM_DHX,      1)
-               AC_DEFINE(UAM_RNDNUM,   1)
-               compile_dhx=yes
-               compile_ssl=yes
-               AC_MSG_RESULT([Found ssl and enabling RANDNUM and DHX support "$ssldir"])
-               break
-       fi
-done
+                       dnl Check for the crypto library:
+                       AC_CHECK_LIB(crypto, main)
+                       dnl LIBS="$LIBS -lcrypto"
+                       dnl Check for "DES" library (for SSLeay, not openssl):
+                       AC_CHECK_LIB(des, main)
+
+                       AC_DEFINE(OPENSSL_DHX,  1)
+                       AC_DEFINE(UAM_DHX,      1)
+                       AC_DEFINE(UAM_RNDNUM,   1)
+                       compile_dhx=yes
+                       compile_ssl=yes
+                       AC_MSG_RESULT([Found ssl and enabling RANDNUM and DHX support "$ssldir"])
+                       break
+               fi
+       done
+fi
 
 dnl --------------------- check for building PGP UAM module
 
@@ -715,7 +720,6 @@ AC_ARG_ENABLE(overwrite,
 
 dnl --------------------- last minute substitutions
 
-
 AC_SUBST(LIBS)
 AC_SUBST(AFPD_LIBS)
 AC_SUBST(PAPD_LIBS)