-=-------##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-m4_define([v_maj], [0])
-m4_define([v_min], [7])
+##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+m4_define([v_maj], [1])
+m4_define([v_min], [0])
m4_define([v_mic], [0])
-m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
+m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
##-- When released, remove the dnl on the below line
-dnl m4_undefine([v_rev])
+m4_undefine([v_rev])
##-- When doing snapshots - change soname. remove dnl on below line
-m4_define([relname], [ver-pre-svn-09])
-m4_define([v_rel], [-release relname])
+dnl m4_define([relname], [ver-pre-svn-09])
+dnl m4_define([v_rel], [-release relname])
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])],
[m4_define([v_ver], [v_maj.v_min.v_mic])])
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-AC_INIT([elementary], [v_ver], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([elementary], [v_ver]-beta, [enlightenment-devel@lists.sourceforge.net])
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_MACRO_DIR([m4])
AC_C_BIGENDIAN
AC_ISC_POSIX
AC_PROG_CC
-AM_PROG_CC_STDC
+AC_PROG_CC_STDC
AC_HEADER_STDC
AC_C_CONST
AC_C___ATTRIBUTE__
ELM_WIN32_DEF="#undef"
ELM_WINCE_DEF="#undef"
have_windows="no"
+have_dlopen="no"
case "$host_os" in
- mingw32ce* | cegcc*)
+ mingw32ce*)
PKG_CHECK_MODULES([EVIL], [evil])
AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.])
lt_enable_auto_import="-Wl,--enable-auto-import"
have_windows="yes"
dnl managed by evil
AC_DEFINE(HAVE_DLADDR)
+ have_dlopen="yes"
dlopen_libs=-ldl
requirement_elm="evil"
have_socket="no"
have_windows="yes"
dnl managed by evil
AC_DEFINE(HAVE_DLADDR)
+ have_dlopen="yes"
dlopen_libs=-ldl
requirement_elm="evil"
have_socket="no"
*solaris*)
ELM_UNIX_DEF="#define"
have_socket="yes"
+ have_dlopen="yes"
AC_CHECK_LIB([socket], [connect], [], [have_socket="no"])
;;
darwin*)
ELM_UNIX_DEF="#define"
have_socket="yes"
+ have_dlopen="yes"
AC_CHECK_HEADERS([crt_externs.h])
AC_DEFINE([environ], [(*_NSGetEnviron())], ["apple doesn't follow POSIX in this case."])
;;
ELM_UNIX_DEF="#define"
AC_CHECK_FUNCS(dlopen, res=yes, res=no)
if test "x$res" = "xyes"; then
- AC_CHECK_FUNCS(dladdr, AC_DEFINE(HAVE_DLADDR))
+ AC_CHECK_FUNCS(dladdr, AC_DEFINE(HAVE_DLADDR))
+ have_dlopen="yes"
else
- AC_CHECK_LIB(dl, dlopen, res=yes, res=no)
- if test "x$res" = "xyes"; then
- AC_CHECK_LIB(dl, dladdr, AC_DEFINE(HAVE_DLADDR))
- dlopen_libs=-ldl
- else
- AC_MSG_ERROR(Cannot find dlopen)
- fi
+ AC_CHECK_LIB(dl, dlopen, res=yes, res=no)
+ if test "x$res" = "xyes"; then
+ AC_CHECK_LIB(dl, dladdr, AC_DEFINE(HAVE_DLADDR))
+ dlopen_libs=-ldl
+ have_dlopen="yes"
+ fi
fi
have_socket="yes"
;;
esac
AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"])
+AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"])
m4_ifdef([v_mic],
[
+ EFL_COMPILER_FLAG([-Wshadow])
EFL_COMPILER_FLAG([-Wall])
EFL_COMPILER_FLAG([-W])
])
have_fork="no"
want_quicklaunch="auto"
AC_ARG_ENABLE([quick-launch],
- [AC_HELP_STRING([--disable-quick-launch], [disable quick-launch support, @<:@default=detect@:>@])],
- [want_quicklaunch=$enableval], [])
+ [AC_HELP_STRING([--disable-quick-launch], [disable quick-launch support, @<:@default=detect@:>@])],
+ [want_quicklaunch=$enableval], [])
if test "x$want_quicklaunch" != "xno"; then
AC_CHECK_FUNCS(fork, [
- have_fork="yes"
- AC_DEFINE(HAVE_FORK)
+ have_fork="yes"
+ AC_DEFINE(HAVE_FORK)
])
fi
-AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x$have_fork" = "xyes"])
+AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x$have_fork" = "xyes" && test "x$have_dlopen" = "xyes"])
AC_SUBST(dlopen_libs)
AC_SUBST(lt_enable_auto_import)
PKG_CHECK_MODULES([ELEMENTARY],
[
- eina >= 1.0.999
- eet >= 1.4.0
- evas >= 1.0.999
- ecore >= 1.0.999
- ecore-evas >= 1.0.999
- ecore-file >= 1.0.999
- ecore-imf >= 1.0.999
- ecore-con >= 1.0.999
- edje >= 1.0.999
+ eina >= 1.2.0
+ eet >= 1.6.0
+ evas >= 1.2.0
+ ecore >= 1.2.0
+ ecore-evas >= 1.2.0
+ ecore-file >= 1.2.0
+ edje >= 1.2.0
]
)
+requirement_elm="edje >= 1.2.0 ecore-file >= 1.2.0 ecore-evas >= 1.2.0 ecore >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 eina >= 1.2.0 ${requirement_elm}"
+
+PKG_CHECK_MODULES([ELEMENTARY_ECORE_IMF],
+ [ecore-imf >= 1.2.0],
+ [
+ ELEMENTARY_ECORE_IMF_INC="#include <Ecore_IMF.h>"
+ AC_DEFINE(HAVE_ELEMENTARY_ECORE_IMF, 1, [Have Ecore_IMF support])
+ have_ecore_imf="yes"
+ requirement_elm="ecore-imf >= 1.2.0 ${requirement_elm}"
+ ],
+ [have_ecore_imf="no"])
+AC_SUBST(ELEMENTARY_ECORE_IMF_INC)
+
+AM_CONDITIONAL([HAVE_ECORE_IMF], [test "x${have_ecore_imf}" = "xyes"])
+
+PKG_CHECK_MODULES([ELEMENTARY_ECORE_CON],
+ [ecore-con >= 1.2.0],
+ [
+ ELEMENTARY_ECORE_CON_INC="#include <Ecore_Con.h>"
+ AC_DEFINE(HAVE_ELEMENTARY_ECORE_CON, 1, [Have Ecore_Con support])
+ have_ecore_con="yes"
+ requirement_elm="ecore-con >= 1.2.0 ${requirement_elm}"
+ ],
+ [have_ecore_con="no"])
+AC_SUBST(ELEMENTARY_ECORE_CON_INC)
+
+AM_CONDITIONAL([HAVE_ECORE_CON], [test "x${have_ecore_con}" = "xyes"])
+
PKG_CHECK_MODULES([EIO],
- [eio],
- [
- have_eio="yes"
- AC_DEFINE(HAVE_EIO, 1, [Use EIO for asynchronous file access])
- requirement_elm="eio ${requirement_elm}"
- ],
- [have_eio="no"])
+ [eio],
+ [
+ have_eio="yes"
+ AC_DEFINE(HAVE_EIO, 1, [Use EIO for asynchronous file access])
+ requirement_elm="eio ${requirement_elm}"
+ ],
+ [have_eio="no"])
AM_CONDITIONAL([HAVE_EIO], [test "x${have_eio}" = "xyes"])
if test "x$want_elementary_emotion" != "xno"; then
PKG_CHECK_MODULES([EMOTION],
- [emotion],
- [
- have_emotion="yes"
- AC_DEFINE(HAVE_EMOTION, 1, [Use Emotion for asynchronous file access])
- requirement_elm="emotion ${requirement_elm}"
- ],
- [have_emotion="no"])
+ [emotion],
+ [
+ have_emotion="yes"
+ AC_DEFINE(HAVE_EMOTION, 1, [Use Emotion for asynchronous file access])
+ requirement_elm="emotion ${requirement_elm}"
+ ],
+ [have_emotion="no"])
fi
AM_CONDITIONAL([HAVE_EMOTION], [test "x${have_emotion}" = "xyes"])
-requirement_elm="edje >= 1.0.0 ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_elm}"
-
have_elementary_x="no"
want_elementary_x="auto"
AC_ARG_ENABLE([ecore-x],
if test "x$want_elementary_x" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_X],
- [ecore-x >= 1.0.0],
+ [ecore-x >= 1.2.0],
[
AC_DEFINE(HAVE_ELEMENTARY_X, 1, [X11 support for Elementary])
have_elementary_x="yes"
- requirement_elm="ecore-x >= 1.0.0 ${requirement_elm}"
+ requirement_elm="ecore-x >= 1.2.0 ${requirement_elm}"
],
[have_elementary_x="no"]
)
if test "x$want_elementary_fb" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_FB],
- [ecore-fb >= 1.0.0],
+ [ecore-fb >= 1.2.0],
[
AC_DEFINE(HAVE_ELEMENTARY_FB, 1, [FB support for Elementary])
have_elementary_fb="yes"
- requirement_elm="ecore-fb >= 1.0.0 ${requirement_elm}"
+ requirement_elm="ecore-fb >= 1.2.0 ${requirement_elm}"
],
[have_elementary_fb="no"]
)
AC_MSG_ERROR([ecore-fb support requested, but not found by pkg-config.])
fi
+have_elementary_psl1ght="no"
+want_elementary_psl1ght="auto"
+AC_ARG_ENABLE([ecore-psl1ght],
+ [AC_HELP_STRING([--disable-ecore-psl1ght], [disable ecore-psl1ght support. @<:@default=detect@:>@])],
+ [want_elementary_psl1ght=$enableval], [])
+
+if test "x$want_elementary_psl1ght" != "xno"; then
+ PKG_CHECK_MODULES([ELEMENTARY_PSL1GHT],
+ [ecore-psl1ght >= 1.2.0],
+ [
+ AC_DEFINE(HAVE_ELEMENTARY_PSL1GHT, 1, [PSL1GHT support for Elementary])
+ have_elementary_psl1ght="yes"
+ requirement_elm="ecore-psl1ght >= 1.2.0 ${requirement_elm}"
+ ],
+ [have_elementary_psl1ght="no"]
+ )
+else
+ have_elementary_psl1ght="no"
+fi
+if test "x$want_elementary_psl1ght" = "xyes" -a "x$have_elementary_psl1ght" = "xno"; then
+ AC_MSG_ERROR([ecore-psl1ght support requested, but not found by pkg-config.])
+fi
+
have_elementary_sdl="no"
want_elementary_sdl="auto"
AC_ARG_ENABLE([ecore-sdl],
if test "x$want_elementary_sdl" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_SDL],
- [ecore-sdl >= 1.0.0],
+ [ecore-sdl >= 1.2.0],
[
AC_DEFINE(HAVE_ELEMENTARY_SDL, 1, [SDL support for Elementary])
have_elementary_sdl="yes"
- requirement_elm="ecore-sdl >= 1.0.0 ${requirement_elm}"
+ requirement_elm="ecore-sdl >= 1.2.0 ${requirement_elm}"
],
[have_elementary_sdl="no"]
)
AC_MSG_ERROR([ecore-sdl support requested, but not found by pkg-config.])
fi
+have_elementary_cocoa="no"
+want_elementary_cocoa="auto"
+AC_ARG_ENABLE([ecore-cocoa],
+ [AC_HELP_STRING([--disable-ecore-cocoa], [disable ecore-cocoa support. @<:@default=detect@:>@])],
+ [want_elementary_cocoa=$enableval], [])
+
+if test "x$want_elementary_cocoa" != "xno"; then
+ PKG_CHECK_MODULES([ELEMENTARY_COCOA],
+ [ecore-cocoa >= 1.2.0],
+ [
+ AC_DEFINE(HAVE_ELEMENTARY_COCOA, 1, [COCOA support for Elementary])
+ have_elementary_cocoa="yes"
+ requirement_elm="ecore-cocoa >= 1.2.0 ${requirement_elm}"
+ ],
+ [have_elementary_cocoa="no"]
+ )
+else
+ have_elementary_cocoa="no"
+fi
+if test "x$want_elementary_cocoa" = "xyes" -a "x$have_elementary_cocoa" = "xno"; then
+ AC_MSG_ERROR([ecore-cocoa support requested, but not found by pkg-config.])
+fi
+
have_elementary_win32="no"
want_elementary_win32="auto"
AC_ARG_ENABLE([ecore-win32],
if test "x$want_elementary_win32" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_WIN32],
- [ecore-win32 >= 1.0.0],
+ [ecore-win32 >= 1.2.0],
[
AC_DEFINE(HAVE_ELEMENTARY_WIN32, 1, [Windows XP support for Elementary])
have_elementary_win32="yes"
- requirement_elm="ecore-win32 >= 1.0.0 ${requirement_elm}"
+ requirement_elm="ecore-win32 >= 1.2.0 ${requirement_elm}"
],
[have_elementary_win32="no"]
)
if test "x$want_elementary_wince" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_WINCE],
- [ecore-wince >= 1.0.0],
+ [ecore-wince >= 1.2.0],
[
AC_DEFINE(HAVE_ELEMENTARY_WINCE, 1, [Windows CE support for Elementary])
have_elementary_wince="yes"
- requirement_elm="ecore-wince >= 1.0.0 ${requirement_elm}"
+ requirement_elm="ecore-wince >= 1.2.0 ${requirement_elm}"
],
[have_elementary_wince="no"]
)
if test "x$want_elementary_edbus" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_EDBUS],
[
- edbus >= 1.0.0
+ edbus >= 1.2.0
],
[
AC_DEFINE(HAVE_ELEMENTARY_EDBUS, 1, [EDBus support for Elementary])
have_elementary_edbus="yes"
ELM_EDBUS_DEF="#define"
- requirement_elm="edbus >= 1.0.0 ${requirement_elm}"
+ requirement_elm="edbus >= 1.2.0 ${requirement_elm}"
],
[have_elementary_edbus="no"]
)
if test "x$want_elementary_efreet" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_EFREET],
[
- efreet >= 1.0.0
- efreet-mime >= 1.0.0
- efreet-trash >= 1.0.0
+ efreet >= 1.2.0
+ efreet-mime >= 1.2.0
+ efreet-trash >= 1.2.0
],
[
AC_DEFINE(HAVE_ELEMENTARY_EFREET, 1, [Efreet support for Elementary])
have_elementary_efreet="yes"
ELM_EFREET_DEF="#define"
- requirement_elm="efreet >= 1.0.0 efreet-mime >= 1.0.0 efreet-trash >= 1.0.0 ${requirement_elm}"
+ requirement_elm="efreet >= 1.2.0 efreet-mime >= 1.2.0 efreet-trash >= 1.2.0 ${requirement_elm}"
],
[have_elementary_efreet="no"]
)
AC_CHECK_HEADER(libintl.h, [ELM_LIBINTL_H_DEF="#define"])
AC_SUBST(ELM_LIBINTL_H_DEF)
-EFL_CHECK_THREADS([
- TH=1
-] , [
- AC_MSG_ERROR(no thread support found. required.)
- exit 1
-])
-AC_SUBST(EFL_PTHREAD_CFLAGS)
-AC_SUBST(EFL_PTHREAD_LIBS)
+ELM_DIRENT_H_DEF="#undef"
+AC_CHECK_HEADER(dirent.h, [ELM_DIRENT_H_DEF="#define"])
+AC_SUBST(ELM_DIRENT_H_DEF)
+
+AC_CHECK_HEADER(sys/mman.h, [have_mman="yes"], [have_mman="no"])
+if test "x${have_mman}" = "xyes"; then
+ AC_DEFINE(HAVE_MMAN_H, 1, [Have sys/mman.h header file])
+fi
+
+AC_CHECK_HEADERS([locale.h langinfo.h])
my_libs="-lm"
AC_SUBST(my_libs)
m4_ifdef([AM_GNU_GETTEXT], [
AM_GNU_GETTEXT([external])
po_makefile_in=po/Makefile.in
-AM_CONDITIONAL([HAVE_PO], [true])
+have_po="yes"
],[
-AM_CONDITIONAL([HAVE_PO], [false])
+have_po="no"
])
AC_SUBST(LTLIBINTL)
+
+if test "x${POSUB}" = "x" ; then
+ have_po="no"
+fi
+
+AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"])
+
EFL_CHECK_PATH_MAX
+elementary_base_dir=".elementary"
+AC_ARG_WITH([elementary-base-dir],
+ [AC_HELP_STRING([--with-elementary-base-dir=PATH], [specify the subdirectory for all elementary data @<:@default=${elementary_base_dir}@:>@])],
+ [elementary_base_dir=${withval}],
+ [elementary_base_dir=".elementary"])
+
+AC_MSG_NOTICE([ELEMENTARY_BASE_DIR set to ${elementary_base_dir}])
+AC_DEFINE_UNQUOTED(ELEMENTARY_BASE_DIR, "${elementary_base_dir}", "subdirectory for all elementary data")
### Build and install examples
EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"])
src/bin/Makefile
src/modules/Makefile
src/modules/access_output/Makefile
+src/modules/datetime_input_ctxpopup/Makefile
src/modules/test_entry/Makefile
src/modules/test_map/Makefile
src/edje_externals/Makefile
echo " Engines:"
echo " X11....................: ${have_elementary_x}"
echo " Framebuffer............: ${have_elementary_fb}"
+echo " PSL1GHT................: ${have_elementary_psl1ght}"
echo " SDL....................: ${have_elementary_sdl}"
+echo " Cocoa..................: ${have_elementary_cocoa}"
echo " Windows XP.............: ${have_elementary_win32}"
echo " Windows CE.............: ${have_elementary_wince}"
echo
echo " Features:"
+echo " Ecore_IMF..............: ${have_ecore_imf}"
+echo " Ecore_Con..............: ${have_ecore_con}"
echo " EDBus..................: ${have_elementary_edbus}"
echo " EFreet.................: ${have_elementary_efreet}"
echo " EWeather...............: ${have_elementary_eweather}"
projects / framework / uifw / elementary.git / blobdiff