Revert "Removes ELM_CHECK_BACKEND[EGLFS] which searches for an ecore-eglfs"
authorNicolas Aguirre <aguirre.nicolas@gmail.com>
Mon, 3 Aug 2015 12:39:38 +0000 (14:39 +0200)
committerNicolas Aguirre <aguirre.nicolas@gmail.com>
Mon, 3 Aug 2015 12:39:38 +0000 (14:39 +0200)
This reverts commit aff92d581ed052413aa36785a9291e47315eb518.

configure.ac
src/lib/elm_win.c

index 3b93e8e..41436b4 100644 (file)
@@ -249,6 +249,7 @@ ELM_CHECK_BACKEND([Cocoa])
 ELM_CHECK_BACKEND([Win32])
 ELM_CHECK_BACKEND([Wayland])
 ELM_CHECK_BACKEND([DRM])
+ELM_CHECK_BACKEND([EGLFS])
 
 ELM_CHECK_OPTION([elocation], [0.1.0])
 ELM_CHECK_OPTION([eweather], [0.2.0])
index 6c29818..1000f86 100644 (file)
@@ -3386,7 +3386,7 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
           }
 #endif
 
-#if defined(HAVE_ELEMENTARY_DRM) || defined(HAVE_ELEMENTARY_FB)
+#if defined(HAVE_ELEMENTARY_DRM) || defined(HAVE_ELEMENTARY_FB) || defined(HAVE_ELEMENTARY_EGLFS)
         else if ((disp) && (!strcmp(disp, "fb")))
           {
 #ifdef HAVE_ELEMENTARY_DRM
@@ -3394,6 +3394,8 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
 #endif
 #ifdef HAVE_ELEMENTARY_FB
              enginelist[p++] = ELM_SOFTWARE_FB;
+#endif
+#ifdef HAVE_ELEMENTARY_EGLFS
              enginelist[p++] = ELM_EGLFS;
 #endif
           }
@@ -3455,7 +3457,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
                   enginelist[p++] = ELM_DRM;
 #endif
 #ifdef HAVE_ELEMENTARY_FB
-                  enginelist[p++] = ELM_EGLFS;
                   enginelist[p++] = ELM_SOFTWARE_FB;
 #endif
 #ifdef HAVE_ELEMENTARY_COCOA
@@ -3480,6 +3481,9 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
 #ifdef HAVE_ELEMENTARY_PSL1GHT
                   enginelist[p++] = ELM_SOFTWARE_PSL1GHT;
 #endif
+#ifdef HAVE_ELEMENTARY_EGLFS
+                  enginelist[p++] = ELM_EGLFS;
+#endif
                }
              else
                {
@@ -3497,7 +3501,6 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
                   enginelist[p++] = ELM_DRM;
 #endif
 #ifdef HAVE_ELEMENTARY_FB
-                  enginelist[p++] = ELM_EGLFS;
                   enginelist[p++] = ELM_SOFTWARE_FB;
 #endif
 #ifdef HAVE_ELEMENTARY_COCOA
@@ -3525,6 +3528,9 @@ _elm_win_finalize_internal(Eo *obj, Elm_Win_Data *sd, const char *name, Elm_Win_
 #ifdef HAVE_ELEMENTARY_PSL1GHT
                   enginelist[p++] = ELM_SOFTWARE_PSL1GHT;
 #endif
+#ifdef HAVE_ELEMENTARY_EGLFS
+                  enginelist[p++] = ELM_EGLFS;
+#endif
                }
           }
         enginelist[p++] = NULL;