Browse Source

Add HAVE_OPENSSL flag to makefile

v0.7.4-release
Paul Querna 14 years ago
committed by Ryan Dahl
parent
commit
9977831078
  1. 12
      Makefile
  2. 2
      config.mak.in
  3. 4
      configure.ac

12
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/ \ node_CPPFLAGS = -Isrc/ -Ideps/libeio/ -Ideps/libev/ -Ideps/http_parser/ \
-Ideps/libev/include/ -Ideps/v8/include -DPLATFORM=\"$(platform)\" \ -Ideps/libev/include/ -Ideps/v8/include -DPLATFORM=\"$(platform)\" \
-DX_STACKSIZE=65536 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ -DX_STACKSIZE=65536 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
-DHAVE_OPENSSL=${HAVE_OPENSSL} \
-DHAVE_FDATASYNC=0 -I$(builddir)/release/src $(cares_CPPFLAGS) -DHAVE_FDATASYNC=0 -I$(builddir)/release/src $(cares_CPPFLAGS)
node_debug_CPPFLAGS = $(subst release,debug,$(NODE_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_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 # node executable
$(builddir)/node: $(node_release_objects) $(libev_release_objects) \ $(builddir)/node: $(node_release_objects) $(libev_release_objects) \

2
config.mak.in

@ -23,4 +23,4 @@ export srcdir VPATH
WANT_OPENSSL=@WANT_OPENSSL@ HAVE_OPENSSL=@HAVE_OPENSSL@

4
configure.ac

@ -44,8 +44,8 @@ AC_CHECK_TOOLS(AR, [gar ar], :)
# OpenSSL # TODO: OpenSSL
AC_SUBST([WANT_OPENSSL],[YES]) AC_SUBST([HAVE_OPENSSL],[1])

Loading…
Cancel
Save