From ff9409b1737627857eb47f64f536a3f66b6a09a4 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 11 Apr 2016 13:01:07 +0200 Subject: Imported Upstream version 2.0.0 --- configure.ac | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 130 insertions(+), 22 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 2b934e8..3bd58bc 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,9 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.65) -AC_INIT([htop],[1.0.3],[hisham@gobolinux.org]) +AC_INIT([htop],[2.0.0],[hisham@gobolinux.org]) + +year=$(date +%Y) # The following two lines are required by hwloc scripts AC_USE_SYSTEM_EXTENSIONS @@ -14,6 +16,7 @@ AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) # Checks for programs. +# ---------------------------------------------------------------------- AC_PROG_CC AM_PROG_CC_C_O @@ -21,10 +24,32 @@ AC_DISABLE_SHARED AC_ENABLE_STATIC AC_PROG_LIBTOOL +# Checks for platform. +# ---------------------------------------------------------------------- +case "$target" in +*linux*) + my_htop_platform=linux + ;; +*freebsd*) + my_htop_platform=freebsd + ;; +*openbsd*) + my_htop_platform=openbsd + ;; +*darwin*) + my_htop_platform=darwin + ;; +*) + my_htop_platform=unsupported + ;; +esac + # Checks for libraries. +# ---------------------------------------------------------------------- AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"]) # Checks for header files. +# ---------------------------------------------------------------------- AC_HEADER_DIRENT AC_HEADER_STDC AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h],[:],[ @@ -33,12 +58,14 @@ AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h],[ AC_CHECK_HEADERS([execinfo.h],[:],[:]) # Checks for typedefs, structures, and compiler characteristics. +# ---------------------------------------------------------------------- AC_HEADER_STDBOOL AC_C_CONST AC_TYPE_PID_T AC_TYPE_UID_T -# Checks for library functions. +# Checks for library functions and compiler features. +# ---------------------------------------------------------------------- AC_FUNC_CLOSEDIR_VOID AC_TYPE_SIGNAL AC_FUNC_STAT @@ -52,14 +79,44 @@ AC_TRY_COMPILE(AC_INCLUDES_DEFAULT, [char *a; a = strdup("foo"); int i = 0; i++; AC_MSG_ERROR([htop is written in C99. A newer version of gcc is required.])) CFLAGS="$save_cflags" +save_cflags="${CFLAGS}" +CFLAGS="$CFLAGS -Wextra" +AC_MSG_CHECKING([if compiler supports -Wextra]) +AC_TRY_COMPILE([], [], [ + wextra_flag=-Wextra + AC_MSG_RESULT([yes]) +],[ + wextra_flag= + AC_MSG_RESULT([no]) +]) +CFLAGS="$save_cflags" +AC_SUBST(wextra_flag) + +# Checks for features and flags. +# ---------------------------------------------------------------------- PROCDIR=/proc -AC_ARG_WITH(proc, [ --with-proc=DIR Location of a Linux-compatible proc filesystem (default=/proc).], - if test -n "$withval"; then - AC_DEFINE_UNQUOTED(PROCDIR, "$withval", [Path of proc filesystem]) - PROCDIR="$withval" - fi, - AC_DEFINE(PROCDIR, "/proc", [Path of proc filesystem])) +AC_ARG_ENABLE(proc, [AC_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, [AC_HELP_STRING([--with-proc=DIR], [Location of a Linux-compatible proc filesystem (default=/proc).])], + +if test -n "$withval"; then + AC_DEFINE_UNQUOTED(PROCDIR, "$withval", [Path of proc filesystem]) + PROCDIR="$withval" +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, [AC_HELP_STRING([--enable-openvz], [enable OpenVZ support])], ,enable_openvz="no") if test "x$enable_openvz" = xyes; then @@ -87,34 +144,71 @@ if test "x$enable_taskstats" = xyes; then AC_DEFINE(HAVE_TASKSTATS, 1, [Define if taskstats support enabled.]) fi +# HTOP_CHECK_SCRIPT(LIBNAME, FUNCTION, DEFINE, CONFIG_SCRIPT, ELSE_PART) +m4_define([HTOP_CHECK_SCRIPT], +[ + htop_config_script=$([$4] --libs 2> /dev/null) + htop_script_success=no + htop_save_LDFLAGS="$LDFLAGS" + if test ! "x$htop_config_script" = x; then + LDFLAGS="$htop_config_script $LDFLAGS" + AC_CHECK_LIB([$1], [$2], [ + AC_DEFINE([$3], 1, [The library is present.]) + LIBS="$htop_config_script $LIBS " + htop_script_success=yes + ], []) + LDFLAGS="$save_LDFLAGS" + fi + if test "x$htop_script_success" = xno; then + [$5] + fi +]) + +# HTOP_CHECK_LIB(LIBNAME, FUNCTION, DEFINE, ELSE_PART) +m4_define([HTOP_CHECK_LIB], +[ + AC_CHECK_LIB([$1], [$2], [ + AC_DEFINE([$3], 1, [The library is present.]) + LIBS="-l[$1] $LIBS " + ], [$4]) +]) + AC_ARG_ENABLE(unicode, [AC_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes") if test "x$enable_unicode" = xyes; then - AC_CHECK_LIB([ncursesw], [refresh], [], [ + HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config", + HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config", + HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config", + HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], + HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], + HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW], missing_libraries="$missing_libraries libncursesw" AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.]) - ]) + )))))) + AC_CHECK_HEADERS([ncursesw/curses.h],[:], [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], [AC_CHECK_HEADERS([ncurses/curses.h],[:], [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) else - AC_CHECK_LIB([ncurses], [refresh], [], [missing_libraries="$missing_libraries libncurses"]) + HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config", + HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config", + HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES], + HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES], + missing_libraries="$missing_libraries libncurses" + )))) + AC_CHECK_HEADERS([curses.h],[:], [AC_CHECK_HEADERS([ncurses/curses.h],[:], [AC_CHECK_HEADERS([ncurses/ncurses.h],[:], [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])]) fi -if test ! -z "$missing_libraries"; then - AC_MSG_ERROR([missing libraries: $missing_libraries]) -fi -if test ! -z "$missing_headers"; then - AC_MSG_ERROR([missing headers: $missing_headers]) +if test "$my_htop_platform" = "freebsd"; then + AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"]) fi -if test "x$cross_compiling" = xno; then -AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/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 /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.)) +if test "$my_htop_platform" = "openbsd"; then + AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"]) fi AC_ARG_ENABLE(native_affinity, [AC_HELP_STRING([--enable-native-affinity], [enable native sched_setaffinity and sched_getaffinity for affinity support, disables hwloc])], ,enable_native_affinity="yes") @@ -145,10 +239,24 @@ then AC_CHECK_HEADERS([hwloc.h],[:], [missing_headers="$missing_headers $ac_header"]) fi -AC_ARG_ENABLE(oom, [AC_HELP_STRING([--enable-oom], [enable OOM score reporting])], ,enable_oom="no") -if test "x$enable_oom" = xyes; then - AC_DEFINE(HAVE_OOM, 1, [Define if OOM score support enabled.]) +# Bail out on errors. +# ---------------------------------------------------------------------- +if test ! -z "$missing_libraries"; then + AC_MSG_ERROR([missing libraries: $missing_libraries]) fi +if test ! -z "$missing_headers"; then + AC_MSG_ERROR([missing headers: $missing_headers]) +fi + +AC_DEFINE_UNQUOTED(COPYRIGHT, "(C) 2004-$year Hisham Muhammad", [Copyright message.]) +# We're done, let's go! +# ---------------------------------------------------------------------- +AM_CONDITIONAL([HTOP_LINUX], [test "$my_htop_platform" = linux]) +AM_CONDITIONAL([HTOP_FREEBSD], [test "$my_htop_platform" = freebsd]) +AM_CONDITIONAL([HTOP_OPENBSD], [test "$my_htop_platform" = openbsd]) +AM_CONDITIONAL([HTOP_DARWIN], [test "$my_htop_platform" = darwin]) +AM_CONDITIONAL([HTOP_UNSUPPORTED], [test "$my_htop_platform" = unsupported]) +AC_SUBST(my_htop_platform) AC_CONFIG_FILES([Makefile htop.1]) AC_OUTPUT -- cgit v1.2.3