Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 May 2009 17:26:56 +0000 (UTC)
From:      Tim Kientzle <kientzle@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r193101 - head/lib/libarchive
Message-ID:  <200905301726.n4UHQuS3014130@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kientzle
Date: Sat May 30 17:26:55 2009
New Revision: 193101
URL: http://svn.freebsd.org/changeset/base/193101

Log:
  Include libmd and libcrypto in DPADD

Modified:
  head/lib/libarchive/Makefile

Modified: head/lib/libarchive/Makefile
==============================================================================
--- head/lib/libarchive/Makefile	Sat May 30 17:25:14 2009	(r193100)
+++ head/lib/libarchive/Makefile	Sat May 30 17:26:55 2009	(r193101)
@@ -2,7 +2,7 @@
 .include <bsd.own.mk>
 
 LIB=	archive
-DPADD=	${LIBBZ2} ${LIBZ}
+DPADD=	${LIBBZ2} ${LIBZ} ${LIBMD}
 LDADD=	-lbz2 -lz -lmd
 
 # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
@@ -12,15 +12,16 @@ SHLIB_MAJOR= 4
 CFLAGS+=	-DPLATFORM_CONFIG_H=\"config_freebsd.h\"
 CFLAGS+=	-I${.OBJDIR}
 #Uncomment to build with full lzma/xz support via liblzma
+#liblzma is not (yet?) part of the FreeBSD base system
 #CFLAGS+= -I/usr/local/include -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
 #LDADD+= -L/usr/local/lib -llzma
 
 .if ${MK_OPENSSL} != "no"
 CFLAGS+=	-DWITH_OPENSSL
-LDFLAGS+=	-lcrypto
+DPADD+=	${LIBCRYPTO}
+LDADD+=	-lcrypto
 .endif
 
-
 WARNS?=	6
 
 # Headers to be installed in /usr/include



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