svn commit: r1808182 - in /santuario/xml-security-cpp/trunk/xsec: Makefile.am framework/XSECDefs.hpp

[sc...@apache.org]

Author: scantor
Date: Tue Sep 12 22:20:10 2017
New Revision: 1808182

URL: http://svn.apache.org/viewvc?rev=1808182&view=rev
Log:
Fix up tool builds

Modified:
    santuario/xml-security-cpp/trunk/xsec/Makefile.am
    santuario/xml-security-cpp/trunk/xsec/framework/XSECDefs.hpp

Modified: santuario/xml-security-cpp/trunk/xsec/Makefile.am
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/Makefile.am?rev=1808182&r1=1808181&r2=1808182&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/Makefile.am (original)
+++ santuario/xml-security-cpp/trunk/xsec/Makefile.am Tue Sep 12 22:20:10 2017
@@ -72,10 +72,12 @@ tools =
 tools += xsec-xtest
 xsec_xtest_SOURCES = \
    tools/xtest/xtest.cpp
+xsec_xtest_CPPFLAGS = -DXSEC_BUILDING_TOOLS
 
 tools += xsec-c14n
 xsec_c14n_SOURCES = \
    tools/c14n/c14n.cpp
+xsec_c14n_CPPFLAGS = -DXSEC_BUILDING_TOOLS
  
 tools += xsec-checksig
 xsec_checksig_SOURCES = \
@@ -84,30 +86,36 @@ xsec_checksig_SOURCES = \
    tools/checksig/AnonymousResolver.cpp \
    tools/checksig/InteropResolver.hpp \
    tools/checksig/InteropResolver.cpp
+xsec_checksig_CPPFLAGS = -DXSEC_BUILDING_TOOLS
 
 tools += xsec-templatesign
 xsec_templatesign_SOURCES = \
    tools/templatesign/templatesign.cpp
+xsec_templatesign_CPPFLAGS = -DXSEC_BUILDING_TOOLS
 
 tools += xsec-txfmout
 xsec_txfmout_SOURCES = \
    tools/txfmout/txfmout.cpp
+xsec_txfmout_CPPFLAGS = -DXSEC_BUILDING_TOOLS
 
 tools += xsec-siginf
 xsec_siginf_SOURCES = \
    tools/siginf/siginf.cpp
+xsec_siginf_CPPFLAGS = -DXSEC_BUILDING_TOOLS
 
 tools += xsec-cipher
 xsec_cipher_SOURCES = \
    tools/cipher/cipher.cpp \
    tools/cipher/XencInteropResolver.hpp \
    tools/cipher/XencInteropResolver.cpp
+xsec_cipher_CPPFLAGS = -DXSEC_BUILDING_TOOLS
 
 if XSEC_AM_HAVE_XKMS
 tools += xsec-xklient
 xsec_xklient_SOURCES = \
    tools/xklient/xklient.cpp \
    enc/OpenSSL/OpenSSLSupport.hpp
+xsec_xklient_CPPFLAGS = -DXSEC_BUILDING_TOOLS
 endif
 
 libxml_security_c_la_CPPFLAGS = -DXSEC_BUILDING_LIBRARY

Modified: santuario/xml-security-cpp/trunk/xsec/framework/XSECDefs.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/framework/XSECDefs.hpp?rev=1808182&r1=1808181&r2=1808182&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECDefs.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECDefs.hpp Tue Sep 12 22:20:10 2017
@@ -48,7 +48,7 @@
 #	endif
 #	define WIN32_LEAN_AND_MEAN
 #	include <windows.h>
-#elif XSEC_BUILDING_LIBRARY
+#elif defined(XSEC_BUILDING_LIBRARY) || defined(XSEC_BUILDING_TOOLS)
 #   include "config.h"
 #else
 #	include <xsec/framework/XSECConfig.hpp>
@@ -145,7 +145,7 @@
 
 #endif
 
-#ifdef XSEC_BUILDING_LIBRARY
+#if defined(XSEC_BUILDING_LIBRARY) || defined(XSEC_BUILDING_TOOLS)
 #   ifdef HAVE_STRCASECMP
 #       define _stricmp(x,y) strcasecmp(x,y)
 #   else