timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make ecore_con a default requirement for elm. 

SVN revision: 61789
This commit is contained in:
Carsten Haitzler 2011-07-27 05:59:01 +00:00
parent a03291c9af
commit 8803910b36
5 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
legacy/elementary/configure.ac
View File

@ -210,23 +210,15 @@ PKG_CHECK_MODULES([ELEMENTARY],
eina >= 1.0.999 eina >= 1.0.999
eet >= 1.4.0 eet >= 1.4.0
evas >= 1.0.999 evas >= 1.0.999
ecore >= 1.0.0 ecore >= 1.0.999
ecore-evas >= 1.0.0 ecore-evas >= 1.0.999
ecore-file >= 1.0.0 ecore-file >= 1.0.999
ecore-imf >= 1.0.0 ecore-imf >= 1.0.999
ecore-con >= 1.0.999
edje >= 1.0.999 edje >= 1.0.999
] ]
) )
PKG_CHECK_MODULES([ECORE_CON],
[ecore-con],
[
have_ecore_con="yes"
AC_DEFINE(HAVE_ECORE_CON, 1, [Use Ecore_Con for downloding files])
requirement_elm="ecore-con ${requirement_elm}"
],
[have_ecore_con="no"])
PKG_CHECK_MODULES([EIO], PKG_CHECK_MODULES([EIO],
[eio], [eio],
[ [
@ -641,8 +633,8 @@ echo " eet......................: ${eet_eet}"
echo " edje_cc..................: ${edje_cc}" echo " edje_cc..................: ${edje_cc}"
echo echo
echo " Build elementary_test....: ${have_elementary_test}" echo " Build elementary_test....: ${have_elementary_test}"
echo " Examples.............: ${enable_build_examples}" echo " Examples.................: ${enable_build_examples}"
echo " Examples installed...: ${enable_install_examples}" echo " Examples installed.......: ${enable_install_examples}"
echo " Build elementary_config..: ${have_elementary_config}" echo " Build elementary_config..: ${have_elementary_config}"
echo echo
echo "Compilation................: make (or gmake)" echo "Compilation................: make (or gmake)"

1
legacy/elementary/src/lib/Elementary.h.in
View File

@ -149,6 +149,7 @@ Pants
#include <Ecore_Evas.h> #include <Ecore_Evas.h>
#include <Ecore_File.h> #include <Ecore_File.h>
#include <Ecore_IMF.h> #include <Ecore_IMF.h>
#include <Ecore_Con.h>
#include <Edje.h> #include <Edje.h>
#ifdef ELM_EDBUS #ifdef ELM_EDBUS

2
legacy/elementary/src/lib/Makefile.am
View File

@ -23,7 +23,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_ETHUMB_CFLAGS@ \ @ELEMENTARY_ETHUMB_CFLAGS@ \
@ELEMENTARY_EMAP_CFLAGS@ \ @ELEMENTARY_EMAP_CFLAGS@ \
@EVIL_CFLAGS@ \ @EVIL_CFLAGS@ \
@ECORE_CON_CFLAGS@ \
@EIO_CFLAGS@ \ @EIO_CFLAGS@ \
@EMOTION_CFLAGS@ \ @EMOTION_CFLAGS@ \
@EFL_PTHREAD_CFLAGS@ @EFL_PTHREAD_CFLAGS@
@ -141,7 +140,6 @@ libelementary_la_LIBADD = \
@ELEMENTARY_ETHUMB_LIBS@ \ @ELEMENTARY_ETHUMB_LIBS@ \
@ELEMENTARY_EMAP_LIBS@ \ @ELEMENTARY_EMAP_LIBS@ \
@EVIL_LIBS@ \ @EVIL_LIBS@ \
@ECORE_CON_LIBS@ \
@EIO_LIBS@ \ @EIO_LIBS@ \
@EMOTION_LIBS@ \ @EMOTION_LIBS@ \
@EFL_PTHREAD_LIBS@ @EFL_PTHREAD_LIBS@

4
legacy/elementary/src/lib/elm_main.c
View File

@ -674,6 +674,8 @@ elm_quicklaunch_sub_init(int argc,
} }
ecore_evas_init(); // FIXME: check errors ecore_evas_init(); // FIXME: check errors
ecore_imf_init(); ecore_imf_init();
ecore_con_init();
ecore_con_url_init();
} }
return _elm_sub_init_count; return _elm_sub_init_count;
} }
@ -693,6 +695,8 @@ elm_quicklaunch_sub_shutdown(void)
{ {
_elm_win_shutdown(); _elm_win_shutdown();
_elm_module_shutdown(); _elm_module_shutdown();
ecore_con_url_shutdown();
ecore_con_shutdown();
ecore_imf_shutdown(); ecore_imf_shutdown();
ecore_evas_shutdown(); ecore_evas_shutdown();
#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name)) #define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))

6
legacy/elementary/src/lib/elm_map.c
View File

@ -1,13 +1,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "elementary_config.h" # include "elementary_config.h"
#endif #endif
#ifdef HAVE_ECORE_CON
# include <Ecore_Con.h>
#endif
#include "Elementary.h" #include "Elementary.h"
#include "elm_priv.h" #include "elm_priv.h"