blautenb 2003/09/06 17:52:26
Modified: c/src Makefile.in configure configure.ac
c/src/framework XSECConfig.hpp.in
c/src/tools Makefile.in
c/src/utils XSECDOMUtils.cpp
Log:
Fix nix build for cipher
Revision Changes Path
1.7 +10 -1 xml-security/c/src/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-security/c/src/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 31 May 2003 23:23:35 -0000 1.6
+++ Makefile.in 7 Sep 2003 00:52:26 -0000 1.7
@@ -110,6 +110,8 @@
FRAMEWORK_DIR = framework
DSIG_DIR = dsig
OPENSSL_DIR = enc/OpenSSL
+XENC_DIR = xenc
+XENCIMPL_DIR = xenc/impl
# Utility SRC directories
@@ -171,6 +173,8 @@
$(MAKE) -C ${FRAMEWORK_DIR} compile
$(MAKE) -C ${UTILS_DIR} compile
$(MAKE) -C ${UNIXUTILS_DIR} compile
+ $(MAKE) -C ${XENC_DIR} compile
+ $(MAKE) -C ${XENCIMPL_DIR} compile
depends:
$(MAKE) -C ${CANON_DIR} -s depends
@@ -181,6 +185,8 @@
$(MAKE) -C ${FRAMEWORK_DIR} -s depends
$(MAKE) -C ${UTILS_DIR} -s depends
$(MAKE) -C ${UNIXUTILS_DIR} -s depends
+ $(MAKE) -C ${XENC_DIR} -s depends
+ $(MAKE) -C ${XENCIMPL_DIR} -s depends
prepare:
$(MKDIR) ../lib
@@ -195,6 +201,7 @@
$(MAKE) -C ${FRAMEWORK_DIR} includes
$(MAKE) -C ${UTILS_DIR} includes
$(MAKE) -C ${UNIXUTILS_DIR} includes
+ $(MAKE) -C ${XENC_DIR} includes
alltools:
$(MAKE) -C ${TOOLS_DIR} alltools
@@ -214,6 +221,7 @@
$(MAKE) -C ${FRAMEWORK_DIR} install
$(MAKE) -C ${UTILS_DIR} install
$(MAKE) -C ${UNIXUTILS_DIR} install
+ $(MAKE) -C ${XENC_DIR} install
@INSTALL_COMMAND_1@
@INSTALL_COMMAND_2@
@INSTALL_COMMAND_3@
@@ -236,7 +244,8 @@
$(MAKE) -C ${UTILS_DIR} distclean
$(MAKE) -C ${UNIXUTILS_DIR} distclean
$(MAKE) -C ${TOOLS_DIR} distclean
- $(MAKE) -C ${SAMPLES_DIR} distclean
+ $(MAKE) -C ${XENC_DIR} distclean
+ $(MAKE) -C ${XENCIMPL_DIR} distclean
rm -f config.cache
rm -f config.status
rm -f config.log
1.20 +11 -3 xml-security/c/src/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-security/c/src/configure,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- configure 5 Aug 2003 11:49:49 -0000 1.19
+++ configure 7 Sep 2003 00:52:26 -0000 1.20
@@ -1229,7 +1229,7 @@
# Define the files we wish to generate
-ac_config_files="$ac_config_files Makefile canon/Makefile
transformers/Makefile dsig/Makefile enc/Makefile enc/OpenSSL/Makefile
framework/Makefile utils/Makefile utils/unixutils/Makefile tools/Makefile
samples/Makefile"
+ac_config_files="$ac_config_files Makefile canon/Makefile
transformers/Makefile dsig/Makefile enc/Makefile enc/OpenSSL/Makefile
framework/Makefile utils/Makefile utils/unixutils/Makefile tools/Makefile
xenc/Makefile xenc/impl/Makefile samples/Makefile"
# AC_CONFIG_FILES([Makefile canon/Makefile transformers/Makefile
dsig/Makefile enc/Makefile enc/OpenSSL/Makefile framework/Makefile
utils/Makefile utils/unixutils/Makefile tools/Makefile samples/Makefile])
ac_config_headers="$ac_config_headers framework/XSECConfig.hpp"
@@ -1263,8 +1263,8 @@
fi
# Create the Makefile.in files in each directory
-library_l1_src_dirs="canon transformers dsig enc framework utils"
-library_l2_src_dirs="enc/OpenSSL utils/unixutils"
+library_l1_src_dirs="canon transformers dsig enc framework utils xenc"
+library_l2_src_dirs="enc/OpenSSL utils/unixutils xenc/impl"
@@ -4092,6 +4092,9 @@
+
+
+
# Populate Install directories
@@ -4703,6 +4706,8 @@
"utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
"utils/unixutils/Makefile" ) CONFIG_FILES="$CONFIG_FILES
utils/unixutils/Makefile" ;;
"tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+ "xenc/Makefile" ) CONFIG_FILES="$CONFIG_FILES xenc/Makefile" ;;
+ "xenc/impl/Makefile" ) CONFIG_FILES="$CONFIG_FILES xenc/impl/Makefile" ;;
"samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
"framework/XSECConfig.hpp" ) CONFIG_HEADERS="$CONFIG_HEADERS
framework/XSECConfig.hpp" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target"
>&5
@@ -4821,6 +4826,8 @@
s,@utils_obj_files@,$utils_obj_files,;t t
s,@utils_unixutils_obj_files@,$utils_unixutils_obj_files,;t t
s,@lib_obj_files@,$lib_obj_files,;t t
+s,@xenc_obj_files@,$xenc_obj_files,;t t
+s,@xenc_impl_obj_files@,$xenc_impl_obj_files,;t t
s,@canon_include_files@,$canon_include_files,;t t
s,@transformers_include_files@,$transformers_include_files,;t t
s,@dsig_include_files@,$dsig_include_files,;t t
@@ -4830,6 +4837,7 @@
s,@utils_include_files@,$utils_include_files,;t t
s,@utils_unixutils_include_files@,$utils_unixutils_include_files,;t t
s,@lib_include_files@,$lib_include_files,;t t
+s,@xenc_include_files@,$xenc_include_files,;t t
s,@LINK_COMMAND_1@,$LINK_COMMAND_1,;t t
s,@LINK_COMMAND_2@,$LINK_COMMAND_2,;t t
s,@INSTALL_COMMAND_1@,$INSTALL_COMMAND_1,;t t
1.20 +8 -2 xml-security/c/src/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/xml-security/c/src/configure.ac,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- configure.ac 5 Aug 2003 11:49:49 -0000 1.19
+++ configure.ac 7 Sep 2003 00:52:26 -0000 1.20
@@ -76,6 +76,8 @@
utils/Makefile \
utils/unixutils/Makefile \
tools/Makefile \
+ xenc/Makefile \
+ xenc/impl/Makefile \
samples/Makefile])
# AC_CONFIG_FILES([Makefile canon/Makefile transformers/Makefile
dsig/Makefile enc/Makefile enc/OpenSSL/Makefile framework/Makefile
utils/Makefile utils/unixutils/Makefile tools/Makefile samples/Makefile])
AC_CONFIG_HEADERS([framework/XSECConfig.hpp])
@@ -101,8 +103,8 @@
fi
# Create the Makefile.in files in each directory
-library_l1_src_dirs="canon transformers dsig enc framework utils"
-library_l2_src_dirs="enc/OpenSSL utils/unixutils"
+library_l1_src_dirs="canon transformers dsig enc framework utils xenc"
+library_l2_src_dirs="enc/OpenSSL utils/unixutils xenc/impl"
AC_CONFIG_COMMANDS_PRE(
[# Define the library directories
@@ -372,6 +374,7 @@
XMLFormatter::UnRep_CharRef);
],
[AC_MSG_RESULT([yes])]
+ [AC_DEFINE(XSEC_XERCES_REQUIRES_MEMMGR)],
[AC_DEFINE(XSEC_XERCES_FORMATTER_REQUIRES_VERSION)],
[AC_MSG_RESULT([no])])
@@ -514,6 +517,8 @@
AC_SUBST(utils_obj_files)
AC_SUBST(utils_unixutils_obj_files)
AC_SUBST(lib_obj_files)
+AC_SUBST(xenc_obj_files)
+AC_SUBST(xenc_impl_obj_files)
AC_SUBST(canon_include_files)
AC_SUBST(transformers_include_files)
@@ -524,6 +529,7 @@
AC_SUBST(utils_include_files)
AC_SUBST(utils_unixutils_include_files)
AC_SUBST(lib_include_files)
+AC_SUBST(xenc_include_files)
# Populate Install directories
1.6 +5 -0 xml-security/c/src/framework/XSECConfig.hpp.in
Index: XSECConfig.hpp.in
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECConfig.hpp.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSECConfig.hpp.in 28 May 2003 11:08:29 -0000 1.5
+++ XSECConfig.hpp.in 7 Sep 2003 00:52:26 -0000 1.6
@@ -88,6 +88,11 @@
#undef XSEC_XERCES_FORMATTER_REQUIRES_VERSION
+/* 2.3 and above use a user defined Memory Manager. In some cases, this
+ actually needs to be passed to functions
+*/
+
+#undef XSEC_XERCES_REQUIRES_MEMMGR
/*
* Define presence of cryptographic providers
1.6 +10 -1 xml-security/c/src/tools/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/Makefile.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 18 May 2003 12:00:20 -0000 1.5
+++ Makefile.in 7 Sep 2003 00:52:26 -0000 1.6
@@ -101,7 +101,8 @@
${BINDIR}/checksig \
${BINDIR}/templatesign \
${BINDIR}/txfmout \
- ${BINDIR}/siginf
+ ${BINDIR}/siginf \
+ ${BINDIR}/cipher
compile: ${OBJ_FILES}
@@ -158,6 +159,14 @@
${CC1} -c ${CPPFLAGS} ${XSEC_INCL} -o [EMAIL PROTECTED] $<
${BINDIR}/siginf: ${OBJDIR}/siginf${OBJSUFFIX}
+ $(LINK) $(LDFLAGS) $< $(LDXSEC) $(LIBS) -o $@
+
+#============================= cipher =============================
+
+${OBJDIR}/cipher${OBJSUFFIX}: cipher/cipher.cpp
+ ${CC1} -c ${CPPFLAGS} ${XSEC_INCL} -o [EMAIL PROTECTED] $<
+
+${BINDIR}/cipher: ${OBJDIR}/cipher${OBJSUFFIX}
$(LINK) $(LDFLAGS) $< $(LDXSEC) $(LIBS) -o $@
#============================= Clean =============================
1.12 +7 -0 xml-security/c/src/utils/XSECDOMUtils.cpp
Index: XSECDOMUtils.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECDOMUtils.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSECDOMUtils.cpp 31 Aug 2003 12:50:47 -0000 1.11
+++ XSECDOMUtils.cpp 7 Sep 2003 00:52:26 -0000 1.12
@@ -324,11 +324,18 @@
// Grab a transcoder
XMLTransService::Codes failReason;
+#if defined(XSEC_XERCES_REQUIRES_MEMMGR)
XMLTranscoder* t =
XMLPlatformUtils::fgTransService->makeNewTranscoderFor("UTF-8",
failReason,
2*1024,
XMLPlatformUtils::fgMemoryManager);
+#else
+ XMLTranscoder* t =
+ XMLPlatformUtils::fgTransService->makeNewTranscoderFor("UTF-8",
+
failReason,
+
2*1024);
+#endif
Janitor<XMLTranscoder> j_t(t);
// Need to loop through, 2K at a time
