From 0b5a87f37d5dcd2ebff977a3b9a50a75ace93c83 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 22 Jan 2014 19:17:24 -0800 Subject: [PATCH] pseudoramiX: Only compile on XQUARTZ and XWIN PseudoramiXExtensionInit() is not defined in extinit.h if it won't be used and we get a compiler warning when compiling the pseudoramiX code. Signed-off-by: Keith Packard Reviewed-by: Eric Anholt --- Makefile.am | 6 +++++- configure.ac | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index add69d193..b296e0cfa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,6 +27,10 @@ if PRESENT PRESENT_DIR=present endif +if PSEUDORAMIX +PSEUDORAMIX_DIR=pseudoramiX +endif + SUBDIRS = \ doc \ man \ @@ -37,11 +41,11 @@ SUBDIRS = \ Xext \ miext \ os \ - pseudoramiX \ randr \ render \ Xi \ xkb \ + $(PSEUDORAMIX_DIR) \ $(DBE_DIR) \ $(RECORD_DIR) \ xfixes \ diff --git a/configure.ac b/configure.ac index 560c46030..0312c4f51 100644 --- a/configure.ac +++ b/configure.ac @@ -2174,6 +2174,8 @@ if test "x$XQUARTZ" = xyes; then fi fi +AM_CONDITIONAL(PSEUDORAMIX, [test "x$XQUARTZ" = xyes -o "x$XWIN" = xyes ]) + # Support for objc in autotools is minimal and not documented. OBJC='$(CC)' OBJCLD='$(CCLD)'