Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Nov 2012 12:42:25 +0000 (UTC)
From:      Dag-Erling Smørgrav <des@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r242611 - stable/7/usr.bin/fetch
Message-ID:  <201211051242.qA5CgPF3001289@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: des
Date: Mon Nov  5 12:42:24 2012
New Revision: 242611
URL: http://svnweb.freebsd.org/changeset/base/242611

Log:
  MFH r240496: use libmd if and only if OpenSSL is not available

Modified:
  stable/7/usr.bin/fetch/Makefile
Directory Properties:
  stable/7/usr.bin/fetch/   (props changed)

Modified: stable/7/usr.bin/fetch/Makefile
==============================================================================
--- stable/7/usr.bin/fetch/Makefile	Mon Nov  5 12:42:02 2012	(r242610)
+++ stable/7/usr.bin/fetch/Makefile	Mon Nov  5 12:42:24 2012	(r242611)
@@ -5,11 +5,13 @@
 PROG=		fetch
 CSTD?=		c99
 WARNS?=		6
+
+.if ${MK_OPENSSL} != "no"
+DPADD=		${LIBFETCH} ${LIBSSL} ${LIBCRYPTO}
+LDADD=		-lfetch -lssl -lcrypto
+.else
 DPADD=		${LIBFETCH} ${LIBMD}
 LDADD=		-lfetch -lmd
-.if ${MK_OPENSSL} != "no"
-DPADD+=		${LIBSSL} ${LIBCRYPTO}
-LDADD+=		-lssl -lcrypto
 .endif
 
 .include <bsd.prog.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211051242.qA5CgPF3001289>