Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 560764 | Differences between
and this patch

Collapse All | Expand All

(-)a/a/configure.ac (-1 / +17 lines)
Lines 58-64 PKG_CHECK_MODULES(CINNAMON_SCREENSAVER, Link Here
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 "$have_xf86vmode" = yes; then 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
439
dnl ---------------------------------------------------------------------------
425
dnl - The --enable-locking option
440
dnl - The --enable-locking option
426
dnl ---------------------------------------------------------------------------
441
dnl ---------------------------------------------------------------------------
427
442
Lines 760-765 echo " Link Here
760
        Maintainer mode:          ${USE_MAINTAINER_MODE}
775
        Maintainer mode:          ${USE_MAINTAINER_MODE}
761
        Docs enabled:             ${enable_docbook_docs}
776
        Docs enabled:             ${enable_docbook_docs}
762
777
778
        GTK WebKit screensavers:  ${enable_webkit}
763
        Screen locking enabled:   ${enable_locking}
779
        Screen locking enabled:   ${enable_locking}
764
        Show keyboard indicator:  ${with_kbd_layout_indicator}
780
        Show keyboard indicator:  ${with_kbd_layout_indicator}
765
781

Return to bug 560764