← Back to branch summary

~ubuntu-branches/debian/jessie/gnome-shell/jessie

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Michael Biebl
  • Date: 2012-05-30 20:56:52 UTC
  • Revision ID: package-import@ubuntu.com-20120530205652-cr4w3zus93e5ac7a
Tags: 3.4.1-5
Disabling the screen recorder on arm{el,hf} was not sufficient to make it
build everywhere since the screen grabber is also used for making
screenshots. Update debian/patches/14_make-GLX-optional.patch instead and
only use pixel buffers in the screen grabber if we have GL/GLX support.
This means we can re-enable the screen recorder on arm{el,hf} as it will
use the slow, cogl-based path there.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
50
50
   AC_MSG_RESULT(yes)
51
51
   build_recorder=true
52
52
   recorder_modules="gstreamer-0.10 gstreamer-base-0.10 x11"
53
 
   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes gl)
 
53
   PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes)
54
54
else
55
55
   AC_MSG_RESULT(no)
56
56
fi
136
136
if test "x$have_glx" = "xyes"; then
137
137
   GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $GLX_CFLAGS"
138
138
   GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $GLX_LIBS"
 
139
   TEST_SHELL_RECORDER_CFLAGS="$TEST_SHELL_RECORDER_CFLAGS $GLX_CFLAGS"
 
140
   TEST_SHELL_RECORDER_LIBS="$TEST_SHELL_RECORDER_LIBS $GLX_LIBS"
139
141
   AC_DEFINE(HAVE_GLX, [1], [Define if we have GLX])
140
142
   AC_SUBST([HAVE_GLX], [1])
141
143
fi