Fix comments style in configure.ac and Makefile.am

(code refactoring)

Do not allow the comments that are meaningless in the auto-generated
configure and Makefile.in to be put to these files.

* Makefile.am (check-nolink): Change comment style from "#" to "##".
* configure.ac: Add the copyright and disclaimer.
* configure.ac: Change comment style from "#" to "dnl" for the comments
that are meaningless in auto-generated configure file.

diff --git a/Makefile.am b/Makefile.am
index a8f4ac93f7016955ee8700130445ec0ce37733e2..f71cf20abd478ce50e51921a88ec0341bcf3977b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,9 @@ endif
 
 EXTRA_DIST = autogen.sh
 
-# TODO: After migration to autoconf-1.13+, remove check-nolink definition
-# from this Makefile.am and add AM_EXTRA_RECURSIVE_TARGETS([check-nolink])
-# back to configure.ac file.
+## TODO: After migration to autoconf-1.13+, remove check-nolink definition
+## from this Makefile.am and add AM_EXTRA_RECURSIVE_TARGETS([check-nolink])
+## back to configure.ac file.
 .PHONY: check-nolink check-nolink-local
 check-nolink: check-nolink-local
        $(MAKE) --directory tests $(AM_MAKEFLAGS) check-nolink-local

diff --git a/configure.ac b/configure.ac
index b15a66e7fbb43d2769df21d6171fb5139cb4b9cf..d8a33f85ecd3c7756e42e37e310b8921861af8e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,17 @@
-# Process this file with autoconf to produce a configure script.
+# Copyright (c) 2005-2006 Hewlett-Packard Development Company, L.P.
+# Copyright (c) 2009-2018 Ivan Maidanski
+#
+# THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+# OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+#
+# Permission is hereby granted to use or copy this program
+# for any purpose,  provided the above notices are retained on all copies.
+# Permission to modify the code and to distribute modified code is granted,
+# provided the above notices are retained, and a notice that the code was
+# modified is included with the above copyright notice.
+
+dnl Process this file with autoconf to produce configure.
+
 AC_INIT([libatomic_ops],[7.7.0],https://github.com/ivmai/libatomic_ops/issues)
 
 AC_PREREQ(2.61)
@@ -10,12 +23,12 @@ AM_MAINTAINER_MODE
 
 AC_CONFIG_HEADERS([src/config.h])
 
-# Checks for programs.
+dnl Checks for programs.
 AM_PROG_CC_C_O
 AM_PROG_AS
 LT_INIT([disable-shared])
 
-# Checks for functions.
+dnl Checks for functions.
 AC_FUNC_MMAP
 
 # Determine PIC flag.
@@ -133,7 +146,7 @@ AM_CONDITIONAL(ENABLE_DOCS, test x$enable_docs != xno)
 AC_SUBST(PICFLAG)
 AC_SUBST(DEFS)
 
-# Extra user-defined C flags.
+dnl Extra user-defined C flags.
 AC_SUBST([CFLAGS_EXTRA])
 
 AH_TEMPLATE([_PTHREADS], [Indicates the use of pthreads (NetBSD).])
@@ -149,7 +162,7 @@ AH_TEMPLATE([AO_USE_WIN32_PTHREADS],
          are emulated)])
 AH_TEMPLATE([AO_TRACE_MALLOC], [Trace AO_malloc/free calls (for debug only)])
 
-# These macros are tested in public headers
+dnl These macros are tested in public headers.
 AH_TEMPLATE([AO_GENERALIZE_ASM_BOOL_CAS],
         [Force compare_and_swap definition via fetch_compare_and_swap])
 AH_TEMPLATE([AO_PREFER_GENERALIZED],