| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 26ad431e19788898fb4ed19ff91392e8b20f1bab Mon Sep 17 00:00:00 2001 |
| 2 | From: Wenzong Fan <wenzong.fan@windriver.com> |
| 3 | Date: Thu, 16 Oct 2014 04:06:55 -0400 |
| 4 | Subject: [PATCH] fix cmd_rsync |
| 5 | |
| 6 | Don't break configure if rsync is not installed on host. |
| 7 | |
| 8 | rsync is a runtime dependency and this change is only used for |
| 9 | generating rsnapshot.conf.default. It allows cmd_rsync to use |
| 10 | default path if options --without-rsync is specfied. |
| 11 | |
| 12 | Upstream-Status: Pending |
| 13 | |
| 14 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
| 15 | --- |
| 16 | configure.ac | 5 +++-- |
| 17 | 1 file changed, 3 insertions(+), 2 deletions(-) |
| 18 | |
| 19 | diff --git a/configure.ac b/configure.ac |
| 20 | index bc9df9e..2a33d29 100644 |
| 21 | --- a/configure.ac |
| 22 | +++ b/configure.ac |
| 23 | @@ -55,7 +55,7 @@ AC_ARG_WITH(rsync, |
| 24 | AC_MSG_ERROR(rsync not found) |
| 25 | fi |
| 26 | else |
| 27 | - AC_MSG_ERROR(rsync is required) |
| 28 | + RSYNC=no |
| 29 | fi |
| 30 | ] |
| 31 | ) |
| 32 | @@ -67,7 +67,8 @@ if test "$RSYNC" = ""; then |
| 33 | fi |
| 34 | dnl bail out if we can't find it |
| 35 | if test "$RSYNC" = "no"; then |
| 36 | - AC_MSG_ERROR(rsync is required) |
| 37 | + RSYNC=${bindir}/rsync |
| 38 | + AC_SUBST(CMD_RSYNC, "cmd_rsync $RSYNC") |
| 39 | fi |
| 40 | |
| 41 | |
| 42 | -- |
| 43 | 1.7.9.5 |
| 44 | |