diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-08-22 16:55:28 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-08-22 16:55:28 +0000 |
| commit | 80168d80d49bc2084e2d5ab0aa15e2afc40851b8 (patch) | |
| tree | d72c41de636336a6c061dd701a26db5aac3aa9c0 /acinclude.m4 | |
| parent | 865c19f29b9c8b2b4402475a9cf5a7d227f1d7e2 (diff) | |
| download | tor-80168d80d49bc2084e2d5ab0aa15e2afc40851b8.tar.gz tor-80168d80d49bc2084e2d5ab0aa15e2afc40851b8.zip | |
r17853@tombo: nickm | 2008-08-22 12:55:00 -0400
Oops. 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:r16625
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index fe9b7ecbb8..47d421c260 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -72,7 +72,12 @@ dnl against it. dnl dnl TOR_SEARCH_LIBRARY(1:libname, 2:IGNORED, 3:linkargs, 4:headers, 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], [ try$1dir="" AC_ARG_WITH($1-dir, @@ -82,6 +87,10 @@ AC_ARG_WITH($1-dir, try$1dir="$withval" 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_LDFLAGS="$LDFLAGS" 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_any_linkable" = no ; then - AC_MSG_WARN([Could not find a linkable $1. If you have it installed somewhere unusual, 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) AC_MSG_ERROR([Missing libraries; unable to proceed.]) else @@ -178,7 +187,7 @@ if test "$cross_compiling" != yes; then done 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 LDFLAGS="$orig_LDFLAGS" ]) dnl end cache check check for extra options. |