Move m4sh scripts to build-aux/m4 directory.

27 files changed, 65 insertions, 66 deletions

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index c1dc7f0..d30c771 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -87,15 +87,15 @@ jobs:
           build-aux/config.sub
           build-aux/depcomp
           build-aux/install-sh
-          build-aux/libtool.m4
           build-aux/ltmain.sh
-          build-aux/ltoptions.m4
-          build-aux/ltsugar.m4
-          build-aux/ltversion.m4
-          build-aux/lt~obsolete.m4
           build-aux/missing
           build-aux/test-driver
-        key: autoreconf-${{ steps.build-tools.outputs.autotools-ver }}-${{ hashFiles('autogen.sh', 'configure.ac', 'Makefile.am', 'build-aux/*.m4') }}
+          build-aux/m4/libtool.m4
+          build-aux/m4/ltoptions.m4
+          build-aux/m4/ltsugar.m4
+          build-aux/m4/ltversion.m4
+          build-aux/m4/lt~obsolete.m4
+        key: autoreconf-${{ steps.build-tools.outputs.autotools-ver }}-${{ hashFiles('autogen.sh', 'configure.ac', 'Makefile.am', 'build-aux/m4/*.m4') }}
 
     - name: Bootstrap
       if: steps.cache.outputs.cache-hit != 'true'
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index f3f14fe..87e2a57 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -74,15 +74,15 @@ jobs:
           build-aux/config.sub
           build-aux/depcomp
           build-aux/install-sh
-          build-aux/libtool.m4
           build-aux/ltmain.sh
-          build-aux/ltoptions.m4
-          build-aux/ltsugar.m4
-          build-aux/ltversion.m4
-          build-aux/lt~obsolete.m4
           build-aux/missing
           build-aux/test-driver
-        key: autoreconf-${{ steps.build-tools.outputs.autotools-ver }}-${{ hashFiles('autogen.sh', 'configure.ac', 'Makefile.am', 'build-aux/*.m4') }}
+          build-aux/m4/libtool.m4
+          build-aux/m4/ltoptions.m4
+          build-aux/m4/ltsugar.m4
+          build-aux/m4/ltversion.m4
+          build-aux/m4/lt~obsolete.m4
+        key: autoreconf-${{ steps.build-tools.outputs.autotools-ver }}-${{ hashFiles('autogen.sh', 'configure.ac', 'Makefile.am', 'build-aux/m4/*.m4') }}
 
     - name: Bootstrap
       if: steps.cache.outputs.cache-hit != 'true'
diff --git a/.github/workflows/config-matrix.yml b/.github/workflows/config-matrix.yml
index 501de78..4ec95a8 100644
--- a/.github/workflows/config-matrix.yml
+++ b/.github/workflows/config-matrix.yml
@@ -103,15 +103,15 @@ jobs:
           build-aux/config.sub
           build-aux/depcomp
           build-aux/install-sh
-          build-aux/libtool.m4
           build-aux/ltmain.sh
-          build-aux/ltoptions.m4
-          build-aux/ltsugar.m4
-          build-aux/ltversion.m4
-          build-aux/lt~obsolete.m4
           build-aux/missing
           build-aux/test-driver
-        key: autoreconf-${{ steps.build-tools.outputs.autotools-ver }}-${{ hashFiles('autogen.sh', 'configure.ac', 'Makefile.am', 'build-aux/*.m4') }}
+          build-aux/m4/libtool.m4
+          build-aux/m4/ltoptions.m4
+          build-aux/m4/ltsugar.m4
+          build-aux/m4/ltversion.m4
+          build-aux/m4/lt~obsolete.m4
+        key: autoreconf-${{ steps.build-tools.outputs.autotools-ver }}-${{ hashFiles('autogen.sh', 'configure.ac', 'Makefile.am', 'build-aux/m4/*.m4') }}
 
     - name: Bootstrap
       if: steps.cache.outputs.cache-hit != 'true'
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index 9629c14..2ab558b 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -106,15 +106,15 @@ jobs:
           build-aux/config.sub
           build-aux/depcomp
           build-aux/install-sh
-          build-aux/libtool.m4
           build-aux/ltmain.sh
-          build-aux/ltoptions.m4
-          build-aux/ltsugar.m4
-          build-aux/ltversion.m4
-          build-aux/lt~obsolete.m4
           build-aux/missing
           build-aux/test-driver
-        key: autoreconf-${{ steps.build-tools.outputs.autotools-ver }}-${{ hashFiles('autogen.sh', 'configure.ac', 'Makefile.am', 'build-aux/*.m4') }}
+          build-aux/m4/libtool.m4
+          build-aux/m4/ltoptions.m4
+          build-aux/m4/ltsugar.m4
+          build-aux/m4/ltversion.m4
+          build-aux/m4/lt~obsolete.m4
+        key: autoreconf-${{ steps.build-tools.outputs.autotools-ver }}-${{ hashFiles('autogen.sh', 'configure.ac', 'Makefile.am', 'build-aux/m4/*.m4') }}
 
     - name: Bootstrap
       if: steps.cache.outputs.cache-hit != 'true'
diff --git a/.github/workflows/distcheck.yml b/.github/workflows/distcheck.yml
index cee85b6..99af815 100644
--- a/.github/workflows/distcheck.yml
+++ b/.github/workflows/distcheck.yml
@@ -81,15 +81,15 @@ jobs:
           build-aux/config.sub
           build-aux/depcomp
           build-aux/install-sh
-          build-aux/libtool.m4
           build-aux/ltmain.sh
-          build-aux/ltoptions.m4
-          build-aux/ltsugar.m4
-          build-aux/ltversion.m4
-          build-aux/lt~obsolete.m4
           build-aux/missing
           build-aux/test-driver
-        key: autoreconf-${{ steps.build-tools.outputs.autotools-ver }}-${{ hashFiles('autogen.sh', 'configure.ac', 'Makefile.am', 'build-aux/*.m4') }}
+          build-aux/m4/libtool.m4
+          build-aux/m4/ltoptions.m4
+          build-aux/m4/ltsugar.m4
+          build-aux/m4/ltversion.m4
+          build-aux/m4/lt~obsolete.m4
+        key: autoreconf-${{ steps.build-tools.outputs.autotools-ver }}-${{ hashFiles('autogen.sh', 'configure.ac', 'Makefile.am', 'build-aux/m4/*.m4') }}
 
     - name: Bootstrap
       if: steps.cache.outputs.cache-hit != 'true'
diff --git a/.github/workflows/memcheck.yml b/.github/workflows/memcheck.yml
index aada864..5b1a777 100644
--- a/.github/workflows/memcheck.yml
+++ b/.github/workflows/memcheck.yml
@@ -66,15 +66,15 @@ jobs:
           build-aux/config.sub
           build-aux/depcomp
           build-aux/install-sh
-          build-aux/libtool.m4
           build-aux/ltmain.sh
-          build-aux/ltoptions.m4
-          build-aux/ltsugar.m4
-          build-aux/ltversion.m4
-          build-aux/lt~obsolete.m4
           build-aux/missing
           build-aux/test-driver
-        key: autoreconf-${{ steps.build-tools.outputs.autotools-ver }}-${{ hashFiles('autogen.sh', 'configure.ac', 'Makefile.am', 'build-aux/*.m4') }}
+          build-aux/m4/libtool.m4
+          build-aux/m4/ltoptions.m4
+          build-aux/m4/ltsugar.m4
+          build-aux/m4/ltversion.m4
+          build-aux/m4/lt~obsolete.m4
+        key: autoreconf-${{ steps.build-tools.outputs.autotools-ver }}-${{ hashFiles('autogen.sh', 'configure.ac', 'Makefile.am', 'build-aux/m4/*.m4') }}
 
     - name: Bootstrap
       if: steps.cache.outputs.cache-hit != 'true'
@@ -139,15 +139,15 @@ jobs:
           build-aux/config.sub
           build-aux/depcomp
           build-aux/install-sh
-          build-aux/libtool.m4
           build-aux/ltmain.sh
-          build-aux/ltoptions.m4
-          build-aux/ltsugar.m4
-          build-aux/ltversion.m4
-          build-aux/lt~obsolete.m4
           build-aux/missing
           build-aux/test-driver
-        key: autoreconf-${{ steps.build-tools.outputs.autotools-ver }}-${{ hashFiles('autogen.sh', 'configure.ac', 'Makefile.am', 'build-aux/*.m4') }}
+          build-aux/m4/libtool.m4
+          build-aux/m4/ltoptions.m4
+          build-aux/m4/ltsugar.m4
+          build-aux/m4/ltversion.m4
+          build-aux/m4/lt~obsolete.m4
+        key: autoreconf-${{ steps.build-tools.outputs.autotools-ver }}-${{ hashFiles('autogen.sh', 'configure.ac', 'Makefile.am', 'build-aux/m4/*.m4') }}
 
     - name: Bootstrap
       if: steps.cache.outputs.cache-hit != 'true'
diff --git a/.gitignore b/.gitignore
index 2b94073..5d3041f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,14 +25,13 @@
 /build-aux/config.sub
 /build-aux/depcomp
 /build-aux/install-sh
-/build-aux/libtool.m4
-/build-aux/ltmain.sh
-/build-aux/ltoptions.m4
-/build-aux/ltsugar.m4
-/build-aux/ltversion.m4
-/build-aux/lt~obsolete.m4
 /build-aux/missing
 /build-aux/test-driver
+/build-aux/m4/libtool.m4
+/build-aux/m4/ltoptions.m4
+/build-aux/m4/ltsugar.m4
+/build-aux/m4/ltversion.m4
+/build-aux/m4/lt~obsolete.m4
 
 # compiler output
 *.gcda
diff --git a/LICENSING b/LICENSING
index 8cde071..5016b7a 100644
--- a/LICENSING
+++ b/LICENSING
@@ -79,51 +79,51 @@ source tree.  For specific licensing terms consult the files themselves.
    test-symbols-renames.sh, test-symbols-static.sh,
    build-aux/gen-crypt-h, build-aux/gen-crypt-symbol-vers-h,
    build-aux/gen-libcrypt-map, build-aux/skip-if-exec-format-error,
-   build-aux/zw_alignment.m4, build-aux/zw_static_assert.m4,
-   build-aux/zw_endianness.m4, build-aux/zw_ld_wrap.m4
+   build-aux/m4/zw_alignment.m4, build-aux/m4/zw_static_assert.m4,
+   build-aux/m4/zw_endianness.m4, build-aux/m4/zw_ld_wrap.m4
 
  * Copyright Zack Weinberg and Free Software Foundation, Inc;
    GPL (v3 or later), with Autoconf exception:
-   build-aux/zw_automodern.m4, build-aux/zw_simple_warnings.m4
+   build-aux/m4/zw_automodern.m4, build-aux/m4/zw_simple_warnings.m4
 
  * Copyright <vt at altlinux.org>; 0-clause BSD:
    crypt-yescrypt.c, test-crypt-yescrypt.c
 
  * Copyright Kevin Cernekee; FSF All Permissive License:
-   build-aux/ax_check_vscript.m4
+   build-aux/m4/ax_check_vscript.m4
 
  * Copyright Maarten Bosmans; FSF All Permissive License:
-   build-aux/ax_append_compile_flags.m4
+   build-aux/m4/ax_append_compile_flags.m4
 
  * Copyright Guido U. Draheim, Maarten Bosmans;
    FSF All Permissive License:
