xserver: Branch 'master' - 2 commits

[Jeremy Huddleston]

 configure.ac                        |    7 +------
 hw/xquartz/mach-startup/Makefile.am |    2 +-
 hw/xquartz/pbproxy/Makefile.am      |    4 +++-
 3 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 9db84fac0cc767e23986223d22bc085cde0cc86f
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Dec 2 14:54:10 2008 -0800

    Removed unised option from configure.ac for launchd
    (cherry picked from commit 87e4de0a9a8af6e5e0cbba74e585761f1160a6ab)

diff --git a/configure.ac b/configure.ac
index f00c2da..81c8e38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -486,10 +486,6 @@ AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir
 				[ APPLE_APPLICATIONS_DIR="${withval}" ],
 				[ APPLE_APPLICATIONS_DIR="/Applications/Utilities" ])
 AC_SUBST([APPLE_APPLICATIONS_DIR])
-AC_ARG_WITH(launchagents-dir,AS_HELP_STRING([--with-launchagents-dir=PATH], [Path to launchd's LaunchAgents directory (default: /Library/LaunchAgents)]),
-				[ launchagentsdir="${withval}" ],
-				[ launchagentsdir="/Library/LaunchAgents" ])
-AC_SUBST([launchagentsdir])
 AC_ARG_ENABLE(builddocs,      AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]),
                                 [BUILDDOCS=$enableval],
                                 [BUILDDOCS=no])
commit fa4f2527a5002711fe47c02b14097032fd845dc4
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Dec 2 14:53:21 2008 -0800

    XQuartz: pbproxy: Simplify linking
    (cherry picked from commit 909cc5c4dca0f63e90505575bbd454b46a4670cc)

diff --git a/configure.ac b/configure.ac
index 5649fe5..f00c2da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1598,8 +1598,7 @@ if test "x$XQUARTZ" = xyes; then
 
 	CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DNO_ALLOCA"
 
-	PKG_CHECK_MODULES(APPLEWMPROTO, [applewmproto >= 1.1.1])
-	PKG_CHECK_MODULES(APPLEWM, [applewm >= 1.0.0])
+	PKG_CHECK_MODULES(XPBPROXY, [applewmproto >= 1.1.1] [applewm >= 1.0.0] xfixes fixesproto)
 
 	if test "x$STANDALONE_XPBPROXY" = xyes ; then
 		AC_DEFINE(STANDALONE_XPBPROXY,1,[Build a standalone xpbproxy])
diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
index 65ee2fa..b4e7852 100644
--- a/hw/xquartz/mach-startup/Makefile.am
+++ b/hw/xquartz/mach-startup/Makefile.am
@@ -19,7 +19,7 @@ X11_LDADD = \
 	$(top_builddir)/dix/dixfonts.lo \
 	$(top_builddir)/miext/rootless/librootless.la \
 	$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
-	$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin -lX11
+	$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
 
 X11_LDFLAGS =  \
 	-XCClinker -Objc \
diff --git a/hw/xquartz/pbproxy/Makefile.am b/hw/xquartz/pbproxy/Makefile.am
index 65e5e4a..e1c537f 100644
--- a/hw/xquartz/pbproxy/Makefile.am
+++ b/hw/xquartz/pbproxy/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS=-F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
-AM_LDFLAGS=-L/usr/X11/lib -lX11 -lXfixes -lAppleWM -framework AppKit -framework Foundation -framework ApplicationServices
+AM_CFLAGS=$(XPBPROXY_CFLAGS)
 
 noinst_LTLIBRARIES = libxpbproxy.la
 libxpbproxy_la_SOURCES = \
@@ -8,6 +8,8 @@ libxpbproxy_la_SOURCES = \
 	x-input.m \
 	x-selection.m
 
+libxpbproxy_la_LDFLAGS=$(XPBPROXY_LIBS)
+
 if STANDALONE_XPBPROXY
 
 bin_PROGRAMS = xpbproxy