Merge with git+ssh://git.ucw.cz/home/mj/GIT/pciutils.git

[pciutils.git] / lib / configure

diff --git a/lib/configure b/lib/configure
index a031ca79488b17746aadc89de346ab656bf9e333..468a29f5aa6c0ffdd6e4914e01b072107da8027b 100755 (executable)
--- a/lib/configure
+++ b/lib/configure
@@ -22,7 +22,7 @@ then
 else
        cpu=`uname -m | sed 's/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/'`
 fi
-if [ "$sys" = "GNU/kFreeBSD" ]
+if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ]
 then
        sys=freebsd
 fi
@@ -64,7 +64,7 @@ case $sys in
                                                echo >>$c "#define PCI_HAVE_PM_INTEL_CONF"
                                                ;;
                                *)
-                                               echo " The PCI library is does not support Solaris for this architecture: $cpu"
+                                               echo " The PCI library does not support Solaris for this architecture: $cpu"
                                                exit 1
                                                ;;
                esac
@@ -92,7 +92,7 @@ case $sys in
                echo >>$c '#define PCI_HAVE_PM_NBSD_LIBPCI'
                echo >>$c '#define PCI_PATH_NBSD_DEVICE "/dev/pci0"'
                echo >>$m 'PCILIB=lib/libpciutils.a'
-               echo >>$m 'LDFLAGS+=-lpci'
+               echo >>$m 'LDLIBS+=-lpci'
                ;;
        gnu)
                echo_n " i386-ports"
@@ -121,7 +121,8 @@ fi
 if [ "$zlib" = yes ] ; then
        echo >>$c '#define PCI_COMPRESSED_IDS'
        echo >>$c '#define PCI_IDS "pci.ids.gz"'
-       echo >>$m 'LDFLAGS+=-lz'
+       echo >>$m 'LIBZ=-lz'
+       echo >>$m 'LDLIBS+=$(LIBZ)'
 else
        echo >>$c '#define PCI_IDS "pci.ids"'
 fi