From: Wayne Davison <wayned@samba.org>
Date: Fri, 1 May 2015 22:17:41 +0000 (-0700)
Subject: Pass -I option to aclocal.
X-Git-Tag: v3.1.2pre1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ac35b45071c7bfd8be6be41bfd45326f1f57bce;p=thirdparty%2Frsync.git

Pass -I option to aclocal.
---

diff --git a/Makefile.in b/Makefile.in
index 4e20827b..2fddfef8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -145,7 +145,7 @@ conf:
 	cd $(srcdir) && $(MAKE) -f prepare-source.mak conf
 
 aclocal.m4: m4/*.m4
-	aclocal
+	aclocal -I $(srcdir)/m4
 
 configure.sh config.h.in: configure.ac aclocal.m4
 	@if test -f configure.sh; then cp -p configure.sh configure.sh.old; else touch configure.sh.old; fi
diff --git a/prepare-source.mak b/prepare-source.mak
index efb62283..ad291feb 100644
--- a/prepare-source.mak
+++ b/prepare-source.mak
@@ -1,7 +1,7 @@
 conf: configure.sh config.h.in
 
 aclocal.m4:
-	aclocal
+	aclocal -I m4
 
 configure.sh: configure.ac aclocal.m4
 	autoconf -o configure.sh