diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-08-31 16:13:14 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-08-31 16:19:21 +0100 |
| commit | ead32f4a1498c2f7b7c74856e97f9e602ed7a274 (patch) | |
| tree | 38ee41bd11402468fb3815eedb09e6188919ed51 | |
| parent | 8067255dc9185e85b110254ffbea4d9682d3aa2d (diff) | |
configure; Remember to disable building the tools
If we find that the headers for the tools are not available on the
system, simply disable building them as they are not essential features
of the driver.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | tools/Makefile.am | 6 |
3 files changed, 16 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 6bb48548..71c7698d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,11 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4 -SUBDIRS = man xvmc src tools +SUBDIRS = man xvmc src + +if BUILD_TOOLS +SUBDIRS += tools +endif MAINTAINERCLEANFILES = ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index d0d1a5e6..d0050529 100644 --- a/configure.ac +++ b/configure.ac @@ -167,6 +167,7 @@ PKG_CHECK_MODULES(X11, [x11 xrender xext pixman-1], [x11=yes], [x11=no]) AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) PKG_CHECK_MODULES(TOOL, [xrandr xdamage xfixes xcursor xtst xext x11], [tools=yes], [tools=no]) +AM_CONDITIONAL(BUILD_TOOLS, test x$tools = xyes) AH_TOP([#include "xorg-server.h"]) @@ -607,12 +608,19 @@ if test "x$dri_msg" = x; then dri_msg=" none" fi +if test "x$tools" = xyes; then + tools_msg=" intel-virtual-output" +else + tools_msg=" none" +fi + echo "" echo "AC_PACKAGE_STRING will be compiled with:" echo " Acceleration backends:$accel_msg" echo " Additional debugging support?$debug_msg" echo " Support for Direct Rendering Infrastructure:$dri_msg" echo " Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg" +echo " Build additional tools and utilities?$tools_msg" if test -n "$xp_msg"; then echo " Experimental support:$xp_msg" fi diff --git a/tools/Makefile.am b/tools/Makefile.am index ff9f067b..de7e9b45 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -24,7 +24,10 @@ AM_CFLAGS = \ @NOWARNFLAGS@ \ $(NULL) +drivermandir = $(DRIVER_MAN_DIR) + bin_PROGRAMS = intel-virtual-output +driverman_DATA = intel-virtual-output.$(DRIVER_MAN_SUFFIX) intel_virtual_output_SOURCES = \ virtual.c \ @@ -32,9 +35,6 @@ intel_virtual_output_SOURCES = \ intel_virtual_output_LDADD = @TOOL_LIBS@ -drivermandir = $(DRIVER_MAN_DIR) -driverman_DATA = intel-virtual-output.$(DRIVER_MAN_SUFFIX) - EXTRA_DIST = intel-virtual-output.man CLEANFILES = $(driverman_DATA) |