r17854@tombo: nickm | 2008-08-22 12:55:20 -0400
Backport to 0.2.0: We had been telling people to use --with-ssl-dir, which had not worked since 0.2.0.1-alpha: --with-openssl-dir was the one that worked. Make them both work, document --with-openssl-dir, and mark --with-ssl-dir as obsolete. Found by "Dave". svn:r16626
This commit is contained in:
parent
772a824d56
commit
ff5898a6ce
|
@ -13,6 +13,10 @@ Changes in version 0.2.0.31 - 2008-08-??
|
||||||
when building against recent kernels. Bugfix on 0.1.2.1-alpha.
|
when building against recent kernels. Bugfix on 0.1.2.1-alpha.
|
||||||
- Pick size of default geoip filename string correctly on windows.
|
- Pick size of default geoip filename string correctly on windows.
|
||||||
Fixes bug 806. Bugfix on 0.2.0.30.
|
Fixes bug 806. Bugfix on 0.2.0.30.
|
||||||
|
- Make the autoconf script accept the obsolete --with-ssl-dir option as
|
||||||
|
an alias for the actually-working --with-openssl-dir option. Fix the
|
||||||
|
help documentation to recommend --with-openssl-dir. Based on a patch
|
||||||
|
by "Dave". Bugfix on 0.2.0.1-alpha.
|
||||||
|
|
||||||
|
|
||||||
Changes in version 0.2.0.30 - 2008-07-15
|
Changes in version 0.2.0.30 - 2008-07-15
|
||||||
|
|
15
acinclude.m4
15
acinclude.m4
|
@ -72,7 +72,12 @@ dnl against it.
|
||||||
dnl
|
dnl
|
||||||
dnl TOR_SEARCH_LIBRARY(1:libname, 2:IGNORED, 3:linkargs, 4:headers,
|
dnl TOR_SEARCH_LIBRARY(1:libname, 2:IGNORED, 3:linkargs, 4:headers,
|
||||||
dnl 5:prototype,
|
dnl 5:prototype,
|
||||||
dnl 6:code, 7:optionname, 8:searchextra)
|
dnl 6:code, 7:IGNORED, 8:searchextra)
|
||||||
|
dnl
|
||||||
|
dnl Special variables:
|
||||||
|
dnl ALT_{libname}_WITHVAL -- another possible value for --with-$1-dir.
|
||||||
|
dnl Used to support renaming --with-ssl-dir to --with-openssl-dir
|
||||||
|
dnl
|
||||||
AC_DEFUN([TOR_SEARCH_LIBRARY], [
|
AC_DEFUN([TOR_SEARCH_LIBRARY], [
|
||||||
try$1dir=""
|
try$1dir=""
|
||||||
AC_ARG_WITH($1-dir,
|
AC_ARG_WITH($1-dir,
|
||||||
|
@ -82,6 +87,10 @@ AC_ARG_WITH($1-dir,
|
||||||
try$1dir="$withval"
|
try$1dir="$withval"
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
if test "x$try$1dir" = x && test "x$ALT_$1_WITHVAL" != x ; then
|
||||||
|
try$1dir="$ALT_$1_WITHVAL"
|
||||||
|
fi
|
||||||
|
|
||||||
tor_saved_LIBS="$LIBS"
|
tor_saved_LIBS="$LIBS"
|
||||||
tor_saved_LDFLAGS="$LDFLAGS"
|
tor_saved_LDFLAGS="$LDFLAGS"
|
||||||
tor_saved_CPPFLAGS="$CPPFLAGS"
|
tor_saved_CPPFLAGS="$CPPFLAGS"
|
||||||
|
@ -129,7 +138,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [
|
||||||
|
|
||||||
if test "$tor_$1_dir_found" = no; then
|
if test "$tor_$1_dir_found" = no; then
|
||||||
if test "$tor_$1_any_linkable" = no ; then
|
if test "$tor_$1_any_linkable" = no ; then
|
||||||
AC_MSG_WARN([Could not find a linkable $1. If you have it installed somewhere unusal, you can specify an explicit path using $7])
|
AC_MSG_WARN([Could not find a linkable $1. If you have it installed somewhere unusual, you can specify an explicit path using --with-$1-dir])
|
||||||
TOR_WARN_MISSING_LIB($1, pkg)
|
TOR_WARN_MISSING_LIB($1, pkg)
|
||||||
AC_MSG_ERROR([Missing libraries; unable to proceed.])
|
AC_MSG_ERROR([Missing libraries; unable to proceed.])
|
||||||
else
|
else
|
||||||
|
@ -178,7 +187,7 @@ if test "$cross_compiling" != yes; then
|
||||||
done
|
done
|
||||||
|
|
||||||
if test "$runnable" = no; then
|
if test "$runnable" = no; then
|
||||||
AC_MSG_ERROR([Found linkable $1 in $tor_cv_library_$1_dir, but it does not seem to run, even with -R. Maybe specify another using $7}])
|
AC_MSG_ERROR([Found linkable $1 in $tor_cv_library_$1_dir, but it does not seem to run, even with -R. Maybe specify another using --with-$1-dir}])
|
||||||
fi
|
fi
|
||||||
LDFLAGS="$orig_LDFLAGS"
|
LDFLAGS="$orig_LDFLAGS"
|
||||||
]) dnl end cache check check for extra options.
|
]) dnl end cache check check for extra options.
|
||||||
|
|
11
configure.in
11
configure.in
|
@ -269,10 +269,19 @@ tor_openssl_pkg_debian="libssl"
|
||||||
tor_openssl_devpkg_redhat="openssl-devel"
|
tor_openssl_devpkg_redhat="openssl-devel"
|
||||||
tor_openssl_devpkg_debian="libssl-dev"
|
tor_openssl_devpkg_debian="libssl-dev"
|
||||||
|
|
||||||
|
ALT_openssl_WITHVAL=""
|
||||||
|
AC_ARG_WITH(ssl-dir,
|
||||||
|
[ --with-ssl-dir=PATH Obsolete alias for --with-openssl-dir ],
|
||||||
|
[
|
||||||
|
if test "x$withval" != xno && test "x$withval" != "x" ; then
|
||||||
|
ALT_openssl_WITHVAL="$withval"
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI],
|
TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI],
|
||||||
[#include <openssl/rand.h>],
|
[#include <openssl/rand.h>],
|
||||||
[void RAND_add(const void *buf, int num, double entropy);],
|
[void RAND_add(const void *buf, int num, double entropy);],
|
||||||
[RAND_add((void*)0,0,0); exit(0);], [--with-ssl-dir],
|
[RAND_add((void*)0,0,0); exit(0);], [],
|
||||||
[/usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl])
|
[/usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl])
|
||||||
|
|
||||||
dnl XXXX check for OPENSSL_VERSION_NUMBER == SSLeay()
|
dnl XXXX check for OPENSSL_VERSION_NUMBER == SSLeay()
|
||||||
|
|
Loading…
Reference in New Issue