Diff: configure.ac - configure.ac

	configure.ac	configure.ac
	##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##	##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
	##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##	##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
	m4_define([v_maj], [1])	m4_define([v_maj], [1])

	m4_define([v_min], [2])	m4_define([v_min], [7])
	m4_define([v_mic], [0])	m4_define([v_mic], [0])
	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_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 \| (g rep -m1 git-svn-id \|\| echo 0) \| sed -e 's/.@$[0-9]$.*/\1/' \| tr -d '\n' ]))])	m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null \| (g rep -m1 git-svn-id \|\| echo 0) \| sed -e 's/.@$[0-9]$.*/\1/' \| tr -d '\n' ]))])
	##-- When released, remove the dnl on the below line	##-- When released, remove the dnl on the below line
	m4_undefine([v_rev])	m4_undefine([v_rev])
	##-- When doing snapshots - change soname. remove dnl on below line	##-- When doing snapshots - change soname. remove dnl on below line
	dnl m4_define([relname], [ver-pre-svn-07])	dnl m4_define([relname], [ver-pre-svn-07])
	dnl m4_define([v_rel], [-release relname])	dnl m4_define([v_rel], [-release relname])
	##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##	##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
	m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])],	m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])],

	skipping to change at line 84	skipping to change at line 84
	mingw*)	mingw*)
	want_ebluez="no"	want_ebluez="no"
	want_econnman0_7x="no"	want_econnman0_7x="no"
	want_ehal="no"	want_ehal="no"
	want_enotify="no"	want_enotify="no"
	want_eofono="no"	want_eofono="no"
	want_eukit="no"	want_eukit="no"
	;;	;;
	esac	esac


	requirement_ebluez="edbus >= 1.2.0"	requirement_ebluez="edbus >= 1.6.99"
	requirement_econnman0_7x="edbus >= 1.2.0"	requirement_econnman0_7x="edbus >= 1.6.99"
	requirement_edbus="ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62"	requirement_edbus="ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62"
	requirement_ehal="edbus >= 1.2.0"	requirement_ehal="edbus >= 1.6.99"
	requirement_enotify="edbus >= 1.2.0"	requirement_enotify="edbus >= 1.6.99"
	requirement_eofono="edbus >= 1.2.0"	requirement_eofono="edbus >= 1.6.99"
	requirement_eukit="edbus >= 1.2.0"	requirement_eukit="edbus >= 1.6.99"
	requirement_dbus="dbus-1 >= 0.62"	requirement_dbus="dbus-1 >= 0.62"

	### Additional options to configure	### Additional options to configure

	dnl Check enabled modules to build	dnl Check enabled modules to build

	AC_ARG_ENABLE([ebluez],	AC_ARG_ENABLE([ebluez],
	[AC_HELP_STRING([--enable-ebluez], [Enable ebluez build])],	[AC_HELP_STRING([--enable-ebluez], [Enable ebluez build])],
	[enable_ebluez=$enableval],	[enable_ebluez=$enableval],
	[enable_ebluez="${want_ebluez}"])	[enable_ebluez="${want_ebluez}"])

	skipping to change at line 153	skipping to change at line 153
	# doxygen program for documentation building	# doxygen program for documentation building
	EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])	EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])

	### Checks for libraries	### Checks for libraries

	PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.62])	PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.62])
	dbus_libs="$DBUS_LIBS"	dbus_libs="$DBUS_LIBS"
	dbus_cflags="$DBUS_CFLAGS"	dbus_cflags="$DBUS_CFLAGS"
	AC_SUBST(dbus_libs)	AC_SUBST(dbus_libs)
	AC_SUBST(dbus_cflags)	AC_SUBST(dbus_cflags)

	PKG_CHECK_MODULES([EDBUS], [ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62])	PKG_CHECK_MODULES([EDBUS], [ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62])

	# Find out the version of DBUS we're using	# Find out the version of DBUS we're using
	dbus_version=`pkg-config --modversion dbus-1`	dbus_version=`pkg-config --modversion dbus-1`
	DBUS_VERSION_MAJOR=`echo $dbus_version \| awk -F. '{print $1}'`	DBUS_VERSION_MAJOR=`echo $dbus_version \| awk -F. '{print $1}'`
	DBUS_VERSION_MINOR=`echo $dbus_version \| awk -F. '{print $2}'`	DBUS_VERSION_MINOR=`echo $dbus_version \| awk -F. '{print $2}'`
	DBUS_VERSION_MICRO=`echo $dbus_version \| awk -F. '{print $3}'`	DBUS_VERSION_MICRO=`echo $dbus_version \| awk -F. '{print $3}'`

	if test "z$DBUS_VERSION_MAJOR" = "z" ; then	if test "z$DBUS_VERSION_MAJOR" = "z" ; then
	DBUS_VERSION_MAJOR="0"	DBUS_VERSION_MAJOR="0"
	fi	fi

	skipping to change at line 181	skipping to change at line 181
	fi	fi

	DBUS_VERSION_CFLAGS="$DBUS_VERSION_CFLAGS -DDBUS_VERSION_MAJOR=$DBUS_VERSIO N_MAJOR"	DBUS_VERSION_CFLAGS="$DBUS_VERSION_CFLAGS -DDBUS_VERSION_MAJOR=$DBUS_VERSIO N_MAJOR"
	DBUS_VERSION_CFLAGS="$DBUS_VERSION_CFLAGS -DDBUS_VERSION_MINOR=$DBUS_VERSIO N_MINOR"	DBUS_VERSION_CFLAGS="$DBUS_VERSION_CFLAGS -DDBUS_VERSION_MINOR=$DBUS_VERSIO N_MINOR"
	DBUS_VERSION_CFLAGS="$DBUS_VERSION_CFLAGS -DDBUS_VERSION_MICRO=$DBUS_VERSIO N_MICRO"	DBUS_VERSION_CFLAGS="$DBUS_VERSION_CFLAGS -DDBUS_VERSION_MICRO=$DBUS_VERSIO N_MICRO"
	AC_SUBST(DBUS_VERSION_CFLAGS)	AC_SUBST(DBUS_VERSION_CFLAGS)

	# Dependencies for the libraries	# Dependencies for the libraries
	if test "x${enable_enotify}" = "xyes" ; then	if test "x${enable_enotify}" = "xyes" ; then
	PKG_CHECK_MODULES([EVAS],	PKG_CHECK_MODULES([EVAS],

	[evas >= 1.2.0],	[evas >= 1.6.99],
	[requirement_enotify="evas >= 1.2.0 ${requirement_enotify}"],	[requirement_enotify="evas >= 1.6.99 ${requirement_enotify}"],
	[enable_enotify="no"])	[enable_enotify="no"])
	fi	fi

	AM_CONDITIONAL([BUILD_EBLUEZ], [test "x${enable_ebluez}" = "xyes"])	AM_CONDITIONAL([BUILD_EBLUEZ], [test "x${enable_ebluez}" = "xyes"])
	AM_CONDITIONAL([BUILD_ECONNMAN0_7X], [test "x${enable_econnman0_7x}" = "xye s"])	AM_CONDITIONAL([BUILD_ECONNMAN0_7X], [test "x${enable_econnman0_7x}" = "xye s"])
	AM_CONDITIONAL([BUILD_EHAL], [test "x${enable_ehal}" = "xyes"])	AM_CONDITIONAL([BUILD_EHAL], [test "x${enable_ehal}" = "xyes"])
	AM_CONDITIONAL([BUILD_ENOTIFY], [test "x${enable_enotify}" = "xyes"])	AM_CONDITIONAL([BUILD_ENOTIFY], [test "x${enable_enotify}" = "xyes"])
	AM_CONDITIONAL([BUILD_EOFONO], [test "x${enable_eofono}" = "xyes"])	AM_CONDITIONAL([BUILD_EOFONO], [test "x${enable_eofono}" = "xyes"])
	AM_CONDITIONAL([BUILD_EUKIT], [test "x${enable_eukit}" = "xyes"])	AM_CONDITIONAL([BUILD_EUKIT], [test "x${enable_eukit}" = "xyes"])


	skipping to change at line 204	skipping to change at line 204

	EFL_ENABLE_BIN([edbus-test], ["yes"])	EFL_ENABLE_BIN([edbus-test], ["yes"])
	EFL_ENABLE_BIN([edbus-test-client], ["yes"])	EFL_ENABLE_BIN([edbus-test-client], ["yes"])
	EFL_ENABLE_BIN([edbus-bluez-test], [${enable_ebluez}])	EFL_ENABLE_BIN([edbus-bluez-test], [${enable_ebluez}])
	EFL_ENABLE_BIN([edbus-connman0_7x-test], [${enable_econnman0_7x}])	EFL_ENABLE_BIN([edbus-connman0_7x-test], [${enable_econnman0_7x}])
	EFL_ENABLE_BIN([edbus-notification-daemon-test], [${enable_enotify}])	EFL_ENABLE_BIN([edbus-notification-daemon-test], [${enable_enotify}])
	EFL_ENABLE_BIN([edbus-notify-send], [${enable_enotify}])	EFL_ENABLE_BIN([edbus-notify-send], [${enable_enotify}])
	EFL_ENABLE_BIN([edbus-notify-test], [${enable_enotify}])	EFL_ENABLE_BIN([edbus-notify-test], [${enable_enotify}])
	EFL_ENABLE_BIN([edbus-ofono-test], [${enable_eofono}])	EFL_ENABLE_BIN([edbus-ofono-test], [${enable_eofono}])
	EFL_ENABLE_BIN([edbus-ukit-test], [${enable_eukit}])	EFL_ENABLE_BIN([edbus-ukit-test], [${enable_eukit}])

		EFL_ENABLE_BIN([edbus-performance-test], ["no"])
		EFL_ENABLE_BIN([edbus-async-test], ["yes"])

	if test "x${have_edbus_test}" = "xyes" ; then	if test "x${have_edbus_test}" = "xyes" ; then
	PKG_CHECK_MODULES([EDBUS_TEST],	PKG_CHECK_MODULES([EDBUS_TEST],

	[ecore >= 1.2.0 dbus-1 >= 0.62],	[ecore >= 1.6.99 dbus-1 >= 0.62],
	[have_edbus_test="yes"],	[have_edbus_test="yes"],
	[have_edbus_test="no"])	[have_edbus_test="no"])
	fi	fi

	if test "x${have_edbus_test_client}" = "xyes" ; then	if test "x${have_edbus_test_client}" = "xyes" ; then
	PKG_CHECK_MODULES([EDBUS_TEST_CLIENT],	PKG_CHECK_MODULES([EDBUS_TEST_CLIENT],

	[ecore >= 1.2.0 dbus-1 >= 0.62],	[ecore >= 1.6.99 dbus-1 >= 0.62],
	[have_edbus_test_client="yes"],	[have_edbus_test_client="yes"],
	[have_edbus_test_client="no"])	[have_edbus_test_client="no"])
	fi	fi

	if test "x${have_edbus_bluez_test}" = "xyes" ; then	if test "x${have_edbus_bluez_test}" = "xyes" ; then
	PKG_CHECK_MODULES([EDBUS_BLUEZ_TEST],	PKG_CHECK_MODULES([EDBUS_BLUEZ_TEST],

	[ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62],	[ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62],
	[have_edbus_bluez_test="yes"],	[have_edbus_bluez_test="yes"],
	[have_edbus_bluez_test="no"])	[have_edbus_bluez_test="no"])
	fi	fi

	if test "x${have_edbus_connman0_7x_test}" = "xyes" ; then	if test "x${have_edbus_connman0_7x_test}" = "xyes" ; then
	PKG_CHECK_MODULES([EDBUS_CONNMAN0_7X_TEST],	PKG_CHECK_MODULES([EDBUS_CONNMAN0_7X_TEST],

	[ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62],	[ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62],
	[have_edbus_connman0_7x_test="yes"],	[have_edbus_connman0_7x_test="yes"],
	[have_edbus_connman0_7x_test="no"])	[have_edbus_connman0_7x_test="no"])
	fi	fi

	if test "x${have_edbus_notification_daemon_test}" = "xyes" ; then	if test "x${have_edbus_notification_daemon_test}" = "xyes" ; then
	PKG_CHECK_MODULES([EDBUS_NOTIFICATION_DAEMON_TEST],	PKG_CHECK_MODULES([EDBUS_NOTIFICATION_DAEMON_TEST],

	[ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62],	[ecore >= 1.6.99 evas >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62],
	[have_edbus_notification_daemon_test="yes"],	[have_edbus_notification_daemon_test="yes"],
	[have_edbus_notification_daemon_test="no"])	[have_edbus_notification_daemon_test="no"])
	fi	fi

	if test "x${have_edbus_notify_send}" = "xyes" ; then	if test "x${have_edbus_notify_send}" = "xyes" ; then
	PKG_CHECK_MODULES([EDBUS_NOTIFY_SEND],	PKG_CHECK_MODULES([EDBUS_NOTIFY_SEND],

	[ecore >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62],	[ecore >= 1.6.99 evas >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62],
	[have_edbus_notify_send="yes"],	[have_edbus_notify_send="yes"],
	[have_edbus_notify_send="no"])	[have_edbus_notify_send="no"])
	fi	fi

	if test "x${have_edbus_notify_test}" = "xyes" ; then	if test "x${have_edbus_notify_test}" = "xyes" ; then
	PKG_CHECK_MODULES([EDBUS_NOTIFY_TEST],	PKG_CHECK_MODULES([EDBUS_NOTIFY_TEST],

	[ecore >= 1.2.0 ecore-evas >= 1.2.0 evas >= 1.2.0 eina >= 1.2.0 dbus- 1 >= 0.62],	[ecore >= 1.6.99 ecore-evas >= 1.6.99 evas >= 1.6.99 eina >= 1.6.99 d bus-1 >= 0.62],
	[have_edbus_notify_test="yes"],	[have_edbus_notify_test="yes"],
	[have_edbus_notify_test="no"])	[have_edbus_notify_test="no"])
	fi	fi

	if test "x${have_edbus_ofono_test}" = "xyes" ; then	if test "x${have_edbus_ofono_test}" = "xyes" ; then
	PKG_CHECK_MODULES([EDBUS_OFONO_TEST],	PKG_CHECK_MODULES([EDBUS_OFONO_TEST],

	[ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62],	[ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62],
	[have_edbus_ofono_test="yes"],	[have_edbus_ofono_test="yes"],
	[have_edbus_ofono_test="no"])	[have_edbus_ofono_test="no"])
	fi	fi

	if test "x${have_edbus_ukit_test}" = "xyes" ; then	if test "x${have_edbus_ukit_test}" = "xyes" ; then
	PKG_CHECK_MODULES([EDBUS_UKIT_TEST],	PKG_CHECK_MODULES([EDBUS_UKIT_TEST],

	[ecore >= 1.2.0 eina >= 1.2.0 dbus-1 >= 0.62],	[ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62],
	[have_edbus_ukit_test="yes"],	[have_edbus_ukit_test="yes"],
	[have_edbus_ukit_test="no"])	[have_edbus_ukit_test="no"])
	fi	fi


		if test "x${have_edbus_performance_test}" = "xyes" ; then
		PKG_CHECK_MODULES([EDBUS_PERFORMANCE_TEST],
		[ecore >= 1.6.99 eina >= 1.6.99 dbus-1 >= 0.62 ecore-evas >= 1.6.99 e
		lementary >= 1.6.99 evas >= 1.6.99],
		[have_edbus_performance_test="yes"],
		[have_edbus_performance_test="no"])
		fi

		AM_CONDITIONAL([BUILD_EDBUS_PERFORMANCE_TEST], [test "x${have_edbus_perform
		ance_test}" = "xyes"])

		if test "x${have_edbus_async_test}" = "xyes" ; then
		PKG_CHECK_MODULES([EDBUS_ASYNC_TEST],
		[ecore >= 1.6.99 dbus-1 >= 0.62],
		[have_edbus_async_test="yes"],
		[have_edbus_async_test="no"])
		fi

	### Checks for header files	### Checks for header files

	### Checks for types	### Checks for types

	### Checks for structures	### Checks for structures

	### Checks for compiler characteristics	### Checks for compiler characteristics

	EFL_EDBUS_BUILD=""	EFL_EDBUS_BUILD=""
	case "$host_os" in	case "$host_os" in

	skipping to change at line 366	skipping to change at line 384
	echo " EConnman (0.7x)....: $enable_econnman0_7x"	echo " EConnman (0.7x)....: $enable_econnman0_7x"
	echo " EHal...............: $enable_ehal"	echo " EHal...............: $enable_ehal"
	echo " ENotify............: $enable_enotify"	echo " ENotify............: $enable_enotify"
	echo " EOfono.............: $enable_eofono"	echo " EOfono.............: $enable_eofono"
	echo " EUkit..............: $enable_eukit"	echo " EUkit..............: $enable_eukit"
	echo	echo
	echo " Binaries:"	echo " Binaries:"
	echo	echo
	echo " EDbus test.........: $have_edbus_test"	echo " EDbus test.........: $have_edbus_test"
	echo " EDbus client test..: $have_edbus_test_client"	echo " EDbus client test..: $have_edbus_test_client"

		echo " EDbus async test...: $have_edbus_async_test"
		echo " EDbus performance..: $have_edbus_performance_test"
	echo " EBluez test........: $have_edbus_bluez_test"	echo " EBluez test........: $have_edbus_bluez_test"
	echo " EConnman (0.7x)test: $have_edbus_connman0_7x_test"	echo " EConnman (0.7x)test: $have_edbus_connman0_7x_test"
	echo " ENotify Daemon test: $have_edbus_notification_daemon_test"	echo " ENotify Daemon test: $have_edbus_notification_daemon_test"
	echo " ENotify send.......: $have_edbus_notify_send"	echo " ENotify send.......: $have_edbus_notify_send"
	echo " ENotify test.......: $have_edbus_notify_test"	echo " ENotify test.......: $have_edbus_notify_test"
	echo " EOfono test........: $have_edbus_ofono_test"	echo " EOfono test........: $have_edbus_ofono_test"
	echo " EUkit test.........: $have_edbus_ukit_test"	echo " EUkit test.........: $have_edbus_ukit_test"
	echo	echo
	echo "Documentation..........: ${build_doc}"	echo "Documentation..........: ${build_doc}"
	echo	echo

End of changes. 16 change blocks.
	20 lines changed or deleted	42 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/