From 7d362b121e99011f96d227bc1ad4a73aab35e2f0 Mon Sep 17 00:00:00 2001 From: Rusty Lynch Date: Wed, 5 Jun 2013 14:25:20 -0700 Subject: [PATCH] Import upstream version 1.7.7 --- ChangeLog | 8 + Makefile.in | 42 +++-- NEWS | 15 +- aclocal.m4 | 20 +-- compile | 91 +++++++--- configure | 307 ++++++++++++++------------------ configure.ac | 46 ++--- depcomp | 124 +++++++------ doc/Makefile.in | 24 ++- e_dbus.spec | 2 +- ebluez.pc | 6 +- econnman-0.7x.pc | 6 +- edbus.pc | 8 +- ehal.pc | 6 +- enotify.pc | 6 +- eofono.pc | 6 +- eukit.pc | 6 +- ltmain.sh | 32 ++-- m4/libtool.m4 | 33 +--- src/Makefile.in | 35 +++- src/bin/Makefile.in | 34 +++- src/lib/Makefile.in | 35 +++- src/lib/bluez/Makefile.in | 32 +++- src/lib/connman0_7x/Makefile.in | 32 +++- src/lib/connman0_7x/e_connman_element.c | 2 +- src/lib/dbus/Makefile.in | 32 +++- src/lib/hal/Makefile.in | 32 +++- src/lib/notification/Makefile.in | 32 +++- src/lib/ofono/Makefile.in | 32 +++- src/lib/ofono/e_ofono_element.c | 2 +- src/lib/ukit/Makefile.in | 32 +++- 31 files changed, 713 insertions(+), 407 deletions(-) diff --git a/ChangeLog b/ChangeLog index b836dfb..9639b30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,3 +113,11 @@ 2013-01-04 Luis Felipe Strano Moraes * 1.7.5 release + +2013-01-06 Tomas Cech + + * Fix missing returns. + +2013-04-04 Rafael Antognolli + + * 1.7.6 release diff --git a/Makefile.in b/Makefile.in index 56eebfa..542f2e3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -76,6 +93,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -458,8 +480,11 @@ distclean-libtool: -rm -f libtool config.lt install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -644,13 +669,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -736,7 +758,7 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff --git a/NEWS b/NEWS index 9fdd96b..a2495db 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,17 @@ -E_dbus 1.7.5 +E_dbus 1.7.7 + +Changes since E_dbus 1.7.6: +--------------------------- + +No changes, just updating to keep in sync with last release. + + +Changes since E_dbus 1.7.5: +--------------------------- + +Fixes: + + * Fix missing returns. Changes since E_dbus 1.7.4: --------------------------- diff --git a/aclocal.m4 b/aclocal.m4 index ae8fa15..5c4899e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -48,8 +48,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.]) # ---------------------------------- AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) @@ -95,8 +94,7 @@ m4_define([_PKG_CONFIG], pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], [pkg_failed=yes]) else pkg_failed=untried @@ -144,9 +142,9 @@ if test $pkg_failed = yes; then AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD @@ -159,7 +157,7 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT])[]dnl +_PKG_TEXT]) ]) elif test $pkg_failed = untried; then AC_MSG_RESULT([no]) @@ -170,7 +168,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see .])[]dnl +To get pkg-config, see .]) ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS @@ -198,7 +196,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -214,7 +212,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/compile b/compile index b1f4749..862a14e 100755 --- a/compile +++ b/compile @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-01-04.17; # UTC +scriptversion=2012-03-05.13; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free # Software Foundation, Inc. @@ -79,6 +79,48 @@ func_file_conv () esac } +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + # func_cl_wrapper cl arg... # Adjust compile command to suit cl func_cl_wrapper () @@ -109,43 +151,34 @@ func_cl_wrapper () ;; esac ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; -I*) func_file_conv "${1#-I}" mingw set x "$@" -I"$file" shift ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; -l*) - lib=${1#-l} - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - set x "$@" "$dir/$lib.dll.lib" - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - set x "$@" "$dir/$lib.lib" - break - fi - done - IFS=$save_IFS - - test "$found" != yes && set x "$@" "$lib.lib" + func_cl_dashl "${1#-l}" + set x "$@" "$lib" shift ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; -L*) - func_file_conv "${1#-L}" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" + func_cl_dashL "${1#-L}" ;; -static) shared=false diff --git a/configure b/configure index c625241..aec8f41 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for e_dbus 1.7.5. +# Generated by GNU Autoconf 2.68 for e_dbus 1.7.7. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='e_dbus' PACKAGE_TARNAME='e_dbus' -PACKAGE_VERSION='1.7.5' -PACKAGE_STRING='e_dbus 1.7.5' +PACKAGE_VERSION='1.7.7' +PACKAGE_STRING='e_dbus 1.7.7' PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net' PACKAGE_URL='' @@ -1438,7 +1438,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures e_dbus 1.7.5 to adapt to many kinds of systems. +\`configure' configures e_dbus 1.7.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1508,7 +1508,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of e_dbus 1.7.5:";; + short | recursive ) echo "Configuration of e_dbus 1.7.7:";; esac cat <<\_ACEOF @@ -1700,7 +1700,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -e_dbus configure 1.7.5 +e_dbus configure 1.7.7 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2032,7 +2032,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by e_dbus $as_me 1.7.5, which was +It was created by e_dbus $as_me 1.7.7, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2856,7 +2856,7 @@ fi # Define the identity of the package. PACKAGE='e_dbus' - VERSION='1.7.5' + VERSION='1.7.7' cat >>confdefs.h <<_ACEOF @@ -5549,7 +5549,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -8945,9 +8945,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; esac ld_shlibs=yes @@ -9169,7 +9166,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -9346,7 +9343,6 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -9800,7 +9796,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -10813,10 +10809,14 @@ fi # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -10828,18 +10828,6 @@ fi dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -11827,7 +11815,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF -#define VMIC 5 +#define VMIC 7 _ACEOF @@ -11835,7 +11823,7 @@ cat >>confdefs.h <<_ACEOF #define VREV 0 _ACEOF -version_info="8:5:7" +version_info="8:7:7" release_info="" @@ -11867,13 +11855,13 @@ case "$host_os" in ;; esac -requirement_ebluez="edbus >= 1.7.5" -requirement_econnman0_7x="edbus >= 1.7.5" -requirement_edbus="ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" -requirement_ehal="edbus >= 1.7.5" -requirement_enotify="edbus >= 1.7.5" -requirement_eofono="edbus >= 1.7.5" -requirement_eukit="edbus >= 1.7.5" +requirement_ebluez="edbus >= 1.7.7" +requirement_econnman0_7x="edbus >= 1.7.7" +requirement_edbus="ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" +requirement_ehal="edbus >= 1.7.7" +requirement_enotify="edbus >= 1.7.7" +requirement_eofono="edbus >= 1.7.7" +requirement_eukit="edbus >= 1.7.7" ### Additional options to configure @@ -12730,7 +12718,6 @@ fi - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -13021,8 +13008,8 @@ fi case "$host_os" in mingw*) if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.7.5\""; } >&5 - ($PKG_CONFIG --exists --print-errors "evil >= 1.7.5") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.7.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "evil >= 1.7.7") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then @@ -13031,7 +13018,7 @@ fi $as_echo "#define HAVE_EVIL 1" >>confdefs.h - requirement_edbus="${requirement_edbus} evil >= 1.7.5" + requirement_edbus="${requirement_edbus} evil >= 1.7.7" ;; esac @@ -13050,7 +13037,6 @@ if test -n "$DBUS_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13067,7 +13053,6 @@ if test -n "$DBUS_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13087,9 +13072,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 0.62" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 0.62" 2>&1` else - DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 0.62" 2>&1` + DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 0.62" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 @@ -13104,6 +13089,7 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables DBUS_CFLAGS and DBUS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13119,6 +13105,7 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } + else DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS DBUS_LIBS=$pkg_cv_DBUS_LIBS @@ -13142,7 +13129,6 @@ if test -n "$EDBUS_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EDBUS_CFLAGS=`$PKG_CONFIG --cflags "${requirement_edbus}" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13159,7 +13145,6 @@ if test -n "$EDBUS_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_EDBUS_LIBS=`$PKG_CONFIG --libs "${requirement_edbus}" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -13179,9 +13164,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "${requirement_edbus}" 2>&1` + EDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "${requirement_edbus}" 2>&1` else - EDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "${requirement_edbus}" 2>&1` + EDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "${requirement_edbus}" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EDBUS_PKG_ERRORS" >&5 @@ -13196,6 +13181,7 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables EDBUS_CFLAGS and EDBUS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 + elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13211,6 +13197,7 @@ See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } + else EDBUS_CFLAGS=$pkg_cv_EDBUS_CFLAGS EDBUS_LIBS=$pkg_cv_EDBUS_LIBS @@ -13253,13 +13240,12 @@ if test -n "$EVAS_CFLAGS"; then pkg_cv_EVAS_CFLAGS="$EVAS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.7.5\""; } >&5 - ($PKG_CONFIG --exists --print-errors "evas >= 1.7.5") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.7.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "evas >= 1.7.7") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EVAS_CFLAGS=`$PKG_CONFIG --cflags "evas >= 1.7.5" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EVAS_CFLAGS=`$PKG_CONFIG --cflags "evas >= 1.7.7" 2>/dev/null` else pkg_failed=yes fi @@ -13270,13 +13256,12 @@ if test -n "$EVAS_LIBS"; then pkg_cv_EVAS_LIBS="$EVAS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.7.5\""; } >&5 - ($PKG_CONFIG --exists --print-errors "evas >= 1.7.5") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.7.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "evas >= 1.7.7") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EVAS_LIBS=`$PKG_CONFIG --libs "evas >= 1.7.5" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EVAS_LIBS=`$PKG_CONFIG --libs "evas >= 1.7.7" 2>/dev/null` else pkg_failed=yes fi @@ -13296,9 +13281,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evas >= 1.7.5" 2>&1` + EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evas >= 1.7.7" 2>&1` else - EVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evas >= 1.7.5" 2>&1` + EVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors "evas >= 1.7.7" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EVAS_PKG_ERRORS" >&5 @@ -13313,7 +13298,7 @@ else EVAS_LIBS=$pkg_cv_EVAS_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - requirement_enotify="evas >= 1.7.5 ${requirement_enotify}" + requirement_enotify="evas >= 1.7.7 ${requirement_enotify}" fi fi @@ -13852,13 +13837,12 @@ if test -n "$EDBUS_TEST_CFLAGS"; then pkg_cv_EDBUS_TEST_CFLAGS="$EDBUS_TEST_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -13869,13 +13853,12 @@ if test -n "$EDBUS_TEST_LIBS"; then pkg_cv_EDBUS_TEST_LIBS="$EDBUS_TEST_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -13895,9 +13878,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EDBUS_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.7.7 dbus-1 >= 0.62" 2>&1` else - EDBUS_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.7.7 dbus-1 >= 0.62" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EDBUS_TEST_PKG_ERRORS" >&5 @@ -13926,13 +13909,12 @@ if test -n "$EDBUS_TEST_CLIENT_CFLAGS"; then pkg_cv_EDBUS_TEST_CLIENT_CFLAGS="$EDBUS_TEST_CLIENT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_TEST_CLIENT_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_TEST_CLIENT_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -13943,13 +13925,12 @@ if test -n "$EDBUS_TEST_CLIENT_LIBS"; then pkg_cv_EDBUS_TEST_CLIENT_LIBS="$EDBUS_TEST_CLIENT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_TEST_CLIENT_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_TEST_CLIENT_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -13969,9 +13950,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EDBUS_TEST_CLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_TEST_CLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.7.7 dbus-1 >= 0.62" 2>&1` else - EDBUS_TEST_CLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_TEST_CLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.7.7 dbus-1 >= 0.62" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EDBUS_TEST_CLIENT_PKG_ERRORS" >&5 @@ -14000,13 +13981,12 @@ if test -n "$EDBUS_BLUEZ_TEST_CFLAGS"; then pkg_cv_EDBUS_BLUEZ_TEST_CFLAGS="$EDBUS_BLUEZ_TEST_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_BLUEZ_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_BLUEZ_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14017,13 +13997,12 @@ if test -n "$EDBUS_BLUEZ_TEST_LIBS"; then pkg_cv_EDBUS_BLUEZ_TEST_LIBS="$EDBUS_BLUEZ_TEST_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_BLUEZ_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_BLUEZ_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14043,9 +14022,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EDBUS_BLUEZ_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_BLUEZ_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>&1` else - EDBUS_BLUEZ_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_BLUEZ_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EDBUS_BLUEZ_TEST_PKG_ERRORS" >&5 @@ -14074,13 +14053,12 @@ if test -n "$EDBUS_CONNMAN0_7X_TEST_CFLAGS"; then pkg_cv_EDBUS_CONNMAN0_7X_TEST_CFLAGS="$EDBUS_CONNMAN0_7X_TEST_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_CONNMAN0_7X_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_CONNMAN0_7X_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14091,13 +14069,12 @@ if test -n "$EDBUS_CONNMAN0_7X_TEST_LIBS"; then pkg_cv_EDBUS_CONNMAN0_7X_TEST_LIBS="$EDBUS_CONNMAN0_7X_TEST_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_CONNMAN0_7X_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_CONNMAN0_7X_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14117,9 +14094,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EDBUS_CONNMAN0_7X_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_CONNMAN0_7X_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>&1` else - EDBUS_CONNMAN0_7X_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_CONNMAN0_7X_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EDBUS_CONNMAN0_7X_TEST_PKG_ERRORS" >&5 @@ -14148,13 +14125,12 @@ if test -n "$EDBUS_NOTIFICATION_DAEMON_TEST_CFLAGS"; then pkg_cv_EDBUS_NOTIFICATION_DAEMON_TEST_CFLAGS="$EDBUS_NOTIFICATION_DAEMON_TEST_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_NOTIFICATION_DAEMON_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_NOTIFICATION_DAEMON_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14165,13 +14141,12 @@ if test -n "$EDBUS_NOTIFICATION_DAEMON_TEST_LIBS"; then pkg_cv_EDBUS_NOTIFICATION_DAEMON_TEST_LIBS="$EDBUS_NOTIFICATION_DAEMON_TEST_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_NOTIFICATION_DAEMON_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_NOTIFICATION_DAEMON_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14191,9 +14166,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EDBUS_NOTIFICATION_DAEMON_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_NOTIFICATION_DAEMON_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>&1` else - EDBUS_NOTIFICATION_DAEMON_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_NOTIFICATION_DAEMON_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EDBUS_NOTIFICATION_DAEMON_TEST_PKG_ERRORS" >&5 @@ -14222,13 +14197,12 @@ if test -n "$EDBUS_NOTIFY_SEND_CFLAGS"; then pkg_cv_EDBUS_NOTIFY_SEND_CFLAGS="$EDBUS_NOTIFY_SEND_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_NOTIFY_SEND_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_NOTIFY_SEND_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14239,13 +14213,12 @@ if test -n "$EDBUS_NOTIFY_SEND_LIBS"; then pkg_cv_EDBUS_NOTIFY_SEND_LIBS="$EDBUS_NOTIFY_SEND_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_NOTIFY_SEND_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_NOTIFY_SEND_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14265,9 +14238,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EDBUS_NOTIFY_SEND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_NOTIFY_SEND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>&1` else - EDBUS_NOTIFY_SEND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_NOTIFY_SEND_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EDBUS_NOTIFY_SEND_PKG_ERRORS" >&5 @@ -14296,13 +14269,12 @@ if test -n "$EDBUS_NOTIFY_TEST_CFLAGS"; then pkg_cv_EDBUS_NOTIFY_TEST_CFLAGS="$EDBUS_NOTIFY_TEST_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 ecore-evas >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 ecore-evas >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 ecore-evas >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 ecore-evas >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_NOTIFY_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.5 ecore-evas >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_NOTIFY_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.7 ecore-evas >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14313,13 +14285,12 @@ if test -n "$EDBUS_NOTIFY_TEST_LIBS"; then pkg_cv_EDBUS_NOTIFY_TEST_LIBS="$EDBUS_NOTIFY_TEST_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 ecore-evas >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 ecore-evas >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 ecore-evas >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 ecore-evas >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_NOTIFY_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.5 ecore-evas >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_NOTIFY_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.7 ecore-evas >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14339,9 +14310,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EDBUS_NOTIFY_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore >= 1.7.5 ecore-evas >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_NOTIFY_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.7.7 ecore-evas >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>&1` else - EDBUS_NOTIFY_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore >= 1.7.5 ecore-evas >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_NOTIFY_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.7.7 ecore-evas >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EDBUS_NOTIFY_TEST_PKG_ERRORS" >&5 @@ -14370,13 +14341,12 @@ if test -n "$EDBUS_OFONO_TEST_CFLAGS"; then pkg_cv_EDBUS_OFONO_TEST_CFLAGS="$EDBUS_OFONO_TEST_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_OFONO_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_OFONO_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14387,13 +14357,12 @@ if test -n "$EDBUS_OFONO_TEST_LIBS"; then pkg_cv_EDBUS_OFONO_TEST_LIBS="$EDBUS_OFONO_TEST_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_OFONO_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_OFONO_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14413,9 +14382,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EDBUS_OFONO_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_OFONO_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>&1` else - EDBUS_OFONO_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_OFONO_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EDBUS_OFONO_TEST_PKG_ERRORS" >&5 @@ -14444,13 +14413,12 @@ if test -n "$EDBUS_UKIT_TEST_CFLAGS"; then pkg_cv_EDBUS_UKIT_TEST_CFLAGS="$EDBUS_UKIT_TEST_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_UKIT_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_UKIT_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14461,13 +14429,12 @@ if test -n "$EDBUS_UKIT_TEST_LIBS"; then pkg_cv_EDBUS_UKIT_TEST_LIBS="$EDBUS_UKIT_TEST_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_UKIT_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_UKIT_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14487,9 +14454,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EDBUS_UKIT_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_UKIT_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>&1` else - EDBUS_UKIT_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_UKIT_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EDBUS_UKIT_TEST_PKG_ERRORS" >&5 @@ -14518,13 +14485,12 @@ if test -n "$EDBUS_PERFORMANCE_TEST_CFLAGS"; then pkg_cv_EDBUS_PERFORMANCE_TEST_CFLAGS="$EDBUS_PERFORMANCE_TEST_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62 ecore-evas >= 1.7.5 elementary >= 1.7.5 evas >= 1.7.5\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62 ecore-evas >= 1.7.5 elementary >= 1.7.5 evas >= 1.7.5") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62 ecore-evas >= 1.7.7 elementary >= 1.7.7 evas >= 1.7.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62 ecore-evas >= 1.7.7 elementary >= 1.7.7 evas >= 1.7.7") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_PERFORMANCE_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62 ecore-evas >= 1.7.5 elementary >= 1.7.5 evas >= 1.7.5" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_PERFORMANCE_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62 ecore-evas >= 1.7.7 elementary >= 1.7.7 evas >= 1.7.7" 2>/dev/null` else pkg_failed=yes fi @@ -14535,13 +14501,12 @@ if test -n "$EDBUS_PERFORMANCE_TEST_LIBS"; then pkg_cv_EDBUS_PERFORMANCE_TEST_LIBS="$EDBUS_PERFORMANCE_TEST_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62 ecore-evas >= 1.7.5 elementary >= 1.7.5 evas >= 1.7.5\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62 ecore-evas >= 1.7.5 elementary >= 1.7.5 evas >= 1.7.5") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62 ecore-evas >= 1.7.7 elementary >= 1.7.7 evas >= 1.7.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62 ecore-evas >= 1.7.7 elementary >= 1.7.7 evas >= 1.7.7") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_PERFORMANCE_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62 ecore-evas >= 1.7.5 elementary >= 1.7.5 evas >= 1.7.5" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_PERFORMANCE_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62 ecore-evas >= 1.7.7 elementary >= 1.7.7 evas >= 1.7.7" 2>/dev/null` else pkg_failed=yes fi @@ -14561,9 +14526,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EDBUS_PERFORMANCE_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62 ecore-evas >= 1.7.5 elementary >= 1.7.5 evas >= 1.7.5" 2>&1` + EDBUS_PERFORMANCE_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62 ecore-evas >= 1.7.7 elementary >= 1.7.7 evas >= 1.7.7" 2>&1` else - EDBUS_PERFORMANCE_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62 ecore-evas >= 1.7.5 elementary >= 1.7.5 evas >= 1.7.5" 2>&1` + EDBUS_PERFORMANCE_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62 ecore-evas >= 1.7.7 elementary >= 1.7.7 evas >= 1.7.7" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EDBUS_PERFORMANCE_TEST_PKG_ERRORS" >&5 @@ -14601,13 +14566,12 @@ if test -n "$EDBUS_ASYNC_TEST_CFLAGS"; then pkg_cv_EDBUS_ASYNC_TEST_CFLAGS="$EDBUS_ASYNC_TEST_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_ASYNC_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_ASYNC_TEST_CFLAGS=`$PKG_CONFIG --cflags "ecore >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14618,13 +14582,12 @@ if test -n "$EDBUS_ASYNC_TEST_LIBS"; then pkg_cv_EDBUS_ASYNC_TEST_LIBS="$EDBUS_ASYNC_TEST_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.5 dbus-1 >= 0.62\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.5 dbus-1 >= 0.62") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.7.7 dbus-1 >= 0.62\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ecore >= 1.7.7 dbus-1 >= 0.62") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_EDBUS_ASYNC_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.5 dbus-1 >= 0.62" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + pkg_cv_EDBUS_ASYNC_TEST_LIBS=`$PKG_CONFIG --libs "ecore >= 1.7.7 dbus-1 >= 0.62" 2>/dev/null` else pkg_failed=yes fi @@ -14644,9 +14607,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EDBUS_ASYNC_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ecore >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_ASYNC_TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.7.7 dbus-1 >= 0.62" 2>&1` else - EDBUS_ASYNC_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ecore >= 1.7.5 dbus-1 >= 0.62" 2>&1` + EDBUS_ASYNC_TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.7.7 dbus-1 >= 0.62" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EDBUS_ASYNC_TEST_PKG_ERRORS" >&5 @@ -15830,7 +15793,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by e_dbus $as_me 1.7.5, which was +This file was extended by e_dbus $as_me 1.7.7, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15896,7 +15859,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -e_dbus config.status 1.7.5 +e_dbus config.status 1.7.7 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index d3d2274..d9c933e 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [1]) m4_define([v_min], [7]) -m4_define([v_mic], [5]) +m4_define([v_mic], [7]) 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 @@ -81,13 +81,13 @@ case "$host_os" in ;; esac -requirement_ebluez="edbus >= 1.7.5" -requirement_econnman0_7x="edbus >= 1.7.5" -requirement_edbus="ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62" -requirement_ehal="edbus >= 1.7.5" -requirement_enotify="edbus >= 1.7.5" -requirement_eofono="edbus >= 1.7.5" -requirement_eukit="edbus >= 1.7.5" +requirement_ebluez="edbus >= 1.7.7" +requirement_econnman0_7x="edbus >= 1.7.7" +requirement_edbus="ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62" +requirement_ehal="edbus >= 1.7.7" +requirement_enotify="edbus >= 1.7.7" +requirement_eofono="edbus >= 1.7.7" +requirement_eukit="edbus >= 1.7.7" ### Additional options to configure @@ -149,9 +149,9 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) case "$host_os" in mingw*) - PKG_CHECK_EXISTS([evil >= 1.7.5]) + PKG_CHECK_EXISTS([evil >= 1.7.7]) AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed]) - requirement_edbus="${requirement_edbus} evil >= 1.7.5" + requirement_edbus="${requirement_edbus} evil >= 1.7.7" ;; esac @@ -185,8 +185,8 @@ AC_SUBST(DBUS_VERSION_CFLAGS) # Dependencies for the libraries if test "x${enable_enotify}" = "xyes" ; then PKG_CHECK_MODULES([EVAS], - [evas >= 1.7.5], - [requirement_enotify="evas >= 1.7.5 ${requirement_enotify}"], + [evas >= 1.7.7], + [requirement_enotify="evas >= 1.7.7 ${requirement_enotify}"], [enable_enotify="no"]) fi @@ -213,70 +213,70 @@ EFL_ENABLE_BIN([edbus-async-test], ["yes"]) if test "x${have_edbus_test}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_TEST], - [ecore >= 1.7.5 dbus-1 >= 0.62], + [ecore >= 1.7.7 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.7.5 dbus-1 >= 0.62], + [ecore >= 1.7.7 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.7.5 eina >= 1.7.5 dbus-1 >= 0.62], + [ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62], [have_edbus_bluez_test="yes"], [have_edbus_bluez_test="no"]) fi if test "x${have_edbus_connman0_7x_test}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_CONNMAN0_7X_TEST], - [ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62], + [ecore >= 1.7.7 eina >= 1.7.7 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.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62], + [ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 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.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62], + [ecore >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 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.7.5 ecore-evas >= 1.7.5 evas >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62], + [ecore >= 1.7.7 ecore-evas >= 1.7.7 evas >= 1.7.7 eina >= 1.7.7 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.7.5 eina >= 1.7.5 dbus-1 >= 0.62], + [ecore >= 1.7.7 eina >= 1.7.7 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.7.5 eina >= 1.7.5 dbus-1 >= 0.62], + [ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62], [have_edbus_ukit_test="yes"], [have_edbus_ukit_test="no"]) fi if test "x${have_edbus_performance_test}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_PERFORMANCE_TEST], - [ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62 ecore-evas >= 1.7.5 elementary >= 1.7.5 evas >= 1.7.5], + [ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62 ecore-evas >= 1.7.7 elementary >= 1.7.7 evas >= 1.7.7], [have_edbus_performance_test="yes"], [have_edbus_performance_test="no"]) fi @@ -285,7 +285,7 @@ AM_CONDITIONAL([BUILD_EDBUS_PERFORMANCE_TEST], [test "x${have_edbus_performance_ if test "x${have_edbus_async_test}" = "xyes" ; then PKG_CHECK_MODULES([EDBUS_ASYNC_TEST], - [ecore >= 1.7.5 dbus-1 >= 0.62], + [ecore >= 1.7.7 dbus-1 >= 0.62], [have_edbus_async_test="yes"], [have_edbus_async_test="no"]) fi diff --git a/depcomp b/depcomp index bd0ac08..25a39e6 100755 --- a/depcomp +++ b/depcomp @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2012-03-27.16; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ scriptversion=2011-12-04.11; # UTC case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,8 +40,8 @@ as side-effects. Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputting dependencies. @@ -57,6 +57,12 @@ EOF ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -102,6 +108,12 @@ if test "$depmode" = msvc7msys; then depmode=msvc7 fi +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -156,15 +168,14 @@ gcc) ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. @@ -203,18 +214,15 @@ sgi) # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -226,10 +234,17 @@ sgi) rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -259,12 +274,11 @@ aix) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -275,23 +289,26 @@ aix) ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -300,15 +317,21 @@ icc) exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -344,7 +367,7 @@ hp2) done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -359,9 +382,9 @@ hp2) tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -407,8 +430,7 @@ tru64) done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -443,11 +465,11 @@ msvc7) p }' | $cygpath_u | sort -u | sed -n ' s/ /\\ /g -s/\(.*\)/ \1 \\/p +s/\(.*\)/'"$tab"'\1 \\/p s/.\(.*\) \\/\1:/ H $ { - s/.*/ / + s/.*/'"$tab"'/ G p }' >> "$depfile" @@ -478,7 +500,7 @@ dashmstdout) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -498,15 +520,14 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -562,8 +583,7 @@ makedepend) # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -583,7 +603,7 @@ cpp) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -652,8 +672,8 @@ msvisualcpp) sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff --git a/doc/Makefile.in b/doc/Makefile.in index 4ed9164..d9642ce 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -58,6 +75,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ diff --git a/e_dbus.spec b/e_dbus.spec index 9e8660a..ae75d65 100644 --- a/e_dbus.spec +++ b/e_dbus.spec @@ -4,7 +4,7 @@ Summary: EFL Wrapper for DBus Name: e_dbus -Version: 1.7.5 +Version: 1.7.7 Release: %{_rel} License: BSD Group: System Environment/Libraries diff --git a/ebluez.pc b/ebluez.pc index 3f41701..ce0f183 100644 --- a/ebluez.pc +++ b/ebluez.pc @@ -1,11 +1,11 @@ -prefix=/home/lfelipe/e-release/release/local +prefix=/home/antognolli/efl/1.7/git-release/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include Name: ebluez Description: bluetooth device manager (bluez) -Requires.private: edbus >= 1.7.5 -Version: 1.7.5 +Requires.private: edbus >= 1.7.7 +Version: 1.7.7 Libs: -L${libdir} -lebluez Cflags: -I${includedir}/e_dbus-1 diff --git a/econnman-0.7x.pc b/econnman-0.7x.pc index 40ac0c3..af04b22 100644 --- a/econnman-0.7x.pc +++ b/econnman-0.7x.pc @@ -1,11 +1,11 @@ -prefix=/home/lfelipe/e-release/release/local +prefix=/home/antognolli/efl/1.7/git-release/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include Name: econnman-0.7x Description: network connection manager (connman v0.7x) -Requires.private: edbus >= 1.7.5 -Version: 1.7.5 +Requires.private: edbus >= 1.7.7 +Version: 1.7.7 Libs: -L${libdir} -leconnman0_7x Cflags: -I${includedir}/e_dbus-1 diff --git a/edbus.pc b/edbus.pc index f13c232..4127da8 100644 --- a/edbus.pc +++ b/edbus.pc @@ -1,5 +1,5 @@ PACKAGE_TARNAME=e_dbus -prefix=/home/lfelipe/e-release/release/local +prefix=/home/antognolli/efl/1.7/git-release/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include @@ -7,7 +7,7 @@ docdir=${prefix}/share/doc/${PACKAGE_TARNAME} Name: edbus Description: DBus convenience library -Requires.private: ecore >= 1.7.5 eina >= 1.7.5 dbus-1 >= 0.62 -Version: 1.7.5 -Libs: -L${libdir} -ledbus -ldbus-1 -lpthread -lrt +Requires.private: ecore >= 1.7.7 eina >= 1.7.7 dbus-1 >= 0.62 +Version: 1.7.7 +Libs: -L${libdir} -ledbus -L/lib64 -ldbus-1 -lpthread -lrt Cflags: -I${includedir}/e_dbus-1 diff --git a/ehal.pc b/ehal.pc index a72f7dd..f096ad7 100644 --- a/ehal.pc +++ b/ehal.pc @@ -1,11 +1,11 @@ -prefix=/home/lfelipe/e-release/release/local +prefix=/home/antognolli/efl/1.7/git-release/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include Name: ehal Description: Hal convenience library -Requires.private: edbus >= 1.7.5 -Version: 1.7.5 +Requires.private: edbus >= 1.7.7 +Version: 1.7.7 Libs: -L${libdir} -lehal Cflags: -I${includedir}/e_dbus-1 diff --git a/enotify.pc b/enotify.pc index 3e6fbbe..f9152d0 100644 --- a/enotify.pc +++ b/enotify.pc @@ -1,11 +1,11 @@ -prefix=/home/lfelipe/e-release/release/local +prefix=/home/antognolli/efl/1.7/git-release/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include Name: enotify Description: Notification convenience library -Requires.private: evas >= 1.7.5 edbus >= 1.7.5 -Version: 1.7.5 +Requires.private: evas >= 1.7.7 edbus >= 1.7.7 +Version: 1.7.7 Libs: -L${libdir} -lenotify Cflags: -I${includedir}/e_dbus-1 diff --git a/eofono.pc b/eofono.pc index 3ab6acd..5944ffe 100644 --- a/eofono.pc +++ b/eofono.pc @@ -1,11 +1,11 @@ -prefix=/home/lfelipe/e-release/release/local +prefix=/home/antognolli/efl/1.7/git-release/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include Name: eofono Description: oFono D-Bus wrappers -Requires.private: edbus >= 1.7.5 -Version: 1.7.5 +Requires.private: edbus >= 1.7.7 +Version: 1.7.7 Libs: -L${libdir} -leofono Cflags: -I${includedir}/e_dbus-1 diff --git a/eukit.pc b/eukit.pc index 88efa3b..cc8c944 100644 --- a/eukit.pc +++ b/eukit.pc @@ -1,11 +1,11 @@ -prefix=/home/lfelipe/e-release/release/local +prefix=/home/antognolli/efl/1.7/git-release/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include Name: eukit Description: udisks/upower convenience library -Requires.private: edbus >= 1.7.5 -Version: 1.7.5 +Requires.private: edbus >= 1.7.7 +Version: 1.7.7 Libs: -L${libdir} -leukit Cflags: -I${includedir}/e_dbus-1 diff --git a/ltmain.sh b/ltmain.sh index c2852d8..63ae69d 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1ubuntu1" +VERSION=2.4.2 TIMESTAMP="" package_revision=1.3337 @@ -6124,10 +6124,7 @@ func_mode_link () case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6447,19 +6444,19 @@ func_mode_link () # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done continue fi # $pass = conv @@ -7352,9 +7349,6 @@ func_mode_link () revision="$number_minor" lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; esac ;; no) diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 828104c..56666f0 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -2669,10 +2669,14 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2684,18 +2688,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3301,7 +3293,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4113,7 +4105,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4590,9 +4582,6 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4655,9 +4644,6 @@ dnl Note also adjust exclude_expsyms for C++ above. openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4879,7 +4865,7 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5056,7 +5042,6 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5361,7 +5346,7 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else diff --git a/src/Makefile.in b/src/Makefile.in index 2670954..94d89e4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -64,6 +81,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -481,13 +503,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/src/bin/Makefile.in b/src/bin/Makefile.in index 374cd86..f15aae1 100644 --- a/src/bin/Makefile.in +++ b/src/bin/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -213,6 +230,11 @@ DIST_SOURCES = $(am__e_notify_send_SOURCES_DIST) \ $(am__e_dbus_test_SOURCES_DIST) \ $(am__e_dbus_test_client_SOURCES_DIST) \ $(am__e_dbus_ukit_test_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -596,8 +618,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -916,8 +941,11 @@ clean-libtool: -rm -rf .libs _libs install-logoDATA: $(logo_DATA) @$(NORMAL_INSTALL) - test -z "$(logodir)" || $(MKDIR_P) "$(DESTDIR)$(logodir)" @list='$(logo_DATA)'; test -n "$(logodir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(logodir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(logodir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index bad1f85..98f8427 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -70,6 +87,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -488,13 +510,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/src/lib/bluez/Makefile.in b/src/lib/bluez/Makefile.in index 5cd0513..8ea1518 100644 --- a/src/lib/bluez/Makefile.in +++ b/src/lib/bluez/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -120,6 +137,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libebluez_la_SOURCES) DIST_SOURCES = $(libebluez_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(includes_HEADERS) ETAGS = etags CTAGS = ctags @@ -355,7 +377,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -363,6 +384,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -428,8 +451,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/lib/connman0_7x/Makefile.in b/src/lib/connman0_7x/Makefile.in index a002505..f5aa2c7 100644 --- a/src/lib/connman0_7x/Makefile.in +++ b/src/lib/connman0_7x/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -122,6 +139,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libeconnman0_7x_la_SOURCES) DIST_SOURCES = $(libeconnman0_7x_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(includes_HEADERS) ETAGS = etags CTAGS = ctags @@ -357,7 +379,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -365,6 +386,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -430,8 +453,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/lib/connman0_7x/e_connman_element.c b/src/lib/connman0_7x/e_connman_element.c index 819b7c5..9c9010d 100644 --- a/src/lib/connman0_7x/e_connman_element.c +++ b/src/lib/connman0_7x/e_connman_element.c @@ -1378,7 +1378,7 @@ _e_connman_element_get_properties_callback(void *user_data, DBusMessage *msg, DB Eina_Bool e_connman_element_sync_properties_full(E_Connman_Element *element, E_DBus_Method_Return_Cb cb, const void *data) { - e_connman_element_properties_sync_full(element, cb, data); + return e_connman_element_properties_sync_full(element, cb, data); } /** diff --git a/src/lib/dbus/Makefile.in b/src/lib/dbus/Makefile.in index 0b04ff2..5454bf1 100644 --- a/src/lib/dbus/Makefile.in +++ b/src/lib/dbus/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -120,6 +137,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libedbus_la_SOURCES) DIST_SOURCES = $(libedbus_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(includes_HEADERS) ETAGS = etags CTAGS = ctags @@ -355,7 +377,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -363,6 +384,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -429,8 +452,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/lib/hal/Makefile.in b/src/lib/hal/Makefile.in index 9e6cb09..0d20d12 100644 --- a/src/lib/hal/Makefile.in +++ b/src/lib/hal/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -119,6 +136,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libehal_la_SOURCES) DIST_SOURCES = $(libehal_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(includes_HEADERS) ETAGS = etags CTAGS = ctags @@ -352,7 +374,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -360,6 +381,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -423,8 +446,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/lib/notification/Makefile.in b/src/lib/notification/Makefile.in index 1671e2d..68f33d8 100644 --- a/src/lib/notification/Makefile.in +++ b/src/lib/notification/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -119,6 +136,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libenotify_la_SOURCES) DIST_SOURCES = $(libenotify_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(includes_HEADERS) ETAGS = etags CTAGS = ctags @@ -354,7 +376,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -362,6 +383,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -425,8 +448,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/lib/ofono/Makefile.in b/src/lib/ofono/Makefile.in index 1fb896f..c236c5a 100644 --- a/src/lib/ofono/Makefile.in +++ b/src/lib/ofono/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -120,6 +137,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libeofono_la_SOURCES) DIST_SOURCES = $(libeofono_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac HEADERS = $(includes_HEADERS) ETAGS = etags CTAGS = ctags @@ -355,7 +377,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -363,6 +384,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -428,8 +451,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/src/lib/ofono/e_ofono_element.c b/src/lib/ofono/e_ofono_element.c index 37c8145..156c1e5 100644 --- a/src/lib/ofono/e_ofono_element.c +++ b/src/lib/ofono/e_ofono_element.c @@ -1458,7 +1458,7 @@ _e_ofono_element_get_properties_callback(void *user_data, DBusMessage *msg, DBus Eina_Bool e_ofono_element_sync_properties_full(E_Ofono_Element *element, E_DBus_Method_Return_Cb cb, const void *data) { - e_ofono_element_properties_sync_full(element, cb, data); + return e_ofono_element_properties_sync_full(element, cb, data); } /** diff --git a/src/lib/ukit/Makefile.in b/src/lib/ukit/Makefile.in index 86a1dde..d8bdec3 100644 --- a/src/lib/ukit/Makefile.in +++ b/src/lib/ukit/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -124,6 +141,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libeukit_la_SOURCES) DIST_SOURCES = $(am__libeukit_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__includes_HEADERS_DIST = E_Ukit.h HEADERS = $(includes_HEADERS) ETAGS = etags @@ -359,7 +381,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -367,6 +388,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -431,8 +454,11 @@ clean-libtool: -rm -rf .libs _libs install-includesHEADERS: $(includes_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)" @list='$(includes_HEADERS)'; test -n "$(includesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ -- 2.7.4