Skip to content

Commit eeb4eee

Browse files
committed
Remove configure check for z_streamp
This is surely obsolete. zlib version 1.0.4, which includes z_streamp, was released 1996-07-24. When this check was put in in 2001 (19c97b8), the commit was already labeling that release as ancient. Reviewed-by: Tristan Partin <tristan@neon.tech> Discussion: https://www.postgresql.org/message-id/flat/33462926-bb1e-7cc9-8d92-d86318e8ed1d%40eisentraut.org
1 parent 67c0ef9 commit eeb4eee

File tree

3 files changed

+0
-32
lines changed

3 files changed

+0
-32
lines changed

configure

-15
Original file line numberDiff line numberDiff line change
@@ -15162,21 +15162,6 @@ _ACEOF
1516215162
fi
1516315163

1516415164

15165-
if test "$with_zlib" = yes; then
15166-
# Check that <zlib.h> defines z_streamp (versions before about 1.0.4
15167-
# did not). While we could work around the lack of z_streamp, it
15168-
# seems unwise to encourage people to use such old zlib versions...
15169-
ac_fn_c_check_type "$LINENO" "z_streamp" "ac_cv_type_z_streamp" "#include <zlib.h>
15170-
"
15171-
if test "x$ac_cv_type_z_streamp" = xyes; then :
15172-
15173-
else
15174-
as_fn_error $? "zlib version is too old
15175-
Use --without-zlib to disable zlib support." "$LINENO" 5
15176-
fi
15177-
15178-
fi
15179-
1518015165
case $host_cpu in
1518115166
x86_64)
1518215167
# On x86_64, check if we can compile a popcntq instruction

configure.ac

-9
Original file line numberDiff line numberDiff line change
@@ -1678,15 +1678,6 @@ AC_CHECK_TYPES([struct option], [], [],
16781678
#include <getopt.h>
16791679
#endif])
16801680

1681-
if test "$with_zlib" = yes; then
1682-
# Check that <zlib.h> defines z_streamp (versions before about 1.0.4
1683-
# did not). While we could work around the lack of z_streamp, it
1684-
# seems unwise to encourage people to use such old zlib versions...
1685-
AC_CHECK_TYPE(z_streamp, [], [AC_MSG_ERROR([zlib version is too old
1686-
Use --without-zlib to disable zlib support.])],
1687-
[#include <zlib.h>])
1688-
fi
1689-
16901681
case $host_cpu in
16911682
x86_64)
16921683
# On x86_64, check if we can compile a popcntq instruction

meson.build

-8
Original file line numberDiff line numberDiff line change
@@ -1384,14 +1384,6 @@ if not zlibopt.disabled()
13841384
args: test_c_args, include_directories: postgres_inc,
13851385
dependencies: [zlib_t], required: zlibopt)
13861386
warning('zlib header not found')
1387-
elif not cc.has_type('z_streamp',
1388-
dependencies: [zlib_t], prefix: '#include <zlib.h>',
1389-
args: test_c_args, include_directories: postgres_inc)
1390-
if zlibopt.enabled()
1391-
error('zlib version is too old')
1392-
else
1393-
warning('zlib version is too old')
1394-
endif
13951387
else
13961388
zlib = zlib_t
13971389
endif

0 commit comments

Comments
 (0)