Ecore_Evas.h now contains HAVE_ECORE_EVAS_FB and -GL. it's generated by autoconf, so edit Ecore_Evas.h.in instead now

SVN revision: 8784

legacy/ecore/configure.in

@@ -381,6 +381,14 @@ else
   AM_CONDITIONAL(BUILD_ECORE_EVAS_GL, false)
 fi
 
+if test "x$have_ecore_evas_gl" = "xyes"; then
+	BUILD_ECORE_EVAS_GL=1
+else
+	BUILD_ECORE_EVAS_GL=0
+fi
+
+AC_SUBST(BUILD_ECORE_EVAS_GL)
+
 have_ecore_evas_fb="no";
 
 AC_MSG_CHECKING(whether ecore_evas fb support is to be built)
@@ -415,6 +423,14 @@ else
   AM_CONDITIONAL(BUILD_ECORE_EVAS_FB, false)
 fi
 
+if test "x$have_ecore_evas_fb" = "xyes"; then
+	BUILD_ECORE_EVAS_FB=1
+else
+	BUILD_ECORE_EVAS_FB=0
+fi
+
+AC_SUBST(BUILD_ECORE_EVAS_FB)
+
 AC_MSG_CHECKING(whether ecore_con module is to be built)
 
 have_ecore_con="no";
@@ -546,6 +562,7 @@ src/lib/ecore/Makefile
 src/lib/ecore_job/Makefile
 src/lib/ecore_x/Makefile
 src/lib/ecore_fb/Makefile
+src/lib/ecore_evas/Ecore_Evas.h
 src/lib/ecore_evas/Makefile
 src/lib/ecore_con/Makefile
 src/lib/ecore_ipc/Makefile

legacy/ecore/src/lib/ecore_evas/.cvsignore

@@ -1,5 +1,6 @@
 .deps
 .libs
+Ecore_Evas.h
 Makefile
 Makefile.in
 ecore_evas.lo

legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h.in

@@ -19,6 +19,9 @@
 extern "C" {
 #endif
 
+#define HAVE_ECORE_EVAS_FB @BUILD_ECORE_EVAS_FB@
+#define HAVE_ECORE_EVAS_GL @BUILD_ECORE_EVAS_GL@
+
 #ifndef _ECORE_X_H
 #define _ECORE_X_WINDOW_PREDEF
 typedef unsigned int Ecore_X_Window;
@@ -35,9 +38,15 @@ int         ecore_evas_shutdown(void);
 
 /* engine/target specific init calls */
 Ecore_Evas     *ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-Ecore_Evas     *ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
 Ecore_X_Window  ecore_evas_software_x11_window_get(Ecore_Evas *ee);
+
+#if HAVE_ECORE_EVAS_GL
+Ecore_Evas     *ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
+#endif
+
+#if HAVE_ECORE_EVAS_FB
 Ecore_Evas     *ecore_evas_fb_new(char *disp_name, int rotation, int w, int h);
+#endif
 
 /* generic manipulation calls */
 void        ecore_evas_free(Ecore_Evas *ee);

legacy/ecore/src/lib/ecore_evas/Makefile.am

@@ -57,7 +57,7 @@ $(top_builddir)/src/lib/ecore/libecore.la
 endif
 
 EXTRA_DIST = \
-Ecore_Evas.h \
+Ecore_Evas.h.in \
 ecore_evas.c \
 ecore_evas_x.c \
 ecore_evas_fb.c \