From 84d39f95c68ce06b321010054955f6ce7213b2d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Tue, 15 Sep 2020 12:10:11 +0200 Subject: [PATCH] autotools: enable warnings and cleanup - enable warnings in autogen script - drop unused m4/ directory usage - drop AC_TYPE_SIGNAL: C99 guarantees the signal return type to be void - drop AC_CHECK_FILE of procdir: most of the time compilation is done on a different system than htop is run and there is a runtime check in place - improve linux_affinity corss compile logic: use fourth argument instead of pre-test --- Makefile.am | 2 -- autogen.sh | 3 +-- configure.ac | 14 +++----------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/Makefile.am b/Makefile.am index 50fb586b..dbf42d14 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,3 @@ - -ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = subdir-objects bin_PROGRAMS = htop diff --git a/autogen.sh b/autogen.sh index c07e0854..fb38e5e2 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,3 +1,2 @@ #!/bin/sh -mkdir -p m4 -autoreconf --install --force +autoreconf --force --install --verbose -Wall diff --git a/configure.ac b/configure.ac index 18617c12..12676fa3 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,6 @@ AC_INIT([htop],[3.0.2],[htop@groups.io]) AC_CONFIG_SRCDIR([htop.c]) AC_CONFIG_AUX_DIR([.]) AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) # Required by hwloc scripts AC_CANONICAL_TARGET @@ -81,7 +80,6 @@ AC_TYPE_UID_T # Checks for library functions and compiler features. # ---------------------------------------------------------------------- AC_FUNC_CLOSEDIR_VOID -AC_TYPE_SIGNAL AC_FUNC_STAT AC_CHECK_FUNCS([memmove strncasecmp strstr strdup]) @@ -118,13 +116,6 @@ AC_ARG_WITH(proc, [AS_HELP_STRING([--with-proc=DIR], [Location of a Linux-compat fi, AC_DEFINE(PROCDIR, "/proc", [Path of proc filesystem])) -if test "x$cross_compiling" = xno; then - if test "x$enable_proc" = xyes; then - AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find $PROCDIR/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) - AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find $PROCDIR/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) - fi -fi - AC_ARG_ENABLE(openvz, [AS_HELP_STRING([--enable-openvz], [enable OpenVZ support])], ,enable_openvz="no") if test "x$enable_openvz" = xyes; then AC_DEFINE(HAVE_OPENVZ, 1, [Define if openvz support enabled.]) @@ -237,7 +228,7 @@ if test "$my_htop_platform" = "solaris"; then fi AC_ARG_ENABLE(linux_affinity, [AS_HELP_STRING([--enable-linux-affinity], [enable Linux sched_setaffinity and sched_getaffinity for affinity support, disables hwloc])], ,enable_linux_affinity="yes") -if test "x$enable_linux_affinity" = xyes -a "x$cross_compiling" = xno; then +if test "x$enable_linux_affinity" = xyes; then AC_MSG_CHECKING([for usable sched_setaffinity]) AC_RUN_IFELSE([ AC_LANG_PROGRAM([[ @@ -251,7 +242,8 @@ if test "x$enable_linux_affinity" = xyes -a "x$cross_compiling" = xno; then ]])], [AC_MSG_RESULT([yes])], [enable_linux_affinity=no - AC_MSG_RESULT([no])]) + AC_MSG_RESULT([no])], + [AC_MSG_RESULT([yes (assumed while cross compiling)])]) fi if test "x$enable_linux_affinity" = xyes; then AC_DEFINE(HAVE_LINUX_AFFINITY, 1, [Define if Linux sched_setaffinity and sched_getaffinity are to be used.])