On Tue, 26 Jul 2011, Enlightenment SVN wrote:
> Log: > make ecore_con a default requirement for elm. > > > > Author: raster > Date: 2011-07-26 22:59:01 -0700 (Tue, 26 Jul 2011) > New Revision: 61789 > Trac: http://trac.enlightenment.org/e/changeset/61789 > > Modified: > trunk/elementary/configure.ac trunk/elementary/src/lib/Elementary.h.in > trunk/elementary/src/lib/Makefile.am trunk/elementary/src/lib/elm_main.c > trunk/elementary/src/lib/elm_map.c > > Modified: trunk/elementary/configure.ac > =================================================================== > --- trunk/elementary/configure.ac 2011-07-27 05:10:28 UTC (rev 61788) > +++ trunk/elementary/configure.ac 2011-07-27 05:59:01 UTC (rev 61789) > @@ -210,23 +210,15 @@ > eina >= 1.0.999 > eet >= 1.4.0 > evas >= 1.0.999 > - ecore >= 1.0.0 > - ecore-evas >= 1.0.0 > - ecore-file >= 1.0.0 > - ecore-imf >= 1.0.0 > + ecore >= 1.0.999 > + ecore-evas >= 1.0.999 > + ecore-file >= 1.0.999 > + ecore-imf >= 1.0.999 > + ecore-con >= 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], > [eio], > [ > @@ -641,8 +633,8 @@ > echo " edje_cc..................: ${edje_cc}" > echo > echo " Build elementary_test....: ${have_elementary_test}" > -echo " Examples.............: ${enable_build_examples}" > -echo " Examples installed...: ${enable_install_examples}" > +echo " Examples.................: ${enable_build_examples}" > +echo " Examples installed.......: ${enable_install_examples}" > echo " Build elementary_config..: ${have_elementary_config}" > echo > echo "Compilation................: make (or gmake)" > > Modified: trunk/elementary/src/lib/Elementary.h.in > =================================================================== > --- trunk/elementary/src/lib/Elementary.h.in 2011-07-27 05:10:28 UTC (rev > 61788) > +++ trunk/elementary/src/lib/Elementary.h.in 2011-07-27 05:59:01 UTC (rev > 61789) > @@ -149,6 +149,7 @@ > #include <Ecore_Evas.h> > #include <Ecore_File.h> > #include <Ecore_IMF.h> > +#include <Ecore_Con.h> > #include <Edje.h> > > #ifdef ELM_EDBUS > > Modified: trunk/elementary/src/lib/Makefile.am > =================================================================== > --- trunk/elementary/src/lib/Makefile.am 2011-07-27 05:10:28 UTC (rev > 61788) > +++ trunk/elementary/src/lib/Makefile.am 2011-07-27 05:59:01 UTC (rev > 61789) > @@ -23,7 +23,6 @@ > @ELEMENTARY_ETHUMB_CFLAGS@ \ > @ELEMENTARY_EMAP_CFLAGS@ \ > @EVIL_CFLAGS@ \ > -@ECORE_CON_CFLAGS@ \ > @EIO_CFLAGS@ \ > @EMOTION_CFLAGS@ \ > @EFL_PTHREAD_CFLAGS@ > @@ -141,7 +140,6 @@ > @ELEMENTARY_ETHUMB_LIBS@ \ > @ELEMENTARY_EMAP_LIBS@ \ > @EVIL_LIBS@ \ > -@ECORE_CON_LIBS@ \ > @EIO_LIBS@ \ > @EMOTION_LIBS@ \ > @EFL_PTHREAD_LIBS@ > > Modified: trunk/elementary/src/lib/elm_main.c > =================================================================== > --- trunk/elementary/src/lib/elm_main.c 2011-07-27 05:10:28 UTC (rev > 61788) > +++ trunk/elementary/src/lib/elm_main.c 2011-07-27 05:59:01 UTC (rev > 61789) > @@ -674,6 +674,8 @@ > } > ecore_evas_init(); // FIXME: check errors > ecore_imf_init(); > + ecore_con_init(); > + ecore_con_url_init(); > } > return _elm_sub_init_count; > } > @@ -693,6 +695,8 @@ > { > _elm_win_shutdown(); > _elm_module_shutdown(); > + ecore_con_url_shutdown(); > + ecore_con_shutdown(); > ecore_imf_shutdown(); > ecore_evas_shutdown(); > #define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name)) > > Modified: trunk/elementary/src/lib/elm_map.c > =================================================================== > --- trunk/elementary/src/lib/elm_map.c 2011-07-27 05:10:28 UTC (rev > 61788) > +++ trunk/elementary/src/lib/elm_map.c 2011-07-27 05:59:01 UTC (rev > 61789) > @@ -1,13 +1,7 @@ > - > - > #ifdef HAVE_CONFIG_H > # include "elementary_config.h" > #endif that inclusion above is not needed anymore (it was needed for the definition of EAPI on Windows) Vincent > > -#ifdef HAVE_ECORE_CON > -# include <Ecore_Con.h> > -#endif > - > #include "Elementary.h" > #include "elm_priv.h" > > > > ------------------------------------------------------------------------------ > Got Input? Slashdot Needs You. > Take our quick survey online. Come on, we don't ask for help often. > Plus, you'll get a chance to win $100 to spend on ThinkGeek. > http://p.sf.net/sfu/slashdot-survey > _______________________________________________ > enlightenment-svn mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > > ------------------------------------------------------------------------------ Got Input? Slashdot Needs You. Take our quick survey online. Come on, we don't ask for help often. Plus, you'll get a chance to win $100 to spend on ThinkGeek. http://p.sf.net/sfu/slashdot-survey _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