-   build-aux/ax_append_flag.m4, build-aux/ax_check_compile_flag.m4
+   build-aux/m4/ax_append_flag.m4, build-aux/m4/ax_check_compile_flag.m4
 
  * Copyright Mike Frysinger; FSF All Permissive License:
-   build-aux/ax_require_defined.m4
+   build-aux/m4/ax_require_defined.m4
 
  * Copyright Gabriele Svelto; FSF All Permissive License:
-   build-aux/ax_gcc_func_attribute.m4
+   build-aux/m4/ax_gcc_func_attribute.m4
 
  * Copyright Scott James Remnant, Dan Nicholson;
    GPL (v2 or later), with Autoconf exception:
-   build-aux/pkg_installdir_compat.m4
+   build-aux/m4/pkg_installdir_compat.m4
 
  * Copyright Tim Toolan; FSF All Permissive License:
-   build-aux/ax_compare_version.m4
+   build-aux/m4/ax_compare_version.m4
 
  * Copyright Philip Withnall; FSF All Permissive License:
-   build-aux/ax_valgrind_check.m4
+   build-aux/m4/ax_valgrind_check.m4
 
  * Copyright Steven G. Johnson, Daniel Richard G.;
    GPL (v3 or later), with Autoconf exception:
-   build-aux/ax_pthread.m4
+   build-aux/m4/ax_pthread.m4
 
  * Copyright Francesco Salvestrini; FSF All Permissive License:
-   build-aux/ax_prog_python_version.m4
+   build-aux/m4/ax_prog_python_version.m4
 
  * Copyright Andrew Collier; FSF All Permissive License:
