Install screensaver by default

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 5ed8839..133eaca 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -9,7 +9,8 @@ noinst_PROGRAMS =                               \
 libexec_PROGRAMS =                             \
        $(desktop_shell)                        \
        $(tablet_shell)                         \
-       $(screenshooter)
+       $(screenshooter)                        \
+       $(screensaver)
 
 AM_CFLAGS = $(GCC_CFLAGS)
 AM_CPPFLAGS =                                  \
@@ -141,14 +142,13 @@ CLEANFILES = $(BUILT_SOURCES)
 endif
 
 if BUILD_FULL_GL_CLIENTS
-full_gl_client_programs =                      \
-       gears                                   \
-       wscreensaver
+full_gl_client_programs = gears
 
 gears_SOURCES = gears.c
 gears_LDADD = $(toolkit_libs)
 
-wscreensaver_SOURCES =                         \
+screensaver = weston-screensaver
+weston_screensaver_SOURCES =                   \
        wscreensaver.c                          \
        wscreensaver.h                          \
        desktop-shell-client-protocol.h         \
@@ -157,7 +157,7 @@ wscreensaver_SOURCES =                              \
        wscreensaver-glue.h                     \
        glmatrix.c                              \
        matrix3.xpm
-wscreensaver_LDADD = $(toolkit_libs) -lGLU
+weston_screensaver_LDADD = $(toolkit_libs) -lGLU
 endif
 
 @wayland_scanner_rules@

diff --git a/weston.ini b/weston.ini
index 7693253..f0736df 100644 (file)
--- a/weston.ini
+++ b/weston.ini
@@ -28,6 +28,7 @@ icon=/usr/share/icons/gnome/24x24/apps/arts.png
 path=./clients/flower
 
 [screensaver]
-#path=./clients/wscreensaver
+# Uncomment path to disable screensaver
+path=/usr/libexec/weston-screensaver
 duration=600
 #binding-modifier=ctrl