From: Sebastian Andrzej Siewior <sebastian@xxxxxxxxxxxxx>
The `aclocal' step is skipped during `autoreconf' because aclocal.m4 is
present.
Move the current aclocal.m4 which contains local macros into the m4/
folder. With this change the aclocal.m4 will be re-created during
changes to the m4/ macro.
This is needed so the `aclocal' can fetch m4 macros from the system if
they are references in the configure script. This is a prerequisite to
use PKG_CHECK_MODULES.
Signed-off-by: Sebastian Andrzej Siewior <sebastian@xxxxxxxxxxxxx>
---
Makefile.in | 2 +-
configure.ac | 1 +
aclocal.m4 => m4/openssh.m4 | 0
3 files changed, 2 insertions(+), 1 deletion(-)
rename aclocal.m4 => m4/openssh.m4 (100%)
diff --git a/Makefile.in b/Makefile.in
index e7549470c520f..895beb9d0aae7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -189,7 +189,7 @@ $(SSHOBJS): Makefile.in config.h
$(SSHDOBJS): Makefile.in config.h
configure-check: $(srcdir)/configure
-$(srcdir)/configure: configure.ac aclocal.m4
+$(srcdir)/configure: configure.ac $(srcdir)/m4/*.m4
@echo "ERROR: configure is out of date; please run ${AUTORECONF} (and configure)" 1>&2
@exit 1
diff --git a/configure.ac b/configure.ac
index b689db4b5c563..0fefa421b8365 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@xxxxxxxxxxx])
+AC_CONFIG_MACRO_DIR([m4])
AC_REVISION($Revision: 1.583 $)
AC_CONFIG_SRCDIR([ssh.c])
AC_LANG([C])
diff --git a/aclocal.m4 b/m4/openssh.m4
similarity index 100%
rename from aclocal.m4
rename to m4/openssh.m4
--
2.26.0.rc2
_______________________________________________
openssh-unix-dev mailing list
openssh-unix-dev@xxxxxxxxxxx
https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev
