Attachment #412926 for bug #560764




        gtk+-3.0 >= $GTK_REQUIRED_VERSION
        dbus-glib-1 >= $DBUS_REQUIRED_VERSION
        cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION)

AC_SUBST(CINNAMON_SCREENSAVER_CFLAGS)
AC_SUBST(CINNAMON_SCREENSAVER_LIBS)


fi

dnl ---------------------------------------------------------------------------
dnl - Optional webkit support
dnl ---------------------------------------------------------------------------

AC_ARG_ENABLE(webkit,[
GTK Webkit support:

  --enable-webkit         Enable support for GTK webkit screensavers.
  --disable-webkit        Disable support for GTK webkit screensavers.],
[enable_webkit="$enableval"],[enable_webkit=yes])

if test "x$enable_webkit" = xyes; then
    PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-3.0],, [PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-4.0])])
fi
AM_CONDITIONAL([HAS_WEBKIT], [test "x$enable_webkit" = xyes])

dnl ---------------------------------------------------------------------------
dnl - The --enable-locking option
dnl ---------------------------------------------------------------------------


        Maintainer mode:          ${USE_MAINTAINER_MODE}
        Docs enabled:             ${enable_docbook_docs}

        GTK WebKit screensavers:  ${enable_webkit}
        Screen locking enabled:   ${enable_locking}
        Show keyboard indicator:  ${with_kbd_layout_indicator}





screensaversdir = $(pkgdatadir)/screensavers

xscreensaver = xscreensaver@cinnamon.org
xscreensaverdir = $(screensaversdir)/$(xscreensaver)
dist_xscreensaver_SCRIPTS = $(xscreensaver)/main

if HAS_WEBKIT
webkit = webkit@cinnamon.org
webkitdir = $(screensaversdir)/$(webkit)
dist_webkit_SCRIPTS = $(webkit)/main

webkit_stars = $(webkit)/webkit-stars@cinnamon.org
webkit_starsdir = $(screensaversdir)/$(webkit_stars)
dist_webkit_stars_DATA = $(webkit_stars)/index.html $(webkit_stars)/metadata.json
endif





prefix = @prefix@
datadir = @datadir@
pkgdatadir = $(datadir)/@PACKAGE@
all:

clean:

distclean:

install:
	mkdir -p $(DESTDIR)$(pkgdatadir)/screensavers/; \
	find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)$(pkgdatadir)/screensavers/ \;

uninstall:
	find -mindepth 1 -type f -exec rm $(DESTDIR)$(pkgdatadir)/screensavers/{} \;

Return to bug 560764

Lines 58-64 PKG_CHECK_MODULES(CINNAMON_SCREENSAVER, Link Here

(-)cinnamon-screensaver-2.6.4.orig/configure.ac (-1 / +18 lines)
58	gtk+-3.0 >= $GTK_REQUIRED_VERSION	58	gtk+-3.0 >= $GTK_REQUIRED_VERSION
59	dbus-glib-1 >= $DBUS_REQUIRED_VERSION	59	dbus-glib-1 >= $DBUS_REQUIRED_VERSION
60	cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION)	60	cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION)
61	PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-3.0],, [PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-4.0])])	61
62	AC_SUBST(CINNAMON_SCREENSAVER_CFLAGS)	62	AC_SUBST(CINNAMON_SCREENSAVER_CFLAGS)
63	AC_SUBST(CINNAMON_SCREENSAVER_LIBS)	63	AC_SUBST(CINNAMON_SCREENSAVER_LIBS)
64		64
Lines 422-427 if test "$have_xf86gamma" = yes -o "$hav Link Here
422	fi	422	fi
423		423
424	dnl ---------------------------------------------------------------------------	424	dnl ---------------------------------------------------------------------------
		425	dnl - Optional webkit support
		426	dnl ---------------------------------------------------------------------------
		427
		428	AC_ARG_ENABLE(webkit,[
		429	GTK Webkit support:
		430
		431	--enable-webkit Enable support for GTK webkit screensavers.
		432	--disable-webkit Disable support for GTK webkit screensavers.],
		433	[enable_webkit="$enableval"],[enable_webkit=yes])
		434
		435	if test "x$enable_webkit" = xyes; then
		436	PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-3.0],, [PKG_CHECK_MODULES([WEBKIT], [webkit2gtk-4.0])])
		437	fi
		438	AM_CONDITIONAL([HAS_WEBKIT], [test "x$enable_webkit" = xyes])
		439
		440	dnl ---------------------------------------------------------------------------
425	dnl - The --enable-locking option	441	dnl - The --enable-locking option
426	dnl ---------------------------------------------------------------------------	442	dnl ---------------------------------------------------------------------------
427		443
Lines 752-757 echo " Link Here
752	Maintainer mode: ${USE_MAINTAINER_MODE}	768	Maintainer mode: ${USE_MAINTAINER_MODE}
753	Docs enabled: ${enable_docbook_docs}	769	Docs enabled: ${enable_docbook_docs}
754		770
		771	GTK WebKit screensavers: ${enable_webkit}
755	Screen locking enabled: ${enable_locking}	772	Screen locking enabled: ${enable_locking}
756	Show keyboard indicator: ${with_kbd_layout_indicator}	773	Show keyboard indicator: ${with_kbd_layout_indicator}
757		774

Line 0 Link Here

(-)cinnamon-screensaver-2.6.4.orig/data/screensavers/Makefile.am (+16 lines)
	1	screensaversdir = $(pkgdatadir)/screensavers
	2
	3	xscreensaver = xscreensaver@cinnamon.org
	4	xscreensaverdir = $(screensaversdir)/$(xscreensaver)
	5	dist_xscreensaver_SCRIPTS = $(xscreensaver)/main
	6
	7	if HAS_WEBKIT
	8	webkit = webkit@cinnamon.org
	9	webkitdir = $(screensaversdir)/$(webkit)
	10	dist_webkit_SCRIPTS = $(webkit)/main
	11
	12	webkit_stars = $(webkit)/webkit-stars@cinnamon.org
	13	webkit_starsdir = $(screensaversdir)/$(webkit_stars)
	14	dist_webkit_stars_DATA = $(webkit_stars)/index.html $(webkit_stars)/metadata.json
	15	endif
	16

Lines 1-15 Link Here

(-)cinnamon-screensaver-2.6.4.orig/data/screensavers/Makefile.in (-15 lines)
1	prefix = @prefix@
2	datadir = @datadir@
3	pkgdatadir = $(datadir)/@PACKAGE@
4	all:
5
6	clean:
7
8	distclean:
9
10	install:
11	mkdir -p $(DESTDIR)$(pkgdatadir)/screensavers/; \
12	find -mindepth 1 -maxdepth 1 -type d -exec cp -R {} $(DESTDIR)$(pkgdatadir)/screensavers/ \;
13
14	uninstall:
15	find -mindepth 1 -type f -exec rm $(DESTDIR)$(pkgdatadir)/screensavers/{} \;