diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-11-03 21:45:44 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2019-11-03 21:45:44 +0100 |
| commit | 9cf19f93324f1a7adfc5c386050d21ce6d661203 (patch) | |
| tree | 23843074b216ac0406284afa33074c3a9c04ed73 | |
| parent | 513e5f1def6e019613430d2ffed952da470fb801 (diff) | |
| download | hurd-9cf19f93324f1a7adfc5c386050d21ce6d661203.tar.gz hurd-9cf19f93324f1a7adfc5c386050d21ce6d661203.tar.bz2 hurd-9cf19f93324f1a7adfc5c386050d21ce6d661203.zip | |
pciaccess: properly detect and use
* configure.ac: Detect pciaccess pkg module. Define HAVE_LIBPCIACCESS,
libpciaccess_CFLAGS, libpciaccess_LIBS variables.
* config.make.in (HAVE_LIBPCIACCESS, libpciaccess_CFLAGS,
libpciaccess_LIBS): Add variables.
* Makefile (prog-subdirs) [!HAVE_LIBPCIACCESS]: Do not add pci-arbiter.
* pci-arbiter/Makefile (LDLIBS): Use $(libpciaccess_LIBS) instead of
-lpciaccess.
(CFLAGS): Use $(libpciaccess_CFLAGS).
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | config.make.in | 7 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | pci-arbiter/Makefile | 4 |
4 files changed, 18 insertions, 3 deletions
@@ -45,7 +45,6 @@ prog-subdirs = auth proc exec term \ init \ devnode \ eth-multiplexer \ - pci-arbiter \ acpi \ shutdown @@ -57,6 +56,10 @@ ifeq ($(HAVE_LIBLWIP),yes) prog-subdirs += lwip endif +ifeq ($(HAVE_LIBPCIACCESS),yes) +prog-subdirs += pci-arbiter +endif + # Other directories other-subdirs = hurd doc config release include diff --git a/config.make.in b/config.make.in index 28d4501e..efcbed4e 100644 --- a/config.make.in +++ b/config.make.in @@ -109,6 +109,13 @@ HAVE_LIBLWIP = @HAVE_LIBLWIP@ liblwip_CFLAGS = @liblwip_CFLAGS@ liblwip_LIBS = @liblwip_LIBS@ +# Whether we found libpciaccess. +HAVE_LIBPCIACCESS = @HAVE_LIBPCIACCESS@ + +# How to compile and link against libpciaccess. +libpciaccess_CFLAGS = @libpciaccess_CFLAGS@ +libpciaccess_LIBS = @libpciaccess_LIBS@ + # Installation tools. INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/configure.ac b/configure.ac index 4f0c3bba..af04d051 100644 --- a/configure.ac +++ b/configure.ac @@ -365,6 +365,11 @@ AC_SUBST([HAVE_LIBLWIP]) AC_SUBST([liblwip_CFLAGS]) AC_SUBST([liblwip_LIBS]) +PKG_CHECK_MODULES([libpciaccess], [pciaccess], [HAVE_LIBPCIACCESS=yes], [HAVE_LIBPCIACCESS=no]) +AC_SUBST([HAVE_LIBPCIACCESS]) +AC_SUBST([libpciaccess_CFLAGS]) +AC_SUBST([libpciaccess_LIBS]) + AC_CONFIG_FILES([config.make ${makefiles}]) AC_OUTPUT diff --git a/pci-arbiter/Makefile b/pci-arbiter/Makefile index b13aefa8..1d0309dc 100644 --- a/pci-arbiter/Makefile +++ b/pci-arbiter/Makefile @@ -27,13 +27,13 @@ MIGSRCS = pciServer.c startup_notifyServer.c OBJS = $(patsubst %.S,%.o,$(patsubst %.c,%.o, $(SRCS) $(MIGSRCS))) HURDLIBS= fshelp ports shouldbeinlibc netfs iohelp ihash -LDLIBS = -lpthread -lpciaccess +LDLIBS = -lpthread $(libpciaccess_LIBS) target = pci-arbiter include ../Makeconf -CFLAGS += -I$(PORTDIR)/include +CFLAGS += -I$(PORTDIR)/include $(libpciaccess_CFLAGS) pci-MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h |