diff -up nut-2.4.0/m4/nut_check_libhal.m4.halpath nut-2.4.0/m4/nut_check_libhal.m4 --- nut-2.4.0/m4/nut_check_libhal.m4.halpath 2009-02-09 12:18:36.578732609 +0100 +++ nut-2.4.0/m4/nut_check_libhal.m4 2009-02-09 12:18:36.579732703 +0100 @@ -75,29 +75,8 @@ if test -z "${nut_have_libhal_seen}"; th dnl As per HAL spec, §5 Callouts and §2 Device Information Files dnl - addon install path: $libdir/hal AC_MSG_CHECKING(for libhal Callouts path) - HAL_CALLOUTS_PATH=`pkg-config --silence-errors --variable=libexecdir hal` - if (test -z "$HAL_CALLOUTS_PATH") - then - # fallback to detecting the right path - if (test -d "${libdir}/hal") - then - # For Debian - HAL_CALLOUTS_PATH="${libdir}/hal" - AC_MSG_RESULT(${HAL_CALLOUTS_PATH}) - else # For RedHat - if (test -d "/usr/libexec") - then - HAL_CALLOUTS_PATH="${libexecdir}" - AC_MSG_RESULT(${HAL_CALLOUTS_PATH}) - else - # FIXME - HAL_CALLOUTS_PATH="${libdir}/hal" - AC_MSG_RESULT(using default (${HAL_CALLOUTS_PATH})) - fi - fi - else - AC_MSG_RESULT(${HAL_CALLOUTS_PATH}) - fi + HAL_CALLOUTS_PATH="${libexecdir}" + AC_MSG_RESULT(${HAL_CALLOUTS_PATH}) dnl - fdi install path: $datarootdir/hal/fdi/information/20thirdparty AC_MSG_CHECKING(for libhal Device Information path)