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

[pciutils.git] / lib / configure

diff --git a/lib/configure b/lib/configure
index c736e014d0109852c4f6fdfcf58e2a589b5fa7a0..7585bfe5b6deb739dc916f1f70629277c7c06177 100755 (executable)
--- a/lib/configure
+++ b/lib/configure
@@ -145,14 +145,16 @@ case $sys in
                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
                # instruct linker to prefer symbols from cfgmgr32.dll.
                echo >>$m 'WITH_LIBS+=-lcfgmgr32'
+               case $cpu in i?86|x86_64)
                echo_n " i386-ports"
                echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
                if [ "$sys" = "cygwin" ] ; then
@@ -162,6 +164,7 @@ case $sys in
                        # advapi32 is windows system library and used only by lib/i386-io-windows.h
                        echo >>$m 'WITH_LIBS+=-ladvapi32'
                fi
+               ;; esac
                EXEEXT=.exe
                ;;
        beos|haiku)
@@ -236,7 +239,7 @@ if [ "$sys" = linux ] ; then
                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
@@ -266,7 +269,7 @@ if [ "$sys" = linux ] ; then
        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