Check separately for the Evas_Engine_FB.h header for enabling it in

ecore_evas.


SVN revision: 8130

legacy/ecore/acconfig.h

@@ -5,6 +5,7 @@
 #undef PACKAGE_BIN_DIR
 #undef BUILD_ECORE_EVAS
 #undef BUILD_ECORE_EVAS_GL
+#undef BUILD_ECORE_EVAS_FB
 #undef BUILD_ECORE_FB
 #undef BUILD_ECORE_JOB
 #undef BUILD_ECORE_X

legacy/ecore/configure.in

@@ -366,6 +366,37 @@ else
   AM_CONDITIONAL(BUILD_ECORE_EVAS_GL, false)
 fi
 
+have_ecore_evas_fb="";
+
+AC_MSG_CHECKING(whether ecore_evas fb support is to be built)
+
+AC_ARG_ENABLE(ecore-evas-fb, 
+[  --enable-ecore-evas-fb          enable fb in the ecore_evas module], [
+  if [ test "$enableval" = "yes" ]; then  
+    AC_MSG_RESULT(yes)
+    have_ecore_evas_fb="yes"
+  else
+    AC_MSG_RESULT(no)
+  fi
+], [
+  AC_MSG_RESULT(yes)
+  have_ecore_evas_fb="yes"
+]
+)
+
+if test "x$have_ecore_evas_fb" = "xyes"; then
+  AC_CHECK_HEADERS(Evas_Engine_FB.h,
+    [
+      AM_CONDITIONAL(BUILD_ECORE_EVAS_FB, true)
+      AC_DEFINE(BUILD_ECORE_EVAS_FB)
+    ], AM_CONDITIONAL(BUILD_ECORE_EVAS_FB, false),
+    [
+      #include <Evas.h>
+    ])
+else
+  AM_CONDITIONAL(BUILD_ECORE_EVAS_FB, false)
+fi
+
 AC_MSG_CHECKING(whether ecore_con module is to be built)
 
 have_ecore_con="";

legacy/ecore/src/lib/ecore_evas/ecore_evas.c

@@ -37,7 +37,7 @@ ecore_evas_shutdown(void)
 #ifdef BUILD_ECORE_X
 	while (_ecore_evas_x_shutdown());
 #endif
-#ifdef BUILD_ECORE_FB
+#ifdef BUILD_ECORE_EVAS_FB
 	while (_ecore_evas_fb_shutdown());
 #endif
      }

legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c

@@ -3,11 +3,11 @@
 #include "ecore_private.h"
 #include "ecore_evas_private.h"
 #include "Ecore_Evas.h"
-#ifdef BUILD_ECORE_FB
+#ifdef BUILD_ECORE_EVAS_FB
 #include "Ecore_Fb.h"
 #endif
 
-#ifdef BUILD_ECORE_FB
+#ifdef BUILD_ECORE_EVAS_FB
 static int _ecore_evas_init_count = 0;
 
 static Ecore_Evas *ecore_evases = NULL;
@@ -435,7 +435,7 @@ static const Ecore_Evas_Engine_Func _ecore_fb_engine_func =
 Ecore_Evas *
 ecore_evas_fb_new(char *disp_name, int rotation, int w, int h)
 {
-#ifdef BUILD_ECORE_FB
+#ifdef BUILD_ECORE_EVAS_FB
    Evas_Engine_Info_FB *einfo;
    Ecore_Evas *ee;
    int rmethod;

legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h

@@ -14,7 +14,7 @@
 #include <Evas_Engine_GL_X11.h>
 #endif
 #endif
-#ifdef BUILD_ECORE_FB
+#ifdef BUILD_ECORE_EVAS_FB
 #include <Evas_Engine_FB.h>
 #endif
 
@@ -79,7 +79,7 @@ struct _Ecore_Evas_Engine
       Region         damages;
    } x;
 #endif   
-#ifdef BUILD_ECORE_FB
+#ifdef BUILD_ECORE_EVAS_FB
    struct {
       int real_w;
       int real_h;
@@ -159,7 +159,7 @@ struct _Ecore_Evas
 #ifdef BUILD_ECORE_X
 int _ecore_evas_x_shutdown(void);
 #endif
-#ifdef BUILD_ECORE_FB
+#ifdef BUILD_ECORE_EVAS_FB
 int _ecore_evas_fb_shutdown(void);
 #endif