lspci: Indent PCIe Capability DevCap2 & DevCtl2 correctly

[pciutils.git] / lib / configure

diff --git a/lib/configure b/lib/configure
index 86bd43c9bb6bf203ae2b261ea5a6d233f71f9d1b..7d4cec85fd2ca8d8838ed2d1ba5f7c5a0a93c1af 100755 (executable)
--- a/lib/configure
+++ b/lib/configure
@@ -44,7 +44,7 @@ if [ -z "$HOST" ] ; then
 fi
 [ -n "$RELEASE" ] && rel="${RELEASE}"
 # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless.
-host=`echo $HOST | sed -e 's/^\([^-]*\)-\([^-]*\)-\([^-]*\)-\([^-]*\)$/\1-\3/' -e 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | tr '[A-Z]' '[a-z]'`
+host=`echo $HOST | sed -e 's/^\([^-]*\)-\([^-]*\)-\([^-]*\)-\([^-]*\)$/\1-\3/' -e 's/^\([^-]*\)-\([^-]*\)-\([^-]*\)$/\1-\2/' -e 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | tr '[A-Z]' '[a-z]'`
 cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo " $host $rel $cpu $sys"
@@ -58,6 +58,7 @@ echo >$m 'WITH_LIBS='
 
 echo_n "Looking for access methods..."
 LIBRESOLV=-lresolv
+LIBEXT=so
 
 case $sys in
        linux*)
@@ -86,7 +87,7 @@ case $sys in
                esac
                echo >>$c '#define PCI_HAVE_STDINT_H'
                ;;
-       freebsd)
+       freebsd*)
                echo_n " fbsd-device"
                echo >>$c '#define PCI_HAVE_PM_FBSD_DEVICE'
                echo >>$c '#define PCI_PATH_FBSD_DEVICE "/dev/pci"'
@@ -100,6 +101,15 @@ case $sys in
                echo >>$c '#define PCI_PATH_OBSD_DEVICE "/dev/pci"'
                LIBRESOLV=
                ;;
+
+        darwin*)
+               echo_n " darwin"
+               echo >>$c '#define PCI_HAVE_PM_DARWIN_DEVICE'
+               echo >>$m 'WITH_LIBS+=-lresolv -framework CoreFoundation -framework IOKit'
+               echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
+               LIBRESOLV=
+               LIBEXT=dylib
+               ;;
        aix)
                echo_n " aix-device"
                echo >>$c '#define PCI_HAVE_PM_AIX_DEVICE'
@@ -138,6 +148,7 @@ case $sys in
                ;;
 esac
 
+echo >>$m "LIBEXT="$LIBEXT
 echo >>$c '#define PCI_HAVE_PM_DUMP'
 echo " dump"
 
@@ -182,10 +193,13 @@ fi
 if [ "$sys" = linux ] ; then
        echo_n "Checking for libkmod... "
        LIBKMOD_DETECTED=
+       if [ -z "$PKG_CONFIG" ] ; then
+               PKG_CONFIG=pkg-config
+       fi
        if [ "$LIBKMOD" != no ] ; then
-               if ! which pkg-config >/dev/null ; then
-                       echo_n "(pkg-config not found) "
-               elif pkg-config libkmod ; then
+               if ! which $PKG_CONFIG >/dev/null ; then
+                       echo_n "($PKG_CONFIG not found) "
+               elif $PKG_CONFIG libkmod ; then
                        LIBKMOD_DETECTED=1
                fi
        fi
@@ -205,8 +219,25 @@ if [ "$sys" = linux ] ; then
        fi
        if [ "$LIBKMOD" = yes ] ; then
                echo >>$c "#define PCI_USE_LIBKMOD"
-               echo >>$m "LIBKMOD_CFLAGS=$(pkg-config --cflags libkmod)"
-               echo >>$m "LIBKMOD_LIBS=$(pkg-config --libs libkmod)"
+               echo >>$m "LIBKMOD_CFLAGS=$($PKG_CONFIG --cflags libkmod)"
+               echo >>$m "LIBKMOD_LIBS=$($PKG_CONFIG --libs libkmod)"
+       fi
+
+       echo_n "Checking for udev hwdb support... "
+       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
+                       HWDB=yes
+               else
+                       HWDB=no
+               fi
+               echo "$HWDB (auto-detected)"
+       fi
+       if [ "$HWDB" = yes ] ; then
+               echo >>$c '#define PCI_HAVE_HWDB'
+               echo >>$m 'LIBUDEV=-ludev'
+               echo >>$m 'WITH_LIBS+=$(LIBUDEV)'
        fi
 fi
 
@@ -216,13 +247,17 @@ if [ "$SHARED" = no ] ; then
        echo >>$m 'LDLIBS=$(WITH_LIBS)'
        echo >>$m 'LIB_LDLIBS='
 else
-       echo >>$m 'PCILIB=$(LIBNAME).so.$(VERSION)'
+       if [ "$LIBEXT" = so ]; then
+               echo >>$m 'PCILIB=$(LIBNAME).$(LIBEXT).$(VERSION)'
+       else
+               echo >>$m 'PCILIB=$(LIBNAME).$(VERSION).$(LIBEXT)'
+       fi
        # We link the dependencies _to_ the library, so we do not need explicit deps in .pc
        echo >>$m 'LDLIBS='
        echo >>$m 'LIB_LDLIBS=$(WITH_LIBS)'
        echo >>$c '#define PCI_SHARED_LIB'
-       if [ "$SHARED" = yes ] ; then
-               echo >>$m 'SONAME=-Wl,-soname,$(LIBNAME).so$(ABI_VERSION)'
+       if [ "$SHARED" = yes -a "$LIBEXT" = so ]; then
+               echo >>$m 'SONAME=-Wl,-soname,$(LIBNAME).$(LIBEXT)$(ABI_VERSION)'
        fi
 fi
 echo >>$m 'PCILIBPC=$(LIBNAME).pc'