RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Error message when SSL libs not found 

Fix RANDOM_POOL
This commit is contained in:
Damien Miller 1999-11-11 11:04:17 +11:00
parent 56825a1693
commit a82feb3f9f
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
configure.in
View File

@ -12,16 +12,20 @@ if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -Wall"; fi
dnl Check for OpenSSL/SSLeay directories. dnl Check for OpenSSL/SSLeay directories.
AC_MSG_CHECKING([for OpenSSL/SSLeay directory]) AC_MSG_CHECKING([for OpenSSL/SSLeay directory])
for ssldir in /usr /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local $prefix /usr/pkg ; do for ssldir in /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 if test -f "$ssldir/include/openssl/crypto.h"; then
AC_DEFINE(HAVE_OPENSSL) AC_DEFINE(HAVE_OPENSSL)
break GOT_SSL="yes"
fi break
if test -f "$ssldir/include/ssl/crypto.h"; then fi
AC_DEFINE(HAVE_SSL) if test -f "$ssldir/include/ssl/crypto.h"; then
break AC_DEFINE(HAVE_SSL)
fi GOT_SSL="yes"
break
fi
done done
AC_MSG_RESULT($ssldir) if test -z "$GOT_SSL" ; then
AC_MSG_ERROR([Could not find SSLeay / OpenSSL libraries, please install])
fi
AC_SUBST(ssldir) AC_SUBST(ssldir)
AC_DEFINE_UNQUOTED(ssldir, "$ssldir") AC_DEFINE_UNQUOTED(ssldir, "$ssldir")
if test "$ssldir" != "/usr"; then if test "$ssldir" != "/usr"; then
@ -29,6 +33,7 @@ if test "$ssldir" != "/usr"; then
LIBS="$LIBS -L$ssldir/lib" LIBS="$LIBS -L$ssldir/lib"
fi fi
LIBS="$LIBS -lssl -lcrypto" LIBS="$LIBS -lssl -lcrypto"
AC_MSG_RESULT($ssldir)
dnl Check for RSAref library. dnl Check for RSAref library.
AC_MSG_CHECKING([for RSAref library]) AC_MSG_CHECKING([for RSAref library])
@ -81,7 +86,8 @@ AC_ARG_WITH(random,
AC_CHECK_FILE("/dev/urandom", AC_CHECK_FILE("/dev/urandom",
[ [
RANDOM_POOL="/dev/urandom"; RANDOM_POOL="/dev/urandom";
AC_DEFINE(RANDOM_POOL, "$RANDOM_POOL") AC_SUBST(RANDOM_POOL)
AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL")
] ]
) )
] ]
@ -93,7 +99,8 @@ AC_ARG_WITH(egd-pool,
[ [
RANDOM_POOL="$withval"; RANDOM_POOL="$withval";
AC_DEFINE(HAVE_EGD) AC_DEFINE(HAVE_EGD)
AC_DEFINE(RANDOM_POOL, "$RANDOM_POOL") AC_SUBST(RANDOM_POOL)
AC_DEFINE_UNQUOTED(RANDOM_POOL, "$RANDOM_POOL")
] ]
) )