##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_maj], [1])
-m4_define([v_min], [1])
-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_min], [2])
+m4_define([v_mic], [99])
+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
-m4_undefine([v_rev])
+dnl m4_undefine([v_rev])
##-- When doing snapshots - change soname. remove dnl on below line
dnl m4_define([relname], [ver-pre-svn-07])
dnl m4_define([v_rel], [-release relname])
AC_CANONICAL_HOST
want_ebluez="yes"
-want_econnman="yes"
+want_econnman0_7x="yes"
want_ehal="yes"
want_enotify="yes"
want_eofono="yes"
case "$host_os" in
mingw*)
want_ebluez="no"
- want_econnman="no"
+ want_econnman0_7x="no"
want_ehal="no"
want_enotify="no"
want_eofono="no"
;;
esac
-requirement_ebluez="edbus >= 1.1.0"
-requirement_econnman="edbus >= 1.1.0"
-requirement_edbus="ecore >= 1.1.0 eina >= 1.1.0 dbus-1 >= 0.62"
-requirement_ehal="edbus >= 1.1.0"
-requirement_enotify="edbus >= 1.1.0"
-requirement_eofono="edbus >= 1.1.0"
-requirement_eukit="edbus >= 1.1.0"
+requirement_ebluez="edbus >= 1.2.0"
+requirement_econnman0_7x="edbus >= 1.2.0"
+requirement_edbus="ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62"
+requirement_ehal="edbus >= 1.2.0"
+requirement_enotify="edbus >= 1.2.0"
+requirement_eofono="edbus >= 1.2.0"
+requirement_eukit="edbus >= 1.2.0"
requirement_dbus="dbus-1 >= 0.62"
### Additional options to configure
[enable_ebluez=$enableval],
[enable_ebluez="${want_ebluez}"])
-AC_ARG_ENABLE([econnman],
- [AC_HELP_STRING([--enable-econnman], [Enable econnman build])],
- [enable_econnman=$enableval],
- [enable_econnman="${want_econnman}"])
+AC_ARG_ENABLE([econnman0_7x],
+ [AC_HELP_STRING([--enable-econnman0_7x], [Enable econnman 0.7x build])],
+ [enable_econnman0_7x=$enableval],
+ [enable_econnman0_7x="${want_econnman0_7x}"])
AC_ARG_ENABLE([ehal],
[AC_HELP_STRING([--disable-ehal], [Disable ehal build])],
dbus_cflags="$DBUS_CFLAGS"
AC_SUBST(dbus_libs)
AC_SUBST(dbus_cflags)
-PKG_CHECK_MODULES([EDBUS], [ecore >= 1.1.0 eina >= 1.1.0 dbus-1 >= 0.62])
+PKG_CHECK_MODULES([EDBUS], [ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62])
# Find out the version of DBUS we're using
dbus_version=`pkg-config --modversion dbus-1`
# Dependencies for the libraries
if test "x${enable_enotify}" = "xyes" ; then
PKG_CHECK_MODULES([EVAS],
- [evas >= 1.1.0],
- [requirement_enotify="evas >= 1.1.0 ${requirement_enotify}"],
+ [evas >= 1.2.0],
+ [requirement_enotify="evas >= 1.2.0 ${requirement_enotify}"],
[enable_enotify="no"])
fi
AM_CONDITIONAL([BUILD_EBLUEZ], [test "x${enable_ebluez}" = "xyes"])
-AM_CONDITIONAL([BUILD_ECONNMAN], [test "x${enable_econnman}" = "xyes"])
+AM_CONDITIONAL([BUILD_ECONNMAN0_7X], [test "x${enable_econnman0_7x}" = "xyes"])
AM_CONDITIONAL([BUILD_EHAL], [test "x${enable_ehal}" = "xyes"])
AM_CONDITIONAL([BUILD_ENOTIFY], [test "x${enable_enotify}" = "xyes"])
AM_CONDITIONAL([BUILD_EOFONO], [test "x${enable_eofono}" = "xyes"])
EFL_ENABLE_BIN([edbus-test], ["yes"])
EFL_ENABLE_BIN([edbus-test-client], ["yes"])
EFL_ENABLE_BIN([edbus-bluez-test], [${enable_ebluez}])
-EFL_ENABLE_BIN([edbus-connman-test], [${enable_econnman}])
+EFL_ENABLE_BIN([edbus-connman0_7x-test], [${enable_econnman0_7x}])
EFL_ENABLE_BIN([edbus-notification-daemon-test], [${enable_enotify}])
EFL_ENABLE_BIN([edbus-notify-send], [${enable_enotify}])
EFL_ENABLE_BIN([edbus-notify-test], [${enable_enotify}])
if test "x${have_edbus_test}" = "xyes" ; then
PKG_CHECK_MODULES([EDBUS_TEST],
- [ecore >= 1.1.0 dbus-1 >= 0.62],
+ [ecore >= 1.2.0 dbus-1 >= 0.62],
[have_edbus_test="yes"],
[have_edbus_test="no"])
fi
if test "x${have_edbus_test_client}" = "xyes" ; then
PKG_CHECK_MODULES([EDBUS_TEST_CLIENT],
- [ecore >= 1.1.0 dbus-1 >= 0.62],
+ [ecore >= 1.2.0 dbus-1 >= 0.62],
[have_edbus_test_client="yes"],
[have_edbus_test_client="no"])
fi
if test "x${have_edbus_bluez_test}" = "xyes" ; then
PKG_CHECK_MODULES([EDBUS_BLUEZ_TEST],
- [ecore >= 1.1.0 eina >= 1.1.0 dbus-1 >= 0.62],
+ [ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62],
[have_edbus_bluez_test="yes"],
[have_edbus_bluez_test="no"])
fi
-if test "x${have_edbus_connman_test}" = "xyes" ; then
- PKG_CHECK_MODULES([EDBUS_CONNMAN_TEST],
- [ecore >= 1.1.0 eina >= 1.1.0 dbus-1 >= 0.62],
- [have_edbus_connman_test="yes"],
- [have_edbus_connman_test="no"])
+if test "x${have_edbus_connman0_7x_test}" = "xyes" ; then
+ PKG_CHECK_MODULES([EDBUS_CONNMAN0_7X_TEST],
+ [ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62],
+ [have_edbus_connman0_7x_test="yes"],
+ [have_edbus_connman0_7x_test="no"])
fi
if test "x${have_edbus_notification_daemon_test}" = "xyes" ; then
PKG_CHECK_MODULES([EDBUS_NOTIFICATION_DAEMON_TEST],
- [ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0 dbus-1 >= 0.62],
+ [ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62],
[have_edbus_notification_daemon_test="yes"],
[have_edbus_notification_daemon_test="no"])
fi
if test "x${have_edbus_notify_send}" = "xyes" ; then
PKG_CHECK_MODULES([EDBUS_NOTIFY_SEND],
- [ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0 dbus-1 >= 0.62],
+ [ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62],
[have_edbus_notify_send="yes"],
[have_edbus_notify_send="no"])
fi
if test "x${have_edbus_notify_test}" = "xyes" ; then
PKG_CHECK_MODULES([EDBUS_NOTIFY_TEST],
- [ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0 dbus-1 >= 0.62],
+ [ecore >= 1.2.0 ecore-evas >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62],
[have_edbus_notify_test="yes"],
[have_edbus_notify_test="no"])
fi
if test "x${have_edbus_ofono_test}" = "xyes" ; then
PKG_CHECK_MODULES([EDBUS_OFONO_TEST],
- [ecore >= 1.1.0 eina >= 1.1.0 dbus-1 >= 0.62],
+ [ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62],
[have_edbus_ofono_test="yes"],
[have_edbus_ofono_test="no"])
fi
if test "x${have_edbus_ukit_test}" = "xyes" ; then
PKG_CHECK_MODULES([EDBUS_UKIT_TEST],
- [ecore >= 1.1.0 eina >= 1.1.0 dbus-1 >= 0.62],
+ [ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62],
[have_edbus_ukit_test="yes"],
[have_edbus_ukit_test="no"])
fi
AC_SUBST(requirement_ebluez)
-AC_SUBST(requirement_econnman)
+AC_SUBST(requirement_econnman0_7x)
AC_SUBST(requirement_edbus)
AC_SUBST(requirement_ehal)
AC_SUBST(requirement_enotify)
src/Makefile
src/lib/Makefile
src/lib/bluez/Makefile
-src/lib/connman/Makefile
+src/lib/connman0_7x/Makefile
src/lib/dbus/Makefile
src/lib/hal/Makefile
src/lib/notification/Makefile
src/lib/ukit/Makefile
src/bin/Makefile
ebluez.pc
-econnman.pc
+econnman-0.7x.pc
edbus.pc
ehal.pc
enotify.pc
echo " Modules:"
echo
echo " EBluez.............: $enable_ebluez"
-echo " EConnman...........: $enable_econnman"
+echo " EConnman (0.7x)....: $enable_econnman0_7x"
echo " EHal...............: $enable_ehal"
echo " ENotify............: $enable_enotify"
echo " EOfono.............: $enable_eofono"
echo " EDbus test.........: $have_edbus_test"
echo " EDbus client test..: $have_edbus_test_client"
echo " EBluez test........: $have_edbus_bluez_test"
-echo " EConnman test......: $have_edbus_connman_test"
+echo " EConnman (0.7x)test: $have_edbus_connman0_7x_test"
echo " ENotify Daemon test: $have_edbus_notification_daemon_test"
echo " ENotify send.......: $have_edbus_notify_send"
echo " ENotify test.......: $have_edbus_notify_test"