diff options
| author | Tiago Vignatti <tiago.vignatti@intel.com> | 2012-05-23 23:04:14 +0300 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-05-25 22:54:40 -0400 |
| commit | 629ce23bd0defe1db240e0f3bab63d5f564bc1be (patch) | |
| tree | 80696e4d498474aac5e96946e366ef9122f23491 | |
| parent | 6150072283056cef8c760121fab42903cf701566 (diff) | |
xwayland: change library name
Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/compositor.c | 2 | ||||
| -rw-r--r-- | src/xwayland/Makefile.am | 14 |
4 files changed, 15 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index d65848a..15dd7f1 100644 --- a/configure.ac +++ b/configure.ac @@ -38,12 +38,12 @@ AC_ARG_ENABLE(setuid-install, [ --enable-setuid-install],, AM_CONDITIONAL(ENABLE_SETUID_INSTALL, test x$enable_setuid_install = xyes) -AC_ARG_ENABLE(xserver-launcher, [ --enable-xserver-launcher],, - enable_xserver_launcher=yes) -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 xcb-xfixes cairo-xcb) - AC_DEFINE([BUILD_XSERVER_LAUNCHER], [1], [Build the X server launcher]) +AC_ARG_ENABLE(xwayland, [ --enable-xwayland],, + enable_xwayland=yes) +AM_CONDITIONAL(ENABLE_XWAYLAND, test x$enable_xwayland = xyes) +if test x$enable_xwayland = xyes; then + PKG_CHECK_MODULES([XWAYLAND], xcb xcb-xfixes cairo-xcb) + AC_DEFINE([BUILD_XWAYLAND], [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"], diff --git a/src/Makefile.am b/src/Makefile.am index fd9c26d..52457ac 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,7 @@ weston_SOURCES = \ weston-launch.h \ weston-egl-ext.h -if ENABLE_XSERVER_LAUNCHER +if ENABLE_XWAYLAND SUBDIRS = xwayland endif diff --git a/src/compositor.c b/src/compositor.c index 7494799..c68b5ba 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -2912,7 +2912,7 @@ int main(int argc, char *argv[]) module_init = NULL; if (xserver) - module_init = load_module("xserver-launcher.so", + module_init = load_module("xwayland.so", "weston_xserver_init", &xserver_module); if (module_init && module_init(ec) < 0) diff --git a/src/xwayland/Makefile.am b/src/xwayland/Makefile.am index 9a97a84..32f0058 100644 --- a/src/xwayland/Makefile.am +++ b/src/xwayland/Makefile.am @@ -5,15 +5,15 @@ AM_CPPFLAGS = \ -DXSERVER_PATH='"@XSERVER_PATH@"' moduledir = @libdir@/weston -module_LTLIBRARIES = xserver-launcher.la +module_LTLIBRARIES = xwayland.la -xserver_launcher = xserver-launcher.la -xserver_launcher_la_LDFLAGS = -module -avoid-version -xserver_launcher_la_LIBADD = \ - $(XSERVER_LAUNCHER_LIBS) \ +xwayland = xwayland.la +xwayland_la_LDFLAGS = -module -avoid-version +xwayland_la_LIBADD = \ + $(XWAYLAND) \ $(top_builddir)/shared/libshared.la -xserver_launcher_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) -xserver_launcher_la_SOURCES = \ +xwayland_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) +xwayland_la_SOURCES = \ window-manager.c \ selection.c \ launcher.c \ |