]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Put openssl -L flags from pkg-config in LDADD_NTP as comment indicates,
authorDave Hart <hart@ntp.org>
Mon, 9 Apr 2012 16:19:04 +0000 (16:19 +0000)
committerDave Hart <hart@ntp.org>
Mon, 9 Apr 2012 16:19:04 +0000 (16:19 +0000)
  rather than in LDFLAGS_NTP.

bk: 4f830bf8_PYpruondtcBHtwoszj-qA

sntp/m4/ntp_openssl.m4

index 6fdb79ef666c5cd7655de73005bd2c40fd0b02e1..4396a6769feda5b2ea3ee2c8f98e4adc64c405fe 100644 (file)
@@ -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