summaryrefslogtreecommitdiff
path: root/launchd
diff options
context:
space:
mode:
Diffstat (limited to 'launchd')
-rw-r--r--launchd/user_startx/Makefile.am4
-rw-r--r--launchd/user_startx/startx.plist.cpp4
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>