and work more on getting release in shape - version requirements.

(god this is a pain in the butt)



SVN revision: 69484
This commit is contained in:
Carsten Haitzler 2012-03-17 06:25:41 +00:00
parent d75b68ae78
commit 4ac2f94b35
1 changed files with 86 additions and 86 deletions

View File

@ -319,7 +319,7 @@ AC_MSG_CHECKING([whether the UDEV device backend is enabled])
AC_MSG_RESULT([${e_cv_want_device_udev}]) AC_MSG_RESULT([${e_cv_want_device_udev}])
if test "x$e_cv_want_device_udev" != "xno";then if test "x$e_cv_want_device_udev" != "xno";then
PKG_CHECK_MODULES([EEZE], [eeze >= 1.0.0 ecore >= 1.0.999 eina >= 1.0.999], PKG_CHECK_MODULES([EEZE], [eeze >= 1.2.0 ecore >= 1.2.0 eina >= 1.2.0],
[ [
device_backend=eeze device_backend=eeze
AC_DEFINE_UNQUOTED([HAVE_EEZE],[1],[enable udev support]) AC_DEFINE_UNQUOTED([HAVE_EEZE],[1],[enable udev support])
@ -338,8 +338,8 @@ test "x${device_backend}" = "xeeze" || AC_DEFINE_UNQUOTED([HAVE_HAL],[1],[enable
DBUS_MOUNT_CONFIG=1 DBUS_MOUNT_CONFIG=1
dbus_mount="dbus-1" dbus_mount="dbus-1"
hal_mount="ehal >= 1.0.0, edbus >= 1.0.0" hal_mount="ehal >= 1.2.0, edbus >= 1.2.0"
udisks_mount="eukit >= 1.0.0" udisks_mount="eukit >= 1.2.0"
AC_ARG_ENABLE([mount-hal], AC_ARG_ENABLE([mount-hal],
AS_HELP_STRING([--enable-mount-hal],[enable hal mounting support @<:@default=enabled@:>@]), AS_HELP_STRING([--enable-mount-hal],[enable hal mounting support @<:@default=enabled@:>@]),
[e_cv_want_mount_hal=$enableval], [e_cv_want_mount_hal=$enableval],
@ -349,7 +349,7 @@ AC_MSG_CHECKING([whether the HAL mounting support is enabled])
AC_MSG_RESULT([${e_cv_want_mount_hal}]) AC_MSG_RESULT([${e_cv_want_mount_hal}])
if test "x$e_cv_want_mount_hal" != "xno";then if test "x$e_cv_want_mount_hal" != "xno";then
PKG_CHECK_EXISTS([ehal >= 1.0.0], PKG_CHECK_EXISTS([ehal >= 1.2.0],
[],[ [],[
hal_mount= hal_mount=
AC_MSG_NOTICE([HAL mounting disabled]) AC_MSG_NOTICE([HAL mounting disabled])
@ -368,7 +368,7 @@ AC_MSG_CHECKING([whether the UDISKS mounting support is enabled])
AC_MSG_RESULT([${e_cv_want_mount_udisks}]) AC_MSG_RESULT([${e_cv_want_mount_udisks}])
if test "x$e_cv_want_mount_udisks" != "xno";then if test "x$e_cv_want_mount_udisks" != "xno";then
PKG_CHECK_EXISTS([eukit >= 1.0.0], PKG_CHECK_EXISTS([eukit >= 1.2.0],
[],[ [],[
udisks_mount= udisks_mount=
AC_MSG_NOTICE([udisks mounting disabled]) AC_MSG_NOTICE([udisks mounting disabled])
@ -403,7 +403,7 @@ if test "x$e_cv_want_mount_eeze" != "xno" ; then
LIBS="$EEZE_LIBS $LIBS" LIBS="$EEZE_LIBS $LIBS"
AC_CHECK_LIB([eeze], [eeze_disk_function], AC_CHECK_LIB([eeze], [eeze_disk_function],
[ [
eeze_mount="eeze >= 1.0.999 ecore-con >= 1.0.999" eeze_mount="eeze >= 1.2.0 ecore-con >= 1.2.0"
EEZE_MOUNT_CONFIG=1 EEZE_MOUNT_CONFIG=1
AC_DEFINE_UNQUOTED([HAVE_EEZE_MOUNT], [1], [enable eeze mounting]) AC_DEFINE_UNQUOTED([HAVE_EEZE_MOUNT], [1], [enable eeze mounting])
AC_MSG_NOTICE([eeze mounting enabled]) AC_MSG_NOTICE([eeze mounting enabled])
@ -434,126 +434,126 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
# explicit libs for each binary to reduce linkage requirements # explicit libs for each binary to reduce linkage requirements
PKG_CHECK_MODULES(E_REMOTE, [ PKG_CHECK_MODULES(E_REMOTE, [
ecore >= 1.0.999 ecore >= 1.2.0
ecore-ipc >= 1.0.999 ecore-ipc >= 1.2.0
eet >= 1.4.0 eet >= 1.6.0
eina >= 1.0.999 eina >= 1.2.0
]) ])
PKG_CHECK_MODULES(E_START, [ PKG_CHECK_MODULES(E_START, [
eina >= 1.0.999 eina >= 1.2.0
]) ])
PKG_CHECK_MODULES(E_IMC, [ PKG_CHECK_MODULES(E_IMC, [
ecore-file >= 1.0.999 ecore-file >= 1.2.0
eet >= 1.4.0 eet >= 1.6.0
eina >= 1.0.999 eina >= 1.2.0
]) ])
PKG_CHECK_MODULES(E_THUMB, [ PKG_CHECK_MODULES(E_THUMB, [
eina >= 1.0.999 eina >= 1.2.0
evas >= 1.0.999 evas >= 1.2.0
ecore >= 1.0.999 ecore >= 1.2.0
ecore-evas >= 1.0.999 ecore-evas >= 1.2.0
edje >= 1.0.999 edje >= 1.2.0
ecore-file >= 1.0.999 ecore-file >= 1.2.0
ecore-ipc >= 1.0.999 ecore-ipc >= 1.2.0
eet >= 1.4.0 eet >= 1.6.0
efreet >= 1.0.999 efreet >= 1.2.0
]) ])
efm_requires="\ efm_requires="\
ecore >= 1.0.999 \ ecore >= 1.2.0 \
ecore-file >= 1.0.999 \ ecore-file >= 1.2.0 \
ecore-ipc >= 1.0.999 \ ecore-ipc >= 1.2.0 \
eet >= 1.4.0 \ eet >= 1.6.0 \
efreet >= 1.0.999 \ efreet >= 1.2.0 \
edbus >= 1.0.999 \ edbus >= 1.2.0 \
eina >= 1.0.999" eina >= 1.2.0"
efm_requires="$efm_requires $eeze_mount $dbus_mount $hal_mount $udisks_mount" efm_requires="$efm_requires $eeze_mount $dbus_mount $hal_mount $udisks_mount"
PKG_CHECK_MODULES(E_FM, [$efm_requires]) PKG_CHECK_MODULES(E_FM, [$efm_requires])
PKG_CHECK_MODULES(E_FM_OP, [ PKG_CHECK_MODULES(E_FM_OP, [
ecore >= 1.0.999 ecore >= 1.2.0
ecore-file >= 1.0.999 ecore-file >= 1.2.0
eina >= 1.0.999 eina >= 1.2.0
]) ])
PKG_CHECK_MODULES(E_FM_OPEN, [ PKG_CHECK_MODULES(E_FM_OPEN, [
ecore >= 1.0.999 ecore >= 1.2.0
ecore-ipc >= 1.0.999 ecore-ipc >= 1.2.0
ecore-con >= 1.0.999 ecore-con >= 1.2.0
eet >= 1.4.0 eet >= 1.6.0
eina >= 1.0.999 eina >= 1.2.0
]) ])
PKG_CHECK_MODULES(E_SYS, [ PKG_CHECK_MODULES(E_SYS, [
eina >= 1.0.999 eina >= 1.2.0
]) ])
PKG_CHECK_MODULES(E_INIT, [ PKG_CHECK_MODULES(E_INIT, [
evas >= 1.0.999 evas >= 1.2.0
ecore >= 1.0.999 ecore >= 1.2.0
ecore-evas >= 1.0.999 ecore-evas >= 1.2.0
ecore-x >= 1.0.999 ecore-x >= 1.2.0
edje >= 1.0.999 edje >= 1.2.0
ecore-ipc >= 1.0.999 ecore-ipc >= 1.2.0
eina >= 1.0.999 eina >= 1.2.0
]) ])
PKG_CHECK_MODULES(E_ALERT, [ PKG_CHECK_MODULES(E_ALERT, [
xcb xcb
xcb-shape xcb-shape
eina >= 1.0.999 eina >= 1.2.0
ecore >= 1.0.999 ecore >= 1.2.0
ecore-ipc >= 1.0.999 ecore-ipc >= 1.2.0
]) ])
PKG_CHECK_MODULES(E, [ PKG_CHECK_MODULES(E, [
evas >= 1.0.999 evas >= 1.2.0
ecore >= 1.0.999 ecore >= 1.2.0
ecore-x >= 1.0.999 ecore-x >= 1.2.0
ecore-evas >= 1.0.999 ecore-evas >= 1.2.0
ecore-input >= 1.0.999 ecore-input >= 1.2.0
ecore-input-evas >= 1.0.999 ecore-input-evas >= 1.2.0
ecore-con >= 1.0.999 ecore-con >= 1.2.0
ecore-ipc >= 1.0.999 ecore-ipc >= 1.2.0
ecore-file >= 1.0.999 ecore-file >= 1.2.0
eet >= 1.4.0 eet >= 1.6.0
edje >= 1.0.999 edje >= 1.2.0
efreet >= 1.0.999 efreet >= 1.2.0
efreet-mime >= 1.0.999 efreet-mime >= 1.2.0
efreet-trash >= 1.0.999 efreet-trash >= 1.2.0
eina >= 1.0.999 eina >= 1.2.0
dbus-1 dbus-1
edbus >= 1.0.999 edbus >= 1.2.0
$hal_mount $hal_mount
$eeze_mount $eeze_mount
$udisks_mount $udisks_mount
$device_backend $device_backend
]) ])
requirements_e="\ requirements_e="\
evas >= 1.0.999 \ evas >= 1.2.0 \
ecore >= 1.0.999 \ ecore >= 1.2.0 \
ecore-x >= 1.0.999 \ ecore-x >= 1.2.0 \
ecore-evas >= 1.0.999 \ ecore-evas >= 1.2.0 \
ecore-con >= 1.0.999 \ ecore-con >= 1.2.0 \
ecore-ipc >= 1.0.999 \ ecore-ipc >= 1.2.0 \
ecore-file >= 1.0.999 \ ecore-file >= 1.2.0 \
eet >= 1.4.0 \ eet >= 1.6.0 \
edje >= 1.0.999 \ edje >= 1.2.0 \
efreet >= 1.0.999 \ efreet >= 1.2.0 \
efreet-mime >= 1.0.999 \ efreet-mime >= 1.2.0 \
eina >= 1.0.999 \ eina >= 1.2.0 \
dbus-1 \ dbus-1 \
edbus >= 1.0.999 \ edbus >= 1.2.0 \
$hal_mount \ $hal_mount \
$udisks_mount \ $udisks_mount \
$eeze_mount \ $eeze_mount \
$device_backend" $device_backend"
AC_E_CHECK_PKG(ECORE_IMF, [ ecore-imf >= 1.0.999 ecore-imf-evas >= 1.0.999 ], [], [:]) AC_E_CHECK_PKG(ECORE_IMF, [ ecore-imf >= 1.2.0 ecore-imf-evas >= 1.2.0 ], [], [:])
e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" "$ECORE_IMF_LIBS" "$execinfo_libs e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" "$ECORE_IMF_LIBS" "$execinfo_libs
e_cflags="-DUSE_E_CONFIG_H "$E_CFLAGS" "$ECORE_IMF_CFLAGS e_cflags="-DUSE_E_CONFIG_H "$E_CFLAGS" "$ECORE_IMF_CFLAGS
@ -586,7 +586,7 @@ AC_ARG_WITH(edje-cc,
]) ])
AC_SUBST(edje_cc) AC_SUBST(edje_cc)
PKG_CHECK_MODULES(EET, [eet >= 1.4.0]) PKG_CHECK_MODULES(EET, [eet >= 1.6.0])
AC_ARG_WITH(eet-eet, AC_ARG_WITH(eet-eet,
[ --with-eet-eet=PATH specify a specific path to eet utility], [ --with-eet-eet=PATH specify a specific path to eet utility],
[ [
@ -603,7 +603,7 @@ AC_DEFINE(E_INTERNAL, 1, "This define can be used to wrap internal E stuff, as c
AM_CONDITIONAL(HAVE_BATTERY, false) AM_CONDITIONAL(HAVE_BATTERY, false)
define([CHECK_MODULE_BATTERY], define([CHECK_MODULE_BATTERY],
[ [
AC_E_CHECK_PKG(BATTERY, [ ecore >= 1.0.999 ecore-file >= 1.0.999 ecore-con >= 1.0.999 eina >= 1.0.999 ], [], [BATTERY=false]) AC_E_CHECK_PKG(BATTERY, [ ecore >= 1.2.0 ecore-file >= 1.2.0 ecore-con >= 1.2.0 eina >= 1.2.0 ], [], [BATTERY=false])
]) ])
have_openbsd="no" have_openbsd="no"
@ -623,7 +623,7 @@ AM_CONDITIONAL([HAVE_OPENBSD], [test "x${have_openbsd}" = "xyes"])
AM_CONDITIONAL(HAVE_TEMPERATURE, false) AM_CONDITIONAL(HAVE_TEMPERATURE, false)
define([CHECK_MODULE_TEMPERATURE], define([CHECK_MODULE_TEMPERATURE],
[ [
AC_E_CHECK_PKG(TEMPERATURE, [ ecore >= 1.0.999 ecore-file >= 1.0.999 eina >= 1.0.999 ], [], [TEMPERATURE=false]) AC_E_CHECK_PKG(TEMPERATURE, [ ecore >= 1.2.0 ecore-file >= 1.2.0 eina >= 1.2.0 ], [], [TEMPERATURE=false])
]) ])
have_exchange=no have_exchange=no
@ -652,7 +652,7 @@ AC_ARG_ENABLE([enotify],
AC_CACHE_VAL([e_cv_want_enotify], [e_cv_want_enotify=yes]) AC_CACHE_VAL([e_cv_want_enotify], [e_cv_want_enotify=yes])
) )
if test "x$e_cv_want_enotify" != "xno" ; then if test "x$e_cv_want_enotify" != "xno" ; then
AC_E_CHECK_PKG(ENOTIFY, [ edbus >= 1.0.999 enotify >= 1.0.999 ], AC_E_CHECK_PKG(ENOTIFY, [ edbus >= 1.2.0 enotify >= 1.2.0 ],
[ [
AC_DEFINE_UNQUOTED([HAVE_ENOTIFY], [1], [enable enotify]) AC_DEFINE_UNQUOTED([HAVE_ENOTIFY], [1], [enable enotify])
], ],
@ -706,7 +706,7 @@ AC_SUBST(SOUND_LIBS)
AM_CONDITIONAL(HAVE_ECONNMAN, false) AM_CONDITIONAL(HAVE_ECONNMAN, false)
define([CHECK_MODULE_CONNMAN], define([CHECK_MODULE_CONNMAN],
[ [
AC_E_CHECK_PKG(ECONNMAN, [ edbus >= 1.0.999 econnman-0.7x >= 1.0.999 ], [], [CONNMAN=false]) AC_E_CHECK_PKG(ECONNMAN, [ edbus >= 1.2.0 econnman-0.7x >= 1.2.0 ], [], [CONNMAN=false])
]) ])
AC_SUBST(ECONNMAN_CFLAGS) AC_SUBST(ECONNMAN_CFLAGS)
AC_SUBST(ECONNMAN_LIBS) AC_SUBST(ECONNMAN_LIBS)
@ -714,7 +714,7 @@ AC_SUBST(ECONNMAN_LIBS)
AM_CONDITIONAL(HAVE_EBLUEZ, false) AM_CONDITIONAL(HAVE_EBLUEZ, false)
define([CHECK_MODULE_BLUEZ], define([CHECK_MODULE_BLUEZ],
[ [
AC_E_CHECK_PKG(EBLUEZ, [ edbus >= 1.0.999 ebluez >= 1.0.999 ], [], [BLUEZ=false]) AC_E_CHECK_PKG(EBLUEZ, [ edbus >= 1.2.0 ebluez >= 1.2.0 ], [], [BLUEZ=false])
]) ])
AC_SUBST(EBLUEZ_CFLAGS) AC_SUBST(EBLUEZ_CFLAGS)
AC_SUBST(EBLUEZ_LIBS) AC_SUBST(EBLUEZ_LIBS)
@ -722,7 +722,7 @@ AC_SUBST(EBLUEZ_LIBS)
AM_CONDITIONAL(HAVE_EOFONO, false) AM_CONDITIONAL(HAVE_EOFONO, false)
define([CHECK_MODULE_OFONO], define([CHECK_MODULE_OFONO],
[ [
AC_E_CHECK_PKG(EOFONO, [ edbus >= 1.0.999 eofono >= 1.0.999 ], [], [OFONO=false]) AC_E_CHECK_PKG(EOFONO, [ edbus >= 1.2.0 eofono >= 1.2.0 ], [], [OFONO=false])
]) ])
AC_SUBST(EOFONO_CFLAGS) AC_SUBST(EOFONO_CFLAGS)
AC_SUBST(EOFONO_LIBS) AC_SUBST(EOFONO_LIBS)