diff options
| author | Sebastian Andrzej Siewior <sebastian@breakpoint.cc> | 2020-09-05 17:50:02 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-09-11 13:18:42 +1000 |
| commit | a2f3ae386b5f7938ed3c565ad71f30c4f7f010f1 (patch) | |
| tree | b4ed82bd7aac63715a9f86a98c605d7fb168c7dc | |
| parent | 8372bff3a895b84fd78a81dc39da10928b662f5a (diff) | |
Move the local m4 macros
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@breakpoint.cc>
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | m4/openssh.m4 (renamed from aclocal.m4) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 6e72136c..acfb919d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -187,7 +187,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 9ae199bc..28947a66 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@mindrot.org]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) diff --git a/aclocal.m4 b/m4/openssh.m4 index b70856e4..b70856e4 100644 --- a/aclocal.m4 +++ b/m4/openssh.m4 |