From ad35733037a093e0726b210c432c5701823b8dc1 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Fri, 13 Sep 2013 06:35:04 +0000 Subject: [PATCH] build: ldflags conversion: libssl. Straight-forward transformation. --- Makefile.in | 2 ++ configure.ac | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1e158ec9..a7abc2d3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,6 +36,7 @@ ao_ldflags := @ao_ldflags@ readline_ldflags := @readline_ldflags@ samplerate_ldflags := @samplerate_ldflags@ osl_ldflags := @osl_ldflags@ +openssl_ldflags := @openssl_ldflags@ build_date := $(shell date) uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS") @@ -273,6 +274,7 @@ 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_audiod \ para_filter \ diff --git a/configure.ac b/configure.ac index 48b75ec5..a1919ca9 100644 --- a/configure.ac +++ b/configure.ac @@ -353,10 +353,8 @@ if test "$check_openssl" = "yes"; then if test "$have_openssl" = "yes"; then AC_DEFINE(HAVE_OPENSSL, 1, [define to 1 to turn on openssl support]) AC_SUBST(openssl_cppflags) - openssl_libs="$openssl_libs -lssl -lcrypto" - server_ldflags="$server_ldflags $openssl_libs" - client_ldflags="$client_ldflags $openssl_libs" - audiod_ldflags="$audiod_ldflags $openssl_libs" + openssl_ldflags="$openssl_libs -lssl -lcrypto" + AC_SUBST(openssl_ldflags) server_errlist_objs="$server_errlist_objs crypt" client_errlist_objs="$client_errlist_objs crypt" -- 2.39.2