luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modified the configure script to allow zlib compression to be 

disabled from the configure command line.  Corrected an error with
the non-zlib-enabled compile.
This commit is contained in:
Tim Edwards 2022-05-12 09:27:32 -04:00
parent 93c96c23a1
commit b643f44659
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.302 8.3.303

1
calma/calmaInt.h
View File

@ -162,6 +162,7 @@ typedef enum { LABEL_TYPE_NONE, LABEL_TYPE_TEXT, LABEL_TYPE_PORT, LABEL_TYPE_CEL
#define REWIND rewind #define REWIND rewind
#define FILETYPE FILE * #define FILETYPE FILE *
#define OFFTYPE off_t #define OFFTYPE off_t
#define PaZOpen PaOpen
#endif #endif
/* Globals for Calma reading */ /* Globals for Calma reading */

12
scripts/configure vendored
View File

@ -746,6 +746,7 @@ ac_subst_files=''
ac_user_opts=' ac_user_opts='
enable_option_checking enable_option_checking
with_gnu_ld with_gnu_ld
enable_compression
with_x with_x
with_distdir with_distdir
with_interpreter with_interpreter
@ -1416,6 +1417,7 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-compression disable file compression
--enable-memdebug enable memory debugging --enable-memdebug enable memory debugging
--enable-modular embed ext2sim and ext2spice packages --enable-modular embed ext2sim and ext2spice packages
--disable-locking disable file locking --disable-locking disable file locking
@ -5033,6 +5035,15 @@ $as_echo "#define HAVE___VA_COPY 1" >>confdefs.h
fi fi
# 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 "$as_me:${as_lineno-$LINENO}: checking for gzopen in -lz" >&5
$as_echo_n "checking for gzopen in -lz... " >&6; } $as_echo_n "checking for gzopen in -lz... " >&6; }
if ${ac_cv_lib_z_gzopen+:} false; then : if ${ac_cv_lib_z_gzopen+:} false; then :
@ -5075,6 +5086,7 @@ $as_echo "#define HAVE_ZLIB 1" >>confdefs.h
fi fi
fi

8
scripts/configure.in
View File

@ -178,8 +178,16 @@ then
AC_DEFINE(HAVE___VA_COPY, 1, [Define if we have __va_copy]) AC_DEFINE(HAVE___VA_COPY, 1, [Define if we have __va_copy])
fi 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 dnl Check for zlib
if test "x$enable_compression" = "xyes" ; then
AC_CHECK_LIB([z],[gzopen],[AC_DEFINE([HAVE_ZLIB],[1],["zlib compression"])]) AC_CHECK_LIB([z],[gzopen],[AC_DEFINE([HAVE_ZLIB],[1],["zlib compression"])])
fi
dnl Check for some C99 functions dnl Check for some C99 functions