From 1783a3aaa9b692ab64260a9c2adf588ed6083a1c Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Fri, 17 Jan 2003 00:43:58 +0000 Subject: [PATCH] Various fixes for autoconf and OpenSSL 0.9.7 and a missing header. --- configure.in | 8 ++++---- lib/fake-getnameinfo.c | 1 + m4/openssl.m4 | 10 +--------- src/tincd.c | 12 ++++++++++-- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/configure.in b/configure.in index 77db35a..0477c21 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Id: configure.in,v 1.13.2.59 2002/09/15 14:55:53 guus Exp $ +dnl $Id: configure.in,v 1.13.2.60 2003/01/17 00:43:56 guus Exp $ AC_PREREQ(2.53) AC_INIT(src/tincd.c) @@ -36,7 +36,7 @@ AC_ISC_POSIX dnl Check and set OS -AC_CANONICAL_HOST +#AC_CANONICAL_HOST case $host_os in *linux*) @@ -169,11 +169,11 @@ AC_ARG_ENABLE(tracing, AC_SUBST(INCLUDES) -AC_OUTPUT(Makefile po/Makefile.in +AC_OUTPUT(Makefile src/Makefile doc/Makefile doc/es/Makefile lib/Makefile -m4/Makefile po/Makefile.in +m4/Makefile ) diff --git a/lib/fake-getnameinfo.c b/lib/fake-getnameinfo.c index 0541648..50d0722 100644 --- a/lib/fake-getnameinfo.c +++ b/lib/fake-getnameinfo.c @@ -22,6 +22,7 @@ #include #include "fake-getnameinfo.h" +#include "fake-getaddrinfo.h" #ifndef HAVE_GETNAMEINFO diff --git a/m4/openssl.m4 b/m4/openssl.m4 index 40ad4fd..79dd3c1 100644 --- a/m4/openssl.m4 +++ b/m4/openssl.m4 @@ -29,15 +29,7 @@ AC_DEFUN(tinc_OPENSSL, [AC_MSG_ERROR([OpenSSL libraries not found.])] ) - AC_CHECK_FUNCS(RAND_pseudo_bytes) - - AC_CHECK_FUNC(OpenSSL_add_all_algorithms, - [], - [AC_CHECK_FUNC(SSLeay_add_all_algorithms, - [AC_DEFINE(HAVE_SSLEAY_ADD_ALL_ALGORITHMS, 1, [Defined if this function should be used instead of OpenSLL_add_all_algorithms])], - [AC_MSG_ERROR([Missing required OpenSSL functionality!])] - )] - ) + AC_CHECK_FUNCS([RAND_pseudo_bytes OPENSSL_add_all_algorithms_noconf OpenSSL_add_all_algorithms SSLeay_add_all_algorithms]) AC_CHECK_FUNC(dlopen, [], diff --git a/src/tincd.c b/src/tincd.c index 2aa16dd..4335d7b 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: tincd.c,v 1.10.4.65 2002/09/15 14:55:54 guus Exp $ + $Id: tincd.c,v 1.10.4.66 2003/01/17 00:43:58 guus Exp $ */ #include "config.h" @@ -390,10 +390,18 @@ int main(int argc, char **argv, char **envp) RAND_load_file("/dev/urandom", 1024); +#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS_NOCONF + OPENSSL_add_all_algorithms_noconf(); +#else +#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS + OpenSSL_add_all_algorithms(); +#else #ifdef HAVE_SSLEAY_ADD_ALL_ALGORITHMS SSLeay_add_all_algorithms(); #else - OpenSSL_add_all_algorithms(); +#error No add_all_algorithms function available! +#endif +#endif #endif if(generate_keys) { -- 2.25.1