commit 339e9597fd77d9e84119f747e9158cb0fc4f4952 Author: Robert Hogan robert@roberthogan.net Date: Wed Mar 2 20:04:34 2011 +0000

Really fix multiple runs of config.status this time --- configure.in | 12 +++++------- src/Makefile.am | 2 -- test/Makefile.am | 1 + 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in index 0291f8f..4bc0e7b 100644 --- a/configure.in +++ b/configure.in @@ -546,8 +546,12 @@ AC_DEFINE_UNQUOTED([SENDMSG_ARGNAMES],[${NAMES}],[Argument names]) # we need to use DYLD_INSERT_LIBRARIES. ##############################################################################

+# This variable is used for the LDFLAGS in test/Makefile.am TESTLDFLAGS="$LDFLAGS"

+# Version information for libtorsocks +LDFLAGS="$LDFLAGS -version-info 1:0:0" + dnl Linker checks for Mac OSX, which uses DYLD_INSERT_LIBRARIES dnl instead of LD_PRELOAD case "$host_os" in @@ -636,10 +640,4 @@ AC_ENABLE_STATIC

AC_CONFIG_FILES([src/usewithtor src/torsocks doc/torsocks.conf.5 doc/torsocks.8 doc/usewithtor.1 doc/torsocks.1]) AC_CONFIG_FILES(Makefile src/Makefile doc/Makefile) -AC_OUTPUT - -dnl Output the Makefile for test/test_torsocks. -dnl Dump any LDFLAGS that were only required for linking libtorsocks, such as -dynamiclib on OSX. -LDFLAGS="$TESTLDFLAGS" -AC_CONFIG_FILES(test/Makefile) -AC_OUTPUT +#AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index d6da8f3..8d47fb6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,8 +9,6 @@ INSTALL_SCRIPT = $(install_sh) -c -m 755 # Install main library to $(prefix)/lib/tor (must match torsocks.in) lib_LTLIBRARIES = libtorsocks.la libtorsocks_la_SOURCES = torsocks.c common.c parser.c dead_pool.c darwin_warts.c socks.c -libtorsocks_la_LDFLAGS = -version-info 1:0:0 -#libtorsocks_la_CFLAGS = -nostartfiles

DISTCLEANFILES=parser.lo dead_pool.lo common.lo libtorsocks.lo torsocks.lo darwin_warts.lo socks.lo\ config.cache config.log config.h Makefile \ diff --git a/test/Makefile.am b/test/Makefile.am index 84e4859..c04e5ea 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,4 +1,5 @@ noinst_PROGRAMS= test_torsocks

test_torsocks_SOURCES= test_torsocks.c +test_torsocks_LDFLAGS= $(TESTLDFLAGS) CLEANFILES= test_torsocks