make ecore_con a default requirement for elm.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@61789 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 6b499d8..171b398 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -210,23 +210,15 @@ PKG_CHECK_MODULES([ELEMENTARY],
     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 "  eet......................: ${eet_eet}"
 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)"

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index e5177fb..064f4a5 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -149,6 +149,7 @@ Pants
 #include <Ecore_Evas.h>
 #include <Ecore_File.h>
 #include <Ecore_IMF.h>
+#include <Ecore_Con.h>
 #include <Edje.h>
 
 #ifdef ELM_EDBUS

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 2eb636f..d438937 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -23,7 +23,6 @@ AM_CPPFLAGS = \
 @ELEMENTARY_ETHUMB_CFLAGS@ \
 @ELEMENTARY_EMAP_CFLAGS@ \
 @EVIL_CFLAGS@ \
-@ECORE_CON_CFLAGS@ \
 @EIO_CFLAGS@ \
 @EMOTION_CFLAGS@ \
 @EFL_PTHREAD_CFLAGS@
@@ -141,7 +140,6 @@ libelementary_la_LIBADD = \
 @ELEMENTARY_ETHUMB_LIBS@ \
 @ELEMENTARY_EMAP_LIBS@ \
 @EVIL_LIBS@ \
-@ECORE_CON_LIBS@ \
 @EIO_LIBS@ \
 @EMOTION_LIBS@ \
 @EFL_PTHREAD_LIBS@

diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index ab5e542..983b528 100644 (file)
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -674,6 +674,8 @@ elm_quicklaunch_sub_init(int    argc,
           }
         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_quicklaunch_sub_shutdown(void)
      {
         _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))

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 97adff9..6d7f7bc 100644 (file)
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1,13 +1,7 @@
-
-
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
 
-#ifdef HAVE_ECORE_CON
-# include <Ecore_Con.h>
-#endif
-
 #include "Elementary.h"
 #include "elm_priv.h"