From: Manuel Bachmann <manuel.bachmann@open.eurogiciel.org>
Date: Fri, 28 Feb 2014 09:28:58 +0000 (+0100)
Subject: wayland-egl: do not require 'gl' to build
X-Git-Tag: accepted/tizen/generic/20140306.102925^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_ivi_release;p=platform%2Fupstream%2Fevas.git

wayland-egl: do not require 'gl' to build

'gl' would pull X11, and is unnecessary anyways.

Change-Id: Ib2b844feefa1b6652589c435a5c34b0ff656ac6a
Bug-Tizen: TIVI-2820
Signed-off-by: Manuel Bachmann <manuel.bachmann@open.eurogiciel.org>
---

diff --git a/configure b/configure
index 27d0d82..14834d4 100755
--- a/configure
+++ b/configure
@@ -3487,7 +3487,7 @@ ac_config_headers="$ac_config_headers config.h"
 
 
 
-am__api_version='1.13'
+am__api_version='1.12'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -21910,7 +21910,7 @@ fi
 if test "x${have_dep}" = "xyes" ; then
    evas_engine_gl_sdl_cflags="${SDL_CFLAGS}"
    evas_engine_gl_sdl_libs="${SDL_LIBS} -lGL -lm $gl_pt_lib"
-   evas_engine_gl_common_libs="-lGL -lm $gl_pt_lib"
+   evas_engine_gl_common_libs="-lm $gl_pt_lib"
 else
    ac_fn_c_check_header_compile "$LINENO" "SDL/SDL_opengles.h" "ac_cv_header_SDL_SDL_opengles_h" "
 #include <SDL/SDL_opengles.h>
@@ -24143,12 +24143,12 @@ if test -n "$WAYLAND_EGL_LIBS"; then
     pkg_cv_WAYLAND_EGL_LIBS="$WAYLAND_EGL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl >= 7.10 glesv2 gl wayland-client wayland-egl\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "egl >= 7.10 glesv2 gl wayland-client wayland-egl") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl >= 7.10 glesv2 wayland-client wayland-egl\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "egl >= 7.10 glesv2 wayland-client wayland-egl") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WAYLAND_EGL_LIBS=`$PKG_CONFIG --libs "egl >= 7.10 glesv2 gl wayland-client wayland-egl" 2>/dev/null`
+  pkg_cv_WAYLAND_EGL_LIBS=`$PKG_CONFIG --libs "egl >= 7.10 glesv2 wayland-client wayland-egl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -24194,7 +24194,7 @@ else
 $as_echo "yes" >&6; }
 
     have_dep="yes"
-    requirement="egl >= 7.10 glesv2 gl wayland-client wayland-egl"
+    requirement="egl >= 7.10 glesv2 wayland-client wayland-egl"
     evas_engine_wayland_egl_cflags="${WAYLAND_EGL_CFLAGS}"
     evas_engine_wayland_egl_libs="${WAYLAND_EGL_LIBS}"
 
@@ -24314,7 +24314,7 @@ fi
 
       if test "x${have_glesv2}" = "xyes" ; then
          evas_engine_wayland_egl_cflags="${WAYLAND_EGL_CFLAGS}"
-         evas_engine_wayland_egl_libs="${WAYLAND_EGL_LIBS} -lGL -lGLESv2 -lEGL"
+         evas_engine_wayland_egl_libs="${WAYLAND_EGL_LIBS} -lGLESv2 -lEGL"
       fi
 fi
 
diff --git a/m4/evas_check_engine.m4 b/m4/evas_check_engine.m4
index d4db2aa..ce99ed1 100644
--- a/m4/evas_check_engine.m4
+++ b/m4/evas_check_engine.m4
@@ -839,7 +839,7 @@ evas_engine_[]$1[]_cflags=""
 evas_engine_[]$1[]_libs=""
 
 PKG_CHECK_MODULES([WAYLAND_EGL],
-   [egl >= 7.10 glesv2 gl wayland-client wayland-egl],
+   [egl >= 7.10 glesv2 wayland-client wayland-egl],
    [
     have_dep="yes"
     requirement="egl >= 7.10 glesv2 gl wayland-client wayland-egl"
@@ -855,7 +855,7 @@ if test "x${have_dep}" = "xyes" ; then
       AC_CHECK_LIB(GLESv2, glTexImage2D, [have_glesv2="yes"], , -lEGL -lm)
       if test "x${have_glesv2}" = "xyes" ; then
          evas_engine_[]$1[]_cflags="${WAYLAND_EGL_CFLAGS}"
-         evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS} -lGL -lGLESv2 -lEGL"
+         evas_engine_[]$1[]_libs="${WAYLAND_EGL_LIBS} -lGLESv2 -lEGL"
       fi
 fi
 
diff --git a/src/modules/engines/wayland_egl/evas_engine.c b/src/modules/engines/wayland_egl/evas_engine.c
index 076c2dc..3f7fb0e 100644
--- a/src/modules/engines/wayland_egl/evas_engine.c
+++ b/src/modules/engines/wayland_egl/evas_engine.c
@@ -3676,13 +3676,14 @@ eng_image_max_size_get(void *data, int *maxw, int *maxh)
 static int
 module_open(Evas_Module *em)
 {
+#if defined(BUILD_ENGINE_GL_X11) || defined(BUILD_ENGINE_GL_XCB)
    static Eina_Bool xrm_inited = EINA_FALSE;
    if (!xrm_inited)
      {
         xrm_inited = EINA_TRUE;
         XrmInitialize();
      }
-
+#endif
    if (!em) return 0;
    if (!evas_gl_common_module_open()) return 0;
    /* get whatever engine module we inherit from */