summaryrefslogtreecommitdiff
path: root/legacy/elementary
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2011-07-27 05:59:01 +0000
committerCarsten Haitzler <raster@rasterman.com>2011-07-27 05:59:01 +0000
commit8803910b36cd0660834ac7016e1cd2ad9f35ceb1 (patch)
tree5bb3b96db7cc7e02422ad117ac0544f107f8a7bf /legacy/elementary
parenta03291c9aff349c01351153bc998866f8faf1eaf (diff)
make ecore_con a default requirement for elm.
SVN revision: 61789
Diffstat (limited to 'legacy/elementary')
-rw-r--r--legacy/elementary/configure.ac22
-rw-r--r--legacy/elementary/src/lib/Elementary.h.in1
-rw-r--r--legacy/elementary/src/lib/Makefile.am2
-rw-r--r--legacy/elementary/src/lib/elm_main.c4
-rw-r--r--legacy/elementary/src/lib/elm_map.c6
5 files changed, 12 insertions, 23 deletions
diff --git a/legacy/elementary/configure.ac b/legacy/elementary/configure.ac
index 6b499d870f..171b3984bd 100644
--- a/legacy/elementary/configure.ac
+++ b/legacy/elementary/configure.ac
@@ -210,23 +210,15 @@ PKG_CHECK_MODULES([ELEMENTARY],
210 eina >= 1.0.999 210 eina >= 1.0.999
211 eet >= 1.4.0 211 eet >= 1.4.0
212 evas >= 1.0.999 212 evas >= 1.0.999
213 ecore >= 1.0.0 213 ecore >= 1.0.999
214 ecore-evas >= 1.0.0 214 ecore-evas >= 1.0.999
215 ecore-file >= 1.0.0 215 ecore-file >= 1.0.999
216 ecore-imf >= 1.0.0 216 ecore-imf >= 1.0.999
217 ecore-con >= 1.0.999
217 edje >= 1.0.999 218 edje >= 1.0.999
218 ] 219 ]
219) 220)
220 221
221PKG_CHECK_MODULES([ECORE_CON],
222 [ecore-con],
223 [
224 have_ecore_con="yes"
225 AC_DEFINE(HAVE_ECORE_CON, 1, [Use Ecore_Con for downloding files])
226 requirement_elm="ecore-con ${requirement_elm}"
227 ],
228 [have_ecore_con="no"])
229
230PKG_CHECK_MODULES([EIO], 222PKG_CHECK_MODULES([EIO],
231 [eio], 223 [eio],
232 [ 224 [
@@ -641,8 +633,8 @@ echo " eet......................: ${eet_eet}"
641echo " edje_cc..................: ${edje_cc}" 633echo " edje_cc..................: ${edje_cc}"
642echo 634echo
643echo " Build elementary_test....: ${have_elementary_test}" 635echo " Build elementary_test....: ${have_elementary_test}"
644echo " Examples.............: ${enable_build_examples}" 636echo " Examples.................: ${enable_build_examples}"
645echo " Examples installed...: ${enable_install_examples}" 637echo " Examples installed.......: ${enable_install_examples}"
646echo " Build elementary_config..: ${have_elementary_config}" 638echo " Build elementary_config..: ${have_elementary_config}"
647echo 639echo
648echo "Compilation................: make (or gmake)" 640echo "Compilation................: make (or gmake)"
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index e5177fbd42..064f4a5639 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -149,6 +149,7 @@ Pants
149#include <Ecore_Evas.h> 149#include <Ecore_Evas.h>
150#include <Ecore_File.h> 150#include <Ecore_File.h>
151#include <Ecore_IMF.h> 151#include <Ecore_IMF.h>
152#include <Ecore_Con.h>
152#include <Edje.h> 153#include <Edje.h>
153 154
154#ifdef ELM_EDBUS 155#ifdef ELM_EDBUS
diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am
index 2eb636f799..d4389377c1 100644
--- a/legacy/elementary/src/lib/Makefile.am
+++ b/legacy/elementary/src/lib/Makefile.am
@@ -23,7 +23,6 @@ AM_CPPFLAGS = \
23@ELEMENTARY_ETHUMB_CFLAGS@ \ 23@ELEMENTARY_ETHUMB_CFLAGS@ \
24@ELEMENTARY_EMAP_CFLAGS@ \ 24@ELEMENTARY_EMAP_CFLAGS@ \
25@EVIL_CFLAGS@ \ 25@EVIL_CFLAGS@ \
26@ECORE_CON_CFLAGS@ \
27@EIO_CFLAGS@ \ 26@EIO_CFLAGS@ \
28@EMOTION_CFLAGS@ \ 27@EMOTION_CFLAGS@ \
29@EFL_PTHREAD_CFLAGS@ 28@EFL_PTHREAD_CFLAGS@
@@ -141,7 +140,6 @@ libelementary_la_LIBADD = \
141@ELEMENTARY_ETHUMB_LIBS@ \ 140@ELEMENTARY_ETHUMB_LIBS@ \
142@ELEMENTARY_EMAP_LIBS@ \ 141@ELEMENTARY_EMAP_LIBS@ \
143@EVIL_LIBS@ \ 142@EVIL_LIBS@ \
144@ECORE_CON_LIBS@ \
145@EIO_LIBS@ \ 143@EIO_LIBS@ \
146@EMOTION_LIBS@ \ 144@EMOTION_LIBS@ \
147@EFL_PTHREAD_LIBS@ 145@EFL_PTHREAD_LIBS@
diff --git a/legacy/elementary/src/lib/elm_main.c b/legacy/elementary/src/lib/elm_main.c
index ab5e54227e..983b528d51 100644
--- a/legacy/elementary/src/lib/elm_main.c
+++ b/legacy/elementary/src/lib/elm_main.c
@@ -674,6 +674,8 @@ elm_quicklaunch_sub_init(int argc,
674 } 674 }
675 ecore_evas_init(); // FIXME: check errors 675 ecore_evas_init(); // FIXME: check errors
676 ecore_imf_init(); 676 ecore_imf_init();
677 ecore_con_init();
678 ecore_con_url_init();
677 } 679 }
678 return _elm_sub_init_count; 680 return _elm_sub_init_count;
679} 681}
@@ -693,6 +695,8 @@ elm_quicklaunch_sub_shutdown(void)
693 { 695 {
694 _elm_win_shutdown(); 696 _elm_win_shutdown();
695 _elm_module_shutdown(); 697 _elm_module_shutdown();
698 ecore_con_url_shutdown();
699 ecore_con_shutdown();
696 ecore_imf_shutdown(); 700 ecore_imf_shutdown();
697 ecore_evas_shutdown(); 701 ecore_evas_shutdown();
698#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name)) 702#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c
index 97adff9e84..6d7f7bc2b2 100644
--- a/legacy/elementary/src/lib/elm_map.c
+++ b/legacy/elementary/src/lib/elm_map.c
@@ -1,13 +1,7 @@
1
2
3#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
4# include "elementary_config.h" 2# include "elementary_config.h"
5#endif 3#endif
6 4
7#ifdef HAVE_ECORE_CON
8# include <Ecore_Con.h>
9#endif
10
11#include "Elementary.h" 5#include "Elementary.h"
12#include "elm_priv.h" 6#include "elm_priv.h"
13 7