ChangeLogTag: Sat Dec 30 06:20:18 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

5 files changed, 226 insertions, 0 deletions

diff --git a/ACE/ACEXML/apps/svcconf/Makefile.am b/ACE/ACEXML/apps/svcconf/Makefile.am
index 0a05c085864..a972e3cc25f 100644
--- a/ACE/ACEXML/apps/svcconf/Makefile.am
+++ b/ACE/ACEXML/apps/svcconf/Makefile.am
@@ -26,6 +26,16 @@ libACEXML_XML_Svc_Conf_Parser_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/ACEXML/common
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+libACEXML_XML_Svc_Conf_Parser_la_CPPFLAGS += \
+  -I$(ZZIP_ROOT)/include \
+  -I$(ZLIB_ROOT)/include \
+  -DUSE_ZZIP \
+  -DZLIB
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 libACEXML_XML_Svc_Conf_Parser_la_SOURCES = \
   Svcconf.cpp \
   Svcconf_Handler.cpp
@@ -33,11 +43,27 @@ libACEXML_XML_Svc_Conf_Parser_la_SOURCES = \
 libACEXML_XML_Svc_Conf_Parser_la_LDFLAGS = \
  -release @ACE_VERSION_NAME@
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+libACEXML_XML_Svc_Conf_Parser_la_LDFLAGS += \
+  -L$(ZZIP_ROOT)/lib \
+  -L$(ZLIB_ROOT)/lib
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 libACEXML_XML_Svc_Conf_Parser_la_LIBADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+libACEXML_XML_Svc_Conf_Parser_la_LIBADD += \
+  -lzzip \
+  -lz
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 nobase_include_HEADERS = \
   Svcconf.h \
   Svcconf_Handler.h \
diff --git a/ACE/ACEXML/common/Makefile.am b/ACE/ACEXML/common/Makefile.am
index 148a0ccffb4..e40bf988715 100644
--- a/ACE/ACEXML/common/Makefile.am
+++ b/ACE/ACEXML/common/Makefile.am
@@ -26,6 +26,16 @@ libACEXML_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -DACEXML_BUILD_DLL
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+libACEXML_la_CPPFLAGS += \
+  -I$(ZZIP_ROOT)/include \
+  -I$(ZLIB_ROOT)/include \
+  -DUSE_ZZIP \
+  -DZLIB \
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 libACEXML_la_SOURCES = \
   Attributes.cpp \
   AttributesImpl.cpp \
@@ -63,9 +73,25 @@ libACEXML_la_SOURCES = \
 libACEXML_la_LDFLAGS = \
  -release @ACE_VERSION_NAME@
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+libACEXML_la_LDFLAGS += \
+  -L$(ZZIP_ROOT)/lib \
+  -L$(ZLIB_ROOT)/lib
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 libACEXML_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+libACEXML_la_LIBADD += \
+  -lzzip \
+  -lz
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 nobase_include_HEADERS = \
   ACEXML_Export.h \
   Attributes.h \
diff --git a/ACE/ACEXML/examples/SAXPrint/Makefile.am b/ACE/ACEXML/examples/SAXPrint/Makefile.am
index 8b7853648cf..09b97541263 100644
--- a/ACE/ACEXML/examples/SAXPrint/Makefile.am
+++ b/ACE/ACEXML/examples/SAXPrint/Makefile.am
@@ -16,6 +16,7 @@ ACE_ROOT = $(top_srcdir)
 
 if BUILD_ACEXML
 if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS = SAXPrint
 
 SAXPrint_CPPFLAGS = \
@@ -23,6 +24,16 @@ SAXPrint_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/ACEXML/common
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+SAXPrint_CPPFLAGS += \
+  -I$(ZZIP_ROOT)/include \
+  -I$(ZLIB_ROOT)/include \
+  -DUSE_ZZIP \
+  -DZLIB
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 SAXPrint_SOURCES = \
   Print_Handler.cpp \
   SAXPrint_Handler.cpp \
@@ -31,11 +42,29 @@ SAXPrint_SOURCES = \
   SAXPrint_Handler.h \
   SAXPrint_Handler.inl
 
+SAXPrint_LDFLAGS =
+
+if BUILD_ZLIB
+if BUILD_ZZIP
+SAXPrint_LDFLAGS += \
+  -L$(ZZIP_ROOT)/lib \
+  -L$(ZLIB_ROOT)/lib
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 SAXPrint_LDADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+SAXPrint_LDADD += \
+  -lzzip \
+  -lz
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACEXML
 
diff --git a/ACE/ACEXML/tests/Makefile.am b/ACE/ACEXML/tests/Makefile.am
index 7fdae59421a..721792a0069 100644
--- a/ACE/ACEXML/tests/Makefile.am
+++ b/ACE/ACEXML/tests/Makefile.am
@@ -21,6 +21,7 @@ noinst_PROGRAMS =
 
 if BUILD_ACEXML
 if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += ContentHandler_Test
 
 ContentHandler_Test_CPPFLAGS = \
@@ -28,14 +29,42 @@ ContentHandler_Test_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/ACEXML/common
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+ContentHandler_Test_CPPFLAGS += \
+  -I$(ZZIP_ROOT)/include \
+  -I$(ZLIB_ROOT)/include \
+  -DUSE_ZZIP \
+  -DZLIB
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 ContentHandler_Test_SOURCES = \
   ContentHandler_Test.cpp
 
