build: ldflags conversion: libgcrypt.

Analogous to the previous patch.

diff --git a/Makefile.in b/Makefile.in
index a7abc2d3169b50c56b444846a3c77409b5607b86..2643ee84950a844edb31181df546759fc0a90bad 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,6 +37,7 @@ readline_ldflags := @readline_ldflags@
 samplerate_ldflags := @samplerate_ldflags@
 osl_ldflags := @osl_ldflags@
 openssl_ldflags := @openssl_ldflags@
+gcrypt_ldflags := @gcrypt_ldflags@
 
 build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@@ -274,7 +275,13 @@ para_recv para_afh para_play para_server: LDFLAGS += $(id3tag_ldflags)
 para_write para_play para_audiod: LDFLAGS += $(ao_ldflags)
 para_client para_audioc para_play : LDFLAGS += $(readline_ldflags)
 para_server: LDFLAGS += $(osl_ldflags)
-para_server para_client para_audiod: LDFLAGS += $(openssl_ldflags)
+
+para_server \
+para_client \
+para_audiod \
+:LDFLAGS += \
+       $(openssl_ldflags) \
+       $(gcrypt_ldflags)
 
 para_audiod \
 para_filter \

diff --git a/configure.ac b/configure.ac
index a1919ca9e94223fbfc8d08837ca4f3db53ec0e1b..61365e632a5ad8cd73c1b45917f76b662064983c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -393,10 +393,8 @@ if test "$check_gcrypt" = "yes"; then
        if test "$have_gcrypt" = "yes"; then
                AC_DEFINE(HAVE_GCRYPT, 1, [define to 1 to turn on gcrypt support])
                AC_SUBST(gcrypt_cppflags)
-               gcrypt_libs="$gcrypt_libs -lgcrypt"
-               server_ldflags="$server_ldflags $gcrypt_libs"
-               client_ldflags="$client_ldflags $gcrypt_libs"
-               audiod_ldflags="$audiod_ldflags $gcrypt_libs"
+               gcrypt_ldflags="$gcrypt_libs -lgcrypt"
+               AC_SUBST(gcrypt_ldflags)
 
                server_errlist_objs="$server_errlist_objs gcrypt"
                client_errlist_objs="$client_errlist_objs gcrypt"