-   build-aux/ax_python_module.m4
+   build-aux/m4/ax_python_module.m4
 
  * Copyright holders unknown, no statement of license (all of these
    files are part of the testsuite and do not contribute to the
diff --git a/Makefile.am b/Makefile.am
index c1f91d4..c88ef83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ AUTOMAKE_OPTIONS = \
 	gnits \
 	subdir-objects
 
-ACLOCAL_AMFLAGS = -I build-aux
+ACLOCAL_AMFLAGS = -I build-aux/m4
 
 AM_CPPFLAGS = -I$(srcdir)/lib
 AM_CFLAGS = $(WARN_CFLAGS) $(OPTI_FLAGS)
diff --git a/NEWS b/NEWS
index de5a19e..4725a4d 100644
--- a/NEWS
+++ b/NEWS
@@ -43,7 +43,7 @@ Version 4.4.24
   with libxcrypt, requiring a few tests to be disabled for builds with
   -fsanitize-address.  See commentary in test/crypt-badargs.c for an
   explanation of the conflict, and the commentary in
-  build-aux/zw_detect_asan.m4 for why a configure test is required.
+  build-aux/m4/zw_detect_asan.m4 for why a configure test is required.
 * Fix several issues found by Covscan in the testsuite.  These include:
   - CWE-170: String not null terminated (STRING_NULL)
   - CWE-188: Reliance on integer endianness (INCOMPATIBLE_CAST)
diff --git a/build-aux/ax_append_compile_flags.m4 b/build-aux/m4/ax_append_compile_flags.m4
index 9c85635..9c85635 100644
--- a/build-aux/ax_append_compile_flags.m4
+++ b/build-aux/m4/ax_append_compile_flags.m4
diff --git a/build-aux/ax_append_flag.m4 b/build-aux/m4/ax_append_flag.m4
index dd6d8b6..dd6d8b6 100644
--- a/build-aux/ax_append_flag.m4
+++ b/build-aux/m4/ax_append_flag.m4
diff --git a/build-aux/ax_check_compile_flag.m4 b/build-aux/m4/ax_check_compile_flag.m4
index bd753b3..bd753b3 100644
--- a/build-aux/ax_check_compile_flag.m4
+++ b/build-aux/m4/ax_check_compile_flag.m4
diff --git a/build-aux/ax_check_vscript.m4 b/build-aux/m4/ax_check_vscript.m4
index 9851f32..9851f32 100644
--- a/build-aux/ax_check_vscript.m4
+++ b/build-aux/m4/ax_check_vscript.m4
diff --git a/build-aux/ax_gcc_func_attribute.m4 b/build-aux/m4/ax_gcc_func_attribute.m4
index 8ba25ee..8ba25ee 100644
--- a/build-aux/ax_gcc_func_attribute.m4
+++ b/build-aux/m4/ax_gcc_func_attribute.m4
diff --git a/build-aux/ax_require_defined.m4 b/build-aux/m4/ax_require_defined.m4
index 17c3eab..17c3eab 100644
--- a/build-aux/ax_require_defined.m4
+++ b/build-aux/m4/ax_require_defined.m4
diff --git a/build-aux/ax_valgrind_check.m4 b/build-aux/m4/ax_valgrind_check.m4
index b2297e1..b2297e1 100644
--- a/build-aux/ax_valgrind_check.m4
+++ b/build-aux/m4/ax_valgrind_check.m4
diff --git a/build-aux/pkg_installdir_compat.m4 b/build-aux/m4/pkg_installdir_compat.m4
index 2bbe156..2bbe156 100644
--- a/build-aux/pkg_installdir_compat.m4
+++ b/build-aux/m4/pkg_installdir_compat.m4
diff --git a/build-aux/zw_alignment.m4 b/build-aux/m4/zw_alignment.m4
index a714196..a714196 100644
--- a/build-aux/zw_alignment.m4
+++ b/build-aux/m4/zw_alignment.m4
diff --git a/build-aux/zw_automodern.m4 b/build-aux/m4/zw_automodern.m4
index 8451b20..8451b20 100644
--- a/build-aux/zw_automodern.m4
+++ b/build-aux/m4/zw_automodern.m4
diff --git a/build-aux/zw_detect_asan.m4 b/build-aux/m4/zw_detect_asan.m4
index 907d35f..907d35f 100644
--- a/build-aux/zw_detect_asan.m4
+++ b/build-aux/m4/zw_detect_asan.m4
diff --git a/build-aux/zw_endianness.m4 b/build-aux/m4/zw_endianness.m4
index 9513216..9513216 100644
--- a/build-aux/zw_endianness.m4
+++ b/build-aux/m4/zw_endianness.m4
diff --git a/build-aux/zw_ld_wrap.m4 b/build-aux/m4/zw_ld_wrap.m4
index 87b22e7..87b22e7 100644
--- a/build-aux/zw_ld_wrap.m4
+++ b/build-aux/m4/zw_ld_wrap.m4
diff --git a/build-aux/zw_prog_perl.m4 b/build-aux/m4/zw_prog_perl.m4
index d2036ff..d2036ff 100644
--- a/build-aux/zw_prog_perl.m4
+++ b/build-aux/m4/zw_prog_perl.m4
diff --git a/build-aux/zw_simple_warnings.m4 b/build-aux/m4/zw_simple_warnings.m4
index fef1312..fef1312 100644
--- a/build-aux/zw_simple_warnings.m4
+++ b/build-aux/m4/zw_simple_warnings.m4
diff --git a/build-aux/zw_static_assert.m4 b/build-aux/m4/zw_static_assert.m4
index e33931a..e33931a 100644
--- a/build-aux/zw_static_assert.m4
+++ b/build-aux/m4/zw_static_assert.m4
diff --git a/configure.ac b/configure.ac
index abd714d..fda28b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 # Process this file with autoconf to produce a configure script.
-m4_include([build-aux/zw_automodern.m4])
+m4_include([build-aux/m4/zw_automodern.m4])
 AC_INIT([xcrypt],
         [4.4.27],
         [https://github.com/besser82/libxcrypt/issues],
         [libxcrypt],
         [https://github.com/besser82/libxcrypt])
-AC_CONFIG_MACRO_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([build-aux/m4])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([lib/crypt.c])
 AC_CONFIG_HEADERS([config.h])