Merge remote-tracking branch 'github/pr/2080'

diff --combined configure.ac
index ad717e3,dcec771..9eb9739
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1861,33 -1861,6 +1861,6 @@@ f
  # Checks for libraries begin here
  #
  
- # Check for HAL (hardware abstraction library)
- PKG_CHECK_MODULES([HAL], [hal],
-   [
-     SAVE_LIBS="$LIBS"
-     LIBS="$HAL_LIBS $LIBS"
-     AC_CHECK_LIB([hal], [libhal_device_property_exists],
-       [
-         SAVE_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="$HAL_CFLAGS $CPPFLAGS"
-         AC_CHECK_HEADERS([libhal.h],
-         [
-           with_libhal="yes"
-           BUILD_WITH_LIBHAL_CFLAGS="$HAL_CFLAGS"
-           BUILD_WITH_LIBHAL_LIBS="$HAL_LIBS"
-         ])
-         CPPFLAGS="$SAVE_CPPFLAGS"
-       ],
-       [with_libhal="no"]
-     )
-     LIBS="$SAVE_LIBS"
-   ],
-   [with_libhal="no"]
- )
- AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
- AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
- 
- 
  # Check for libpthread
  SAVE_LIBS="$LIBS"
  AC_CHECK_LIB([pthread],
@@@ -1984,7 -1957,7 +1957,7 @@@ AM_CONDITIONAL([BUILD_WITH_LIBIOKIT], [
  with_libkvm="no"
  AC_CHECK_LIB([kvm], [kvm_getprocs],
    [with_kvm_getprocs="yes"],
 -  []
 +  [with_kvm_getprocs="no"]
  )
  
  if test "x$with_kvm_getprocs" = "xyes"; then
@@@ -1998,7 -1971,7 +1971,7 @@@ AM_CONDITIONAL([BUILD_WITH_LIBKVM_GETPR
  
  AC_CHECK_LIB([kvm], [kvm_getswapinfo],
    [with_kvm_getswapinfo="yes"],
 -  []
 +  [with_kvm_getswapinfo="no"]
  )
  
  if test "x$with_kvm_getswapinfo" = "xyes"; then
@@@ -2012,7 -1985,7 +1985,7 @@@ AM_CONDITIONAL([BUILD_WITH_LIBKVM_GETSW
  
  AC_CHECK_LIB([kvm], [kvm_nlist],
    [with_kvm_nlist="yes"],
 -  []
 +  [with_kvm_nlist="no"]
  )
  
  if test "x$with_kvm_nlist" = "xyes"; then
@@@ -2027,7 -2000,7 +2000,7 @@@ AM_CONDITIONAL([BUILD_WITH_LIBKVM_NLIST
  
  AC_CHECK_LIB([kvm], [kvm_openfiles],
    [with_kvm_openfiles="yes"],
 -  []
 +  [with_kvm_openfiles="no"]
  )
  
  if test "x$with_kvm_openfiles" = "xyes"; then
@@@ -3455,7 -3428,7 +3428,7 @@@ if test "x$with_libmysql" = "xyes"; the
  
      AC_CHECK_HEADERS([mysql.h],
        [have_mysql_h="yes"],
 -      []
 +      [have_mysql_h="no"]
      )
  
      if test "x$have_mysql_h" != "xyes"; then
@@@ -4560,7 -4533,8 +4533,7 @@@ if test "x$with_librabbitmq" = "xyes"; 
      [
        AC_DEFINE([HAVE_AMQP_TCP_SOCKET], [1],
          [Define if librabbitmq provides the new TCP socket interface.])
 -    ],
 -    []
 +    ]
    )
  
    AC_CHECK_DECLS([amqp_socket_close],
@@@ -5983,7 -5957,7 +5956,7 @@@ if test "x$ac_system" = "xLinux"; the
      plugin_ipvs="yes"
    fi
  
 -  if test "x$c_cv_have_usable_asm_msrindex_h" = "xyes" && test "x$have_cpuid_h" = "xyes" && test "x$have_capability" = "xyes"; then
 +  if test "x$c_cv_have_usable_asm_msrindex_h" = "xyes" && test "x$have_cpuid_h" = "xyes"; then
      plugin_turbostat="yes"
    fi
    
@@@ -6634,7 -6608,6 +6607,6 @@@ AC_MSG_RESULT([    libganglia  . . . . 
  AC_MSG_RESULT([    libgcrypt . . . . . . $with_libgcrypt])
  AC_MSG_RESULT([    libgps  . . . . . . . $with_libgps])
  AC_MSG_RESULT([    libgrpc++ . . . . . . $with_libgrpcpp])
- AC_MSG_RESULT([    libhal  . . . . . . . $with_libhal])
  AC_MSG_RESULT([    libhiredis  . . . . . $with_libhiredis])
  AC_MSG_RESULT([    libi2c-dev  . . . . . $with_libi2c])
  AC_MSG_RESULT([    libiokit  . . . . . . $with_libiokit])