diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | exa/Makefile.am | 4 |
3 files changed, 13 insertions, 1 deletions
@@ -1,5 +1,12 @@ 2006-05-01 Alan Coopersmith <alan.coopersmith@sun.com> + * configure.ac: + * exa/Makefile.am: + Fix Solaris build with Sun compilers to work when exa is built before + hw/xfree86/os-support/solaris (as it is by default now). + +2006-05-01 Alan Coopersmith <alan.coopersmith@sun.com> + * os/WaitFor.c: Use min() [defined in include/misc.h] instead of MIN() [not defined in any Xorg header]. diff --git a/configure.ac b/configure.ac index d79ea592b..e43354cd7 100644 --- a/configure.ac +++ b/configure.ac @@ -1142,7 +1142,8 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then esac AC_SUBST([SOLARIS_INOUT_ARCH]) if test x$solaris_asm_inline = xyes ; then - XORG_CFLAGS="${XORG_CFLAGS} "'$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-${SOLARIS_INOUT_ARCH}.il' + SOLARIS_ASM_CFLAGS='$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il' + XORG_CFLAGS="${XORG_CFLAGS} "'$(SOLARIS_ASM_CFLAGS)' fi ;; *) diff --git a/exa/Makefile.am b/exa/Makefile.am index c9cbf9b45..98db0271f 100644 --- a/exa/Makefile.am +++ b/exa/Makefile.am @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libexa.la +# Override these since EXA doesn't need them and the needed files aren't +# built (in hw/xfree86/os-support/solaris) until after EXA is built +SOLARIS_ASM_CFLAGS="" + if XORG sdk_HEADERS = exa.h endif |