2007-05-08 02:24:27 +02:00
|
|
|
--- Makefile.in
|
|
|
|
+++ Makefile.in
|
2008-03-11 17:58:40 +01:00
|
|
|
@@ -40,7 +40,8 @@
|
|
|
|
DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
|
2007-05-08 02:24:27 +02:00
|
|
|
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
|
|
|
|
popt/popthelp.o popt/poptparse.o
|
|
|
|
-OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@
|
|
|
|
+OBJS=$(OBJS1) $(OBJS2) $(OBJS3) $(DAEMON_OBJ) $(LIBOBJ) @BUILD_POPT@
|
|
|
|
+LIBS += -lz
|
|
|
|
|
2008-03-11 17:58:40 +01:00
|
|
|
TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o lib/permstring.o lib/sysxattrs.o @BUILD_POPT@
|
2007-05-08 02:24:27 +02:00
|
|
|
|
2007-05-08 20:10:02 +02:00
|
|
|
--- batch.c
|
|
|
|
+++ batch.c
|
2008-03-11 17:58:40 +01:00
|
|
|
@@ -20,7 +20,7 @@
|
2007-05-08 20:10:02 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "rsync.h"
|
|
|
|
-#include "zlib/zlib.h"
|
|
|
|
+#include <zlib.h>
|
|
|
|
#include <time.h>
|
|
|
|
|
|
|
|
extern int eol_nulls;
|
|
|
|
--- options.c
|
|
|
|
+++ options.c
|
|
|
|
@@ -22,7 +22,7 @@
|
|
|
|
#include "rsync.h"
|
2008-03-11 17:58:40 +01:00
|
|
|
#include "ifuncs.h"
|
2007-05-08 20:10:02 +02:00
|
|
|
#include <popt.h>
|
|
|
|
-#include "zlib/zlib.h"
|
|
|
|
+#include <zlib.h>
|
|
|
|
|
|
|
|
extern int module_id;
|
|
|
|
extern int sanitize_paths;
|
|
|
|
--- token.c
|
|
|
|
+++ token.c
|
|
|
|
@@ -21,7 +21,7 @@
|
|
|
|
|
|
|
|
#include "rsync.h"
|
2008-03-11 17:58:40 +01:00
|
|
|
#include "ifuncs.h"
|
2007-05-08 20:10:02 +02:00
|
|
|
-#include "zlib/zlib.h"
|
|
|
|
+#include <zlib.h>
|
|
|
|
|
|
|
|
extern int do_compression;
|
|
|
|
extern int module_id;
|