diff --git a/configure.ac b/configure.ac index 5bded44..8eb1b5d 100644 --- a/configure.ac +++ b/configure.ac @@ -41,6 +41,7 @@ AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version]) AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version]) AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version]) AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison]) + version_info="lt_cur:lt_rev:lt_age" release_info="v_rel" AC_SUBST(version_info) @@ -60,6 +61,7 @@ PKG_CHECK_MODULES([ENVENTOR], ecore-ipc >= 1.7.99 edje >= 1.7.99 eo >= 1.7.99 + eio >= 1.7.99 ] ) diff --git a/src/bin/main.c b/src/bin/main.c index 9d6924d..d3b26d6 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -1,10 +1,16 @@ #include #include +#include "config.h" #include "common.h" +const char *BIN_DIR = PACKAGE_BIN_DIR; +const char *LIB_DIR = PACKAGE_LIB_DIR; +const char *DATA_DIR = PACKAGE_DATA_DIR; const char *PROTO_EDC_PATH = "/tmp/.proto.edc"; char EDJE_PATH[PATH_MAX]; +int main(int argc, char **argv); + struct app_s { edit_data *ed; @@ -450,6 +456,7 @@ config_data_set(app_data *ad, int argc, char **argv) static void elm_setup() { + int main(int , char **); elm_config_profile_set("standard"); //Recover the scale since it will be reset by elm_config_profile_set() @@ -458,8 +465,11 @@ elm_setup() elm_config_scroll_bounce_enabled_set(EINA_FALSE); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - elm_app_info_set("/usr/local/bin", "enventor", - "/usr/local/share/enventor"); + elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR); + elm_app_compile_data_dir_set(PACKAGE_DATA_DIR); + elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR); + elm_app_info_set(main, "enventor", + "images/logo.png"); snprintf(EDJE_PATH, sizeof(EDJE_PATH), "%s/themes/enventor.edj", elm_app_data_dir_get());