summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-02-03 13:58:51 +1100
committerDamien Miller <djm@mindrot.org>2000-02-03 13:58:51 +1100
commit0c0e4bfe3c126e2a172db7b978f7e6360c6580d5 (patch)
treee0cf87b0fe5cd08c8a111f7aa54c7b0da582896c
parent1852246d30592c4b511db0755a806f90a4842852 (diff)
- Add --with-ssl-dir option
-rw-r--r--ChangeLog1
-rw-r--r--INSTALL3
-rw-r--r--configure.in13
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5bacbcba..51034cf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
20000203
- Fixed SEGVs in authloop, fix from vbzoli@hbrt.hu
+ - Add --with-ssl-dir option
20000202
- Fix lastlog code for directory based lastlogs. Fix from Josh Durham
diff --git a/INSTALL b/INSTALL
index 93fc2f2f..15ddffc1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -155,6 +155,9 @@ IPv4 addresses. On Linux/glibc-2.1.2 this causes long delays in name
resolution. If this option is specified, you can still attempt to
connect to IPv6 addresses using the command line option '-6'.
+--with-ssl-dir=DIR allows you to specify where your OpenSSL libraries
+are installed.
+
If you need to pass special options to the compiler or linker, you
can specify these as enviornment variables before running ./configure.
For example:
diff --git a/configure.in b/configure.in
index 2ff4aba5..1176bfc4 100644
--- a/configure.in
+++ b/configure.in
@@ -46,14 +46,21 @@ if test ! -z "$rsh_path" ; then
AC_DEFINE_UNQUOTED(RSH_PATH, "$rsh_path")
fi
-dnl Checks for compiler characteristics
if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -Wall"; fi
AC_C_INLINE
-dnl Check for OpenSSL/SSLeay directories.
+AC_ARG_WITH(ssl-dir,
+ [ --with-ssl-dir=PATH Specify path to OpenSSL installation ],
+ [
+ if test "x$withval" != "$xno" ; then
+ ssldir=$withval
+ fi
+ ]
+)
+
AC_MSG_CHECKING([for OpenSSL/SSLeay directory])
-for ssldir in $prefix /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local $prefix /usr/pkg ; do
+for ssldir in $ssldir $prefix /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local $prefix /usr/pkg ; do
if test -f "$ssldir/include/openssl/crypto.h"; then
AC_DEFINE(HAVE_OPENSSL)
GOT_SSL="yes"