From: Wayne Davison <wayne@opencoder.net>
Date: Thu, 18 Jun 2020 21:53:51 +0000 (-0700)
Subject: We need to use nawk or gawk on Solaris, not their weird awk.
X-Git-Tag: v3.2.0~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4965ccf283eee1aee04c004a133c71a7280816cc;p=thirdparty%2Frsync.git

We need to use nawk or gawk on Solaris, not their weird awk.
---

diff --git a/Makefile.in b/Makefile.in
index 91d9d4a9..17dae3a6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,6 +10,7 @@ mandir=@mandir@
 
 LIBS=@LIBS@
 CC=@CC@
+AWK=@AWK@
 CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@
 CXX=@CXX@
@@ -106,10 +107,10 @@ loadparm.o: default-dont-compress.h
 flist.o: rounding.h
 
 default-cvsignore.h default-dont-compress.h: rsync.1.md define-from-md.awk
-	awk -f $(srcdir)/define-from-md.awk -v hfile=$@ $(srcdir)/rsync.1.md
+	$(AWK) -f $(srcdir)/define-from-md.awk -v hfile=$@ $(srcdir)/rsync.1.md
 
 help-rsync.h help-rsyncd.h: rsync.1.md help-from-md.awk
-	awk -f $(srcdir)/help-from-md.awk -v hfile=$@ $(srcdir)/rsync.1.md
+	$(AWK) -f $(srcdir)/help-from-md.awk -v hfile=$@ $(srcdir)/rsync.1.md
 
 rounding.h: rounding.c rsync.h proto.h
 	@for r in 0 1 3; do \
@@ -225,7 +226,7 @@ proto.h: proto.h-tstamp
 	@if test -f proto.h; then :; else cp -p $(srcdir)/proto.h .; fi
 
 proto.h-tstamp: $(srcdir)/*.c $(srcdir)/lib/compat.c config.h
-	awk -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c
+	$(AWK) -f $(srcdir)/mkproto.awk $(srcdir)/*.c $(srcdir)/lib/compat.c
 
 .PHONY: man
 man: rsync.1 rsync-ssl.1 rsyncd.conf.5
diff --git a/configure.ac b/configure.ac
index a65b289d..a01dd701 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,7 @@ dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_CXX
+AC_PROG_AWK
 AC_PROG_EGREP
 AC_PROG_INSTALL
 AC_PROG_MKDIR_P