From 9b17452909d3140fa33a753cadfaa6e9006b9685 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 14 Dec 2009 10:22:19 +0000 Subject: Git update 14/12/2009 --- xorg-server/hw/xquartz/mach-startup/stub.c | 3 ++- xorg-server/hw/xquartz/pbproxy/Makefile.am | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'xorg-server/hw/xquartz') diff --git a/xorg-server/hw/xquartz/mach-startup/stub.c b/xorg-server/hw/xquartz/mach-startup/stub.c index c8686e78f..89f9e1058 100644 --- a/xorg-server/hw/xquartz/mach-startup/stub.c +++ b/xorg-server/hw/xquartz/mach-startup/stub.c @@ -232,8 +232,9 @@ int main(int argc, char **argv, char **envp) { kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp); if(kr != KERN_SUCCESS) { - fprintf(stderr, "Xquartz: Unable to locate waiting server: %s\n", server_bootstrap_name); pid_t child; + + fprintf(stderr, "Xquartz: Unable to locate waiting server: %s\n", server_bootstrap_name); set_x11_path(); /* This forking is ugly and will be cleaned up later */ diff --git a/xorg-server/hw/xquartz/pbproxy/Makefile.am b/xorg-server/hw/xquartz/pbproxy/Makefile.am index e1c537fbb..02da6b265 100644 --- a/xorg-server/hw/xquartz/pbproxy/Makefile.am +++ b/xorg-server/hw/xquartz/pbproxy/Makefile.am @@ -15,6 +15,9 @@ if STANDALONE_XPBPROXY bin_PROGRAMS = xpbproxy xpbproxy_SOURCES = app-main.m xpbproxy_LDADD = libxpbproxy.la +xpbproxy_LDFLAGS = -Wl,-framework,Cocoa + +AM_CPPFLAGS += -DSTANDALONE_XPBPROXY endif -- cgit v1.2.3