From a76e32f9491889c378e99d651ffb90cdc8fe20cf Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayne@opencoder.net>
Date: Sun, 26 Dec 2021 14:48:55 -0800
Subject: [PATCH] Test --with-rrsync configure option & put rrsync into the
 artifacts.

---
 .github/workflows/build.yml | 18 ++++++++++++------
 Makefile.in                 |  3 +++
 packaging/auto-Makefile     |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9e34b4c97..4f5cbf23d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,9 +22,9 @@ jobs:
         wget -O git-version.h https://gist.githubusercontent.com/WayneD/c11243fa374fc64d4e42f2855c8e3827/raw/rsync-git-version.h
         echo "/usr/local/bin" >>$GITHUB_PATH
     - name: configure
-      run: ./configure
+      run: ./configure --with-rrsync
     - name: make
-      run: make
+      run: make all rrsync
     - name: install
       run: sudo make install
     - name: info
@@ -47,6 +47,8 @@ jobs:
           rsync.1
           rsync-ssl.1
           rsyncd.conf.5
+          rrsync.1
+          rrsync
 
   macos-build:
     runs-on: macos-latest
@@ -59,9 +61,9 @@ jobs:
         wget -O git-version.h https://gist.githubusercontent.com/WayneD/c11243fa374fc64d4e42f2855c8e3827/raw/rsync-git-version.h
         echo "/usr/local/bin" >>$GITHUB_PATH
     - name: configure
-      run: CPPFLAGS=-I/usr/local/opt/openssl/include/ LDFLAGS=-L/usr/local/opt/openssl/lib/ ./configure
+      run: CPPFLAGS=-I/usr/local/opt/openssl/include/ LDFLAGS=-L/usr/local/opt/openssl/lib/ ./configure --with-rrsync
     - name: make
-      run: make
+      run: make all rrsync
     - name: install
       run: sudo make install
     - name: info
@@ -80,6 +82,8 @@ jobs:
           rsync.1
           rsync-ssl.1
           rsyncd.conf.5
+          rrsync.1
+          rrsync
 
   cygwin-build:
     runs-on: windows-latest
@@ -97,9 +101,9 @@ jobs:
     - name: commonmark
       run: bash -c 'python3 -mpip install --user commonmark'
     - name: configure
-      run: bash -c './configure'
+      run: bash -c './configure --with-rrsync'
     - name: make
-      run: bash -c 'make'
+      run: bash -c 'make all rrsync'
     - name: install
       run: bash -c 'make install'
     - name: info
@@ -118,3 +122,5 @@ jobs:
           rsync.1
           rsync-ssl.1
           rsyncd.conf.5
+          rrsync.1
+          rrsync
diff --git a/Makefile.in b/Makefile.in
index 5eed339e3..98d5a7af8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -101,6 +101,9 @@ install-strip:
 rsync$(EXEEXT): $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
 
+rrsync: support/rrsync
+	cp -p $(srcdir)/support/rrsync rrsync
+
 $(OBJS): $(HEADERS)
 $(CHECK_OBJS): $(HEADERS)
 tls.o xattrs.o: lib/sysxattrs.h
diff --git a/packaging/auto-Makefile b/packaging/auto-Makefile
index 29d2d6889..7f2e2585c 100644
--- a/packaging/auto-Makefile
+++ b/packaging/auto-Makefile
@@ -1,6 +1,6 @@
 TARGETS := all install install-ssl-daemon install-all install-strip conf gen gensend reconfigure restatus \
 	proto man clean cleantests distclean test check check29 check30 installcheck splint \
-	doxygen doxygen-upload finddead
+	doxygen doxygen-upload finddead rrsync
 
 .PHONY: $(TARGETS) auto-prep
 
-- 
2.47.2