Do not compile code for libarchive support if libarchive is not

available. Update autoconf and automake files.
darold · Mar 3, 2019 · 9f16650 · 9f16650
1 parent 9365017
commit 9f16650
Show file tree

Hide file tree

Showing 20 changed files with 11,589 additions and 16,240 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -2,6 +2,7 @@
 CONFIGDIR = @CONFDIR@
 cicapmoduledir=@MODSDIR@
 HAVE_TEMPLATE=@HAVE_TEMPLATE@
+HAVE_ARCHIVE=@HAVE_ARCHIVE@
 HAVE_HASALLDATA=@HAVE_HASALLDATA@
 
 SUBDIRS = . src etc
@@ -20,6 +21,7 @@ DEFAULT_DOC_DIR         = $(datadir)/squidclamav
 DEFAULT_LIBEXEC_DIR     = $(libexecdir)/squidclamav
 
 DEFS = @DEFS@
+OBJDIR = @OBJDIR@
 
 man1_MANS = doc/squidclamav.1
 docdir = $(DEFAULT_DOC_DIR)