bootstrap.sh                    | 4 ++--

 m4/ax_compiler_flags_ldflags.m4 | 8 --------

 macro2m4.py                     | 2 +-

 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh

index f30aba2..fed5fc0 100755

--- a/bootstrap.sh

+++ b/bootstrap.sh

@@ -39,8 +39,8 @@ echo >>ChangeLog '# Copying and distribution of this file, with or without modif

 echo >>ChangeLog '# permitted in any medium without royalty provided the copyright notice and'

 echo >>ChangeLog '# this notice are preserved. This file is offered as-is, without any warranty.'

 echo >>ChangeLog ''

-build-aux/gitlog-to-changelog >>ChangeLog -- m4/

-bash gen-authors.sh >AUTHORS

+#build-aux/gitlog-to-changelog >>ChangeLog -- m4/

+#bash gen-authors.sh >AUTHORS

 install -c -m 444 README.md README

 autoreconf --install -Wall

diff --git a/m4/ax_compiler_flags_ldflags.m4 b/m4/ax_compiler_flags_ldflags.m4

index 976d119..274292a 100644

--- a/m4/ax_compiler_flags_ldflags.m4

+++ b/m4/ax_compiler_flags_ldflags.m4

@@ -67,13 +67,6 @@ AC_DEFUN([AX_COMPILER_FLAGS_LDFLAGS],[

     ])

     # textonly, retpolineplt not yet

-    # macOS and cygwin linker do not have --as-needed

-    AX_CHECK_LINK_FLAG([-Wl,--no-as-needed], [

-        ax_compiler_flags_as_needed_option="-Wl,--no-as-needed"

-    ], [

-        ax_compiler_flags_as_needed_option=""

-    ])

-

     # macOS linker speaks with a different accent

     ax_compiler_flags_fatal_warnings_option=""

     AX_CHECK_LINK_FLAG([-Wl,--fatal-warnings], [

@@ -85,7 +78,6 @@ AC_DEFUN([AX_COMPILER_FLAGS_LDFLAGS],[

     # Base flags

     AX_APPEND_LINK_FLAGS([ dnl

-        $ax_compiler_flags_as_needed_option dnl

         $3 dnl

     ],ax_warn_ldflags_variable,[$ax_compiler_flags_test])

diff --git a/macro2m4.py b/macro2m4.py

index 39e44da..f2b9214 100755

--- a/macro2m4.py

+++ b/macro2m4.py

@@ -53,7 +53,7 @@ if len(sys.argv) != 3:

   raise Exception("invalid command line syntax: %s" % ' '.join(map(repr, sys.argv)))

 (m4File,outFile) = sys.argv[1:]

 assert outFile != m4File

-m = Macro(m4File, computeSerialNumber=True)

+m = Macro(m4File, computeSerialNumber=False)

 for i in range(len(m.description)):

   para = m.description[i]

   if para[0][0].isspace():