Changeset bfef00c in mod_gnutls for configure.ac

Timestamp:

Feb 2, 2020, 7:19:25 AM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, master, proxy-ticket

Children:

c4a6889

Parents:

1a6eeae

Message:

Show the right GnuTLS version when using ./configure --with-gnutls-dev

Previously the version information was always loaded from the
system-wide installation, now the pkg-config file from the GnuTLS git
tree is used if enabled.

File:

• configure.ac (modified) (2 diffs)

configure.ac

@@ -30 +30 @@
     AC_MSG_ERROR([*** Apache version $AP_VERSION not found!])
 )
+
+PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.6.3])
+LIBGNUTLS_VERSION=`pkg-config --modversion gnutls`
 
 dnl Maybe use the binaries for tests, too?
@@ -42 +45 @@
                         LIBGNUTLS_CFLAGS="-I${with_gnutls_dev}/lib/includes"
                         LIBGNUTLS_LIBS="-lgnutls -L${with_gnutls_dev}/lib/.libs -R${with_gnutls_dev}/lib/.libs"
+                        LIBGNUTLS_VERSION=`PKG_CONFIG_PATH="${with_gnutls_dev}/lib" pkg-config --modversion gnutls`
                 ],
                 [AC_MSG_ERROR([--with-gnutls-dev=DIR requires a directory!])])
         ], [])
-
-PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.6.3])
-
-LIBGNUTLS_VERSION=`pkg-config --modversion gnutls`
 
 AC_ARG_ENABLE(vpath-install,