summaryrefslogtreecommitdiff
path: root/legacy/elementary
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-07-10 21:45:47 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-07-10 21:45:47 +0000
commitd3a1fdd8fbe5132ed634044623995800e75c33d8 (patch)
tree36d01062fa03a82d24128f1612cd1cab1ae2759d /legacy/elementary
parent3fcd1757eaf0e008864faf0d673322af16a5fbf4 (diff)
again, first part of the fix of compilation of elm_map without ecore_con. elm_map.c must be fixed.
SVN revision: 61216
Diffstat (limited to 'legacy/elementary')
-rw-r--r--legacy/elementary/configure.ac9
-rw-r--r--legacy/elementary/src/lib/Makefile.am2
-rw-r--r--legacy/elementary/src/lib/elm_map.c11
3 files changed, 21 insertions, 1 deletions
diff --git a/legacy/elementary/configure.ac b/legacy/elementary/configure.ac
index 8355255591..5b774b92be 100644
--- a/legacy/elementary/configure.ac
+++ b/legacy/elementary/configure.ac
@@ -218,6 +218,15 @@ PKG_CHECK_MODULES([ELEMENTARY],
218 ] 218 ]
219) 219)
220 220
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
221PKG_CHECK_MODULES([EIO], 230PKG_CHECK_MODULES([EIO],
222 [eio], 231 [eio],
223 [ 232 [
diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am
index 5e72f59baa..33fa4f1e58 100644
--- a/legacy/elementary/src/lib/Makefile.am
+++ b/legacy/elementary/src/lib/Makefile.am
@@ -23,6 +23,7 @@ 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@ \
26@EIO_CFLAGS@ \ 27@EIO_CFLAGS@ \
27@EMOTION_CFLAGS@ \ 28@EMOTION_CFLAGS@ \
28@EFL_PTHREAD_CFLAGS@ 29@EFL_PTHREAD_CFLAGS@
@@ -139,6 +140,7 @@ libelementary_la_LIBADD = \
139@ELEMENTARY_ETHUMB_LIBS@ \ 140@ELEMENTARY_ETHUMB_LIBS@ \
140@ELEMENTARY_EMAP_LIBS@ \ 141@ELEMENTARY_EMAP_LIBS@ \
141@EVIL_LIBS@ \ 142@EVIL_LIBS@ \
143@ECORE_CON_LIBS@ \
142@EIO_LIBS@ \ 144@EIO_LIBS@ \
143@EMOTION_LIBS@ \ 145@EMOTION_LIBS@ \
144@EFL_PTHREAD_LIBS@ 146@EFL_PTHREAD_LIBS@
diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c
index 658f656ef0..31b87ff70d 100644
--- a/legacy/elementary/src/lib/elm_map.c
+++ b/legacy/elementary/src/lib/elm_map.c
@@ -1,4 +1,13 @@
1#include <Ecore_Con.h> 1
2
3#ifdef HAVE_CONFIG_H
4# include <elementary_config.h>
5#endif
6
7#ifdef HAVE_ECORE_CON
8# include <Ecore_Con.h>
9#endif
10
2#include "Elementary.h" 11#include "Elementary.h"
3#include "elm_priv.h" 12#include "elm_priv.h"
4 13