Merge remote branch 'nobled/for-krh'

diff --combined configure.ac
index 01f2141,a4cfcbf..868ebb8
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -23,9 -23,9 +23,9 @@@ PKG_PROG_PKG_CONFIG(
  PKG_CHECK_MODULES(FFI, [libffi])
  
  PKG_CHECK_MODULES(COMPOSITOR,
 -                [egl >= 7.10 glesv2 gdk-pixbuf-2.0 >= 2.21.5 libudev >= 136 libdrm >= 2.4.23] xcb-dri2 xcb-xfixes)
 +                [egl >= 7.10 glesv2 gdk-pixbuf-2.0 libudev >= 136 libdrm >= 2.4.23] xcb-dri2 xcb-xfixes)
  PKG_CHECK_MODULES(GLES2, [egl >= 7.10 glesv2 libdrm >= 2.4.23])
 -PKG_CHECK_MODULES(CLIENT, [egl >= 7.10 gl cairo >= 1.10.0 gdk-pixbuf-2.0 >= 2.21.5 glib-2.0 gobject-2.0 xkbcommon libdrm >= 2.4.23])
 +PKG_CHECK_MODULES(CLIENT, [egl >= 7.10 gl cairo >= 1.10.0 gdk-pixbuf-2.0 glib-2.0 gobject-2.0 xkbcommon libdrm >= 2.4.23])
  PKG_CHECK_MODULES(POPPLER, [poppler-glib gdk-2.0 gio-2.0],
                           [have_poppler=yes], [have_poppler=no])
  AM_CONDITIONAL(HAVE_POPPLER, test "x$have_poppler" = "xyes")
@@@ -64,7 -64,7 +64,7 @@@ PKG_CHECK_MODULES(CAIRO_EGL, [cairo-egl
  AS_IF([test "x$have_cairo_egl" = "xyes"],
        [AC_DEFINE([HAVE_CAIRO_EGL], [1], [Have cairo-egl])])
  
- if test $CC = gcc; then
+ if test "x$GCC" = "xyes"; then
        GCC_CFLAGS="-Wall -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden"
  fi
  AC_SUBST(GCC_CFLAGS)