re-added check for libbz2 and libz

GNUmakefile.in

@@ -27,12 +27,12 @@ firstTarget: all
 CXX					= @CXX@
 CXXFLAGS			= @CXXFLAGS@ @CPPFLAGS@ @PTHREAD_CFLAGS@ @CIFPP_CFLAGS@
 LDFLAGS				= @LDFLAGS@ @PTHREAD_CFLAGS@
-LIBS				= @LIBS@ \
-					  @CIFPP_LIBS@ \
+LIBS				= @CIFPP_LIBS@ \
 					  @BOOST_IOSTREAMS_LIB@ \
 					  @BOOST_PROGRAM_OPTIONS_LIB@ \
 					  @BOOST_DATE_TIME_LIB@ \
-					  @BOOST_REGEX_LIB@
+					  @BOOST_REGEX_LIB@ \
+					  @LIBS@
 
 prefix				= $(DESTDIR)@prefix@
 exec_prefix			= @exec_prefix@

configure

@@ -625,6 +625,10 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+LIBBZ2_LDFLAGS
+LIBBZ2_CPPFLAGS
+LIBZ_LDFLAGS
+LIBZ_CPPFLAGS
 CIFPP_LDFLAGS
 CIFPP_CPPFLAGS
 AX_PACKAGE_REQUIRES_PRIVATE
@@ -749,7 +753,11 @@ CXXCPP
 CIFPP_CFLAGS
 CIFPP_LIBS
 CIFPP_CPPFLAGS
-CIFPP_LDFLAGS'
+CIFPP_LDFLAGS
+LIBZ_CPPFLAGS
+LIBZ_LDFLAGS
+LIBBZ2_CPPFLAGS
+LIBBZ2_LDFLAGS'
 
 
 # Initialize some variables set by options.
@@ -1436,6 +1444,14 @@ Some influential environment variables:
               C preprocessor flags for CIFPP headers
   CIFPP_LDFLAGS
               linker flags for CIFPP libraries
+  LIBZ_CPPFLAGS
+              C preprocessor flags for LIBZ headers
+  LIBZ_LDFLAGS
+              linker flags for LIBZ libraries
+  LIBBZ2_CPPFLAGS
+              C preprocessor flags for LIBBZ2 headers
+  LIBBZ2_LDFLAGS
+              linker flags for LIBBZ2 libraries
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -7514,6 +7530,172 @@ fi
 
 fi
 
+
+
+
+
+  if ${ax_cv_have_LIBZ+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_CPPFLAGS="$CPPFLAGS"
+     save_LDFLAGS="$LDFLAGS"
+     save_LIBS="$LIBS"
+
+     if test "x$LIBZ_CPPFLAGS" != "x"; then :
+  CPPFLAGS="$CPPFLAGS $LIBZ_CPPFLAGS"
+fi
+
+     if test "x$LIBZ_LDFLAGS" != "x"; then :
+  LDFLAGS="$LDFLAGS $LIBZ_LDFLAGS"
+fi
+
+     ac_fn_cxx_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = xyes; then :
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5
+$as_echo_n "checking for main in -lz... " >&6; }
+if ${ac_cv_lib_z_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_z_main=yes
+else
+  ac_cv_lib_z_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_main" >&5
+$as_echo "$ac_cv_lib_z_main" >&6; }
+if test "x$ac_cv_lib_z_main" = xyes; then :
+  ax_cv_have_LIBZ=yes
+else
+  ax_cv_have_LIBZ=no
+fi
+
+
+else
+  ax_cv_have_LIBZ=no
+fi
+
+
+
+     CPPFLAGS="$save_CPPFLAGS"
+     LDFLAGS="$save_LDFLAGS"
+     LIBS="$save_LIBS"
+
+fi
+
+
+  if test "$ax_cv_have_LIBZ" = "yes"; then :
+
+$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
+
+     LIBS="$LIBS -lz"
+else
+  as_fn_error $? "libz not found - compressed files not supported" "$LINENO" 5
+fi
+
+
+
+
+
+  if ${ax_cv_have_LIBBZ2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_CPPFLAGS="$CPPFLAGS"
+     save_LDFLAGS="$LDFLAGS"
+     save_LIBS="$LIBS"
+
+     if test "x$LIBBZ2_CPPFLAGS" != "x"; then :
+  CPPFLAGS="$CPPFLAGS $LIBBZ2_CPPFLAGS"
+fi
+
+     if test "x$LIBBZ2_LDFLAGS" != "x"; then :
+  LDFLAGS="$LDFLAGS $LIBBZ2_LDFLAGS"
+fi
+
+     ac_fn_cxx_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_bzlib_h" = xyes; then :
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lbz2" >&5
+$as_echo_n "checking for main in -lbz2... " >&6; }
+if ${ac_cv_lib_bz2_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbz2  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_bz2_main=yes
+else
+  ac_cv_lib_bz2_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_main" >&5
+$as_echo "$ac_cv_lib_bz2_main" >&6; }
+if test "x$ac_cv_lib_bz2_main" = xyes; then :
+  ax_cv_have_LIBBZ2=yes
+else
+  ax_cv_have_LIBBZ2=no
+fi
+
+
+else
+  ax_cv_have_LIBBZ2=no
+fi
+
+
+
+     CPPFLAGS="$save_CPPFLAGS"
+     LDFLAGS="$save_LDFLAGS"
+     LIBS="$save_LIBS"
+
+fi
+
+
+  if test "$ax_cv_have_LIBBZ2" = "yes"; then :
+
+$as_echo "#define HAVE_LIBBZ2 1" >>confdefs.h
+
+     LIBS="$LIBS -lbz2"
+else
+  as_fn_error $? "libbz2 not found - compressed files not supported" "$LINENO" 5
+fi
+
+
+LIBS=$LIBS
+
+
 ac_config_files="$ac_config_files GNUmakefile"
 
 cat >confcache <<\_ACEOF

configure.ac

@@ -135,5 +135,15 @@ pkg-config.])])
 	fi
 ])
 
+dnl These are still needed outside the Debian environment
+AX_CHECK_LIBRARY([LIBZ], [zlib.h], [z],
+				 [ LIBS="$LIBS -lz" ],
+                 [AC_MSG_ERROR([libz not found - compressed files not supported])])
+AX_CHECK_LIBRARY([LIBBZ2], [bzlib.h], [bz2],
+				 [ LIBS="$LIBS -lbz2"],
+                 [AC_MSG_ERROR([libbz2 not found - compressed files not supported])])
+
+AC_SUBST([LIBS], [$LIBS])
+
 dnl Process Makefile.in to create Makefile
 AC_OUTPUT([GNUmakefile])

src/config.hpp.in

@@ -24,6 +24,12 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if LIBBZ2 is found */
+#undef HAVE_LIBBZ2
+
+/* Define to 1 if LIBZ is found */
+#undef HAVE_LIBZ
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H