diff --git a/VERSION b/VERSION index 6bd47844..b1993e83 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.3.302 +8.3.303 diff --git a/calma/calmaInt.h b/calma/calmaInt.h index d3be62ef..c8a27e67 100644 --- a/calma/calmaInt.h +++ b/calma/calmaInt.h @@ -162,6 +162,7 @@ typedef enum { LABEL_TYPE_NONE, LABEL_TYPE_TEXT, LABEL_TYPE_PORT, LABEL_TYPE_CEL #define REWIND rewind #define FILETYPE FILE * #define OFFTYPE off_t + #define PaZOpen PaOpen #endif /* Globals for Calma reading */ diff --git a/scripts/configure b/scripts/configure index 7dcf9d4b..fed71267 100755 --- a/scripts/configure +++ b/scripts/configure @@ -746,6 +746,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking with_gnu_ld +enable_compression with_x with_distdir with_interpreter @@ -1416,6 +1417,7 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-compression disable file compression --enable-memdebug enable memory debugging --enable-modular embed ext2sim and ext2spice packages --disable-locking disable file locking @@ -5033,7 +5035,16 @@ $as_echo "#define HAVE___VA_COPY 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5 +# Check whether --enable-compression was given. +if test "${enable_compression+set}" = set; then : + enableval=$enable_compression; +else + enable_compression=yes +fi + + +if test "x$enable_compression" = "xyes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5 $as_echo_n "checking for gzopen in -lz... " >&6; } if ${ac_cv_lib_z_gzopen+:} false; then : $as_echo_n "(cached) " >&6 @@ -5075,6 +5086,7 @@ $as_echo "#define HAVE_ZLIB 1" >>confdefs.h fi +fi diff --git a/scripts/configure.in b/scripts/configure.in index 837a7752..97dbb01d 100644 --- a/scripts/configure.in +++ b/scripts/configure.in @@ -178,8 +178,16 @@ then AC_DEFINE(HAVE___VA_COPY, 1, [Define if we have __va_copy]) fi +dnl Allow file compression (zlib) to be disabled +AC_ARG_ENABLE(compression, +[ --disable-compression disable file compression], +[], +[enable_compression=yes]) + dnl Check for zlib -AC_CHECK_LIB([z],[gzopen],[AC_DEFINE([HAVE_ZLIB],[1],["zlib compression"])]) +if test "x$enable_compression" = "xyes" ; then + AC_CHECK_LIB([z],[gzopen],[AC_DEFINE([HAVE_ZLIB],[1],["zlib compression"])]) +fi dnl Check for some C99 functions