From: Dave Hart <hart@ntp.org>
Date: Mon, 9 Apr 2012 16:19:04 +0000 (+0000)
Subject: Put openssl -L flags from pkg-config in LDADD_NTP as comment indicates,
X-Git-Tag: NTP_4_2_7P271~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90c8c929cc798f692ac59b7e5511ec9863bd1c93;p=thirdparty%2Fntp.git

Put openssl -L flags from pkg-config in LDADD_NTP as comment indicates,
  rather than in LDFLAGS_NTP.

bk: 4f830bf8_PYpruondtcBHtwoszj-qA
---

diff --git a/sntp/m4/ntp_openssl.m4 b/sntp/m4/ntp_openssl.m4
index 6fdb79ef6..4396a6769 100644
--- a/sntp/m4/ntp_openssl.m4
+++ b/sntp/m4/ntp_openssl.m4
@@ -68,9 +68,9 @@ case "$with_crypto:${PKG_CONFIG:+notempty}:${with_openssl_libdir-notgiven}:${wit
     if $PKG_CONFIG --exists openssl ; then
 	CPPFLAGS_NTP="$CPPFLAGS_NTP `$PKG_CONFIG --cflags-only-I openssl`"
 	CFLAGS_NTP="$CFLAGS_NTP `$PKG_CONFIG --cflags-only-other openssl`"
-	LDFLAGS_NTP="$LDFLAGS_NTP `$PKG_CONFIG --libs-only-L openssl`"
-	LDFLAGS_NTP="$LDFLAGS_NTP `$PKG_CONFIG --libs-only-other openssl`"
+	LDADD_NTP="$LDADD_NTP `$PKG_CONFIG --libs-only-L openssl`"
 	LDADD_NTP="$LDADD_NTP `$PKG_CONFIG --libs-only-l openssl`"
+	LDFLAGS_NTP="$LDFLAGS_NTP `$PKG_CONFIG --libs-only-other openssl`"
 	ntp_openssl=yes
 	ntp_openssl_from_pkg_config=yes
     fi
@@ -187,10 +187,10 @@ case "$with_crypto:$ntp_openssl" in
 	 /usr/lib)
 	    ;;
 	 *)
-	    LDFLAGS_NTP="$LDFLAGS_NTP -L$openssl_libdir"
+	    LDADD_NTP="$LDADD_NTP -L$openssl_libdir"
 	    case "$need_dash_r" in
 	     1)
-		LDFLAGS="$LDFLAGS -R$openssl_libdir"
+		LDFLAGS_NTP="$LDFLAGS_NTP -R$openssl_libdir"
 	    esac
 	    ;;
 	esac