[build] support autoconf-archive 2019.01.06 (#457)

This PR adds support for autoconf-archive 2019.01.06, which doesn't
define CODE_COVERAGE_RULES anymore.

Author: bukepo

Makefile.am

@@ -21,7 +21,7 @@ DIST_TARGETS = dist-gzip dist-bzip2
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 AM_DISTCHECK_CONFIGURE_FLAGS = --enable-all-restricted-plugins
 
-@CODE_COVERAGE_RULES@
+include $(top_srcdir)/pre.am
 
 SUBDIRS =                              \
 	src                                \
@@ -61,6 +61,11 @@ EXTRA_DIST =                           \
 	$(NULL)
 
 
+if AUTOCONF_HAVE_AM_INCLUDE_STATIC
+EXTRA_DIST +=                          \
+	aminclude_static.am                \
+	$(NULL)
+endif
 
 HASH_VERSION = $(shell                                                   \
 	git describe --dirty --match __poison__ --always 2> /dev/null        \

bootstrap.sh

@@ -90,15 +90,6 @@ then
 		echo "Debian/Ubuntu ........ apt-get install pkg-config"
 		exit 1
 	}
-
-	grep -q AX_CHECK_ configure && {
-		echo " *** error: The 'autoconf-archive' package is not installed."
-		echo "Use the appropriate command for your platform to install the package:"
-		echo ""
-		echo "Homebrew(OS X) ....... brew install autoconf-archive"
-		echo "Debian/Ubuntu ........ apt-get install autoconf-archive"
-		exit 1
-	}
 fi
 
 if test "$BOOTSTRAP_ANDROID" = 1

configure.ac

@@ -340,6 +340,10 @@ m4_foreach_w(THIS_PLUGIN,RESTRICTED_USE_NCP_PLUGINS,[
 
 AC_SUBST(default_ncp_plugin)
 
+AC_CHECK_FILE([${srcdir}/aminclude_static.am],
+		 [AM_CONDITIONAL(AUTOCONF_HAVE_AM_INCLUDE_STATIC, [true])],
+		 [AM_CONDITIONAL(AUTOCONF_HAVE_AM_INCLUDE_STATIC, [false])])
+
 AC_OUTPUT
 
 echo ""

pre.am

@@ -0,0 +1,24 @@
+#
+# Copyright (c) 2020 Nest Labs, Inc.
+# All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+if AUTOCONF_HAVE_AM_INCLUDE_STATIC
+-include $(top_srcdir)/aminclude_static.am
+clean-local: code-coverage-clean
+dist-clean-local: code-coverage-dist-clean
+else
+@CODE_COVERAGE_RULES@
+endif

src/ipc-dbus/Makefile.am

@@ -23,7 +23,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/third_party/assert-macros \
 	$(NULL)
 
-@CODE_COVERAGE_RULES@
+include $(top_srcdir)/pre.am
 
 EXTRA_DIST = wpantund.conf
 
@@ -75,4 +75,4 @@ libwpantund_dbus_fuzz_la_LIBADD =  $(DBUS_LIBS)
 libwpantund_dbus_fuzz_la_CPPFLAGS = $(AM_CPPFLAGS) $(DBUS_CFLAGS) $(FUZZ_CPPFLAGS) $(CODE_COVERAGE_CPPFLAGS)
 libwpantund_dbus_fuzz_la_CXXFLAGS = $(AM_CXXFLAGS) $(BOOST_CXXFLAGS) $(FUZZ_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
 
-pkginclude_HEADERS = wpan-dbus-v0.h wpan-dbus-v1.h
+pkginclude_HEADERS = wpan-dbus-v0.h wpan-dbus-v1.h

src/ncp-spinel/Makefile.am

@@ -25,7 +25,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/third_party/openthread/src/ncp \
 	$(NULL)
 
-@CODE_COVERAGE_RULES@
+include $(top_srcdir)/pre.am
 
 DISTCLEANFILES = \
 	.deps \
@@ -144,4 +144,4 @@ endif
 if APPEND_NETWORK_TIME_RECEIVED_MONOTONIC_TIMESTAMP
 ncp_spinel_la_CPPFLAGS += -DAPPEND_NETWORK_TIME_RECEIVED_MONOTONIC_TIMESTAMP=1
 libncp_spinel_fuzz_la_CPPFLAGS += -DAPPEND_NETWORK_TIME_RECEIVED_MONOTONIC_TIMESTAMP=1
-endif
+endif

src/wpanctl/Makefile.am

@@ -24,7 +24,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/third_party/assert-macros \
 	$(NULL)
 
-@CODE_COVERAGE_RULES@
+include $(top_srcdir)/pre.am
 
 DISTCLEANFILES = .deps Makefile
 

src/wpantund/Makefile.am

@@ -26,7 +26,7 @@ AM_CPPFLAGS = \
 	$(MISSING_CPPFLAGS) \
 	$(NULL)
 
-@CODE_COVERAGE_RULES@
+include $(top_srcdir)/pre.am
 
 DISTCLEANFILES = \
 	.deps \