xserver: Branch 'master' - 3 commits

[Ben Byer]

 hw/darwin/Makefile.am                         |    2 -
 hw/darwin/apple/X11.xcodeproj/project.pbxproj |   33 +++++++++-----------------
 hw/darwin/apple/bundle-main.c                 |    7 +++--
 3 files changed, 17 insertions(+), 25 deletions(-)

New commits:
diff-tree 215e3691b76a63e6af19865790193b20b105ec5a (from ea8dcc458ea8870126cf8d3e21cab9d63d094c5e)
Author: Ben Byer <bbyer at xyzzy.local>
Date:   Sat Mar 3 21:52:56 2007 -0800

    stopped using XTrans internals in X11.app because they're apparently no longer public

diff --git a/hw/darwin/apple/bundle-main.c b/hw/darwin/apple/bundle-main.c
index 12fb1bf..a35e1e3 100644
--- a/hw/darwin/apple/bundle-main.c
+++ b/hw/darwin/apple/bundle-main.c
@@ -601,10 +601,10 @@ display_exists_p (int number)
     int idisplay, iscreen;
     char *conn_auth_name, *conn_auth_data;
     int conn_auth_namelen, conn_auth_datalen;
-	
+#ifdef USE_XTRANS_INTERNALS	
     extern void *_X11TransConnectDisplay ();
     extern void _XDisconnectDisplay ();
-	
+#endif	
     /* Since connecting to the display waits for a few seconds if the
 	 display doesn't exist, check for trivial non-existence - if the
 	 socket in /tmp exists or not.. (note: if the socket exists, the
@@ -613,7 +613,7 @@ display_exists_p (int number)
     sprintf (buf, "/tmp/.X11-unix/X%d", number);
     if (access (buf, F_OK) != 0)
 		return FALSE;
-	
+#ifdef USE_XTRANS_INTERNALS	
     /* This is a private function that we shouldn't really be calling,
 	 but it's the best way to see if the server exists (without
 	 needing to hold the necessary authentication to use it) */
@@ -626,6 +626,7 @@ display_exists_p (int number)
 		return FALSE;
 	
     _XDisconnectDisplay (conn);
+#endif
     return TRUE;
 }
 
diff-tree ea8dcc458ea8870126cf8d3e21cab9d63d094c5e (from 18508212599bf0964c450c69b9790208e5d428be)
Author: Ben Byer <bbyer at xyzzy.local>
Date:   Sat Mar 3 21:51:20 2007 -0800

    Makefile fix for X11.app

diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index 46642cd..75d028e 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -275,7 +275,7 @@ install-data-hook: $(HOOK_TARGETS)
 
 xquartz-install-hook:
 	mv $(DESTDIR)$(macosdir)/XDarwinApp $(DESTDIR)$(macosdir)/XDarwin
-	cd apple && xcodebuild install
+        cd apple && xcodebuild CFLAGS="$(XSERVERCFLAGS_CFLAGS)" LDFLAGS="$(XSERVERCFLAGS_LIBS)"
 
 EXTRA_DIST = \
 	darwin.c \
diff-tree 18508212599bf0964c450c69b9790208e5d428be (from 7f2b9f3790456044d01bf8e6404f9a1239b41da6)
Author: Ben Byer <bbyer at xyzzy.local>
Date:   Sat Mar 3 21:41:33 2007 -0800

    fixed X11.xcodeproj to get CFLAGS and LDFLAGS from autoconf script

diff --git a/hw/darwin/apple/X11.xcodeproj/project.pbxproj b/hw/darwin/apple/X11.xcodeproj/project.pbxproj
index 7ca75d4..2fef99b 100644
--- a/hw/darwin/apple/X11.xcodeproj/project.pbxproj
+++ b/hw/darwin/apple/X11.xcodeproj/project.pbxproj
@@ -224,15 +224,12 @@
 				DSTROOT = "$(DSTROOT)";
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				HEADER_SEARCH_PATHS = /usr/X11/include;
+				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = $DSTROOT/Applications/Utilties;
-				LIBRARY_SEARCH_PATHS = /usr/X11/lib;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-lXau",
-					"-lX11",
-				);
+				LIBRARY_SEARCH_PATHS = "";
+				OTHER_CFLAGS = "$(CFLAGS)";
+				OTHER_LDFLAGS = "$(LDFLAGS)";
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = X11;
 				SECTORDER_FLAGS = "";
@@ -252,15 +249,12 @@
 				DSTROOT = "$(DSTROOT)";
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				HEADER_SEARCH_PATHS = /usr/X11/include;
+				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = $DSTROOT/Applications/Utilties;
-				LIBRARY_SEARCH_PATHS = /usr/X11/lib;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-lXau",
-					"-lX11",
-				);
+				LIBRARY_SEARCH_PATHS = "";
+				OTHER_CFLAGS = "$(CFLAGS)";
+				OTHER_LDFLAGS = "$(LDFLAGS)";
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = X11;
 				SECTORDER_FLAGS = "";
@@ -279,15 +273,12 @@
 				DSTROOT = "$(DSTROOT)";
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				HEADER_SEARCH_PATHS = /usr/X11/include;
+				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = $DSTROOT/Applications/Utilties;
-				LIBRARY_SEARCH_PATHS = /usr/X11/lib;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = (
-					"-lXau",
-					"-lX11",
-				);
+				LIBRARY_SEARCH_PATHS = "";
+				OTHER_CFLAGS = "$(CFLAGS)";
+				OTHER_LDFLAGS = "$(LDFLAGS)";
 				OTHER_REZFLAGS = "";
 				PRODUCT_NAME = X11;
 				SECTORDER_FLAGS = "";