commit d155da429f0f06ade870850eb3451828a44f19b6
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 06 16:03:47 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 09 15:14:25 2014 -0800
tree e9f862e3fc25078a075015383cbbcf1cfdef019d
parent c5bb2ad6928c8e645893ba7b9a21ec5c20434b09

build: Conditional enabling of osx-private-key-storage compilation

Makefile.am now contains a condition to enable/disable compilation of
osx-private-key-storage, instead of relying on define in the key storage
implementation.

Change-Id: I4a2079d99cd515c744cbe8f90a34a39e5c8197fa

Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 850d034..951e891 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,7 +103,6 @@
   src/security/identity/identity-storage.cpp \
   src/security/identity/memory-identity-storage.cpp \
   src/security/identity/memory-private-key-storage.cpp \
-  src/security/identity/osx-private-key-storage.cpp \
   src/security/key-chain.cpp \
   src/security/policy/no-verify-policy-manager.cpp \
   src/security/policy/self-verify-policy-manager.cpp \
@@ -120,6 +119,12 @@
   src/util/string-helper.hpp \
   src/util/time.hpp
 
+if HAVE_OSX_SECURITY
+  libndn_cpp_la_SOURCES += src/security/identity/osx-private-key-storage.cpp
+else
+  EXTRA_DIST = src/security/identity/osx-private-key-storage.cpp
+endif
+
 libndn_cpp_la_LIBADD  = @OPENSSL_LIBS@ @CRYPTOPP_LIBS@ @OSX_SECURITY_LIBS@
 libndn_cpp_la_LDFLAGS = @OPENSSL_LDFLAGS@  @CRYPTOPP_LDFLAGS@ @SQLITE3_LDFLAGS@ @BOOST_LDFLAGS@
 libndn_cpp_la_CFLAGS  = @OPENSSL_INCLUDES@ @CRYPTOPP_INCLUDES@ @SQLITE3_CFLAGS@  @BOOST_CPPFLAGS@