This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch dde in repository hurd.
commit bc4ac1c9dd5a27836fc57fabefbc0fbd523a1f60 Author: Samuel Thibault <[email protected]> Date: Sun Nov 29 12:33:16 2015 +0100 Make dde conditionally built under presence of libpciaccess * configure.ac [!LIBPCIACCESS]: Warn instead of abort. * config.make.in (LIBPCIACCESS): New definition. * Makefile [LIBPCIACCESS=no] (lib-subdirs): Remove libmachdev and libddekit. --- Makefile | 6 +++++- config.make.in | 4 ++++ configure.ac | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e0328b3..9a5d4f3 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,11 @@ include ./Makeconf lib-subdirs = libshouldbeinlibc libihash libiohelp libports libthreads \ libpager libfshelp libdiskfs libtrivfs libps \ libnetfs libpipe libstore libhurdbugaddr libftpconn libcons \ - libmachdev libddekit libhurd-slab + libhurd-slab + +ifneq ($(LIBPCIACCESS),no) +lib-subdirs += libmachdev libddekit +endif # Hurd programs prog-subdirs = auth proc exec init term \ diff --git a/config.make.in b/config.make.in index b63c859..5d861ef 100644 --- a/config.make.in +++ b/config.make.in @@ -66,6 +66,7 @@ VERSIONING = @VERSIONING@ # If a separate libcrypt is available, use it. LIBCRYPT = @LIBCRYPT@ +# Whether pcap support is available. LIBPCAP = @LIBPCAP@ # How to link against Parted libraries, if at all. @@ -95,6 +96,9 @@ libblkid_LIBS = @libblkid_LIBS@ # Whether Sun RPC support is available. HAVE_SUN_RPC = @HAVE_SUN_RPC@ +# Whether libpciaccess is available. +LIBPCIACCESS = @LIBPCIACCESS@ + # Installation tools. INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/configure.ac b/configure.ac index 98eeaf2..fedd992 100644 --- a/configure.ac +++ b/configure.ac @@ -246,7 +246,7 @@ fi AC_CHECK_LIB(pciaccess, pci_system_init, LIBPCIACCESS=-lpciaccess, LIBPCIACCESS=no) AC_SUBST(LIBPCIACCESS) if test "$LIBPCIACCESS" = "no"; then - AC_MSG_ERROR([libpciaccess must be install in order to use libddekit]) + AC_MSG_WARN([libpciaccess must be install in order to use libddekit]) fi # Check for ncursesw, which is needed for the console-curses client. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/hurd.git
