From 9977831078bff3b9d09872c115e34ee8d00b215c Mon Sep 17 00:00:00 2001 From: Paul Querna Date: Mon, 25 Oct 2010 10:27:39 -0700 Subject: [PATCH] Add HAVE_OPENSSL flag to makefile --- Makefile | 12 ++++++++++++ config.mak.in | 2 +- configure.ac | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5bdae40cda..4e6731e750 100644 --- a/Makefile +++ b/Makefile @@ -113,6 +113,7 @@ node_release_objects = $(addprefix $(builddir)/release/,$(node_sources:.cc=.o)) node_CPPFLAGS = -Isrc/ -Ideps/libeio/ -Ideps/libev/ -Ideps/http_parser/ \ -Ideps/libev/include/ -Ideps/v8/include -DPLATFORM=\"$(platform)\" \ -DX_STACKSIZE=65536 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + -DHAVE_OPENSSL=${HAVE_OPENSSL} \ -DHAVE_FDATASYNC=0 -I$(builddir)/release/src $(cares_CPPFLAGS) node_debug_CPPFLAGS = $(subst release,debug,$(NODE_CPPFLAGS)) @@ -218,6 +219,17 @@ $(builddir)/debug/src/node.o: src/node.cc $(builddir)/debug/src/node_natives.h $(node_CPPFLAGS) $(OPENSSL_CPPFLAGS) $< -o $@ +# node_javascript.o + +$(builddir)/release/src/node_javascript.o: src/node_javascript.cc $(builddir)/release/src/node_natives.h + $(CXX) -c $(release_CXXFLAGS) $(release_CPPFLAGS) $(node_CFLAGS) \ + $(node_CPPFLAGS) $(OPENSSL_CPPFLAGS) $< -o $@ + +$(builddir)/debug/src/node_javascript.o: src/node_javascript.cc $(builddir)/debug/src/node_natives.h + $(CXX) -c $(debug_CXXFLAGS) $(debug_CPPFLAGS) $(node_CFLAGS) \ + $(node_CPPFLAGS) $(OPENSSL_CPPFLAGS) $< -o $@ + + # node executable $(builddir)/node: $(node_release_objects) $(libev_release_objects) \ diff --git a/config.mak.in b/config.mak.in index fdfc5e639c..59d25e0264 100644 --- a/config.mak.in +++ b/config.mak.in @@ -23,4 +23,4 @@ export srcdir VPATH -WANT_OPENSSL=@WANT_OPENSSL@ +HAVE_OPENSSL=@HAVE_OPENSSL@ diff --git a/configure.ac b/configure.ac index f6fd16bfb8..3e12540cf0 100644 --- a/configure.ac +++ b/configure.ac @@ -44,8 +44,8 @@ AC_CHECK_TOOLS(AR, [gar ar], :) -# OpenSSL -AC_SUBST([WANT_OPENSSL],[YES]) +# TODO: OpenSSL +AC_SUBST([HAVE_OPENSSL],[1])