[tor-commits] [stegotorus/master] Remove a hack from the configure script and a reference to Crypto++ from the README.

zwol at torproject.org zwol at torproject.org
Fri Jul 20 23:17:07 UTC 2012


commit 5513c95762305224973d614cd6f4e839ef948cc3
Author: Zack Weinberg <zackw at panix.com>
Date:   Wed Apr 4 18:01:27 2012 -0700

    Remove a hack from the configure script and a reference to Crypto++ from the README.
---
 README       |    2 +-
 configure.ac |    8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/README b/README
index b3b82b4..e1f45b3 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 This doesn't work yet.
 
-It requires Crypto++ 5.6.0 or later.
+It requires OpenSSL 1.0.1 or later.
 
 It requires Libevent 2.0 or later.
 
diff --git a/configure.ac b/configure.ac
index 69f4150..87cb713 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,12 +5,6 @@ AC_LANG([C++])
 AM_INIT_AUTOMAKE([foreign nostdinc silent-rules subdir-objects])
 AM_MAINTAINER_MODE([enable])
 
-dnl The stock definition of AC_INCLUDES_DEFAULT performs a whole bunch
-dnl of completely unnecessary checks *even if* you override its
-dnl mostly-useless default header list at invocation time.
-dnl Replace it with a version that does nothing unless requested.
-m4_pushdef([AC_INCLUDES_DEFAULT], [$1])
-
 ### Programs ###
 
 AC_PROG_CXX
@@ -64,7 +58,7 @@ LIBS="$LIBS $ws32_LIBS"
 
 ### Language features ###
 
-AC_CHECK_HEADERS([execinfo.h],,, [AC_INCLUDES_DEFAULT()])
+AC_CHECK_HEADERS([execinfo.h],,,[/**/])
 
 AX_CXXFLAGS_STDCXX_11([ext])
 AX_CXX_DELETE_METHOD





More information about the tor-commits mailing list