2
1
mirror of https://github.com/qpdf/qpdf.git synced 2024-05-29 16:30:53 +00:00

Search for gnutls if not found with pkg-config

This commit is contained in:
Jay Berkenbilt 2019-11-09 21:23:37 -05:00
parent 021d71454a
commit f60b4ead18
3 changed files with 73 additions and 1 deletions

View File

@ -1,4 +1,4 @@
50057c548d9af98d7b070a8a7716352a777b1f52e7ba44719f94ede65fc27cee configure.ac 766d1c21521da343b30d5518198e211cad1a049150ba15afb8dcaeaa2664f470 configure.ac
d3f9ee6f6f0846888d9a10fd3dad2e4b1258be84205426cf04d7cef02d61dad7 aclocal.m4 d3f9ee6f6f0846888d9a10fd3dad2e4b1258be84205426cf04d7cef02d61dad7 aclocal.m4
2e4cd495837be1b8454a4d8aef541b000988634be89d9c05a9cf5de67dffef5e libqpdf/qpdf/qpdf-config.h.in 2e4cd495837be1b8454a4d8aef541b000988634be89d9c05a9cf5de67dffef5e libqpdf/qpdf/qpdf-config.h.in
5297971a0ef90bcd5563eb3f7127a032bb76d3ae2af7258bf13479caf8983a60 m4/ax_cxx_compile_stdcxx.m4 5297971a0ef90bcd5563eb3f7127a032bb76d3ae2af7258bf13479caf8983a60 m4/ax_cxx_compile_stdcxx.m4

68
configure vendored
View File

@ -17717,6 +17717,74 @@ else
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
GNUTLS_FOUND=1 GNUTLS_FOUND=1
fi fi
if test "$GNUTLS_FOUND" = "0"; then
ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then :
GNUTLS_FOUND=1
else
GNUTLS_FOUND=0
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gnutls_hash_init" >&5
$as_echo_n "checking for library containing gnutls_hash_init... " >&6; }
if ${ac_cv_search_gnutls_hash_init+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_func_search_save_LIBS=$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 gnutls_hash_init ();
int
main ()
{
return gnutls_hash_init ();
;
return 0;
}
_ACEOF
for ac_lib in '' gnutls; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_gnutls_hash_init=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if ${ac_cv_search_gnutls_hash_init+:} false; then :
break
fi
done
if ${ac_cv_search_gnutls_hash_init+:} false; then :
else
ac_cv_search_gnutls_hash_init=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gnutls_hash_init" >&5
$as_echo "$ac_cv_search_gnutls_hash_init" >&6; }
ac_res=$ac_cv_search_gnutls_hash_init
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
GNUTLS_FOUND=1
else
GNUTLS_FOUND=0
fi
fi
IMPLICIT_GNUTLS=0 IMPLICIT_GNUTLS=0
USE_CRYPTO_GNUTLS=0 USE_CRYPTO_GNUTLS=0

View File

@ -519,6 +519,10 @@ dnl gnutls is available. If the gnutls provider is explicitly
dnl disabled, do not link with gnutls even if present. dnl disabled, do not link with gnutls even if present.
PKG_CHECK_MODULES([pc_gnutls], [gnutls], [GNUTLS_FOUND=1], [GNUTLS_FOUND=0]) PKG_CHECK_MODULES([pc_gnutls], [gnutls], [GNUTLS_FOUND=1], [GNUTLS_FOUND=0])
if test "$GNUTLS_FOUND" = "0"; then
AC_CHECK_HEADER(gnutls/gnutls.h,[GNUTLS_FOUND=1],[GNUTLS_FOUND=0])
AC_SEARCH_LIBS(gnutls_hash_init,gnutls,[GNUTLS_FOUND=1],[GNUTLS_FOUND=0])
fi
IMPLICIT_GNUTLS=0 IMPLICIT_GNUTLS=0
USE_CRYPTO_GNUTLS=0 USE_CRYPTO_GNUTLS=0