X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure;h=ecd350352d444fac3d1ddcc5b67b41c2cc5b8feb;hb=152967235012b72c4c99f2d9631d19a2afc0ef8c;hp=c169c8bc5fd16b43590fc68d1e72d62f2943a60c;hpb=80459c650b9739e06a8662e395a27ac481e2de3a;p=pciutils.git

diff --git a/lib/configure b/lib/configure
index c169c8b..ecd3503 100755
--- 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`
@@ -20,58 +20,74 @@ then
 	proc=`/usr/sbin/lsdev -C -c processor -S available -F name | head -1`
 	cpu=`/usr/sbin/lsattr -F value -l $proc -a type | sed 's/_.*//'`
 else
-	cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/'`
+	cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`
 fi
-echo " $sys/$cpu $rel"
+host=${3:-$cpu-$sys}
+host=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | tr 'A-Z' 'a-z'`
+cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+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)
+	linux*)
 		case $rel in
-			2.[1-9]*|[3-9]*)	echo_n " proc"
-						echo >>$c '#define HAVE_PM_LINUX_PROC'
-						echo >>$c '#define HAVE_LINUX_BYTEORDER_H'
-						echo >>$c '#define PATH_PROC_BUS_PCI "/proc/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)	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 PCI_HAVE_PM_INTEL_CONF"
+						ok=1
 						;;
-				sparc|sparc64)	echo >>$c '#define HAVE_64BIT_ADDRESS'
-						echo >>$c '#define HAVE_LONG_ADDRESS'
+				*)
+						echo " The PCI library is does not support Solaris for this architecture: $cpu"
+						exit 1
 						;;
 		esac
 		;;
-	FreeBSD)
+		
+	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)
+	aix)
 		echo_n " aix-device"
-		echo >>$c '#define HAVE_PM_AIX_DEVICE'
+		echo >>$c '#define PCI_HAVE_PM_AIX_DEVICE'
 		ok=1
 		;;
-	NetBSD)
+	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 " intel-conf"
-		echo >>$c '#define HAVE_PM_INTEL_CONF'
+    	gnu)
+		echo_n " i386-ports"
+		echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
 		ok=1
 		;;
         *)
@@ -80,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