From beb52352f2aeefb69ae2ee67e4e456346e28e40e Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 8 Mar 2010 23:24:24 -0500
Subject: Fix build with automake 1.6

automake 1.6 doesn't like using a conditional += to add stuff to foo_LDADD.
Instead you need to conditionally define a variable, then non-conditionally
put that variable in foo_LDADD.
---
 src/test/Makefile.am | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/test')

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index d6f2176580..cfe330c744 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -21,15 +21,18 @@ test_SOURCES = \
 	test_util.c \
 	tinytest.c
 
+if USE_BUFFEREVENTS
+levent_openssl_lib = -levent_openssl
+else
+levent_openssl_lib =
+endif
+
 test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
         @TOR_LDFLAGS_libevent@
 test_LDADD = ../or/libtor.a ../common/libor.a ../common/libor-crypto.a \
 	../common/libor-event.a \
-	@TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@
-
-if USE_BUFFEREVENTS
-test_LDADD += -levent_openssl
-endif
+	@TOR_ZLIB_LIBS@ -lm @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
+	@TOR_LIB_WS32@ @TOR_LIB_GDI@ $(levent_openssl_lib)
 
 noinst_HEADERS = tinytest.h tinytest_macros.h test.h
 
-- 
cgit v1.2.3-54-g00ecf