[cairo-commit] configure.ac

[Bryce Harrington]

 configure.ac |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit eab218d1e3b0f2a3c0ab33d3173c42cc57e9bf8c
Author: Ravi Nanjundappa <nravi.n at samsung.com>
Date:   Wed Aug 20 11:45:19 2014 +0530

    configure.ac: configuration check to enable either gl or glesv2, not both at the same time
    
    A proposed solution for the discussion in
    https://bugs.freedesktop.org/show_bug.cgi?id=57379#c12,
    to avoid muliple definition of cairo_gl_* symbols when
    both gl and glesv2 backends are enabled at the same time
    
    Signed-off-by: Ravi Nanjundappa <nravi.n at samsung.com>
    Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>

diff --git a/configure.ac b/configure.ac
index 23f2054..4e28adf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -378,6 +378,10 @@ CAIRO_ENABLE_SURFACE_BACKEND(glesv2, OpenGLESv2, no, [
     glesv2_LIBS="$glesv2_LIBS -ldl"
   fi
 
+  if test "x$use_glesv2" = "xyes" -a "x$use_gl" = "xyes"; then
+      AC_MSG_ERROR([use either --enable-gl=yes or --enable-glesv2=yes. Not both at the same time.])
+  fi
+
   need_egl_functions=yes
 ])