X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fconfigure;h=45a416a7620e0763216d323ade801bdf90f6073e;hb=4c2b4b1bfa348ea22a22f4ca271bc13096ab3e78;hp=2663b92c76e70ba76ea1f0c06a535b1818d4565f;hpb=02321cd3ad5d2ab157c833bf5f068fb7ac45b1d6;p=pciutils.git

diff --git a/lib/configure b/lib/configure
index 2663b92..45a416a 100755
--- a/lib/configure
+++ b/lib/configure
@@ -9,7 +9,7 @@ echo_n() {
 	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
@@ -62,7 +62,9 @@ echo >$m 'WITH_LIBS='
 echo_n "Looking for access methods..."
 LIBRESOLV=-lresolv
 LIBEXT=so
+EXEEXT=
 SYSINCLUDE=/usr/include
+LSPCIDIR=SBINDIR
 
 case $sys in
 	linux*)
@@ -78,6 +80,7 @@ case $sys in
 						;;
 		esac
 		echo >>$c '#define PCI_HAVE_64BIT_ADDRESS'
+		LSPCIDIR=BINDIR
 		;;
 	sunos)
 		case $cpu in
@@ -139,11 +142,29 @@ case $sys in
 	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 >>$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
@@ -167,6 +188,8 @@ case $sys in
 esac
 
 echo >>$m "LIBEXT="$LIBEXT
+echo >>$m "EXEEXT="$EXEEXT
+echo >>$m "LSPCIDIR=\$($LSPCIDIR)"
 echo >>$c '#define PCI_HAVE_PM_DUMP'
 echo " dump"
 
@@ -195,7 +218,7 @@ echo_n "Checking for DNS support... "
 if [ "$DNS" = yes -o "$DNS" = no ] ; then
 	echo "$DNS (set manually)"
 else
-	if [ -f "$SYSINCLUDE/resolv.h" ] ; then
+	if [ "$sys" != "windows" -a -f "$SYSINCLUDE/resolv.h" ] ; then
 		DNS=yes
 	else
 		DNS=no