remove popt dependency, consolidate config stuff (00a9e373) · Commits · Mike Perry / Tor

README

+15 −8

Original line number	Diff line number	Diff line
		@@ -3,8 +3,12 @@ described in a bit more detail at http://www.onion-router.net/. You
		can read list archives, and subscribe to the mailing list, at
		http://archives.seul.org/or/dev/.

		Is your question in the FAQ? Should it be?

		Quickstart version:

		0) Download the absolute newest version. No, really.
		http://freehaven.net/or/.
		1) ./configure (or do the two-line version below, if you're on bsd)
		2) make
		3) cd src/config
		@@ -12,9 +16,11 @@ Quickstart version:
		5) download privoxy (www.privoxy.org), and add the line
		"forward-socks4a / localhost:9050 ." (without the quotes) to its
		config file.
		6) point your mozilla (or whatever) to proxy at localhost:8118 (this
		6) point your mozilla (or whatever) to http proxy at localhost:8118 (this
		points it through Privoxy, so you now get good data-scrubbing too.)
		7) browse some web pages
		7) make sure you've set it up correctly: go to
		http://www.junkbusters.com/cgi-bin/privacy and see what IP it says
		you're coming from.

		More detailed version:

		@@ -23,10 +29,11 @@ Dependencies:
		You're going to need Privoxy (www.privoxy.org) installed, and configured
		to point at a socks4a proxy -- see below.

		For tor itself, you're going to need openssl (0.9.5 or later) and popt
		(1.6 or later). If you're on Linux, everything will probably work
		fine. OS X and BSD (but see below under troubleshooting) now work
		too. Let us know if you get it working elsewhere.
		For tor itself, you're going to need openssl (0.9.5 or later
		-- including the dev stuff and includes). If you're on Linux,
		everything will probably work fine. OS X and BSD (but see below under
		troubleshooting) now work too. Let us know if you get it working
		elsewhere.

		If you got the source from cvs:

		@@ -41,10 +48,10 @@ If you got the source from a tarball:

		If this doesn't work for you / troubleshooting:

		If you couldn't find popt (eg you're on BSD), try
		If you have problems finding libraries, try
		CPPFLAGS="-I/usr/local/include" LDFLAGS="-L/usr/local/lib" \
		./configure
		rather than simply ./configure. And install popt if you don't have it.
		rather than simply ./configure.

		Check out the list archives at http://archives.seul.org/or/dev/ and see
		if somebody else has reported your problem. If not, please subscribe

TODO

+1 −2

Original line number	Diff line number	Diff line

		[First four are all equally first.
		Others follow in order of priority.]

		@@ -34,7 +33,7 @@ and directory/network state monitoring.
		debian / red hat spec file
		handle starting things as a system daemon
		transition addr to sin_addr

		get proxy to choose the same conn if it's open

		Obvious things I'd like to do that won't break anything:

acconfig.h

+0 −1

Original line number	Diff line number	Diff line
		#undef HAVE_POPT
		#undef HAVE_OPENSSL

configure.in

+0 −8

Original line number	Diff line number	Diff line
		@@ -16,14 +16,6 @@ AC_PROG_MAKE_SET
		AC_PROG_RANLIB

		dnl AC_DEFINE([HAVE_OPENSSL], 0, [Define if OpenSSL was found.])
		dnl AC_DEFINE([HAVE_POPT], 0, [Define if popt was found.])

		AC_CHECK_LIB(popt,poptParseArgvString,
		AC_DEFINE(HAVE_POPT),
		AC_MSG_ERROR(required library not found: popt)
		)

		LIBS="$LIBS -lpopt"

		# The big search for OpenSSL
		# copied from openssh's configure.ac

src/common/Makefile.am

+2 −4

Original line number	Diff line number	Diff line
		@@ -3,9 +3,7 @@ noinst_LIBRARIES = libor.a

		#CFLAGS = -Wall -Wpointer-arith -O2

		libor_a_SOURCES = config.c log.c utils.c crypto.c fakepoll.c
		libor_a_SOURCES = log.c utils.c crypto.c fakepoll.c

		noinst_HEADERS = config.h log.h \
		policies.h utils.h \
		ss.h version.h crypto.h fakepoll.h
		noinst_HEADERS = log.h policies.h utils.h ss.h version.h crypto.h fakepoll.h