Author: kientzle
Date: Sun May 16 20:43:17 2010
New Revision: 208169
URL: http://svn.freebsd.org/changeset/base/208169
Log:
Reorganize slightly in preparation for making lzma and bz2 support
conditional.
Modified:
head/lib/libarchive/Makefile
head/lib/libarchive/config_freebsd.h
Modified: head/lib/libarchive/Makefile
==============================================================================
--- head/lib/libarchive/Makefile Sun May 16 20:31:31 2010
(r208168)
+++ head/lib/libarchive/Makefile Sun May 16 20:43:17 2010
(r208169)
@@ -2,8 +2,16 @@
.include <bsd.own.mk>
LIB= archive
-DPADD= ${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBLZMA}
-LDADD= -lbz2 -lz -lmd -llzma
+DPADD= ${LIBZ} ${LIBMD}
+LDADD= -lz -lmd
+
+DPADD+= ${LIBBZ2}
+LDADD+= -lbz2
+CFLAGS+= -DHAVE_BZLIB_H 1
+
+DPADD+= ${LIBLZMA}
+LDADD+= -llzma
+CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
# FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
# It has no real relation to the libarchive version number.
@@ -11,7 +19,6 @@ SHLIB_MAJOR= 5
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
CFLAGS+= -I${.OBJDIR}
-CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
.if ${MK_OPENSSL} != "no"
CFLAGS+= -DWITH_OPENSSL
Modified: head/lib/libarchive/config_freebsd.h
==============================================================================
--- head/lib/libarchive/config_freebsd.h Sun May 16 20:31:31 2010
(r208168)
+++ head/lib/libarchive/config_freebsd.h Sun May 16 20:43:17 2010
(r208169)
@@ -52,7 +52,6 @@
#endif
#define HAVE_BSDXML_H 1
-#define HAVE_BZLIB_H 1
#define HAVE_CHFLAGS 1
#define HAVE_CHOWN 1
#define HAVE_DECL_INT64_MAX 1
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
