Merge remote-tracking branch 'thesamesam/which-hunt'

diff --combined lib/configure
index 2c74d9df64e8ab17e94fadd8ba9040aa8e8202cb,85bf0b8fe49e72e184bf1dd3e0dbb59d2d5f880f..7585bfe5b6deb739dc916f1f70629277c7c06177
--- 1/lib/configure
--- 2/lib/configure
+++ b/lib/configure
@@@ -145,10 -145,9 +145,10 @@@ case $sys i
                EXEEXT=.exe
                ;;
        cygwin|windows)
 -              echo_n " win32-cfgmgr32"
 +              echo_n " win32-cfgmgr32 win32-sysdbg"
                echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
                echo >>$c '#define PCI_HAVE_PM_WIN32_CFGMGR32'
 +              echo >>$c '#define PCI_HAVE_PM_WIN32_SYSDBG'
                # Warning: MinGW-w64 (incorrectly) provides cfgmgr32 functions
                # also in other import libraries, not only in libcfgmgr32.a.
                # So always set -lcfgmgr32 as a first library parameter which
@@@ -239,7 -238,7 +239,7 @@@ if [ "$sys" = linux ] ; the
                PKG_CONFIG=pkg-config
        fi
        if [ "$LIBKMOD" != no ] ; then
-               if ! which $PKG_CONFIG >/dev/null ; then
+               if ! command -v $PKG_CONFIG >/dev/null ; then
                        echo_n "($PKG_CONFIG not found) "
                elif $PKG_CONFIG libkmod ; then
                        LIBKMOD_DETECTED=1
@@@ -269,7 -268,7 +269,7 @@@
        if [ "$HWDB" = yes -o "$HWDB" = no ] ; then
                echo "$HWDB (set manually)"
        else
-               if `which pkg-config >/dev/null && pkg-config --atleast-version=196 libudev` ; then
+               if `command -v $PKG_CONFIG >/dev/null && $PKG_CONFIG --atleast-version=196 libudev` ; then
                        HWDB=yes
                else
                        HWDB=no