again, first part of the fix of compilation of elm_map without ecore_con. elm_map...

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

diff --git a/configure.ac b/configure.ac
index 8355255..5b774b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -218,6 +218,15 @@ PKG_CHECK_MODULES([ELEMENTARY],
    ]
 )
 
+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],
        [

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 5e72f59..33fa4f1 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
 @ELEMENTARY_ETHUMB_CFLAGS@ \
 @ELEMENTARY_EMAP_CFLAGS@ \
 @EVIL_CFLAGS@ \
+@ECORE_CON_CFLAGS@ \
 @EIO_CFLAGS@ \
 @EMOTION_CFLAGS@ \
 @EFL_PTHREAD_CFLAGS@
@@ -139,6 +140,7 @@ 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_map.c b/src/lib/elm_map.c
index 658f656..31b87ff 100644 (file)
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1,4 +1,13 @@
-#include <Ecore_Con.h>
+
+
+#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"