From 8c82a38002ce09db2a0b83dab8b598cf1ab0596c Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 11 Apr 2016 13:01:17 +0200 Subject: Imported Upstream version 2.0.1 --- configure | 64 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 31 insertions(+), 33 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 70eb844..2acf0c3 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for htop 2.0.0. +# Generated by GNU Autoconf 2.69 for htop 2.0.1. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='htop' PACKAGE_TARNAME='htop' -PACKAGE_VERSION='2.0.0' -PACKAGE_STRING='htop 2.0.0' +PACKAGE_VERSION='2.0.1' +PACKAGE_STRING='htop 2.0.1' PACKAGE_BUGREPORT='hisham@gobolinux.org' PACKAGE_URL='' @@ -784,7 +784,7 @@ enable_vserver enable_ancient_vserver enable_taskstats enable_unicode -enable_native_affinity +enable_linux_affinity enable_hwloc ' ac_precious_vars='build_alias @@ -1336,7 +1336,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures htop 2.0.0 to adapt to many kinds of systems. +\`configure' configures htop 2.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1407,7 +1407,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of htop 2.0.0:";; + short | recursive ) echo "Configuration of htop 2.0.1:";; esac cat <<\_ACEOF @@ -1436,10 +1436,8 @@ Optional Features: --enable-taskstats enable per-task IO Stats (taskstats kernel sup required) --enable-unicode enable Unicode support - --enable-native-affinity - enable native sched_setaffinity and - sched_getaffinity for affinity support, disables - hwloc + --enable-linux-affinity enable Linux sched_setaffinity and sched_getaffinity + for affinity support, disables hwloc --enable-hwloc enable hwloc support for CPU affinity Optional Packages: @@ -1529,7 +1527,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -htop configure 2.0.0 +htop configure 2.0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1952,7 +1950,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by htop $as_me 2.0.0, which was +It was created by htop $as_me 2.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4300,7 +4298,7 @@ fi # Define the identity of the package. PACKAGE='htop' - VERSION='2.0.0' + VERSION='2.0.1' cat >>confdefs.h <<_ACEOF @@ -14000,14 +13998,14 @@ fi fi -# Check whether --enable-native_affinity was given. -if test "${enable_native_affinity+set}" = set; then : - enableval=$enable_native_affinity; +# Check whether --enable-linux_affinity was given. +if test "${enable_linux_affinity+set}" = set; then : + enableval=$enable_linux_affinity; else - enable_native_affinity="yes" + enable_linux_affinity="yes" fi -if test "x$enable_native_affinity" = xyes -a "x$cross_compiling" = xno; then +if test "x$enable_linux_affinity" = xyes -a "x$cross_compiling" = xno; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable sched_setaffinity" >&5 $as_echo_n "checking for usable sched_setaffinity... " >&6; } if test "$cross_compiling" = yes; then : @@ -14040,7 +14038,7 @@ if ac_fn_c_try_run "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - enable_native_affinity=no + enable_linux_affinity=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -14049,9 +14047,9 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -if test "x$enable_native_affinity" = xyes; then +if test "x$enable_linux_affinity" = xyes; then -$as_echo "#define HAVE_NATIVE_AFFINITY 1" >>confdefs.h +$as_echo "#define HAVE_LINUX_AFFINITY 1" >>confdefs.h fi @@ -14064,9 +14062,9 @@ fi if test "x$enable_hwloc" = xyes then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hwloc_linux_get_tid_cpubind in -lhwloc" >&5 -$as_echo_n "checking for hwloc_linux_get_tid_cpubind in -lhwloc... " >&6; } -if ${ac_cv_lib_hwloc_hwloc_linux_get_tid_cpubind+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hwloc_get_proc_cpubind in -lhwloc" >&5 +$as_echo_n "checking for hwloc_get_proc_cpubind in -lhwloc... " >&6; } +if ${ac_cv_lib_hwloc_hwloc_get_proc_cpubind+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -14080,27 +14078,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char hwloc_linux_get_tid_cpubind (); +char hwloc_get_proc_cpubind (); int main () { -return hwloc_linux_get_tid_cpubind (); +return hwloc_get_proc_cpubind (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_hwloc_hwloc_linux_get_tid_cpubind=yes + ac_cv_lib_hwloc_hwloc_get_proc_cpubind=yes else - ac_cv_lib_hwloc_hwloc_linux_get_tid_cpubind=no + ac_cv_lib_hwloc_hwloc_get_proc_cpubind=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hwloc_hwloc_linux_get_tid_cpubind" >&5 -$as_echo "$ac_cv_lib_hwloc_hwloc_linux_get_tid_cpubind" >&6; } -if test "x$ac_cv_lib_hwloc_hwloc_linux_get_tid_cpubind" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hwloc_hwloc_get_proc_cpubind" >&5 +$as_echo "$ac_cv_lib_hwloc_hwloc_get_proc_cpubind" >&6; } +if test "x$ac_cv_lib_hwloc_hwloc_get_proc_cpubind" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBHWLOC 1 _ACEOF @@ -14737,7 +14735,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by htop $as_me 2.0.0, which was +This file was extended by htop $as_me 2.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14803,7 +14801,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -htop config.status 2.0.0 +htop config.status 2.0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- cgit v1.2.3