diff options
| author | Keith Packard <keithp@keithp.com> | 2014-01-22 19:17:24 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-27 11:38:36 -0800 |
| commit | 0b5a87f37d5dcd2ebff977a3b9a50a75ace93c83 (patch) | |
| tree | e03c20a7f74ce7bfe7c5ac3fdf8e0c17277f0e62 | |
| parent | 61cb6c9aa95aa369573c4e02c023bbc33c7678c9 (diff) | |
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 <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 7 insertions, 1 deletions
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)' |