summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-03-11 20:05:11 +1100
committerDamien Miller <djm@mindrot.org>2000-03-11 20:05:11 +1100
commitd58b3abe0e9d887a00679245065ee91b8565037f (patch)
tree8caf62dd555725eed210620038add355b9367f32
parent02491e9632dc03c8aa75a9d406ff98445aa28786 (diff)
More config fixes
-rw-r--r--ChangeLog1
-rw-r--r--configure.in4
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1dc77d453..eba385a8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
3 - OpenBSD CVS change 3 - OpenBSD CVS change
4 [sshd.c] 4 [sshd.c]
5 - disallow guessing of root password 5 - disallow guessing of root password
6 - More configure fixes
6 7
720000309 820000309
8 - OpenBSD CVS updates to v1.2.3 9 - OpenBSD CVS updates to v1.2.3
diff --git a/configure.in b/configure.in
index a7a2c699f..90aadd98f 100644
--- a/configure.in
+++ b/configure.in
@@ -151,10 +151,10 @@ fi
151AC_MSG_CHECKING([for OpenSSL/SSLeay directory]) 151AC_MSG_CHECKING([for OpenSSL/SSLeay directory])
152for ssldir in "" $tryssldir /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do 152for ssldir in "" $tryssldir /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
153 if test ! -z "$ssldir" ; then 153 if test ! -z "$ssldir" ; then
154 LIBS="$saved_LIBS -L$ssldir -lcrypto" 154 LIBS="$saved_LIBS -L$ssldir/lib -L$ssldir -lcrypto"
155 CFLAGS="$CFLAGS -I$ssldir/include" 155 CFLAGS="$CFLAGS -I$ssldir/include"
156 if test "x$need_dash_r" = "x1" ; then 156 if test "x$need_dash_r" = "x1" ; then
157 LIBS="$LIBS -R$ssldir/lib" 157 LIBS="$LIBS -R$ssldir/lib -L$ssldir"
158 fi 158 fi
159 else 159 else
160 LIBS="$saved_LIBS -lcrypto" 160 LIBS="$saved_LIBS -lcrypto"