Commit 5884bcde authored by Tiago Vignatti's avatar Tiago Vignatti Committed by Kristian Høgsberg
Browse files

configure: add helper for setting xserver directory



With this the X server directory can become independent from the
installation prefix set by autoconf.
Signed-off-by: default avatarTiago Vignatti <tiago.vignatti@intel.com>
parent 338c9632
......@@ -3,7 +3,7 @@ bin_PROGRAMS = wayland-compositor
AM_CPPFLAGS = \
-DDATADIR='"$(datadir)"' \
-DMODULEDIR='"$(moduledir)"' \
-DBINDIR='"$(bindir)"' \
-DXSERVER_PATH='"@XSERVER_PATH@"' \
$(COMPOSITOR_CFLAGS)
wayland_compositor_LDFLAGS = -export-dynamic
......
......@@ -501,8 +501,8 @@ wlsc_xserver_handle_event(int listen_fd, uint32_t mask, void *data)
snprintf(logfile, sizeof logfile,
"/tmp/x-log-%d", mxs->display);
if (execl(BINDIR "/Xorg",
BINDIR "/Xorg",
if (execl(XSERVER_PATH,
XSERVER_PATH,
display,
"-wayland",
"-rootless",
......
......@@ -37,6 +37,11 @@ AM_CONDITIONAL(ENABLE_XSERVER_LAUNCHER, test x$enable_xserver_launcher == xyes)
if test x$enable_xserver_launcher == xyes; then
PKG_CHECK_MODULES([XSERVER_LAUNCHER], xcb)
AC_DEFINE([BUILD_XSERVER_LAUNCHER], [1], [Build the X server launcher])
AC_ARG_WITH(xserver-path, AS_HELP_STRING([--with-xserver-path=PATH],
[Path to X server]), [XSERVER_PATH="$withval"],
[XSERVER_PATH="$bindir/Xorg"])
AC_SUBST([XSERVER_PATH])
fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment