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: Tiago Vignatti <tiago.vignatti@intel.com>

diff --git a/compositor/Makefile.am b/compositor/Makefile.am
index f913a92..46a3220 100644 (file)
--- a/compositor/Makefile.am
+++ b/compositor/Makefile.am
@@ -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

diff --git a/compositor/xserver-launcher.c b/compositor/xserver-launcher.c
index f39c38d..a3c7fd8 100644 (file)
--- a/compositor/xserver-launcher.c
+++ b/compositor/xserver-launcher.c
@@ -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",

diff --git a/configure.ac b/configure.ac
index 228b527..f19c4e7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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