[PATCH] Set XQUARTZ to no on non-Darwin OS'es

[Jeremy Huddleston]

Currently, you can't build other DDXs parallel to XQuartz because we  
need a bunch of #ifdef XQUARTZ / #ifdef ROOTLESS magic sprinkled in  
various locations...

Either way you want to push it is fine with me.  I'll hopefully be  
able to clean that all up eventually.


On Oct 2, 2009, at 21:06, Alan Coopersmith wrote:

> Though really, that should probably be an OS check instead of an  
> XQUARTZ
> check, since you don't want that case if you're building Xephyr, Xdmx,
> Xnest, or Xvfb on Darwin, but chose not to build Xquartz.   I just  
> took
> the quickest path to start with.
>
> 	-alan-
>
> Jeremy Huddleston wrote:
>> This one might be good instead or in addition:
>>
>> Either way,
>> Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
>>
>> diff --git a/configure.ac b/configure.ac
>> index 46421fd..22e42c5 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -1244,7 +1244,7 @@ AC_DEFINE(XSYNC, 1, [Support XSync extension])
>> AC_DEFINE(XCMISC, 1, [Support XCMisc extension])
>> AC_DEFINE(BIGREQS, 1, [Support BigRequests extension])
>>
>> -if test "x$WDTRACE" != "xno" && test "x$XQUARTZ" = "xno"; then
>> +if test "x$WDTRACE" != "xno" && test "x$XQUARTZ" != "xyes"; then
>>   DIX_LIB='$(top_builddir)/dix/dix.O'
>>   OS_LIB='$(top_builddir)/os/os.O'
>> else
>>
>>
>> On Oct 2, 2009, at 20:51, Alan Coopersmith wrote:
>>
>>> Fixes build with dtrace probes on Solaris after
>>> efacd7bfd08ffc0725de6f639c6afbf3b2f6c9fe
>>>
>>> Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
>>> ---
>>> configure.ac |    1 +
>>> 1 files changed, 1 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/configure.ac b/configure.ac
>>> index 46421fd..ba52329 100644
>>> --- a/configure.ac
>>> +++ b/configure.ac
>>> @@ -701,6 +701,7 @@ case $host_os in
>>>            XF86VIDMODE=no
>>>        fi
>>>        ;;
>>> +    *) XQUARTZ=no ;;
>>> esac
>>>
>>> dnl
>>> ---------------------------------------------------------------------------
>>>
>>> -- 
>>> 1.5.6.5
>>>
>>> _______________________________________________
>>> xorg-devel mailing list
>>> xorg-devel at lists.x.org
>>> http://lists.x.org/mailman/listinfo/xorg-devel
>>
>>
>> ------------------------------------------------------------------------
>>
>> _______________________________________________
>> xorg-devel mailing list
>> xorg-devel at lists.x.org
>> http://lists.x.org/mailman/listinfo/xorg-devel
>
> -- 
> 	-Alan Coopersmith-           alan.coopersmith at sun.com
> 	 Sun Microsystems, Inc. - X Window System Engineering
>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3333 bytes
Desc: not available
Url : http://lists.x.org/archives/xorg-devel/attachments/20091002/10e05333/attachment.bin