Build cleanup

Makefile.am

@@ -114,12 +114,4 @@ clean-all:
 
 .PHONY: $(PHONY_TARGETS)
 
-# TODO(jmmv): Remove after atf 0.22.
-install-data-hook:
-	cd $(DESTDIR)$(man3dir) && \
-	for binding in c c++ sh; do \
-	    rm -f "atf-$${binding}-api.3"; \
-	    $(LN_S) "atf-$${binding}.3" "atf-$${binding}-api.3"; \
-	done
-
 # vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8

atf-c++/detail/Makefile.am.inc

@@ -25,7 +25,6 @@
 
 libatf_c___la_SOURCES += atf-c++/detail/application.cpp \
                          atf-c++/detail/application.hpp \
-                         atf-c++/detail/auto_array.hpp \
                          atf-c++/detail/env.cpp \
                          atf-c++/detail/env.hpp \
                          atf-c++/detail/exceptions.cpp \

atf-c++/detail/test_helpers.hpp

@@ -45,8 +45,6 @@
     { \
         set_md_var("descr", "Tests that the " hdrname " file can be " \
             "included on its own, without any prerequisites"); \
-        const std::string cxx = atf::env::get("ATF_BUILD_CXX", ATF_BUILD_CXX); \
-        set_md_var("require.progs", cxx); \
     } \
     ATF_TEST_CASE_BODY(name) \
     { \
@@ -58,8 +56,6 @@
     ATF_TEST_CASE_HEAD(name) \
     { \
         set_md_var("descr", descr); \
-        const std::string cxx = atf::env::get("ATF_BUILD_CXX", ATF_BUILD_CXX); \
-        set_md_var("require.progs", cxx); \
     } \
     ATF_TEST_CASE_BODY(name) \
     { \

atf-c/defs.h.in

@@ -27,6 +27,7 @@
 #define ATF_C_DEFS_H
 
 #define ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(a, b) @ATTRIBUTE_FORMAT_PRINTF@
+#define ATF_DEFS_ATTRIBUTE_NONNULL @ATTRIBUTE_NONNULL@
 #define ATF_DEFS_ATTRIBUTE_NORETURN @ATTRIBUTE_NORETURN@
 #define ATF_DEFS_ATTRIBUTE_UNUSED @ATTRIBUTE_UNUSED@
 

atf-c/detail/env.c

@@ -25,10 +25,6 @@
 
 #include "atf-c/detail/env.h"
 
-#if defined(HAVE_CONFIG_H)
-#include "config.h"
-#endif
-
 #include <errno.h>
 #include <stdlib.h>
 
@@ -65,50 +61,19 @@ atf_env_set(const char *name, const char *val)
 {
     atf_error_t err;
 
-#if defined(HAVE_SETENV)
     if (setenv(name, val, 1) == -1)
-        err = atf_libc_error(errno, "Cannot set environment variable "
-                             "'%s' to '%s'", name, val);
+        err = atf_libc_error(errno,
+            "Cannot set environment variable '%s' to '%s'", name, val);
     else
         err = atf_no_error();
-#elif defined(HAVE_PUTENV)
-    char *buf;
-
-    err = atf_text_format(&buf, "%s=%s", name, val);
-    if (!atf_is_error(err)) {
-        if (putenv(buf) == -1)
-            err = atf_libc_error(errno, "Cannot set environment variable "
-                                 "'%s' to '%s'", name, val);
-        free(buf);
-    }
-#else
-#   error "Don't know how to set an environment variable."
-#endif
 
     return err;
 }
 
 atf_error_t
 atf_env_unset(const char *name)
 {
-    atf_error_t err;
 
-#if defined(HAVE_UNSETENV)
     unsetenv(name);
-    err = atf_no_error();
-#elif defined(HAVE_PUTENV)
-    char *buf;
-
-    err = atf_text_format(&buf, "%s=", name);
-    if (!atf_is_error(err)) {
-        if (putenv(buf) == -1)
-            err = atf_libc_error(errno, "Cannot unset environment variable"
-                                 " '%s'", name);
-        free(buf);
-    }
-#else
-#   error "Don't know how to unset an environment variable."
-#endif
-
-    return err;
+    return (atf_no_error());
 }

atf-c/detail/process.c

@@ -23,6 +23,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  */
 
+#include "config.h"
+
 #include "atf-c/detail/process.h"
 
 #include <sys/types.h>

configure.ac

@@ -58,27 +58,17 @@ AM_PROG_CC_C_O
 dnl The C compiler check automatically aborts if the compiler does not work.
 dnl Nothing to do here.
 
-AC_LANG(C++)
+AC_USE_SYSTEM_EXTENSIONS
+
 AC_PROG_CXX
-AC_CACHE_CHECK([whether the C++ compiler works],
-               [atf_cv_prog_cxx_works],
-               [AC_LANG_PUSH([C++])
-                AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-                               [atf_cv_prog_cxx_works=yes],
-                               [atf_cv_prog_cxx_works=no])
-                AC_LANG_POP])
-if test "${atf_cv_prog_cxx_works}" = no; then
-    AC_MSG_ERROR([C++ compiler cannot create executables])
-fi
+AC_LANG_COMPILER(C++)
+AC_PROG_CPP
+AX_CXX_COMPILE_STDCXX(14, noext, mandatory)
 
 KYUA_DEVELOPER_MODE([C,C++])
 
-dnl TODO(jmmv): Remove once the atf-*-api.3 symlinks are removed.
-AC_PROG_LN_S
-
 ATF_MODULE_APPLICATION
 ATF_MODULE_DEFS
-ATF_MODULE_ENV
 ATF_MODULE_FS
 
 ATF_RUNTIME_TOOL([ATF_BUILD_CC],