From 7f83de14a022f60c287361293f9ae513c9443d9c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 14 Jul 2023 18:40:57 +0000 Subject: [PATCH] autotools: use comma separator in `Requires.private` of `libssh2.pc` In `Requires*:`, the documented name separator is comma. We already used it in the CMake-generated `libssh2.pc`. Adjust the autotools-generated one to use it too, instead of spaces. Ref: https://linux.die.net/man/1/pkg-config Ref: https://gitlab.freedesktop.org/pkg-config/pkg-config/-/blob/d97db4fae4c1cd099b506970b285dc2afd818ea2/pkg-config.1 Closes #1124 --- acinclude.m4 | 6 +++--- configure.ac | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 4fef112a..62dbb6aa 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -778,7 +778,7 @@ m4_case([$1], [openssl], [ LIBSSH2_LIB_HAVE_LINKFLAGS([ssl], [crypto], [#include ], [ AC_DEFINE(LIBSSH2_OPENSSL, 1, [Use $1]) - LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }libssl libcrypto" + LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+,}libssl,libcrypto" found_crypto="$1" found_crypto_str="OpenSSL" ]) @@ -792,7 +792,7 @@ m4_case([$1], fi LIBSSH2_LIB_HAVE_LINKFLAGS([wolfssl], [], [#include ], [ AC_DEFINE(LIBSSH2_WOLFSSL, 1, [Use $1]) - LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }wolfssl" + LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+,}wolfssl" found_crypto="$1" ]) ], @@ -800,7 +800,7 @@ m4_case([$1], [libgcrypt], [ LIBSSH2_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include ], [ AC_DEFINE(LIBSSH2_LIBGCRYPT, 1, [Use $1]) - LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }libgcrypt" + LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+,}libgcrypt" found_crypto="$1" ]) ], diff --git a/configure.ac b/configure.ac index b5a5791e..c69be8c1 100644 --- a/configure.ac +++ b/configure.ac @@ -146,7 +146,7 @@ Try --with-libz-prefix=PATH if you know that you have it." fi else AC_DEFINE(LIBSSH2_HAVE_ZLIB, 1, [Compile in zlib support]) - LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }zlib" + LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+,}zlib" found_libz="yes" fi fi