diff options
| -rwxr-xr-x | configure | 15 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | meson.build | 8 |
3 files changed, 0 insertions, 32 deletions
diff --git a/configure b/configure index 2e518c8007d..963fbbcf1e7 100755 --- a/configure +++ b/configure @@ -15162,21 +15162,6 @@ _ACEOF fi -if test "$with_zlib" = yes; then - # Check that <zlib.h> defines z_streamp (versions before about 1.0.4 - # did not). While we could work around the lack of z_streamp, it - # seems unwise to encourage people to use such old zlib versions... - ac_fn_c_check_type "$LINENO" "z_streamp" "ac_cv_type_z_streamp" "#include <zlib.h> -" -if test "x$ac_cv_type_z_streamp" = xyes; then : - -else - as_fn_error $? "zlib version is too old -Use --without-zlib to disable zlib support." "$LINENO" 5 -fi - -fi - case $host_cpu in x86_64) # On x86_64, check if we can compile a popcntq instruction diff --git a/configure.ac b/configure.ac index 3ebe1a796dc..5153b8b3fdc 100644 --- a/configure.ac +++ b/configure.ac @@ -1678,15 +1678,6 @@ AC_CHECK_TYPES([struct option], [], [], #include <getopt.h> #endif]) -if test "$with_zlib" = yes; then - # Check that <zlib.h> defines z_streamp (versions before about 1.0.4 - # did not). While we could work around the lack of z_streamp, it - # seems unwise to encourage people to use such old zlib versions... - AC_CHECK_TYPE(z_streamp, [], [AC_MSG_ERROR([zlib version is too old -Use --without-zlib to disable zlib support.])], - [#include <zlib.h>]) -fi - case $host_cpu in x86_64) # On x86_64, check if we can compile a popcntq instruction diff --git a/meson.build b/meson.build index 04ea3488522..0a11efc97a1 100644 --- a/meson.build +++ b/meson.build @@ -1384,14 +1384,6 @@ if not zlibopt.disabled() args: test_c_args, include_directories: postgres_inc, dependencies: [zlib_t], required: zlibopt) warning('zlib header not found') - elif not cc.has_type('z_streamp', - dependencies: [zlib_t], prefix: '#include <zlib.h>', - args: test_c_args, include_directories: postgres_inc) - if zlibopt.enabled() - error('zlib version is too old') - else - warning('zlib version is too old') - endif else zlib = zlib_t endif |