@@ -, +, @@ --- src/Makefile.am | 9 +++------ src/htszlib.h | 6 +++--- src/proxy/proxytrack.c | 2 +- src/proxy/proxytrack.h | 2 +- src/proxy/store.c | 4 ++-- 5 files changed, 8 insertions(+), 14 deletions(-) --- a/src/Makefile.am +++ a/src/Makefile.am @@ -27,7 +27,7 @@ httrack_LDADD = $(THREADS_LIBS) libhttrack.la htsserver_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) libhttrack.la -proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) +proxytrack_LDADD = $(THREADS_LIBS) $(SOCKET_LIBS) -lminizip proxytrack_CFLAGS = $(AM_CFLAGS) -DNO_MALLOCT lib_LTLIBRARIES = libhttrack.la libhtsjava.la @@ -35,8 +35,7 @@ lib_LTLIBRARIES = libhttrack.la libhtsjava.la htsserver_SOURCES = htsserver.c htsserver.h htsweb.c htsweb.h proxytrack_SOURCES = proxy/main.c \ proxy/proxytrack.c proxy/store.c \ - htsinthash.c htsmd5.c md5.c \ - minizip/ioapi.c minizip/mztools.c minizip/unzip.c minizip/zip.c + htsinthash.c htsmd5.c md5.c whttrackrundir = $(bindir) whttrackrun_SCRIPTS = webhttrack @@ -50,7 +49,6 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \ htsmodules.c \ md5.c \ htsmms.c \ - minizip/ioapi.c minizip/mztools.c minizip/unzip.c minizip/zip.c \ mmsrip/error.c mmsrip/mms.c \ hts-indextmpl.h htsalias.h htsback.h htsbase.h \ htsbasenet.h htsbauth.h htscache.h htscatchurl.h \ @@ -63,9 +61,8 @@ libhttrack_la_SOURCES = htscore.c htsparse.c htsback.c htscache.c \ htsstrings.h httrack-library.h \ md5.h \ htsmms.h \ - minizip/crypt.h minizip/ioapi.h minizip/mztools.h minizip/unzip.h minizip/zip.h \ mmsrip/error.h mmsrip/mms.h -libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(DL_LIBS) $(SOCKET_LIBS) +libhttrack_la_LIBADD = $(THREADS_LIBS) $(ZLIB_LIBS) $(DL_LIBS) $(SOCKET_LIBS) -lminizip libhttrack_la_LDFLAGS = -version-info $(VERSION_INFO) libhtsjava_la_SOURCES = htsjava.c htsjava.h --- a/src/htszlib.h +++ a/src/htszlib.h @@ -44,9 +44,9 @@ Please visit our Website: http://www.httrack.com //#include "zutil.h" /* MiniZip */ -#include "minizip/zip.h" -#include "minizip/unzip.h" -#include "minizip/mztools.h" +#include +#include +#include /* Library internal definictions */ #ifdef HTS_INTERNAL_BYTECODE --- a/src/proxy/proxytrack.c +++ a/src/proxy/proxytrack.c @@ -141,7 +141,7 @@ Remark: If no cache newer than the added one is found, all entries can be added #include "proxytrack.h" /* Store manager */ -#include "../minizip/mztools.h" +#include #include "store.h" /* threads */ --- a/src/proxy/proxytrack.h +++ a/src/proxy/proxytrack.h @@ -32,7 +32,7 @@ Please visit our Website: http://www.httrack.com #define PROXYTRACK_VERSION "0.5" /* Store manager */ -#include "../minizip/mztools.h" +#include #include "store.h" #include --- a/src/proxy/store.c +++ a/src/proxy/store.c @@ -45,8 +45,8 @@ Please visit our Website: http://www.httrack.com #include "htsinthash.h" #include "htsmd5.h" #undef HTS_INTERNAL_BYTECODE -#include "../minizip/mztools.h" -#include "../minizip/zip.h" +#include +#include #include "htscore.h" #include "htsback.h" --