X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=9eb9739332c079fc6dea29ce617b4d2788cc64b5;hb=73e49352aa8c5e5ec47918dba93b508b481fe431;hp=3d577b4d1054e700572008d080741dc8e8796fca;hpb=4e8e1adb1b6affe8af4a844480b4cd11fbfae27e;p=collectd.git diff --git a/configure.ac b/configure.ac index 3d577b4d..9eb97393 100644 --- a/configure.ac +++ b/configure.ac @@ -1861,33 +1861,6 @@ fi # 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 @@ AM_CONDITIONAL([BUILD_WITH_LIBIOKIT], [test "x$with_libiokit" = "xyes"]) 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 @@ AM_CONDITIONAL([BUILD_WITH_LIBKVM_GETPROCS], [test "x$with_kvm_getprocs" = "xyes 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 @@ AM_CONDITIONAL([BUILD_WITH_LIBKVM_GETSWAPINFO], [test "x$with_kvm_getswapinfo" = 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 @@ AM_CONDITIONAL([BUILD_WITH_LIBKVM_NLIST], [test "x$with_kvm_nlist" = "xyes"]) 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 @@ if test "x$with_libmysql" = "xyes"; then AC_CHECK_HEADERS([mysql.h], [have_mysql_h="yes"], - [] + [have_mysql_h="no"] ) if test "x$have_mysql_h" != "xyes"; then @@ -4560,8 +4533,7 @@ if test "x$with_librabbitmq" = "xyes"; then [ AC_DEFINE([HAVE_AMQP_TCP_SOCKET], [1], [Define if librabbitmq provides the new TCP socket interface.]) - ], - [] + ] ) AC_CHECK_DECLS([amqp_socket_close], @@ -6635,7 +6607,6 @@ AC_MSG_RESULT([ libganglia . . . . . $with_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])