[tor-commits] [torbrowser/maint-2.3] Link openssl and libevent statically with obfsproxy

[erinn at torproject.org]

commit 196ebd20de78c11065b79e0e98e6e06ce8779761
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Tue Sep 4 15:26:42 2012 +0200

    Link openssl and libevent statically with obfsproxy
---
 build-scripts/osx-alpha.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index 58a8ce1..1c77620 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -120,7 +120,7 @@ TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(B
 OBFSPROXY_CFLAGS="-arch $(ARCH_TYPE) $(MIN_VERSION) $(CF_MIN_VERSION)"
 build-obfsproxy: build-zlib build-openssl build-libevent $(OBFSPROXY_DIR)
 ifeq ($(USE_OBFSPROXY),1)
-	cd $(OBFSPROXY_DIR) && libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="-L$(BUILT_DIR)/lib -levent" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="-L$(BUILT_DIR)/lib -lssl -lcrypto" ./configure --prefix=$(BUILT_DIR)
+	cd $(OBFSPROXY_DIR) && CFLAGS=$(OBFSPROXY_CFLAGS) libevent_CFLAGS=-I$(BUILT_DIR)/include libevent_LIBS="$(BUILT_DIR)/lib/libevent.a" libcrypto_CFLAGS=-I$(BUILT_DIR)/include/openssl libcrypto_LIBS="$(BUILT_DIR)/lib/libssl.a $(BUILT_DIR)/lib/libz.a $(BUILT_DIR)/lib/libcrypto.a" ./configure --prefix=$(BUILT_DIR)
 	cd $(OBFSPROXY_DIR) && make
 	cd $(OBFSPROXY_DIR) && make install
 endif