diff options
| author | kientzle <kientzle@FreeBSD.org> | 2010-05-16 20:43:17 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2010-05-16 20:43:17 +0000 |
| commit | 02e2e7806f669c5da2bd50002bb58f54c31f28da (patch) | |
| tree | 1c9bd6dbae8038d99fe69fa77ebc1ede2b56efec /lib/libarchive | |
| parent | 94e3ec8b605894e812bc365088e0dc94ff83c15b (diff) | |
| download | FreeBSD-src-02e2e7806f669c5da2bd50002bb58f54c31f28da.zip FreeBSD-src-02e2e7806f669c5da2bd50002bb58f54c31f28da.tar.gz | |
Reorganize slightly in preparation for making lzma and bz2 support conditional.
Diffstat (limited to 'lib/libarchive')
| -rw-r--r-- | lib/libarchive/Makefile | 13 | ||||
| -rw-r--r-- | lib/libarchive/config_freebsd.h | 1 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index 9470190..24b0e3b 100644 --- a/lib/libarchive/Makefile +++ b/lib/libarchive/Makefile @@ -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 diff --git a/lib/libarchive/config_freebsd.h b/lib/libarchive/config_freebsd.h index 10b399a..ea5f2dc 100644 --- a/lib/libarchive/config_freebsd.h +++ b/lib/libarchive/config_freebsd.h @@ -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 |
