ChangeLogTag: Thu Jan 4 13:53:33 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com>

7 files changed, 178 insertions, 68 deletions

diff --git a/ACE/ACEXML/apps/svcconf/Makefile.am b/ACE/ACEXML/apps/svcconf/Makefile.am
index a972e3cc25f..2464ab3ad33 100644
--- a/ACE/ACEXML/apps/svcconf/Makefile.am
+++ b/ACE/ACEXML/apps/svcconf/Makefile.am
@@ -29,10 +29,8 @@ libACEXML_XML_Svc_Conf_Parser_la_CPPFLAGS = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 libACEXML_XML_Svc_Conf_Parser_la_CPPFLAGS += \
-  -I$(ZZIP_ROOT)/include \
-  -I$(ZLIB_ROOT)/include \
-  -DUSE_ZZIP \
-  -DZLIB
+  $(ACE_ZZIP_CPPFLAGS) \
+  $(ACE_ZLIB_CPPFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -46,8 +44,8 @@ libACEXML_XML_Svc_Conf_Parser_la_LDFLAGS = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 libACEXML_XML_Svc_Conf_Parser_la_LDFLAGS += \
-  -L$(ZZIP_ROOT)/lib \
-  -L$(ZLIB_ROOT)/lib
+  $(ACE_ZZIP_LDFLAGS) \
+  $(ACE_ZLIB_LDFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -59,8 +57,8 @@ libACEXML_XML_Svc_Conf_Parser_la_LIBADD = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 libACEXML_XML_Svc_Conf_Parser_la_LIBADD += \
-  -lzzip \
-  -lz
+  $(ACE_ZZIP_LIBS) \
+  $(ACE_ZLIB_LIBS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
diff --git a/ACE/ACEXML/common/Makefile.am b/ACE/ACEXML/common/Makefile.am
index 7c7fa4d17f4..f08574ae905 100644
--- a/ACE/ACEXML/common/Makefile.am
+++ b/ACE/ACEXML/common/Makefile.am
@@ -29,10 +29,8 @@ libACEXML_la_CPPFLAGS = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 libACEXML_la_CPPFLAGS += \
-  -I$(ZZIP_ROOT)/include \
-  -I$(ZLIB_ROOT)/include \
-  -DUSE_ZZIP \
-  -DZLIB
+  $(ACE_ZZIP_CPPFLAGS) \
+  $(ACE_ZLIB_CPPFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -76,8 +74,8 @@ libACEXML_la_LDFLAGS = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 libACEXML_la_LDFLAGS += \
-  -L$(ZZIP_ROOT)/lib \
-  -L$(ZLIB_ROOT)/lib
+  $(ACE_ZZIP_LDFLAGS) \
+  $(ACE_ZLIB_LDFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -87,8 +85,8 @@ libACEXML_la_LIBADD = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 libACEXML_la_LIBADD += \
-  -lzzip \
-  -lz
+  $(ACE_ZZIP_LIBS) \
+  $(ACE_ZLIB_LIBS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
diff --git a/ACE/ACEXML/examples/SAXPrint/Makefile.am b/ACE/ACEXML/examples/SAXPrint/Makefile.am
index 09b97541263..d196510359f 100644
--- a/ACE/ACEXML/examples/SAXPrint/Makefile.am
+++ b/ACE/ACEXML/examples/SAXPrint/Makefile.am
@@ -27,10 +27,8 @@ SAXPrint_CPPFLAGS = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 SAXPrint_CPPFLAGS += \
-  -I$(ZZIP_ROOT)/include \
-  -I$(ZLIB_ROOT)/include \
-  -DUSE_ZZIP \
-  -DZLIB
+  $(ACE_ZZIP_CPPFLAGS) \
+  $(ACE_ZLIB_CPPFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -47,8 +45,8 @@ SAXPrint_LDFLAGS =
 if BUILD_ZLIB
 if BUILD_ZZIP
 SAXPrint_LDFLAGS += \
-  -L$(ZZIP_ROOT)/lib \
-  -L$(ZLIB_ROOT)/lib
+  $(ACE_ZZIP_LDFLAGS) \
+  $(ACE_ZLIB_LDFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -60,8 +58,8 @@ SAXPrint_LDADD = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 SAXPrint_LDADD += \
-  -lzzip \
-  -lz
+  $(ACE_ZZIP_LIBS) \
+  $(ACE_ZLIB_LIBS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
diff --git a/ACE/ACEXML/tests/Makefile.am b/ACE/ACEXML/tests/Makefile.am
index 721792a0069..e8f43fdc317 100644
--- a/ACE/ACEXML/tests/Makefile.am
+++ b/ACE/ACEXML/tests/Makefile.am
@@ -32,10 +32,8 @@ ContentHandler_Test_CPPFLAGS = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 ContentHandler_Test_CPPFLAGS += \
-  -I$(ZZIP_ROOT)/include \
-  -I$(ZLIB_ROOT)/include \
-  -DUSE_ZZIP \
-  -DZLIB
+  $(ACE_ZZIP_CPPFLAGS) \
+  $(ACE_ZLIB_CPPFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -47,8 +45,8 @@ ContentHandler_Test_LDFLAGS =
 if BUILD_ZLIB
 if BUILD_ZZIP
 ContentHandler_Test_LDFLAGS += \
-  -L$(ZZIP_ROOT)/lib \
-  -L$(ZLIB_ROOT)/lib
+  $(ACE_ZZIP_LDFLAGS) \
+  $(ACE_ZLIB_LDFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -60,8 +58,8 @@ ContentHandler_Test_LDADD = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 ContentHandler_Test_LDADD += \
-  -lzzip \
-  -lz
+  $(ACE_ZZIP_LIBS) \
+  $(ACE_ZLIB_LIBS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -83,10 +81,8 @@ HttpCharStream_Test_CPPFLAGS = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 HttpCharStream_Test_CPPFLAGS += \
-  -I$(ZZIP_ROOT)/include \
-  -I$(ZLIB_ROOT)/include \
-  -DUSE_ZZIP \
-  -DZLIB
+  $(ACE_ZZIP_CPPFLAGS) \
+  $(ACE_ZLIB_CPPFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -98,8 +94,8 @@ HttpCharStream_Test_LDFLAGS =
 if BUILD_ZLIB
 if BUILD_ZZIP
 HttpCharStream_Test_LDFLAGS += \
-  -L$(ZZIP_ROOT)/lib \
-  -L$(ZLIB_ROOT)/lib
+  $(ACE_ZZIP_LDFLAGS) \
+  $(ACE_ZLIB_LDFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -111,8 +107,8 @@ HttpCharStream_Test_LDADD = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 HttpCharStream_Test_LDADD += \
-  -lzzip \
-  -lz
+  $(ACE_ZZIP_LIBS) \
+  $(ACE_ZLIB_LIBS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -134,10 +130,8 @@ NamespaceSupport_Test_CPPFLAGS = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 NamespaceSupport_Test_CPPFLAGS += \
-  -I$(ZZIP_ROOT)/include \
-  -I$(ZLIB_ROOT)/include \
-  -DUSE_ZZIP \
-  -DZLIB
+  $(ACE_ZZIP_CPPFLAGS) \
+  $(ACE_ZLIB_CPPFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -149,8 +143,8 @@ NamespaceSupport_Test_LDFLAGS =
 if BUILD_ZLIB
 if BUILD_ZZIP
 NamespaceSupport_Test_LDFLAGS += \
-  -L$(ZZIP_ROOT)/lib \
-  -L$(ZLIB_ROOT)/lib
+  $(ACE_ZZIP_LDFLAGS) \
+  $(ACE_ZLIB_LDFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -162,8 +156,8 @@ NamespaceSupport_Test_LDADD = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 NamespaceSupport_Test_LDADD += \
-  -lzzip \
-  -lz
+  $(ACE_ZZIP_LIBS) \
+  $(ACE_ZLIB_LIBS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -185,10 +179,8 @@ Transcoder_Test_CPPFLAGS = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 Transcoder_Test_CPPFLAGS += \
-  -I$(ZZIP_ROOT)/include \
-  -I$(ZLIB_ROOT)/include \
-  -DUSE_ZZIP \
-  -DZLIB
+  $(ACE_ZZIP_CPPFLAGS) \
+  $(ACE_ZLIB_CPPFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -200,8 +192,8 @@ Transcoder_Test_LDFLAGS =
 if BUILD_ZLIB
 if BUILD_ZZIP
 Transcoder_Test_LDFLAGS += \
-  -L$(ZZIP_ROOT)/lib \
-  -L$(ZLIB_ROOT)/lib
+  $(ACE_ZZIP_LDFLAGS) \
+  $(ACE_ZLIB_LDFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -213,8 +205,8 @@ Transcoder_Test_LDADD = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 Transcoder_Test_LDADD += \
-  -lzzip \
-  -lz
+  $(ACE_ZZIP_LIBS) \
+  $(ACE_ZLIB_LIBS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
diff --git a/ACE/ACEXML/tests/util/Makefile.am b/ACE/ACEXML/tests/util/Makefile.am
index 4c92beeebca..b2d79bef425 100644
--- a/ACE/ACEXML/tests/util/Makefile.am
+++ b/ACE/ACEXML/tests/util/Makefile.am
@@ -27,10 +27,8 @@ test_CPPFLAGS = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 test_CPPFLAGS += \
-  -I$(ZZIP_ROOT)/include \
-  -I$(ZLIB_ROOT)/include \
-  -DUSE_ZZIP \
-  -DZLIB
+  $(ACE_ZZIP_CPPFLAGS) \
+  $(ACE_ZLIB_CPPFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -42,8 +40,8 @@ test_LDFLAGS =
 if BUILD_ZLIB
 if BUILD_ZZIP
 test_LDFLAGS += \
-  -L$(ZZIP_ROOT)/lib \
-  -L$(ZLIB_ROOT)/lib
+  $(ACE_ZZIP_LDFLAGS) \
+  $(ACE_ZLIB_LDFLAGS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
@@ -55,8 +53,8 @@ test_LDADD = \
 if BUILD_ZLIB
 if BUILD_ZZIP
 test_LDADD += \
-  -lzzip \
-  -lz
+  $(ACE_ZZIP_LIBS) \
+  $(ACE_ZLIB_LIBS)
 endif BUILD_ZZIP
 endif BUILD_ZLIB
 
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 8f0afba68bb..d2bb2d0ff5a 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,21 @@
+Thu Jan  4 13:53:33 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* ACEXML/tests/Makefile.am:
+	* ACEXML/tests/util/Makefile.am:
+	* ACEXML/apps/svcconf/Makefile.am:
+	* ACEXML/common/Makefile.am:
+	* ACEXML/examples/SAXPrint/Makefile.am:
+
+          Tweak to use ACE_{ZLIB,ZZIP}_{CPPFLAGS,LDFLAGS,LIBS}
+          instead of -I${ZLIB_ROOT}/include, etc.  The former
+          are substituted by the configure script.
+
+	* m4/ace.m4:
+
+          Add ACE_PATH_ZLIB and ACE_PATH_ZZIP autoconf macros.
+          zlib and zzip can now be enabled at configure time
+          with --with-zlib and --with-zzip.
+
 Thu Jan  4 12:45:46 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
 
         * ace/Basic_Stats.cpp:
diff --git a/ACE/m4/ace.m4 b/ACE/m4/ace.m4
index 736a018de8f..4d91810008d 100644
--- a/ACE/m4/ace.m4
+++ b/ACE/m4/ace.m4
@@ -489,10 +489,9 @@ AC_DEFUN([ACE_CONFIGURATION_OPTIONS],
 
  # placeholder for WxWindows/wxWidgets support
  AM_CONDITIONAL([BUILD_WXWINDOWS], false)
- # placeholder for zziplib support
- AM_CONDITIONAL([BUILD_ZZIP], false)
- # placeholder for zlib support
- AM_CONDITIONAL([BUILD_ZLIB], false)
+
+ ACE_PATH_ZLIB
+ ACE_PATH_ZZIP
 
  AC_ARG_ENABLE([gperf],
   AS_HELP_STRING(--enable-gperf,compile the gperf program [[[yes]]]),
@@ -1318,6 +1317,115 @@ AM_CONDITIONAL([BUILD_X11], [test X$no_x != Xyes])
 ])
 
 
+# ACE_PATH_ZLIB
+#---------------------------------------------------------------------------
+# Find zlib Libraries, flags, etc.
+AC_DEFUN([ACE_PATH_ZLIB],
+[
+ACE_ZLIB_CPPFLAGS=""
+ACE_ZLIB_LDFLAGS=""
+
+dnl TODO: default to false, at least until we add a check to see if
+dnl the zlib library is usable.
+AC_ARG_WITH([zlib],
+  AS_HELP_STRING([--with-zlib@<:@=DIR@:>@],
+		 [root directory of zlib installation]),
+  [
+  ace_with_zlib="${withval}"
+  if test "${ace_with_zlib}" != yes; then
+       ace_zlib_include="${ace_with_zlib}/include"
+       ace_zlib_libdir="${ace_with_zlib}/lib"
+  fi
+  ],[ace_with_zlib=no])
+
+dnl TODO: let's wait and see before adding options to specify header
+dnl and library location separately.
+dnl
+dnl AC_ARG_WITH([zlib_include],
+dnl   AS_HELP_STRING([--with-zlib-include=DIR],
+dnl 		 [specify exact include dir for zlib headers]),
+dnl   [ace_zlib_include="$withval"])
+dnl 
+dnl AC_ARG_WITH([zlib_libdir],
+dnl   AS_HELP_STRING([--with-zlib-libdir=DIR],
+dnl 		 [specify exact include dir for zlib libraries]),
+dnl   [ace_zlib_libdir="$withval"])
+
+if test "${ace_zlib_include}"; then
+  ACE_ZLIB_CPPFLAGS="-I$ace_zlib_include"
+fi
+
+if test "${ace_zlib_libdir}"; then
+  ACE_ZLIB_LDFLAGS="-L$ace_zlib_libdir"
+fi
+
+ACE_ZLIB_CPPFLAGS="${ACE_ZLIB_CPPFLAGS} -DZLIB"
+
+if test "${ace_with_zlib}" != no; then
+  ACE_ZLIB_LIBS="-lz"
+  AC_SUBST(ACE_ZLIB_CPPFLAGS)
+  AC_SUBST(ACE_ZLIB_LDFLAGS)
+  AC_SUBST(ACE_ZLIB_LIBS)
+fi
+AM_CONDITIONAL([BUILD_ZLIB], test "${ace_with_zlib}" != no)
+])
+
+
+# ACE_PATH_ZZIP
+#---------------------------------------------------------------------------
+# Find zziplib Libraries, flags, etc.
+AC_DEFUN([ACE_PATH_ZZIP],
+[AC_REQUIRE([ACE_PATH_ZLIB])
+
+ACE_ZZIP_CPPFLAGS=""
+ACE_ZZIP_LDFLAGS=""
+
+dnl TODO: default to false, at least until we add a check to see if
+dnl the zlib library is usable.
+AC_ARG_WITH([zzip],
+  AS_HELP_STRING([--with-zzip@<:@=DIR@:>@],
+		 [root directory of zzip installation]),
+  [
+  ace_with_zzip="${withval}"
+  if test "${ace_with_zzip}" != yes; then
+       ace_zzip_include="${ace_with_zzip}/include"
+       ace_zzip_libdir="${ace_with_zzip}/lib"
+  fi
+  ],[ace_with_zzip=no])
+
+dnl TODO: let's wait and see before adding options to specify header
+dnl and library location separately.
+dnl
+dnl AC_ARG_WITH([zzip_include],
+dnl   AS_HELP_STRING([--with-zzip-include=DIR],
+dnl 		 [specify exact include dir for zzip headers]),
+dnl   [ace_zzip_include="$withval"])
+dnl 
+dnl AC_ARG_WITH([zzip_libdir],
+dnl   AS_HELP_STRING([--with-zzip-libdir=DIR],
+dnl 		 [specify exact include dir for zzip libraries]),
+dnl   [ace_zzip_libdir="$withval"])
+
+if test "${ace_zzip_include}"; then
+  ACE_ZZIP_CPPFLAGS="-I$ace_zzip_include"
+fi
+
+if test "${ace_zzip_libdir}"; then
+  ACE_ZZIP_LDFLAGS="-L$ace_zzip_libdir"
+fi
+
+ACE_ZZIP_CPPFLAGS="${ACE_ZZIP_CPPFLAGS} -DUSE_ZZIP"
+
+if test "${ace_with_zzip}" != no; then
+  ACE_ZZIP_LIBS="-lzzip"
+  AC_SUBST(ACE_ZZIP_CPPFLAGS)
+  AC_SUBST(ACE_ZZIP_LDFLAGS)
+  AC_SUBST(ACE_ZZIP_LIBS)
+fi
+AM_CONDITIONAL([BUILD_ZZIP], test "${ace_with_zzip}" != no)
+])
+
+
 # ACE_ENABLE_FL_REACTOR
 #---------------------------------------------------------------------------
 AC_DEFUN([ACE_ENABLE_FL_REACTOR],