summaryrefslogtreecommitdiff
path: root/ext2fs
diff options
context:
space:
mode:
authorGabriele Giacone <1o5g4r8o@gmail.com>2014-03-20 10:44:20 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2014-03-20 10:44:20 +0100
commit7b054153eccbf0843fbbfb131855f56ea5c695e0 (patch)
tree42980519516696dd3d38d6bb0948403117581d86 /ext2fs
parent2294f2fdffcf724cc28653976b8029351e41fd77 (diff)
Make bz2 and gz support optional
* config.make.in (HAVE_LIBBZ2, HAVE_LIBZ): New variables. * configure.ac (--without-libbz2, --without-libz): New options. * ext2fs/Makefile (OTHERLIBS): Make -lbz2 and -lz optional. * fatfs/Makefile (OTHERLIBS): Likewise. * isofs/Makefile (OTHERLIBS): Likewise. * libstore/Makefile (maybe_part): Remove variable. (store-types): Add part, bunzip2 and gunzip support conditionnally. (LDLIBS): Make -lbz2 and -lz optional. (OBJS): Add GUNZIP_OBJS and BUNZIP2_OBJS optional.
Diffstat (limited to 'ext2fs')
-rw-r--r--ext2fs/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext2fs/Makefile b/ext2fs/Makefile
index 32e40f06..8d2e68c7 100644
--- a/ext2fs/Makefile
+++ b/ext2fs/Makefile
@@ -24,7 +24,7 @@ SRCS = balloc.c dir.c ext2fs.c getblk.c hyper.c ialloc.c \
inode.c pager.c pokel.c truncate.c storeinfo.c msg.c xinl.c
OBJS = $(SRCS:.c=.o)
HURDLIBS = diskfs pager iohelp fshelp store ports ihash shouldbeinlibc
-OTHERLIBS = -lpthread -lbz2 -lz
+OTHERLIBS = -lpthread $(and $(HAVE_LIBBZ2),-lbz2) $(and $(HAVE_LIBZ),-lz)
include ../Makeconf