1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
Include DDE in the build
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,16 @@ include ./Makeconf
# Hurd libraries
lib-subdirs = libshouldbeinlibc libihash libiohelp libports libthreads \
libpager libfshelp libdiskfs libtrivfs libps \
libnetfs libpipe libstore libhurdbugaddr libftpconn libcons \
- libhurd-slab
+ libhurd-slab libbpf eth-multiplexer
+
+ifneq ($(LIBPCIACCESS),no)
+lib-subdirs += libmachdev libddekit
+endif
+
+ifeq ($(HAVE_PCAP),yes)
+lib-subdirs += eth-filter
+endif
# Hurd programs
prog-subdirs = auth proc exec term \
--- a/Makeconf
+++ b/Makeconf
@@ -576,7 +576,7 @@ vpath %.defs $(top_srcdir)/hurd
# These we want to find in the libc include directory...
mach_defs_names = bootstrap exc mach mach4 \
mach_host mach_port mach_timer_reply memory_object \
- memory_object_default notify \
+ memory_object_default notify experimental \
gnumach \
task_notify \
--- a/configure.ac
+++ b/configure.ac
@@ -245,6 +245,13 @@ AC_SUBST(boot_store_types)dnl
AC_MSG_CHECKING(boot store types)
AC_MSG_RESULT($boot_store_types)
+AC_CHECK_LIB(pciaccess, pci_system_init, LIBPCIACCESS=-lpciaccess, LIBPCIACCESS=no)
+AC_SUBST(LIBPCIACCESS)
+if test "$LIBPCIACCESS" = "no"; then
+ AC_MSG_WARN([libpciaccess must be installed in order to use libddekit])
+fi
+AC_CHECK_HEADER([pcap.h], [HAVE_PCAP=yes], [HAVE_PCAP=no])
+
# Check for ncursesw, which is needed for the console-curses client.
hurd_LIB_NCURSESW
--- a/config.make.in
+++ b/config.make.in
@@ -98,6 +98,12 @@ libblkid_LIBS = @libblkid_LIBS@
# Whether Sun RPC support is available.
HAVE_SUN_RPC = @HAVE_SUN_RPC@
+# Whether pcap support is available.
+HAVE_PCAP = @HAVE_PCAP@
+
+# Whether libpciaccess is available.
+LIBPCIACCESS = @LIBPCIACCESS@
+
# Installation tools.
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
