Skip to content

Commit

Permalink
autotools: use comma separator in Requires.private of libssh2.pc
Browse files Browse the repository at this point in the history
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
  • Loading branch information
vszakats committed Jul 14, 2023
1 parent ef53806 commit 7f83de1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions acinclude.m4
Expand Up @@ -778,7 +778,7 @@ m4_case([$1],
[openssl], [
LIBSSH2_LIB_HAVE_LINKFLAGS([ssl], [crypto], [#include <openssl/ssl.h>], [
AC_DEFINE(LIBSSH2_OPENSSL, 1, [Use $1])
LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }libssl libcrypto"
LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+,}libssl,libcrypto"
found_crypto="$1"
found_crypto_str="OpenSSL"
])
Expand All @@ -792,15 +792,15 @@ m4_case([$1],
fi
LIBSSH2_LIB_HAVE_LINKFLAGS([wolfssl], [], [#include <wolfssl/options.h>], [
AC_DEFINE(LIBSSH2_WOLFSSL, 1, [Use $1])
LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }wolfssl"
LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+,}wolfssl"
found_crypto="$1"
])
],
[libgcrypt], [
LIBSSH2_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>], [
AC_DEFINE(LIBSSH2_LIBGCRYPT, 1, [Use $1])
LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }libgcrypt"
LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+,}libgcrypt"
found_crypto="$1"
])
],
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -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
Expand Down

0 comments on commit 7f83de1

Please sign in to comment.