diff options
| author | Martin Mares <mj@ucw.cz> | 2020-12-06 19:17:21 +0100 |
|---|---|---|
| committer | Martin Mares <mj@ucw.cz> | 2020-12-06 19:17:21 +0100 |
| commit | 89e90b56d7f8cb10f4ba60ed3bcd9c289d11eee7 (patch) | |
| tree | 430901539b7b1392415f6aaa6b432b73fd5f43b4 | |
| parent | e6f95ee78be139be5f0b2ab3fbeb630f845f701f (diff) | |
| parent | a6665cfbcba00059be5aefad88da9fd64e3b5a1e (diff) | |
| download | pciutils-89e90b56d7f8cb10f4ba60ed3bcd9c289d11eee7.tar.gz | |
Merge branch 'pu/buildsys' of https://github.com/guillemj/pciutils
| -rw-r--r-- | lib/Makefile | 3 | ||||
| -rwxr-xr-x | lib/configure | 16 | ||||
| -rw-r--r-- | lib/libpci.pc.in | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/lib/Makefile b/lib/Makefile index d89cd6c..0332508 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -77,7 +77,8 @@ $(PCILIBPC): libpci.pc.in -e 's,@LIBDIR@,$(LIBDIR),' \ -e 's,@IDSDIR@,$(IDSDIR),' \ -e 's,@VERSION@,$(VERSION),' \ - -e 's,@LDLIBS@,$(LDLIBS),' + -e 's,@LDLIBS@,$(LDLIBS),' \ + -e 's,@WITH_LIBS@,$(WITH_LIBS),' init.o: init.c $(INCL) access.o: access.c $(INCL) diff --git a/lib/configure b/lib/configure index 08b9462..e181b7f 100755 --- a/lib/configure +++ b/lib/configure @@ -25,12 +25,20 @@ if [ -z "$HOST" ] ; 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/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'` + cpu=`uname -m | sed 's/^i.86-AT386/i386/;s/^i.86$/i386/;s/^sun4u$/sparc64/;s/^i86pc$/i386/;s/^BePC$/i386/;s/^BeMac$/powerpc/;s/^BeBox$/powerpc/'` fi - if [ "$sys" = "GNU/kFreeBSD" -o "$sys" = "DragonFly" ] + if [ "$sys" = "DragonFly" ] then sys=freebsd fi + if [ "$sys" = "GNU/kFreeBSD" ] + then + sys=kfreebsd + fi + if [ "$sys" = "GNU" ] + then + sys=gnu + fi if [ "$sys" = "CYGWIN_NT-5.1" -o "$sys" = "CYGWIN_NT-6.0" ] then sys=cygwin @@ -82,11 +90,11 @@ case $sys in esac echo >>$c '#define PCI_HAVE_STDINT_H' ;; - freebsd*) + freebsd*|kfreebsd*) echo_n " fbsd-device" echo >>$c '#define PCI_HAVE_PM_FBSD_DEVICE' echo >>$c '#define PCI_PATH_FBSD_DEVICE "/dev/pci"' - if [ "$realsys" != "GNU/kFreeBSD" ] ; then + if [ "$sys" != "kfreebsd" ] ; then LIBRESOLV= fi ;; diff --git a/lib/libpci.pc.in b/lib/libpci.pc.in index 9d7e8a0..29c6910 100644 --- a/lib/libpci.pc.in +++ b/lib/libpci.pc.in @@ -7,5 +7,5 @@ Name: libpci Description: libpci Version: @VERSION@ Libs: -L${libdir} -lpci -Libs.private: @LDLIBS@ +Libs.private: @LDLIBS@ @WITH_LIBS@ Cflags: -I${includedir} |