[Xquartz-changes] xserver: Branch 'darwin-xfree86' - 3 commits

[Jeremy Huddleston]

Rebased ref, commits from common ancestor:
commit 6152332ac89ebb49190431180a8a4e84deb1118f
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Mon Jan 9 00:14:29 2012 -0800

    xfree86: Don't link libxorgxkb against libdix.la
    
    libdix.a is already provided by XSERVER_LIBS.  Including it in libxorgxkb
    results in duplicate symbols landing in the Xorg binary.
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index b6eb54f..a5be3ae 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -65,4 +65,3 @@ libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
 libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
 
 libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
-libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la
commit 65469ffc1fbdeeb0d93271977d07df3a38b5c2c3
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Mon Jan 9 00:40:10 2012 -0800

    configure.ac: Remove MIEXT_SHADOW_LIB from XORG_LIBS
    
    This is provided by dixmods/libshadow.so and is not part of the main binary.
    
    This addresses a build failure on darwin due to MIEXT_SHADOW_LIB having
    unsatisfied dependencies (FB_LIB) in XORG_LIBS.
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/configure.ac b/configure.ac
index 3cc7a5b..9b53b15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1525,7 +1525,7 @@ if test "x$XORG" = xyes; then
 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
 	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
 	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
-	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB"
+	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $XI_LIB $XKB_LIB"
 
 	dnl ==================================================================
 	dnl symbol visibility
commit c7158277d0cbbac313d38c897921fa747827c25d
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Mon Jan 9 00:28:02 2012 -0800

    configure.ac: Use -Wl,-all_load when building Xorg on darwin
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/configure.ac b/configure.ac
index 6de92b4..3cc7a5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1680,6 +1680,13 @@ if test "x$XORG" = xyes; then
 	  gnu*)
 		XORG_OS_SUBDIR="hurd"
 		;;
+	  darwin*)
+		XORG_OS_SUBDIR="stub"
+		LDFLAGS="$LDFLAGS -Wl,-all_load"
+		AC_MSG_NOTICE([m4_text_wrap(m4_join([ ],
+		[Support for the Xorg DDX on Mac OS X is in the early stages.],
+		[If you intended to build XQuartz, please reconfigure with the appropriate options.]))])
+		;;
 	  *)
 		XORG_OS_SUBDIR="stub"
 		AC_MSG_NOTICE([m4_text_wrap(m4_join([ ],