diff options
| author | Explorer09 <explorer09@gmail.com> | 2018-12-30 12:18:27 +0800 |
|---|---|---|
| committer | Explorer09 <explorer09@gmail.com> | 2019-06-14 10:10:23 +0800 |
| commit | 351297108488d0a77f4ce666c1b7d82e6aae0831 (patch) | |
| tree | 4638f989ebcd0df9a34c41bd2d681ace5d389b8b /configure.ac | |
| parent | 402e46bb82964366746b86d77eb5afa69c279539 (diff) | |
Fix configure 'major' workaround causing <sys/sysmacros.h> to miss.
A logic mistake in pull request #746 causes <sys/sysmacro.h> to be
*not* included when AC_HEADER_MAJOR (before autoconf-2.70) finds
'major' in <sys/types.h>. Though this would still build htop, it would
still bring deprecation warning in systems using glibc 2.25-2.27. Fix
the logic and suppress the warning.
Also, include config.h in Process.c for the sake of strengthening the
code.
Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index ffd8fede..4c7360e6 100644 --- a/configure.ac +++ b/configure.ac @@ -69,7 +69,7 @@ dnl glibc 2.25 deprecates 'major' and 'minor' in <sys/types.h> and requires to dnl include <sys/sysmacros.h>. However the logic in AC_HEADER_MAJOR has not yet dnl been updated in Autoconf 2.69, so use a workaround: m4_version_prereq([2.70], [], -[if test "x$ac_cv_header_sys_mkdev_h" = xno; then +[if test "x$ac_cv_header_sys_mkdev_h" != xyes; then AC_CHECK_HEADER(sys/sysmacros.h, [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, [Define to 1 if `major', `minor', and `makedev' are declared in <sys/sysmacros.h>.])]) fi]) |