diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-19 23:00:56 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-19 23:09:32 -0700 |
| commit | 98b85a1ac235dbf421d1a49b41599e8bcaf490d3 (patch) | |
| tree | e8b2ce84fa0f39e9f9189b6b580c36d62269757d /launchd | |
| parent | 27be391123f5143fdccdfe975bf18bbff7517537 (diff) | |
| download | xorg-app-xinit-98b85a1ac235dbf421d1a49b41599e8bcaf490d3.tar.gz | |
launchd: Add an option (--with-launchagent-xserver) to set the default X11 server
This allows the LaunchAgent and startx to have different default servers
which will be useful as the Xorg DDX becomes available on darwin.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Diffstat (limited to 'launchd')
| -rw-r--r-- | launchd/user_startx/Makefile.am | 4 | ||||
| -rw-r--r-- | launchd/user_startx/startx.plist.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/launchd/user_startx/Makefile.am b/launchd/user_startx/Makefile.am index ce00e73..bf18fb0 100644 --- a/launchd/user_startx/Makefile.am +++ b/launchd/user_startx/Makefile.am @@ -36,6 +36,10 @@ CPP_FILES_FLAGS = \ -D__bindir__="$(bindir)" \ -DBUNDLE_ID_PREFIX="$(bundleidprefix)" +if LAUNCHAGENT_XSERVER +CPP_FILES_FLAGS += -DLAUNCHAGENT_XSERVER_PATH="$(launchagentxserver)" +endif + $(bundleidprefix).startx.plist.cpp: startx.plist.cpp cp $< $@ diff --git a/launchd/user_startx/startx.plist.cpp b/launchd/user_startx/startx.plist.cpp index 9d9c1a4..a43025f 100644 --- a/launchd/user_startx/startx.plist.cpp +++ b/launchd/user_startx/startx.plist.cpp @@ -8,6 +8,10 @@ <array> <string>__xinitrcdir__/launchd_startx</string> <string>__bindir__/startx</string> +#ifdef LAUNCHAGENT_XSERVER_PATH + <string>--</string> + <string>LAUNCHAGENT_XSERVER_PATH</string> +#endif </array> <key>Sockets</key> <dict> |