fix makefile for new configure script

GNUmakefile.in

@@ -28,8 +28,8 @@
 firstTarget: all
 
 CXX					= @CXX@
-CXXFLAGS			= @CXXFLAGS@ @BOOST_CPPFLAGS@ @LIBBZ2_CPPFLAGS@
-LDFLAGS				= @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@ @LIBBZ2_LDFLAGS@
+CXXFLAGS			= @CXXFLAGS@ @BOOST_CPPFLAGS@
+LDFLAGS				= @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
 LIBS				= @LIBS@ \
 					  @BOOST_IOSTREAMS_LIB@ \
 					  @BOOST_DATE_TIME_LIB@

configure

@@ -635,10 +635,6 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-LIBBZ2_LDFLAGS
-LIBBZ2_CPPFLAGS
-LIBZ_LDFLAGS
-LIBZ_CPPFLAGS
 BOOST_DATE_TIME_LIB
 BOOST_IOSTREAMS_LIB
 BOOST_LDFLAGS
@@ -770,11 +766,7 @@ CC
 CFLAGS
 LT_SYS_LIBRARY_PATH
 DEBUG
-CCP4
-LIBZ_CPPFLAGS
-LIBZ_LDFLAGS
-LIBBZ2_CPPFLAGS
-LIBBZ2_LDFLAGS'
+CCP4'
 
 
 # Initialize some variables set by options.
@@ -1452,14 +1444,6 @@ Some influential environment variables:
               User-defined run-time library search path.
   DEBUG       Build a debug version of the library
   CCP4        The location where CCP4 is installed
-  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.
@@ -17119,169 +17103,6 @@ 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
-
-
-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
-
-
-else
-  as_fn_error $? "libbz2 not found - compressed files not supported" "$LINENO" 5
-fi
-
-
 ac_config_files="$ac_config_files GNUmakefile libcifpp.pc"
 
 cat >confcache <<\_ACEOF

include/cif++/Config.hpp.in

@@ -21,12 +21,6 @@
 /* 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