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

1 files changed, 112 insertions, 4 deletions

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],