X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure;h=5e4d97fb9b1af34de79d941ef3582b67b3a61f30;hb=d45531756b426fb883e78deb412be3c031bb7675;hp=4f17cdc48e9e7165cc2875ce459d2680c4430c5b;hpb=daf2ef4e78d6559bd7a3242113b082134b9f2ea7;p=pciutils.git

diff --git a/lib/configure b/lib/configure
index 4f17cdc..5e4d97f 100755
--- a/lib/configure
+++ b/lib/configure
@@ -38,11 +38,12 @@ if [ -z "$HOST" ] ; then
 	fi
 	HOST=${3:-$cpu-$sys}
 fi
+[ -n "$RELEASE" ] && rel="${RELEASE}"
 # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless.
-host=`echo $HOST | sed 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | tr '[A-Z]' '[a-z]'`
+host=`echo $HOST | sed -e 's/^\([^-]*\)-\([^-]*\)-\([^-]*\)-\([^-]*\)$/\1-\3/' -e 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | tr '[A-Z]' '[a-z]'`
 cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo " $host $rel"
+echo " $host $rel $cpu $sys"
 
 c=config.h
 m=config.mk
@@ -63,7 +64,7 @@ case $sys in
 		echo >>$c '#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"'
 		echo >>$c '#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"'
 		case $cpu in
-				i386|x86_64)	echo_n " i386-ports"
+				i?86|x86_64)	echo_n " i386-ports"
 						echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
 						;;
 		esac
@@ -71,7 +72,7 @@ case $sys in
 		;;
 	sunos)
 		case $cpu in
-				i386)		echo_n " i386-ports"
+				i?86)		echo_n " i386-ports"
 						echo >>$c "#define PCI_HAVE_PM_INTEL_CONF"
 						;;
 				*)
@@ -115,7 +116,7 @@ case $sys in
 	cygwin)
 		echo_n " i386-ports"
 		echo >>$c '#define PCI_HAVE_PM_INTEL_CONF'
-		echo >>$m 'LDLIBS+=-lioperm'
+		echo >>$m 'WITH_LIBS+=-lioperm'
 		;;
         *)
 		echo " Unfortunately, your OS is not supported by the PCI Library"