From 5bee9026651e4f2f07e524dce7c9d8da75eafa19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Fri, 28 Aug 2020 11:54:50 +0200 Subject: [PATCH] Drop configure option --enable-proc Move to HTOP_LINUX, as --enable-proc implies my_htop_platform=linux, and the Linux features do not work without a proc fs. --- configure.ac | 7 ------- htop.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 18291b95..e46b6eba 100644 --- a/configure.ac +++ b/configure.ac @@ -111,13 +111,6 @@ AC_SUBST(wextra_flag) # ---------------------------------------------------------------------- PROCDIR=/proc -AC_ARG_ENABLE(proc, [AS_HELP_STRING([--enable-proc], [use Linux-compatible proc filesystem])], enable_proc="yes", enable_proc="no") -if test "x$enable_proc" = xyes; then - # An enabled proc assumes we're emulating Linux. - my_htop_platform=linux - AC_DEFINE(HAVE_PROC, 1, [Define if using a Linux-compatible proc filesystem.]) -fi - AC_ARG_WITH(proc, [AS_HELP_STRING([--with-proc=DIR], [Location of a Linux-compatible proc filesystem (default=/proc).])], if test -n "$withval"; then diff --git a/htop.c b/htop.c index 7cdf4e42..c7689c66 100644 --- a/htop.c +++ b/htop.c @@ -200,7 +200,7 @@ int main(int argc, char** argv) { CommandLineSettings flags = parseArguments(argc, argv); // may exit() -#ifdef HAVE_PROC +#ifdef HTOP_LINUX if (access(PROCDIR, R_OK) != 0) { fprintf(stderr, "Error: could not read procfs (compiled to look in %s).\n", PROCDIR); exit(1);