+ContentHandler_Test_LDFLAGS =
+
+if BUILD_ZLIB
+if BUILD_ZZIP
+ContentHandler_Test_LDFLAGS += \
+  -L$(ZZIP_ROOT)/lib \
+  -L$(ZLIB_ROOT)/lib
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 ContentHandler_Test_LDADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+ContentHandler_Test_LDADD += \
+  -lzzip \
+  -lz
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACEXML
 
@@ -43,6 +72,7 @@ endif BUILD_ACEXML
 
 if BUILD_ACEXML
 if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += HttpCharStream_Test
 
 HttpCharStream_Test_CPPFLAGS = \
@@ -50,14 +80,42 @@ HttpCharStream_Test_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/ACEXML/common
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+HttpCharStream_Test_CPPFLAGS += \
+  -I$(ZZIP_ROOT)/include \
+  -I$(ZLIB_ROOT)/include \
+  -DUSE_ZZIP \
+  -DZLIB
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 HttpCharStream_Test_SOURCES = \
   HttpCharStream_Test.cpp
 
+HttpCharStream_Test_LDFLAGS =
+
+if BUILD_ZLIB
+if BUILD_ZZIP
+HttpCharStream_Test_LDFLAGS += \
+  -L$(ZZIP_ROOT)/lib \
+  -L$(ZLIB_ROOT)/lib
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 HttpCharStream_Test_LDADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+HttpCharStream_Test_LDADD += \
+  -lzzip \
+  -lz
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACEXML
 
@@ -65,6 +123,7 @@ endif BUILD_ACEXML
 
 if BUILD_ACEXML
 if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += NamespaceSupport_Test
 
 NamespaceSupport_Test_CPPFLAGS = \
@@ -72,14 +131,42 @@ NamespaceSupport_Test_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/ACEXML/common
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+NamespaceSupport_Test_CPPFLAGS += \
+  -I$(ZZIP_ROOT)/include \
+  -I$(ZLIB_ROOT)/include \
+  -DUSE_ZZIP \
+  -DZLIB
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 NamespaceSupport_Test_SOURCES = \
   NamespaceSupport_Test.cpp
 
+NamespaceSupport_Test_LDFLAGS =
+
+if BUILD_ZLIB
+if BUILD_ZZIP
+NamespaceSupport_Test_LDFLAGS += \
+  -L$(ZZIP_ROOT)/lib \
+  -L$(ZLIB_ROOT)/lib
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 NamespaceSupport_Test_LDADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+NamespaceSupport_Test_LDADD += \
+  -lzzip \
+  -lz
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACEXML
 
@@ -87,6 +174,7 @@ endif BUILD_ACEXML
 
 if BUILD_ACEXML
 if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS += Transcoder_Test
 
 Transcoder_Test_CPPFLAGS = \
@@ -94,14 +182,42 @@ Transcoder_Test_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/ACEXML/common
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+Transcoder_Test_CPPFLAGS += \
+  -I$(ZZIP_ROOT)/include \
+  -I$(ZLIB_ROOT)/include \
+  -DUSE_ZZIP \
+  -DZLIB
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 Transcoder_Test_SOURCES = \
   Transcoder_Test.cpp
 
+Transcoder_Test_LDFLAGS = 
+
+if BUILD_ZLIB
+if BUILD_ZZIP
+Transcoder_Test_LDFLAGS += \
+  -L$(ZZIP_ROOT)/lib \
+  -L$(ZLIB_ROOT)/lib
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 Transcoder_Test_LDADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+Transcoder_Test_LDADD += \
+  -lzzip \
+  -lz
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACEXML
 
diff --git a/ACE/ACEXML/tests/util/Makefile.am b/ACE/ACEXML/tests/util/Makefile.am
index 4de2a3fd78c..4c92beeebca 100644
--- a/ACE/ACEXML/tests/util/Makefile.am
+++ b/ACE/ACEXML/tests/util/Makefile.am
@@ -16,6 +16,7 @@ ACE_ROOT = $(top_srcdir)
 
 if BUILD_ACEXML
 if !BUILD_ACE_FOR_TAO
+
 noinst_PROGRAMS = test
 
 test_CPPFLAGS = \
@@ -23,14 +24,42 @@ test_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(ACE_ROOT)/ACEXML/common
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+test_CPPFLAGS += \
+  -I$(ZZIP_ROOT)/include \
+  -I$(ZLIB_ROOT)/include \
+  -DUSE_ZZIP \
+  -DZLIB
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 test_SOURCES = \
   test.cpp
 
+test_LDFLAGS =
+
+if BUILD_ZLIB
+if BUILD_ZZIP
+test_LDFLAGS += \
+  -L$(ZZIP_ROOT)/lib \
+  -L$(ZLIB_ROOT)/lib
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 test_LDADD = \
   $(ACE_BUILDDIR)/ACEXML/parser/parser/libACEXML_Parser.la \
   $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
+if BUILD_ZLIB
+if BUILD_ZZIP
+test_LDADD += \
+  -lzzip \
+  -lz
+endif BUILD_ZZIP
+endif BUILD_ZLIB
+
 endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACEXML