upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix detection of libz on windows compile with static option.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2022-06-29 11:41:20 +02:00
parent e7badb9428
commit 203f606c38
3 changed files with 83 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
configure vendored
View file

@ -19968,7 +19968,46 @@ if test x_$enable_static_exe = x_yes; then
else else
LIBS="$LIBS -lgdi32" LIBS="$LIBS -lgdi32"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
$as_echo_n "checking for compress in -lz... " >&6; }
if ${ac_cv_lib_z_compress+:} 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. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char compress ();
int
main ()
{
return compress ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_z_compress=yes
else
ac_cv_lib_z_compress=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_compress" >&5
$as_echo "$ac_cv_lib_z_compress" >&6; }
if test "x$ac_cv_lib_z_compress" = xyes; then :
LIBS="$LIBS -lz" LIBS="$LIBS -lz"
fi
LIBS="$LIBS -l:libssp.a" LIBS="$LIBS -l:libssp.a"
fi fi
fi fi
@ -19988,7 +20027,46 @@ if test x_$enable_fully_static = x_yes; then
else else
LIBS="$LIBS -lgdi32" LIBS="$LIBS -lgdi32"
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
$as_echo_n "checking for compress in -lz... " >&6; }
if ${ac_cv_lib_z_compress+:} 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. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char compress ();
int
main ()
{
return compress ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_z_compress=yes
else
ac_cv_lib_z_compress=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_compress" >&5
$as_echo "$ac_cv_lib_z_compress" >&6; }
if test "x$ac_cv_lib_z_compress" = xyes; then :
LIBS="$LIBS -lz" LIBS="$LIBS -lz"
fi
LIBS="$LIBS -l:libssp.a" LIBS="$LIBS -l:libssp.a"
fi fi
fi fi

4
configure.ac
View file

@ -1500,7 +1500,7 @@ if test x_$enable_static_exe = x_yes; then
else else
LIBS="$LIBS -lgdi32" LIBS="$LIBS -lgdi32"
fi fi
LIBS="$LIBS -lz" AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ])
LIBS="$LIBS -l:libssp.a" LIBS="$LIBS -l:libssp.a"
fi fi
fi fi
@ -1517,7 +1517,7 @@ if test x_$enable_fully_static = x_yes; then
else else
LIBS="$LIBS -lgdi32" LIBS="$LIBS -lgdi32"
fi fi
LIBS="$LIBS -lz" AC_CHECK_LIB([z], [compress], [ LIBS="$LIBS -lz" ])
LIBS="$LIBS -l:libssp.a" LIBS="$LIBS -l:libssp.a"
fi fi
fi fi

1
doc/Changelog
View file

@ -1,5 +1,6 @@
29 June 2022: Wouter 29 June 2022: Wouter
- iana portlist update. - iana portlist update.
- Fix detection of libz on windows compile with static option.
29 June 2022: George 29 June 2022: George
- Add debug option to the mini_tdir.sh test code. - Add debug option to the mini_tdir.sh test code.