* emotion: Use the right macro.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/emotion@44895 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/emotion_test_main.c b/src/bin/emotion_test_main.c
index c824090..73418e5 100644 (file)
--- a/src/bin/emotion_test_main.c
+++ b/src/bin/emotion_test_main.c
@@ -112,22 +112,14 @@ main_start(int argc, char **argv)
      }
    if (mode == 4)
      ecore_evas = ecore_evas_new(NULL, 0, 0, startw, starth, NULL);
-# if HAVE_EVAS_SOFWARE_X11
    if (mode == 0)
      ecore_evas = ecore_evas_software_x11_new(NULL, 0,  0, 0, startw, starth);
-# endif
-# if HAVE_EVAS_OPENGL_X11
    if (mode == 1)
      ecore_evas = ecore_evas_gl_x11_new(NULL, 0, 0, 0, startw, starth);
-# endif
-# if HAVE_EVAS_FB
    if (mode == 2)
      ecore_evas = ecore_evas_fb_new(NULL, 0, startw, starth);
-# endif
-# if HAVE_EVAS_XRENDER_X11
    if (mode == 3)
      ecore_evas = ecore_evas_xrender_x11_new(NULL, 0, 0, 0, startw, starth);
-# endif
 
 #else
    startw = 240;

diff --git a/src/modules/gstreamer/emotion_gstreamer.c b/src/modules/gstreamer/emotion_gstreamer.c
index 5340612..e894e3e 100644 (file)
--- a/src/modules/gstreamer/emotion_gstreamer.c
+++ b/src/modules/gstreamer/emotion_gstreamer.c
@@ -1292,7 +1292,7 @@ gstreamer_module_shutdown(void)
    _emotion_module_unregister("gstreamer");
 }
 
-#ifndef EINA_STATIC_BUILD_GSTREAMER
+#ifndef EMOTION_STATIC_BUILD_GSTREAMER
 
 EINA_MODULE_INIT(gstreamer_module_init);
 EINA_MODULE_SHUTDOWN(gstreamer_module_shutdown);

diff --git a/src/modules/vlc/emotion_vlc.c b/src/modules/vlc/emotion_vlc.c
index bf0c9cc..7818719 100644 (file)
--- a/src/modules/vlc/emotion_vlc.c
+++ b/src/modules/vlc/emotion_vlc.c
@@ -1234,7 +1234,7 @@ vlc_module_shutdown(void)
    _emotion_module_unregister("vlc");
 }
 
-#ifndef EINA_STATIC_BUILD_VLC
+#ifndef EMOTION_STATIC_BUILD_VLC
 
 EINA_MODULE_INIT(vlc_module_init);
 EINA_MODULE_SHUTDOWN(vlc_module_shutdown);

diff --git a/src/modules/xine/emotion_xine.c b/src/modules/xine/emotion_xine.c
index 99b3139..d457abd 100644 (file)
--- a/src/modules/xine/emotion_xine.c
+++ b/src/modules/xine/emotion_xine.c
@@ -1557,7 +1557,7 @@ xine_module_shutdown(void)
    _emotion_module_unregister("xine");
 }
 
-#ifndef EINA_STATIC_BUILD_XINE
+#ifndef EMOTION_STATIC_BUILD_XINE
 
 EINA_MODULE_INIT(xine_module_init);
 EINA_MODULE_SHUTDOWN(xine_module_shutdown);