Make the situation w.r.t. dynamically linking zlib and libpopt clear.

2 files changed, 19 insertions, 2 deletions

diff --git a/popt/README.rsync b/popt/README.rsync
new file mode 100644
index 00000000..f31a8820
--- /dev/null
+++ b/popt/README.rsync
@@ -0,0 +1,5 @@
+Unlike zlib, this is a perfectly ordinary copy of libpopt.  It's only
+used on platforms that don't have a sufficiently up-to-date copy of
+their own.  If you build rsync on a platform which has popt, this
+directory should not be used.  (You can control that using
+--with-included-popt.)
diff --git a/zlib/README.rsync b/zlib/README.rsync
index 32f3f4e8..5440bfde 100644
--- a/zlib/README.rsync
+++ b/zlib/README.rsync
@@ -1,3 +1,5 @@
+READ THIS BEFORE TRYING TO DYNAMICALLY LINK RSYNC AND ZLIB!
+
 zlib has been adapted slightly for use in rsync. Please don't bother
 the zlib authors with problems related to the use of zlib in rsync as
 any bugs are likely to be our fault and not theirs.
@@ -15,5 +17,15 @@ Specific changes that have been made to zlib for rsync include:
 - include rsync.h to ensure that we get a consistent set of includes
   for all C code in rsync and to take advantage of autoconf
 
---
-Paul Mackerras and Andrew Tridgell
+As a result of the first item, the streams from rsync's version of
+zlib are *not compatible* with those produced by the upstream version
+of rsync.  In other words, if you link rsync against your system's
+copy, it will not be able to interoperate with any other version if
+the -z option is used.  (Sorry.  Sometimes standard is better than
+better.)
+
+The rsync maintainers hope to fix this problem in the future by either
+merging our changes into the upstream version, or backing them out of
+rsync in a way that preserves wire compatibility.  But in the meantime
+this version must be maintained in parallel.
+