forked from enlightenment/efl
* fix build when ecore_imf is not available. Patch by Lars Munch
* formatting SVN revision: 40632
This commit is contained in:
parent
eb183cb48c
commit
b56951c385
|
@ -145,11 +145,13 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
|
|||
AM_PATH_PYTHON([2.5], , [:])
|
||||
AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != : ])
|
||||
|
||||
|
||||
### Checks for libraries
|
||||
# pkg-config
|
||||
|
||||
PKG_PROG_PKG_CONFIG
|
||||
|
||||
|
||||
### Checks for libraries
|
||||
|
||||
# Evil library for compilation on Windows
|
||||
|
||||
EFL_EDJE_BUILD=""
|
||||
|
@ -171,12 +173,11 @@ PKG_CHECK_MODULES([EDJE],
|
|||
eet >= 1.0.1
|
||||
evas >= 0.9.9
|
||||
ecore >= 0.9.9
|
||||
ecore-imf >= 0.9.9
|
||||
ecore-imf-evas >= 0.9.9
|
||||
ecore-job >= 0.9.9
|
||||
embryo >= 0.9.1
|
||||
]
|
||||
)
|
||||
])
|
||||
|
||||
requirement_edje="embryo ecore-job ecore evas eet eina-0 ${requirement_edje}"
|
||||
|
||||
have_ecore_imf="no"
|
||||
PKG_CHECK_MODULES([ECORE_IMF],
|
||||
|
@ -189,10 +190,8 @@ PKG_CHECK_MODULES([ECORE_IMF],
|
|||
have_ecore_imf="yes"
|
||||
requirement_edje="ecore-imf ecore-imf-evas ${requirement_edje}"
|
||||
],
|
||||
[have_ecore_imf="yes"]
|
||||
)
|
||||
|
||||
requirement_edje="embryo ecore-job ecore evas eet eina-0 ${requirement_edje}"
|
||||
[have_ecore_imf="yes"],
|
||||
[have_ecore_imf="no"])
|
||||
|
||||
# Dependencies for the binaries
|
||||
|
||||
|
@ -282,11 +281,13 @@ echo "------------------------------------------------------------------------"
|
|||
echo
|
||||
echo "Configuration Options Summary:"
|
||||
echo
|
||||
echo " Ecore IMF............: $have_ecore_imf"
|
||||
echo
|
||||
echo " EDJE_PROGRAM_CACHE...: $want_edje_program_cache"
|
||||
echo
|
||||
echo " Build binaries.......: $have_edje_cc"
|
||||
echo
|
||||
echo " Documentation........: ${enable_doc}"
|
||||
echo " Documentation........: ${build_doc}"
|
||||
echo
|
||||
echo " Compilation..........: make"
|
||||
echo
|
||||
|
@ -294,5 +295,3 @@ echo " Installation.........: make install"
|
|||
echo
|
||||
echo " prefix.............: $prefix"
|
||||
echo
|
||||
echo " Ecore IMF............: $have_ecore_imf"
|
||||
echo
|
||||
|
|
|
@ -27,10 +27,12 @@ void *alloca (size_t);
|
|||
|
||||
#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_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_delete_surrounding_cb(void *data, int type, void *event);
|
||||
#endif
|
||||
|
||||
typedef struct _Entry Entry;
|
||||
typedef struct _Sel Sel;
|
||||
|
|
Loading…
Reference in New Issue