bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fix build when ecore_imf is not available. Patch by Lars Munch 

* formatting


SVN revision: 40632
This commit is contained in:
Vincent Torri 2009-05-13 22:11:06 +00:00
parent eb183cb48c
commit b56951c385
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
legacy/edje/configure.ac
View File

@ -145,11 +145,13 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
AM_PATH_PYTHON([2.5], , [:]) AM_PATH_PYTHON([2.5], , [:])
AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != : ]) AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != : ])
# pkg-config
### Checks for libraries
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
### Checks for libraries
# Evil library for compilation on Windows # Evil library for compilation on Windows
EFL_EDJE_BUILD="" EFL_EDJE_BUILD=""
@ -171,12 +173,11 @@ PKG_CHECK_MODULES([EDJE],
eet >= 1.0.1 eet >= 1.0.1
evas >= 0.9.9 evas >= 0.9.9
ecore >= 0.9.9 ecore >= 0.9.9
ecore-imf >= 0.9.9
ecore-imf-evas >= 0.9.9
ecore-job >= 0.9.9 ecore-job >= 0.9.9
embryo >= 0.9.1 embryo >= 0.9.1
] ])
)
requirement_edje="embryo ecore-job ecore evas eet eina-0 ${requirement_edje}"
have_ecore_imf="no" have_ecore_imf="no"
PKG_CHECK_MODULES([ECORE_IMF], PKG_CHECK_MODULES([ECORE_IMF],
@ -189,10 +190,8 @@ PKG_CHECK_MODULES([ECORE_IMF],
have_ecore_imf="yes" have_ecore_imf="yes"
requirement_edje="ecore-imf ecore-imf-evas ${requirement_edje}" requirement_edje="ecore-imf ecore-imf-evas ${requirement_edje}"
], ],
[have_ecore_imf="yes"] [have_ecore_imf="yes"],
) [have_ecore_imf="no"])
requirement_edje="embryo ecore-job ecore evas eet eina-0 ${requirement_edje}"
# Dependencies for the binaries # Dependencies for the binaries
@ -282,11 +281,13 @@ echo "------------------------------------------------------------------------"
echo echo
echo "Configuration Options Summary:" echo "Configuration Options Summary:"
echo echo
echo " Ecore IMF............: $have_ecore_imf"
echo
echo " EDJE_PROGRAM_CACHE...: $want_edje_program_cache" echo " EDJE_PROGRAM_CACHE...: $want_edje_program_cache"
echo echo
echo " Build binaries.......: $have_edje_cc" echo " Build binaries.......: $have_edje_cc"
echo echo
echo " Documentation........: ${enable_doc}" echo " Documentation........: ${build_doc}"
echo echo
echo " Compilation..........: make" echo " Compilation..........: make"
echo echo
@ -294,5 +295,3 @@ echo " Installation.........: make install"
echo echo
echo " prefix.............: $prefix" echo " prefix.............: $prefix"
echo echo
echo " Ecore IMF............: $have_ecore_imf"
echo

2
legacy/edje/src/lib/edje_entry.c
View File

@ -27,10 +27,12 @@ void *alloca (size_t);
#include "edje_private.h" #include "edje_private.h"
#ifdef ECORE_IMF
static int _edje_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos); static int _edje_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos);
static int _edje_entry_imf_event_commit_cb(void *data, int type, void *event); static int _edje_entry_imf_event_commit_cb(void *data, int type, void *event);
static int _edje_entry_imf_event_changed_cb(void *data, int type, void *event); static int _edje_entry_imf_event_changed_cb(void *data, int type, void *event);
static int _edje_entry_imf_event_delete_surrounding_cb(void *data, int type, void *event); static int _edje_entry_imf_event_delete_surrounding_cb(void *data, int type, void *event);
#endif
typedef struct _Entry Entry; typedef struct _Entry Entry;
typedef struct _Sel Sel; typedef struct _Sel Sel;