autotools: add nettle library detection via pkg-config (for GnuTLS)

Also:
- fix to restore full state when gnutls canary function is not found.
- fix indentation.

Closes #19703
This commit is contained in:
Viktor Szakats 2025-11-26 02:03:29 +01:00
parent 0d2bb9c7c6
commit 2acdc4f549
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
2 changed files with 62 additions and 15 deletions

View file

@ -409,8 +409,7 @@ jobs:
install_packages: libp11-kit-dev
install_steps: skipall
PKG_CONFIG_PATH: /home/runner/nettle/build/lib64/pkgconfig:/home/runner/gnutls/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/ngtcp2/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig
LDFLAGS: -Wl,-rpath,/home/runner/gnutls/build/lib -Wl,-rpath,/home/runner/nettle/build/lib64 -L/home/runner/nettle/build/lib64 -Wl,-rpath,/home/runner/ngtcp2/build/lib
CPPFLAGS: -I/home/runner/nettle/build/include
LDFLAGS: -Wl,-rpath,/home/runner/gnutls/build/lib -Wl,-rpath,/home/runner/nettle/build/lib64 -Wl,-rpath,/home/runner/ngtcp2/build/lib
configure: >-
--with-gnutls=/home/runner/gnutls/build --with-ngtcp2 --enable-ssls-export
@ -640,7 +639,6 @@ jobs:
- name: 'configure'
env:
CPPFLAGS: '${{ matrix.build.CPPFLAGS }}'
LDFLAGS: '${{ matrix.build.LDFLAGS }}'
MATRIX_CONFIGURE: '${{ matrix.build.configure }}'
MATRIX_GENERATE: '${{ matrix.build.generate }}'