Fix Solaris build with Sun compilers to work when exa is built before
hw/xfree86/os-support/solaris (as it is by default now).
This commit is contained in:
		
							parent
							
								
									724dbc2f8b
								
							
						
					
					
						commit
						1e8a594957
					
				| 
						 | 
				
			
			@ -1,3 +1,10 @@
 | 
			
		|||
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:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
		;;
 | 
			
		||||
	  *)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue