Fixed 64 bit addresses and released as 2.2.0.

[pciutils.git] / lib / configure

diff --git a/lib/configure b/lib/configure
index 8ff9040cc34eb3c53864d582670e9f47ffe503f5..ecd350352d444fac3d1ddcc5b67b41c2cc5b8feb 100755 (executable)
--- a/lib/configure
+++ b/lib/configure
@@ -10,7 +10,7 @@ echo_n() {
 }
 
 echo_n "Configuring libpci for your system..."
-sharedir=${1:-/usr/share}
+idsdir=${1:-/usr/share}
 version=${2:-0.0}
 sys=`uname -s`
 rel=`uname -r`
@@ -30,37 +30,35 @@ rel=${4:-$rel}
 echo " $host $rel"
 
 c=config.h
-echo >$c "#define ARCH_`echo $cpu | tr 'a-z' 'A-Z'`"
-echo >>$c "#define OS_`echo $sys | tr 'a-z' 'A-Z'`"
+echo >$c "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`"
+echo >>$c "#define PCI_OS_`echo $sys | tr 'a-z' 'A-Z'`"
 
 echo_n "Looking for access methods..."
 
 case $sys in
        linux*)
                case $rel in
-                       2.[1-9]*|[3-9]*)        echo_n "sysfs proc"
-                                               echo >>$c '#define HAVE_PM_LINUX_SYSFS'
-                                               echo >>$c '#define HAVE_PM_LINUX_PROC'
-                                               echo >>$c '#define HAVE_LINUX_BYTEORDER_H'
-                                               echo >>$c '#define PATH_PROC_BUS_PCI "/proc/bus/pci"'
-                                               echo >>$c '#define PATH_SYS_BUS_PCI "/sys/bus/pci"'
+                       2.[1-9]*|[3-9]*)        echo_n " sysfs proc"
+                                               echo >>$c '#define PCI_HAVE_PM_LINUX_SYSFS'
+                                               echo >>$c '#define PCI_HAVE_PM_LINUX_PROC'
+                                               echo >>$c '#define PCI_HAVE_LINUX_BYTEORDER_H'
+                                               echo >>$c '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"'
+                                               echo >>$c '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"'
                                                ok=1
                                                ;;
                esac
                case $cpu in
                                i386)           echo_n " i386-ports"
-                                               echo >>$c '#define HAVE_PM_INTEL_CONF'
+                                               echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
                                                ok=1
                                                ;;
-                               alpha|ia64|sparc|sparc64|ppc|ppc64)
-                                               echo >>$c '#define HAVE_64BIT_ADDRESS'
-                                               ;;
                esac
+               echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
                ;;
        sunos)
                case $cpu in
                                i386)           echo_n " i386-ports"
-                                               echo >>$c "#define HAVE_PM_INTEL_CONF"
+                                               echo >>$c "#define PCI_HAVE_PM_INTEL_CONF"
                                                ok=1
                                                ;;
                                *)
@@ -72,24 +70,24 @@ case $sys in
                
        freebsd)
                echo_n " fbsd-device"
-               echo >>$c '#define HAVE_PM_FBSD_DEVICE'
-               echo >>$c '#define PATH_FBSD_DEVICE "/dev/pci"'
+               echo >>$c '#define PCI_HAVE_PM_FBSD_DEVICE'
+               echo >>$c '#define PCI_PATH_FBSD_DEVICE "/dev/pci"'
                ok=1
                ;;
        aix)
                echo_n " aix-device"
-               echo >>$c '#define HAVE_PM_AIX_DEVICE'
+               echo >>$c '#define PCI_HAVE_PM_AIX_DEVICE'
                ok=1
                ;;
        netbsd)
                echo_n " nbsd-libpci"
-               echo >>$c '#define HAVE_PM_NBSD_LIBPCI'
-               echo >>$c '#define PATH_NBSD_DEVICE "/dev/pci0"'
+               echo >>$c '#define PCI_HAVE_PM_NBSD_LIBPCI'
+               echo >>$c '#define PCI_PATH_NBSD_DEVICE "/dev/pci0"'
                ok=1
                ;;
        gnu)
                echo_n " i386-ports"
-               echo >>$c '#define HAVE_PM_INTEL_CONF'
+               echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
                ok=1
                ;;
         *)
@@ -98,11 +96,11 @@ case $sys in
                ;;
 esac
 
-echo >>$c '#define HAVE_PM_DUMP'
+echo >>$c '#define PCI_HAVE_PM_DUMP'
 echo " dump"
 if [ -z "$ok" ] ; then
        echo "WARNING: No real configuration access method is available."
 fi
-echo >>$c "#define PATH_PCI_IDS \"$sharedir/pci.ids\""
+echo >>$c "#define PCI_PATH_IDS \"$idsdir/pci.ids\""
 echo >>$c "#define PCILIB_VERSION \"$version\""
 sed '/^#define [^ ]*$/!d;s/^#define \(.*\)/\1=1/' <$c >config.mk