cxl: Rename caps to be device caps

[pciutils.git] / lib / configure

diff --git a/lib/configure b/lib/configure
index e181b7fda13ef9632f3dda10a30b11255979e475..45a416a7620e0763216d323ade801bdf90f6073e 100755 (executable)
--- a/lib/configure
+++ b/lib/configure
@@ -9,7 +9,7 @@ echo_n() {
        printf '%s' "$*"
 }
 
        printf '%s' "$*"
 }
 

-if [ -z "$VERSION" -o -z "$IDSDIR" ] ; then
+if [ -z "$VERSION" ] ; then

        echo >&2 "Please run the configure script from the top-level Makefile"
        exit 1
 fi
        echo >&2 "Please run the configure script from the top-level Makefile"
        exit 1
 fi


@@ -62,6 +62,9 @@ echo >$m 'WITH_LIBS='
 echo_n "Looking for access methods..."
 LIBRESOLV=-lresolv
 LIBEXT=so
 echo_n "Looking for access methods..."
 LIBRESOLV=-lresolv
 LIBEXT=so

+EXEEXT=
+SYSINCLUDE=/usr/include
+LSPCIDIR=SBINDIR

 
 case $sys in
        linux*)
 
 case $sys in
        linux*)


@@ -77,6 +80,7 @@ case $sys in
                                                ;;
                esac
                echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
                                                ;;
                esac
                echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'

+               LSPCIDIR=BINDIR

                ;;
        sunos)
                case $cpu in
                ;;
        sunos)
                case $cpu in


@@ -112,6 +116,7 @@ case $sys in
                echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
                LIBRESOLV=
                LIBEXT=dylib
                echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
                LIBRESOLV=
                LIBEXT=dylib

+               SYSINCLUDE=$(xcrun --sdk macosx --show-sdk-path)/usr/include

                ;;
        aix)
                echo_n " aix-device"
                ;;
        aix)
                echo_n " aix-device"


@@ -137,11 +142,29 @@ case $sys in
        djgpp)
                echo_n " i386-ports"
                echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
        djgpp)
                echo_n " i386-ports"
                echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'

+               EXEEXT=.exe

                ;;
                ;;

-       cygwin)
+       cygwin|windows)
+               echo_n " win32-cfgmgr32"
+               echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
+               echo >>$c '#define PCI_HAVE_PM_WIN32_CFGMGR32'
+               # 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'
                echo_n " i386-ports"
                echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'

-               echo >>$m 'WITH_LIBS+=-lioperm'
+               if [ "$sys" = "cygwin" ] ; then
+                       # ioperm is cygwin specific library and used only by lib/i386-io-cygwin.h
+                       echo >>$m 'WITH_LIBS+=-lioperm'
+               elif [ "$sys" = "windows" ] ; then
+                       # 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)
                case $cpu in
                ;;
        beos|haiku)
                case $cpu in


@@ -165,6 +188,8 @@ case $sys in
 esac
 
 echo >>$m "LIBEXT="$LIBEXT
 esac
 
 echo >>$m "LIBEXT="$LIBEXT

+echo >>$m "EXEEXT="$EXEEXT
+echo >>$m "LSPCIDIR=\$($LSPCIDIR)"

 echo >>$c '#define PCI_HAVE_PM_DUMP'
 echo " dump"
 
 echo >>$c '#define PCI_HAVE_PM_DUMP'
 echo " dump"
 


@@ -172,7 +197,7 @@ echo_n "Checking for zlib support... "
 if [ "$ZLIB" = yes -o "$ZLIB" = no ] ; then
        echo "$ZLIB (set manually)"
 else
 if [ "$ZLIB" = yes -o "$ZLIB" = no ] ; then
        echo "$ZLIB (set manually)"
 else

-       if [ -f /usr/include/zlib.h -o -f /usr/local/include/zlib.h ] ; then
+       if [ -f "$SYSINCLUDE/zlib.h" -o -f /usr/local/include/zlib.h ] ; then

                ZLIB=yes
        else
                ZLIB=no
                ZLIB=yes
        else
                ZLIB=no


@@ -193,7 +218,7 @@ echo_n "Checking for DNS support... "
 if [ "$DNS" = yes -o "$DNS" = no ] ; then
        echo "$DNS (set manually)"
 else
 if [ "$DNS" = yes -o "$DNS" = no ] ; then
        echo "$DNS (set manually)"
 else

-       if [ -f /usr/include/resolv.h ] ; then
+       if [ "$sys" != "windows" -a -f "$SYSINCLUDE/resolv.h" ] ; then

                DNS=yes
        else
                DNS=no
                DNS=yes
        else
                DNS=no