aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/libraries/edje
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--libraries/edje/ChangeLog66
-rw-r--r--libraries/edje/Makefile.in2
-rw-r--r--libraries/edje/NEWS17
-rw-r--r--libraries/edje/README8
-rw-r--r--libraries/edje/aclocal.m464
-rwxr-xr-xlibraries/edje/configure2045
-rw-r--r--libraries/edje/configure.ac39
-rw-r--r--libraries/edje/data/Makefile.in2
-rw-r--r--libraries/edje/data/include/Makefile.in2
-rw-r--r--libraries/edje/doc/Makefile.in2
-rw-r--r--libraries/edje/edje.spec4
-rw-r--r--libraries/edje/edje.spec.in2
-rwxr-xr-xlibraries/edje/ltmain.sh4
-rw-r--r--libraries/edje/m4/libtool.m4144
-rw-r--r--libraries/edje/m4/ltoptions.m42
-rw-r--r--libraries/edje/sha1-for-source.txt1
-rw-r--r--libraries/edje/src/Makefile.in2
-rw-r--r--libraries/edje/src/bin/Makefile.in2
-rw-r--r--libraries/edje/src/bin/edje_cc.h1
-rw-r--r--libraries/edje/src/bin/edje_cc_handlers.c129
-rw-r--r--libraries/edje/src/bin/edje_cc_out.c35
-rw-r--r--libraries/edje/src/bin/edje_cc_parse.c6
-rw-r--r--libraries/edje/src/bin/edje_decc.c3
-rw-r--r--libraries/edje/src/bin/edje_inspector.c202
-rw-r--r--libraries/edje/src/bin/edje_multisense_convert.c2
-rw-r--r--libraries/edje/src/bin/epp/Makefile.in2
-rw-r--r--libraries/edje/src/bin/epp/cppmain.c13
-rw-r--r--libraries/edje/src/examples/Makefile.am104
-rw-r--r--libraries/edje/src/examples/Makefile.in135
-rw-r--r--libraries/edje/src/examples/Vera.ttfbin0 -> 65932 bytes
-rw-r--r--libraries/edje/src/examples/lua_script.edc12
-rw-r--r--libraries/edje/src/examples/multisense.edc139
-rw-r--r--libraries/edje/src/examples/signals-messages.edc8
-rw-r--r--libraries/edje/src/lib/Edje.h40
-rw-r--r--libraries/edje/src/lib/Makefile.in2
-rw-r--r--libraries/edje/src/lib/edje_cache.c13
-rw-r--r--libraries/edje/src/lib/edje_calc.c447
-rw-r--r--libraries/edje/src/lib/edje_callbacks.c5
-rw-r--r--libraries/edje/src/lib/edje_data.c3
-rw-r--r--libraries/edje/src/lib/edje_edit.c131
-rw-r--r--libraries/edje/src/lib/edje_embryo.c2
-rw-r--r--libraries/edje/src/lib/edje_entry.c350
-rw-r--r--libraries/edje/src/lib/edje_load.c151
-rw-r--r--libraries/edje/src/lib/edje_lua2.c269
-rw-r--r--libraries/edje/src/lib/edje_main.c5
-rw-r--r--libraries/edje/src/lib/edje_message_queue.c4
-rw-r--r--libraries/edje/src/lib/edje_module.c4
-rw-r--r--libraries/edje/src/lib/edje_multisense.c12
-rw-r--r--libraries/edje/src/lib/edje_private.h13
-rw-r--r--libraries/edje/src/lib/edje_program.c4
-rw-r--r--libraries/edje/src/lib/edje_util.c44
-rw-r--r--libraries/edje/src/modules/Makefile.in2
-rw-r--r--libraries/edje/src/modules/alsa_snd_player/Makefile.in2
-rw-r--r--libraries/edje/src/modules/eet_snd_reader/Makefile.in2
-rw-r--r--libraries/edje/src/modules/multisense_factory/Makefile.in2
-rw-r--r--libraries/edje/src/modules/multisense_factory/multisense_factory.c66
-rw-r--r--libraries/edje/src/tests/Makefile.in2
-rw-r--r--libraries/edje/utils/Makefile.in2
58 files changed, 2734 insertions, 2042 deletions
diff --git a/libraries/edje/ChangeLog b/libraries/edje/ChangeLog
index 39757b9..ae65d85 100644
--- a/libraries/edje/ChangeLog
+++ b/libraries/edje/ChangeLog
@@ -219,3 +219,69 @@
219 * Fix message and signal propagation to be consistent in all situations 219 * Fix message and signal propagation to be consistent in all situations
220 as well as simpler. 220 as well as simpler.
221 221
2222011-12-02 Carsten Haitzler (The Rasterman)
223
224 1.1.0 release
225
2262011-12-12 Mike Blumenkrantz (discomfitor/zmike)
227
228 * Fix potential crash from buffer overflow on copying map data.
229
2302011-12-15 Tom Hacohen (TAsn)
231
232 * Entry: Added support for various new key bindings:
233 Ctrl+Arrows, Ctrl+Del and Ctrl+Backspace.
234 * Entry: Added cursor,changed,manual signal.
235 This signal indicates the cursor has been manually changed, i.e by
236 either mouse click or arrows.
237
2382011-12-15 Cedric Bail
239
240 * Fix detections of limits by edje_cc parser.
241
2422011-12-16 Cedric Bail
243
244 * Fix wrong call to free() in edje_load.
245 * Reduce parts walk to the strict minimum.
246
2472011-12-19 Cedric Bail
248
249 * Check existence of group at compile time also.
250
2512012-01-02 Carsten Haitzler (The Rasterman)
252
253 * Fix prototype for edje_object_part_text_cursor_content_get()
254 as it returned a strduped string and not an internal one, so
255 this just formalizes its existing behavior correctly.
256
2572012-01-03 Tom Hacohen (TAsn)
258
259 * Entry: Fixed undo/redo with IMF.
260
2612012-01-04 Carsten Haitzler (The Rasterman)
262
263 * Add HEX, TERMINAL and PASSWORD layouts to edje
264 * Add "recalc" smart callback for object size changes
265
2662012-01-05 Cedric Bail
267
268 * Reduce call to stat during edje_object_file_set.
269
2702012-01-06 Cedric Bail
271
272 * Unswallow object that are about to be swallowed if necessary.
273 * Add EDJE_ASPECT_PREFER_SOURCE.
274
2752012-01-07 David Seikel (onefang)
276
277 * Lua: Calling non exstent functions no longer crashes scripts.
278 This is so that future scripts will still work with old libraries,
279 and lets us add the "host can provide Lua API" feature soon.
280
2812012-01-09 David Seikel (onefang)
282
283 * Lua: Added edje.version().
284
2852012-01-14 Carsten Haitzler (The Rasterman)
286
287 * Added minmul propery for edje to multiply minimum size during min size calc
diff --git a/libraries/edje/Makefile.in b/libraries/edje/Makefile.in
index 2666156..b63286c 100644
--- a/libraries/edje/Makefile.in
+++ b/libraries/edje/Makefile.in
@@ -236,8 +236,6 @@ PACKAGE_URL = @PACKAGE_URL@
236PACKAGE_VERSION = @PACKAGE_VERSION@ 236PACKAGE_VERSION = @PACKAGE_VERSION@
237PATH_SEPARATOR = @PATH_SEPARATOR@ 237PATH_SEPARATOR = @PATH_SEPARATOR@
238PKG_CONFIG = @PKG_CONFIG@ 238PKG_CONFIG = @PKG_CONFIG@
239PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
240PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
241PYTHON = @PYTHON@ 239PYTHON = @PYTHON@
242PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 240PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
243PYTHON_PLATFORM = @PYTHON_PLATFORM@ 241PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/NEWS b/libraries/edje/NEWS
index e34a719..bf529dc 100644
--- a/libraries/edje/NEWS
+++ b/libraries/edje/NEWS
@@ -1,5 +1,22 @@
1Edje 1.1.0 1Edje 1.1.0
2 2
3Changes since Edje 1.1.0:
4-------------------------
5
6Additions:
7
8 * "recalc" smart callback for object size changes
9 * EDJE_ASPECT_PREFER_SOURCE.
10 * edje.version() Lua function.
11 * minmul edc property
12
13Improvements:
14 * speedup load time of Edje file.
15 * check existence of group at compile time also.
16 * reduce number of call to stat during edje_object_file_set.
17 * unswallow object about to be swallowed if necessary.
18 * Lua scripts now more resilient against API changes.
19
3Changes since Edje 1.0.0: 20Changes since Edje 1.0.0:
4------------------------- 21-------------------------
5 22
diff --git a/libraries/edje/README b/libraries/edje/README
index d040a5c..3cf9a65 100644
--- a/libraries/edje/README
+++ b/libraries/edje/README
@@ -4,16 +4,16 @@ Edje 1.1.0
4 4
5 FOR ANY ISSUES PLEASE EMAIL: 5 FOR ANY ISSUES PLEASE EMAIL:
6 enlightenment-devel@lists.sourceforge.net 6 enlightenment-devel@lists.sourceforge.net
7 7
8****************************************************************************** 8******************************************************************************
9 9
10Requirements: 10Requirements:
11------------- 11-------------
12 12
13Must: 13Must:
14 libc 14 libc
15 libm 15 libm
16 eet (at least 1.5.0) 16 eet (at least 1.5.0)
17 ecore (at least 1.1.0) 17 ecore (at least 1.1.0)
18 ecore-evas (at least 1.1.0) 18 ecore-evas (at least 1.1.0)
19 ecore-file (at least 1.1.0) 19 ecore-file (at least 1.1.0)
diff --git a/libraries/edje/aclocal.m4 b/libraries/edje/aclocal.m4
index 23ca0ef..a809f4b 100644
--- a/libraries/edje/aclocal.m4
+++ b/libraries/edje/aclocal.m4
@@ -13,14 +13,13 @@
13 13
14m4_ifndef([AC_AUTOCONF_VERSION], 14m4_ifndef([AC_AUTOCONF_VERSION],
15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 15 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, 16m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
17[m4_warning([this file was generated for autoconf 2.67. 17[m4_warning([this file was generated for autoconf 2.65.
18You have another version of autoconf. It may work, but is not guaranteed to. 18You have another version of autoconf. It may work, but is not guaranteed to.
19If you have problems, you may need to regenerate the build system entirely. 19If you have problems, you may need to regenerate the build system entirely.
20To do so, use the procedure documented by the package, typically `autoreconf'.])]) 20To do so, use the procedure documented by the package, typically `autoreconf'.])])
21 21
22# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 22# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
23# serial 1 (pkg-config-0.24)
24# 23#
25# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 24# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
26# 25#
@@ -48,10 +47,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
48AC_DEFUN([PKG_PROG_PKG_CONFIG], 47AC_DEFUN([PKG_PROG_PKG_CONFIG],
49[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) 48[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
50m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) 49m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
51AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) 50AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
52AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
53AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
54
55if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then 51if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
56 AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) 52 AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
57fi 53fi
@@ -64,6 +60,7 @@ if test -n "$PKG_CONFIG"; then
64 AC_MSG_RESULT([no]) 60 AC_MSG_RESULT([no])
65 PKG_CONFIG="" 61 PKG_CONFIG=""
66 fi 62 fi
63
67fi[]dnl 64fi[]dnl
68])# PKG_PROG_PKG_CONFIG 65])# PKG_PROG_PKG_CONFIG
69 66
@@ -72,31 +69,34 @@ fi[]dnl
72# Check to see whether a particular set of modules exists. Similar 69# Check to see whether a particular set of modules exists. Similar
73# to PKG_CHECK_MODULES(), but does not set variables or print errors. 70# to PKG_CHECK_MODULES(), but does not set variables or print errors.
74# 71#
75# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 72#
76# only at the first occurence in configure.ac, so if the first place 73# Similar to PKG_CHECK_MODULES, make sure that the first instance of
77# it's called might be skipped (such as if it is within an "if", you 74# this or PKG_CHECK_MODULES is called, or make sure to call
78# have to call PKG_CHECK_EXISTS manually 75# PKG_CHECK_EXISTS manually
79# -------------------------------------------------------------- 76# --------------------------------------------------------------
80AC_DEFUN([PKG_CHECK_EXISTS], 77AC_DEFUN([PKG_CHECK_EXISTS],
81[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl 78[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
82if test -n "$PKG_CONFIG" && \ 79if test -n "$PKG_CONFIG" && \
83 AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then 80 AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
84 m4_default([$2], [:]) 81 m4_ifval([$2], [$2], [:])
85m4_ifvaln([$3], [else 82m4_ifvaln([$3], [else
86 $3])dnl 83 $3])dnl
87fi]) 84fi])
88 85
86
89# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) 87# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
90# --------------------------------------------- 88# ---------------------------------------------
91m4_define([_PKG_CONFIG], 89m4_define([_PKG_CONFIG],
92[if test -n "$$1"; then 90[if test -n "$PKG_CONFIG"; then
93 pkg_cv_[]$1="$$1" 91 if test -n "$$1"; then
94 elif test -n "$PKG_CONFIG"; then 92 pkg_cv_[]$1="$$1"
95 PKG_CHECK_EXISTS([$3], 93 else
96 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], 94 PKG_CHECK_EXISTS([$3],
97 [pkg_failed=yes]) 95 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
98 else 96 [pkg_failed=yes])
99 pkg_failed=untried 97 fi
98else
99 pkg_failed=untried
100fi[]dnl 100fi[]dnl
101])# _PKG_CONFIG 101])# _PKG_CONFIG
102 102
@@ -138,17 +138,16 @@ and $1[]_LIBS to avoid the need to call pkg-config.
138See the pkg-config man page for more details.]) 138See the pkg-config man page for more details.])
139 139
140if test $pkg_failed = yes; then 140if test $pkg_failed = yes; then
141 AC_MSG_RESULT([no])
142 _PKG_SHORT_ERRORS_SUPPORTED 141 _PKG_SHORT_ERRORS_SUPPORTED
143 if test $_pkg_short_errors_supported = yes; then 142 if test $_pkg_short_errors_supported = yes; then
144 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` 143 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
145 else 144 else
146 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` 145 $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
147 fi 146 fi
148 # Put the nasty error message in config.log where it belongs 147 # Put the nasty error message in config.log where it belongs
149 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD 148 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
150 149
151 m4_default([$4], [AC_MSG_ERROR( 150 ifelse([$4], , [AC_MSG_ERROR(dnl
152[Package requirements ($2) were not met: 151[Package requirements ($2) were not met:
153 152
154$$1_PKG_ERRORS 153$$1_PKG_ERRORS
@@ -156,24 +155,25 @@ $$1_PKG_ERRORS
156Consider adjusting the PKG_CONFIG_PATH environment variable if you 155Consider adjusting the PKG_CONFIG_PATH environment variable if you
157installed software in a non-standard prefix. 156installed software in a non-standard prefix.
158 157
159_PKG_TEXT])[]dnl 158_PKG_TEXT
160 ]) 159])],
160 [AC_MSG_RESULT([no])
161 $4])
161elif test $pkg_failed = untried; then 162elif test $pkg_failed = untried; then
162 AC_MSG_RESULT([no]) 163 ifelse([$4], , [AC_MSG_FAILURE(dnl
163 m4_default([$4], [AC_MSG_FAILURE(
164[The pkg-config script could not be found or is too old. Make sure it 164[The pkg-config script could not be found or is too old. Make sure it
165is in your PATH or set the PKG_CONFIG environment variable to the full 165is in your PATH or set the PKG_CONFIG environment variable to the full
166path to pkg-config. 166path to pkg-config.
167 167
168_PKG_TEXT 168_PKG_TEXT
169 169
170To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl 170To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
171 ]) 171 [$4])
172else 172else
173 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS 173 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
174 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS 174 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
175 AC_MSG_RESULT([yes]) 175 AC_MSG_RESULT([yes])
176 $3 176 ifelse([$3], , :, [$3])
177fi[]dnl 177fi[]dnl
178])# PKG_CHECK_MODULES 178])# PKG_CHECK_MODULES
179 179
@@ -968,7 +968,7 @@ AC_DEFUN([AM_PATH_PYTHON],
968 dnl Find a Python interpreter. Python versions prior to 2.0 are not 968 dnl Find a Python interpreter. Python versions prior to 2.0 are not
969 dnl supported. (2.0 was released on October 16, 2000). 969 dnl supported. (2.0 was released on October 16, 2000).
970 m4_define_default([_AM_PYTHON_INTERPRETER_LIST], 970 m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
971 [python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl 971 [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl
972python2.1 python2.0]) 972python2.1 python2.0])
973 973
974 m4_if([$1],[],[ 974 m4_if([$1],[],[
diff --git a/libraries/edje/configure b/libraries/edje/configure
index 3b234ef..c763308 100755
--- a/libraries/edje/configure
+++ b/libraries/edje/configure
@@ -1,13 +1,13 @@
1#! /bin/sh 1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles. 2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.67 for edje 1.1.0. 3# Generated by GNU Autoconf 2.65 for edje 1.1.99.67344.
4# 4#
5# Report bugs to <enlightenment-devel@lists.sourceforge.net>. 5# Report bugs to <enlightenment-devel@lists.sourceforge.net>.
6# 6#
7# 7#
8# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 8# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
9# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software 9# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
10# Foundation, Inc. 10# Inc.
11# 11#
12# 12#
13# This configure script is free software; the Free Software Foundation 13# This configure script is free software; the Free Software Foundation
@@ -319,7 +319,7 @@ $as_echo X"$as_dir" |
319 test -d "$as_dir" && break 319 test -d "$as_dir" && break
320 done 320 done
321 test -z "$as_dirs" || eval "mkdir $as_dirs" 321 test -z "$as_dirs" || eval "mkdir $as_dirs"
322 } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 322 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
323 323
324 324
325} # as_fn_mkdir_p 325} # as_fn_mkdir_p
@@ -359,19 +359,19 @@ else
359fi # as_fn_arith 359fi # as_fn_arith
360 360
361 361
362# as_fn_error STATUS ERROR [LINENO LOG_FD] 362# as_fn_error ERROR [LINENO LOG_FD]
363# ---------------------------------------- 363# ---------------------------------
364# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 364# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
365# provided, also output the error to LOG_FD, referencing LINENO. Then exit the 365# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
366# script with STATUS, using 1 if that was 0. 366# script with status $?, using 1 if that was 0.
367as_fn_error () 367as_fn_error ()
368{ 368{
369 as_status=$1; test $as_status -eq 0 && as_status=1 369 as_status=$?; test $as_status -eq 0 && as_status=1
370 if test "$4"; then 370 if test "$3"; then
371 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 371 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
372 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 372 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
373 fi 373 fi
374 $as_echo "$as_me: error: $2" >&2 374 $as_echo "$as_me: error: $1" >&2
375 as_fn_exit $as_status 375 as_fn_exit $as_status
376} # as_fn_error 376} # as_fn_error
377 377
@@ -682,7 +682,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
682exec 6>&1 682exec 6>&1
683 683
684# Name of the host. 684# Name of the host.
685# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, 685# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
686# so uname gets run too. 686# so uname gets run too.
687ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` 687ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
688 688
@@ -701,8 +701,8 @@ MAKEFLAGS=
701# Identity of this package. 701# Identity of this package.
702PACKAGE_NAME='edje' 702PACKAGE_NAME='edje'
703PACKAGE_TARNAME='edje' 703PACKAGE_TARNAME='edje'
704PACKAGE_VERSION='1.1.0' 704PACKAGE_VERSION='1.1.99.67344'
705PACKAGE_STRING='edje 1.1.0' 705PACKAGE_STRING='edje 1.1.99.67344'
706PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net' 706PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
707PACKAGE_URL='' 707PACKAGE_URL=''
708 708
@@ -751,8 +751,6 @@ requirement_edje
751BUILD_EXAMPLES_FALSE 751BUILD_EXAMPLES_FALSE
752BUILD_EXAMPLES_TRUE 752BUILD_EXAMPLES_TRUE
753edje_cc 753edje_cc
754INSTALL_EXAMPLES_FALSE
755INSTALL_EXAMPLES_TRUE
756EFL_ENABLE_COVERAGE_FALSE 754EFL_ENABLE_COVERAGE_FALSE
757EFL_ENABLE_COVERAGE_TRUE 755EFL_ENABLE_COVERAGE_TRUE
758EFL_COVERAGE_LIBS 756EFL_COVERAGE_LIBS
@@ -808,8 +806,6 @@ EFL_EDJE_BUILD
808EVIL_LIBS 806EVIL_LIBS
809EVIL_CFLAGS 807EVIL_CFLAGS
810pkgconfig_requires_private 808pkgconfig_requires_private
811PKG_CONFIG_LIBDIR
812PKG_CONFIG_PATH
813PKG_CONFIG 809PKG_CONFIG
814HAVE_PYTHON_FALSE 810HAVE_PYTHON_FALSE
815HAVE_PYTHON_TRUE 811HAVE_PYTHON_TRUE
@@ -990,13 +986,13 @@ enable_fixed_point
990with_vim 986with_vim
991enable_doc 987enable_doc
992with_doxygen 988with_doxygen
989enable_multisense
993enable_sndfile 990enable_sndfile
994enable_remix 991enable_remix
995enable_vorbisenc 992enable_vorbisenc
996enable_flac 993enable_flac
997enable_tests 994enable_tests
998enable_coverage 995enable_coverage
999enable_install_examples
1000enable_build_examples 996enable_build_examples
1001' 997'
1002 ac_precious_vars='build_alias 998 ac_precious_vars='build_alias
@@ -1009,8 +1005,6 @@ LIBS
1009CPPFLAGS 1005CPPFLAGS
1010CPP 1006CPP
1011PKG_CONFIG 1007PKG_CONFIG
1012PKG_CONFIG_PATH
1013PKG_CONFIG_LIBDIR
1014EVIL_CFLAGS 1008EVIL_CFLAGS
1015EVIL_LIBS 1009EVIL_LIBS
1016LUA_CFLAGS 1010LUA_CFLAGS
@@ -1105,9 +1099,8 @@ do
1105 fi 1099 fi
1106 1100
1107 case $ac_option in 1101 case $ac_option in
1108 *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; 1102 *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
1109 *=) ac_optarg= ;; 1103 *) ac_optarg=yes ;;
1110 *) ac_optarg=yes ;;
1111 esac 1104 esac
1112 1105
1113 # Accept the important Cygnus configure options, so we can diagnose typos. 1106 # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1152,7 +1145,7 @@ do
1152 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` 1145 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
1153 # Reject names that are not valid shell variable names. 1146 # Reject names that are not valid shell variable names.
1154 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1147 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1155 as_fn_error $? "invalid feature name: $ac_useropt" 1148 as_fn_error "invalid feature name: $ac_useropt"
1156 ac_useropt_orig=$ac_useropt 1149 ac_useropt_orig=$ac_useropt
1157 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1150 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1158 case $ac_user_opts in 1151 case $ac_user_opts in
@@ -1178,7 +1171,7 @@ do
1178 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` 1171 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
1179 # Reject names that are not valid shell variable names. 1172 # Reject names that are not valid shell variable names.
1180 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1173 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1181 as_fn_error $? "invalid feature name: $ac_useropt" 1174 as_fn_error "invalid feature name: $ac_useropt"
1182 ac_useropt_orig=$ac_useropt 1175 ac_useropt_orig=$ac_useropt
1183 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1176 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1184 case $ac_user_opts in 1177 case $ac_user_opts in
@@ -1382,7 +1375,7 @@ do
1382 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` 1375 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1383 # Reject names that are not valid shell variable names. 1376 # Reject names that are not valid shell variable names.
1384 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1377 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1385 as_fn_error $? "invalid package name: $ac_useropt" 1378 as_fn_error "invalid package name: $ac_useropt"
1386 ac_useropt_orig=$ac_useropt 1379 ac_useropt_orig=$ac_useropt
1387 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1380 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1388 case $ac_user_opts in 1381 case $ac_user_opts in
@@ -1398,7 +1391,7 @@ do
1398 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` 1391 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1399 # Reject names that are not valid shell variable names. 1392 # Reject names that are not valid shell variable names.
1400 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && 1393 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1401 as_fn_error $? "invalid package name: $ac_useropt" 1394 as_fn_error "invalid package name: $ac_useropt"
1402 ac_useropt_orig=$ac_useropt 1395 ac_useropt_orig=$ac_useropt
1403 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` 1396 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1404 case $ac_user_opts in 1397 case $ac_user_opts in
@@ -1428,8 +1421,8 @@ do
1428 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) 1421 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
1429 x_libraries=$ac_optarg ;; 1422 x_libraries=$ac_optarg ;;
1430 1423
1431 -*) as_fn_error $? "unrecognized option: \`$ac_option' 1424 -*) as_fn_error "unrecognized option: \`$ac_option'
1432Try \`$0 --help' for more information" 1425Try \`$0 --help' for more information."
1433 ;; 1426 ;;
1434 1427
1435 *=*) 1428 *=*)
@@ -1437,7 +1430,7 @@ Try \`$0 --help' for more information"
1437 # Reject names that are not valid shell variable names. 1430 # Reject names that are not valid shell variable names.
1438 case $ac_envvar in #( 1431 case $ac_envvar in #(
1439 '' | [0-9]* | *[!_$as_cr_alnum]* ) 1432 '' | [0-9]* | *[!_$as_cr_alnum]* )
1440 as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; 1433 as_fn_error "invalid variable name: \`$ac_envvar'" ;;
1441 esac 1434 esac
1442 eval $ac_envvar=\$ac_optarg 1435 eval $ac_envvar=\$ac_optarg
1443 export $ac_envvar ;; 1436 export $ac_envvar ;;
@@ -1455,13 +1448,13 @@ done
1455 1448
1456if test -n "$ac_prev"; then 1449if test -n "$ac_prev"; then
1457 ac_option=--`echo $ac_prev | sed 's/_/-/g'` 1450 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
1458 as_fn_error $? "missing argument to $ac_option" 1451 as_fn_error "missing argument to $ac_option"
1459fi 1452fi
1460 1453
1461if test -n "$ac_unrecognized_opts"; then 1454if test -n "$ac_unrecognized_opts"; then
1462 case $enable_option_checking in 1455 case $enable_option_checking in
1463 no) ;; 1456 no) ;;
1464 fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; 1457 fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
1465 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; 1458 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
1466 esac 1459 esac
1467fi 1460fi
@@ -1484,7 +1477,7 @@ do
1484 [\\/$]* | ?:[\\/]* ) continue;; 1477 [\\/$]* | ?:[\\/]* ) continue;;
1485 NONE | '' ) case $ac_var in *prefix ) continue;; esac;; 1478 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
1486 esac 1479 esac
1487 as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" 1480 as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
1488done 1481done
1489 1482
1490# There might be people who depend on the old broken behavior: `$host' 1483# There might be people who depend on the old broken behavior: `$host'
@@ -1498,8 +1491,8 @@ target=$target_alias
1498if test "x$host_alias" != x; then 1491if test "x$host_alias" != x; then
1499 if test "x$build_alias" = x; then 1492 if test "x$build_alias" = x; then
1500 cross_compiling=maybe 1493 cross_compiling=maybe
1501 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. 1494 $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
1502 If a cross compiler is detected then cross compile mode will be used" >&2 1495 If a cross compiler is detected then cross compile mode will be used." >&2
1503 elif test "x$build_alias" != "x$host_alias"; then 1496 elif test "x$build_alias" != "x$host_alias"; then
1504 cross_compiling=yes 1497 cross_compiling=yes
1505 fi 1498 fi
@@ -1514,9 +1507,9 @@ test "$silent" = yes && exec 6>/dev/null
1514ac_pwd=`pwd` && test -n "$ac_pwd" && 1507ac_pwd=`pwd` && test -n "$ac_pwd" &&
1515ac_ls_di=`ls -di .` && 1508ac_ls_di=`ls -di .` &&
1516ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || 1509ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
1517 as_fn_error $? "working directory cannot be determined" 1510 as_fn_error "working directory cannot be determined"
1518test "X$ac_ls_di" = "X$ac_pwd_ls_di" || 1511test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1519 as_fn_error $? "pwd does not report name of working directory" 1512 as_fn_error "pwd does not report name of working directory"
1520 1513
1521 1514
1522# Find the source files, if location was not specified. 1515# Find the source files, if location was not specified.
@@ -1555,11 +1548,11 @@ else
1555fi 1548fi
1556if test ! -r "$srcdir/$ac_unique_file"; then 1549if test ! -r "$srcdir/$ac_unique_file"; then
1557 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." 1550 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1558 as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" 1551 as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
1559fi 1552fi
1560ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" 1553ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1561ac_abs_confdir=`( 1554ac_abs_confdir=`(
1562 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" 1555 cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
1563 pwd)` 1556 pwd)`
1564# When building in place, set srcdir=. 1557# When building in place, set srcdir=.
1565if test "$ac_abs_confdir" = "$ac_pwd"; then 1558if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1585,7 +1578,7 @@ if test "$ac_init_help" = "long"; then
1585 # Omit some internal or obsolete options to make the list less imposing. 1578 # Omit some internal or obsolete options to make the list less imposing.
1586 # This message is too long to be a string in the A/UX 3.1 sh. 1579 # This message is too long to be a string in the A/UX 3.1 sh.
1587 cat <<_ACEOF 1580 cat <<_ACEOF
1588\`configure' configures edje 1.1.0 to adapt to many kinds of systems. 1581\`configure' configures edje 1.1.99.67344 to adapt to many kinds of systems.
1589 1582
1590Usage: $0 [OPTION]... [VAR=VALUE]... 1583Usage: $0 [OPTION]... [VAR=VALUE]...
1591 1584
@@ -1599,7 +1592,7 @@ Configuration:
1599 --help=short display options specific to this package 1592 --help=short display options specific to this package
1600 --help=recursive display the short help of all the included packages 1593 --help=recursive display the short help of all the included packages
1601 -V, --version display version information and exit 1594 -V, --version display version information and exit
1602 -q, --quiet, --silent do not print \`checking ...' messages 1595 -q, --quiet, --silent do not print \`checking...' messages
1603 --cache-file=FILE cache test results in FILE [disabled] 1596 --cache-file=FILE cache test results in FILE [disabled]
1604 -C, --config-cache alias for \`--cache-file=config.cache' 1597 -C, --config-cache alias for \`--cache-file=config.cache'
1605 -n, --no-create do not create output files 1598 -n, --no-create do not create output files
@@ -1655,7 +1648,7 @@ fi
1655 1648
1656if test -n "$ac_init_help"; then 1649if test -n "$ac_init_help"; then
1657 case $ac_init_help in 1650 case $ac_init_help in
1658 short | recursive ) echo "Configuration of edje 1.1.0:";; 1651 short | recursive ) echo "Configuration of edje 1.1.99.67344:";;
1659 esac 1652 esac
1660 cat <<\_ACEOF 1653 cat <<\_ACEOF
1661 1654
@@ -1690,6 +1683,8 @@ Optional Features:
1690 --enable-fixed-point reduce use of FPU by using Fixed Point provided by 1683 --enable-fixed-point reduce use of FPU by using Fixed Point provided by
1691 Eina and Eet, [[default=disabled]] 1684 Eina and Eet, [[default=disabled]]
1692 --disable-doc Disable documentation build [default=enabled] 1685 --disable-doc Disable documentation build [default=enabled]
1686 --enable-multisense multisense provides sound. tone and haptic effects
1687 support, [[default=disabled]]
1693 --disable-sndfile disable sndfile support. [default=detect] 1688 --disable-sndfile disable sndfile support. [default=detect]
1694 --disable-remix disable remix support. [default=detect] 1689 --disable-remix disable remix support. [default=detect]
1695 --disable-vorbis disable ogg-vorbis support. [default=detect] 1690 --disable-vorbis disable ogg-vorbis support. [default=detect]
@@ -1698,9 +1693,6 @@ Optional Features:
1698 --enable-tests enable tests [default=disabled] 1693 --enable-tests enable tests [default=disabled]
1699 --enable-coverage enable coverage profiling instrumentation 1694 --enable-coverage enable coverage profiling instrumentation
1700 [default=disabled] 1695 [default=disabled]
1701 --disable-install-examples
1702 disable installing examples (compiled or just
1703 source). [default==enabled]
1704 --enable-build-examples Enable building examples. This requires extra 1696 --enable-build-examples Enable building examples. This requires extra
1705 denpendencies. If you don't have them installed yet, 1697 denpendencies. If you don't have them installed yet,
1706 don't build with this option or it will fail. Build 1698 don't build with this option or it will fail. Build
@@ -1726,10 +1718,6 @@ Some influential environment variables:
1726 you have headers in a nonstandard directory <include dir> 1718 you have headers in a nonstandard directory <include dir>
1727 CPP C preprocessor 1719 CPP C preprocessor
1728 PKG_CONFIG path to pkg-config utility 1720 PKG_CONFIG path to pkg-config utility
1729 PKG_CONFIG_PATH
1730 directories to add to pkg-config's search path
1731 PKG_CONFIG_LIBDIR
1732 path overriding pkg-config's built-in search path
1733 EVIL_CFLAGS C compiler flags for EVIL, overriding pkg-config 1721 EVIL_CFLAGS C compiler flags for EVIL, overriding pkg-config
1734 EVIL_LIBS linker flags for EVIL, overriding pkg-config 1722 EVIL_LIBS linker flags for EVIL, overriding pkg-config
1735 LUA_CFLAGS C compiler flags for LUA, overriding pkg-config 1723 LUA_CFLAGS C compiler flags for LUA, overriding pkg-config
@@ -1850,10 +1838,10 @@ fi
1850test -n "$ac_init_help" && exit $ac_status 1838test -n "$ac_init_help" && exit $ac_status
1851if $ac_init_version; then 1839if $ac_init_version; then
1852 cat <<\_ACEOF 1840 cat <<\_ACEOF
1853edje configure 1.1.0 1841edje configure 1.1.99.67344
1854generated by GNU Autoconf 2.67 1842generated by GNU Autoconf 2.65
1855 1843
1856Copyright (C) 2010 Free Software Foundation, Inc. 1844Copyright (C) 2009 Free Software Foundation, Inc.
1857This configure script is free software; the Free Software Foundation 1845This configure script is free software; the Free Software Foundation
1858gives unlimited permission to copy, distribute and modify it. 1846gives unlimited permission to copy, distribute and modify it.
1859_ACEOF 1847_ACEOF
@@ -1957,7 +1945,7 @@ ac_fn_c_check_header_compile ()
1957 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1945 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1958 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1946 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1959$as_echo_n "checking for $2... " >&6; } 1947$as_echo_n "checking for $2... " >&6; }
1960if eval "test \"\${$3+set}\"" = set; then : 1948if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
1961 $as_echo_n "(cached) " >&6 1949 $as_echo_n "(cached) " >&6
1962else 1950else
1963 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1951 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2000,7 +1988,7 @@ $as_echo "$ac_try_echo"; } >&5
2000 mv -f conftest.er1 conftest.err 1988 mv -f conftest.er1 conftest.err
2001 fi 1989 fi
2002 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 1990 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
2003 test $ac_status = 0; } > conftest.i && { 1991 test $ac_status = 0; } >/dev/null && {
2004 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || 1992 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2005 test ! -s conftest.err 1993 test ! -s conftest.err
2006 }; then : 1994 }; then :
@@ -2066,7 +2054,7 @@ ac_fn_c_check_func ()
2066 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2054 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2067 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2055 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2068$as_echo_n "checking for $2... " >&6; } 2056$as_echo_n "checking for $2... " >&6; }
2069if eval "test \"\${$3+set}\"" = set; then : 2057if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2070 $as_echo_n "(cached) " >&6 2058 $as_echo_n "(cached) " >&6
2071else 2059else
2072 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2060 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2133,10 +2121,10 @@ $as_echo "$ac_res" >&6; }
2133ac_fn_c_check_header_mongrel () 2121ac_fn_c_check_header_mongrel ()
2134{ 2122{
2135 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2123 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
2136 if eval "test \"\${$3+set}\"" = set; then : 2124 if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2137 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2125 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2138$as_echo_n "checking for $2... " >&6; } 2126$as_echo_n "checking for $2... " >&6; }
2139if eval "test \"\${$3+set}\"" = set; then : 2127if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2140 $as_echo_n "(cached) " >&6 2128 $as_echo_n "(cached) " >&6
2141fi 2129fi
2142eval ac_res=\$$3 2130eval ac_res=\$$3
@@ -2172,7 +2160,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
2172else 2160else
2173 ac_header_preproc=no 2161 ac_header_preproc=no
2174fi 2162fi
2175rm -f conftest.err conftest.i conftest.$ac_ext 2163rm -f conftest.err conftest.$ac_ext
2176{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 2164{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
2177$as_echo "$ac_header_preproc" >&6; } 2165$as_echo "$ac_header_preproc" >&6; }
2178 2166
@@ -2195,15 +2183,17 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
2195$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} 2183$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
2196 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 2184 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
2197$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} 2185$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2198( $as_echo "## -------------------------------------------------------- ## 2186( cat <<\_ASBOX
2187## -------------------------------------------------------- ##
2199## Report this to enlightenment-devel@lists.sourceforge.net ## 2188## Report this to enlightenment-devel@lists.sourceforge.net ##
2200## -------------------------------------------------------- ##" 2189## -------------------------------------------------------- ##
2190_ASBOX
2201 ) | sed "s/^/$as_me: WARNING: /" >&2 2191 ) | sed "s/^/$as_me: WARNING: /" >&2
2202 ;; 2192 ;;
2203esac 2193esac
2204 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2194 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
2205$as_echo_n "checking for $2... " >&6; } 2195$as_echo_n "checking for $2... " >&6; }
2206if eval "test \"\${$3+set}\"" = set; then : 2196if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
2207 $as_echo_n "(cached) " >&6 2197 $as_echo_n "(cached) " >&6
2208else 2198else
2209 eval "$3=\$ac_header_compiler" 2199 eval "$3=\$ac_header_compiler"
@@ -2219,8 +2209,8 @@ cat >config.log <<_ACEOF
2219This file contains any messages produced by compilers while 2209This file contains any messages produced by compilers while
2220running configure, to aid debugging if configure makes a mistake. 2210running configure, to aid debugging if configure makes a mistake.
2221 2211
2222It was created by edje $as_me 1.1.0, which was 2212It was created by edje $as_me 1.1.99.67344, which was
2223generated by GNU Autoconf 2.67. Invocation command line was 2213generated by GNU Autoconf 2.65. Invocation command line was
2224 2214
2225 $ $0 $@ 2215 $ $0 $@
2226 2216
@@ -2330,9 +2320,11 @@ trap 'exit_status=$?
2330 { 2320 {
2331 echo 2321 echo
2332 2322
2333 $as_echo "## ---------------- ## 2323 cat <<\_ASBOX
2324## ---------------- ##
2334## Cache variables. ## 2325## Cache variables. ##
2335## ---------------- ##" 2326## ---------------- ##
2327_ASBOX
2336 echo 2328 echo
2337 # The following way of writing the cache mishandles newlines in values, 2329 # The following way of writing the cache mishandles newlines in values,
2338( 2330(
@@ -2366,9 +2358,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2366) 2358)
2367 echo 2359 echo
2368 2360
2369 $as_echo "## ----------------- ## 2361 cat <<\_ASBOX
2362## ----------------- ##
2370## Output variables. ## 2363## Output variables. ##
2371## ----------------- ##" 2364## ----------------- ##
2365_ASBOX
2372 echo 2366 echo
2373 for ac_var in $ac_subst_vars 2367 for ac_var in $ac_subst_vars
2374 do 2368 do
@@ -2381,9 +2375,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2381 echo 2375 echo
2382 2376
2383 if test -n "$ac_subst_files"; then 2377 if test -n "$ac_subst_files"; then
2384 $as_echo "## ------------------- ## 2378 cat <<\_ASBOX
2379## ------------------- ##
2385## File substitutions. ## 2380## File substitutions. ##
2386## ------------------- ##" 2381## ------------------- ##
2382_ASBOX
2387 echo 2383 echo
2388 for ac_var in $ac_subst_files 2384 for ac_var in $ac_subst_files
2389 do 2385 do
@@ -2397,9 +2393,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
2397 fi 2393 fi
2398 2394
2399 if test -s confdefs.h; then 2395 if test -s confdefs.h; then
2400 $as_echo "## ----------- ## 2396 cat <<\_ASBOX
2397## ----------- ##
2401## confdefs.h. ## 2398## confdefs.h. ##
2402## ----------- ##" 2399## ----------- ##
2400_ASBOX
2403 echo 2401 echo
2404 cat confdefs.h 2402 cat confdefs.h
2405 echo 2403 echo
@@ -2454,12 +2452,7 @@ _ACEOF
2454ac_site_file1=NONE 2452ac_site_file1=NONE
2455ac_site_file2=NONE 2453ac_site_file2=NONE
2456if test -n "$CONFIG_SITE"; then 2454if test -n "$CONFIG_SITE"; then
2457 # We do not want a PATH search for config.site. 2455 ac_site_file1=$CONFIG_SITE
2458 case $CONFIG_SITE in #((
2459 -*) ac_site_file1=./$CONFIG_SITE;;
2460 */*) ac_site_file1=$CONFIG_SITE;;
2461 *) ac_site_file1=./$CONFIG_SITE;;
2462 esac
2463elif test "x$prefix" != xNONE; then 2456elif test "x$prefix" != xNONE; then
2464 ac_site_file1=$prefix/share/config.site 2457 ac_site_file1=$prefix/share/config.site
2465 ac_site_file2=$prefix/etc/config.site 2458 ac_site_file2=$prefix/etc/config.site
@@ -2474,11 +2467,7 @@ do
2474 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 2467 { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
2475$as_echo "$as_me: loading site script $ac_site_file" >&6;} 2468$as_echo "$as_me: loading site script $ac_site_file" >&6;}
2476 sed 's/^/| /' "$ac_site_file" >&5 2469 sed 's/^/| /' "$ac_site_file" >&5
2477 . "$ac_site_file" \ 2470 . "$ac_site_file"
2478 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
2479$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2480as_fn_error $? "failed to load site script $ac_site_file
2481See \`config.log' for more details" "$LINENO" 5 ; }
2482 fi 2471 fi
2483done 2472done
2484 2473
@@ -2554,7 +2543,7 @@ if $ac_cache_corrupted; then
2554$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2543$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2555 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 2544 { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
2556$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} 2545$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
2557 as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 2546 as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
2558fi 2547fi
2559## -------------------- ## 2548## -------------------- ##
2560## Main body of script. ## 2549## Main body of script. ##
@@ -2580,22 +2569,16 @@ am__api_version='1.11'
2580 2569
2581ac_aux_dir= 2570ac_aux_dir=
2582for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do 2571for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
2583 if test -f "$ac_dir/install-sh"; then 2572 for ac_t in install-sh install.sh shtool; do
2584 ac_aux_dir=$ac_dir 2573 if test -f "$ac_dir/$ac_t"; then
2585 ac_install_sh="$ac_aux_dir/install-sh -c" 2574 ac_aux_dir=$ac_dir
2586 break 2575 ac_install_sh="$ac_aux_dir/$ac_t -c"
2587 elif test -f "$ac_dir/install.sh"; then 2576 break 2
2588 ac_aux_dir=$ac_dir 2577 fi
2589 ac_install_sh="$ac_aux_dir/install.sh -c" 2578 done
2590 break
2591 elif test -f "$ac_dir/shtool"; then
2592 ac_aux_dir=$ac_dir
2593 ac_install_sh="$ac_aux_dir/shtool install -c"
2594 break
2595 fi
2596done 2579done
2597if test -z "$ac_aux_dir"; then 2580if test -z "$ac_aux_dir"; then
2598 as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 2581 as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
2599fi 2582fi
2600 2583
2601# These three variables are undocumented and unsupported, 2584# These three variables are undocumented and unsupported,
@@ -2711,11 +2694,11 @@ am_lf='
2711' 2694'
2712case `pwd` in 2695case `pwd` in
2713 *[\\\"\#\$\&\'\`$am_lf]*) 2696 *[\\\"\#\$\&\'\`$am_lf]*)
2714 as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; 2697 as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
2715esac 2698esac
2716case $srcdir in 2699case $srcdir in
2717 *[\\\"\#\$\&\'\`$am_lf\ \ ]*) 2700 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
2718 as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; 2701 as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2719esac 2702esac
2720 2703
2721# Do `set' in a subshell so we don't clobber the current shell's 2704# Do `set' in a subshell so we don't clobber the current shell's
@@ -2737,7 +2720,7 @@ if (
2737 # if, for instance, CONFIG_SHELL is bash and it inherits a 2720 # if, for instance, CONFIG_SHELL is bash and it inherits a
2738 # broken ls alias from the environment. This has actually 2721 # broken ls alias from the environment. This has actually
2739 # happened. Such a system could not be considered "sane". 2722 # happened. Such a system could not be considered "sane".
2740 as_fn_error $? "ls -t appears to fail. Make sure there is not a broken 2723 as_fn_error "ls -t appears to fail. Make sure there is not a broken
2741alias in your environment" "$LINENO" 5 2724alias in your environment" "$LINENO" 5
2742 fi 2725 fi
2743 2726
@@ -2747,7 +2730,7 @@ then
2747 # Ok. 2730 # Ok.
2748 : 2731 :
2749else 2732else
2750 as_fn_error $? "newly created file is older than distributed files! 2733 as_fn_error "newly created file is older than distributed files!
2751Check your system clock" "$LINENO" 5 2734Check your system clock" "$LINENO" 5
2752fi 2735fi
2753{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 2736{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2985,7 +2968,7 @@ done
2985$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } 2968$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
2986set x ${MAKE-make} 2969set x ${MAKE-make}
2987ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` 2970ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
2988if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : 2971if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
2989 $as_echo_n "(cached) " >&6 2972 $as_echo_n "(cached) " >&6
2990else 2973else
2991 cat >conftest.make <<\_ACEOF 2974 cat >conftest.make <<\_ACEOF
@@ -2993,7 +2976,7 @@ SHELL = /bin/sh
2993all: 2976all:
2994 @echo '@@@%%%=$(MAKE)=@@@%%%' 2977 @echo '@@@%%%=$(MAKE)=@@@%%%'
2995_ACEOF 2978_ACEOF
2996# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. 2979# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
2997case `${MAKE-make} -f conftest.make 2>/dev/null` in 2980case `${MAKE-make} -f conftest.make 2>/dev/null` in
2998 *@@@%%%=?*=@@@%%%*) 2981 *@@@%%%=?*=@@@%%%*)
2999 eval ac_cv_prog_make_${ac_make}_set=yes;; 2982 eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -3027,7 +3010,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
3027 am__isrc=' -I$(srcdir)' 3010 am__isrc=' -I$(srcdir)'
3028 # test to see if srcdir already configured 3011 # test to see if srcdir already configured
3029 if test -f $srcdir/config.status; then 3012 if test -f $srcdir/config.status; then
3030 as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 3013 as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
3031 fi 3014 fi
3032fi 3015fi
3033 3016
@@ -3043,7 +3026,7 @@ fi
3043 3026
3044# Define the identity of the package. 3027# Define the identity of the package.
3045 PACKAGE='edje' 3028 PACKAGE='edje'
3046 VERSION='1.1.0' 3029 VERSION='1.1.99.67344'
3047 3030
3048 3031
3049cat >>confdefs.h <<_ACEOF 3032cat >>confdefs.h <<_ACEOF
@@ -3098,7 +3081,7 @@ AM_BACKSLASH='\'
3098 3081
3099# Make sure we can run config.sub. 3082# Make sure we can run config.sub.
3100$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || 3083$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
3101 as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 3084 as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
3102 3085
3103{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 3086{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
3104$as_echo_n "checking build system type... " >&6; } 3087$as_echo_n "checking build system type... " >&6; }
@@ -3109,16 +3092,16 @@ else
3109test "x$ac_build_alias" = x && 3092test "x$ac_build_alias" = x &&
3110 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` 3093 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
3111test "x$ac_build_alias" = x && 3094test "x$ac_build_alias" = x &&
3112 as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 3095 as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
3113ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || 3096ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
3114 as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 3097 as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
3115 3098
3116fi 3099fi
3117{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 3100{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
3118$as_echo "$ac_cv_build" >&6; } 3101$as_echo "$ac_cv_build" >&6; }
3119case $ac_cv_build in 3102case $ac_cv_build in
3120*-*-*) ;; 3103*-*-*) ;;
3121*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 3104*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
3122esac 3105esac
3123build=$ac_cv_build 3106build=$ac_cv_build
3124ac_save_IFS=$IFS; IFS='-' 3107ac_save_IFS=$IFS; IFS='-'
@@ -3143,7 +3126,7 @@ else
3143 ac_cv_host=$ac_cv_build 3126 ac_cv_host=$ac_cv_build
3144else 3127else
3145 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || 3128 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
3146 as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 3129 as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
3147fi 3130fi
3148 3131
3149fi 3132fi
@@ -3151,7 +3134,7 @@ fi
3151$as_echo "$ac_cv_host" >&6; } 3134$as_echo "$ac_cv_host" >&6; }
3152case $ac_cv_host in 3135case $ac_cv_host in
3153*-*-*) ;; 3136*-*-*) ;;
3154*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 3137*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
3155esac 3138esac
3156host=$ac_cv_host 3139host=$ac_cv_host
3157ac_save_IFS=$IFS; IFS='-' 3140ac_save_IFS=$IFS; IFS='-'
@@ -3170,7 +3153,7 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
3170enable_win32_dll=yes 3153enable_win32_dll=yes
3171 3154
3172case $host in 3155case $host in
3173*-*-cygwin* | *-*-mingw* | *-*-pw32*) 3156*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
3174 if test -n "$ac_tool_prefix"; then 3157 if test -n "$ac_tool_prefix"; then
3175 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. 3158 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
3176set dummy ${ac_tool_prefix}as; ac_word=$2 3159set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -3857,8 +3840,8 @@ fi
3857 3840
3858test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3841test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3859$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3842$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3860as_fn_error $? "no acceptable C compiler found in \$PATH 3843as_fn_error "no acceptable C compiler found in \$PATH
3861See \`config.log' for more details" "$LINENO" 5 ; } 3844See \`config.log' for more details." "$LINENO" 5; }
3862 3845
3863# Provide some information about the compiler. 3846# Provide some information about the compiler.
3864$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 3847$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3972,8 +3955,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
3972 3955
3973{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3956{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
3974$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3957$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3975as_fn_error 77 "C compiler cannot create executables 3958{ as_fn_set_status 77
3976See \`config.log' for more details" "$LINENO" 5 ; } 3959as_fn_error "C compiler cannot create executables
3960See \`config.log' for more details." "$LINENO" 5; }; }
3977else 3961else
3978 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 3962 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3979$as_echo "yes" >&6; } 3963$as_echo "yes" >&6; }
@@ -4015,8 +3999,8 @@ done
4015else 3999else
4016 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4000 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4017$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4001$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4018as_fn_error $? "cannot compute suffix of executables: cannot compile and link 4002as_fn_error "cannot compute suffix of executables: cannot compile and link
4019See \`config.log' for more details" "$LINENO" 5 ; } 4003See \`config.log' for more details." "$LINENO" 5; }
4020fi 4004fi
4021rm -f conftest conftest$ac_cv_exeext 4005rm -f conftest conftest$ac_cv_exeext
4022{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 4006{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4073,9 +4057,9 @@ $as_echo "$ac_try_echo"; } >&5
4073 else 4057 else
4074 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4058 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4075$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4059$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4076as_fn_error $? "cannot run C compiled programs. 4060as_fn_error "cannot run C compiled programs.
4077If you meant to cross compile, use \`--host'. 4061If you meant to cross compile, use \`--host'.
4078See \`config.log' for more details" "$LINENO" 5 ; } 4062See \`config.log' for more details." "$LINENO" 5; }
4079 fi 4063 fi
4080 fi 4064 fi
4081fi 4065fi
@@ -4126,8 +4110,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
4126 4110
4127{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 4111{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
4128$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 4112$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
4129as_fn_error $? "cannot compute suffix of object files: cannot compile 4113as_fn_error "cannot compute suffix of object files: cannot compile
4130See \`config.log' for more details" "$LINENO" 5 ; } 4114See \`config.log' for more details." "$LINENO" 5; }
4131fi 4115fi
4132rm -f conftest.$ac_cv_objext conftest.$ac_ext 4116rm -f conftest.$ac_cv_objext conftest.$ac_ext
4133fi 4117fi
@@ -4531,7 +4515,7 @@ esac
4531 done 4515 done
4532IFS=$as_save_IFS 4516IFS=$as_save_IFS
4533 if test -z "$ac_cv_path_SED"; then 4517 if test -z "$ac_cv_path_SED"; then
4534 as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 4518 as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
4535 fi 4519 fi
4536else 4520else
4537 ac_cv_path_SED=$SED 4521 ac_cv_path_SED=$SED
@@ -4607,7 +4591,7 @@ esac
4607 done 4591 done
4608IFS=$as_save_IFS 4592IFS=$as_save_IFS
4609 if test -z "$ac_cv_path_GREP"; then 4593 if test -z "$ac_cv_path_GREP"; then
4610 as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4594 as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4611 fi 4595 fi
4612else 4596else
4613 ac_cv_path_GREP=$GREP 4597 ac_cv_path_GREP=$GREP
@@ -4673,7 +4657,7 @@ esac
4673 done 4657 done
4674IFS=$as_save_IFS 4658IFS=$as_save_IFS
4675 if test -z "$ac_cv_path_EGREP"; then 4659 if test -z "$ac_cv_path_EGREP"; then
4676 as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4660 as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4677 fi 4661 fi
4678else 4662else
4679 ac_cv_path_EGREP=$EGREP 4663 ac_cv_path_EGREP=$EGREP
@@ -4740,7 +4724,7 @@ esac
4740 done 4724 done
4741IFS=$as_save_IFS 4725IFS=$as_save_IFS
4742 if test -z "$ac_cv_path_FGREP"; then 4726 if test -z "$ac_cv_path_FGREP"; then
4743 as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 4727 as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
4744 fi 4728 fi
4745else 4729else
4746 ac_cv_path_FGREP=$FGREP 4730 ac_cv_path_FGREP=$FGREP
@@ -4856,7 +4840,7 @@ else
4856 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4840 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4857$as_echo "no" >&6; } 4841$as_echo "no" >&6; }
4858fi 4842fi
4859test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 4843test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
4860{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 4844{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
4861$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } 4845$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
4862if test "${lt_cv_prog_gnu_ld+set}" = set; then : 4846if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -5058,13 +5042,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
5058else 5042else
5059 lt_cv_nm_interface="BSD nm" 5043 lt_cv_nm_interface="BSD nm"
5060 echo "int some_variable = 0;" > conftest.$ac_ext 5044 echo "int some_variable = 0;" > conftest.$ac_ext
5061 (eval echo "\"\$as_me:5061: $ac_compile\"" >&5) 5045 (eval echo "\"\$as_me:5045: $ac_compile\"" >&5)
5062 (eval "$ac_compile" 2>conftest.err) 5046 (eval "$ac_compile" 2>conftest.err)
5063 cat conftest.err >&5 5047 cat conftest.err >&5
5064 (eval echo "\"\$as_me:5064: $NM \\\"conftest.$ac_objext\\\"\"" >&5) 5048 (eval echo "\"\$as_me:5048: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
5065 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) 5049 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
5066 cat conftest.err >&5 5050 cat conftest.err >&5
5067 (eval echo "\"\$as_me:5067: output\"" >&5) 5051 (eval echo "\"\$as_me:5051: output\"" >&5)
5068 cat conftest.out >&5 5052 cat conftest.out >&5
5069 if $GREP 'External.*some_variable' conftest.out > /dev/null; then 5053 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
5070 lt_cv_nm_interface="MS dumpbin" 5054 lt_cv_nm_interface="MS dumpbin"
@@ -5110,7 +5094,7 @@ else
5110 lt_cv_sys_max_cmd_len=-1; 5094 lt_cv_sys_max_cmd_len=-1;
5111 ;; 5095 ;;
5112 5096
5113 cygwin* | mingw*) 5097 cygwin* | mingw* | cegcc*)
5114 # On Win9x/ME, this test blows up -- it succeeds, but takes 5098 # On Win9x/ME, this test blows up -- it succeeds, but takes
5115 # about 5 minutes as the teststring grows exponentially. 5099 # about 5 minutes as the teststring grows exponentially.
5116 # Worse, since 9x/ME are not pre-emptively multitasking, 5100 # Worse, since 9x/ME are not pre-emptively multitasking,
@@ -5311,6 +5295,104 @@ esac
5311 5295
5312 5296
5313 5297
5298if test -n "$ac_tool_prefix"; then
5299 # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
5300set dummy ${ac_tool_prefix}objdump; ac_word=$2
5301{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5302$as_echo_n "checking for $ac_word... " >&6; }
5303if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
5304 $as_echo_n "(cached) " >&6
5305else
5306 if test -n "$OBJDUMP"; then
5307 ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
5308else
5309as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5310for as_dir in $PATH
5311do
5312 IFS=$as_save_IFS
5313 test -z "$as_dir" && as_dir=.
5314 for ac_exec_ext in '' $ac_executable_extensions; do
5315 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5316 ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
5317 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5318 break 2
5319 fi
5320done
5321 done
5322IFS=$as_save_IFS
5323
5324fi
5325fi
5326OBJDUMP=$ac_cv_prog_OBJDUMP
5327if test -n "$OBJDUMP"; then
5328 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
5329$as_echo "$OBJDUMP" >&6; }
5330else
5331 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5332$as_echo "no" >&6; }
5333fi
5334
5335
5336fi
5337if test -z "$ac_cv_prog_OBJDUMP"; then
5338 ac_ct_OBJDUMP=$OBJDUMP
5339 # Extract the first word of "objdump", so it can be a program name with args.
5340set dummy objdump; ac_word=$2
5341{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5342$as_echo_n "checking for $ac_word... " >&6; }
5343if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
5344 $as_echo_n "(cached) " >&6
5345else
5346 if test -n "$ac_ct_OBJDUMP"; then
5347 ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
5348else
5349as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5350for as_dir in $PATH
5351do
5352 IFS=$as_save_IFS
5353 test -z "$as_dir" && as_dir=.
5354 for ac_exec_ext in '' $ac_executable_extensions; do
5355 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5356 ac_cv_prog_ac_ct_OBJDUMP="objdump"
5357 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5358 break 2
5359 fi
5360done
5361 done
5362IFS=$as_save_IFS
5363
5364fi
5365fi
5366ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
5367if test -n "$ac_ct_OBJDUMP"; then
5368 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
5369$as_echo "$ac_ct_OBJDUMP" >&6; }
5370else
5371 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5372$as_echo "no" >&6; }
5373fi
5374
5375 if test "x$ac_ct_OBJDUMP" = x; then
5376 OBJDUMP="false"
5377 else
5378 case $cross_compiling:$ac_tool_warned in
5379yes:)
5380{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
5381$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
5382ac_tool_warned=yes ;;
5383esac
5384 OBJDUMP=$ac_ct_OBJDUMP
5385 fi
5386else
5387 OBJDUMP="$ac_cv_prog_OBJDUMP"
5388fi
5389
5390test -z "$OBJDUMP" && OBJDUMP=objdump
5391
5392
5393
5394
5395
5314 5396
5315{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 5397{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
5316$as_echo_n "checking how to recognize dependent libraries... " >&6; } 5398$as_echo_n "checking how to recognize dependent libraries... " >&6; }
@@ -5365,6 +5447,12 @@ mingw* | pw32*)
5365 fi 5447 fi
5366 ;; 5448 ;;
5367 5449
5450cegcc)
5451 # use the weaker test based on 'objdump'. See mingw*.
5452 lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
5453 lt_cv_file_magic_cmd='$OBJDUMP -f'
5454 ;;
5455
5368darwin* | rhapsody*) 5456darwin* | rhapsody*)
5369 lt_cv_deplibs_check_method=pass_all 5457 lt_cv_deplibs_check_method=pass_all
5370 ;; 5458 ;;
@@ -5423,7 +5511,7 @@ irix5* | irix6* | nonstopux*)
5423 ;; 5511 ;;
5424 5512
5425# This must be Linux ELF. 5513# This must be Linux ELF.
5426linux* | k*bsd*-gnu) 5514linux* | k*bsd*-gnu | kopensolaris*-gnu)
5427 lt_cv_deplibs_check_method=pass_all 5515 lt_cv_deplibs_check_method=pass_all
5428 ;; 5516 ;;
5429 5517
@@ -5903,7 +5991,7 @@ case $host_os in
5903aix*) 5991aix*)
5904 symcode='[BCDT]' 5992 symcode='[BCDT]'
5905 ;; 5993 ;;
5906cygwin* | mingw* | pw32*) 5994cygwin* | mingw* | pw32* | cegcc*)
5907 symcode='[ABCDGISTW]' 5995 symcode='[ABCDGISTW]'
5908 ;; 5996 ;;
5909hpux*) 5997hpux*)
@@ -6163,7 +6251,7 @@ ia64-*-hpux*)
6163 ;; 6251 ;;
6164*-*-irix6*) 6252*-*-irix6*)
6165 # Find out which ABI we are using. 6253 # Find out which ABI we are using.
6166 echo '#line 6166 "configure"' > conftest.$ac_ext 6254 echo '#line 6254 "configure"' > conftest.$ac_ext
6167 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 6255 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
6168 (eval $ac_compile) 2>&5 6256 (eval $ac_compile) 2>&5
6169 ac_status=$? 6257 ac_status=$?
@@ -6952,7 +7040,7 @@ else
6952 # Broken: fails on valid input. 7040 # Broken: fails on valid input.
6953continue 7041continue
6954fi 7042fi
6955rm -f conftest.err conftest.i conftest.$ac_ext 7043rm -f conftest.err conftest.$ac_ext
6956 7044
6957 # OK, works on sane cases. Now check whether nonexistent headers 7045 # OK, works on sane cases. Now check whether nonexistent headers
6958 # can be detected and how. 7046 # can be detected and how.
@@ -6968,11 +7056,11 @@ else
6968ac_preproc_ok=: 7056ac_preproc_ok=:
6969break 7057break
6970fi 7058fi
6971rm -f conftest.err conftest.i conftest.$ac_ext 7059rm -f conftest.err conftest.$ac_ext
6972 7060
6973done 7061done
6974# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 7062# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
6975rm -f conftest.i conftest.err conftest.$ac_ext 7063rm -f conftest.err conftest.$ac_ext
6976if $ac_preproc_ok; then : 7064if $ac_preproc_ok; then :
6977 break 7065 break
6978fi 7066fi
@@ -7011,7 +7099,7 @@ else
7011 # Broken: fails on valid input. 7099 # Broken: fails on valid input.
7012continue 7100continue
7013fi 7101fi
7014rm -f conftest.err conftest.i conftest.$ac_ext 7102rm -f conftest.err conftest.$ac_ext
7015 7103
7016 # OK, works on sane cases. Now check whether nonexistent headers 7104 # OK, works on sane cases. Now check whether nonexistent headers
7017 # can be detected and how. 7105 # can be detected and how.
@@ -7027,18 +7115,18 @@ else
7027ac_preproc_ok=: 7115ac_preproc_ok=:
7028break 7116break
7029fi 7117fi
7030rm -f conftest.err conftest.i conftest.$ac_ext 7118rm -f conftest.err conftest.$ac_ext
7031 7119
7032done 7120done
7033# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. 7121# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
7034rm -f conftest.i conftest.err conftest.$ac_ext 7122rm -f conftest.err conftest.$ac_ext
7035if $ac_preproc_ok; then : 7123if $ac_preproc_ok; then :
7036 7124
7037else 7125else
7038 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 7126 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
7039$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 7127$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
7040as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 7128as_fn_error "C preprocessor \"$CPP\" fails sanity check
7041See \`config.log' for more details" "$LINENO" 5 ; } 7129See \`config.log' for more details." "$LINENO" 5; }
7042fi 7130fi
7043 7131
7044ac_ext=c 7132ac_ext=c
@@ -7167,7 +7255,8 @@ do :
7167 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 7255 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
7168ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 7256ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
7169" 7257"
7170if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 7258eval as_val=\$$as_ac_Header
7259 if test "x$as_val" = x""yes; then :
7171 cat >>confdefs.h <<_ACEOF 7260 cat >>confdefs.h <<_ACEOF
7172#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 7261#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
7173_ACEOF 7262_ACEOF
@@ -7690,11 +7779,11 @@ else
7690 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 7779 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
7691 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7780 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
7692 -e 's:$: $lt_compiler_flag:'` 7781 -e 's:$: $lt_compiler_flag:'`
7693 (eval echo "\"\$as_me:7693: $lt_compile\"" >&5) 7782 (eval echo "\"\$as_me:7782: $lt_compile\"" >&5)
7694 (eval "$lt_compile" 2>conftest.err) 7783 (eval "$lt_compile" 2>conftest.err)
7695 ac_status=$? 7784 ac_status=$?
7696 cat conftest.err >&5 7785 cat conftest.err >&5
7697 echo "$as_me:7697: \$? = $ac_status" >&5 7786 echo "$as_me:7786: \$? = $ac_status" >&5
7698 if (exit $ac_status) && test -s "$ac_outfile"; then 7787 if (exit $ac_status) && test -s "$ac_outfile"; then
7699 # The compiler can only warn and ignore the option if not recognized 7788 # The compiler can only warn and ignore the option if not recognized
7700 # So say no if there are warnings other than the usual output. 7789 # So say no if there are warnings other than the usual output.
@@ -7762,7 +7851,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
7762 # PIC is the default for these OSes. 7851 # PIC is the default for these OSes.
7763 ;; 7852 ;;
7764 7853
7765 mingw* | cygwin* | pw32* | os2*) 7854 mingw* | cygwin* | pw32* | os2* | cegcc*)
7766 # This hack is so that the source file can tell whether it is being 7855 # This hack is so that the source file can tell whether it is being
7767 # built for inclusion in a dll (and should export symbols for example). 7856 # built for inclusion in a dll (and should export symbols for example).
7768 # Although the cygwin gcc ignores -fPIC, still need this for old-style 7857 # Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -7777,10 +7866,11 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
7777 ;; 7866 ;;
7778 7867
7779 hpux*) 7868 hpux*)
7780 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 7869 # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
7781 # not for PA HP-UX. 7870 # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
7871 # sets the default TLS model and affects inlining.
7782 case $host_cpu in 7872 case $host_cpu in
7783 hppa*64*|ia64*) 7873 hppa*64*)
7784 # +Z the default 7874 # +Z the default
7785 ;; 7875 ;;
7786 *) 7876 *)
@@ -7830,7 +7920,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
7830 fi 7920 fi
7831 ;; 7921 ;;
7832 7922
7833 mingw* | cygwin* | pw32* | os2*) 7923 mingw* | cygwin* | pw32* | os2* | cegcc*)
7834 # This hack is so that the source file can tell whether it is being 7924 # This hack is so that the source file can tell whether it is being
7835 # built for inclusion in a dll (and should export symbols for example). 7925 # built for inclusion in a dll (and should export symbols for example).
7836 lt_prog_compiler_pic='-DDLL_EXPORT' 7926 lt_prog_compiler_pic='-DDLL_EXPORT'
@@ -7858,13 +7948,27 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
7858 lt_prog_compiler_static='-non_shared' 7948 lt_prog_compiler_static='-non_shared'
7859 ;; 7949 ;;
7860 7950
7861 linux* | k*bsd*-gnu) 7951 linux* | k*bsd*-gnu | kopensolaris*-gnu)
7862 case $cc_basename in 7952 case $cc_basename in
7863 icc* | ecc* | ifort*) 7953 # old Intel for x86_64 which still supported -KPIC.
7954 ecc*)
7864 lt_prog_compiler_wl='-Wl,' 7955 lt_prog_compiler_wl='-Wl,'
7865 lt_prog_compiler_pic='-KPIC' 7956 lt_prog_compiler_pic='-KPIC'
7866 lt_prog_compiler_static='-static' 7957 lt_prog_compiler_static='-static'
7867 ;; 7958 ;;
7959 # icc used to be incompatible with GCC.
7960 # ICC 10 doesn't accept -KPIC any more.
7961 icc* | ifort*)
7962 lt_prog_compiler_wl='-Wl,'
7963 lt_prog_compiler_pic='-fPIC'
7964 lt_prog_compiler_static='-static'
7965 ;;
7966 # Lahey Fortran 8.1.
7967 lf95*)
7968 lt_prog_compiler_wl='-Wl,'
7969 lt_prog_compiler_pic='--shared'
7970 lt_prog_compiler_static='--static'
7971 ;;
7868 pgcc* | pgf77* | pgf90* | pgf95*) 7972 pgcc* | pgf77* | pgf90* | pgf95*)
7869 # Portland Group compilers (*not* the Pentium gcc compiler, 7973 # Portland Group compilers (*not* the Pentium gcc compiler,
7870 # which looks to be a dead project) 7974 # which looks to be a dead project)
@@ -8014,11 +8118,11 @@ else
8014 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 8118 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8015 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8119 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8016 -e 's:$: $lt_compiler_flag:'` 8120 -e 's:$: $lt_compiler_flag:'`
8017 (eval echo "\"\$as_me:8017: $lt_compile\"" >&5) 8121 (eval echo "\"\$as_me:8121: $lt_compile\"" >&5)
8018 (eval "$lt_compile" 2>conftest.err) 8122 (eval "$lt_compile" 2>conftest.err)
8019 ac_status=$? 8123 ac_status=$?
8020 cat conftest.err >&5 8124 cat conftest.err >&5
8021 echo "$as_me:8021: \$? = $ac_status" >&5 8125 echo "$as_me:8125: \$? = $ac_status" >&5
8022 if (exit $ac_status) && test -s "$ac_outfile"; then 8126 if (exit $ac_status) && test -s "$ac_outfile"; then
8023 # The compiler can only warn and ignore the option if not recognized 8127 # The compiler can only warn and ignore the option if not recognized
8024 # So say no if there are warnings other than the usual output. 8128 # So say no if there are warnings other than the usual output.
@@ -8119,11 +8223,11 @@ else
8119 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 8223 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8120 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8224 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8121 -e 's:$: $lt_compiler_flag:'` 8225 -e 's:$: $lt_compiler_flag:'`
8122 (eval echo "\"\$as_me:8122: $lt_compile\"" >&5) 8226 (eval echo "\"\$as_me:8226: $lt_compile\"" >&5)
8123 (eval "$lt_compile" 2>out/conftest.err) 8227 (eval "$lt_compile" 2>out/conftest.err)
8124 ac_status=$? 8228 ac_status=$?
8125 cat out/conftest.err >&5 8229 cat out/conftest.err >&5
8126 echo "$as_me:8126: \$? = $ac_status" >&5 8230 echo "$as_me:8230: \$? = $ac_status" >&5
8127 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8231 if (exit $ac_status) && test -s out/conftest2.$ac_objext
8128 then 8232 then
8129 # The compiler can only warn and ignore the option if not recognized 8233 # The compiler can only warn and ignore the option if not recognized
@@ -8174,11 +8278,11 @@ else
8174 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ 8278 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8175 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8279 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8176 -e 's:$: $lt_compiler_flag:'` 8280 -e 's:$: $lt_compiler_flag:'`
8177 (eval echo "\"\$as_me:8177: $lt_compile\"" >&5) 8281 (eval echo "\"\$as_me:8281: $lt_compile\"" >&5)
8178 (eval "$lt_compile" 2>out/conftest.err) 8282 (eval "$lt_compile" 2>out/conftest.err)
8179 ac_status=$? 8283 ac_status=$?
8180 cat out/conftest.err >&5 8284 cat out/conftest.err >&5
8181 echo "$as_me:8181: \$? = $ac_status" >&5 8285 echo "$as_me:8285: \$? = $ac_status" >&5
8182 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8286 if (exit $ac_status) && test -s out/conftest2.$ac_objext
8183 then 8287 then
8184 # The compiler can only warn and ignore the option if not recognized 8288 # The compiler can only warn and ignore the option if not recognized
@@ -8278,7 +8382,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
8278 extract_expsyms_cmds= 8382 extract_expsyms_cmds=
8279 8383
8280 case $host_os in 8384 case $host_os in
8281 cygwin* | mingw* | pw32*) 8385 cygwin* | mingw* | pw32* | cegcc*)
8282 # FIXME: the MSVC++ port hasn't been tested in a loooong time 8386 # FIXME: the MSVC++ port hasn't been tested in a loooong time
8283 # When not using gcc, we currently assume that we are using 8387 # When not using gcc, we currently assume that we are using
8284 # Microsoft Visual C++. 8388 # Microsoft Visual C++.
@@ -8293,6 +8397,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
8293 openbsd*) 8397 openbsd*)
8294 with_gnu_ld=no 8398 with_gnu_ld=no
8295 ;; 8399 ;;
8400 linux* | k*bsd*-gnu)
8401 link_all_deplibs=no
8402 ;;
8296 esac 8403 esac
8297 8404
8298 ld_shlibs=yes 8405 ld_shlibs=yes
@@ -8314,6 +8421,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
8314 fi 8421 fi
8315 supports_anon_versioning=no 8422 supports_anon_versioning=no
8316 case `$LD -v 2>&1` in 8423 case `$LD -v 2>&1` in
8424 *GNU\ gold*) supports_anon_versioning=yes ;;
8317 *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 8425 *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
8318 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... 8426 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
8319 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... 8427 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -8365,7 +8473,7 @@ _LT_EOF
8365 fi 8473 fi
8366 ;; 8474 ;;
8367 8475
8368 cygwin* | mingw* | pw32*) 8476 cygwin* | mingw* | pw32* | cegcc*)
8369 # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, 8477 # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
8370 # as there is no search path for DLLs. 8478 # as there is no search path for DLLs.
8371 hardcode_libdir_flag_spec='-L$libdir' 8479 hardcode_libdir_flag_spec='-L$libdir'
@@ -8405,7 +8513,7 @@ _LT_EOF
8405 archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' 8513 archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
8406 ;; 8514 ;;
8407 8515
8408 gnu* | linux* | tpf* | k*bsd*-gnu) 8516 gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
8409 tmp_diet=no 8517 tmp_diet=no
8410 if test "$host_os" = linux-dietlibc; then 8518 if test "$host_os" = linux-dietlibc; then
8411 case $cc_basename in 8519 case $cc_basename in
@@ -8431,6 +8539,9 @@ _LT_EOF
8431 tmp_addflag=' -i_dynamic -nofor_main' ;; 8539 tmp_addflag=' -i_dynamic -nofor_main' ;;
8432 ifc* | ifort*) # Intel Fortran compiler 8540 ifc* | ifort*) # Intel Fortran compiler
8433 tmp_addflag=' -nofor_main' ;; 8541 tmp_addflag=' -nofor_main' ;;
8542 lf95*) # Lahey Fortran 8.1
8543 whole_archive_flag_spec=
8544 tmp_sharedflag='--shared' ;;
8434 xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) 8545 xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
8435 tmp_sharedflag='-qmkshrobj' 8546 tmp_sharedflag='-qmkshrobj'
8436 tmp_addflag= ;; 8547 tmp_addflag= ;;
@@ -8663,6 +8774,7 @@ _LT_EOF
8663 fi 8774 fi
8664 fi 8775 fi
8665 8776
8777 export_dynamic_flag_spec='${wl}-bexpall'
8666 # It seems that -bexpall does not export symbols beginning with 8778 # It seems that -bexpall does not export symbols beginning with
8667 # underscore (_), so it is better to generate a list of symbols to export. 8779 # underscore (_), so it is better to generate a list of symbols to export.
8668 always_export_symbols=yes 8780 always_export_symbols=yes
@@ -8775,7 +8887,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8775 export_dynamic_flag_spec=-rdynamic 8887 export_dynamic_flag_spec=-rdynamic
8776 ;; 8888 ;;
8777 8889
8778 cygwin* | mingw* | pw32*) 8890 cygwin* | mingw* | pw32* | cegcc*)
8779 # When not using gcc, we currently assume that we are using 8891 # When not using gcc, we currently assume that we are using
8780 # Microsoft Visual C++. 8892 # Microsoft Visual C++.
8781 # hardcode_libdir_flag_spec is actually meaningless, as there is 8893 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -8806,7 +8918,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8806 whole_archive_flag_spec='' 8918 whole_archive_flag_spec=''
8807 link_all_deplibs=yes 8919 link_all_deplibs=yes
8808 allow_undefined_flag="$_lt_dar_allow_undefined" 8920 allow_undefined_flag="$_lt_dar_allow_undefined"
8809 if test "$GCC" = "yes"; then 8921 case $cc_basename in
8922 ifort*) _lt_dar_can_shared=yes ;;
8923 *) _lt_dar_can_shared=$GCC ;;
8924 esac
8925 if test "$_lt_dar_can_shared" = "yes"; then
8810 output_verbose_link_cmd=echo 8926 output_verbose_link_cmd=echo
8811 archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" 8927 archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
8812 module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 8928 module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
@@ -8898,7 +9014,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
8898 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 9014 archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
8899 ;; 9015 ;;
8900 ia64*) 9016 ia64*)
8901 archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 9017 archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
8902 ;; 9018 ;;
8903 *) 9019 *)
8904 archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 9020 archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -9614,14 +9730,14 @@ bsdi[45]*)
9614 # libtool to hard-code these into programs 9730 # libtool to hard-code these into programs
9615 ;; 9731 ;;
9616 9732
9617cygwin* | mingw* | pw32*) 9733cygwin* | mingw* | pw32* | cegcc*)
9618 version_type=windows 9734 version_type=windows
9619 shrext_cmds=".dll" 9735 shrext_cmds=".dll"
9620 need_version=no 9736 need_version=no
9621 need_lib_prefix=no 9737 need_lib_prefix=no
9622 9738
9623 case $GCC,$host_os in 9739 case $GCC,$host_os in
9624 yes,cygwin* | yes,mingw* | yes,pw32*) 9740 yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
9625 library_names_spec='$libname.dll.a' 9741 library_names_spec='$libname.dll.a'
9626 # DLL is installed to $(libdir)/../bin by postinstall_cmds 9742 # DLL is installed to $(libdir)/../bin by postinstall_cmds
9627 postinstall_cmds='base_file=`basename \${file}`~ 9743 postinstall_cmds='base_file=`basename \${file}`~
@@ -9644,7 +9760,7 @@ cygwin* | mingw* | pw32*)
9644 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9760 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9645 sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" 9761 sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
9646 ;; 9762 ;;
9647 mingw*) 9763 mingw* | cegcc*)
9648 # MinGW DLLs use traditional 'lib' prefix 9764 # MinGW DLLs use traditional 'lib' prefix
9649 soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' 9765 soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
9650 sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` 9766 sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
@@ -9859,7 +9975,7 @@ linux*oldld* | linux*aout* | linux*coff*)
9859 ;; 9975 ;;
9860 9976
9861# This must be Linux ELF. 9977# This must be Linux ELF.
9862linux* | k*bsd*-gnu) 9978linux* | k*bsd*-gnu | kopensolaris*-gnu)
9863 version_type=linux 9979 version_type=linux
9864 need_lib_prefix=no 9980 need_lib_prefix=no
9865 need_version=no 9981 need_version=no
@@ -10097,7 +10213,7 @@ tpf*)
10097 version_type=linux 10213 version_type=linux
10098 need_lib_prefix=no 10214 need_lib_prefix=no
10099 need_version=no 10215 need_version=no
10100 library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 10216 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
10101 shlibpath_var=LD_LIBRARY_PATH 10217 shlibpath_var=LD_LIBRARY_PATH
10102 shlibpath_overrides_runpath=no 10218 shlibpath_overrides_runpath=no
10103 hardcode_into_libs=yes 10219 hardcode_into_libs=yes
@@ -10274,7 +10390,7 @@ else
10274 lt_cv_dlopen_self=yes 10390 lt_cv_dlopen_self=yes
10275 ;; 10391 ;;
10276 10392
10277 mingw* | pw32*) 10393 mingw* | pw32* | cegcc*)
10278 lt_cv_dlopen="LoadLibrary" 10394 lt_cv_dlopen="LoadLibrary"
10279 lt_cv_dlopen_libs= 10395 lt_cv_dlopen_libs=
10280 ;; 10396 ;;
@@ -10546,7 +10662,7 @@ else
10546 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 10662 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10547 lt_status=$lt_dlunknown 10663 lt_status=$lt_dlunknown
10548 cat > conftest.$ac_ext <<_LT_EOF 10664 cat > conftest.$ac_ext <<_LT_EOF
10549#line 10549 "configure" 10665#line 10665 "configure"
10550#include "confdefs.h" 10666#include "confdefs.h"
10551 10667
10552#if HAVE_DLFCN_H 10668#if HAVE_DLFCN_H
@@ -10587,10 +10703,6 @@ else
10587# endif 10703# endif
10588#endif 10704#endif
10589 10705
10590#ifdef __cplusplus
10591extern "C" void exit (int);
10592#endif
10593
10594void fnord() { int i=42;} 10706void fnord() { int i=42;}
10595int main () 10707int main ()
10596{ 10708{
@@ -10606,7 +10718,7 @@ int main ()
10606 else 10718 else
10607 puts (dlerror ()); 10719 puts (dlerror ());
10608 10720
10609 exit (status); 10721 return status;
10610} 10722}
10611_LT_EOF 10723_LT_EOF
10612 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 10724 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
@@ -10646,7 +10758,7 @@ else
10646 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 10758 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10647 lt_status=$lt_dlunknown 10759 lt_status=$lt_dlunknown
10648 cat > conftest.$ac_ext <<_LT_EOF 10760 cat > conftest.$ac_ext <<_LT_EOF
10649#line 10649 "configure" 10761#line 10761 "configure"
10650#include "confdefs.h" 10762#include "confdefs.h"
10651 10763
10652#if HAVE_DLFCN_H 10764#if HAVE_DLFCN_H
@@ -10687,10 +10799,6 @@ else
10687# endif 10799# endif
10688#endif 10800#endif
10689 10801
10690#ifdef __cplusplus
10691extern "C" void exit (int);
10692#endif
10693
10694void fnord() { int i=42;} 10802void fnord() { int i=42;}
10695int main () 10803int main ()
10696{ 10804{
@@ -10706,7 +10814,7 @@ int main ()
10706 else 10814 else
10707 puts (dlerror ()); 10815 puts (dlerror ());
10708 10816
10709 exit (status); 10817 return status;
10710} 10818}
10711_LT_EOF 10819_LT_EOF
10712 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 10820 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
@@ -10894,15 +11002,15 @@ _ACEOF
10894 11002
10895 11003
10896cat >>confdefs.h <<_ACEOF 11004cat >>confdefs.h <<_ACEOF
10897#define VMIC 0 11005#define VMIC 99
10898_ACEOF 11006_ACEOF
10899 11007
10900 11008
10901cat >>confdefs.h <<_ACEOF 11009cat >>confdefs.h <<_ACEOF
10902#define VREV 0 11010#define VREV 67344
10903_ACEOF 11011_ACEOF
10904 11012
10905version_info="2:0:1" 11013version_info="2:99:1"
10906release_info="" 11014release_info=""
10907 11015
10908 11016
@@ -11640,8 +11748,8 @@ fi
11640 11748
11641test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 11749test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
11642$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 11750$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
11643as_fn_error $? "no acceptable C compiler found in \$PATH 11751as_fn_error "no acceptable C compiler found in \$PATH
11644See \`config.log' for more details" "$LINENO" 5 ; } 11752See \`config.log' for more details." "$LINENO" 5; }
11645 11753
11646# Provide some information about the compiler. 11754# Provide some information about the compiler.
11647$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 11755$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -12195,7 +12303,7 @@ sys.exit(sys.hexversion < minverhex)"
12195 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 12303 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12196$as_echo "yes" >&6; } 12304$as_echo "yes" >&6; }
12197else 12305else
12198 as_fn_error $? "too old" "$LINENO" 5 12306 as_fn_error "too old" "$LINENO" 5
12199fi 12307fi
12200 am_display_PYTHON=$PYTHON 12308 am_display_PYTHON=$PYTHON
12201 else 12309 else
@@ -12207,7 +12315,7 @@ if test "${am_cv_pathless_PYTHON+set}" = set; then :
12207 $as_echo_n "(cached) " >&6 12315 $as_echo_n "(cached) " >&6
12208else 12316else
12209 12317
12210 for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do 12318 for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
12211 test "$am_cv_pathless_PYTHON" = none && break 12319 test "$am_cv_pathless_PYTHON" = none && break
12212 prog="import sys 12320 prog="import sys
12213# split strings by '.' and convert to numeric. Append some zeros 12321# split strings by '.' and convert to numeric. Append some zeros
@@ -12409,10 +12517,6 @@ fi
12409 12517
12410 12518
12411 12519
12412
12413
12414
12415
12416if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then 12520if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
12417 if test -n "$ac_tool_prefix"; then 12521 if test -n "$ac_tool_prefix"; then
12418 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. 12522 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -12525,6 +12629,7 @@ $as_echo "yes" >&6; }
12525$as_echo "no" >&6; } 12629$as_echo "no" >&6; }
12526 PKG_CONFIG="" 12630 PKG_CONFIG=""
12527 fi 12631 fi
12632
12528fi 12633fi
12529 12634
12530# Check whether pkg-config supports Requires.private 12635# Check whether pkg-config supports Requires.private
@@ -12549,10 +12654,11 @@ pkg_failed=no
12549{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVIL" >&5 12654{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVIL" >&5
12550$as_echo_n "checking for EVIL... " >&6; } 12655$as_echo_n "checking for EVIL... " >&6; }
12551 12656
12552if test -n "$EVIL_CFLAGS"; then 12657if test -n "$PKG_CONFIG"; then
12553 pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS" 12658 if test -n "$EVIL_CFLAGS"; then
12554 elif test -n "$PKG_CONFIG"; then 12659 pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS"
12555 if test -n "$PKG_CONFIG" && \ 12660 else
12661 if test -n "$PKG_CONFIG" && \
12556 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5 12662 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5
12557 ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5 12663 ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5
12558 ac_status=$? 12664 ac_status=$?
@@ -12562,13 +12668,15 @@ if test -n "$EVIL_CFLAGS"; then
12562else 12668else
12563 pkg_failed=yes 12669 pkg_failed=yes
12564fi 12670fi
12565 else 12671 fi
12566 pkg_failed=untried 12672else
12673 pkg_failed=untried
12567fi 12674fi
12568if test -n "$EVIL_LIBS"; then 12675if test -n "$PKG_CONFIG"; then
12569 pkg_cv_EVIL_LIBS="$EVIL_LIBS" 12676 if test -n "$EVIL_LIBS"; then
12570 elif test -n "$PKG_CONFIG"; then 12677 pkg_cv_EVIL_LIBS="$EVIL_LIBS"
12571 if test -n "$PKG_CONFIG" && \ 12678 else
12679 if test -n "$PKG_CONFIG" && \
12572 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5 12680 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5
12573 ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5 12681 ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5
12574 ac_status=$? 12682 ac_status=$?
@@ -12578,15 +12686,14 @@ if test -n "$EVIL_LIBS"; then
12578else 12686else
12579 pkg_failed=yes 12687 pkg_failed=yes
12580fi 12688fi
12581 else 12689 fi
12582 pkg_failed=untried 12690else
12691 pkg_failed=untried
12583fi 12692fi
12584 12693
12585 12694
12586 12695
12587if test $pkg_failed = yes; then 12696if test $pkg_failed = yes; then
12588 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12589$as_echo "no" >&6; }
12590 12697
12591if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 12698if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12592 _pkg_short_errors_supported=yes 12699 _pkg_short_errors_supported=yes
@@ -12594,14 +12701,14 @@ else
12594 _pkg_short_errors_supported=no 12701 _pkg_short_errors_supported=no
12595fi 12702fi
12596 if test $_pkg_short_errors_supported = yes; then 12703 if test $_pkg_short_errors_supported = yes; then
12597 EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evil >= 1.0.0" 2>&1` 12704 EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evil >= 1.0.0"`
12598 else 12705 else
12599 EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "evil >= 1.0.0" 2>&1` 12706 EVIL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evil >= 1.0.0"`
12600 fi 12707 fi
12601 # Put the nasty error message in config.log where it belongs 12708 # Put the nasty error message in config.log where it belongs
12602 echo "$EVIL_PKG_ERRORS" >&5 12709 echo "$EVIL_PKG_ERRORS" >&5
12603 12710
12604 as_fn_error $? "Package requirements (evil >= 1.0.0) were not met: 12711 as_fn_error "Package requirements (evil >= 1.0.0) were not met:
12605 12712
12606$EVIL_PKG_ERRORS 12713$EVIL_PKG_ERRORS
12607 12714
@@ -12610,13 +12717,12 @@ installed software in a non-standard prefix.
12610 12717
12611Alternatively, you may set the environment variables EVIL_CFLAGS 12718Alternatively, you may set the environment variables EVIL_CFLAGS
12612and EVIL_LIBS to avoid the need to call pkg-config. 12719and EVIL_LIBS to avoid the need to call pkg-config.
12613See the pkg-config man page for more details." "$LINENO" 5 12720See the pkg-config man page for more details.
12721" "$LINENO" 5
12614elif test $pkg_failed = untried; then 12722elif test $pkg_failed = untried; then
12615 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12616$as_echo "no" >&6; }
12617 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 12723 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
12618$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 12724$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
12619as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it 12725as_fn_error "The pkg-config script could not be found or is too old. Make sure it
12620is in your PATH or set the PKG_CONFIG environment variable to the full 12726is in your PATH or set the PKG_CONFIG environment variable to the full
12621path to pkg-config. 12727path to pkg-config.
12622 12728
@@ -12625,13 +12731,13 @@ and EVIL_LIBS to avoid the need to call pkg-config.
12625See the pkg-config man page for more details. 12731See the pkg-config man page for more details.
12626 12732
12627To get pkg-config, see <http://pkg-config.freedesktop.org/>. 12733To get pkg-config, see <http://pkg-config.freedesktop.org/>.
12628See \`config.log' for more details" "$LINENO" 5 ; } 12734See \`config.log' for more details." "$LINENO" 5; }
12629else 12735else
12630 EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS 12736 EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS
12631 EVIL_LIBS=$pkg_cv_EVIL_LIBS 12737 EVIL_LIBS=$pkg_cv_EVIL_LIBS
12632 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 12738 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
12633$as_echo "yes" >&6; } 12739$as_echo "yes" >&6; }
12634 12740 :
12635fi 12741fi
12636 12742
12637$as_echo "#define HAVE_EVIL 1" >>confdefs.h 12743$as_echo "#define HAVE_EVIL 1" >>confdefs.h
@@ -12653,10 +12759,11 @@ pkg_failed=no
12653{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 12759{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
12654$as_echo_n "checking for LUA... " >&6; } 12760$as_echo_n "checking for LUA... " >&6; }
12655 12761
12656if test -n "$LUA_CFLAGS"; then 12762if test -n "$PKG_CONFIG"; then
12657 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 12763 if test -n "$LUA_CFLAGS"; then
12658 elif test -n "$PKG_CONFIG"; then 12764 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
12659 if test -n "$PKG_CONFIG" && \ 12765 else
12766 if test -n "$PKG_CONFIG" && \
12660 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1.0\""; } >&5 12767 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1.0\""; } >&5
12661 ($PKG_CONFIG --exists --print-errors "lua >= 5.1.0") 2>&5 12768 ($PKG_CONFIG --exists --print-errors "lua >= 5.1.0") 2>&5
12662 ac_status=$? 12769 ac_status=$?
@@ -12666,13 +12773,15 @@ if test -n "$LUA_CFLAGS"; then
12666else 12773else
12667 pkg_failed=yes 12774 pkg_failed=yes
12668fi 12775fi
12669 else 12776 fi
12670 pkg_failed=untried 12777else
12778 pkg_failed=untried
12671fi 12779fi
12672if test -n "$LUA_LIBS"; then 12780if test -n "$PKG_CONFIG"; then
12673 pkg_cv_LUA_LIBS="$LUA_LIBS" 12781 if test -n "$LUA_LIBS"; then
12674 elif test -n "$PKG_CONFIG"; then 12782 pkg_cv_LUA_LIBS="$LUA_LIBS"
12675 if test -n "$PKG_CONFIG" && \ 12783 else
12784 if test -n "$PKG_CONFIG" && \
12676 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1.0\""; } >&5 12785 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua >= 5.1.0\""; } >&5
12677 ($PKG_CONFIG --exists --print-errors "lua >= 5.1.0") 2>&5 12786 ($PKG_CONFIG --exists --print-errors "lua >= 5.1.0") 2>&5
12678 ac_status=$? 12787 ac_status=$?
@@ -12682,15 +12791,14 @@ if test -n "$LUA_LIBS"; then
12682else 12791else
12683 pkg_failed=yes 12792 pkg_failed=yes
12684fi 12793fi
12685 else 12794 fi
12686 pkg_failed=untried 12795else
12796 pkg_failed=untried
12687fi 12797fi
12688 12798
12689 12799
12690 12800
12691if test $pkg_failed = yes; then 12801if test $pkg_failed = yes; then
12692 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12693$as_echo "no" >&6; }
12694 12802
12695if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 12803if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12696 _pkg_short_errors_supported=yes 12804 _pkg_short_errors_supported=yes
@@ -12698,22 +12806,25 @@ else
12698 _pkg_short_errors_supported=no 12806 _pkg_short_errors_supported=no
12699fi 12807fi
12700 if test $_pkg_short_errors_supported = yes; then 12808 if test $_pkg_short_errors_supported = yes; then
12701 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua >= 5.1.0" 2>&1` 12809 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua >= 5.1.0"`
12702 else 12810 else
12703 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua >= 5.1.0" 2>&1` 12811 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua >= 5.1.0"`
12704 fi 12812 fi
12705 # Put the nasty error message in config.log where it belongs 12813 # Put the nasty error message in config.log where it belongs
12706 echo "$LUA_PKG_ERRORS" >&5 12814 echo "$LUA_PKG_ERRORS" >&5
12707 12815
12816 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12817$as_echo "no" >&6; }
12708 12818
12709pkg_failed=no 12819pkg_failed=no
12710{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 12820{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
12711$as_echo_n "checking for LUA... " >&6; } 12821$as_echo_n "checking for LUA... " >&6; }
12712 12822
12713if test -n "$LUA_CFLAGS"; then 12823if test -n "$PKG_CONFIG"; then
12714 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 12824 if test -n "$LUA_CFLAGS"; then
12715 elif test -n "$PKG_CONFIG"; then 12825 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
12716 if test -n "$PKG_CONFIG" && \ 12826 else
12827 if test -n "$PKG_CONFIG" && \
12717 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5 12828 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5
12718 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5 12829 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5
12719 ac_status=$? 12830 ac_status=$?
@@ -12723,13 +12834,15 @@ if test -n "$LUA_CFLAGS"; then
12723else 12834else
12724 pkg_failed=yes 12835 pkg_failed=yes
12725fi 12836fi
12726 else 12837 fi
12727 pkg_failed=untried 12838else
12839 pkg_failed=untried
12728fi 12840fi
12729if test -n "$LUA_LIBS"; then 12841if test -n "$PKG_CONFIG"; then
12730 pkg_cv_LUA_LIBS="$LUA_LIBS" 12842 if test -n "$LUA_LIBS"; then
12731 elif test -n "$PKG_CONFIG"; then 12843 pkg_cv_LUA_LIBS="$LUA_LIBS"
12732 if test -n "$PKG_CONFIG" && \ 12844 else
12845 if test -n "$PKG_CONFIG" && \
12733 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5 12846 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5
12734 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5 12847 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5
12735 ac_status=$? 12848 ac_status=$?
@@ -12739,15 +12852,14 @@ if test -n "$LUA_LIBS"; then
12739else 12852else
12740 pkg_failed=yes 12853 pkg_failed=yes
12741fi 12854fi
12742 else 12855 fi
12743 pkg_failed=untried 12856else
12857 pkg_failed=untried
12744fi 12858fi
12745 12859
12746 12860
12747 12861
12748if test $pkg_failed = yes; then 12862if test $pkg_failed = yes; then
12749 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12750$as_echo "no" >&6; }
12751 12863
12752if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 12864if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12753 _pkg_short_errors_supported=yes 12865 _pkg_short_errors_supported=yes
@@ -12755,22 +12867,25 @@ else
12755 _pkg_short_errors_supported=no 12867 _pkg_short_errors_supported=no
12756fi 12868fi
12757 if test $_pkg_short_errors_supported = yes; then 12869 if test $_pkg_short_errors_supported = yes; then
12758 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua5.1 >= 5.1.0" 2>&1` 12870 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1.0"`
12759 else 12871 else
12760 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua5.1 >= 5.1.0" 2>&1` 12872 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1.0"`
12761 fi 12873 fi
12762 # Put the nasty error message in config.log where it belongs 12874 # Put the nasty error message in config.log where it belongs
12763 echo "$LUA_PKG_ERRORS" >&5 12875 echo "$LUA_PKG_ERRORS" >&5
12764 12876
12877 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12878$as_echo "no" >&6; }
12765 12879
12766pkg_failed=no 12880pkg_failed=no
12767{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 12881{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
12768$as_echo_n "checking for LUA... " >&6; } 12882$as_echo_n "checking for LUA... " >&6; }
12769 12883
12770if test -n "$LUA_CFLAGS"; then 12884if test -n "$PKG_CONFIG"; then
12771 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 12885 if test -n "$LUA_CFLAGS"; then
12772 elif test -n "$PKG_CONFIG"; then 12886 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
12773 if test -n "$PKG_CONFIG" && \ 12887 else
12888 if test -n "$PKG_CONFIG" && \
12774 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 12889 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
12775 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 12890 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
12776 ac_status=$? 12891 ac_status=$?
@@ -12780,13 +12895,15 @@ if test -n "$LUA_CFLAGS"; then
12780else 12895else
12781 pkg_failed=yes 12896 pkg_failed=yes
12782fi 12897fi
12783 else 12898 fi
12784 pkg_failed=untried 12899else
12900 pkg_failed=untried
12785fi 12901fi
12786if test -n "$LUA_LIBS"; then 12902if test -n "$PKG_CONFIG"; then
12787 pkg_cv_LUA_LIBS="$LUA_LIBS" 12903 if test -n "$LUA_LIBS"; then
12788 elif test -n "$PKG_CONFIG"; then 12904 pkg_cv_LUA_LIBS="$LUA_LIBS"
12789 if test -n "$PKG_CONFIG" && \ 12905 else
12906 if test -n "$PKG_CONFIG" && \
12790 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 12907 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
12791 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 12908 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
12792 ac_status=$? 12909 ac_status=$?
@@ -12796,15 +12913,14 @@ if test -n "$LUA_LIBS"; then
12796else 12913else
12797 pkg_failed=yes 12914 pkg_failed=yes
12798fi 12915fi
12799 else 12916 fi
12800 pkg_failed=untried 12917else
12918 pkg_failed=untried
12801fi 12919fi
12802 12920
12803 12921
12804 12922
12805if test $pkg_failed = yes; then 12923if test $pkg_failed = yes; then
12806 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12807$as_echo "no" >&6; }
12808 12924
12809if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 12925if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12810 _pkg_short_errors_supported=yes 12926 _pkg_short_errors_supported=yes
@@ -12812,22 +12928,25 @@ else
12812 _pkg_short_errors_supported=no 12928 _pkg_short_errors_supported=no
12813fi 12929fi
12814 if test $_pkg_short_errors_supported = yes; then 12930 if test $_pkg_short_errors_supported = yes; then
12815 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1` 12931 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
12816 else 12932 else
12817 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1` 12933 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
12818 fi 12934 fi
12819 # Put the nasty error message in config.log where it belongs 12935 # Put the nasty error message in config.log where it belongs
12820 echo "$LUA_PKG_ERRORS" >&5 12936 echo "$LUA_PKG_ERRORS" >&5
12821 12937
12938 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12939$as_echo "no" >&6; }
12822 12940
12823pkg_failed=no 12941pkg_failed=no
12824{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 12942{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
12825$as_echo_n "checking for LUA... " >&6; } 12943$as_echo_n "checking for LUA... " >&6; }
12826 12944
12827if test -n "$LUA_CFLAGS"; then 12945if test -n "$PKG_CONFIG"; then
12828 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 12946 if test -n "$LUA_CFLAGS"; then
12829 elif test -n "$PKG_CONFIG"; then 12947 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
12830 if test -n "$PKG_CONFIG" && \ 12948 else
12949 if test -n "$PKG_CONFIG" && \
12831 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 12950 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
12832 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 12951 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
12833 ac_status=$? 12952 ac_status=$?
@@ -12837,13 +12956,15 @@ if test -n "$LUA_CFLAGS"; then
12837else 12956else
12838 pkg_failed=yes 12957 pkg_failed=yes
12839fi 12958fi
12840 else 12959 fi
12841 pkg_failed=untried 12960else
12961 pkg_failed=untried
12842fi 12962fi
12843if test -n "$LUA_LIBS"; then 12963if test -n "$PKG_CONFIG"; then
12844 pkg_cv_LUA_LIBS="$LUA_LIBS" 12964 if test -n "$LUA_LIBS"; then
12845 elif test -n "$PKG_CONFIG"; then 12965 pkg_cv_LUA_LIBS="$LUA_LIBS"
12846 if test -n "$PKG_CONFIG" && \ 12966 else
12967 if test -n "$PKG_CONFIG" && \
12847 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 12968 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
12848 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 12969 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
12849 ac_status=$? 12970 ac_status=$?
@@ -12853,15 +12974,14 @@ if test -n "$LUA_LIBS"; then
12853else 12974else
12854 pkg_failed=yes 12975 pkg_failed=yes
12855fi 12976fi
12856 else 12977 fi
12857 pkg_failed=untried 12978else
12979 pkg_failed=untried
12858fi 12980fi
12859 12981
12860 12982
12861 12983
12862if test $pkg_failed = yes; then 12984if test $pkg_failed = yes; then
12863 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12864$as_echo "no" >&6; }
12865 12985
12866if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 12986if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12867 _pkg_short_errors_supported=yes 12987 _pkg_short_errors_supported=yes
@@ -12869,17 +12989,17 @@ else
12869 _pkg_short_errors_supported=no 12989 _pkg_short_errors_supported=no
12870fi 12990fi
12871 if test $_pkg_short_errors_supported = yes; then 12991 if test $_pkg_short_errors_supported = yes; then
12872 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1` 12992 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
12873 else 12993 else
12874 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1` 12994 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
12875 fi 12995 fi
12876 # Put the nasty error message in config.log where it belongs 12996 # Put the nasty error message in config.log where it belongs
12877 echo "$LUA_PKG_ERRORS" >&5 12997 echo "$LUA_PKG_ERRORS" >&5
12878 12998
12879 have_lua="no" 12999 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12880elif test $pkg_failed = untried; then
12881 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12882$as_echo "no" >&6; } 13000$as_echo "no" >&6; }
13001 have_lua="no"
13002elif test $pkg_failed = untried; then
12883 have_lua="no" 13003 have_lua="no"
12884else 13004else
12885 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13005 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -12889,17 +13009,16 @@ $as_echo "yes" >&6; }
12889 requirement_lua="lua51" 13009 requirement_lua="lua51"
12890fi 13010fi
12891elif test $pkg_failed = untried; then 13011elif test $pkg_failed = untried; then
12892 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12893$as_echo "no" >&6; }
12894 13012
12895pkg_failed=no 13013pkg_failed=no
12896{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13014{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
12897$as_echo_n "checking for LUA... " >&6; } 13015$as_echo_n "checking for LUA... " >&6; }
12898 13016
12899if test -n "$LUA_CFLAGS"; then 13017if test -n "$PKG_CONFIG"; then
12900 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13018 if test -n "$LUA_CFLAGS"; then
12901 elif test -n "$PKG_CONFIG"; then 13019 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
12902 if test -n "$PKG_CONFIG" && \ 13020 else
13021 if test -n "$PKG_CONFIG" && \
12903 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13022 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
12904 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13023 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
12905 ac_status=$? 13024 ac_status=$?
@@ -12909,13 +13028,15 @@ if test -n "$LUA_CFLAGS"; then
12909else 13028else
12910 pkg_failed=yes 13029 pkg_failed=yes
12911fi 13030fi
12912 else 13031 fi
12913 pkg_failed=untried 13032else
13033 pkg_failed=untried
12914fi 13034fi
12915if test -n "$LUA_LIBS"; then 13035if test -n "$PKG_CONFIG"; then
12916 pkg_cv_LUA_LIBS="$LUA_LIBS" 13036 if test -n "$LUA_LIBS"; then
12917 elif test -n "$PKG_CONFIG"; then 13037 pkg_cv_LUA_LIBS="$LUA_LIBS"
12918 if test -n "$PKG_CONFIG" && \ 13038 else
13039 if test -n "$PKG_CONFIG" && \
12919 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13040 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
12920 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13041 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
12921 ac_status=$? 13042 ac_status=$?
@@ -12925,15 +13046,14 @@ if test -n "$LUA_LIBS"; then
12925else 13046else
12926 pkg_failed=yes 13047 pkg_failed=yes
12927fi 13048fi
12928 else 13049 fi
12929 pkg_failed=untried 13050else
13051 pkg_failed=untried
12930fi 13052fi
12931 13053
12932 13054
12933 13055
12934if test $pkg_failed = yes; then 13056if test $pkg_failed = yes; then
12935 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12936$as_echo "no" >&6; }
12937 13057
12938if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13058if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
12939 _pkg_short_errors_supported=yes 13059 _pkg_short_errors_supported=yes
@@ -12941,17 +13061,17 @@ else
12941 _pkg_short_errors_supported=no 13061 _pkg_short_errors_supported=no
12942fi 13062fi
12943 if test $_pkg_short_errors_supported = yes; then 13063 if test $_pkg_short_errors_supported = yes; then
12944 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1` 13064 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
12945 else 13065 else
12946 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1` 13066 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
12947 fi 13067 fi
12948 # Put the nasty error message in config.log where it belongs 13068 # Put the nasty error message in config.log where it belongs
12949 echo "$LUA_PKG_ERRORS" >&5 13069 echo "$LUA_PKG_ERRORS" >&5
12950 13070
12951 have_lua="no" 13071 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12952elif test $pkg_failed = untried; then
12953 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12954$as_echo "no" >&6; } 13072$as_echo "no" >&6; }
13073 have_lua="no"
13074elif test $pkg_failed = untried; then
12955 have_lua="no" 13075 have_lua="no"
12956else 13076else
12957 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13077 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -12968,17 +13088,16 @@ $as_echo "yes" >&6; }
12968 requirement_lua="lua-5.1" 13088 requirement_lua="lua-5.1"
12969fi 13089fi
12970elif test $pkg_failed = untried; then 13090elif test $pkg_failed = untried; then
12971 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
12972$as_echo "no" >&6; }
12973 13091
12974pkg_failed=no 13092pkg_failed=no
12975{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13093{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
12976$as_echo_n "checking for LUA... " >&6; } 13094$as_echo_n "checking for LUA... " >&6; }
12977 13095
12978if test -n "$LUA_CFLAGS"; then 13096if test -n "$PKG_CONFIG"; then
12979 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13097 if test -n "$LUA_CFLAGS"; then
12980 elif test -n "$PKG_CONFIG"; then 13098 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
12981 if test -n "$PKG_CONFIG" && \ 13099 else
13100 if test -n "$PKG_CONFIG" && \
12982 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 13101 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
12983 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 13102 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
12984 ac_status=$? 13103 ac_status=$?
@@ -12988,13 +13107,15 @@ if test -n "$LUA_CFLAGS"; then
12988else 13107else
12989 pkg_failed=yes 13108 pkg_failed=yes
12990fi 13109fi
12991 else 13110 fi
12992 pkg_failed=untried 13111else
13112 pkg_failed=untried
12993fi 13113fi
12994if test -n "$LUA_LIBS"; then 13114if test -n "$PKG_CONFIG"; then
12995 pkg_cv_LUA_LIBS="$LUA_LIBS" 13115 if test -n "$LUA_LIBS"; then
12996 elif test -n "$PKG_CONFIG"; then 13116 pkg_cv_LUA_LIBS="$LUA_LIBS"
12997 if test -n "$PKG_CONFIG" && \ 13117 else
13118 if test -n "$PKG_CONFIG" && \
12998 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 13119 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
12999 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 13120 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
13000 ac_status=$? 13121 ac_status=$?
@@ -13004,15 +13125,14 @@ if test -n "$LUA_LIBS"; then
13004else 13125else
13005 pkg_failed=yes 13126 pkg_failed=yes
13006fi 13127fi
13007 else 13128 fi
13008 pkg_failed=untried 13129else
13130 pkg_failed=untried
13009fi 13131fi
13010 13132
13011 13133
13012 13134
13013if test $pkg_failed = yes; then 13135if test $pkg_failed = yes; then
13014 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13015$as_echo "no" >&6; }
13016 13136
13017if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13137if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13018 _pkg_short_errors_supported=yes 13138 _pkg_short_errors_supported=yes
@@ -13020,22 +13140,25 @@ else
13020 _pkg_short_errors_supported=no 13140 _pkg_short_errors_supported=no
13021fi 13141fi
13022 if test $_pkg_short_errors_supported = yes; then 13142 if test $_pkg_short_errors_supported = yes; then
13023 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1` 13143 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
13024 else 13144 else
13025 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1` 13145 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
13026 fi 13146 fi
13027 # Put the nasty error message in config.log where it belongs 13147 # Put the nasty error message in config.log where it belongs
13028 echo "$LUA_PKG_ERRORS" >&5 13148 echo "$LUA_PKG_ERRORS" >&5
13029 13149
13150 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13151$as_echo "no" >&6; }
13030 13152
13031pkg_failed=no 13153pkg_failed=no
13032{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13154{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13033$as_echo_n "checking for LUA... " >&6; } 13155$as_echo_n "checking for LUA... " >&6; }
13034 13156
13035if test -n "$LUA_CFLAGS"; then 13157if test -n "$PKG_CONFIG"; then
13036 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13158 if test -n "$LUA_CFLAGS"; then
13037 elif test -n "$PKG_CONFIG"; then 13159 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13038 if test -n "$PKG_CONFIG" && \ 13160 else
13161 if test -n "$PKG_CONFIG" && \
13039 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13162 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13040 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13163 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13041 ac_status=$? 13164 ac_status=$?
@@ -13045,13 +13168,15 @@ if test -n "$LUA_CFLAGS"; then
13045else 13168else
13046 pkg_failed=yes 13169 pkg_failed=yes
13047fi 13170fi
13048 else 13171 fi
13049 pkg_failed=untried 13172else
13173 pkg_failed=untried
13050fi 13174fi
13051if test -n "$LUA_LIBS"; then 13175if test -n "$PKG_CONFIG"; then
13052 pkg_cv_LUA_LIBS="$LUA_LIBS" 13176 if test -n "$LUA_LIBS"; then
13053 elif test -n "$PKG_CONFIG"; then 13177 pkg_cv_LUA_LIBS="$LUA_LIBS"
13054 if test -n "$PKG_CONFIG" && \ 13178 else
13179 if test -n "$PKG_CONFIG" && \
13055 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13180 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13056 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13181 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13057 ac_status=$? 13182 ac_status=$?
@@ -13061,15 +13186,14 @@ if test -n "$LUA_LIBS"; then
13061else 13186else
13062 pkg_failed=yes 13187 pkg_failed=yes
13063fi 13188fi
13064 else 13189 fi
13065 pkg_failed=untried 13190else
13191 pkg_failed=untried
13066fi 13192fi
13067 13193
13068 13194
13069 13195
13070if test $pkg_failed = yes; then 13196if test $pkg_failed = yes; then
13071 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13072$as_echo "no" >&6; }
13073 13197
13074if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13198if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13075 _pkg_short_errors_supported=yes 13199 _pkg_short_errors_supported=yes
@@ -13077,17 +13201,17 @@ else
13077 _pkg_short_errors_supported=no 13201 _pkg_short_errors_supported=no
13078fi 13202fi
13079 if test $_pkg_short_errors_supported = yes; then 13203 if test $_pkg_short_errors_supported = yes; then
13080 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1` 13204 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
13081 else 13205 else
13082 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1` 13206 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
13083 fi 13207 fi
13084 # Put the nasty error message in config.log where it belongs 13208 # Put the nasty error message in config.log where it belongs
13085 echo "$LUA_PKG_ERRORS" >&5 13209 echo "$LUA_PKG_ERRORS" >&5
13086 13210
13087 have_lua="no" 13211 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13088elif test $pkg_failed = untried; then
13089 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13090$as_echo "no" >&6; } 13212$as_echo "no" >&6; }
13213 have_lua="no"
13214elif test $pkg_failed = untried; then
13091 have_lua="no" 13215 have_lua="no"
13092else 13216else
13093 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13217 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13097,17 +13221,16 @@ $as_echo "yes" >&6; }
13097 requirement_lua="lua51" 13221 requirement_lua="lua51"
13098fi 13222fi
13099elif test $pkg_failed = untried; then 13223elif test $pkg_failed = untried; then
13100 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13101$as_echo "no" >&6; }
13102 13224
13103pkg_failed=no 13225pkg_failed=no
13104{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13226{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13105$as_echo_n "checking for LUA... " >&6; } 13227$as_echo_n "checking for LUA... " >&6; }
13106 13228
13107if test -n "$LUA_CFLAGS"; then 13229if test -n "$PKG_CONFIG"; then
13108 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13230 if test -n "$LUA_CFLAGS"; then
13109 elif test -n "$PKG_CONFIG"; then 13231 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13110 if test -n "$PKG_CONFIG" && \ 13232 else
13233 if test -n "$PKG_CONFIG" && \
13111 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13234 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13112 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13235 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13113 ac_status=$? 13236 ac_status=$?
@@ -13117,13 +13240,15 @@ if test -n "$LUA_CFLAGS"; then
13117else 13240else
13118 pkg_failed=yes 13241 pkg_failed=yes
13119fi 13242fi
13120 else 13243 fi
13121 pkg_failed=untried 13244else
13245 pkg_failed=untried
13122fi 13246fi
13123if test -n "$LUA_LIBS"; then 13247if test -n "$PKG_CONFIG"; then
13124 pkg_cv_LUA_LIBS="$LUA_LIBS" 13248 if test -n "$LUA_LIBS"; then
13125 elif test -n "$PKG_CONFIG"; then 13249 pkg_cv_LUA_LIBS="$LUA_LIBS"
13126 if test -n "$PKG_CONFIG" && \ 13250 else
13251 if test -n "$PKG_CONFIG" && \
13127 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13252 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13128 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13253 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13129 ac_status=$? 13254 ac_status=$?
@@ -13133,15 +13258,14 @@ if test -n "$LUA_LIBS"; then
13133else 13258else
13134 pkg_failed=yes 13259 pkg_failed=yes
13135fi 13260fi
13136 else 13261 fi
13137 pkg_failed=untried 13262else
13263 pkg_failed=untried
13138fi 13264fi
13139 13265
13140 13266
13141 13267
13142if test $pkg_failed = yes; then 13268if test $pkg_failed = yes; then
13143 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13144$as_echo "no" >&6; }
13145 13269
13146if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13270if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13147 _pkg_short_errors_supported=yes 13271 _pkg_short_errors_supported=yes
@@ -13149,17 +13273,17 @@ else
13149 _pkg_short_errors_supported=no 13273 _pkg_short_errors_supported=no
13150fi 13274fi
13151 if test $_pkg_short_errors_supported = yes; then 13275 if test $_pkg_short_errors_supported = yes; then
13152 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1` 13276 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
13153 else 13277 else
13154 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1` 13278 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
13155 fi 13279 fi
13156 # Put the nasty error message in config.log where it belongs 13280 # Put the nasty error message in config.log where it belongs
13157 echo "$LUA_PKG_ERRORS" >&5 13281 echo "$LUA_PKG_ERRORS" >&5
13158 13282
13159 have_lua="no" 13283 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13160elif test $pkg_failed = untried; then
13161 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13162$as_echo "no" >&6; } 13284$as_echo "no" >&6; }
13285 have_lua="no"
13286elif test $pkg_failed = untried; then
13163 have_lua="no" 13287 have_lua="no"
13164else 13288else
13165 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13289 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13183,17 +13307,16 @@ $as_echo "yes" >&6; }
13183 requirement_lua="lua5.1" 13307 requirement_lua="lua5.1"
13184fi 13308fi
13185elif test $pkg_failed = untried; then 13309elif test $pkg_failed = untried; then
13186 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13187$as_echo "no" >&6; }
13188 13310
13189pkg_failed=no 13311pkg_failed=no
13190{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13312{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13191$as_echo_n "checking for LUA... " >&6; } 13313$as_echo_n "checking for LUA... " >&6; }
13192 13314
13193if test -n "$LUA_CFLAGS"; then 13315if test -n "$PKG_CONFIG"; then
13194 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13316 if test -n "$LUA_CFLAGS"; then
13195 elif test -n "$PKG_CONFIG"; then 13317 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13196 if test -n "$PKG_CONFIG" && \ 13318 else
13319 if test -n "$PKG_CONFIG" && \
13197 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5 13320 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5
13198 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5 13321 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5
13199 ac_status=$? 13322 ac_status=$?
@@ -13203,13 +13326,15 @@ if test -n "$LUA_CFLAGS"; then
13203else 13326else
13204 pkg_failed=yes 13327 pkg_failed=yes
13205fi 13328fi
13206 else 13329 fi
13207 pkg_failed=untried 13330else
13331 pkg_failed=untried
13208fi 13332fi
13209if test -n "$LUA_LIBS"; then 13333if test -n "$PKG_CONFIG"; then
13210 pkg_cv_LUA_LIBS="$LUA_LIBS" 13334 if test -n "$LUA_LIBS"; then
13211 elif test -n "$PKG_CONFIG"; then 13335 pkg_cv_LUA_LIBS="$LUA_LIBS"
13212 if test -n "$PKG_CONFIG" && \ 13336 else
13337 if test -n "$PKG_CONFIG" && \
13213 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5 13338 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1 >= 5.1.0\""; } >&5
13214 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5 13339 ($PKG_CONFIG --exists --print-errors "lua5.1 >= 5.1.0") 2>&5
13215 ac_status=$? 13340 ac_status=$?
@@ -13219,15 +13344,14 @@ if test -n "$LUA_LIBS"; then
13219else 13344else
13220 pkg_failed=yes 13345 pkg_failed=yes
13221fi 13346fi
13222 else 13347 fi
13223 pkg_failed=untried 13348else
13349 pkg_failed=untried
13224fi 13350fi
13225 13351
13226 13352
13227 13353
13228if test $pkg_failed = yes; then 13354if test $pkg_failed = yes; then
13229 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13230$as_echo "no" >&6; }
13231 13355
13232if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13356if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13233 _pkg_short_errors_supported=yes 13357 _pkg_short_errors_supported=yes
@@ -13235,22 +13359,25 @@ else
13235 _pkg_short_errors_supported=no 13359 _pkg_short_errors_supported=no
13236fi 13360fi
13237 if test $_pkg_short_errors_supported = yes; then 13361 if test $_pkg_short_errors_supported = yes; then
13238 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua5.1 >= 5.1.0" 2>&1` 13362 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1 >= 5.1.0"`
13239 else 13363 else
13240 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua5.1 >= 5.1.0" 2>&1` 13364 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1 >= 5.1.0"`
13241 fi 13365 fi
13242 # Put the nasty error message in config.log where it belongs 13366 # Put the nasty error message in config.log where it belongs
13243 echo "$LUA_PKG_ERRORS" >&5 13367 echo "$LUA_PKG_ERRORS" >&5
13244 13368
13369 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13370$as_echo "no" >&6; }
13245 13371
13246pkg_failed=no 13372pkg_failed=no
13247{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13373{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13248$as_echo_n "checking for LUA... " >&6; } 13374$as_echo_n "checking for LUA... " >&6; }
13249 13375
13250if test -n "$LUA_CFLAGS"; then 13376if test -n "$PKG_CONFIG"; then
13251 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13377 if test -n "$LUA_CFLAGS"; then
13252 elif test -n "$PKG_CONFIG"; then 13378 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13253 if test -n "$PKG_CONFIG" && \ 13379 else
13380 if test -n "$PKG_CONFIG" && \
13254 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 13381 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
13255 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 13382 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
13256 ac_status=$? 13383 ac_status=$?
@@ -13260,13 +13387,15 @@ if test -n "$LUA_CFLAGS"; then
13260else 13387else
13261 pkg_failed=yes 13388 pkg_failed=yes
13262fi 13389fi
13263 else 13390 fi
13264 pkg_failed=untried 13391else
13392 pkg_failed=untried
13265fi 13393fi
13266if test -n "$LUA_LIBS"; then 13394if test -n "$PKG_CONFIG"; then
13267 pkg_cv_LUA_LIBS="$LUA_LIBS" 13395 if test -n "$LUA_LIBS"; then
13268 elif test -n "$PKG_CONFIG"; then 13396 pkg_cv_LUA_LIBS="$LUA_LIBS"
13269 if test -n "$PKG_CONFIG" && \ 13397 else
13398 if test -n "$PKG_CONFIG" && \
13270 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 13399 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
13271 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 13400 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
13272 ac_status=$? 13401 ac_status=$?
@@ -13276,15 +13405,14 @@ if test -n "$LUA_LIBS"; then
13276else 13405else
13277 pkg_failed=yes 13406 pkg_failed=yes
13278fi 13407fi
13279 else 13408 fi
13280 pkg_failed=untried 13409else
13410 pkg_failed=untried
13281fi 13411fi
13282 13412
13283 13413
13284 13414
13285if test $pkg_failed = yes; then 13415if test $pkg_failed = yes; then
13286 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13287$as_echo "no" >&6; }
13288 13416
13289if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13417if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13290 _pkg_short_errors_supported=yes 13418 _pkg_short_errors_supported=yes
@@ -13292,22 +13420,25 @@ else
13292 _pkg_short_errors_supported=no 13420 _pkg_short_errors_supported=no
13293fi 13421fi
13294 if test $_pkg_short_errors_supported = yes; then 13422 if test $_pkg_short_errors_supported = yes; then
13295 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1` 13423 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
13296 else 13424 else
13297 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1` 13425 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
13298 fi 13426 fi
13299 # Put the nasty error message in config.log where it belongs 13427 # Put the nasty error message in config.log where it belongs
13300 echo "$LUA_PKG_ERRORS" >&5 13428 echo "$LUA_PKG_ERRORS" >&5
13301 13429
13430 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13431$as_echo "no" >&6; }
13302 13432
13303pkg_failed=no 13433pkg_failed=no
13304{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13434{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13305$as_echo_n "checking for LUA... " >&6; } 13435$as_echo_n "checking for LUA... " >&6; }
13306 13436
13307if test -n "$LUA_CFLAGS"; then 13437if test -n "$PKG_CONFIG"; then
13308 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13438 if test -n "$LUA_CFLAGS"; then
13309 elif test -n "$PKG_CONFIG"; then 13439 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13310 if test -n "$PKG_CONFIG" && \ 13440 else
13441 if test -n "$PKG_CONFIG" && \
13311 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13442 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13312 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13443 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13313 ac_status=$? 13444 ac_status=$?
@@ -13317,13 +13448,15 @@ if test -n "$LUA_CFLAGS"; then
13317else 13448else
13318 pkg_failed=yes 13449 pkg_failed=yes
13319fi 13450fi
13320 else 13451 fi
13321 pkg_failed=untried 13452else
13453 pkg_failed=untried
13322fi 13454fi
13323if test -n "$LUA_LIBS"; then 13455if test -n "$PKG_CONFIG"; then
13324 pkg_cv_LUA_LIBS="$LUA_LIBS" 13456 if test -n "$LUA_LIBS"; then
13325 elif test -n "$PKG_CONFIG"; then 13457 pkg_cv_LUA_LIBS="$LUA_LIBS"
13326 if test -n "$PKG_CONFIG" && \ 13458 else
13459 if test -n "$PKG_CONFIG" && \
13327 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13460 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13328 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13461 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13329 ac_status=$? 13462 ac_status=$?
@@ -13333,15 +13466,14 @@ if test -n "$LUA_LIBS"; then
13333else 13466else
13334 pkg_failed=yes 13467 pkg_failed=yes
13335fi 13468fi
13336 else 13469 fi
13337 pkg_failed=untried 13470else
13471 pkg_failed=untried
13338fi 13472fi
13339 13473
13340 13474
13341 13475
13342if test $pkg_failed = yes; then 13476if test $pkg_failed = yes; then
13343 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13344$as_echo "no" >&6; }
13345 13477
13346if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13478if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13347 _pkg_short_errors_supported=yes 13479 _pkg_short_errors_supported=yes
@@ -13349,17 +13481,17 @@ else
13349 _pkg_short_errors_supported=no 13481 _pkg_short_errors_supported=no
13350fi 13482fi
13351 if test $_pkg_short_errors_supported = yes; then 13483 if test $_pkg_short_errors_supported = yes; then
13352 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1` 13484 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
13353 else 13485 else
13354 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1` 13486 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
13355 fi 13487 fi
13356 # Put the nasty error message in config.log where it belongs 13488 # Put the nasty error message in config.log where it belongs
13357 echo "$LUA_PKG_ERRORS" >&5 13489 echo "$LUA_PKG_ERRORS" >&5
13358 13490
13359 have_lua="no" 13491 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13360elif test $pkg_failed = untried; then
13361 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13362$as_echo "no" >&6; } 13492$as_echo "no" >&6; }
13493 have_lua="no"
13494elif test $pkg_failed = untried; then
13363 have_lua="no" 13495 have_lua="no"
13364else 13496else
13365 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13497 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13369,17 +13501,16 @@ $as_echo "yes" >&6; }
13369 requirement_lua="lua51" 13501 requirement_lua="lua51"
13370fi 13502fi
13371elif test $pkg_failed = untried; then 13503elif test $pkg_failed = untried; then
13372 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13373$as_echo "no" >&6; }
13374 13504
13375pkg_failed=no 13505pkg_failed=no
13376{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13506{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13377$as_echo_n "checking for LUA... " >&6; } 13507$as_echo_n "checking for LUA... " >&6; }
13378 13508
13379if test -n "$LUA_CFLAGS"; then 13509if test -n "$PKG_CONFIG"; then
13380 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13510 if test -n "$LUA_CFLAGS"; then
13381 elif test -n "$PKG_CONFIG"; then 13511 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13382 if test -n "$PKG_CONFIG" && \ 13512 else
13513 if test -n "$PKG_CONFIG" && \
13383 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13514 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13384 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13515 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13385 ac_status=$? 13516 ac_status=$?
@@ -13389,13 +13520,15 @@ if test -n "$LUA_CFLAGS"; then
13389else 13520else
13390 pkg_failed=yes 13521 pkg_failed=yes
13391fi 13522fi
13392 else 13523 fi
13393 pkg_failed=untried 13524else
13525 pkg_failed=untried
13394fi 13526fi
13395if test -n "$LUA_LIBS"; then 13527if test -n "$PKG_CONFIG"; then
13396 pkg_cv_LUA_LIBS="$LUA_LIBS" 13528 if test -n "$LUA_LIBS"; then
13397 elif test -n "$PKG_CONFIG"; then 13529 pkg_cv_LUA_LIBS="$LUA_LIBS"
13398 if test -n "$PKG_CONFIG" && \ 13530 else
13531 if test -n "$PKG_CONFIG" && \
13399 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13532 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13400 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13533 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13401 ac_status=$? 13534 ac_status=$?
@@ -13405,15 +13538,14 @@ if test -n "$LUA_LIBS"; then
13405else 13538else
13406 pkg_failed=yes 13539 pkg_failed=yes
13407fi 13540fi
13408 else 13541 fi
13409 pkg_failed=untried 13542else
13543 pkg_failed=untried
13410fi 13544fi
13411 13545
13412 13546
13413 13547
13414if test $pkg_failed = yes; then 13548if test $pkg_failed = yes; then
13415 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13416$as_echo "no" >&6; }
13417 13549
13418if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13550if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13419 _pkg_short_errors_supported=yes 13551 _pkg_short_errors_supported=yes
@@ -13421,17 +13553,17 @@ else
13421 _pkg_short_errors_supported=no 13553 _pkg_short_errors_supported=no
13422fi 13554fi
13423 if test $_pkg_short_errors_supported = yes; then 13555 if test $_pkg_short_errors_supported = yes; then
13424 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1` 13556 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
13425 else 13557 else
13426 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1` 13558 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
13427 fi 13559 fi
13428 # Put the nasty error message in config.log where it belongs 13560 # Put the nasty error message in config.log where it belongs
13429 echo "$LUA_PKG_ERRORS" >&5 13561 echo "$LUA_PKG_ERRORS" >&5
13430 13562
13431 have_lua="no" 13563 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13432elif test $pkg_failed = untried; then
13433 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13434$as_echo "no" >&6; } 13564$as_echo "no" >&6; }
13565 have_lua="no"
13566elif test $pkg_failed = untried; then
13435 have_lua="no" 13567 have_lua="no"
13436else 13568else
13437 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13569 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13448,17 +13580,16 @@ $as_echo "yes" >&6; }
13448 requirement_lua="lua-5.1" 13580 requirement_lua="lua-5.1"
13449fi 13581fi
13450elif test $pkg_failed = untried; then 13582elif test $pkg_failed = untried; then
13451 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13452$as_echo "no" >&6; }
13453 13583
13454pkg_failed=no 13584pkg_failed=no
13455{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13585{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13456$as_echo_n "checking for LUA... " >&6; } 13586$as_echo_n "checking for LUA... " >&6; }
13457 13587
13458if test -n "$LUA_CFLAGS"; then 13588if test -n "$PKG_CONFIG"; then
13459 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13589 if test -n "$LUA_CFLAGS"; then
13460 elif test -n "$PKG_CONFIG"; then 13590 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13461 if test -n "$PKG_CONFIG" && \ 13591 else
13592 if test -n "$PKG_CONFIG" && \
13462 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 13593 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
13463 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 13594 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
13464 ac_status=$? 13595 ac_status=$?
@@ -13468,13 +13599,15 @@ if test -n "$LUA_CFLAGS"; then
13468else 13599else
13469 pkg_failed=yes 13600 pkg_failed=yes
13470fi 13601fi
13471 else 13602 fi
13472 pkg_failed=untried 13603else
13604 pkg_failed=untried
13473fi 13605fi
13474if test -n "$LUA_LIBS"; then 13606if test -n "$PKG_CONFIG"; then
13475 pkg_cv_LUA_LIBS="$LUA_LIBS" 13607 if test -n "$LUA_LIBS"; then
13476 elif test -n "$PKG_CONFIG"; then 13608 pkg_cv_LUA_LIBS="$LUA_LIBS"
13477 if test -n "$PKG_CONFIG" && \ 13609 else
13610 if test -n "$PKG_CONFIG" && \
13478 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5 13611 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-5.1 >= 5.1.0\""; } >&5
13479 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5 13612 ($PKG_CONFIG --exists --print-errors "lua-5.1 >= 5.1.0") 2>&5
13480 ac_status=$? 13613 ac_status=$?
@@ -13484,15 +13617,14 @@ if test -n "$LUA_LIBS"; then
13484else 13617else
13485 pkg_failed=yes 13618 pkg_failed=yes
13486fi 13619fi
13487 else 13620 fi
13488 pkg_failed=untried 13621else
13622 pkg_failed=untried
13489fi 13623fi
13490 13624
13491 13625
13492 13626
13493if test $pkg_failed = yes; then 13627if test $pkg_failed = yes; then
13494 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13495$as_echo "no" >&6; }
13496 13628
13497if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13629if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13498 _pkg_short_errors_supported=yes 13630 _pkg_short_errors_supported=yes
@@ -13500,22 +13632,25 @@ else
13500 _pkg_short_errors_supported=no 13632 _pkg_short_errors_supported=no
13501fi 13633fi
13502 if test $_pkg_short_errors_supported = yes; then 13634 if test $_pkg_short_errors_supported = yes; then
13503 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua-5.1 >= 5.1.0" 2>&1` 13635 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
13504 else 13636 else
13505 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua-5.1 >= 5.1.0" 2>&1` 13637 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-5.1 >= 5.1.0"`
13506 fi 13638 fi
13507 # Put the nasty error message in config.log where it belongs 13639 # Put the nasty error message in config.log where it belongs
13508 echo "$LUA_PKG_ERRORS" >&5 13640 echo "$LUA_PKG_ERRORS" >&5
13509 13641
13642 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13643$as_echo "no" >&6; }
13510 13644
13511pkg_failed=no 13645pkg_failed=no
13512{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13646{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13513$as_echo_n "checking for LUA... " >&6; } 13647$as_echo_n "checking for LUA... " >&6; }
13514 13648
13515if test -n "$LUA_CFLAGS"; then 13649if test -n "$PKG_CONFIG"; then
13516 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13650 if test -n "$LUA_CFLAGS"; then
13517 elif test -n "$PKG_CONFIG"; then 13651 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13518 if test -n "$PKG_CONFIG" && \ 13652 else
13653 if test -n "$PKG_CONFIG" && \
13519 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13654 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13520 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13655 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13521 ac_status=$? 13656 ac_status=$?
@@ -13525,13 +13660,15 @@ if test -n "$LUA_CFLAGS"; then
13525else 13660else
13526 pkg_failed=yes 13661 pkg_failed=yes
13527fi 13662fi
13528 else 13663 fi
13529 pkg_failed=untried 13664else
13665 pkg_failed=untried
13530fi 13666fi
13531if test -n "$LUA_LIBS"; then 13667if test -n "$PKG_CONFIG"; then
13532 pkg_cv_LUA_LIBS="$LUA_LIBS" 13668 if test -n "$LUA_LIBS"; then
13533 elif test -n "$PKG_CONFIG"; then 13669 pkg_cv_LUA_LIBS="$LUA_LIBS"
13534 if test -n "$PKG_CONFIG" && \ 13670 else
13671 if test -n "$PKG_CONFIG" && \
13535 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13672 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13536 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13673 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13537 ac_status=$? 13674 ac_status=$?
@@ -13541,15 +13678,14 @@ if test -n "$LUA_LIBS"; then
13541else 13678else
13542 pkg_failed=yes 13679 pkg_failed=yes
13543fi 13680fi
13544 else 13681 fi
13545 pkg_failed=untried 13682else
13683 pkg_failed=untried
13546fi 13684fi
13547 13685
13548 13686
13549 13687
13550if test $pkg_failed = yes; then 13688if test $pkg_failed = yes; then
13551 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13552$as_echo "no" >&6; }
13553 13689
13554if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13690if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13555 _pkg_short_errors_supported=yes 13691 _pkg_short_errors_supported=yes
@@ -13557,17 +13693,17 @@ else
13557 _pkg_short_errors_supported=no 13693 _pkg_short_errors_supported=no
13558fi 13694fi
13559 if test $_pkg_short_errors_supported = yes; then 13695 if test $_pkg_short_errors_supported = yes; then
13560 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1` 13696 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
13561 else 13697 else
13562 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1` 13698 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
13563 fi 13699 fi
13564 # Put the nasty error message in config.log where it belongs 13700 # Put the nasty error message in config.log where it belongs
13565 echo "$LUA_PKG_ERRORS" >&5 13701 echo "$LUA_PKG_ERRORS" >&5
13566 13702
13567 have_lua="no" 13703 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13568elif test $pkg_failed = untried; then
13569 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13570$as_echo "no" >&6; } 13704$as_echo "no" >&6; }
13705 have_lua="no"
13706elif test $pkg_failed = untried; then
13571 have_lua="no" 13707 have_lua="no"
13572else 13708else
13573 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13709 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13577,17 +13713,16 @@ $as_echo "yes" >&6; }
13577 requirement_lua="lua51" 13713 requirement_lua="lua51"
13578fi 13714fi
13579elif test $pkg_failed = untried; then 13715elif test $pkg_failed = untried; then
13580 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13581$as_echo "no" >&6; }
13582 13716
13583pkg_failed=no 13717pkg_failed=no
13584{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5 13718{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
13585$as_echo_n "checking for LUA... " >&6; } 13719$as_echo_n "checking for LUA... " >&6; }
13586 13720
13587if test -n "$LUA_CFLAGS"; then 13721if test -n "$PKG_CONFIG"; then
13588 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS" 13722 if test -n "$LUA_CFLAGS"; then
13589 elif test -n "$PKG_CONFIG"; then 13723 pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
13590 if test -n "$PKG_CONFIG" && \ 13724 else
13725 if test -n "$PKG_CONFIG" && \
13591 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13726 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13592 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13727 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13593 ac_status=$? 13728 ac_status=$?
@@ -13597,13 +13732,15 @@ if test -n "$LUA_CFLAGS"; then
13597else 13732else
13598 pkg_failed=yes 13733 pkg_failed=yes
13599fi 13734fi
13600 else 13735 fi
13601 pkg_failed=untried 13736else
13737 pkg_failed=untried
13602fi 13738fi
13603if test -n "$LUA_LIBS"; then 13739if test -n "$PKG_CONFIG"; then
13604 pkg_cv_LUA_LIBS="$LUA_LIBS" 13740 if test -n "$LUA_LIBS"; then
13605 elif test -n "$PKG_CONFIG"; then 13741 pkg_cv_LUA_LIBS="$LUA_LIBS"
13606 if test -n "$PKG_CONFIG" && \ 13742 else
13743 if test -n "$PKG_CONFIG" && \
13607 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5 13744 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua51 >= 5.1.0\""; } >&5
13608 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5 13745 ($PKG_CONFIG --exists --print-errors "lua51 >= 5.1.0") 2>&5
13609 ac_status=$? 13746 ac_status=$?
@@ -13613,15 +13750,14 @@ if test -n "$LUA_LIBS"; then
13613else 13750else
13614 pkg_failed=yes 13751 pkg_failed=yes
13615fi 13752fi
13616 else 13753 fi
13617 pkg_failed=untried 13754else
13755 pkg_failed=untried
13618fi 13756fi
13619 13757
13620 13758
13621 13759
13622if test $pkg_failed = yes; then 13760if test $pkg_failed = yes; then
13623 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13624$as_echo "no" >&6; }
13625 13761
13626if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13762if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13627 _pkg_short_errors_supported=yes 13763 _pkg_short_errors_supported=yes
@@ -13629,17 +13765,17 @@ else
13629 _pkg_short_errors_supported=no 13765 _pkg_short_errors_supported=no
13630fi 13766fi
13631 if test $_pkg_short_errors_supported = yes; then 13767 if test $_pkg_short_errors_supported = yes; then
13632 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lua51 >= 5.1.0" 2>&1` 13768 LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
13633 else 13769 else
13634 LUA_PKG_ERRORS=`$PKG_CONFIG --print-errors "lua51 >= 5.1.0" 2>&1` 13770 LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua51 >= 5.1.0"`
13635 fi 13771 fi
13636 # Put the nasty error message in config.log where it belongs 13772 # Put the nasty error message in config.log where it belongs
13637 echo "$LUA_PKG_ERRORS" >&5 13773 echo "$LUA_PKG_ERRORS" >&5
13638 13774
13639 have_lua="no" 13775 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13640elif test $pkg_failed = untried; then
13641 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13642$as_echo "no" >&6; } 13776$as_echo "no" >&6; }
13777 have_lua="no"
13778elif test $pkg_failed = untried; then
13643 have_lua="no" 13779 have_lua="no"
13644else 13780else
13645 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS 13781 LUA_CFLAGS=$pkg_cv_LUA_CFLAGS
@@ -13724,7 +13860,7 @@ fi
13724 13860
13725 13861
13726if test "x${have_lua}" = "xno" ; then 13862if test "x${have_lua}" = "xno" ; then
13727 as_fn_error $? "Cannot find lua library. Be sure that you have installed it and set CFLAGS and LDFLAGS correctly" "$LINENO" 5 13863 as_fn_error "Cannot find lua library. Be sure that you have installed it and set CFLAGS and LDFLAGS correctly" "$LINENO" 5
13728fi 13864fi
13729 13865
13730 13866
@@ -13732,10 +13868,11 @@ pkg_failed=no
13732{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MINIMAL" >&5 13868{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MINIMAL" >&5
13733$as_echo_n "checking for MINIMAL... " >&6; } 13869$as_echo_n "checking for MINIMAL... " >&6; }
13734 13870
13735if test -n "$MINIMAL_CFLAGS"; then 13871if test -n "$PKG_CONFIG"; then
13736 pkg_cv_MINIMAL_CFLAGS="$MINIMAL_CFLAGS" 13872 if test -n "$MINIMAL_CFLAGS"; then
13737 elif test -n "$PKG_CONFIG"; then 13873 pkg_cv_MINIMAL_CFLAGS="$MINIMAL_CFLAGS"
13738 if test -n "$PKG_CONFIG" && \ 13874 else
13875 if test -n "$PKG_CONFIG" && \
13739 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 13876 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
13740 eina >= 1.1.0 13877 eina >= 1.1.0
13741 eet >= 1.5.0 13878 eet >= 1.5.0
@@ -13754,13 +13891,15 @@ if test -n "$MINIMAL_CFLAGS"; then
13754else 13891else
13755 pkg_failed=yes 13892 pkg_failed=yes
13756fi 13893fi
13757 else 13894 fi
13758 pkg_failed=untried 13895else
13896 pkg_failed=untried
13759fi 13897fi
13760if test -n "$MINIMAL_LIBS"; then 13898if test -n "$PKG_CONFIG"; then
13761 pkg_cv_MINIMAL_LIBS="$MINIMAL_LIBS" 13899 if test -n "$MINIMAL_LIBS"; then
13762 elif test -n "$PKG_CONFIG"; then 13900 pkg_cv_MINIMAL_LIBS="$MINIMAL_LIBS"
13763 if test -n "$PKG_CONFIG" && \ 13901 else
13902 if test -n "$PKG_CONFIG" && \
13764 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 13903 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
13765 eina >= 1.1.0 13904 eina >= 1.1.0
13766 eet >= 1.5.0 13905 eet >= 1.5.0
@@ -13779,15 +13918,14 @@ if test -n "$MINIMAL_LIBS"; then
13779else 13918else
13780 pkg_failed=yes 13919 pkg_failed=yes
13781fi 13920fi
13782 else 13921 fi
13783 pkg_failed=untried 13922else
13923 pkg_failed=untried
13784fi 13924fi
13785 13925
13786 13926
13787 13927
13788if test $pkg_failed = yes; then 13928if test $pkg_failed = yes; then
13789 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13790$as_echo "no" >&6; }
13791 13929
13792if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 13930if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13793 _pkg_short_errors_supported=yes 13931 _pkg_short_errors_supported=yes
@@ -13795,20 +13933,20 @@ else
13795 _pkg_short_errors_supported=no 13933 _pkg_short_errors_supported=no
13796fi 13934fi
13797 if test $_pkg_short_errors_supported = yes; then 13935 if test $_pkg_short_errors_supported = yes; then
13798 MINIMAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " 13936 MINIMAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
13799 eina >= 1.1.0 13937 eina >= 1.1.0
13800 eet >= 1.5.0 13938 eet >= 1.5.0
13801 " 2>&1` 13939 "`
13802 else 13940 else
13803 MINIMAL_PKG_ERRORS=`$PKG_CONFIG --print-errors " 13941 MINIMAL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
13804 eina >= 1.1.0 13942 eina >= 1.1.0
13805 eet >= 1.5.0 13943 eet >= 1.5.0
13806 " 2>&1` 13944 "`
13807 fi 13945 fi
13808 # Put the nasty error message in config.log where it belongs 13946 # Put the nasty error message in config.log where it belongs
13809 echo "$MINIMAL_PKG_ERRORS" >&5 13947 echo "$MINIMAL_PKG_ERRORS" >&5
13810 13948
13811 as_fn_error $? "Package requirements ( 13949 as_fn_error "Package requirements (
13812 eina >= 1.1.0 13950 eina >= 1.1.0
13813 eet >= 1.5.0 13951 eet >= 1.5.0
13814 ) were not met: 13952 ) were not met:
@@ -13820,13 +13958,12 @@ installed software in a non-standard prefix.
13820 13958
13821Alternatively, you may set the environment variables MINIMAL_CFLAGS 13959Alternatively, you may set the environment variables MINIMAL_CFLAGS
13822and MINIMAL_LIBS to avoid the need to call pkg-config. 13960and MINIMAL_LIBS to avoid the need to call pkg-config.
13823See the pkg-config man page for more details." "$LINENO" 5 13961See the pkg-config man page for more details.
13962" "$LINENO" 5
13824elif test $pkg_failed = untried; then 13963elif test $pkg_failed = untried; then
13825 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13826$as_echo "no" >&6; }
13827 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 13964 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13828$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 13965$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13829as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it 13966as_fn_error "The pkg-config script could not be found or is too old. Make sure it
13830is in your PATH or set the PKG_CONFIG environment variable to the full 13967is in your PATH or set the PKG_CONFIG environment variable to the full
13831path to pkg-config. 13968path to pkg-config.
13832 13969
@@ -13835,13 +13972,13 @@ and MINIMAL_LIBS to avoid the need to call pkg-config.
13835See the pkg-config man page for more details. 13972See the pkg-config man page for more details.
13836 13973
13837To get pkg-config, see <http://pkg-config.freedesktop.org/>. 13974To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13838See \`config.log' for more details" "$LINENO" 5 ; } 13975See \`config.log' for more details." "$LINENO" 5; }
13839else 13976else
13840 MINIMAL_CFLAGS=$pkg_cv_MINIMAL_CFLAGS 13977 MINIMAL_CFLAGS=$pkg_cv_MINIMAL_CFLAGS
13841 MINIMAL_LIBS=$pkg_cv_MINIMAL_LIBS 13978 MINIMAL_LIBS=$pkg_cv_MINIMAL_LIBS
13842 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 13979 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
13843$as_echo "yes" >&6; } 13980$as_echo "yes" >&6; }
13844 13981 :
13845fi 13982fi
13846 13983
13847 13984
@@ -13849,10 +13986,11 @@ pkg_failed=no
13849{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE" >&5 13986{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE" >&5
13850$as_echo_n "checking for EDJE... " >&6; } 13987$as_echo_n "checking for EDJE... " >&6; }
13851 13988
13852if test -n "$EDJE_CFLAGS"; then 13989if test -n "$PKG_CONFIG"; then
13853 pkg_cv_EDJE_CFLAGS="$EDJE_CFLAGS" 13990 if test -n "$EDJE_CFLAGS"; then
13854 elif test -n "$PKG_CONFIG"; then 13991 pkg_cv_EDJE_CFLAGS="$EDJE_CFLAGS"
13855 if test -n "$PKG_CONFIG" && \ 13992 else
13993 if test -n "$PKG_CONFIG" && \
13856 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 13994 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
13857 eina >= 1.1.0 13995 eina >= 1.1.0
13858 eet >= 1.5.0 13996 eet >= 1.5.0
@@ -13886,13 +14024,15 @@ if test -n "$EDJE_CFLAGS"; then
13886else 14024else
13887 pkg_failed=yes 14025 pkg_failed=yes
13888fi 14026fi
13889 else 14027 fi
13890 pkg_failed=untried 14028else
14029 pkg_failed=untried
13891fi 14030fi
13892if test -n "$EDJE_LIBS"; then 14031if test -n "$PKG_CONFIG"; then
13893 pkg_cv_EDJE_LIBS="$EDJE_LIBS" 14032 if test -n "$EDJE_LIBS"; then
13894 elif test -n "$PKG_CONFIG"; then 14033 pkg_cv_EDJE_LIBS="$EDJE_LIBS"
13895 if test -n "$PKG_CONFIG" && \ 14034 else
14035 if test -n "$PKG_CONFIG" && \
13896 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14036 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
13897 eina >= 1.1.0 14037 eina >= 1.1.0
13898 eet >= 1.5.0 14038 eet >= 1.5.0
@@ -13926,15 +14066,14 @@ if test -n "$EDJE_LIBS"; then
13926else 14066else
13927 pkg_failed=yes 14067 pkg_failed=yes
13928fi 14068fi
13929 else 14069 fi
13930 pkg_failed=untried 14070else
14071 pkg_failed=untried
13931fi 14072fi
13932 14073
13933 14074
13934 14075
13935if test $pkg_failed = yes; then 14076if test $pkg_failed = yes; then
13936 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13937$as_echo "no" >&6; }
13938 14077
13939if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14078if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
13940 _pkg_short_errors_supported=yes 14079 _pkg_short_errors_supported=yes
@@ -13942,7 +14081,7 @@ else
13942 _pkg_short_errors_supported=no 14081 _pkg_short_errors_supported=no
13943fi 14082fi
13944 if test $_pkg_short_errors_supported = yes; then 14083 if test $_pkg_short_errors_supported = yes; then
13945 EDJE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " 14084 EDJE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
13946 eina >= 1.1.0 14085 eina >= 1.1.0
13947 eet >= 1.5.0 14086 eet >= 1.5.0
13948 evas >= 1.1.0 14087 evas >= 1.1.0
@@ -13950,9 +14089,9 @@ fi
13950 ecore-evas >= 1.1.0 14089 ecore-evas >= 1.1.0
13951 ecore-file >= 1.1.0 14090 ecore-file >= 1.1.0
13952 embryo >= 1.1.0 14091 embryo >= 1.1.0
13953 " 2>&1` 14092 "`
13954 else 14093 else
13955 EDJE_PKG_ERRORS=`$PKG_CONFIG --print-errors " 14094 EDJE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
13956 eina >= 1.1.0 14095 eina >= 1.1.0
13957 eet >= 1.5.0 14096 eet >= 1.5.0
13958 evas >= 1.1.0 14097 evas >= 1.1.0
@@ -13960,12 +14099,12 @@ fi
13960 ecore-evas >= 1.1.0 14099 ecore-evas >= 1.1.0
13961 ecore-file >= 1.1.0 14100 ecore-file >= 1.1.0
13962 embryo >= 1.1.0 14101 embryo >= 1.1.0
13963 " 2>&1` 14102 "`
13964 fi 14103 fi
13965 # Put the nasty error message in config.log where it belongs 14104 # Put the nasty error message in config.log where it belongs
13966 echo "$EDJE_PKG_ERRORS" >&5 14105 echo "$EDJE_PKG_ERRORS" >&5
13967 14106
13968 as_fn_error $? "Package requirements ( 14107 as_fn_error "Package requirements (
13969 eina >= 1.1.0 14108 eina >= 1.1.0
13970 eet >= 1.5.0 14109 eet >= 1.5.0
13971 evas >= 1.1.0 14110 evas >= 1.1.0
@@ -13982,13 +14121,12 @@ installed software in a non-standard prefix.
13982 14121
13983Alternatively, you may set the environment variables EDJE_CFLAGS 14122Alternatively, you may set the environment variables EDJE_CFLAGS
13984and EDJE_LIBS to avoid the need to call pkg-config. 14123and EDJE_LIBS to avoid the need to call pkg-config.
13985See the pkg-config man page for more details." "$LINENO" 5 14124See the pkg-config man page for more details.
14125" "$LINENO" 5
13986elif test $pkg_failed = untried; then 14126elif test $pkg_failed = untried; then
13987 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13988$as_echo "no" >&6; }
13989 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 14127 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
13990$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 14128$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
13991as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it 14129as_fn_error "The pkg-config script could not be found or is too old. Make sure it
13992is in your PATH or set the PKG_CONFIG environment variable to the full 14130is in your PATH or set the PKG_CONFIG environment variable to the full
13993path to pkg-config. 14131path to pkg-config.
13994 14132
@@ -13997,13 +14135,13 @@ and EDJE_LIBS to avoid the need to call pkg-config.
13997See the pkg-config man page for more details. 14135See the pkg-config man page for more details.
13998 14136
13999To get pkg-config, see <http://pkg-config.freedesktop.org/>. 14137To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14000See \`config.log' for more details" "$LINENO" 5 ; } 14138See \`config.log' for more details." "$LINENO" 5; }
14001else 14139else
14002 EDJE_CFLAGS=$pkg_cv_EDJE_CFLAGS 14140 EDJE_CFLAGS=$pkg_cv_EDJE_CFLAGS
14003 EDJE_LIBS=$pkg_cv_EDJE_LIBS 14141 EDJE_LIBS=$pkg_cv_EDJE_LIBS
14004 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 14142 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14005$as_echo "yes" >&6; } 14143$as_echo "yes" >&6; }
14006 14144 :
14007fi 14145fi
14008 14146
14009EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}" 14147EDJE_LIBS="${EDJE_LIBS} ${LUA_LIBS} ${lua_libs}"
@@ -14018,10 +14156,11 @@ pkg_failed=no
14018{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECORE_IMF" >&5 14156{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECORE_IMF" >&5
14019$as_echo_n "checking for ECORE_IMF... " >&6; } 14157$as_echo_n "checking for ECORE_IMF... " >&6; }
14020 14158
14021if test -n "$ECORE_IMF_CFLAGS"; then 14159if test -n "$PKG_CONFIG"; then
14022 pkg_cv_ECORE_IMF_CFLAGS="$ECORE_IMF_CFLAGS" 14160 if test -n "$ECORE_IMF_CFLAGS"; then
14023 elif test -n "$PKG_CONFIG"; then 14161 pkg_cv_ECORE_IMF_CFLAGS="$ECORE_IMF_CFLAGS"
14024 if test -n "$PKG_CONFIG" && \ 14162 else
14163 if test -n "$PKG_CONFIG" && \
14025 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14164 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14026 ecore-imf >= 1.1.0 14165 ecore-imf >= 1.1.0
14027 ecore-imf-evas >= 1.1.0 14166 ecore-imf-evas >= 1.1.0
@@ -14040,13 +14179,15 @@ if test -n "$ECORE_IMF_CFLAGS"; then
14040else 14179else
14041 pkg_failed=yes 14180 pkg_failed=yes
14042fi 14181fi
14043 else 14182 fi
14044 pkg_failed=untried 14183else
14184 pkg_failed=untried
14045fi 14185fi
14046if test -n "$ECORE_IMF_LIBS"; then 14186if test -n "$PKG_CONFIG"; then
14047 pkg_cv_ECORE_IMF_LIBS="$ECORE_IMF_LIBS" 14187 if test -n "$ECORE_IMF_LIBS"; then
14048 elif test -n "$PKG_CONFIG"; then 14188 pkg_cv_ECORE_IMF_LIBS="$ECORE_IMF_LIBS"
14049 if test -n "$PKG_CONFIG" && \ 14189 else
14190 if test -n "$PKG_CONFIG" && \
14050 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14191 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14051 ecore-imf >= 1.1.0 14192 ecore-imf >= 1.1.0
14052 ecore-imf-evas >= 1.1.0 14193 ecore-imf-evas >= 1.1.0
@@ -14065,15 +14206,14 @@ if test -n "$ECORE_IMF_LIBS"; then
14065else 14206else
14066 pkg_failed=yes 14207 pkg_failed=yes
14067fi 14208fi
14068 else 14209 fi
14069 pkg_failed=untried 14210else
14211 pkg_failed=untried
14070fi 14212fi
14071 14213
14072 14214
14073 14215
14074if test $pkg_failed = yes; then 14216if test $pkg_failed = yes; then
14075 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14076$as_echo "no" >&6; }
14077 14217
14078if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14218if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14079 _pkg_short_errors_supported=yes 14219 _pkg_short_errors_supported=yes
@@ -14081,23 +14221,23 @@ else
14081 _pkg_short_errors_supported=no 14221 _pkg_short_errors_supported=no
14082fi 14222fi
14083 if test $_pkg_short_errors_supported = yes; then 14223 if test $_pkg_short_errors_supported = yes; then
14084 ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " 14224 ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
14085 ecore-imf >= 1.1.0 14225 ecore-imf >= 1.1.0
14086 ecore-imf-evas >= 1.1.0 14226 ecore-imf-evas >= 1.1.0
14087 " 2>&1` 14227 "`
14088 else 14228 else
14089 ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --print-errors " 14229 ECORE_IMF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
14090 ecore-imf >= 1.1.0 14230 ecore-imf >= 1.1.0
14091 ecore-imf-evas >= 1.1.0 14231 ecore-imf-evas >= 1.1.0
14092 " 2>&1` 14232 "`
14093 fi 14233 fi
14094 # Put the nasty error message in config.log where it belongs 14234 # Put the nasty error message in config.log where it belongs
14095 echo "$ECORE_IMF_PKG_ERRORS" >&5 14235 echo "$ECORE_IMF_PKG_ERRORS" >&5
14096 14236
14097 have_ecore_imf="no" 14237 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14098elif test $pkg_failed = untried; then
14099 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14100$as_echo "no" >&6; } 14238$as_echo "no" >&6; }
14239 have_ecore_imf="no"
14240elif test $pkg_failed = untried; then
14101 have_ecore_imf="no" 14241 have_ecore_imf="no"
14102else 14242else
14103 ECORE_IMF_CFLAGS=$pkg_cv_ECORE_IMF_CFLAGS 14243 ECORE_IMF_CFLAGS=$pkg_cv_ECORE_IMF_CFLAGS
@@ -14114,7 +14254,13 @@ $as_echo "#define HAVE_ECORE_IMF 1" >>confdefs.h
14114fi 14254fi
14115 14255
14116# Enable Multisense use 14256# Enable Multisense use
14117want_multisense="no" 14257want_multisense="yes"
14258# Check whether --enable-multisense was given.
14259if test "${enable_multisense+set}" = set; then :
14260 enableval=$enable_multisense; want_multisense=$enableval
14261
14262fi
14263
14118 if test "x${want_multisense}" = "xyes"; then 14264 if test "x${want_multisense}" = "xyes"; then
14119 ENABLE_MULTISENSE_TRUE= 14265 ENABLE_MULTISENSE_TRUE=
14120 ENABLE_MULTISENSE_FALSE='#' 14266 ENABLE_MULTISENSE_FALSE='#'
@@ -14140,10 +14286,11 @@ pkg_failed=no
14140{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDFILE" >&5 14286{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDFILE" >&5
14141$as_echo_n "checking for SNDFILE... " >&6; } 14287$as_echo_n "checking for SNDFILE... " >&6; }
14142 14288
14143if test -n "$SNDFILE_CFLAGS"; then 14289if test -n "$PKG_CONFIG"; then
14144 pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS" 14290 if test -n "$SNDFILE_CFLAGS"; then
14145 elif test -n "$PKG_CONFIG"; then 14291 pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
14146 if test -n "$PKG_CONFIG" && \ 14292 else
14293 if test -n "$PKG_CONFIG" && \
14147 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.21\""; } >&5 14294 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.21\""; } >&5
14148 ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.21") 2>&5 14295 ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.21") 2>&5
14149 ac_status=$? 14296 ac_status=$?
@@ -14153,13 +14300,15 @@ if test -n "$SNDFILE_CFLAGS"; then
14153else 14300else
14154 pkg_failed=yes 14301 pkg_failed=yes
14155fi 14302fi
14156 else 14303 fi
14157 pkg_failed=untried 14304else
14305 pkg_failed=untried
14158fi 14306fi
14159if test -n "$SNDFILE_LIBS"; then 14307if test -n "$PKG_CONFIG"; then
14160 pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS" 14308 if test -n "$SNDFILE_LIBS"; then
14161 elif test -n "$PKG_CONFIG"; then 14309 pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
14162 if test -n "$PKG_CONFIG" && \ 14310 else
14311 if test -n "$PKG_CONFIG" && \
14163 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.21\""; } >&5 14312 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 1.0.21\""; } >&5
14164 ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.21") 2>&5 14313 ($PKG_CONFIG --exists --print-errors "sndfile >= 1.0.21") 2>&5
14165 ac_status=$? 14314 ac_status=$?
@@ -14169,15 +14318,14 @@ if test -n "$SNDFILE_LIBS"; then
14169else 14318else
14170 pkg_failed=yes 14319 pkg_failed=yes
14171fi 14320fi
14172 else 14321 fi
14173 pkg_failed=untried 14322else
14323 pkg_failed=untried
14174fi 14324fi
14175 14325
14176 14326
14177 14327
14178if test $pkg_failed = yes; then 14328if test $pkg_failed = yes; then
14179 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14180$as_echo "no" >&6; }
14181 14329
14182if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14330if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14183 _pkg_short_errors_supported=yes 14331 _pkg_short_errors_supported=yes
@@ -14185,18 +14333,18 @@ else
14185 _pkg_short_errors_supported=no 14333 _pkg_short_errors_supported=no
14186fi 14334fi
14187 if test $_pkg_short_errors_supported = yes; then 14335 if test $_pkg_short_errors_supported = yes; then
14188 SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sndfile >= 1.0.21" 2>&1` 14336 SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sndfile >= 1.0.21"`
14189 else 14337 else
14190 SNDFILE_PKG_ERRORS=`$PKG_CONFIG --print-errors "sndfile >= 1.0.21" 2>&1` 14338 SNDFILE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sndfile >= 1.0.21"`
14191 fi 14339 fi
14192 # Put the nasty error message in config.log where it belongs 14340 # Put the nasty error message in config.log where it belongs
14193 echo "$SNDFILE_PKG_ERRORS" >&5 14341 echo "$SNDFILE_PKG_ERRORS" >&5
14194 14342
14195 have_sndfile="no"; want_multisense="no" 14343 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14344$as_echo "no" >&6; }
14345 have_sndfile="no"; want_multisense="no"
14196 14346
14197elif test $pkg_failed = untried; then 14347elif test $pkg_failed = untried; then
14198 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14199$as_echo "no" >&6; }
14200 have_sndfile="no"; want_multisense="no" 14348 have_sndfile="no"; want_multisense="no"
14201 14349
14202else 14350else
@@ -14214,7 +14362,7 @@ $as_echo "#define HAVE_LIBSNDFILE 1" >>confdefs.h
14214fi 14362fi
14215 14363
14216 if test "x$want_sndfile" = "xyes" -a "x$have_sndfile" = "xno"; then 14364 if test "x$want_sndfile" = "xyes" -a "x$have_sndfile" = "xno"; then
14217 as_fn_error $? "sndfile support requested, but not found by pkg-config." "$LINENO" 5 14365 as_fn_error "sndfile support requested, but not found by pkg-config." "$LINENO" 5
14218 fi 14366 fi
14219fi 14367fi
14220 if test "x${have_sndfile}" = "xyes"; then 14368 if test "x${have_sndfile}" = "xyes"; then
@@ -14241,10 +14389,11 @@ pkg_failed=no
14241{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for REMIX" >&5 14389{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for REMIX" >&5
14242$as_echo_n "checking for REMIX... " >&6; } 14390$as_echo_n "checking for REMIX... " >&6; }
14243 14391
14244if test -n "$REMIX_CFLAGS"; then 14392if test -n "$PKG_CONFIG"; then
14245 pkg_cv_REMIX_CFLAGS="$REMIX_CFLAGS" 14393 if test -n "$REMIX_CFLAGS"; then
14246 elif test -n "$PKG_CONFIG"; then 14394 pkg_cv_REMIX_CFLAGS="$REMIX_CFLAGS"
14247 if test -n "$PKG_CONFIG" && \ 14395 else
14396 if test -n "$PKG_CONFIG" && \
14248 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"remix >= 0.2.4\""; } >&5 14397 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"remix >= 0.2.4\""; } >&5
14249 ($PKG_CONFIG --exists --print-errors "remix >= 0.2.4") 2>&5 14398 ($PKG_CONFIG --exists --print-errors "remix >= 0.2.4") 2>&5
14250 ac_status=$? 14399 ac_status=$?
@@ -14254,13 +14403,15 @@ if test -n "$REMIX_CFLAGS"; then
14254else 14403else
14255 pkg_failed=yes 14404 pkg_failed=yes
14256fi 14405fi
14257 else 14406 fi
14258 pkg_failed=untried 14407else
14408 pkg_failed=untried
14259fi 14409fi
14260if test -n "$REMIX_LIBS"; then 14410if test -n "$PKG_CONFIG"; then
14261 pkg_cv_REMIX_LIBS="$REMIX_LIBS" 14411 if test -n "$REMIX_LIBS"; then
14262 elif test -n "$PKG_CONFIG"; then 14412 pkg_cv_REMIX_LIBS="$REMIX_LIBS"
14263 if test -n "$PKG_CONFIG" && \ 14413 else
14414 if test -n "$PKG_CONFIG" && \
14264 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"remix >= 0.2.4\""; } >&5 14415 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"remix >= 0.2.4\""; } >&5
14265 ($PKG_CONFIG --exists --print-errors "remix >= 0.2.4") 2>&5 14416 ($PKG_CONFIG --exists --print-errors "remix >= 0.2.4") 2>&5
14266 ac_status=$? 14417 ac_status=$?
@@ -14270,15 +14421,14 @@ if test -n "$REMIX_LIBS"; then
14270else 14421else
14271 pkg_failed=yes 14422 pkg_failed=yes
14272fi 14423fi
14273 else 14424 fi
14274 pkg_failed=untried 14425else
14426 pkg_failed=untried
14275fi 14427fi
14276 14428
14277 14429
14278 14430
14279if test $pkg_failed = yes; then 14431if test $pkg_failed = yes; then
14280 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14281$as_echo "no" >&6; }
14282 14432
14283if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14433if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14284 _pkg_short_errors_supported=yes 14434 _pkg_short_errors_supported=yes
@@ -14286,18 +14436,18 @@ else
14286 _pkg_short_errors_supported=no 14436 _pkg_short_errors_supported=no
14287fi 14437fi
14288 if test $_pkg_short_errors_supported = yes; then 14438 if test $_pkg_short_errors_supported = yes; then
14289 REMIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "remix >= 0.2.4" 2>&1` 14439 REMIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "remix >= 0.2.4"`
14290 else 14440 else
14291 REMIX_PKG_ERRORS=`$PKG_CONFIG --print-errors "remix >= 0.2.4" 2>&1` 14441 REMIX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "remix >= 0.2.4"`
14292 fi 14442 fi
14293 # Put the nasty error message in config.log where it belongs 14443 # Put the nasty error message in config.log where it belongs
14294 echo "$REMIX_PKG_ERRORS" >&5 14444 echo "$REMIX_PKG_ERRORS" >&5
14295 14445
14296 have_libremix="no"; want_multisense="no" 14446 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14447$as_echo "no" >&6; }
14448 have_libremix="no"; want_multisense="no"
14297 14449
14298elif test $pkg_failed = untried; then 14450elif test $pkg_failed = untried; then
14299 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14300$as_echo "no" >&6; }
14301 have_libremix="no"; want_multisense="no" 14451 have_libremix="no"; want_multisense="no"
14302 14452
14303else 14453else
@@ -14325,7 +14475,7 @@ _ACEOF
14325fi 14475fi
14326 14476
14327 if test "x$want_libremix" = "xyes" -a "x$have_libremix" = "xno"; then 14477 if test "x$want_libremix" = "xyes" -a "x$have_libremix" = "xno"; then
14328 as_fn_error $? "remix support requested, but not found by pkg-config." "$LINENO" 5 14478 as_fn_error "remix support requested, but not found by pkg-config." "$LINENO" 5
14329 fi 14479 fi
14330fi 14480fi
14331 if test "x${have_libremix}" = "xyes"; then 14481 if test "x${have_libremix}" = "xyes"; then
@@ -14352,10 +14502,11 @@ pkg_failed=no
14352{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBISENC" >&5 14502{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBISENC" >&5
14353$as_echo_n "checking for VORBISENC... " >&6; } 14503$as_echo_n "checking for VORBISENC... " >&6; }
14354 14504
14355if test -n "$VORBISENC_CFLAGS"; then 14505if test -n "$PKG_CONFIG"; then
14356 pkg_cv_VORBISENC_CFLAGS="$VORBISENC_CFLAGS" 14506 if test -n "$VORBISENC_CFLAGS"; then
14357 elif test -n "$PKG_CONFIG"; then 14507 pkg_cv_VORBISENC_CFLAGS="$VORBISENC_CFLAGS"
14358 if test -n "$PKG_CONFIG" && \ 14508 else
14509 if test -n "$PKG_CONFIG" && \
14359 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14510 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14360 ogg >= 1.1.4 14511 ogg >= 1.1.4
14361 vorbis >= 1.2.3 14512 vorbis >= 1.2.3
@@ -14377,13 +14528,15 @@ if test -n "$VORBISENC_CFLAGS"; then
14377else 14528else
14378 pkg_failed=yes 14529 pkg_failed=yes
14379fi 14530fi
14380 else 14531 fi
14381 pkg_failed=untried 14532else
14533 pkg_failed=untried
14382fi 14534fi
14383if test -n "$VORBISENC_LIBS"; then 14535if test -n "$PKG_CONFIG"; then
14384 pkg_cv_VORBISENC_LIBS="$VORBISENC_LIBS" 14536 if test -n "$VORBISENC_LIBS"; then
14385 elif test -n "$PKG_CONFIG"; then 14537 pkg_cv_VORBISENC_LIBS="$VORBISENC_LIBS"
14386 if test -n "$PKG_CONFIG" && \ 14538 else
14539 if test -n "$PKG_CONFIG" && \
14387 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14540 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14388 ogg >= 1.1.4 14541 ogg >= 1.1.4
14389 vorbis >= 1.2.3 14542 vorbis >= 1.2.3
@@ -14405,15 +14558,14 @@ if test -n "$VORBISENC_LIBS"; then
14405else 14558else
14406 pkg_failed=yes 14559 pkg_failed=yes
14407fi 14560fi
14408 else 14561 fi
14409 pkg_failed=untried 14562else
14563 pkg_failed=untried
14410fi 14564fi
14411 14565
14412 14566
14413 14567
14414if test $pkg_failed = yes; then 14568if test $pkg_failed = yes; then
14415 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14416$as_echo "no" >&6; }
14417 14569
14418if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14570if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14419 _pkg_short_errors_supported=yes 14571 _pkg_short_errors_supported=yes
@@ -14421,26 +14573,26 @@ else
14421 _pkg_short_errors_supported=no 14573 _pkg_short_errors_supported=no
14422fi 14574fi
14423 if test $_pkg_short_errors_supported = yes; then 14575 if test $_pkg_short_errors_supported = yes; then
14424 VORBISENC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " 14576 VORBISENC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
14425 ogg >= 1.1.4 14577 ogg >= 1.1.4
14426 vorbis >= 1.2.3 14578 vorbis >= 1.2.3
14427 vorbisenc >= 1.2.3 14579 vorbisenc >= 1.2.3
14428 " 2>&1` 14580 "`
14429 else 14581 else
14430 VORBISENC_PKG_ERRORS=`$PKG_CONFIG --print-errors " 14582 VORBISENC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
14431 ogg >= 1.1.4 14583 ogg >= 1.1.4
14432 vorbis >= 1.2.3 14584 vorbis >= 1.2.3
14433 vorbisenc >= 1.2.3 14585 vorbisenc >= 1.2.3
14434 " 2>&1` 14586 "`
14435 fi 14587 fi
14436 # Put the nasty error message in config.log where it belongs 14588 # Put the nasty error message in config.log where it belongs
14437 echo "$VORBISENC_PKG_ERRORS" >&5 14589 echo "$VORBISENC_PKG_ERRORS" >&5
14438 14590
14439 have_vorbis="no"; want_multisense="no" 14591 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14592$as_echo "no" >&6; }
14593 have_vorbis="no"; want_multisense="no"
14440 14594
14441elif test $pkg_failed = untried; then 14595elif test $pkg_failed = untried; then
14442 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14443$as_echo "no" >&6; }
14444 have_vorbis="no"; want_multisense="no" 14596 have_vorbis="no"; want_multisense="no"
14445 14597
14446else 14598else
@@ -14458,7 +14610,7 @@ $as_echo "#define HAVE_VORBIS 1" >>confdefs.h
14458fi 14610fi
14459 14611
14460 if test "x$want_vorbis" = "xyes" -a "x$have_vorbis" = "xno"; then 14612 if test "x$want_vorbis" = "xyes" -a "x$have_vorbis" = "xno"; then
14461 as_fn_error $? "vorbisenc support requested, but not found by pkg-config." "$LINENO" 5 14613 as_fn_error "vorbisenc support requested, but not found by pkg-config." "$LINENO" 5
14462 fi 14614 fi
14463fi 14615fi
14464 14616
@@ -14477,10 +14629,11 @@ pkg_failed=no
14477{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5 14629{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
14478$as_echo_n "checking for ALSA... " >&6; } 14630$as_echo_n "checking for ALSA... " >&6; }
14479 14631
14480if test -n "$ALSA_CFLAGS"; then 14632if test -n "$PKG_CONFIG"; then
14481 pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS" 14633 if test -n "$ALSA_CFLAGS"; then
14482 elif test -n "$PKG_CONFIG"; then 14634 pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
14483 if test -n "$PKG_CONFIG" && \ 14635 else
14636 if test -n "$PKG_CONFIG" && \
14484 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14637 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14485 alsa >= 1.0.21 14638 alsa >= 1.0.21
14486 \""; } >&5 14639 \""; } >&5
@@ -14496,13 +14649,15 @@ if test -n "$ALSA_CFLAGS"; then
14496else 14649else
14497 pkg_failed=yes 14650 pkg_failed=yes
14498fi 14651fi
14499 else 14652 fi
14500 pkg_failed=untried 14653else
14654 pkg_failed=untried
14501fi 14655fi
14502if test -n "$ALSA_LIBS"; then 14656if test -n "$PKG_CONFIG"; then
14503 pkg_cv_ALSA_LIBS="$ALSA_LIBS" 14657 if test -n "$ALSA_LIBS"; then
14504 elif test -n "$PKG_CONFIG"; then 14658 pkg_cv_ALSA_LIBS="$ALSA_LIBS"
14505 if test -n "$PKG_CONFIG" && \ 14659 else
14660 if test -n "$PKG_CONFIG" && \
14506 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14661 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14507 alsa >= 1.0.21 14662 alsa >= 1.0.21
14508 \""; } >&5 14663 \""; } >&5
@@ -14518,15 +14673,14 @@ if test -n "$ALSA_LIBS"; then
14518else 14673else
14519 pkg_failed=yes 14674 pkg_failed=yes
14520fi 14675fi
14521 else 14676 fi
14522 pkg_failed=untried 14677else
14678 pkg_failed=untried
14523fi 14679fi
14524 14680
14525 14681
14526 14682
14527if test $pkg_failed = yes; then 14683if test $pkg_failed = yes; then
14528 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14529$as_echo "no" >&6; }
14530 14684
14531if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14685if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14532 _pkg_short_errors_supported=yes 14686 _pkg_short_errors_supported=yes
@@ -14534,22 +14688,22 @@ else
14534 _pkg_short_errors_supported=no 14688 _pkg_short_errors_supported=no
14535fi 14689fi
14536 if test $_pkg_short_errors_supported = yes; then 14690 if test $_pkg_short_errors_supported = yes; then
14537 ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " 14691 ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
14538 alsa >= 1.0.21 14692 alsa >= 1.0.21
14539 " 2>&1` 14693 "`
14540 else 14694 else
14541 ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors " 14695 ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
14542 alsa >= 1.0.21 14696 alsa >= 1.0.21
14543 " 2>&1` 14697 "`
14544 fi 14698 fi
14545 # Put the nasty error message in config.log where it belongs 14699 # Put the nasty error message in config.log where it belongs
14546 echo "$ALSA_PKG_ERRORS" >&5 14700 echo "$ALSA_PKG_ERRORS" >&5
14547 14701
14548 have_alsa_lib="no"; want_multisense="no" 14702 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14703$as_echo "no" >&6; }
14704 have_alsa_lib="no"; want_multisense="no"
14549 14705
14550elif test $pkg_failed = untried; then 14706elif test $pkg_failed = untried; then
14551 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14552$as_echo "no" >&6; }
14553 have_alsa_lib="no"; want_multisense="no" 14707 have_alsa_lib="no"; want_multisense="no"
14554 14708
14555else 14709else
@@ -14567,7 +14721,7 @@ $as_echo "#define HAVE_LIBALSA 1" >>confdefs.h
14567fi 14721fi
14568 14722
14569 if test "x$want_alsa_lib" = "xyes" -a "x$have_alsa_lib" = "xno"; then 14723 if test "x$want_alsa_lib" = "xyes" -a "x$have_alsa_lib" = "xno"; then
14570 as_fn_error $? "alsa support requested, but not found by pkg-config." "$LINENO" 5 14724 as_fn_error "alsa support requested, but not found by pkg-config." "$LINENO" 5
14571 fi 14725 fi
14572fi 14726fi
14573 if test "x${have_alsa_lib}" = "xyes"; then 14727 if test "x${have_alsa_lib}" = "xyes"; then
@@ -14595,10 +14749,11 @@ pkg_failed=no
14595{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC" >&5 14749{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC" >&5
14596$as_echo_n "checking for FLAC... " >&6; } 14750$as_echo_n "checking for FLAC... " >&6; }
14597 14751
14598if test -n "$FLAC_CFLAGS"; then 14752if test -n "$PKG_CONFIG"; then
14599 pkg_cv_FLAC_CFLAGS="$FLAC_CFLAGS" 14753 if test -n "$FLAC_CFLAGS"; then
14600 elif test -n "$PKG_CONFIG"; then 14754 pkg_cv_FLAC_CFLAGS="$FLAC_CFLAGS"
14601 if test -n "$PKG_CONFIG" && \ 14755 else
14756 if test -n "$PKG_CONFIG" && \
14602 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14757 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14603 flac >= 1.2.1 14758 flac >= 1.2.1
14604 \""; } >&5 14759 \""; } >&5
@@ -14614,13 +14769,15 @@ if test -n "$FLAC_CFLAGS"; then
14614else 14769else
14615 pkg_failed=yes 14770 pkg_failed=yes
14616fi 14771fi
14617 else 14772 fi
14618 pkg_failed=untried 14773else
14774 pkg_failed=untried
14619fi 14775fi
14620if test -n "$FLAC_LIBS"; then 14776if test -n "$PKG_CONFIG"; then
14621 pkg_cv_FLAC_LIBS="$FLAC_LIBS" 14777 if test -n "$FLAC_LIBS"; then
14622 elif test -n "$PKG_CONFIG"; then 14778 pkg_cv_FLAC_LIBS="$FLAC_LIBS"
14623 if test -n "$PKG_CONFIG" && \ 14779 else
14780 if test -n "$PKG_CONFIG" && \
14624 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" 14781 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
14625 flac >= 1.2.1 14782 flac >= 1.2.1
14626 \""; } >&5 14783 \""; } >&5
@@ -14636,15 +14793,14 @@ if test -n "$FLAC_LIBS"; then
14636else 14793else
14637 pkg_failed=yes 14794 pkg_failed=yes
14638fi 14795fi
14639 else 14796 fi
14640 pkg_failed=untried 14797else
14798 pkg_failed=untried
14641fi 14799fi
14642 14800
14643 14801
14644 14802
14645if test $pkg_failed = yes; then 14803if test $pkg_failed = yes; then
14646 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14647$as_echo "no" >&6; }
14648 14804
14649if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14805if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14650 _pkg_short_errors_supported=yes 14806 _pkg_short_errors_supported=yes
@@ -14652,22 +14808,22 @@ else
14652 _pkg_short_errors_supported=no 14808 _pkg_short_errors_supported=no
14653fi 14809fi
14654 if test $_pkg_short_errors_supported = yes; then 14810 if test $_pkg_short_errors_supported = yes; then
14655 FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " 14811 FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
14656 flac >= 1.2.1 14812 flac >= 1.2.1
14657 " 2>&1` 14813 "`
14658 else 14814 else
14659 FLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors " 14815 FLAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
14660 flac >= 1.2.1 14816 flac >= 1.2.1
14661 " 2>&1` 14817 "`
14662 fi 14818 fi
14663 # Put the nasty error message in config.log where it belongs 14819 # Put the nasty error message in config.log where it belongs
14664 echo "$FLAC_PKG_ERRORS" >&5 14820 echo "$FLAC_PKG_ERRORS" >&5
14665 14821
14666 have_flac_lib="no"; want_multisense="no" 14822 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14823$as_echo "no" >&6; }
14824 have_flac_lib="no"; want_multisense="no"
14667 14825
14668elif test $pkg_failed = untried; then 14826elif test $pkg_failed = untried; then
14669 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14670$as_echo "no" >&6; }
14671 have_flac_lib="no"; want_multisense="no" 14827 have_flac_lib="no"; want_multisense="no"
14672 14828
14673else 14829else
@@ -14688,7 +14844,7 @@ $as_echo "#define HAVE_LIBFLAC 1" >>confdefs.h
14688 14844
14689fi 14845fi
14690 if test "x$want_flac_lib" = "xyes" -a "x$have_flac_lib" = "xno"; then 14846 if test "x$want_flac_lib" = "xyes" -a "x$have_flac_lib" = "xno"; then
14691 as_fn_error $? "flac support requested, but not found by pkg-config." "$LINENO" 5 14847 as_fn_error "flac support requested, but not found by pkg-config." "$LINENO" 5
14692 fi 14848 fi
14693fi 14849fi
14694 14850
@@ -14706,10 +14862,11 @@ pkg_failed=no
14706{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_CC" >&5 14862{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_CC" >&5
14707$as_echo_n "checking for EDJE_CC... " >&6; } 14863$as_echo_n "checking for EDJE_CC... " >&6; }
14708 14864
14709if test -n "$EDJE_CC_CFLAGS"; then 14865if test -n "$PKG_CONFIG"; then
14710 pkg_cv_EDJE_CC_CFLAGS="$EDJE_CC_CFLAGS" 14866 if test -n "$EDJE_CC_CFLAGS"; then
14711 elif test -n "$PKG_CONFIG"; then 14867 pkg_cv_EDJE_CC_CFLAGS="$EDJE_CC_CFLAGS"
14712 if test -n "$PKG_CONFIG" && \ 14868 else
14869 if test -n "$PKG_CONFIG" && \
14713 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5 14870 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5
14714 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0") 2>&5 14871 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0") 2>&5
14715 ac_status=$? 14872 ac_status=$?
@@ -14719,13 +14876,15 @@ if test -n "$EDJE_CC_CFLAGS"; then
14719else 14876else
14720 pkg_failed=yes 14877 pkg_failed=yes
14721fi 14878fi
14722 else 14879 fi
14723 pkg_failed=untried 14880else
14881 pkg_failed=untried
14724fi 14882fi
14725if test -n "$EDJE_CC_LIBS"; then 14883if test -n "$PKG_CONFIG"; then
14726 pkg_cv_EDJE_CC_LIBS="$EDJE_CC_LIBS" 14884 if test -n "$EDJE_CC_LIBS"; then
14727 elif test -n "$PKG_CONFIG"; then 14885 pkg_cv_EDJE_CC_LIBS="$EDJE_CC_LIBS"
14728 if test -n "$PKG_CONFIG" && \ 14886 else
14887 if test -n "$PKG_CONFIG" && \
14729 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5 14888 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5
14730 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0") 2>&5 14889 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0") 2>&5
14731 ac_status=$? 14890 ac_status=$?
@@ -14735,15 +14894,14 @@ if test -n "$EDJE_CC_LIBS"; then
14735else 14894else
14736 pkg_failed=yes 14895 pkg_failed=yes
14737fi 14896fi
14738 else 14897 fi
14739 pkg_failed=untried 14898else
14899 pkg_failed=untried
14740fi 14900fi
14741 14901
14742 14902
14743 14903
14744if test $pkg_failed = yes; then 14904if test $pkg_failed = yes; then
14745 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14746$as_echo "no" >&6; }
14747 14905
14748if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 14906if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14749 _pkg_short_errors_supported=yes 14907 _pkg_short_errors_supported=yes
@@ -14751,14 +14909,14 @@ else
14751 _pkg_short_errors_supported=no 14909 _pkg_short_errors_supported=no
14752fi 14910fi
14753 if test $_pkg_short_errors_supported = yes; then 14911 if test $_pkg_short_errors_supported = yes; then
14754 EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0" 2>&1` 14912 EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0"`
14755 else 14913 else
14756 EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0" 2>&1` 14914 EDJE_CC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0"`
14757 fi 14915 fi
14758 # Put the nasty error message in config.log where it belongs 14916 # Put the nasty error message in config.log where it belongs
14759 echo "$EDJE_CC_PKG_ERRORS" >&5 14917 echo "$EDJE_CC_PKG_ERRORS" >&5
14760 14918
14761 as_fn_error $? "Package requirements (ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0) were not met: 14919 as_fn_error "Package requirements (ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0) were not met:
14762 14920
14763$EDJE_CC_PKG_ERRORS 14921$EDJE_CC_PKG_ERRORS
14764 14922
@@ -14767,13 +14925,12 @@ installed software in a non-standard prefix.
14767 14925
14768Alternatively, you may set the environment variables EDJE_CC_CFLAGS 14926Alternatively, you may set the environment variables EDJE_CC_CFLAGS
14769and EDJE_CC_LIBS to avoid the need to call pkg-config. 14927and EDJE_CC_LIBS to avoid the need to call pkg-config.
14770See the pkg-config man page for more details." "$LINENO" 5 14928See the pkg-config man page for more details.
14929" "$LINENO" 5
14771elif test $pkg_failed = untried; then 14930elif test $pkg_failed = untried; then
14772 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14773$as_echo "no" >&6; }
14774 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 14931 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14775$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 14932$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14776as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it 14933as_fn_error "The pkg-config script could not be found or is too old. Make sure it
14777is in your PATH or set the PKG_CONFIG environment variable to the full 14934is in your PATH or set the PKG_CONFIG environment variable to the full
14778path to pkg-config. 14935path to pkg-config.
14779 14936
@@ -14782,13 +14939,13 @@ and EDJE_CC_LIBS to avoid the need to call pkg-config.
14782See the pkg-config man page for more details. 14939See the pkg-config man page for more details.
14783 14940
14784To get pkg-config, see <http://pkg-config.freedesktop.org/>. 14941To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14785See \`config.log' for more details" "$LINENO" 5 ; } 14942See \`config.log' for more details." "$LINENO" 5; }
14786else 14943else
14787 EDJE_CC_CFLAGS=$pkg_cv_EDJE_CC_CFLAGS 14944 EDJE_CC_CFLAGS=$pkg_cv_EDJE_CC_CFLAGS
14788 EDJE_CC_LIBS=$pkg_cv_EDJE_CC_LIBS 14945 EDJE_CC_LIBS=$pkg_cv_EDJE_CC_LIBS
14789 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 14946 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14790$as_echo "yes" >&6; } 14947$as_echo "yes" >&6; }
14791 14948 :
14792fi 14949fi
14793 EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}" 14950 EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
14794fi 14951fi
@@ -14808,10 +14965,11 @@ pkg_failed=no
14808{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_DECC" >&5 14965{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_DECC" >&5
14809$as_echo_n "checking for EDJE_DECC... " >&6; } 14966$as_echo_n "checking for EDJE_DECC... " >&6; }
14810 14967
14811if test -n "$EDJE_DECC_CFLAGS"; then 14968if test -n "$PKG_CONFIG"; then
14812 pkg_cv_EDJE_DECC_CFLAGS="$EDJE_DECC_CFLAGS" 14969 if test -n "$EDJE_DECC_CFLAGS"; then
14813 elif test -n "$PKG_CONFIG"; then 14970 pkg_cv_EDJE_DECC_CFLAGS="$EDJE_DECC_CFLAGS"
14814 if test -n "$PKG_CONFIG" && \ 14971 else
14972 if test -n "$PKG_CONFIG" && \
14815 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5 14973 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5
14816 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0") 2>&5 14974 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0") 2>&5
14817 ac_status=$? 14975 ac_status=$?
@@ -14821,13 +14979,15 @@ if test -n "$EDJE_DECC_CFLAGS"; then
14821else 14979else
14822 pkg_failed=yes 14980 pkg_failed=yes
14823fi 14981fi
14824 else 14982 fi
14825 pkg_failed=untried 14983else
14984 pkg_failed=untried
14826fi 14985fi
14827if test -n "$EDJE_DECC_LIBS"; then 14986if test -n "$PKG_CONFIG"; then
14828 pkg_cv_EDJE_DECC_LIBS="$EDJE_DECC_LIBS" 14987 if test -n "$EDJE_DECC_LIBS"; then
14829 elif test -n "$PKG_CONFIG"; then 14988 pkg_cv_EDJE_DECC_LIBS="$EDJE_DECC_LIBS"
14830 if test -n "$PKG_CONFIG" && \ 14989 else
14990 if test -n "$PKG_CONFIG" && \
14831 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5 14991 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0\""; } >&5
14832 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0") 2>&5 14992 ($PKG_CONFIG --exists --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0") 2>&5
14833 ac_status=$? 14993 ac_status=$?
@@ -14837,15 +14997,14 @@ if test -n "$EDJE_DECC_LIBS"; then
14837else 14997else
14838 pkg_failed=yes 14998 pkg_failed=yes
14839fi 14999fi
14840 else 15000 fi
14841 pkg_failed=untried 15001else
15002 pkg_failed=untried
14842fi 15003fi
14843 15004
14844 15005
14845 15006
14846if test $pkg_failed = yes; then 15007if test $pkg_failed = yes; then
14847 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14848$as_echo "no" >&6; }
14849 15008
14850if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 15009if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14851 _pkg_short_errors_supported=yes 15010 _pkg_short_errors_supported=yes
@@ -14853,14 +15012,14 @@ else
14853 _pkg_short_errors_supported=no 15012 _pkg_short_errors_supported=no
14854fi 15013fi
14855 if test $_pkg_short_errors_supported = yes; then 15014 if test $_pkg_short_errors_supported = yes; then
14856 EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0" 2>&1` 15015 EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0"`
14857 else 15016 else
14858 EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0" 2>&1` 15017 EDJE_DECC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0"`
14859 fi 15018 fi
14860 # Put the nasty error message in config.log where it belongs 15019 # Put the nasty error message in config.log where it belongs
14861 echo "$EDJE_DECC_PKG_ERRORS" >&5 15020 echo "$EDJE_DECC_PKG_ERRORS" >&5
14862 15021
14863 as_fn_error $? "Package requirements (ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0) were not met: 15022 as_fn_error "Package requirements (ecore-file >= 1.1.0 ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eet >= 1.5.0 eina >= 1.1.0) were not met:
14864 15023
14865$EDJE_DECC_PKG_ERRORS 15024$EDJE_DECC_PKG_ERRORS
14866 15025
@@ -14869,13 +15028,12 @@ installed software in a non-standard prefix.
14869 15028
14870Alternatively, you may set the environment variables EDJE_DECC_CFLAGS 15029Alternatively, you may set the environment variables EDJE_DECC_CFLAGS
14871and EDJE_DECC_LIBS to avoid the need to call pkg-config. 15030and EDJE_DECC_LIBS to avoid the need to call pkg-config.
14872See the pkg-config man page for more details." "$LINENO" 5 15031See the pkg-config man page for more details.
15032" "$LINENO" 5
14873elif test $pkg_failed = untried; then 15033elif test $pkg_failed = untried; then
14874 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14875$as_echo "no" >&6; }
14876 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 15034 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14877$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 15035$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14878as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it 15036as_fn_error "The pkg-config script could not be found or is too old. Make sure it
14879is in your PATH or set the PKG_CONFIG environment variable to the full 15037is in your PATH or set the PKG_CONFIG environment variable to the full
14880path to pkg-config. 15038path to pkg-config.
14881 15039
@@ -14884,13 +15042,13 @@ and EDJE_DECC_LIBS to avoid the need to call pkg-config.
14884See the pkg-config man page for more details. 15042See the pkg-config man page for more details.
14885 15043
14886To get pkg-config, see <http://pkg-config.freedesktop.org/>. 15044To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14887See \`config.log' for more details" "$LINENO" 5 ; } 15045See \`config.log' for more details." "$LINENO" 5; }
14888else 15046else
14889 EDJE_DECC_CFLAGS=$pkg_cv_EDJE_DECC_CFLAGS 15047 EDJE_DECC_CFLAGS=$pkg_cv_EDJE_DECC_CFLAGS
14890 EDJE_DECC_LIBS=$pkg_cv_EDJE_DECC_LIBS 15048 EDJE_DECC_LIBS=$pkg_cv_EDJE_DECC_LIBS
14891 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 15049 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14892$as_echo "yes" >&6; } 15050$as_echo "yes" >&6; }
14893 15051 :
14894fi 15052fi
14895fi 15053fi
14896 15054
@@ -14900,10 +15058,11 @@ pkg_failed=no
14900{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_PLAYER" >&5 15058{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_PLAYER" >&5
14901$as_echo_n "checking for EDJE_PLAYER... " >&6; } 15059$as_echo_n "checking for EDJE_PLAYER... " >&6; }
14902 15060
14903if test -n "$EDJE_PLAYER_CFLAGS"; then 15061if test -n "$PKG_CONFIG"; then
14904 pkg_cv_EDJE_PLAYER_CFLAGS="$EDJE_PLAYER_CFLAGS" 15062 if test -n "$EDJE_PLAYER_CFLAGS"; then
14905 elif test -n "$PKG_CONFIG"; then 15063 pkg_cv_EDJE_PLAYER_CFLAGS="$EDJE_PLAYER_CFLAGS"
14906 if test -n "$PKG_CONFIG" && \ 15064 else
15065 if test -n "$PKG_CONFIG" && \
14907 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5 15066 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5
14908 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5 15067 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5
14909 ac_status=$? 15068 ac_status=$?
@@ -14913,13 +15072,15 @@ if test -n "$EDJE_PLAYER_CFLAGS"; then
14913else 15072else
14914 pkg_failed=yes 15073 pkg_failed=yes
14915fi 15074fi
14916 else 15075 fi
14917 pkg_failed=untried 15076else
15077 pkg_failed=untried
14918fi 15078fi
14919if test -n "$EDJE_PLAYER_LIBS"; then 15079if test -n "$PKG_CONFIG"; then
14920 pkg_cv_EDJE_PLAYER_LIBS="$EDJE_PLAYER_LIBS" 15080 if test -n "$EDJE_PLAYER_LIBS"; then
14921 elif test -n "$PKG_CONFIG"; then 15081 pkg_cv_EDJE_PLAYER_LIBS="$EDJE_PLAYER_LIBS"
14922 if test -n "$PKG_CONFIG" && \ 15082 else
15083 if test -n "$PKG_CONFIG" && \
14923 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5 15084 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5
14924 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5 15085 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5
14925 ac_status=$? 15086 ac_status=$?
@@ -14929,15 +15090,14 @@ if test -n "$EDJE_PLAYER_LIBS"; then
14929else 15090else
14930 pkg_failed=yes 15091 pkg_failed=yes
14931fi 15092fi
14932 else 15093 fi
14933 pkg_failed=untried 15094else
15095 pkg_failed=untried
14934fi 15096fi
14935 15097
14936 15098
14937 15099
14938if test $pkg_failed = yes; then 15100if test $pkg_failed = yes; then
14939 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14940$as_echo "no" >&6; }
14941 15101
14942if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 15102if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
14943 _pkg_short_errors_supported=yes 15103 _pkg_short_errors_supported=yes
@@ -14945,14 +15105,14 @@ else
14945 _pkg_short_errors_supported=no 15105 _pkg_short_errors_supported=no
14946fi 15106fi
14947 if test $_pkg_short_errors_supported = yes; then 15107 if test $_pkg_short_errors_supported = yes; then
14948 EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>&1` 15108 EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"`
14949 else 15109 else
14950 EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>&1` 15110 EDJE_PLAYER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"`
14951 fi 15111 fi
14952 # Put the nasty error message in config.log where it belongs 15112 # Put the nasty error message in config.log where it belongs
14953 echo "$EDJE_PLAYER_PKG_ERRORS" >&5 15113 echo "$EDJE_PLAYER_PKG_ERRORS" >&5
14954 15114
14955 as_fn_error $? "Package requirements (ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0) were not met: 15115 as_fn_error "Package requirements (ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0) were not met:
14956 15116
14957$EDJE_PLAYER_PKG_ERRORS 15117$EDJE_PLAYER_PKG_ERRORS
14958 15118
@@ -14961,13 +15121,12 @@ installed software in a non-standard prefix.
14961 15121
14962Alternatively, you may set the environment variables EDJE_PLAYER_CFLAGS 15122Alternatively, you may set the environment variables EDJE_PLAYER_CFLAGS
14963and EDJE_PLAYER_LIBS to avoid the need to call pkg-config. 15123and EDJE_PLAYER_LIBS to avoid the need to call pkg-config.
14964See the pkg-config man page for more details." "$LINENO" 5 15124See the pkg-config man page for more details.
15125" "$LINENO" 5
14965elif test $pkg_failed = untried; then 15126elif test $pkg_failed = untried; then
14966 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14967$as_echo "no" >&6; }
14968 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 15127 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
14969$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 15128$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
14970as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it 15129as_fn_error "The pkg-config script could not be found or is too old. Make sure it
14971is in your PATH or set the PKG_CONFIG environment variable to the full 15130is in your PATH or set the PKG_CONFIG environment variable to the full
14972path to pkg-config. 15131path to pkg-config.
14973 15132
@@ -14976,13 +15135,13 @@ and EDJE_PLAYER_LIBS to avoid the need to call pkg-config.
14976See the pkg-config man page for more details. 15135See the pkg-config man page for more details.
14977 15136
14978To get pkg-config, see <http://pkg-config.freedesktop.org/>. 15137To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14979See \`config.log' for more details" "$LINENO" 5 ; } 15138See \`config.log' for more details." "$LINENO" 5; }
14980else 15139else
14981 EDJE_PLAYER_CFLAGS=$pkg_cv_EDJE_PLAYER_CFLAGS 15140 EDJE_PLAYER_CFLAGS=$pkg_cv_EDJE_PLAYER_CFLAGS
14982 EDJE_PLAYER_LIBS=$pkg_cv_EDJE_PLAYER_LIBS 15141 EDJE_PLAYER_LIBS=$pkg_cv_EDJE_PLAYER_LIBS
14983 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 15142 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
14984$as_echo "yes" >&6; } 15143$as_echo "yes" >&6; }
14985 15144 :
14986fi 15145fi
14987fi 15146fi
14988 15147
@@ -14992,10 +15151,11 @@ pkg_failed=no
14992{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_INSPECTOR" >&5 15151{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_INSPECTOR" >&5
14993$as_echo_n "checking for EDJE_INSPECTOR... " >&6; } 15152$as_echo_n "checking for EDJE_INSPECTOR... " >&6; }
14994 15153
14995if test -n "$EDJE_INSPECTOR_CFLAGS"; then 15154if test -n "$PKG_CONFIG"; then
14996 pkg_cv_EDJE_INSPECTOR_CFLAGS="$EDJE_INSPECTOR_CFLAGS" 15155 if test -n "$EDJE_INSPECTOR_CFLAGS"; then
14997 elif test -n "$PKG_CONFIG"; then 15156 pkg_cv_EDJE_INSPECTOR_CFLAGS="$EDJE_INSPECTOR_CFLAGS"
14998 if test -n "$PKG_CONFIG" && \ 15157 else
15158 if test -n "$PKG_CONFIG" && \
14999 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5 15159 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5
15000 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5 15160 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5
15001 ac_status=$? 15161 ac_status=$?
@@ -15005,13 +15165,15 @@ if test -n "$EDJE_INSPECTOR_CFLAGS"; then
15005else 15165else
15006 pkg_failed=yes 15166 pkg_failed=yes
15007fi 15167fi
15008 else 15168 fi
15009 pkg_failed=untried 15169else
15170 pkg_failed=untried
15010fi 15171fi
15011if test -n "$EDJE_INSPECTOR_LIBS"; then 15172if test -n "$PKG_CONFIG"; then
15012 pkg_cv_EDJE_INSPECTOR_LIBS="$EDJE_INSPECTOR_LIBS" 15173 if test -n "$EDJE_INSPECTOR_LIBS"; then
15013 elif test -n "$PKG_CONFIG"; then 15174 pkg_cv_EDJE_INSPECTOR_LIBS="$EDJE_INSPECTOR_LIBS"
15014 if test -n "$PKG_CONFIG" && \ 15175 else
15176 if test -n "$PKG_CONFIG" && \
15015 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5 15177 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5
15016 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5 15178 ($PKG_CONFIG --exists --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5
15017 ac_status=$? 15179 ac_status=$?
@@ -15021,15 +15183,14 @@ if test -n "$EDJE_INSPECTOR_LIBS"; then
15021else 15183else
15022 pkg_failed=yes 15184 pkg_failed=yes
15023fi 15185fi
15024 else 15186 fi
15025 pkg_failed=untried 15187else
15188 pkg_failed=untried
15026fi 15189fi
15027 15190
15028 15191
15029 15192
15030if test $pkg_failed = yes; then 15193if test $pkg_failed = yes; then
15031 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15032$as_echo "no" >&6; }
15033 15194
15034if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 15195if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
15035 _pkg_short_errors_supported=yes 15196 _pkg_short_errors_supported=yes
@@ -15037,14 +15198,14 @@ else
15037 _pkg_short_errors_supported=no 15198 _pkg_short_errors_supported=no
15038fi 15199fi
15039 if test $_pkg_short_errors_supported = yes; then 15200 if test $_pkg_short_errors_supported = yes; then
15040 EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>&1` 15201 EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"`
15041 else 15202 else
15042 EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>&1` 15203 EDJE_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"`
15043 fi 15204 fi
15044 # Put the nasty error message in config.log where it belongs 15205 # Put the nasty error message in config.log where it belongs
15045 echo "$EDJE_INSPECTOR_PKG_ERRORS" >&5 15206 echo "$EDJE_INSPECTOR_PKG_ERRORS" >&5
15046 15207
15047 as_fn_error $? "Package requirements (ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0) were not met: 15208 as_fn_error "Package requirements (ecore-evas >= 1.1.0 ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0) were not met:
15048 15209
15049$EDJE_INSPECTOR_PKG_ERRORS 15210$EDJE_INSPECTOR_PKG_ERRORS
15050 15211
@@ -15053,13 +15214,12 @@ installed software in a non-standard prefix.
15053 15214
15054Alternatively, you may set the environment variables EDJE_INSPECTOR_CFLAGS 15215Alternatively, you may set the environment variables EDJE_INSPECTOR_CFLAGS
15055and EDJE_INSPECTOR_LIBS to avoid the need to call pkg-config. 15216and EDJE_INSPECTOR_LIBS to avoid the need to call pkg-config.
15056See the pkg-config man page for more details." "$LINENO" 5 15217See the pkg-config man page for more details.
15218" "$LINENO" 5
15057elif test $pkg_failed = untried; then 15219elif test $pkg_failed = untried; then
15058 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15059$as_echo "no" >&6; }
15060 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 15220 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
15061$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 15221$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
15062as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it 15222as_fn_error "The pkg-config script could not be found or is too old. Make sure it
15063is in your PATH or set the PKG_CONFIG environment variable to the full 15223is in your PATH or set the PKG_CONFIG environment variable to the full
15064path to pkg-config. 15224path to pkg-config.
15065 15225
@@ -15068,13 +15228,13 @@ and EDJE_INSPECTOR_LIBS to avoid the need to call pkg-config.
15068See the pkg-config man page for more details. 15228See the pkg-config man page for more details.
15069 15229
15070To get pkg-config, see <http://pkg-config.freedesktop.org/>. 15230To get pkg-config, see <http://pkg-config.freedesktop.org/>.
15071See \`config.log' for more details" "$LINENO" 5 ; } 15231See \`config.log' for more details." "$LINENO" 5; }
15072else 15232else
15073 EDJE_INSPECTOR_CFLAGS=$pkg_cv_EDJE_INSPECTOR_CFLAGS 15233 EDJE_INSPECTOR_CFLAGS=$pkg_cv_EDJE_INSPECTOR_CFLAGS
15074 EDJE_INSPECTOR_LIBS=$pkg_cv_EDJE_INSPECTOR_LIBS 15234 EDJE_INSPECTOR_LIBS=$pkg_cv_EDJE_INSPECTOR_LIBS
15075 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 15235 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
15076$as_echo "yes" >&6; } 15236$as_echo "yes" >&6; }
15077 15237 :
15078fi 15238fi
15079fi 15239fi
15080 15240
@@ -15084,10 +15244,11 @@ pkg_failed=no
15084{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_EXTERNAL_INSPECTOR" >&5 15244{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDJE_EXTERNAL_INSPECTOR" >&5
15085$as_echo_n "checking for EDJE_EXTERNAL_INSPECTOR... " >&6; } 15245$as_echo_n "checking for EDJE_EXTERNAL_INSPECTOR... " >&6; }
15086 15246
15087if test -n "$EDJE_EXTERNAL_INSPECTOR_CFLAGS"; then 15247if test -n "$PKG_CONFIG"; then
15088 pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS="$EDJE_EXTERNAL_INSPECTOR_CFLAGS" 15248 if test -n "$EDJE_EXTERNAL_INSPECTOR_CFLAGS"; then
15089 elif test -n "$PKG_CONFIG"; then 15249 pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS="$EDJE_EXTERNAL_INSPECTOR_CFLAGS"
15090 if test -n "$PKG_CONFIG" && \ 15250 else
15251 if test -n "$PKG_CONFIG" && \
15091 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5 15252 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5
15092 ($PKG_CONFIG --exists --print-errors "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5 15253 ($PKG_CONFIG --exists --print-errors "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5
15093 ac_status=$? 15254 ac_status=$?
@@ -15097,13 +15258,15 @@ if test -n "$EDJE_EXTERNAL_INSPECTOR_CFLAGS"; then
15097else 15258else
15098 pkg_failed=yes 15259 pkg_failed=yes
15099fi 15260fi
15100 else 15261 fi
15101 pkg_failed=untried 15262else
15263 pkg_failed=untried
15102fi 15264fi
15103if test -n "$EDJE_EXTERNAL_INSPECTOR_LIBS"; then 15265if test -n "$PKG_CONFIG"; then
15104 pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS="$EDJE_EXTERNAL_INSPECTOR_LIBS" 15266 if test -n "$EDJE_EXTERNAL_INSPECTOR_LIBS"; then
15105 elif test -n "$PKG_CONFIG"; then 15267 pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS="$EDJE_EXTERNAL_INSPECTOR_LIBS"
15106 if test -n "$PKG_CONFIG" && \ 15268 else
15269 if test -n "$PKG_CONFIG" && \
15107 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5 15270 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0\""; } >&5
15108 ($PKG_CONFIG --exists --print-errors "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5 15271 ($PKG_CONFIG --exists --print-errors "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0") 2>&5
15109 ac_status=$? 15272 ac_status=$?
@@ -15113,15 +15276,14 @@ if test -n "$EDJE_EXTERNAL_INSPECTOR_LIBS"; then
15113else 15276else
15114 pkg_failed=yes 15277 pkg_failed=yes
15115fi 15278fi
15116 else 15279 fi
15117 pkg_failed=untried 15280else
15281 pkg_failed=untried
15118fi 15282fi
15119 15283
15120 15284
15121 15285
15122if test $pkg_failed = yes; then 15286if test $pkg_failed = yes; then
15123 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15124$as_echo "no" >&6; }
15125 15287
15126if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 15288if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
15127 _pkg_short_errors_supported=yes 15289 _pkg_short_errors_supported=yes
@@ -15129,14 +15291,14 @@ else
15129 _pkg_short_errors_supported=no 15291 _pkg_short_errors_supported=no
15130fi 15292fi
15131 if test $_pkg_short_errors_supported = yes; then 15293 if test $_pkg_short_errors_supported = yes; then
15132 EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>&1` 15294 EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"`
15133 else 15295 else
15134 EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0" 2>&1` 15296 EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0"`
15135 fi 15297 fi
15136 # Put the nasty error message in config.log where it belongs 15298 # Put the nasty error message in config.log where it belongs
15137 echo "$EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS" >&5 15299 echo "$EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS" >&5
15138 15300
15139 as_fn_error $? "Package requirements (ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0) were not met: 15301 as_fn_error "Package requirements (ecore >= 1.1.0 evas >= 1.1.0 eina >= 1.1.0) were not met:
15140 15302
15141$EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS 15303$EDJE_EXTERNAL_INSPECTOR_PKG_ERRORS
15142 15304
@@ -15145,13 +15307,12 @@ installed software in a non-standard prefix.
15145 15307
15146Alternatively, you may set the environment variables EDJE_EXTERNAL_INSPECTOR_CFLAGS 15308Alternatively, you may set the environment variables EDJE_EXTERNAL_INSPECTOR_CFLAGS
15147and EDJE_EXTERNAL_INSPECTOR_LIBS to avoid the need to call pkg-config. 15309and EDJE_EXTERNAL_INSPECTOR_LIBS to avoid the need to call pkg-config.
15148See the pkg-config man page for more details." "$LINENO" 5 15310See the pkg-config man page for more details.
15311" "$LINENO" 5
15149elif test $pkg_failed = untried; then 15312elif test $pkg_failed = untried; then
15150 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15151$as_echo "no" >&6; }
15152 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 15313 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
15153$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 15314$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
15154as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it 15315as_fn_error "The pkg-config script could not be found or is too old. Make sure it
15155is in your PATH or set the PKG_CONFIG environment variable to the full 15316is in your PATH or set the PKG_CONFIG environment variable to the full
15156path to pkg-config. 15317path to pkg-config.
15157 15318
@@ -15160,13 +15321,13 @@ and EDJE_EXTERNAL_INSPECTOR_LIBS to avoid the need to call pkg-config.
15160See the pkg-config man page for more details. 15321See the pkg-config man page for more details.
15161 15322
15162To get pkg-config, see <http://pkg-config.freedesktop.org/>. 15323To get pkg-config, see <http://pkg-config.freedesktop.org/>.
15163See \`config.log' for more details" "$LINENO" 5 ; } 15324See \`config.log' for more details." "$LINENO" 5; }
15164else 15325else
15165 EDJE_EXTERNAL_INSPECTOR_CFLAGS=$pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS 15326 EDJE_EXTERNAL_INSPECTOR_CFLAGS=$pkg_cv_EDJE_EXTERNAL_INSPECTOR_CFLAGS
15166 EDJE_EXTERNAL_INSPECTOR_LIBS=$pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS 15327 EDJE_EXTERNAL_INSPECTOR_LIBS=$pkg_cv_EDJE_EXTERNAL_INSPECTOR_LIBS
15167 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 15328 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
15168$as_echo "yes" >&6; } 15329$as_echo "yes" >&6; }
15169 15330 :
15170fi 15331fi
15171fi 15332fi
15172 15333
@@ -15176,7 +15337,8 @@ for ac_header in locale.h sys/resource.h
15176do : 15337do :
15177 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 15338 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
15178ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" 15339ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
15179if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : 15340eval as_val=\$$as_ac_Header
15341 if test "x$as_val" = x""yes; then :
15180 cat >>confdefs.h <<_ACEOF 15342 cat >>confdefs.h <<_ACEOF
15181#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 15343#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
15182_ACEOF 15344_ACEOF
@@ -15255,7 +15417,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
15255fi 15417fi
15256set dummy $CC; ac_cc=`$as_echo "$2" | 15418set dummy $CC; ac_cc=`$as_echo "$2" |
15257 sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` 15419 sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
15258if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : 15420if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
15259 $as_echo_n "(cached) " >&6 15421 $as_echo_n "(cached) " >&6
15260else 15422else
15261 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 15423 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16119,7 +16281,8 @@ if test $ac_cv_os_cray = yes; then
16119 for ac_func in _getb67 GETB67 getb67; do 16281 for ac_func in _getb67 GETB67 getb67; do
16120 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 16282 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
16121ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 16283ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
16122if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 16284eval as_val=\$$as_ac_var
16285 if test "x$as_val" = x""yes; then :
16123 16286
16124cat >>confdefs.h <<_ACEOF 16287cat >>confdefs.h <<_ACEOF
16125#define CRAY_STACKSEG_END $ac_func 16288#define CRAY_STACKSEG_END $ac_func
@@ -16235,10 +16398,11 @@ pkg_failed=no
16235{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5 16398{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5
16236$as_echo_n "checking for CHECK... " >&6; } 16399$as_echo_n "checking for CHECK... " >&6; }
16237 16400
16238if test -n "$CHECK_CFLAGS"; then 16401if test -n "$PKG_CONFIG"; then
16239 pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS" 16402 if test -n "$CHECK_CFLAGS"; then
16240 elif test -n "$PKG_CONFIG"; then 16403 pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS"
16241 if test -n "$PKG_CONFIG" && \ 16404 else
16405 if test -n "$PKG_CONFIG" && \
16242 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5 16406 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5
16243 ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5 16407 ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5
16244 ac_status=$? 16408 ac_status=$?
@@ -16248,13 +16412,15 @@ if test -n "$CHECK_CFLAGS"; then
16248else 16412else
16249 pkg_failed=yes 16413 pkg_failed=yes
16250fi 16414fi
16251 else 16415 fi
16252 pkg_failed=untried 16416else
16417 pkg_failed=untried
16253fi 16418fi
16254if test -n "$CHECK_LIBS"; then 16419if test -n "$PKG_CONFIG"; then
16255 pkg_cv_CHECK_LIBS="$CHECK_LIBS" 16420 if test -n "$CHECK_LIBS"; then
16256 elif test -n "$PKG_CONFIG"; then 16421 pkg_cv_CHECK_LIBS="$CHECK_LIBS"
16257 if test -n "$PKG_CONFIG" && \ 16422 else
16423 if test -n "$PKG_CONFIG" && \
16258 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5 16424 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5
16259 ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5 16425 ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5
16260 ac_status=$? 16426 ac_status=$?
@@ -16264,15 +16430,14 @@ if test -n "$CHECK_LIBS"; then
16264else 16430else
16265 pkg_failed=yes 16431 pkg_failed=yes
16266fi 16432fi
16267 else 16433 fi
16268 pkg_failed=untried 16434else
16435 pkg_failed=untried
16269fi 16436fi
16270 16437
16271 16438
16272 16439
16273if test $pkg_failed = yes; then 16440if test $pkg_failed = yes; then
16274 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16275$as_echo "no" >&6; }
16276 16441
16277if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then 16442if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
16278 _pkg_short_errors_supported=yes 16443 _pkg_short_errors_supported=yes
@@ -16280,17 +16445,17 @@ else
16280 _pkg_short_errors_supported=no 16445 _pkg_short_errors_supported=no
16281fi 16446fi
16282 if test $_pkg_short_errors_supported = yes; then 16447 if test $_pkg_short_errors_supported = yes; then
16283 CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "check >= 0.9.5" 2>&1` 16448 CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "check >= 0.9.5"`
16284 else 16449 else
16285 CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors "check >= 0.9.5" 2>&1` 16450 CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "check >= 0.9.5"`
16286 fi 16451 fi
16287 # Put the nasty error message in config.log where it belongs 16452 # Put the nasty error message in config.log where it belongs
16288 echo "$CHECK_PKG_ERRORS" >&5 16453 echo "$CHECK_PKG_ERRORS" >&5
16289 16454
16290 _efl_enable_tests="no" 16455 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16291elif test $pkg_failed = untried; then
16292 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16293$as_echo "no" >&6; } 16456$as_echo "no" >&6; }
16457 _efl_enable_tests="no"
16458elif test $pkg_failed = untried; then
16294 _efl_enable_tests="no" 16459 _efl_enable_tests="no"
16295else 16460else
16296 CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS 16461 CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS
@@ -16425,29 +16590,6 @@ fi
16425 16590
16426## Examples 16591## Examples
16427 16592
16428install_examples="yes"
16429# Check whether --enable-install-examples was given.
16430if test "${enable_install_examples+set}" = set; then :
16431 enableval=$enable_install_examples;
16432 if test "x${enableval}" = "xyes" ; then
16433 install_examples="yes"
16434 else
16435 install_examples="no"
16436 fi
16437
16438else
16439 install_examples="yes"
16440fi
16441
16442 if test "x${install_examples}" = "xyes"; then
16443 INSTALL_EXAMPLES_TRUE=
16444 INSTALL_EXAMPLES_FALSE='#'
16445else
16446 INSTALL_EXAMPLES_TRUE='#'
16447 INSTALL_EXAMPLES_FALSE=
16448fi
16449
16450
16451build_examples="no" 16593build_examples="no"
16452# Check whether --enable-build-examples was given. 16594# Check whether --enable-build-examples was given.
16453if test "${enable_build_examples+set}" = set; then : 16595if test "${enable_build_examples+set}" = set; then :
@@ -16455,7 +16597,7 @@ if test "${enable_build_examples+set}" = set; then :
16455 if test "x${enableval}" = "xyes" ; then 16597 if test "x${enableval}" = "xyes" ; then
16456 build_examples="yes" 16598 build_examples="yes"
16457 edje_cc=$($PKG_CONFIG --variable=prefix edje)/bin/edje_cc 16599 edje_cc=$($PKG_CONFIG --variable=prefix edje)/bin/edje_cc
16458 # put in here the dependencies for Edje' examples. They are 16600 # put in here the dependencies for Edje' examples. They are
16459 # meant to be 'real world' usage examples, thus one will be 16601 # meant to be 'real world' usage examples, thus one will be
16460 # using higher level libraries on these programs 16602 # using higher level libraries on these programs
16461 16603
@@ -16563,7 +16705,6 @@ DEFS=-DHAVE_CONFIG_H
16563 16705
16564ac_libobjs= 16706ac_libobjs=
16565ac_ltlibobjs= 16707ac_ltlibobjs=
16566U=
16567for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue 16708for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
16568 # 1. Remove the extension, and $U if already installed. 16709 # 1. Remove the extension, and $U if already installed.
16569 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' 16710 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -16587,99 +16728,95 @@ else
16587fi 16728fi
16588 16729
16589if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then 16730if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
16590 as_fn_error $? "conditional \"AMDEP\" was never defined. 16731 as_fn_error "conditional \"AMDEP\" was never defined.
16591Usually this means the macro was only invoked conditionally." "$LINENO" 5 16732Usually this means the macro was only invoked conditionally." "$LINENO" 5
16592fi 16733fi
16593if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then 16734if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
16594 as_fn_error $? "conditional \"am__fastdepCC\" was never defined. 16735 as_fn_error "conditional \"am__fastdepCC\" was never defined.
16595Usually this means the macro was only invoked conditionally." "$LINENO" 5 16736Usually this means the macro was only invoked conditionally." "$LINENO" 5
16596fi 16737fi
16597if test -z "${EDJE_AMALGAMATION_TRUE}" && test -z "${EDJE_AMALGAMATION_FALSE}"; then 16738if test -z "${EDJE_AMALGAMATION_TRUE}" && test -z "${EDJE_AMALGAMATION_FALSE}"; then
16598 as_fn_error $? "conditional \"EDJE_AMALGAMATION\" was never defined. 16739 as_fn_error "conditional \"EDJE_AMALGAMATION\" was never defined.
16599Usually this means the macro was only invoked conditionally." "$LINENO" 5 16740Usually this means the macro was only invoked conditionally." "$LINENO" 5
16600fi 16741fi
16601if test -z "${BUILD_EDJE_CC_TRUE}" && test -z "${BUILD_EDJE_CC_FALSE}"; then 16742if test -z "${BUILD_EDJE_CC_TRUE}" && test -z "${BUILD_EDJE_CC_FALSE}"; then
16602 as_fn_error $? "conditional \"BUILD_EDJE_CC\" was never defined. 16743 as_fn_error "conditional \"BUILD_EDJE_CC\" was never defined.
16603Usually this means the macro was only invoked conditionally." "$LINENO" 5 16744Usually this means the macro was only invoked conditionally." "$LINENO" 5
16604fi 16745fi
16605if test -z "${BUILD_EDJE_DECC_TRUE}" && test -z "${BUILD_EDJE_DECC_FALSE}"; then 16746if test -z "${BUILD_EDJE_DECC_TRUE}" && test -z "${BUILD_EDJE_DECC_FALSE}"; then
16606 as_fn_error $? "conditional \"BUILD_EDJE_DECC\" was never defined. 16747 as_fn_error "conditional \"BUILD_EDJE_DECC\" was never defined.
16607Usually this means the macro was only invoked conditionally." "$LINENO" 5 16748Usually this means the macro was only invoked conditionally." "$LINENO" 5
16608fi 16749fi
16609if test -z "${BUILD_EDJE_RECC_TRUE}" && test -z "${BUILD_EDJE_RECC_FALSE}"; then 16750if test -z "${BUILD_EDJE_RECC_TRUE}" && test -z "${BUILD_EDJE_RECC_FALSE}"; then
16610 as_fn_error $? "conditional \"BUILD_EDJE_RECC\" was never defined. 16751 as_fn_error "conditional \"BUILD_EDJE_RECC\" was never defined.
16611Usually this means the macro was only invoked conditionally." "$LINENO" 5 16752Usually this means the macro was only invoked conditionally." "$LINENO" 5
16612fi 16753fi
16613if test -z "${BUILD_EDJE_PLAYER_TRUE}" && test -z "${BUILD_EDJE_PLAYER_FALSE}"; then 16754if test -z "${BUILD_EDJE_PLAYER_TRUE}" && test -z "${BUILD_EDJE_PLAYER_FALSE}"; then
16614 as_fn_error $? "conditional \"BUILD_EDJE_PLAYER\" was never defined. 16755 as_fn_error "conditional \"BUILD_EDJE_PLAYER\" was never defined.
16615Usually this means the macro was only invoked conditionally." "$LINENO" 5 16756Usually this means the macro was only invoked conditionally." "$LINENO" 5
16616fi 16757fi
16617if test -z "${BUILD_EDJE_INSPECTOR_TRUE}" && test -z "${BUILD_EDJE_INSPECTOR_FALSE}"; then 16758if test -z "${BUILD_EDJE_INSPECTOR_TRUE}" && test -z "${BUILD_EDJE_INSPECTOR_FALSE}"; then
16618 as_fn_error $? "conditional \"BUILD_EDJE_INSPECTOR\" was never defined. 16759 as_fn_error "conditional \"BUILD_EDJE_INSPECTOR\" was never defined.
16619Usually this means the macro was only invoked conditionally." "$LINENO" 5 16760Usually this means the macro was only invoked conditionally." "$LINENO" 5
16620fi 16761fi
16621if test -z "${BUILD_EDJE_EXTERNAL_INSPECTOR_TRUE}" && test -z "${BUILD_EDJE_EXTERNAL_INSPECTOR_FALSE}"; then 16762if test -z "${BUILD_EDJE_EXTERNAL_INSPECTOR_TRUE}" && test -z "${BUILD_EDJE_EXTERNAL_INSPECTOR_FALSE}"; then
16622 as_fn_error $? "conditional \"BUILD_EDJE_EXTERNAL_INSPECTOR\" was never defined. 16763 as_fn_error "conditional \"BUILD_EDJE_EXTERNAL_INSPECTOR\" was never defined.
16623Usually this means the macro was only invoked conditionally." "$LINENO" 5 16764Usually this means the macro was only invoked conditionally." "$LINENO" 5
16624fi 16765fi
16625if test -z "${EDJE_PROGRAM_CACHE_TRUE}" && test -z "${EDJE_PROGRAM_CACHE_FALSE}"; then 16766if test -z "${EDJE_PROGRAM_CACHE_TRUE}" && test -z "${EDJE_PROGRAM_CACHE_FALSE}"; then
16626 as_fn_error $? "conditional \"EDJE_PROGRAM_CACHE\" was never defined. 16767 as_fn_error "conditional \"EDJE_PROGRAM_CACHE\" was never defined.
16627Usually this means the macro was only invoked conditionally." "$LINENO" 5 16768Usually this means the macro was only invoked conditionally." "$LINENO" 5
16628fi 16769fi
16629if test -z "${EDJE_CALC_CACHE_TRUE}" && test -z "${EDJE_CALC_CACHE_FALSE}"; then 16770if test -z "${EDJE_CALC_CACHE_TRUE}" && test -z "${EDJE_CALC_CACHE_FALSE}"; then
16630 as_fn_error $? "conditional \"EDJE_CALC_CACHE\" was never defined. 16771 as_fn_error "conditional \"EDJE_CALC_CACHE\" was never defined.
16631Usually this means the macro was only invoked conditionally." "$LINENO" 5 16772Usually this means the macro was only invoked conditionally." "$LINENO" 5
16632fi 16773fi
16633if test -z "${BUILD_EDJE_FP_TRUE}" && test -z "${BUILD_EDJE_FP_FALSE}"; then 16774if test -z "${BUILD_EDJE_FP_TRUE}" && test -z "${BUILD_EDJE_FP_FALSE}"; then
16634 as_fn_error $? "conditional \"BUILD_EDJE_FP\" was never defined. 16775 as_fn_error "conditional \"BUILD_EDJE_FP\" was never defined.
16635Usually this means the macro was only invoked conditionally." "$LINENO" 5 16776Usually this means the macro was only invoked conditionally." "$LINENO" 5
16636fi 16777fi
16637if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then 16778if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
16638 as_fn_error $? "conditional \"am__fastdepCC\" was never defined. 16779 as_fn_error "conditional \"am__fastdepCC\" was never defined.
16639Usually this means the macro was only invoked conditionally." "$LINENO" 5 16780Usually this means the macro was only invoked conditionally." "$LINENO" 5
16640fi 16781fi
16641if test -z "${EFL_BUILD_DOC_TRUE}" && test -z "${EFL_BUILD_DOC_FALSE}"; then 16782if test -z "${EFL_BUILD_DOC_TRUE}" && test -z "${EFL_BUILD_DOC_FALSE}"; then
16642 as_fn_error $? "conditional \"EFL_BUILD_DOC\" was never defined. 16783 as_fn_error "conditional \"EFL_BUILD_DOC\" was never defined.
16643Usually this means the macro was only invoked conditionally." "$LINENO" 5 16784Usually this means the macro was only invoked conditionally." "$LINENO" 5
16644fi 16785fi
16645if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then 16786if test -z "${HAVE_PYTHON_TRUE}" && test -z "${HAVE_PYTHON_FALSE}"; then
16646 as_fn_error $? "conditional \"HAVE_PYTHON\" was never defined. 16787 as_fn_error "conditional \"HAVE_PYTHON\" was never defined.
16647Usually this means the macro was only invoked conditionally." "$LINENO" 5 16788Usually this means the macro was only invoked conditionally." "$LINENO" 5
16648fi 16789fi
16649if test -z "${ENABLE_MULTISENSE_TRUE}" && test -z "${ENABLE_MULTISENSE_FALSE}"; then 16790if test -z "${ENABLE_MULTISENSE_TRUE}" && test -z "${ENABLE_MULTISENSE_FALSE}"; then
16650 as_fn_error $? "conditional \"ENABLE_MULTISENSE\" was never defined. 16791 as_fn_error "conditional \"ENABLE_MULTISENSE\" was never defined.
16651Usually this means the macro was only invoked conditionally." "$LINENO" 5 16792Usually this means the macro was only invoked conditionally." "$LINENO" 5
16652fi 16793fi
16653if test -z "${HAVE_LIBSNDFILE_TRUE}" && test -z "${HAVE_LIBSNDFILE_FALSE}"; then 16794if test -z "${HAVE_LIBSNDFILE_TRUE}" && test -z "${HAVE_LIBSNDFILE_FALSE}"; then
16654 as_fn_error $? "conditional \"HAVE_LIBSNDFILE\" was never defined. 16795 as_fn_error "conditional \"HAVE_LIBSNDFILE\" was never defined.
16655Usually this means the macro was only invoked conditionally." "$LINENO" 5 16796Usually this means the macro was only invoked conditionally." "$LINENO" 5
16656fi 16797fi
16657if test -z "${HAVE_LIBREMIX_TRUE}" && test -z "${HAVE_LIBREMIX_FALSE}"; then 16798if test -z "${HAVE_LIBREMIX_TRUE}" && test -z "${HAVE_LIBREMIX_FALSE}"; then
16658 as_fn_error $? "conditional \"HAVE_LIBREMIX\" was never defined. 16799 as_fn_error "conditional \"HAVE_LIBREMIX\" was never defined.
16659Usually this means the macro was only invoked conditionally." "$LINENO" 5 16800Usually this means the macro was only invoked conditionally." "$LINENO" 5
16660fi 16801fi
16661if test -z "${HAVE_LIBALSA_TRUE}" && test -z "${HAVE_LIBALSA_FALSE}"; then 16802if test -z "${HAVE_LIBALSA_TRUE}" && test -z "${HAVE_LIBALSA_FALSE}"; then
16662 as_fn_error $? "conditional \"HAVE_LIBALSA\" was never defined. 16803 as_fn_error "conditional \"HAVE_LIBALSA\" was never defined.
16663Usually this means the macro was only invoked conditionally." "$LINENO" 5 16804Usually this means the macro was only invoked conditionally." "$LINENO" 5
16664fi 16805fi
16665if test -z "${BUILD_EPP_TRUE}" && test -z "${BUILD_EPP_FALSE}"; then 16806if test -z "${BUILD_EPP_TRUE}" && test -z "${BUILD_EPP_FALSE}"; then
16666 as_fn_error $? "conditional \"BUILD_EPP\" was never defined. 16807 as_fn_error "conditional \"BUILD_EPP\" was never defined.
16667Usually this means the macro was only invoked conditionally." "$LINENO" 5 16808Usually this means the macro was only invoked conditionally." "$LINENO" 5
16668fi 16809fi
16669if test -z "${EFL_ENABLE_TESTS_TRUE}" && test -z "${EFL_ENABLE_TESTS_FALSE}"; then 16810if test -z "${EFL_ENABLE_TESTS_TRUE}" && test -z "${EFL_ENABLE_TESTS_FALSE}"; then
16670 as_fn_error $? "conditional \"EFL_ENABLE_TESTS\" was never defined. 16811 as_fn_error "conditional \"EFL_ENABLE_TESTS\" was never defined.
16671Usually this means the macro was only invoked conditionally." "$LINENO" 5 16812Usually this means the macro was only invoked conditionally." "$LINENO" 5
16672fi 16813fi
16673if test -z "${EFL_ENABLE_COVERAGE_TRUE}" && test -z "${EFL_ENABLE_COVERAGE_FALSE}"; then 16814if test -z "${EFL_ENABLE_COVERAGE_TRUE}" && test -z "${EFL_ENABLE_COVERAGE_FALSE}"; then
16674 as_fn_error $? "conditional \"EFL_ENABLE_COVERAGE\" was never defined. 16815 as_fn_error "conditional \"EFL_ENABLE_COVERAGE\" was never defined.
16675Usually this means the macro was only invoked conditionally." "$LINENO" 5
16676fi
16677if test -z "${INSTALL_EXAMPLES_TRUE}" && test -z "${INSTALL_EXAMPLES_FALSE}"; then
16678 as_fn_error $? "conditional \"INSTALL_EXAMPLES\" was never defined.
16679Usually this means the macro was only invoked conditionally." "$LINENO" 5 16816Usually this means the macro was only invoked conditionally." "$LINENO" 5
16680fi 16817fi
16681if test -z "${BUILD_EXAMPLES_TRUE}" && test -z "${BUILD_EXAMPLES_FALSE}"; then 16818if test -z "${BUILD_EXAMPLES_TRUE}" && test -z "${BUILD_EXAMPLES_FALSE}"; then
16682 as_fn_error $? "conditional \"BUILD_EXAMPLES\" was never defined. 16819 as_fn_error "conditional \"BUILD_EXAMPLES\" was never defined.
16683Usually this means the macro was only invoked conditionally." "$LINENO" 5 16820Usually this means the macro was only invoked conditionally." "$LINENO" 5
16684fi 16821fi
16685 16822
@@ -16829,19 +16966,19 @@ export LANGUAGE
16829(unset CDPATH) >/dev/null 2>&1 && unset CDPATH 16966(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
16830 16967
16831 16968
16832# as_fn_error STATUS ERROR [LINENO LOG_FD] 16969# as_fn_error ERROR [LINENO LOG_FD]
16833# ---------------------------------------- 16970# ---------------------------------
16834# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are 16971# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
16835# provided, also output the error to LOG_FD, referencing LINENO. Then exit the 16972# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
16836# script with STATUS, using 1 if that was 0. 16973# script with status $?, using 1 if that was 0.
16837as_fn_error () 16974as_fn_error ()
16838{ 16975{
16839 as_status=$1; test $as_status -eq 0 && as_status=1 16976 as_status=$?; test $as_status -eq 0 && as_status=1
16840 if test "$4"; then 16977 if test "$3"; then
16841 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 16978 as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
16842 $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 16979 $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
16843 fi 16980 fi
16844 $as_echo "$as_me: error: $2" >&2 16981 $as_echo "$as_me: error: $1" >&2
16845 as_fn_exit $as_status 16982 as_fn_exit $as_status
16846} # as_fn_error 16983} # as_fn_error
16847 16984
@@ -17037,7 +17174,7 @@ $as_echo X"$as_dir" |
17037 test -d "$as_dir" && break 17174 test -d "$as_dir" && break
17038 done 17175 done
17039 test -z "$as_dirs" || eval "mkdir $as_dirs" 17176 test -z "$as_dirs" || eval "mkdir $as_dirs"
17040 } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" 17177 } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
17041 17178
17042 17179
17043} # as_fn_mkdir_p 17180} # as_fn_mkdir_p
@@ -17090,8 +17227,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17090# report actual input values of CONFIG_FILES etc. instead of their 17227# report actual input values of CONFIG_FILES etc. instead of their
17091# values after options handling. 17228# values after options handling.
17092ac_log=" 17229ac_log="
17093This file was extended by edje $as_me 1.1.0, which was 17230This file was extended by edje $as_me 1.1.99.67344, which was
17094generated by GNU Autoconf 2.67. Invocation command line was 17231generated by GNU Autoconf 2.65. Invocation command line was
17095 17232
17096 CONFIG_FILES = $CONFIG_FILES 17233 CONFIG_FILES = $CONFIG_FILES
17097 CONFIG_HEADERS = $CONFIG_HEADERS 17234 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -17156,11 +17293,11 @@ _ACEOF
17156cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 17293cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
17157ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 17294ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
17158ac_cs_version="\\ 17295ac_cs_version="\\
17159edje config.status 1.1.0 17296edje config.status 1.1.99.67344
17160configured by $0, generated by GNU Autoconf 2.67, 17297configured by $0, generated by GNU Autoconf 2.65,
17161 with options \\"\$ac_cs_config\\" 17298 with options \\"\$ac_cs_config\\"
17162 17299
17163Copyright (C) 2010 Free Software Foundation, Inc. 17300Copyright (C) 2009 Free Software Foundation, Inc.
17164This config.status script is free software; the Free Software Foundation 17301This config.status script is free software; the Free Software Foundation
17165gives unlimited permission to copy, distribute and modify it." 17302gives unlimited permission to copy, distribute and modify it."
17166 17303
@@ -17178,16 +17315,11 @@ ac_need_defaults=:
17178while test $# != 0 17315while test $# != 0
17179do 17316do
17180 case $1 in 17317 case $1 in
17181 --*=?*) 17318 --*=*)
17182 ac_option=`expr "X$1" : 'X\([^=]*\)='` 17319 ac_option=`expr "X$1" : 'X\([^=]*\)='`
17183 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` 17320 ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
17184 ac_shift=: 17321 ac_shift=:
17185 ;; 17322 ;;
17186 --*=)
17187 ac_option=`expr "X$1" : 'X\([^=]*\)='`
17188 ac_optarg=
17189 ac_shift=:
17190 ;;
17191 *) 17323 *)
17192 ac_option=$1 17324 ac_option=$1
17193 ac_optarg=$2 17325 ac_optarg=$2
@@ -17209,7 +17341,6 @@ do
17209 $ac_shift 17341 $ac_shift
17210 case $ac_optarg in 17342 case $ac_optarg in
17211 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; 17343 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
17212 '') as_fn_error $? "missing file argument" ;;
17213 esac 17344 esac
17214 as_fn_append CONFIG_FILES " '$ac_optarg'" 17345 as_fn_append CONFIG_FILES " '$ac_optarg'"
17215 ac_need_defaults=false;; 17346 ac_need_defaults=false;;
@@ -17222,7 +17353,7 @@ do
17222 ac_need_defaults=false;; 17353 ac_need_defaults=false;;
17223 --he | --h) 17354 --he | --h)
17224 # Conflict between --help and --header 17355 # Conflict between --help and --header
17225 as_fn_error $? "ambiguous option: \`$1' 17356 as_fn_error "ambiguous option: \`$1'
17226Try \`$0 --help' for more information.";; 17357Try \`$0 --help' for more information.";;
17227 --help | --hel | -h ) 17358 --help | --hel | -h )
17228 $as_echo "$ac_cs_usage"; exit ;; 17359 $as_echo "$ac_cs_usage"; exit ;;
@@ -17231,7 +17362,7 @@ Try \`$0 --help' for more information.";;
17231 ac_cs_silent=: ;; 17362 ac_cs_silent=: ;;
17232 17363
17233 # This is an error. 17364 # This is an error.
17234 -*) as_fn_error $? "unrecognized option: \`$1' 17365 -*) as_fn_error "unrecognized option: \`$1'
17235Try \`$0 --help' for more information." ;; 17366Try \`$0 --help' for more information." ;;
17236 17367
17237 *) as_fn_append ac_config_targets " $1" 17368 *) as_fn_append ac_config_targets " $1"
@@ -17405,47 +17536,6 @@ enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quot
17405enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' 17536enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
17406old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' 17537old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
17407striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' 17538striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
17408LD_='`$ECHO "X$LD_" | $Xsed -e "$delay_single_quote_subst"`'
17409old_archive_cmds_='`$ECHO "X$old_archive_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
17410compiler_='`$ECHO "X$compiler_" | $Xsed -e "$delay_single_quote_subst"`'
17411GCC_='`$ECHO "X$GCC_" | $Xsed -e "$delay_single_quote_subst"`'
17412lt_prog_compiler_no_builtin_flag_='`$ECHO "X$lt_prog_compiler_no_builtin_flag_" | $Xsed -e "$delay_single_quote_subst"`'
17413lt_prog_compiler_wl_='`$ECHO "X$lt_prog_compiler_wl_" | $Xsed -e "$delay_single_quote_subst"`'
17414lt_prog_compiler_pic_='`$ECHO "X$lt_prog_compiler_pic_" | $Xsed -e "$delay_single_quote_subst"`'
17415lt_prog_compiler_static_='`$ECHO "X$lt_prog_compiler_static_" | $Xsed -e "$delay_single_quote_subst"`'
17416lt_cv_prog_compiler_c_o_='`$ECHO "X$lt_cv_prog_compiler_c_o_" | $Xsed -e "$delay_single_quote_subst"`'
17417archive_cmds_need_lc_='`$ECHO "X$archive_cmds_need_lc_" | $Xsed -e "$delay_single_quote_subst"`'
17418enable_shared_with_static_runtimes_='`$ECHO "X$enable_shared_with_static_runtimes_" | $Xsed -e "$delay_single_quote_subst"`'
17419export_dynamic_flag_spec_='`$ECHO "X$export_dynamic_flag_spec_" | $Xsed -e "$delay_single_quote_subst"`'
17420whole_archive_flag_spec_='`$ECHO "X$whole_archive_flag_spec_" | $Xsed -e "$delay_single_quote_subst"`'
17421compiler_needs_object_='`$ECHO "X$compiler_needs_object_" | $Xsed -e "$delay_single_quote_subst"`'
17422old_archive_from_new_cmds_='`$ECHO "X$old_archive_from_new_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
17423old_archive_from_expsyms_cmds_='`$ECHO "X$old_archive_from_expsyms_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
17424archive_cmds_='`$ECHO "X$archive_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
17425archive_expsym_cmds_='`$ECHO "X$archive_expsym_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
17426module_cmds_='`$ECHO "X$module_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
17427module_expsym_cmds_='`$ECHO "X$module_expsym_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
17428with_gnu_ld_='`$ECHO "X$with_gnu_ld_" | $Xsed -e "$delay_single_quote_subst"`'
17429allow_undefined_flag_='`$ECHO "X$allow_undefined_flag_" | $Xsed -e "$delay_single_quote_subst"`'
17430no_undefined_flag_='`$ECHO "X$no_undefined_flag_" | $Xsed -e "$delay_single_quote_subst"`'
17431hardcode_libdir_flag_spec_='`$ECHO "X$hardcode_libdir_flag_spec_" | $Xsed -e "$delay_single_quote_subst"`'
17432hardcode_libdir_flag_spec_ld_='`$ECHO "X$hardcode_libdir_flag_spec_ld_" | $Xsed -e "$delay_single_quote_subst"`'
17433hardcode_libdir_separator_='`$ECHO "X$hardcode_libdir_separator_" | $Xsed -e "$delay_single_quote_subst"`'
17434hardcode_direct_='`$ECHO "X$hardcode_direct_" | $Xsed -e "$delay_single_quote_subst"`'
17435hardcode_direct_absolute_='`$ECHO "X$hardcode_direct_absolute_" | $Xsed -e "$delay_single_quote_subst"`'
17436hardcode_minus_L_='`$ECHO "X$hardcode_minus_L_" | $Xsed -e "$delay_single_quote_subst"`'
17437hardcode_shlibpath_var_='`$ECHO "X$hardcode_shlibpath_var_" | $Xsed -e "$delay_single_quote_subst"`'
17438hardcode_automatic_='`$ECHO "X$hardcode_automatic_" | $Xsed -e "$delay_single_quote_subst"`'
17439inherit_rpath_='`$ECHO "X$inherit_rpath_" | $Xsed -e "$delay_single_quote_subst"`'
17440link_all_deplibs_='`$ECHO "X$link_all_deplibs_" | $Xsed -e "$delay_single_quote_subst"`'
17441fix_srcfile_path_='`$ECHO "X$fix_srcfile_path_" | $Xsed -e "$delay_single_quote_subst"`'
17442always_export_symbols_='`$ECHO "X$always_export_symbols_" | $Xsed -e "$delay_single_quote_subst"`'
17443export_symbols_cmds_='`$ECHO "X$export_symbols_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
17444exclude_expsyms_='`$ECHO "X$exclude_expsyms_" | $Xsed -e "$delay_single_quote_subst"`'
17445include_expsyms_='`$ECHO "X$include_expsyms_" | $Xsed -e "$delay_single_quote_subst"`'
17446prelink_cmds_='`$ECHO "X$prelink_cmds_" | $Xsed -e "$delay_single_quote_subst"`'
17447file_list_spec_='`$ECHO "X$file_list_spec_" | $Xsed -e "$delay_single_quote_subst"`'
17448hardcode_action_='`$ECHO "X$hardcode_action_" | $Xsed -e "$delay_single_quote_subst"`'
17449 17539
17450LTCC='$LTCC' 17540LTCC='$LTCC'
17451LTCFLAGS='$LTCFLAGS' 17541LTCFLAGS='$LTCFLAGS'
@@ -17508,27 +17598,7 @@ library_names_spec \
17508soname_spec \ 17598soname_spec \
17509finish_eval \ 17599finish_eval \
17510old_striplib \ 17600old_striplib \
17511striplib \ 17601striplib; do
17512LD_ \
17513compiler_ \
17514lt_prog_compiler_no_builtin_flag_ \
17515lt_prog_compiler_wl_ \
17516lt_prog_compiler_pic_ \
17517lt_prog_compiler_static_ \
17518lt_cv_prog_compiler_c_o_ \
17519export_dynamic_flag_spec_ \
17520whole_archive_flag_spec_ \
17521compiler_needs_object_ \
17522with_gnu_ld_ \
17523allow_undefined_flag_ \
17524no_undefined_flag_ \
17525hardcode_libdir_flag_spec_ \
17526hardcode_libdir_flag_spec_ld_ \
17527hardcode_libdir_separator_ \
17528fix_srcfile_path_ \
17529exclude_expsyms_ \
17530include_expsyms_ \
17531file_list_spec_; do
17532 case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in 17602 case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
17533 *[\\\\\\\`\\"\\\$]*) 17603 *[\\\\\\\`\\"\\\$]*)
17534 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" 17604 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
@@ -17557,16 +17627,7 @@ postinstall_cmds \
17557postuninstall_cmds \ 17627postuninstall_cmds \
17558finish_cmds \ 17628finish_cmds \
17559sys_lib_search_path_spec \ 17629sys_lib_search_path_spec \
17560sys_lib_dlsearch_path_spec \ 17630sys_lib_dlsearch_path_spec; do
17561old_archive_cmds_ \
17562old_archive_from_new_cmds_ \
17563old_archive_from_expsyms_cmds_ \
17564archive_cmds_ \
17565archive_expsym_cmds_ \
17566module_cmds_ \
17567module_expsym_cmds_ \
17568export_symbols_cmds_ \
17569prelink_cmds_; do
17570 case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in 17631 case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
17571 *[\\\\\\\`\\"\\\$]*) 17632 *[\\\\\\\`\\"\\\$]*)
17572 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" 17633 eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
@@ -17633,7 +17694,7 @@ do
17633 "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;; 17694 "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
17634 "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;; 17695 "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
17635 17696
17636 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 17697 *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
17637 esac 17698 esac
17638done 17699done
17639 17700
@@ -17671,7 +17732,7 @@ $debug ||
17671{ 17732{
17672 tmp=./conf$$-$RANDOM 17733 tmp=./conf$$-$RANDOM
17673 (umask 077 && mkdir "$tmp") 17734 (umask 077 && mkdir "$tmp")
17674} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 17735} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
17675 17736
17676# Set up the scripts for CONFIG_FILES section. 17737# Set up the scripts for CONFIG_FILES section.
17677# No need to generate them if there are no CONFIG_FILES. 17738# No need to generate them if there are no CONFIG_FILES.
@@ -17688,7 +17749,7 @@ if test "x$ac_cr" = x; then
17688fi 17749fi
17689ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` 17750ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
17690if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then 17751if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
17691 ac_cs_awk_cr='\\r' 17752 ac_cs_awk_cr='\r'
17692else 17753else
17693 ac_cs_awk_cr=$ac_cr 17754 ac_cs_awk_cr=$ac_cr
17694fi 17755fi
@@ -17702,18 +17763,18 @@ _ACEOF
17702 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && 17763 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
17703 echo "_ACEOF" 17764 echo "_ACEOF"
17704} >conf$$subs.sh || 17765} >conf$$subs.sh ||
17705 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 17766 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
17706ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` 17767ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
17707ac_delim='%!_!# ' 17768ac_delim='%!_!# '
17708for ac_last_try in false false false false false :; do 17769for ac_last_try in false false false false false :; do
17709 . ./conf$$subs.sh || 17770 . ./conf$$subs.sh ||
17710 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 17771 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
17711 17772
17712 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` 17773 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
17713 if test $ac_delim_n = $ac_delim_num; then 17774 if test $ac_delim_n = $ac_delim_num; then
17714 break 17775 break
17715 elif $ac_last_try; then 17776 elif $ac_last_try; then
17716 as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 17777 as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
17717 else 17778 else
17718 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 17779 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
17719 fi 17780 fi
@@ -17802,28 +17863,20 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
17802else 17863else
17803 cat 17864 cat
17804fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 17865fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
17805 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 17866 || as_fn_error "could not setup config files machinery" "$LINENO" 5
17806_ACEOF 17867_ACEOF
17807 17868
17808# VPATH may cause trouble with some makes, so we remove sole $(srcdir), 17869# VPATH may cause trouble with some makes, so we remove $(srcdir),
17809# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and 17870# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
17810# trailing colons and then remove the whole line if VPATH becomes empty 17871# trailing colons and then remove the whole line if VPATH becomes empty
17811# (actually we leave an empty line to preserve line numbers). 17872# (actually we leave an empty line to preserve line numbers).
17812if test "x$srcdir" = x.; then 17873if test "x$srcdir" = x.; then
17813 ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ 17874 ac_vpsub='/^[ ]*VPATH[ ]*=/{
17814h 17875s/:*\$(srcdir):*/:/
17815s/// 17876s/:*\${srcdir}:*/:/
17816s/^/:/ 17877s/:*@srcdir@:*/:/
17817s/[ ]*$/:/ 17878s/^\([^=]*=[ ]*\):*/\1/
17818s/:\$(srcdir):/:/g
17819s/:\${srcdir}:/:/g
17820s/:@srcdir@:/:/g
17821s/^:*//
17822s/:*$// 17879s/:*$//
17823x
17824s/\(=[ ]*\).*/\1/
17825G
17826s/\n//
17827s/^[^=]*=[ ]*$// 17880s/^[^=]*=[ ]*$//
17828}' 17881}'
17829fi 17882fi
@@ -17851,7 +17904,7 @@ for ac_last_try in false false :; do
17851 if test -z "$ac_t"; then 17904 if test -z "$ac_t"; then
17852 break 17905 break
17853 elif $ac_last_try; then 17906 elif $ac_last_try; then
17854 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 17907 as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
17855 else 17908 else
17856 ac_delim="$ac_delim!$ac_delim _$ac_delim!! " 17909 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
17857 fi 17910 fi
@@ -17936,7 +17989,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
17936_ACAWK 17989_ACAWK
17937_ACEOF 17990_ACEOF
17938cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 17991cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
17939 as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 17992 as_fn_error "could not setup config headers machinery" "$LINENO" 5
17940fi # test -n "$CONFIG_HEADERS" 17993fi # test -n "$CONFIG_HEADERS"
17941 17994
17942 17995
@@ -17949,7 +18002,7 @@ do
17949 esac 18002 esac
17950 case $ac_mode$ac_tag in 18003 case $ac_mode$ac_tag in
17951 :[FHL]*:*);; 18004 :[FHL]*:*);;
17952 :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 18005 :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
17953 :[FH]-) ac_tag=-:-;; 18006 :[FH]-) ac_tag=-:-;;
17954 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 18007 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
17955 esac 18008 esac
@@ -17977,7 +18030,7 @@ do
17977 [\\/$]*) false;; 18030 [\\/$]*) false;;
17978 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 18031 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
17979 esac || 18032 esac ||
17980 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 18033 as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
17981 esac 18034 esac
17982 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 18035 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
17983 as_fn_append ac_file_inputs " '$ac_f'" 18036 as_fn_append ac_file_inputs " '$ac_f'"
@@ -18004,7 +18057,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
18004 18057
18005 case $ac_tag in 18058 case $ac_tag in
18006 *:-:* | *:-) cat >"$tmp/stdin" \ 18059 *:-:* | *:-) cat >"$tmp/stdin" \
18007 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 18060 || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
18008 esac 18061 esac
18009 ;; 18062 ;;
18010 esac 18063 esac
@@ -18141,22 +18194,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
18141$ac_datarootdir_hack 18194$ac_datarootdir_hack
18142" 18195"
18143eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 18196eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
18144 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 18197 || as_fn_error "could not create $ac_file" "$LINENO" 5
18145 18198
18146test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 18199test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
18147 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 18200 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
18148 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 18201 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
18149 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 18202 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
18150which seems to be undefined. Please make sure it is defined" >&5 18203which seems to be undefined. Please make sure it is defined." >&5
18151$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 18204$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
18152which seems to be undefined. Please make sure it is defined" >&2;} 18205which seems to be undefined. Please make sure it is defined." >&2;}
18153 18206
18154 rm -f "$tmp/stdin" 18207 rm -f "$tmp/stdin"
18155 case $ac_file in 18208 case $ac_file in
18156 -) cat "$tmp/out" && rm -f "$tmp/out";; 18209 -) cat "$tmp/out" && rm -f "$tmp/out";;
18157 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 18210 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
18158 esac \ 18211 esac \
18159 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 18212 || as_fn_error "could not create $ac_file" "$LINENO" 5
18160 ;; 18213 ;;
18161 :H) 18214 :H)
18162 # 18215 #
@@ -18167,19 +18220,19 @@ which seems to be undefined. Please make sure it is defined" >&2;}
18167 $as_echo "/* $configure_input */" \ 18220 $as_echo "/* $configure_input */" \
18168 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 18221 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
18169 } >"$tmp/config.h" \ 18222 } >"$tmp/config.h" \
18170 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 18223 || as_fn_error "could not create $ac_file" "$LINENO" 5
18171 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 18224 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
18172 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 18225 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
18173$as_echo "$as_me: $ac_file is unchanged" >&6;} 18226$as_echo "$as_me: $ac_file is unchanged" >&6;}
18174 else 18227 else
18175 rm -f "$ac_file" 18228 rm -f "$ac_file"
18176 mv "$tmp/config.h" "$ac_file" \ 18229 mv "$tmp/config.h" "$ac_file" \
18177 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 18230 || as_fn_error "could not create $ac_file" "$LINENO" 5
18178 fi 18231 fi
18179 else 18232 else
18180 $as_echo "/* $configure_input */" \ 18233 $as_echo "/* $configure_input */" \
18181 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 18234 && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
18182 || as_fn_error $? "could not create -" "$LINENO" 5 18235 || as_fn_error "could not create -" "$LINENO" 5
18183 fi 18236 fi
18184# Compute "$ac_file"'s index in $config_headers. 18237# Compute "$ac_file"'s index in $config_headers.
18185_am_arg="$ac_file" 18238_am_arg="$ac_file"
@@ -18970,7 +19023,7 @@ _ACEOF
18970ac_clean_files=$ac_clean_files_save 19023ac_clean_files=$ac_clean_files_save
18971 19024
18972test $ac_write_fail = 0 || 19025test $ac_write_fail = 0 ||
18973 as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 19026 as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
18974 19027
18975 19028
18976# configure is writing to config.log, and then calls config.status. 19029# configure is writing to config.log, and then calls config.status.
@@ -18991,7 +19044,7 @@ if test "$no_create" != yes; then
18991 exec 5>>config.log 19044 exec 5>>config.log
18992 # Use ||, not &&, to avoid exiting from the if with $? = 1, which 19045 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
18993 # would make configure fail if this is the last instruction. 19046 # would make configure fail if this is the last instruction.
18994 $ac_cs_success || as_fn_exit 1 19047 $ac_cs_success || as_fn_exit $?
18995fi 19048fi
18996if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then 19049if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
18997 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 19050 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff --git a/libraries/edje/configure.ac b/libraries/edje/configure.ac
index 36bf32c..eceed6c 100644
--- a/libraries/edje/configure.ac
+++ b/libraries/edje/configure.ac
@@ -2,11 +2,11 @@
2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
3m4_define([v_maj], [1]) 3m4_define([v_maj], [1])
4m4_define([v_min], [1]) 4m4_define([v_min], [1])
5m4_define([v_mic], [0]) 5m4_define([v_mic], [99])
6m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) 6m4_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']))
7m4_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']))]) 7m4_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']))])
8##-- When released, remove the dnl on the below line 8##-- When released, remove the dnl on the below line
9m4_undefine([v_rev]) 9dnl m4_undefine([v_rev])
10##-- When doing snapshots - change soname. remove dnl on below line 10##-- When doing snapshots - change soname. remove dnl on below line
11dnl m4_define([relname], [ver-pre-svn-07]) 11dnl m4_define([relname], [ver-pre-svn-07])
12dnl m4_define([v_rel], [-release relname]) 12dnl m4_define([v_rel], [-release relname])
@@ -291,14 +291,14 @@ PKG_CHECK_MODULES([ECORE_IMF],
291 [have_ecore_imf="no"]) 291 [have_ecore_imf="no"])
292 292
293# Enable Multisense use 293# Enable Multisense use
294want_multisense="no" 294want_multisense="yes"
295dnl AC_ARG_ENABLE([multisense], 295AC_ARG_ENABLE([multisense],
296dnl [AC_HELP_STRING( 296 [AC_HELP_STRING(
297dnl [--enable-multisense], 297 [--enable-multisense],
298dnl [multisense provides sound. tone and haptic effects support, [[default=disabled]]] 298 [multisense provides sound. tone and haptic effects support, [[default=disabled]]]
299dnl )], 299 )],
300dnl [want_multisense=$enableval] 300 [want_multisense=$enableval]
301dnl ) 301)
302AM_CONDITIONAL([ENABLE_MULTISENSE], [test "x${want_multisense}" = "xyes"]) 302AM_CONDITIONAL([ENABLE_MULTISENSE], [test "x${want_multisense}" = "xyes"])
303 303
304##sndfile library 304##sndfile library
@@ -534,21 +534,6 @@ fi
534 534
535## Examples 535## Examples
536 536
537install_examples="yes"
538AC_ARG_ENABLE([install-examples],
539 AC_HELP_STRING([--disable-install-examples],
540 [disable installing examples (compiled or just source).
541 @<:@default==enabled@:>@]),
542 [
543 if test "x${enableval}" = "xyes" ; then
544 install_examples="yes"
545 else
546 install_examples="no"
547 fi
548 ],
549 [install_examples="yes"])
550AM_CONDITIONAL([INSTALL_EXAMPLES], [test "x${install_examples}" = "xyes"])
551
552build_examples="no" 537build_examples="no"
553AC_ARG_ENABLE([build-examples], 538AC_ARG_ENABLE([build-examples],
554 AC_HELP_STRING([--enable-build-examples], 539 AC_HELP_STRING([--enable-build-examples],
@@ -557,7 +542,7 @@ AC_ARG_ENABLE([build-examples],
557 if test "x${enableval}" = "xyes" ; then 542 if test "x${enableval}" = "xyes" ; then
558 build_examples="yes" 543 build_examples="yes"
559 edje_cc=$($PKG_CONFIG --variable=prefix edje)/bin/edje_cc 544 edje_cc=$($PKG_CONFIG --variable=prefix edje)/bin/edje_cc
560 # put in here the dependencies for Edje' examples. They are 545 # put in here the dependencies for Edje' examples. They are
561 # meant to be 'real world' usage examples, thus one will be 546 # meant to be 'real world' usage examples, thus one will be
562 # using higher level libraries on these programs 547 # using higher level libraries on these programs
563 AC_SUBST(edje_cc) 548 AC_SUBST(edje_cc)
diff --git a/libraries/edje/data/Makefile.in b/libraries/edje/data/Makefile.in
index 8555a6e..83c9e7c 100644
--- a/libraries/edje/data/Makefile.in
+++ b/libraries/edje/data/Makefile.in
@@ -217,8 +217,6 @@ PACKAGE_URL = @PACKAGE_URL@
217PACKAGE_VERSION = @PACKAGE_VERSION@ 217PACKAGE_VERSION = @PACKAGE_VERSION@
218PATH_SEPARATOR = @PATH_SEPARATOR@ 218PATH_SEPARATOR = @PATH_SEPARATOR@
219PKG_CONFIG = @PKG_CONFIG@ 219PKG_CONFIG = @PKG_CONFIG@
220PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
221PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
222PYTHON = @PYTHON@ 220PYTHON = @PYTHON@
223PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 221PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
224PYTHON_PLATFORM = @PYTHON_PLATFORM@ 222PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/data/include/Makefile.in b/libraries/edje/data/include/Makefile.in
index ce14f03..b639450 100644
--- a/libraries/edje/data/include/Makefile.in
+++ b/libraries/edje/data/include/Makefile.in
@@ -177,8 +177,6 @@ PACKAGE_URL = @PACKAGE_URL@
177PACKAGE_VERSION = @PACKAGE_VERSION@ 177PACKAGE_VERSION = @PACKAGE_VERSION@
178PATH_SEPARATOR = @PATH_SEPARATOR@ 178PATH_SEPARATOR = @PATH_SEPARATOR@
179PKG_CONFIG = @PKG_CONFIG@ 179PKG_CONFIG = @PKG_CONFIG@
180PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
181PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
182PYTHON = @PYTHON@ 180PYTHON = @PYTHON@
183PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 181PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
184PYTHON_PLATFORM = @PYTHON_PLATFORM@ 182PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/doc/Makefile.in b/libraries/edje/doc/Makefile.in
index b821675..d88c39e 100644
--- a/libraries/edje/doc/Makefile.in
+++ b/libraries/edje/doc/Makefile.in
@@ -154,8 +154,6 @@ PACKAGE_URL = @PACKAGE_URL@
154PACKAGE_VERSION = @PACKAGE_VERSION@ 154PACKAGE_VERSION = @PACKAGE_VERSION@
155PATH_SEPARATOR = @PATH_SEPARATOR@ 155PATH_SEPARATOR = @PATH_SEPARATOR@
156PKG_CONFIG = @PKG_CONFIG@ 156PKG_CONFIG = @PKG_CONFIG@
157PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
158PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
159PYTHON = @PYTHON@ 157PYTHON = @PYTHON@
160PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 158PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
161PYTHON_PLATFORM = @PYTHON_PLATFORM@ 159PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/edje.spec b/libraries/edje/edje.spec
index d887479..cede72d 100644
--- a/libraries/edje/edje.spec
+++ b/libraries/edje/edje.spec
@@ -4,7 +4,7 @@
4 4
5Summary: Complex Graphical Design/Layout Engine 5Summary: Complex Graphical Design/Layout Engine
6Name: edje 6Name: edje
7Version: 1.1.0 7Version: 1.1.99.67344
8Release: %{_rel} 8Release: %{_rel}
9License: BSD 9License: BSD
10Group: System Environment/Libraries 10Group: System Environment/Libraries
@@ -81,8 +81,8 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
81 81
82%files devel 82%files devel
83%defattr(-, root, root) 83%defattr(-, root, root)
84%doc doc/html
85%{_libdir}/*.so 84%{_libdir}/*.so
85%{_libdir}/edje/modules/multisense_factory/*/module.*
86%{_libdir}/*.la 86%{_libdir}/*.la
87%{_libdir}/*.a 87%{_libdir}/*.a
88%{_libdir}/pkgconfig/* 88%{_libdir}/pkgconfig/*
diff --git a/libraries/edje/edje.spec.in b/libraries/edje/edje.spec.in
index be7069c..a05e8a3 100644
--- a/libraries/edje/edje.spec.in
+++ b/libraries/edje/edje.spec.in
@@ -81,8 +81,8 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
81 81
82%files devel 82%files devel
83%defattr(-, root, root) 83%defattr(-, root, root)
84%doc doc/html
85%{_libdir}/*.so 84%{_libdir}/*.so
85%{_libdir}/edje/modules/multisense_factory/*/module.*
86%{_libdir}/*.la 86%{_libdir}/*.la
87%{_libdir}/*.a 87%{_libdir}/*.a
88%{_libdir}/pkgconfig/* 88%{_libdir}/pkgconfig/*
diff --git a/libraries/edje/ltmain.sh b/libraries/edje/ltmain.sh
index fa4b1e1..7ed280b 100755
--- a/libraries/edje/ltmain.sh
+++ b/libraries/edje/ltmain.sh
@@ -65,7 +65,7 @@
65# compiler: $LTCC 65# compiler: $LTCC
66# compiler flags: $LTCFLAGS 66# compiler flags: $LTCFLAGS
67# linker: $LD (gnu? $with_gnu_ld) 67# linker: $LD (gnu? $with_gnu_ld)
68# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3 68# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
69# automake: $automake_version 69# automake: $automake_version
70# autoconf: $autoconf_version 70# autoconf: $autoconf_version
71# 71#
@@ -73,7 +73,7 @@
73 73
74PROGRAM=ltmain.sh 74PROGRAM=ltmain.sh
75PACKAGE=libtool 75PACKAGE=libtool
76VERSION="2.2.6b Debian-2.2.6b-2ubuntu3" 76VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
77TIMESTAMP="" 77TIMESTAMP=""
78package_revision=1.3017 78package_revision=1.3017
79 79
diff --git a/libraries/edje/m4/libtool.m4 b/libraries/edje/m4/libtool.m4
index 6e86e5b..a3fee53 100644
--- a/libraries/edje/m4/libtool.m4
+++ b/libraries/edje/m4/libtool.m4
@@ -380,12 +380,12 @@ m4_define([lt_decl_dquote_varnames],
380# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) 380# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
381# --------------------------------------------------- 381# ---------------------------------------------------
382m4_define([lt_decl_varnames_tagged], 382m4_define([lt_decl_varnames_tagged],
383[_$0(m4_quote(m4_default([$1], [[, ]])), 383[m4_assert([$# <= 2])dnl
384 m4_quote(m4_if([$2], [], 384_$0(m4_quote(m4_default([$1], [[, ]])),
385 m4_quote(lt_decl_tag_varnames), 385 m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
386 m4_quote(m4_shift($@)))), 386 m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
387 m4_split(m4_normalize(m4_quote(_LT_TAGS))))]) 387m4_define([_lt_decl_varnames_tagged],
388m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)]) 388[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
389 389
390 390
391# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) 391# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
@@ -945,10 +945,10 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
945 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; 945 _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
946 darwin1.*) 946 darwin1.*)
947 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 947 _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
948 darwin*) # darwin 5.x on 948 darwin*) # darwin 5.x on
949 # if running on 10.5 or later, the deployment target defaults 949 # if running on 10.5 or later, the deployment target defaults
950 # to the OS version, if on x86, and 10.4, the deployment 950 # to the OS version, if on x86, and 10.4, the deployment
951 # target defaults to 10.4. Don't you love it? 951 # target defaults to 10.4. Don't you love it?
952 case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 952 case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
953 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) 953 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
954 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; 954 _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
@@ -990,7 +990,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
990 _LT_TAGVAR(whole_archive_flag_spec, $1)='' 990 _LT_TAGVAR(whole_archive_flag_spec, $1)=''
991 _LT_TAGVAR(link_all_deplibs, $1)=yes 991 _LT_TAGVAR(link_all_deplibs, $1)=yes
992 _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" 992 _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
993 if test "$GCC" = "yes"; then 993 case $cc_basename in
994 ifort*) _lt_dar_can_shared=yes ;;
995 *) _lt_dar_can_shared=$GCC ;;
996 esac
997 if test "$_lt_dar_can_shared" = "yes"; then
994 output_verbose_link_cmd=echo 998 output_verbose_link_cmd=echo
995 _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" 999 _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
996 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" 1000 _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
@@ -1512,7 +1516,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
1512 lt_cv_sys_max_cmd_len=-1; 1516 lt_cv_sys_max_cmd_len=-1;
1513 ;; 1517 ;;
1514 1518
1515 cygwin* | mingw*) 1519 cygwin* | mingw* | cegcc*)
1516 # On Win9x/ME, this test blows up -- it succeeds, but takes 1520 # On Win9x/ME, this test blows up -- it succeeds, but takes
1517 # about 5 minutes as the teststring grows exponentially. 1521 # about 5 minutes as the teststring grows exponentially.
1518 # Worse, since 9x/ME are not pre-emptively multitasking, 1522 # Worse, since 9x/ME are not pre-emptively multitasking,
@@ -1680,10 +1684,6 @@ else
1680# endif 1684# endif
1681#endif 1685#endif
1682 1686
1683#ifdef __cplusplus
1684extern "C" void exit (int);
1685#endif
1686
1687void fnord() { int i=42;} 1687void fnord() { int i=42;}
1688int main () 1688int main ()
1689{ 1689{
@@ -1699,7 +1699,7 @@ int main ()
1699 else 1699 else
1700 puts (dlerror ()); 1700 puts (dlerror ());
1701 1701
1702 exit (status); 1702 return status;
1703}] 1703}]
1704_LT_EOF 1704_LT_EOF
1705 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then 1705 if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -1738,7 +1738,7 @@ else
1738 lt_cv_dlopen_self=yes 1738 lt_cv_dlopen_self=yes
1739 ;; 1739 ;;
1740 1740
1741 mingw* | pw32*) 1741 mingw* | pw32* | cegcc*)
1742 lt_cv_dlopen="LoadLibrary" 1742 lt_cv_dlopen="LoadLibrary"
1743 lt_cv_dlopen_libs= 1743 lt_cv_dlopen_libs=
1744 ;; 1744 ;;
@@ -2035,6 +2035,7 @@ m4_defun([_LT_SYS_DYNAMIC_LINKER],
2035[AC_REQUIRE([AC_CANONICAL_HOST])dnl 2035[AC_REQUIRE([AC_CANONICAL_HOST])dnl
2036m4_require([_LT_DECL_EGREP])dnl 2036m4_require([_LT_DECL_EGREP])dnl
2037m4_require([_LT_FILEUTILS_DEFAULTS])dnl 2037m4_require([_LT_FILEUTILS_DEFAULTS])dnl
2038m4_require([_LT_DECL_OBJDUMP])dnl
2038m4_require([_LT_DECL_SED])dnl 2039m4_require([_LT_DECL_SED])dnl
2039AC_MSG_CHECKING([dynamic linker characteristics]) 2040AC_MSG_CHECKING([dynamic linker characteristics])
2040m4_if([$1], 2041m4_if([$1],
@@ -2199,14 +2200,14 @@ bsdi[[45]]*)
2199 # libtool to hard-code these into programs 2200 # libtool to hard-code these into programs
2200 ;; 2201 ;;
2201 2202
2202cygwin* | mingw* | pw32*) 2203cygwin* | mingw* | pw32* | cegcc*)
2203 version_type=windows 2204 version_type=windows
2204 shrext_cmds=".dll" 2205 shrext_cmds=".dll"
2205 need_version=no 2206 need_version=no
2206 need_lib_prefix=no 2207 need_lib_prefix=no
2207 2208
2208 case $GCC,$host_os in 2209 case $GCC,$host_os in
2209 yes,cygwin* | yes,mingw* | yes,pw32*) 2210 yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
2210 library_names_spec='$libname.dll.a' 2211 library_names_spec='$libname.dll.a'
2211 # DLL is installed to $(libdir)/../bin by postinstall_cmds 2212 # DLL is installed to $(libdir)/../bin by postinstall_cmds
2212 postinstall_cmds='base_file=`basename \${file}`~ 2213 postinstall_cmds='base_file=`basename \${file}`~
@@ -2229,7 +2230,7 @@ cygwin* | mingw* | pw32*)
2229 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 2230 soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2230 sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" 2231 sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
2231 ;; 2232 ;;
2232 mingw*) 2233 mingw* | cegcc*)
2233 # MinGW DLLs use traditional 'lib' prefix 2234 # MinGW DLLs use traditional 'lib' prefix
2234 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' 2235 soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
2235 sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` 2236 sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
@@ -2444,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*)
2444 ;; 2445 ;;
2445 2446
2446# This must be Linux ELF. 2447# This must be Linux ELF.
2447linux* | k*bsd*-gnu) 2448linux* | k*bsd*-gnu | kopensolaris*-gnu)
2448 version_type=linux 2449 version_type=linux
2449 need_lib_prefix=no 2450 need_lib_prefix=no
2450 need_version=no 2451 need_version=no
@@ -2667,7 +2668,7 @@ tpf*)
2667 version_type=linux 2668 version_type=linux
2668 need_lib_prefix=no 2669 need_lib_prefix=no
2669 need_version=no 2670 need_version=no
2670 library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' 2671 library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
2671 shlibpath_var=LD_LIBRARY_PATH 2672 shlibpath_var=LD_LIBRARY_PATH
2672 shlibpath_overrides_runpath=no 2673 shlibpath_overrides_runpath=no
2673 hardcode_into_libs=yes 2674 hardcode_into_libs=yes
@@ -2691,7 +2692,7 @@ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
2691if test "$GCC" = yes; then 2692if test "$GCC" = yes; then
2692 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" 2693 variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
2693fi 2694fi
2694 2695
2695if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then 2696if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
2696 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" 2697 sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
2697fi 2698fi
@@ -2968,6 +2969,7 @@ _LT_DECL([], [reload_cmds], [2])dnl
2968# -- PORTME fill in with the dynamic library characteristics 2969# -- PORTME fill in with the dynamic library characteristics
2969m4_defun([_LT_CHECK_MAGIC_METHOD], 2970m4_defun([_LT_CHECK_MAGIC_METHOD],
2970[m4_require([_LT_DECL_EGREP]) 2971[m4_require([_LT_DECL_EGREP])
2972m4_require([_LT_DECL_OBJDUMP])
2971AC_CACHE_CHECK([how to recognize dependent libraries], 2973AC_CACHE_CHECK([how to recognize dependent libraries],
2972lt_cv_deplibs_check_method, 2974lt_cv_deplibs_check_method,
2973[lt_cv_file_magic_cmd='$MAGIC_CMD' 2975[lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -3018,6 +3020,12 @@ mingw* | pw32*)
3018 fi 3020 fi
3019 ;; 3021 ;;
3020 3022
3023cegcc)
3024 # use the weaker test based on 'objdump'. See mingw*.
3025 lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
3026 lt_cv_file_magic_cmd='$OBJDUMP -f'
3027 ;;
3028
3021darwin* | rhapsody*) 3029darwin* | rhapsody*)
3022 lt_cv_deplibs_check_method=pass_all 3030 lt_cv_deplibs_check_method=pass_all
3023 ;; 3031 ;;
@@ -3076,7 +3084,7 @@ irix5* | irix6* | nonstopux*)
3076 ;; 3084 ;;
3077 3085
3078# This must be Linux ELF. 3086# This must be Linux ELF.
3079linux* | k*bsd*-gnu) 3087linux* | k*bsd*-gnu | kopensolaris*-gnu)
3080 lt_cv_deplibs_check_method=pass_all 3088 lt_cv_deplibs_check_method=pass_all
3081 ;; 3089 ;;
3082 3090
@@ -3329,7 +3337,7 @@ case $host_os in
3329aix*) 3337aix*)
3330 symcode='[[BCDT]]' 3338 symcode='[[BCDT]]'
3331 ;; 3339 ;;
3332cygwin* | mingw* | pw32*) 3340cygwin* | mingw* | pw32* | cegcc*)
3333 symcode='[[ABCDGISTW]]' 3341 symcode='[[ABCDGISTW]]'
3334 ;; 3342 ;;
3335hpux*) 3343hpux*)
@@ -3575,7 +3583,7 @@ m4_if([$1], [CXX], [
3575 beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) 3583 beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
3576 # PIC is the default for these OSes. 3584 # PIC is the default for these OSes.
3577 ;; 3585 ;;
3578 mingw* | cygwin* | os2* | pw32*) 3586 mingw* | cygwin* | os2* | pw32* | cegcc*)
3579 # This hack is so that the source file can tell whether it is being 3587 # This hack is so that the source file can tell whether it is being
3580 # built for inclusion in a dll (and should export symbols for example). 3588 # built for inclusion in a dll (and should export symbols for example).
3581 # Although the cygwin gcc ignores -fPIC, still need this for old-style 3589 # Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -3602,10 +3610,11 @@ m4_if([$1], [CXX], [
3602 fi 3610 fi
3603 ;; 3611 ;;
3604 hpux*) 3612 hpux*)
3605 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 3613 # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
3606 # not for PA HP-UX. 3614 # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
3615 # sets the default TLS model and affects inlining.
3607 case $host_cpu in 3616 case $host_cpu in
3608 hppa*64*|ia64*) 3617 hppa*64*)
3609 ;; 3618 ;;
3610 *) 3619 *)
3611 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' 3620 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
@@ -3696,19 +3705,26 @@ m4_if([$1], [CXX], [
3696 ;; 3705 ;;
3697 esac 3706 esac
3698 ;; 3707 ;;
3699 linux* | k*bsd*-gnu) 3708 linux* | k*bsd*-gnu | kopensolaris*-gnu)
3700 case $cc_basename in 3709 case $cc_basename in
3701 KCC*) 3710 KCC*)
3702 # KAI C++ Compiler 3711 # KAI C++ Compiler
3703 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' 3712 _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
3704 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' 3713 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
3705 ;; 3714 ;;
3706 icpc* | ecpc* ) 3715 ecpc* )
3707 # Intel C++ 3716 # old Intel C++ for x86_64 which still supported -KPIC.
3708 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 3717 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3709 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 3718 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3710 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' 3719 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
3711 ;; 3720 ;;
3721 icpc* )
3722 # Intel C++, used to be incompatible with GCC.
3723 # ICC 10 doesn't accept -KPIC any more.
3724 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3725 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
3726 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
3727 ;;
3712 pgCC* | pgcpp*) 3728 pgCC* | pgcpp*)
3713 # Portland Group C++ compiler 3729 # Portland Group C++ compiler
3714 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 3730 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -3874,7 +3890,7 @@ m4_if([$1], [CXX], [
3874 # PIC is the default for these OSes. 3890 # PIC is the default for these OSes.
3875 ;; 3891 ;;
3876 3892
3877 mingw* | cygwin* | pw32* | os2*) 3893 mingw* | cygwin* | pw32* | os2* | cegcc*)
3878 # This hack is so that the source file can tell whether it is being 3894 # This hack is so that the source file can tell whether it is being
3879 # built for inclusion in a dll (and should export symbols for example). 3895 # built for inclusion in a dll (and should export symbols for example).
3880 # Although the cygwin gcc ignores -fPIC, still need this for old-style 3896 # Although the cygwin gcc ignores -fPIC, still need this for old-style
@@ -3890,10 +3906,11 @@ m4_if([$1], [CXX], [
3890 ;; 3906 ;;
3891 3907
3892 hpux*) 3908 hpux*)
3893 # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but 3909 # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
3894 # not for PA HP-UX. 3910 # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
3911 # sets the default TLS model and affects inlining.
3895 case $host_cpu in 3912 case $host_cpu in
3896 hppa*64*|ia64*) 3913 hppa*64*)
3897 # +Z the default 3914 # +Z the default
3898 ;; 3915 ;;
3899 *) 3916 *)
@@ -3943,7 +3960,7 @@ m4_if([$1], [CXX], [
3943 fi 3960 fi
3944 ;; 3961 ;;
3945 3962
3946 mingw* | cygwin* | pw32* | os2*) 3963 mingw* | cygwin* | pw32* | os2* | cegcc*)
3947 # This hack is so that the source file can tell whether it is being 3964 # This hack is so that the source file can tell whether it is being
3948 # built for inclusion in a dll (and should export symbols for example). 3965 # built for inclusion in a dll (and should export symbols for example).
3949 m4_if([$1], [GCJ], [], 3966 m4_if([$1], [GCJ], [],
@@ -3972,13 +3989,27 @@ m4_if([$1], [CXX], [
3972 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' 3989 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
3973 ;; 3990 ;;
3974 3991
3975 linux* | k*bsd*-gnu) 3992 linux* | k*bsd*-gnu | kopensolaris*-gnu)
3976 case $cc_basename in 3993 case $cc_basename in
3977 icc* | ecc* | ifort*) 3994 # old Intel for x86_64 which still supported -KPIC.
3995 ecc*)
3978 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' 3996 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
3979 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' 3997 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
3980 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' 3998 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
3981 ;; 3999 ;;
4000 # icc used to be incompatible with GCC.
4001 # ICC 10 doesn't accept -KPIC any more.
4002 icc* | ifort*)
4003 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4004 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
4005 _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
4006 ;;
4007 # Lahey Fortran 8.1.
4008 lf95*)
4009 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
4010 _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
4011 _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
4012 ;;
3982 pgcc* | pgf77* | pgf90* | pgf95*) 4013 pgcc* | pgf77* | pgf90* | pgf95*)
3983 # Portland Group compilers (*not* the Pentium gcc compiler, 4014 # Portland Group compilers (*not* the Pentium gcc compiler,
3984 # which looks to be a dead project) 4015 # which looks to be a dead project)
@@ -4160,7 +4191,7 @@ m4_if([$1], [CXX], [
4160 pw32*) 4191 pw32*)
4161 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" 4192 _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
4162 ;; 4193 ;;
4163 cygwin* | mingw*) 4194 cygwin* | mingw* | cegcc*)
4164 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' 4195 _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
4165 ;; 4196 ;;
4166 linux* | k*bsd*-gnu) 4197 linux* | k*bsd*-gnu)
@@ -4215,7 +4246,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
4215 extract_expsyms_cmds= 4246 extract_expsyms_cmds=
4216 4247
4217 case $host_os in 4248 case $host_os in
4218 cygwin* | mingw* | pw32*) 4249 cygwin* | mingw* | pw32* | cegcc*)
4219 # FIXME: the MSVC++ port hasn't been tested in a loooong time 4250 # FIXME: the MSVC++ port hasn't been tested in a loooong time
4220 # When not using gcc, we currently assume that we are using 4251 # When not using gcc, we currently assume that we are using
4221 # Microsoft Visual C++. 4252 # Microsoft Visual C++.
@@ -4230,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for C++ above.
4230 openbsd*) 4261 openbsd*)
4231 with_gnu_ld=no 4262 with_gnu_ld=no
4232 ;; 4263 ;;
4264 linux* | k*bsd*-gnu)
4265 _LT_TAGVAR(link_all_deplibs, $1)=no
4266 ;;
4233 esac 4267 esac
4234 4268
4235 _LT_TAGVAR(ld_shlibs, $1)=yes 4269 _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4251,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
4251 fi 4285 fi
4252 supports_anon_versioning=no 4286 supports_anon_versioning=no
4253 case `$LD -v 2>&1` in 4287 case `$LD -v 2>&1` in
4288 *GNU\ gold*) supports_anon_versioning=yes ;;
4254 *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 4289 *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
4255 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... 4290 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
4256 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... 4291 *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -4302,7 +4337,7 @@ _LT_EOF
4302 fi 4337 fi
4303 ;; 4338 ;;
4304 4339
4305 cygwin* | mingw* | pw32*) 4340 cygwin* | mingw* | pw32* | cegcc*)
4306 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, 4341 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
4307 # as there is no search path for DLLs. 4342 # as there is no search path for DLLs.
4308 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' 4343 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -4342,7 +4377,7 @@ _LT_EOF
4342 _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' 4377 _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
4343 ;; 4378 ;;
4344 4379
4345 gnu* | linux* | tpf* | k*bsd*-gnu) 4380 gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
4346 tmp_diet=no 4381 tmp_diet=no
4347 if test "$host_os" = linux-dietlibc; then 4382 if test "$host_os" = linux-dietlibc; then
4348 case $cc_basename in 4383 case $cc_basename in
@@ -4368,6 +4403,9 @@ _LT_EOF
4368 tmp_addflag=' -i_dynamic -nofor_main' ;; 4403 tmp_addflag=' -i_dynamic -nofor_main' ;;
4369 ifc* | ifort*) # Intel Fortran compiler 4404 ifc* | ifort*) # Intel Fortran compiler
4370 tmp_addflag=' -nofor_main' ;; 4405 tmp_addflag=' -nofor_main' ;;
4406 lf95*) # Lahey Fortran 8.1
4407 _LT_TAGVAR(whole_archive_flag_spec, $1)=
4408 tmp_sharedflag='--shared' ;;
4371 xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) 4409 xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
4372 tmp_sharedflag='-qmkshrobj' 4410 tmp_sharedflag='-qmkshrobj'
4373 tmp_addflag= ;; 4411 tmp_addflag= ;;
@@ -4600,6 +4638,7 @@ _LT_EOF
4600 fi 4638 fi
4601 fi 4639 fi
4602 4640
4641 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
4603 # It seems that -bexpall does not export symbols beginning with 4642 # It seems that -bexpall does not export symbols beginning with
4604 # underscore (_), so it is better to generate a list of symbols to export. 4643 # underscore (_), so it is better to generate a list of symbols to export.
4605 _LT_TAGVAR(always_export_symbols, $1)=yes 4644 _LT_TAGVAR(always_export_symbols, $1)=yes
@@ -4654,7 +4693,7 @@ _LT_EOF
4654 _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic 4693 _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
4655 ;; 4694 ;;
4656 4695
4657 cygwin* | mingw* | pw32*) 4696 cygwin* | mingw* | pw32* | cegcc*)
4658 # When not using gcc, we currently assume that we are using 4697 # When not using gcc, we currently assume that we are using
4659 # Microsoft Visual C++. 4698 # Microsoft Visual C++.
4660 # hardcode_libdir_flag_spec is actually meaningless, as there is 4699 # hardcode_libdir_flag_spec is actually meaningless, as there is
@@ -4758,7 +4797,7 @@ _LT_EOF
4758 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' 4797 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
4759 ;; 4798 ;;
4760 ia64*) 4799 ia64*)
4761 _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' 4800 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
4762 ;; 4801 ;;
4763 *) 4802 *)
4764 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' 4803 _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -5543,6 +5582,7 @@ if test "$_lt_caught_CXX_error" != yes; then
5543 fi 5582 fi
5544 fi 5583 fi
5545 5584
5585 _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
5546 # It seems that -bexpall does not export symbols beginning with 5586 # It seems that -bexpall does not export symbols beginning with
5547 # underscore (_), so it is better to generate a list of symbols to 5587 # underscore (_), so it is better to generate a list of symbols to
5548 # export. 5588 # export.
@@ -5601,7 +5641,7 @@ if test "$_lt_caught_CXX_error" != yes; then
5601 esac 5641 esac
5602 ;; 5642 ;;
5603 5643
5604 cygwin* | mingw* | pw32*) 5644 cygwin* | mingw* | pw32* | cegcc*)
5605 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, 5645 # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
5606 # as there is no search path for DLLs. 5646 # as there is no search path for DLLs.
5607 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' 5647 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -5821,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes; then
5821 _LT_TAGVAR(inherit_rpath, $1)=yes 5861 _LT_TAGVAR(inherit_rpath, $1)=yes
5822 ;; 5862 ;;
5823 5863
5824 linux* | k*bsd*-gnu) 5864 linux* | k*bsd*-gnu | kopensolaris*-gnu)
5825 case $cc_basename in 5865 case $cc_basename in
5826 KCC*) 5866 KCC*)
5827 # Kuck and Associates, Inc. (KAI) C++ Compiler 5867 # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -6986,6 +7026,18 @@ AC_SUBST([GREP])
6986]) 7026])
6987 7027
6988 7028
7029# _LT_DECL_OBJDUMP
7030# --------------
7031# If we don't have a new enough Autoconf to choose the best objdump
7032# available, choose the one first in the user's PATH.
7033m4_defun([_LT_DECL_OBJDUMP],
7034[AC_CHECK_TOOL(OBJDUMP, objdump, false)
7035test -z "$OBJDUMP" && OBJDUMP=objdump
7036_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
7037AC_SUBST([OBJDUMP])
7038])
7039
7040
6989# _LT_DECL_SED 7041# _LT_DECL_SED
6990# ------------ 7042# ------------
6991# Check for a fully-functional sed program, that truncates 7043# Check for a fully-functional sed program, that truncates
diff --git a/libraries/edje/m4/ltoptions.m4 b/libraries/edje/m4/ltoptions.m4
index e970119..34151a3 100644
--- a/libraries/edje/m4/ltoptions.m4
+++ b/libraries/edje/m4/ltoptions.m4
@@ -125,7 +125,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
125[enable_win32_dll=yes 125[enable_win32_dll=yes
126 126
127case $host in 127case $host in
128*-*-cygwin* | *-*-mingw* | *-*-pw32*) 128*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
129 AC_CHECK_TOOL(AS, as, false) 129 AC_CHECK_TOOL(AS, as, false)
130 AC_CHECK_TOOL(DLLTOOL, dlltool, false) 130 AC_CHECK_TOOL(DLLTOOL, dlltool, false)
131 AC_CHECK_TOOL(OBJDUMP, objdump, false) 131 AC_CHECK_TOOL(OBJDUMP, objdump, false)
diff --git a/libraries/edje/sha1-for-source.txt b/libraries/edje/sha1-for-source.txt
deleted file mode 100644
index ca5daa9..0000000
--- a/libraries/edje/sha1-for-source.txt
+++ /dev/null
@@ -1 +0,0 @@
10753a3ba57908d7c3f0e5ab4fb437c24ed1b5dce
diff --git a/libraries/edje/src/Makefile.in b/libraries/edje/src/Makefile.in
index 532d75b..fc05386 100644
--- a/libraries/edje/src/Makefile.in
+++ b/libraries/edje/src/Makefile.in
@@ -193,8 +193,6 @@ PACKAGE_URL = @PACKAGE_URL@
193PACKAGE_VERSION = @PACKAGE_VERSION@ 193PACKAGE_VERSION = @PACKAGE_VERSION@
194PATH_SEPARATOR = @PATH_SEPARATOR@ 194PATH_SEPARATOR = @PATH_SEPARATOR@
195PKG_CONFIG = @PKG_CONFIG@ 195PKG_CONFIG = @PKG_CONFIG@
196PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
197PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
198PYTHON = @PYTHON@ 196PYTHON = @PYTHON@
199PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 197PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
200PYTHON_PLATFORM = @PYTHON_PLATFORM@ 198PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/bin/Makefile.in b/libraries/edje/src/bin/Makefile.in
index 877bcb2..07bf025 100644
--- a/libraries/edje/src/bin/Makefile.in
+++ b/libraries/edje/src/bin/Makefile.in
@@ -291,8 +291,6 @@ PACKAGE_URL = @PACKAGE_URL@
291PACKAGE_VERSION = @PACKAGE_VERSION@ 291PACKAGE_VERSION = @PACKAGE_VERSION@
292PATH_SEPARATOR = @PATH_SEPARATOR@ 292PATH_SEPARATOR = @PATH_SEPARATOR@
293PKG_CONFIG = @PKG_CONFIG@ 293PKG_CONFIG = @PKG_CONFIG@
294PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
295PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
296PYTHON = @PYTHON@ 294PYTHON = @PYTHON@
297PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 295PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
298PYTHON_PLATFORM = @PYTHON_PLATFORM@ 296PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/bin/edje_cc.h b/libraries/edje/src/bin/edje_cc.h
index bcd31a1..d0c6d22 100644
--- a/libraries/edje/src/bin/edje_cc.h
+++ b/libraries/edje/src/bin/edje_cc.h
@@ -138,6 +138,7 @@ struct _Edje_Part_Parser
138/* global fn calls */ 138/* global fn calls */
139void data_setup(void); 139void data_setup(void);
140void data_write(void); 140void data_write(void);
141void data_queue_group_lookup(const char *name, Edje_Part *part);
141void data_queue_part_lookup(Edje_Part_Collection *pc, const char *name, int *dest); 142void data_queue_part_lookup(Edje_Part_Collection *pc, const char *name, int *dest);
142void data_queue_copied_part_lookup(Edje_Part_Collection *pc, int *src, int *dest); 143void data_queue_copied_part_lookup(Edje_Part_Collection *pc, int *src, int *dest);
143void data_queue_program_lookup(Edje_Part_Collection *pc, const char *name, int *dest); 144void data_queue_program_lookup(Edje_Part_Collection *pc, const char *name, int *dest);
diff --git a/libraries/edje/src/bin/edje_cc_handlers.c b/libraries/edje/src/bin/edje_cc_handlers.c
index 8bfc262..f74fa12 100644
--- a/libraries/edje/src/bin/edje_cc_handlers.c
+++ b/libraries/edje/src/bin/edje_cc_handlers.c
@@ -172,6 +172,7 @@ static void st_collections_group_parts_part_description_visible(void);
172static void st_collections_group_parts_part_description_align(void); 172static void st_collections_group_parts_part_description_align(void);
173static void st_collections_group_parts_part_description_fixed(void); 173static void st_collections_group_parts_part_description_fixed(void);
174static void st_collections_group_parts_part_description_min(void); 174static void st_collections_group_parts_part_description_min(void);
175static void st_collections_group_parts_part_description_minmul(void);
175static void st_collections_group_parts_part_description_max(void); 176static void st_collections_group_parts_part_description_max(void);
176static void st_collections_group_parts_part_description_step(void); 177static void st_collections_group_parts_part_description_step(void);
177static void st_collections_group_parts_part_description_aspect(void); 178static void st_collections_group_parts_part_description_aspect(void);
@@ -261,12 +262,9 @@ static void st_collections_group_programs_program_after(void);
261static void st_collections_group_programs_program_api(void); 262static void st_collections_group_programs_program_api(void);
262 263
263static void ob_collections_group_programs_program_script(void); 264static void ob_collections_group_programs_program_script(void);
264
265#ifdef ENABLE_MULTISENSE
266static void st_collections_group_sound_sample_name(void); 265static void st_collections_group_sound_sample_name(void);
267static void st_collections_group_sound_sample_source(void); 266static void st_collections_group_sound_sample_source(void);
268static void st_collections_group_sound_tone(void); 267static void st_collections_group_sound_tone(void);
269#endif
270 268
271/*****/ 269/*****/
272 270
@@ -305,14 +303,13 @@ New_Statement_Handler statement_handlers[] =
305 {"collections.color_classes.color_class.color", st_color_class_color}, /* dup */ 303 {"collections.color_classes.color_class.color", st_color_class_color}, /* dup */
306 {"collections.color_classes.color_class.color2", st_color_class_color2}, /* dup */ 304 {"collections.color_classes.color_class.color2", st_color_class_color2}, /* dup */
307 {"collections.color_classes.color_class.color3", st_color_class_color3}, /* dup */ 305 {"collections.color_classes.color_class.color3", st_color_class_color3}, /* dup */
308#ifdef ENABLE_MULTISENSE 306
309 {"collections.sounds.sample.name", st_collections_group_sound_sample_name}, 307 {"collections.sounds.sample.name", st_collections_group_sound_sample_name},
310 {"collections.sounds.sample.source", st_collections_group_sound_sample_source}, 308 {"collections.sounds.sample.source", st_collections_group_sound_sample_source},
311 {"collections.group.sounds.sample.name", st_collections_group_sound_sample_name}, /* dup */ 309 {"collections.group.sounds.sample.name", st_collections_group_sound_sample_name}, /* dup */
312 {"collections.group.sounds.sample.source", st_collections_group_sound_sample_source}, /* dup */ 310 {"collections.group.sounds.sample.source", st_collections_group_sound_sample_source}, /* dup */
313 {"collections.sounds.tone", st_collections_group_sound_tone}, 311 {"collections.sounds.tone", st_collections_group_sound_tone},
314 {"collections.group.sounds.tone", st_collections_group_sound_tone}, /* dup */ 312 {"collections.group.sounds.tone", st_collections_group_sound_tone}, /* dup */
315#endif
316 {"collections.group.name", st_collections_group_name}, 313 {"collections.group.name", st_collections_group_name},
317 {"collections.group.inherit", st_collections_group_inherit}, 314 {"collections.group.inherit", st_collections_group_inherit},
318 {"collections.group.script_only", st_collections_group_script_only}, 315 {"collections.group.script_only", st_collections_group_script_only},
@@ -438,6 +435,7 @@ New_Statement_Handler statement_handlers[] =
438 {"collections.group.parts.part.description.align", st_collections_group_parts_part_description_align}, 435 {"collections.group.parts.part.description.align", st_collections_group_parts_part_description_align},
439 {"collections.group.parts.part.description.fixed", st_collections_group_parts_part_description_fixed}, 436 {"collections.group.parts.part.description.fixed", st_collections_group_parts_part_description_fixed},
440 {"collections.group.parts.part.description.min", st_collections_group_parts_part_description_min}, 437 {"collections.group.parts.part.description.min", st_collections_group_parts_part_description_min},
438 {"collections.group.parts.part.description.minmul", st_collections_group_parts_part_description_minmul},
441 {"collections.group.parts.part.description.max", st_collections_group_parts_part_description_max}, 439 {"collections.group.parts.part.description.max", st_collections_group_parts_part_description_max},
442 {"collections.group.parts.part.description.step", st_collections_group_parts_part_description_step}, 440 {"collections.group.parts.part.description.step", st_collections_group_parts_part_description_step},
443 {"collections.group.parts.part.description.aspect", st_collections_group_parts_part_description_aspect}, 441 {"collections.group.parts.part.description.aspect", st_collections_group_parts_part_description_aspect},
@@ -677,14 +675,13 @@ New_Object_Handler object_handlers[] =
677 {"collections.styles.style", ob_styles_style}, /* dup */ 675 {"collections.styles.style", ob_styles_style}, /* dup */
678 {"collections.color_classes", NULL}, /* dup */ 676 {"collections.color_classes", NULL}, /* dup */
679 {"collections.color_classes.color_class", ob_color_class}, /* dup */ 677 {"collections.color_classes.color_class", ob_color_class}, /* dup */
680#ifdef ENABLE_MULTISENSE
681 {"collections.sounds", NULL}, 678 {"collections.sounds", NULL},
682 {"collections.group.sounds", NULL}, /* dup */ 679 {"collections.group.sounds", NULL}, /* dup */
683 {"collections.sounds.sample", NULL}, 680 {"collections.sounds.sample", NULL},
684 {"collections.group.sounds.sample", NULL}, /* dup */ 681 {"collections.group.sounds.sample", NULL}, /* dup */
685#endif
686 {"collections.group", ob_collections_group}, 682 {"collections.group", ob_collections_group},
687 {"collections.group.data", NULL}, 683 {"collections.group.data", NULL},
684 {"collections.group.limits", NULL},
688 {"collections.group.script", ob_collections_group_script}, 685 {"collections.group.script", ob_collections_group_script},
689 {"collections.group.lua_script", ob_collections_group_lua_script}, 686 {"collections.group.lua_script", ob_collections_group_lua_script},
690 {"collections.group.externals", NULL}, /* dup */ 687 {"collections.group.externals", NULL}, /* dup */
@@ -1836,12 +1833,6 @@ st_styles_style_tag(void)
1836 stl->tags = eina_list_append(stl->tags, tag); 1833 stl->tags = eina_list_append(stl->tags, tag);
1837} 1834}
1838 1835
1839#ifdef ENABLE_MULTISENSE
1840/* add to below doc
1841sounds { }
1842 */
1843#endif
1844
1845/** 1836/**
1846 @page edcref 1837 @page edcref
1847 @block 1838 @block
@@ -1851,6 +1842,7 @@ sounds { }
1851 .. 1842 ..
1852 group { } 1843 group { }
1853 group { } 1844 group { }
1845 sounds { }
1854 .. 1846 ..
1855 } 1847 }
1856 @description 1848 @description
@@ -1866,8 +1858,7 @@ ob_collections(void)
1866 edje_file->collection = eina_hash_string_small_new(NULL); 1858 edje_file->collection = eina_hash_string_small_new(NULL);
1867} 1859}
1868 1860
1869#ifdef ENABLE_MULTISENSE 1861/**
1870/* * delete space before *
1871 @page edcref 1862 @page edcref
1872 @block 1863 @block
1873 sounds 1864 sounds
@@ -1980,7 +1971,7 @@ st_collections_group_sound_sample_name(void)
1980 1971
1981} 1972}
1982 1973
1983/* * delete space before * 1974/**
1984 @page edcref 1975 @page edcref
1985 @property 1976 @property
1986 source 1977 source
@@ -2016,7 +2007,7 @@ st_collections_group_sound_sample_source(void)
2016 check_arg_count(1); 2007 check_arg_count(1);
2017} 2008}
2018 2009
2019/* * delete space before * 2010/**
2020 @page edcref 2011 @page edcref
2021 @property 2012 @property
2022 tone 2013 tone
@@ -2079,7 +2070,6 @@ st_collections_group_sound_tone(void)
2079 tone->value = value; 2070 tone->value = value;
2080 tone->id = edje_file->sound_dir->tones_count - 1; 2071 tone->id = edje_file->sound_dir->tones_count - 1;
2081} 2072}
2082#endif
2083 2073
2084/** 2074/**
2085 @edcsection{group,Group sub blocks} 2075 @edcsection{group,Group sub blocks}
@@ -2677,14 +2667,14 @@ st_collections_group_orientation(void)
2677 @block 2667 @block
2678 limits 2668 limits
2679 @context 2669 @context
2680 group { 2670 group {
2681 limits { 2671 limits {
2682 vertical: "limit_name" height_barrier; 2672 vertical: "limit_name" height_barrier;
2683 horizontal: "limit_name" width_barrier; 2673 horizontal: "limit_name" width_barrier;
2684 .. 2674 ..
2685 } 2675 }
2686 .. 2676 ..
2687 } 2677 }
2688 .. 2678 ..
2689 @description 2679 @description
2690 This block is used to trigger some signal when the Edje object is resized. 2680 This block is used to trigger some signal when the Edje object is resized.
@@ -2696,10 +2686,10 @@ st_collections_group_orientation(void)
2696 @parameters 2686 @parameters
2697 [name] [height barrier] 2687 [name] [height barrier]
2698 @effect 2688 @effect
2699 It will send a signal: "limit,name,over" when the object is resized and pass 2689 It will send a signal: "limit,name,over" when the object is resized and pass
2700 the limit by growing over it. And it will send: "limit,name,below" when 2690 the limit by growing over it. And it will send: "limit,name,below" when
2701 it pass below that limit. 2691 it pass below that limit.
2702 This limit will be applied on the y absis. 2692 This limit will be applied on the y absis and is expressed in pixels.
2703 @endproperty 2693 @endproperty
2704*/ 2694*/
2705static void 2695static void
@@ -2734,10 +2724,10 @@ st_collections_group_limits_vertical(void)
2734 @parameters 2724 @parameters
2735 [name] [width barrier] 2725 [name] [width barrier]
2736 @effect 2726 @effect
2737 It will send a signal: "limit,name,over" when the object is resized and pass 2727 It will send a signal: "limit,name,over" when the object is resized and pass
2738 the limit by growing over it. And it will send: "limit,name,below" when 2728 the limit by growing over it. And it will send: "limit,name,below" when
2739 it pass below that limit. 2729 it pass below that limit.
2740 This limit will be applied on the x absis. 2730 This limit will be applied on the x absis and is expressed in pixels.
2741 @endproperty 2731 @endproperty
2742*/ 2732*/
2743static void 2733static void
@@ -3224,6 +3214,7 @@ st_collections_group_parts_part_source(void)
3224 3214
3225 //FIXME: validate this somehow (need to decide on the format also) 3215 //FIXME: validate this somehow (need to decide on the format also)
3226 current_part->source = parse_str(0); 3216 current_part->source = parse_str(0);
3217 data_queue_group_lookup(current_part->source, current_part);
3227} 3218}
3228 3219
3229/** 3220/**
@@ -3245,6 +3236,7 @@ st_collections_group_parts_part_source2(void)
3245 3236
3246 //FIXME: validate this somehow (need to decide on the format also) 3237 //FIXME: validate this somehow (need to decide on the format also)
3247 current_part->source2 = parse_str(0); 3238 current_part->source2 = parse_str(0);
3239 data_queue_group_lookup(current_part->source2, current_part);
3248} 3240}
3249 3241
3250/** 3242/**
@@ -3266,6 +3258,7 @@ st_collections_group_parts_part_source3(void)
3266 3258
3267 //FIXME: validate this somehow (need to decide on the format also) 3259 //FIXME: validate this somehow (need to decide on the format also)
3268 current_part->source3 = parse_str(0); 3260 current_part->source3 = parse_str(0);
3261 data_queue_group_lookup(current_part->source3, current_part);
3269} 3262}
3270 3263
3271/** 3264/**
@@ -3287,6 +3280,7 @@ st_collections_group_parts_part_source4(void)
3287 3280
3288 //FIXME: validate this somehow (need to decide on the format also) 3281 //FIXME: validate this somehow (need to decide on the format also)
3289 current_part->source4 = parse_str(0); 3282 current_part->source4 = parse_str(0);
3283 data_queue_group_lookup(current_part->source4, current_part);
3290} 3284}
3291 3285
3292/** 3286/**
@@ -3308,6 +3302,7 @@ st_collections_group_parts_part_source5(void)
3308 3302
3309 //FIXME: validate this somehow (need to decide on the format also) 3303 //FIXME: validate this somehow (need to decide on the format also)
3310 current_part->source5 = parse_str(0); 3304 current_part->source5 = parse_str(0);
3305 data_queue_group_lookup(current_part->source5, current_part);
3311} 3306}
3312 3307
3313/** 3308/**
@@ -3329,6 +3324,7 @@ st_collections_group_parts_part_source6(void)
3329 3324
3330 //FIXME: validate this somehow (need to decide on the format also) 3325 //FIXME: validate this somehow (need to decide on the format also)
3331 current_part->source6 = parse_str(0); 3326 current_part->source6 = parse_str(0);
3327 data_queue_group_lookup(current_part->source6, current_part);
3332} 3328}
3333 3329
3334/** 3330/**
@@ -3439,10 +3435,9 @@ st_collections_group_parts_part_entry_mode(void)
3439 [MODE] 3435 [MODE]
3440 @effect 3436 @effect
3441 Sets the selection mode for a textblock part to one of: 3437 Sets the selection mode for a textblock part to one of:
3442 @li DEFAULT 3438 @li DEFAULT selection mode is what you would expect on any desktop. Press
3443 @li EXPLICIT 3439 mouse, drag and release to end.
3444 DEFAULT selection mode is what you would expect on any desktop. Press 3440 @li EXPLICITmode requires the application
3445 mouse, drag and release to end. EXPLICIT mode requires the application
3446 controlling the edje object has to explicitly begin and end selection 3441 controlling the edje object has to explicitly begin and end selection
3447 modes, and the selection itself is dragable at both ends. 3442 modes, and the selection itself is dragable at both ends.
3448 @endproperty 3443 @endproperty
@@ -3466,11 +3461,9 @@ st_collections_group_parts_part_select_mode(void)
3466 [MODE] 3461 [MODE]
3467 @effect 3462 @effect
3468 Sets the cursor mode for a textblock part to one of: 3463 Sets the cursor mode for a textblock part to one of:
3469 @li UNDER 3464 @li UNDER cursor mode means the cursor will draw below the character pointed
3470 @li BEFORE
3471 UNDER cursor mode means the cursor will draw below the character pointed
3472 at. That's the default. 3465 at. That's the default.
3473 BEFORE cursor mode means the cursor is drawn as a vertical line before 3466 @li BEFORE cursor mode means the cursor is drawn as a vertical line before
3474 the current character, just like many other GUI toolkits handle it. 3467 the current character, just like many other GUI toolkits handle it.
3475 @endproperty 3468 @endproperty
3476*/ 3469*/
@@ -3816,6 +3809,7 @@ static void st_collections_group_parts_part_box_items_item_source(void)
3816 check_arg_count(1); 3809 check_arg_count(1);
3817 3810
3818 current_item->source = parse_str(0); 3811 current_item->source = parse_str(0);
3812 data_queue_group_lookup(current_item->source, current_part);
3819} 3813}
3820 3814
3821/** 3815/**
@@ -4140,6 +4134,9 @@ ob_collections_group_parts_part_description(void)
4140 ed->map.persp_on = 0; 4134 ed->map.persp_on = 0;
4141 ed->persp.zplane = 0; 4135 ed->persp.zplane = 0;
4142 ed->persp.focal = 1000; 4136 ed->persp.focal = 1000;
4137 ed->minmul.have = 1;
4138 ed->minmul.w = FROM_INT(1);
4139 ed->minmul.h = FROM_INT(1);
4143} 4140}
4144 4141
4145/** 4142/**
@@ -4558,6 +4555,27 @@ st_collections_group_parts_part_description_min(void)
4558/** 4555/**
4559 @page edcref 4556 @page edcref
4560 @property 4557 @property
4558 minmul
4559 @parameters
4560 [width multipler] [height multiplier]
4561 @effect
4562 A multiplier FORCIBLY applied to whatever minimum size is only during
4563 minimum size calculation.
4564 @endproperty
4565 @since 1.2
4566*/
4567static void
4568st_collections_group_parts_part_description_minmul(void)
4569{
4570 check_arg_count(2);
4571
4572 current_desc->minmul.w = FROM_DOUBLE(parse_float_range(0, 0, 999999));
4573 current_desc->minmul.h = FROM_DOUBLE(parse_float_range(1, 0, 999999));
4574}
4575
4576/**
4577 @page edcref
4578 @property
4561 max 4579 max
4562 @parameters 4580 @parameters
4563 [width] [height] 4581 [width] [height]
@@ -4605,7 +4623,7 @@ st_collections_group_parts_part_description_step(void)
4605 Normally width and height can be resized to any values independently. 4623 Normally width and height can be resized to any values independently.
4606 The aspect property forces the width to height ratio to be kept between 4624 The aspect property forces the width to height ratio to be kept between
4607 the minimum and maximum set. For example, "1.0 1.0" will increase the 4625 the minimum and maximum set. For example, "1.0 1.0" will increase the
4608 width a pixel for every pixel added to heigh. The default value is 4626 width a pixel for every pixel added to height. The default value is
4609 "0.0 0.0" disabling aspect. 4627 "0.0 0.0" disabling aspect.
4610 @endproperty 4628 @endproperty
4611*/ 4629*/
@@ -4626,7 +4644,7 @@ st_collections_group_parts_part_description_aspect(void)
4626 [DIMENSION] 4644 [DIMENSION]
4627 @effect 4645 @effect
4628 Sets the scope of the "aspect" property to a given dimension. Available 4646 Sets the scope of the "aspect" property to a given dimension. Available
4629 options are BOTH, VERTICAL, HORIZONTAL and NONE 4647 options are BOTH, VERTICAL, HORIZONTAL, SOURCE and NONE
4630 @endproperty 4648 @endproperty
4631*/ 4649*/
4632static void 4650static void
@@ -4639,6 +4657,7 @@ st_collections_group_parts_part_description_aspect_preference(void)
4639 "VERTICAL", EDJE_ASPECT_PREFER_VERTICAL, 4657 "VERTICAL", EDJE_ASPECT_PREFER_VERTICAL,
4640 "HORIZONTAL", EDJE_ASPECT_PREFER_HORIZONTAL, 4658 "HORIZONTAL", EDJE_ASPECT_PREFER_HORIZONTAL,
4641 "BOTH", EDJE_ASPECT_PREFER_BOTH, 4659 "BOTH", EDJE_ASPECT_PREFER_BOTH,
4660 "SOURCE", EDJE_ASPECT_PREFER_SOURCE,
4642 NULL); 4661 NULL);
4643} 4662}
4644 4663
@@ -7236,15 +7255,6 @@ st_collections_group_programs_program_in(void)
7236 current_program->in.range = parse_float_range(1, 0.0, 999999999.0); 7255 current_program->in.range = parse_float_range(1, 0.0, 999999999.0);
7237} 7256}
7238 7257
7239#ifdef ENABLE_MULTISENSE
7240/* add to docs below
7241, PLAY_SAMPLE, PLAY_TONE
7242
7243 action: PLAY_SAMPLE "sample name";\n
7244 action: PLAY_TONE "tone name" duration in seconds ( Range 0.1 to 10.0 );\n
7245*/
7246#endif
7247
7248/** 7258/**
7249 @page edcref 7259 @page edcref
7250 @property 7260 @property
@@ -7254,7 +7264,7 @@ st_collections_group_programs_program_in(void)
7254 @effect 7264 @effect
7255 Action to be performed by the program. Valid actions are: STATE_SET, 7265 Action to be performed by the program. Valid actions are: STATE_SET,
7256 ACTION_STOP, SIGNAL_EMIT, DRAG_VAL_SET, DRAG_VAL_STEP, DRAG_VAL_PAGE, 7266 ACTION_STOP, SIGNAL_EMIT, DRAG_VAL_SET, DRAG_VAL_STEP, DRAG_VAL_PAGE,
7257 FOCUS_SET, PARAM_COPY, PARAM_SET 7267 FOCUS_SET, PARAM_COPY, PARAM_SET, PLAY_SAMPLE, PLAY_TONE
7258 Only one action can be specified per program. Examples:\n 7268 Only one action can be specified per program. Examples:\n
7259 action: STATE_SET "statename" 0.5;\n 7269 action: STATE_SET "statename" 0.5;\n
7260 action: ACTION_STOP;\n 7270 action: ACTION_STOP;\n
@@ -7266,6 +7276,8 @@ st_collections_group_programs_program_in(void)
7266 action: FOCUS_OBJECT;\n 7276 action: FOCUS_OBJECT;\n
7267 action: PARAM_COPY "src_part" "src_param" "dst_part" "dst_param";\n 7277 action: PARAM_COPY "src_part" "src_param" "dst_part" "dst_param";\n
7268 action: PARAM_SET "part" "param" "value";\n 7278 action: PARAM_SET "part" "param" "value";\n
7279 action: PLAY_SAMPLE "sample name";\n
7280 action: PLAY_TONE "tone name" duration in seconds ( Range 0.1 to 10.0 );\n
7269 @endproperty 7281 @endproperty
7270*/ 7282*/
7271static void 7283static void
@@ -7273,6 +7285,7 @@ st_collections_group_programs_program_action(void)
7273{ 7285{
7274 Edje_Part_Collection *pc; 7286 Edje_Part_Collection *pc;
7275 Edje_Program *ep; 7287 Edje_Program *ep;
7288 int i;
7276 7289
7277 pc = eina_list_data_get(eina_list_last(edje_collections)); 7290 pc = eina_list_data_get(eina_list_last(edje_collections));
7278 ep = current_program; 7291 ep = current_program;
@@ -7288,10 +7301,8 @@ st_collections_group_programs_program_action(void)
7288 "FOCUS_OBJECT", EDJE_ACTION_TYPE_FOCUS_OBJECT, 7301 "FOCUS_OBJECT", EDJE_ACTION_TYPE_FOCUS_OBJECT,
7289 "PARAM_COPY", EDJE_ACTION_TYPE_PARAM_COPY, 7302 "PARAM_COPY", EDJE_ACTION_TYPE_PARAM_COPY,
7290 "PARAM_SET", EDJE_ACTION_TYPE_PARAM_SET, 7303 "PARAM_SET", EDJE_ACTION_TYPE_PARAM_SET,
7291#ifdef ENABLE_MULTISENSE
7292 "PLAY_SAMPLE", EDJE_ACTION_TYPE_SOUND_SAMPLE, 7304 "PLAY_SAMPLE", EDJE_ACTION_TYPE_SOUND_SAMPLE,
7293 "PLAY_TONE", EDJE_ACTION_TYPE_SOUND_TONE, 7305 "PLAY_TONE", EDJE_ACTION_TYPE_SOUND_TONE,
7294#endif
7295 NULL); 7306 NULL);
7296 if (ep->action == EDJE_ACTION_TYPE_STATE_SET) 7307 if (ep->action == EDJE_ACTION_TYPE_STATE_SET)
7297 { 7308 {
@@ -7303,11 +7314,8 @@ st_collections_group_programs_program_action(void)
7303 ep->state = parse_str(1); 7314 ep->state = parse_str(1);
7304 ep->state2 = parse_str(2); 7315 ep->state2 = parse_str(2);
7305 } 7316 }
7306#ifdef ENABLE_MULTISENSE
7307 else if (ep->action == EDJE_ACTION_TYPE_SOUND_SAMPLE) 7317 else if (ep->action == EDJE_ACTION_TYPE_SOUND_SAMPLE)
7308 { 7318 {
7309 int i;
7310
7311 ep->sample_name = parse_str(1); 7319 ep->sample_name = parse_str(1);
7312 for (i = 0; i < (int)edje_file->sound_dir->samples_count; i++) 7320 for (i = 0; i < (int)edje_file->sound_dir->samples_count; i++)
7313 { 7321 {
@@ -7324,8 +7332,6 @@ st_collections_group_programs_program_action(void)
7324 } 7332 }
7325 else if (ep->action == EDJE_ACTION_TYPE_SOUND_TONE) 7333 else if (ep->action == EDJE_ACTION_TYPE_SOUND_TONE)
7326 { 7334 {
7327 int i;
7328
7329 ep->tone_name = parse_str(1); 7335 ep->tone_name = parse_str(1);
7330 for (i = 0; i < (int)edje_file->sound_dir->tones_count; i++) 7336 for (i = 0; i < (int)edje_file->sound_dir->tones_count; i++)
7331 { 7337 {
@@ -7340,7 +7346,6 @@ st_collections_group_programs_program_action(void)
7340 } 7346 }
7341 ep->duration = parse_float_range(2, 0.1, 10.0); 7347 ep->duration = parse_float_range(2, 0.1, 10.0);
7342 } 7348 }
7343#endif
7344 else if (ep->action == EDJE_ACTION_TYPE_DRAG_VAL_SET) 7349 else if (ep->action == EDJE_ACTION_TYPE_DRAG_VAL_SET)
7345 { 7350 {
7346 ep->value = parse_float(1); 7351 ep->value = parse_float(1);
@@ -7402,14 +7407,12 @@ st_collections_group_programs_program_action(void)
7402 case EDJE_ACTION_TYPE_PARAM_SET: 7407 case EDJE_ACTION_TYPE_PARAM_SET:
7403 check_arg_count(4); 7408 check_arg_count(4);
7404 break; 7409 break;
7405#ifdef ENABLE_MULTISENSE
7406 case EDJE_ACTION_TYPE_SOUND_SAMPLE: 7410 case EDJE_ACTION_TYPE_SOUND_SAMPLE:
7407 check_arg_count(3); 7411 check_arg_count(3);
7408 break; 7412 break;
7409 case EDJE_ACTION_TYPE_SOUND_TONE: 7413 case EDJE_ACTION_TYPE_SOUND_TONE:
7410 check_arg_count(3); 7414 check_arg_count(3);
7411 break; 7415 break;
7412#endif
7413 default: 7416 default:
7414 check_arg_count(3); 7417 check_arg_count(3);
7415 } 7418 }
diff --git a/libraries/edje/src/bin/edje_cc_out.c b/libraries/edje/src/bin/edje_cc_out.c
index 443a702..5050ad4 100644
--- a/libraries/edje/src/bin/edje_cc_out.c
+++ b/libraries/edje/src/bin/edje_cc_out.c
@@ -72,6 +72,7 @@ struct _Program_Lookup
72struct _Group_Lookup 72struct _Group_Lookup
73{ 73{
74 char *name; 74 char *name;
75 Edje_Part *part;
75}; 76};
76 77
77struct _String_Lookup 78struct _String_Lookup
@@ -808,8 +809,8 @@ data_write_groups(Eet_File *ef, int *collection_num)
808 809
809 if (verbose) 810 if (verbose)
810 { 811 {
811 printf("%s: Wrote %9i bytes (%4iKb) for \"%s\" collection entry\n", 812 printf("%s: Wrote %9i bytes (%4iKb) for \"%s\" aka \"%s\" collection entry\n",
812 progname, bytes, (bytes + 512) / 1024, buf); 813 progname, bytes, (bytes + 512) / 1024, buf, pc->part);
813 } 814 }
814 } 815 }
815 816
@@ -1371,13 +1372,16 @@ reorder_parts(void)
1371} 1372}
1372 1373
1373void 1374void
1374data_queue_group_lookup(char *name) 1375data_queue_group_lookup(const char *name, Edje_Part *part)
1375{ 1376{
1376 Group_Lookup *gl; 1377 Group_Lookup *gl;
1377 1378
1379 if (!name || !name[0]) return;
1380
1378 gl = mem_alloc(SZ(Group_Lookup)); 1381 gl = mem_alloc(SZ(Group_Lookup));
1379 group_lookups = eina_list_append(group_lookups, gl); 1382 group_lookups = eina_list_append(group_lookups, gl);
1380 gl->name = mem_strdup(name); 1383 gl->name = mem_strdup(name);
1384 gl->part = part;
1381} 1385}
1382 1386
1383void 1387void
@@ -1698,15 +1702,38 @@ data_process_lookups(void)
1698 { 1702 {
1699 Edje_Part_Collection_Directory_Entry *de; 1703 Edje_Part_Collection_Directory_Entry *de;
1700 1704
1705 if (group->part)
1706 {
1707 if (group->part->type != EDJE_PART_TYPE_GROUP
1708 && group->part->type != EDJE_PART_TYPE_TEXTBLOCK
1709 && group->part->type != EDJE_PART_TYPE_BOX
1710 && group->part->type != EDJE_PART_TYPE_TABLE)
1711 goto free_group;
1712 }
1713
1701 de = eina_hash_find(edje_file->collection, group->name); 1714 de = eina_hash_find(edje_file->collection, group->name);
1702 1715
1703 if (!de) 1716 if (!de)
1717 {
1718 Eina_Bool found = EINA_FALSE;
1719
1720 EINA_LIST_FOREACH(aliases, l, de)
1721 if (strcmp(de->entry, group->name) == 0)
1722 {
1723 found = EINA_TRUE;
1724 break;
1725 }
1726 if (!found) de = NULL;
1727 }
1728
1729 if (!de)
1704 { 1730 {
1705 ERR("%s: Error. Unable to find group name \"%s\".", 1731 ERR("%s: Error. Unable to find group name \"%s\".",
1706 progname, group->name); 1732 progname, group->name);
1707 exit(-1); 1733 exit(-1);
1708 } 1734 }
1709 1735
1736 free_group:
1710 free(group->name); 1737 free(group->name);
1711 free(group); 1738 free(group);
1712 } 1739 }
@@ -1914,7 +1941,7 @@ _data_queue_program_lookup(Edje_Part_Collection *pc, char *name, char *ptr, int
1914static void 1941static void
1915_data_queue_group_lookup(Edje_Part_Collection *pc __UNUSED__, char *name, char *ptr __UNUSED__, int len __UNUSED__) 1942_data_queue_group_lookup(Edje_Part_Collection *pc __UNUSED__, char *name, char *ptr __UNUSED__, int len __UNUSED__)
1916{ 1943{
1917 data_queue_group_lookup(name); 1944 data_queue_group_lookup(name, NULL);
1918} 1945}
1919static void 1946static void
1920_data_queue_image_pc_lookup(Edje_Part_Collection *pc __UNUSED__, char *name, char *ptr, int len) 1947_data_queue_image_pc_lookup(Edje_Part_Collection *pc __UNUSED__, char *name, char *ptr, int len)
diff --git a/libraries/edje/src/bin/edje_cc_parse.c b/libraries/edje/src/bin/edje_cc_parse.c
index ae68e00..adc08d3 100644
--- a/libraries/edje/src/bin/edje_cc_parse.c
+++ b/libraries/edje/src/bin/edje_cc_parse.c
@@ -238,8 +238,6 @@ next_token(char *p, char *end, char **new_p, int *delim)
238 int in_comment_sa = 0; 238 int in_comment_sa = 0;
239 int had_quote = 0; 239 int had_quote = 0;
240 int is_escaped = 0; 240 int is_escaped = 0;
241 char *cpp_token_line = NULL;
242 char *cpp_token_file = NULL;
243 241
244 *delim = 0; 242 *delim = 0;
245 if (p >= end) return NULL; 243 if (p >= end) return NULL;
@@ -249,8 +247,6 @@ next_token(char *p, char *end, char **new_p, int *delim)
249 { 247 {
250 in_comment_ss = 0; 248 in_comment_ss = 0;
251 in_comment_cpp = 0; 249 in_comment_cpp = 0;
252 cpp_token_line = NULL;
253 cpp_token_file = NULL;
254 line++; 250 line++;
255 } 251 }
256 if ((!in_comment_ss) && (!in_comment_sa)) 252 if ((!in_comment_ss) && (!in_comment_sa))
@@ -275,8 +271,6 @@ next_token(char *p, char *end, char **new_p, int *delim)
275 /* their line format is 271 /* their line format is
276 * #line <line no. of next line> <filename from next line on> [??] 272 * #line <line no. of next line> <filename from next line on> [??]
277 */ 273 */
278 cpp_token_line = NULL;
279 cpp_token_file = NULL;
280 274
281 pp = p; 275 pp = p;
282 while ((pp < end) && (*pp != '\n')) 276 while ((pp < end) && (*pp != '\n'))
diff --git a/libraries/edje/src/bin/edje_decc.c b/libraries/edje/src/bin/edje_decc.c
index 1b79e13..ac776e9 100644
--- a/libraries/edje/src/bin/edje_decc.c
+++ b/libraries/edje/src/bin/edje_decc.c
@@ -69,7 +69,6 @@ main(int argc, char **argv)
69 eina_shutdown(); 69 eina_shutdown();
70 exit(-1); 70 exit(-1);
71 } 71 }
72 eina_log_level_set(EINA_LOG_LEVEL_INFO);
73 progname = argv[0]; 72 progname = argv[0];
74 for (i = 1; i < argc; i++) 73 for (i = 1; i < argc; i++)
75 { 74 {
@@ -104,7 +103,7 @@ main(int argc, char **argv)
104 if (!decomp()) return -1; 103 if (!decomp()) return -1;
105 output(); 104 output();
106 105
107 printf("WARNING! If any Image or audio data was encoded in a LOSSY way, then\n" 106 fprintf(stderr, "WARNING! If any Image or audio data was encoded in a LOSSY way, then\n"
108 "re-encoding will drop quality even more. You need access to the original\n" 107 "re-encoding will drop quality even more. You need access to the original\n"
109 "data to ensure no loss of quality.\n"); 108 "data to ensure no loss of quality.\n");
110 eet_close(ef); 109 eet_close(ef);
diff --git a/libraries/edje/src/bin/edje_inspector.c b/libraries/edje/src/bin/edje_inspector.c
index ed3baaf..093de86 100644
--- a/libraries/edje/src/bin/edje_inspector.c
+++ b/libraries/edje/src/bin/edje_inspector.c
@@ -263,20 +263,20 @@ border_fill_name_get(int id)
263} 263}
264 264
265static void 265static void
266state_details(Evas_Object *ed, const char *part, const char *state, double value) 266state_details(Evas_Object *ed, const char *ppart, const char *state, double value)
267{ 267{
268 Edje_Part_Type t = edje_edit_part_type_get(ed, part); 268 Edje_Part_Type t = edje_edit_part_type_get(ed, ppart);
269 double dx, dy; 269 double dx, dy;
270 const char *str, *str2; 270 const char *str, *str2;
271 int x, y, r, g, b, a; 271 int x, y, r, g, b, a;
272 272
273 if (detail < 1) return; 273 if (detail < 1) return;
274 274
275 b = edje_edit_state_visible_get(ed, part, state, value); 275 b = edje_edit_state_visible_get(ed, ppart, state, value);
276 if (machine) printf("VISIBLE: %d\n", b); 276 if (machine) printf("VISIBLE: %d\n", b);
277 else if (!b) puts(INDENT4 "visible: 0;"); 277 else if (!b) puts(INDENT4 "visible: 0;");
278 278
279 edje_edit_state_color_get(ed, part, state, value, &r, &g, &b, &a); 279 edje_edit_state_color_get(ed, ppart, state, value, &r, &g, &b, &a);
280 if (machine) 280 if (machine)
281 printf("COLOR-R: %d\nCOLOR-G: %d\nCOLOR-B: %d\nCOLOR-A: %d\n", r, g, b, a); 281 printf("COLOR-R: %d\nCOLOR-G: %d\nCOLOR-B: %d\nCOLOR-A: %d\n", r, g, b, a);
282 else if ((r != 255) || (g != 255) || (b != 255) || (a != 255)) 282 else if ((r != 255) || (g != 255) || (b != 255) || (a != 255))
@@ -284,14 +284,14 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
284 284
285 if (detail > 1) 285 if (detail > 1)
286 { 286 {
287 edje_edit_state_color2_get(ed, part, state, value, &r, &g, &b, &a); 287 edje_edit_state_color2_get(ed, ppart, state, value, &r, &g, &b, &a);
288 if (machine) 288 if (machine)
289 printf("COLOR2-R: %d\nCOLOR2-G: %d\nCOLOR2-B: %d\nCOLOR2-A: %d\n", 289 printf("COLOR2-R: %d\nCOLOR2-G: %d\nCOLOR2-B: %d\nCOLOR2-A: %d\n",
290 r, g, b, a); 290 r, g, b, a);
291 else if ((r != 255) || (g != 255) || (b != 255) || (a != 255)) 291 else if ((r != 255) || (g != 255) || (b != 255) || (a != 255))
292 printf(INDENT4 "color2: %d %d %d %d;\n", r, g, b, a); 292 printf(INDENT4 "color2: %d %d %d %d;\n", r, g, b, a);
293 293
294 edje_edit_state_color3_get(ed, part, state, value, &r, &g, &b, &a); 294 edje_edit_state_color3_get(ed, ppart, state, value, &r, &g, &b, &a);
295 if (machine) 295 if (machine)
296 printf("COLOR3-R: %d\nCOLOR3-G: %d\nCOLOR3-B: %d\nCOLOR3-A: %d\n", 296 printf("COLOR3-R: %d\nCOLOR3-G: %d\nCOLOR3-B: %d\nCOLOR3-A: %d\n",
297 r, g, b, a); 297 r, g, b, a);
@@ -299,19 +299,19 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
299 printf(INDENT4 "color3: %d %d %d %d;\n", r, g, b, a); 299 printf(INDENT4 "color3: %d %d %d %d;\n", r, g, b, a);
300 } 300 }
301 301
302 dx = edje_edit_state_align_x_get(ed, part, state, value); 302 dx = edje_edit_state_align_x_get(ed, ppart, state, value);
303 dy = edje_edit_state_align_y_get(ed, part, state, value); 303 dy = edje_edit_state_align_y_get(ed, ppart, state, value);
304 if (machine) printf("ALIGN-X: %g\nALIGN-Y: %g\n", dx, dy); 304 if (machine) printf("ALIGN-X: %g\nALIGN-Y: %g\n", dx, dy);
305 else if (FDIFF(dx, 0.5) || FDIFF(dy, 0.5)) 305 else if (FDIFF(dx, 0.5) || FDIFF(dy, 0.5))
306 printf(INDENT4 "align: %g %g;\n", dx, dy); 306 printf(INDENT4 "align: %g %g;\n", dx, dy);
307 307
308 x = edje_edit_state_min_w_get(ed, part, state, value); 308 x = edje_edit_state_min_w_get(ed, ppart, state, value);
309 y = edje_edit_state_min_h_get(ed, part, state, value); 309 y = edje_edit_state_min_h_get(ed, ppart, state, value);
310 if (machine) printf("MIN-W: %d\nMIN-H: %d\n", x, y); 310 if (machine) printf("MIN-W: %d\nMIN-H: %d\n", x, y);
311 else if ((x) || (y)) printf(INDENT4 "min: %d %d;\n", x, y); 311 else if ((x) || (y)) printf(INDENT4 "min: %d %d;\n", x, y);
312 312
313 x = edje_edit_state_max_w_get(ed, part, state, value); 313 x = edje_edit_state_max_w_get(ed, ppart, state, value);
314 y = edje_edit_state_max_h_get(ed, part, state, value); 314 y = edje_edit_state_max_h_get(ed, ppart, state, value);
315 if (machine) printf("MAX-W: %d\nMAX-H: %d\n", x, y); 315 if (machine) printf("MAX-W: %d\nMAX-H: %d\n", x, y);
316 else if ((x != -1) || (y != -1)) printf(INDENT4 "max: %d %d;\n", x, y); 316 else if ((x != -1) || (y != -1)) printf(INDENT4 "max: %d %d;\n", x, y);
317 317
@@ -320,30 +320,30 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
320 320
321 if (detail > 1) 321 if (detail > 1)
322 { 322 {
323 dx = edje_edit_state_aspect_min_get(ed, part, state, value); 323 dx = edje_edit_state_aspect_min_get(ed, ppart, state, value);
324 dy = edje_edit_state_aspect_max_get(ed, part, state, value); 324 dy = edje_edit_state_aspect_max_get(ed, ppart, state, value);
325 if (machine) printf("ASPECT-MIN: %g\nASPECT-MAX: %g\n", dx, dy); 325 if (machine) printf("ASPECT-MIN: %g\nASPECT-MAX: %g\n", dx, dy);
326 else if (FDIFF(dx, 0.0) || FDIFF(dy, 0.0)) 326 else if (FDIFF(dx, 0.0) || FDIFF(dy, 0.0))
327 printf(INDENT4 "aspect: %g %g;\n", dx, dy); 327 printf(INDENT4 "aspect: %g %g;\n", dx, dy);
328 328
329 x = edje_edit_state_aspect_pref_get(ed, part, state, value); 329 x = edje_edit_state_aspect_pref_get(ed, ppart, state, value);
330 str = aspect_pref_name_get(x); 330 str = aspect_pref_name_get(x);
331 if (machine) printf("ASPECT-PREFERENCE: %s\n", str); 331 if (machine) printf("ASPECT-PREFERENCE: %s\n", str);
332 else if (x) printf(INDENT4 "aspect_preference: %s;\n", str); 332 else if (x) printf(INDENT4 "aspect_preference: %s;\n", str);
333 /* do not free this str! */ 333 /* do not free this str! */
334 334
335 str = edje_edit_state_color_class_get(ed, part, state, value); 335 str = edje_edit_state_color_class_get(ed, ppart, state, value);
336 if (machine) printf("COLOR_CLASS: %s\n", str ? str : ""); 336 if (machine) printf("COLOR_CLASS: %s\n", str ? str : "");
337 else if (str) printf(INDENT4 "color_class: \"%s\";\n", str); 337 else if (str) printf(INDENT4 "color_class: \"%s\";\n", str);
338 edje_edit_string_free(str); 338 edje_edit_string_free(str);
339 } 339 }
340 340
341 dx = edje_edit_state_rel1_relative_x_get(ed, part, state, value); 341 dx = edje_edit_state_rel1_relative_x_get(ed, ppart, state, value);
342 dy = edje_edit_state_rel1_relative_y_get(ed, part, state, value); 342 dy = edje_edit_state_rel1_relative_y_get(ed, ppart, state, value);
343 x = edje_edit_state_rel1_offset_x_get(ed, part, state, value); 343 x = edje_edit_state_rel1_offset_x_get(ed, ppart, state, value);
344 y = edje_edit_state_rel1_offset_y_get(ed, part, state, value); 344 y = edje_edit_state_rel1_offset_y_get(ed, ppart, state, value);
345 str = edje_edit_state_rel1_to_x_get(ed, part, state, value); 345 str = edje_edit_state_rel1_to_x_get(ed, ppart, state, value);
346 str2 = edje_edit_state_rel1_to_y_get(ed, part, state, value); 346 str2 = edje_edit_state_rel1_to_y_get(ed, ppart, state, value);
347 if (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y) || (str) || (str2)) 347 if (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y) || (str) || (str2))
348 { 348 {
349 if (machine) puts("REL1-BEGIN"); 349 if (machine) puts("REL1-BEGIN");
@@ -372,12 +372,12 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
372 edje_edit_string_free(str); 372 edje_edit_string_free(str);
373 edje_edit_string_free(str2); 373 edje_edit_string_free(str2);
374 374
375 dx = edje_edit_state_rel2_relative_x_get(ed, part, state, value); 375 dx = edje_edit_state_rel2_relative_x_get(ed, ppart, state, value);
376 dy = edje_edit_state_rel2_relative_y_get(ed, part, state, value); 376 dy = edje_edit_state_rel2_relative_y_get(ed, ppart, state, value);
377 x = edje_edit_state_rel2_offset_x_get(ed, part, state, value); 377 x = edje_edit_state_rel2_offset_x_get(ed, ppart, state, value);
378 y = edje_edit_state_rel2_offset_y_get(ed, part, state, value); 378 y = edje_edit_state_rel2_offset_y_get(ed, ppart, state, value);
379 str = edje_edit_state_rel2_to_x_get(ed, part, state, value); 379 str = edje_edit_state_rel2_to_x_get(ed, ppart, state, value);
380 str2 = edje_edit_state_rel2_to_y_get(ed, part, state, value); 380 str2 = edje_edit_state_rel2_to_y_get(ed, ppart, state, value);
381 if (FDIFF(dx, 1.0) || FDIFF(dy, 1.0) || (x != -1) || (y != -1) || 381 if (FDIFF(dx, 1.0) || FDIFF(dy, 1.0) || (x != -1) || (y != -1) ||
382 (str) || (str2)) 382 (str) || (str2))
383 { 383 {
@@ -410,7 +410,7 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
410 410
411 if (t == EDJE_PART_TYPE_IMAGE) 411 if (t == EDJE_PART_TYPE_IMAGE)
412 { 412 {
413 str = edje_edit_state_image_get(ed, part, state, value); 413 str = edje_edit_state_image_get(ed, ppart, state, value);
414 414
415 if (machine) printf("IMAGE-BEGIN\nNORMAL: %s\n", str ? str : ""); 415 if (machine) printf("IMAGE-BEGIN\nNORMAL: %s\n", str ? str : "");
416 else if (detail > 1) 416 else if (detail > 1)
@@ -429,7 +429,7 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
429 double dx2, dy2; 429 double dx2, dy2;
430 Eina_Bool has_orgin, has_size; 430 Eina_Bool has_orgin, has_size;
431 431
432 tweens = edje_edit_state_tweens_list_get(ed, part, state, value); 432 tweens = edje_edit_state_tweens_list_get(ed, ppart, state, value);
433 EINA_LIST_FOREACH(tweens, l, str) 433 EINA_LIST_FOREACH(tweens, l, str)
434 { 434 {
435 if (machine) printf("TWEEN: %s\n", str); 435 if (machine) printf("TWEEN: %s\n", str);
@@ -438,14 +438,14 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
438 edje_edit_string_list_free(tweens); 438 edje_edit_string_list_free(tweens);
439 439
440 edje_edit_state_image_border_get 440 edje_edit_state_image_border_get
441 (ed, part, state, value, &bl, &br, &bt, &bb); 441 (ed, ppart, state, value, &bl, &br, &bt, &bb);
442 if (machine) 442 if (machine)
443 printf("BORDER-LEFT: %d\nBORDER-RIGHT: %d\n" 443 printf("BORDER-LEFT: %d\nBORDER-RIGHT: %d\n"
444 "BORDER-TOP: %d\nBORDER-BOTTOM: %d\n", bl, br, bt, bb); 444 "BORDER-TOP: %d\nBORDER-BOTTOM: %d\n", bl, br, bt, bb);
445 else if ((bl) || (br) || (bt) || (bb)) 445 else if ((bl) || (br) || (bt) || (bb))
446 printf(INDENT5 "border: %d %d %d %d;\n", bl, br, bt, bb); 446 printf(INDENT5 "border: %d %d %d %d;\n", bl, br, bt, bb);
447 447
448 x = edje_edit_state_image_border_fill_get(ed, part, state, value); 448 x = edje_edit_state_image_border_fill_get(ed, ppart, state, value);
449 str = border_fill_name_get(x); 449 str = border_fill_name_get(x);
450 if (machine) printf("BORDER-FILL: %s\n", str); 450 if (machine) printf("BORDER-FILL: %s\n", str);
451 else if (x != 1) printf(INDENT5 "middle: %s;\n", str); 451 else if (x != 1) printf(INDENT5 "middle: %s;\n", str);
@@ -454,22 +454,22 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
454 // TODO support image.fill.smooth 454 // TODO support image.fill.smooth
455 455
456 dx = edje_edit_state_fill_origin_relative_x_get 456 dx = edje_edit_state_fill_origin_relative_x_get
457 (ed, part, state, value); 457 (ed, ppart, state, value);
458 dy = edje_edit_state_fill_origin_relative_y_get 458 dy = edje_edit_state_fill_origin_relative_y_get
459 (ed, part, state, value); 459 (ed, ppart, state, value);
460 x = edje_edit_state_fill_origin_offset_x_get 460 x = edje_edit_state_fill_origin_offset_x_get
461 (ed, part, state, value); 461 (ed, ppart, state, value);
462 y = edje_edit_state_fill_origin_offset_y_get 462 y = edje_edit_state_fill_origin_offset_y_get
463 (ed, part, state, value); 463 (ed, ppart, state, value);
464 464
465 dx2 = edje_edit_state_fill_size_relative_x_get 465 dx2 = edje_edit_state_fill_size_relative_x_get
466 (ed, part, state, value); 466 (ed, ppart, state, value);
467 dy2 = edje_edit_state_fill_size_relative_y_get 467 dy2 = edje_edit_state_fill_size_relative_y_get
468 (ed, part, state, value); 468 (ed, ppart, state, value);
469 x2 = edje_edit_state_fill_size_offset_x_get 469 x2 = edje_edit_state_fill_size_offset_x_get
470 (ed, part, state, value); 470 (ed, ppart, state, value);
471 y2 = edje_edit_state_fill_size_offset_y_get 471 y2 = edje_edit_state_fill_size_offset_y_get
472 (ed, part, state, value); 472 (ed, ppart, state, value);
473 473
474 has_orgin = (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y)); 474 has_orgin = (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y));
475 has_size = (FDIFF(dx2, 1.0) || FDIFF(dy2, 1.0) || (x2) || (y2)); 475 has_size = (FDIFF(dx2, 1.0) || FDIFF(dy2, 1.0) || (x2) || (y2));
@@ -531,22 +531,22 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
531 // TODO support proxy.fill.smooth 531 // TODO support proxy.fill.smooth
532 532
533 dx = edje_edit_state_fill_origin_relative_x_get 533 dx = edje_edit_state_fill_origin_relative_x_get
534 (ed, part, state, value); 534 (ed, ppart, state, value);
535 dy = edje_edit_state_fill_origin_relative_y_get 535 dy = edje_edit_state_fill_origin_relative_y_get
536 (ed, part, state, value); 536 (ed, ppart, state, value);
537 x = edje_edit_state_fill_origin_offset_x_get 537 x = edje_edit_state_fill_origin_offset_x_get
538 (ed, part, state, value); 538 (ed, ppart, state, value);
539 y = edje_edit_state_fill_origin_offset_y_get 539 y = edje_edit_state_fill_origin_offset_y_get
540 (ed, part, state, value); 540 (ed, ppart, state, value);
541 541
542 dx2 = edje_edit_state_fill_size_relative_x_get 542 dx2 = edje_edit_state_fill_size_relative_x_get
543 (ed, part, state, value); 543 (ed, ppart, state, value);
544 dy2 = edje_edit_state_fill_size_relative_y_get 544 dy2 = edje_edit_state_fill_size_relative_y_get
545 (ed, part, state, value); 545 (ed, ppart, state, value);
546 x2 = edje_edit_state_fill_size_offset_x_get 546 x2 = edje_edit_state_fill_size_offset_x_get
547 (ed, part, state, value); 547 (ed, ppart, state, value);
548 y2 = edje_edit_state_fill_size_offset_y_get 548 y2 = edje_edit_state_fill_size_offset_y_get
549 (ed, part, state, value); 549 (ed, ppart, state, value);
550 550
551 has_orgin = (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y)); 551 has_orgin = (FDIFF(dx, 0.0) || FDIFF(dy, 0.0) || (x) || (y));
552 has_size = (FDIFF(dx2, 1.0) || FDIFF(dy2, 1.0) || (x2) || (y2)); 552 has_size = (FDIFF(dx2, 1.0) || FDIFF(dy2, 1.0) || (x2) || (y2));
@@ -600,34 +600,34 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
600 if (machine) puts("TEXT-BEGIN"); 600 if (machine) puts("TEXT-BEGIN");
601 else puts(INDENT4 "text {"); 601 else puts(INDENT4 "text {");
602 602
603 str = edje_edit_state_text_get(ed, part, state, value); 603 str = edje_edit_state_text_get(ed, ppart, state, value);
604 if (machine) printf("TEXT: %s\n", str ? str : ""); 604 if (machine) printf("TEXT: %s\n", str ? str : "");
605 else if (str) printf(INDENT5 "text: \"%s\";\n", str); 605 else if (str) printf(INDENT5 "text: \"%s\";\n", str);
606 edje_edit_string_free(str); 606 edje_edit_string_free(str);
607 607
608 str = edje_edit_state_font_get(ed, part, state, value); 608 str = edje_edit_state_font_get(ed, ppart, state, value);
609 if (machine) printf("FONT: %s\n", str ? str : ""); 609 if (machine) printf("FONT: %s\n", str ? str : "");
610 else if (str) printf(INDENT5 "font: \"%s\";\n", str); 610 else if (str) printf(INDENT5 "font: \"%s\";\n", str);
611 edje_edit_string_free(str); 611 edje_edit_string_free(str);
612 612
613 x = edje_edit_state_text_size_get(ed, part, state, value); 613 x = edje_edit_state_text_size_get(ed, ppart, state, value);
614 if (machine) printf("SIZE: %d\n", x); 614 if (machine) printf("SIZE: %d\n", x);
615 else if (x > 0) printf(INDENT5 "size: %d;\n", x); 615 else if (x > 0) printf(INDENT5 "size: %d;\n", x);
616 616
617 // TODO text_class 617 // TODO text_class
618 618
619 dx = edje_edit_state_text_align_x_get(ed, part, state, value); 619 dx = edje_edit_state_text_align_x_get(ed, ppart, state, value);
620 dy = edje_edit_state_text_align_y_get(ed, part, state, value); 620 dy = edje_edit_state_text_align_y_get(ed, ppart, state, value);
621 if (machine) printf("TEXT-ALIGN-X: %g\nTEXT-ALIGN-Y: %g\n", dx, dy); 621 if (machine) printf("TEXT-ALIGN-X: %g\nTEXT-ALIGN-Y: %g\n", dx, dy);
622 else if (FDIFF(dx, 0.5) || FDIFF(dy, 0.5)) 622 else if (FDIFF(dx, 0.5) || FDIFF(dy, 0.5))
623 printf(INDENT5 "align: %g %g;\n", dx, dy); 623 printf(INDENT5 "align: %g %g;\n", dx, dy);
624 624
625 x = edje_edit_state_text_fit_x_get(ed, part, state, value); 625 x = edje_edit_state_text_fit_x_get(ed, ppart, state, value);
626 y = edje_edit_state_text_fit_y_get(ed, part, state, value); 626 y = edje_edit_state_text_fit_y_get(ed, ppart, state, value);
627 if (machine) printf("TEXT-FIT-X: %d\nTEXT-FIT-Y: %d\n", x, y); 627 if (machine) printf("TEXT-FIT-X: %d\nTEXT-FIT-Y: %d\n", x, y);
628 else if ((x) || (y)) printf(INDENT5 "fit: %d %d;\n", x, y); 628 else if ((x) || (y)) printf(INDENT5 "fit: %d %d;\n", x, y);
629 629
630 dx = edje_edit_state_text_elipsis_get(ed, part, state, value); 630 dx = edje_edit_state_text_elipsis_get(ed, ppart, state, value);
631 if (machine) printf("TEXT-ELIPSIS: %g\n", dx); 631 if (machine) printf("TEXT-ELIPSIS: %g\n", dx);
632 else if (FDIFF(dx, 0.5)) printf(INDENT5 "elipsis: %g;\n", dx); 632 else if (FDIFF(dx, 0.5)) printf(INDENT5 "elipsis: %g;\n", dx);
633 633
@@ -640,7 +640,7 @@ state_details(Evas_Object *ed, const char *part, const char *state, double value
640 const Edje_External_Param *p; 640 const Edje_External_Param *p;
641 641
642 params = edje_edit_state_external_params_list_get 642 params = edje_edit_state_external_params_list_get
643 (ed, part, state, value); 643 (ed, ppart, state, value);
644 644
645 if (params) 645 if (params)
646 { 646 {
@@ -766,16 +766,16 @@ _api_name_fix(const char *orig)
766} 766}
767 767
768static char * 768static char *
769_part_api_name_get(Evas_Object *ed, const char *part) 769_part_api_name_get(Evas_Object *ed, const char *ppart)
770{ 770{
771 const char *orig = edje_edit_part_api_name_get(ed, part); 771 const char *orig = edje_edit_part_api_name_get(ed, ppart);
772 char *fix = _api_name_fix(orig); 772 char *fix = _api_name_fix(orig);
773 edje_edit_string_free(orig); 773 edje_edit_string_free(orig);
774 return fix; 774 return fix;
775} 775}
776 776
777static void 777static void
778part_details(Evas_Object *ed, const char *part) 778part_details(Evas_Object *ed, const char *ppart)
779{ 779{
780 Eina_List *states, *l; 780 Eina_List *states, *l;
781 Eina_Bool b; 781 Eina_Bool b;
@@ -786,8 +786,8 @@ part_details(Evas_Object *ed, const char *part)
786 786
787 if (machine) puts("PART-DETAILS-BEGIN"); 787 if (machine) puts("PART-DETAILS-BEGIN");
788 788
789 str = api =_part_api_name_get(ed, part); 789 str = api =_part_api_name_get(ed, ppart);
790 str2 = edje_edit_part_api_description_get(ed, part); 790 str2 = edje_edit_part_api_description_get(ed, ppart);
791 if (machine) 791 if (machine)
792 { 792 {
793 printf("API-NAME: %s\n", str ? str : ""); 793 printf("API-NAME: %s\n", str ? str : "");
@@ -798,67 +798,67 @@ part_details(Evas_Object *ed, const char *part)
798 free(api); 798 free(api);
799 edje_edit_string_free(str2); 799 edje_edit_string_free(str2);
800 800
801 b = edje_edit_part_mouse_events_get(ed, part); 801 b = edje_edit_part_mouse_events_get(ed, ppart);
802 if (machine) printf("MOUSE_EVENTS: %d\n", b); 802 if (machine) printf("MOUSE_EVENTS: %d\n", b);
803 else if (!b) puts(INDENT3 "mouse_events: 0;"); 803 else if (!b) puts(INDENT3 "mouse_events: 0;");
804 804
805 if (detail > 1) 805 if (detail > 1)
806 { 806 {
807 b = edje_edit_part_repeat_events_get(ed, part); 807 b = edje_edit_part_repeat_events_get(ed, ppart);
808 if (machine) printf("REPEAT_EVENTS: %d\n", b); 808 if (machine) printf("REPEAT_EVENTS: %d\n", b);
809 else if (b) puts(INDENT3 "repeat_events: 1;"); 809 else if (b) puts(INDENT3 "repeat_events: 1;");
810 810
811 b = edje_edit_part_scale_get(ed, part); 811 b = edje_edit_part_scale_get(ed, ppart);
812 if (machine) printf("SCALE: %d\n", b); 812 if (machine) printf("SCALE: %d\n", b);
813 else if (b) puts(INDENT3 "scale: 1;"); 813 else if (b) puts(INDENT3 "scale: 1;");
814 } 814 }
815 815
816 str = edje_edit_part_clip_to_get(ed, part); 816 str = edje_edit_part_clip_to_get(ed, ppart);
817 if (machine) printf("CLIP_TO: %s\n", str ? str : ""); 817 if (machine) printf("CLIP_TO: %s\n", str ? str : "");
818 else if (str) printf(INDENT3 "clip_to: \"%s\";\n", str); 818 else if (str) printf(INDENT3 "clip_to: \"%s\";\n", str);
819 edje_edit_string_free(str); 819 edje_edit_string_free(str);
820 820
821 str = edje_edit_part_source_get(ed, part); 821 str = edje_edit_part_source_get(ed, ppart);
822 if (machine) printf("SOURCE: %s\n", str ? str : ""); 822 if (machine) printf("SOURCE: %s\n", str ? str : "");
823 else if (str) printf(INDENT3 "source: \"%s\";\n", str); 823 else if (str) printf(INDENT3 "source: \"%s\";\n", str);
824 edje_edit_string_free(str); 824 edje_edit_string_free(str);
825 825
826 if (detail > 1) 826 if (detail > 1)
827 { 827 {
828 if (edje_edit_part_type_get(ed, part) == EDJE_PART_TYPE_TEXT) 828 if (edje_edit_part_type_get(ed, ppart) == EDJE_PART_TYPE_TEXT)
829 { 829 {
830 str = text_effect_name_get(edje_edit_part_effect_get(ed, part)); 830 str = text_effect_name_get(edje_edit_part_effect_get(ed, ppart));
831 if (machine) printf("EFFECT: %s\n", str ? str : ""); 831 if (machine) printf("EFFECT: %s\n", str ? str : "");
832 else if (str) printf(INDENT3 "effect: %s;\n", str); 832 else if (str) printf(INDENT3 "effect: %s;\n", str);
833 /* do not free this str! */ 833 /* do not free this str! */
834 } 834 }
835 835
836 if (edje_edit_part_drag_x_get(ed, part) || 836 if (edje_edit_part_drag_x_get(ed, ppart) ||
837 edje_edit_part_drag_y_get(ed, part)) 837 edje_edit_part_drag_y_get(ed, ppart))
838 { 838 {
839 int dir, step, count; 839 int dir, step, count;
840 840
841 if (machine) puts("DRAGABLE-BEGIN"); 841 if (machine) puts("DRAGABLE-BEGIN");
842 else puts(INDENT3 "dragable {"); 842 else puts(INDENT3 "dragable {");
843 843
844 dir = edje_edit_part_drag_x_get(ed, part); 844 dir = edje_edit_part_drag_x_get(ed, ppart);
845 step = edje_edit_part_drag_step_x_get(ed, part); 845 step = edje_edit_part_drag_step_x_get(ed, ppart);
846 count = edje_edit_part_drag_count_x_get(ed, part); 846 count = edje_edit_part_drag_count_x_get(ed, ppart);
847 if (machine) printf("DRAG-X: %d %d %d\n", dir, step, count); 847 if (machine) printf("DRAG-X: %d %d %d\n", dir, step, count);
848 else printf(INDENT4 "x: %d %d %d;\n", dir, step, count); 848 else printf(INDENT4 "x: %d %d %d;\n", dir, step, count);
849 849
850 dir = edje_edit_part_drag_y_get(ed, part); 850 dir = edje_edit_part_drag_y_get(ed, ppart);
851 step = edje_edit_part_drag_step_y_get(ed, part); 851 step = edje_edit_part_drag_step_y_get(ed, ppart);
852 count = edje_edit_part_drag_count_y_get(ed, part); 852 count = edje_edit_part_drag_count_y_get(ed, ppart);
853 if (machine) printf("DRAG-Y: %d %d %d\n", dir, step, count); 853 if (machine) printf("DRAG-Y: %d %d %d\n", dir, step, count);
854 else printf(INDENT4 "y: %d %d %d;\n", dir, step, count); 854 else printf(INDENT4 "y: %d %d %d;\n", dir, step, count);
855 855
856 str = edje_edit_part_drag_confine_get(ed, part); 856 str = edje_edit_part_drag_confine_get(ed, ppart);
857 if (machine) printf("DRAG-CONFINE: %s\n", str ? str : ""); 857 if (machine) printf("DRAG-CONFINE: %s\n", str ? str : "");
858 else if (str) printf(INDENT4 "confine: \"%s\";\n", str); 858 else if (str) printf(INDENT4 "confine: \"%s\";\n", str);
859 edje_edit_string_free(str); 859 edje_edit_string_free(str);
860 860
861 str = edje_edit_part_drag_event_get(ed, part); 861 str = edje_edit_part_drag_event_get(ed, ppart);
862 if (machine) printf("DRAG-EVENTS: %s\n", str ? str : ""); 862 if (machine) printf("DRAG-EVENTS: %s\n", str ? str : "");
863 else if (str) printf(INDENT4 "events: \"%s\";\n", str); 863 else if (str) printf(INDENT4 "events: \"%s\";\n", str);
864 edje_edit_string_free(str); 864 edje_edit_string_free(str);
@@ -868,7 +868,7 @@ part_details(Evas_Object *ed, const char *part)
868 } 868 }
869 } 869 }
870 870
871 states = edje_edit_part_states_list_get(ed, part); 871 states = edje_edit_part_states_list_get(ed, ppart);
872 EINA_LIST_FOREACH(states, l, str) 872 EINA_LIST_FOREACH(states, l, str)
873 { 873 {
874 char state[512], *delim; 874 char state[512], *delim;
@@ -879,7 +879,7 @@ part_details(Evas_Object *ed, const char *part)
879 delim++; 879 delim++;
880 value = strtod(delim, NULL); 880 value = strtod(delim, NULL);
881 state_begin(state, value); 881 state_begin(state, value);
882 state_details(ed, part, state, value); 882 state_details(ed, ppart, state, value);
883 state_end(); 883 state_end();
884 } 884 }
885 edje_edit_string_list_free(states); 885 edje_edit_string_list_free(states);
@@ -1047,9 +1047,9 @@ program_end(void)
1047 1047
1048 1048
1049static char * 1049static char *
1050_program_api_name_get(Evas_Object *ed, const char *program) 1050_program_api_name_get(Evas_Object *ed, const char *pprogram)
1051{ 1051{
1052 const char *orig = edje_edit_program_api_name_get(ed, program); 1052 const char *orig = edje_edit_program_api_name_get(ed, pprogram);
1053 char *fix = _api_name_fix(orig); 1053 char *fix = _api_name_fix(orig);
1054 edje_edit_string_free(orig); 1054 edje_edit_string_free(orig);
1055 return fix; 1055 return fix;
@@ -1071,7 +1071,7 @@ _transition_name_get(Edje_Tween_Mode mode)
1071} 1071}
1072 1072
1073static void 1073static void
1074program_details(Evas_Object *ed, const char *program) 1074program_details(Evas_Object *ed, const char *pprogram)
1075{ 1075{
1076 const char *str, *str2; 1076 const char *str, *str2;
1077 char *api; 1077 char *api;
@@ -1080,8 +1080,8 @@ program_details(Evas_Object *ed, const char *program)
1080 1080
1081 if (machine) puts("PROGRAM-DETAILS-BEGIN"); 1081 if (machine) puts("PROGRAM-DETAILS-BEGIN");
1082 1082
1083 str = api =_program_api_name_get(ed, program); 1083 str = api =_program_api_name_get(ed, pprogram);
1084 str2 = edje_edit_program_api_description_get(ed, program); 1084 str2 = edje_edit_program_api_description_get(ed, pprogram);
1085 if (machine) 1085 if (machine)
1086 { 1086 {
1087 printf("API-NAME: %s\n", str ? str : ""); 1087 printf("API-NAME: %s\n", str ? str : "");
@@ -1092,12 +1092,12 @@ program_details(Evas_Object *ed, const char *program)
1092 free(api); 1092 free(api);
1093 edje_edit_string_free(str2); 1093 edje_edit_string_free(str2);
1094 1094
1095 str = edje_edit_program_signal_get(ed, program); 1095 str = edje_edit_program_signal_get(ed, pprogram);
1096 if (machine) printf("SIGNAL: %s\n", str ? str : ""); 1096 if (machine) printf("SIGNAL: %s\n", str ? str : "");
1097 else if (str) printf(INDENT3 "signal: \"%s\";\n", str); 1097 else if (str) printf(INDENT3 "signal: \"%s\";\n", str);
1098 edje_edit_string_free(str); 1098 edje_edit_string_free(str);
1099 1099
1100 str = edje_edit_program_source_get(ed, program); 1100 str = edje_edit_program_source_get(ed, pprogram);
1101 if (machine) printf("SOURCE: %s\n", str ? str : ""); 1101 if (machine) printf("SOURCE: %s\n", str ? str : "");
1102 else if (str) printf(INDENT3 "source: \"%s\";\n", str); 1102 else if (str) printf(INDENT3 "source: \"%s\";\n", str);
1103 edje_edit_string_free(str); 1103 edje_edit_string_free(str);
@@ -1105,7 +1105,7 @@ program_details(Evas_Object *ed, const char *program)
1105 if (detail >= 1) 1105 if (detail >= 1)
1106 { 1106 {
1107 Eina_List *lst, *l; 1107 Eina_List *lst, *l;
1108 Edje_Action_Type type = edje_edit_program_action_get(ed, program); 1108 Edje_Action_Type type = edje_edit_program_action_get(ed, pprogram);
1109 switch (type) 1109 switch (type)
1110 { 1110 {
1111 case EDJE_ACTION_TYPE_ACTION_STOP: 1111 case EDJE_ACTION_TYPE_ACTION_STOP:
@@ -1113,18 +1113,18 @@ program_details(Evas_Object *ed, const char *program)
1113 else puts(INDENT3 "action: ACTION_STOP;"); 1113 else puts(INDENT3 "action: ACTION_STOP;");
1114 break; 1114 break;
1115 case EDJE_ACTION_TYPE_STATE_SET: 1115 case EDJE_ACTION_TYPE_STATE_SET:
1116 str = edje_edit_program_state_get(ed, program); 1116 str = edje_edit_program_state_get(ed, pprogram);
1117 if (machine) 1117 if (machine)
1118 printf("ACTION: STATE_SET\nACTION-STATE: %s %g\n", 1118 printf("ACTION: STATE_SET\nACTION-STATE: %s %g\n",
1119 str, edje_edit_program_value_get(ed, program)); 1119 str, edje_edit_program_value_get(ed, pprogram));
1120 else 1120 else
1121 printf(INDENT3 "action: STATE_SET \"%s\" %2.1f;\n", 1121 printf(INDENT3 "action: STATE_SET \"%s\" %2.1f;\n",
1122 str, edje_edit_program_value_get(ed, program)); 1122 str, edje_edit_program_value_get(ed, pprogram));
1123 edje_edit_string_free(str); 1123 edje_edit_string_free(str);
1124 break; 1124 break;
1125 case EDJE_ACTION_TYPE_SIGNAL_EMIT: 1125 case EDJE_ACTION_TYPE_SIGNAL_EMIT:
1126 str = edje_edit_program_state_get(ed, program); 1126 str = edje_edit_program_state_get(ed, pprogram);
1127 str2 = edje_edit_program_state2_get(ed, program); 1127 str2 = edje_edit_program_state2_get(ed, pprogram);
1128 if (machine) 1128 if (machine)
1129 printf("ACTION: SIGNAL_EMIT\nACTION-SIGNAL: %s\n" 1129 printf("ACTION: SIGNAL_EMIT\nACTION-SIGNAL: %s\n"
1130 "ACTION-SOURCE: %s\n", 1130 "ACTION-SOURCE: %s\n",
@@ -1146,7 +1146,7 @@ program_details(Evas_Object *ed, const char *program)
1146 //~ eina_strbuf_append(buf, I4"action: DRAG_VAL_PAGE TODO;\n"); 1146 //~ eina_strbuf_append(buf, I4"action: DRAG_VAL_PAGE TODO;\n");
1147 //~ break; 1147 //~ break;
1148 default: 1148 default:
1149 ERR("Unhandled program action type %d", type); 1149 ERR("Unhandled pprogram action type %d", type);
1150 break; 1150 break;
1151 } 1151 }
1152 1152
@@ -1154,11 +1154,11 @@ program_details(Evas_Object *ed, const char *program)
1154 { 1154 {
1155 double from, range; 1155 double from, range;
1156 1156
1157 from = edje_edit_program_transition_time_get(ed, program); 1157 from = edje_edit_program_transition_time_get(ed, pprogram);
1158 if (from > 0.0) 1158 if (from > 0.0)
1159 { 1159 {
1160 str = _transition_name_get 1160 str = _transition_name_get
1161 (edje_edit_program_transition_get(ed, program)); 1161 (edje_edit_program_transition_get(ed, pprogram));
1162 if (machine) 1162 if (machine)
1163 printf("TRANSITION-NAME: %s\nTRANSITION-DURATION: %g\n", 1163 printf("TRANSITION-NAME: %s\nTRANSITION-DURATION: %g\n",
1164 str, from); 1164 str, from);
@@ -1166,8 +1166,8 @@ program_details(Evas_Object *ed, const char *program)
1166 /* do not free str! */ 1166 /* do not free str! */
1167 } 1167 }
1168 1168
1169 from = edje_edit_program_in_from_get(ed, program); 1169 from = edje_edit_program_in_from_get(ed, pprogram);
1170 range = edje_edit_program_in_range_get(ed, program); 1170 range = edje_edit_program_in_range_get(ed, pprogram);
1171 if (FDIFF(from, 0.0) || FDIFF(range, 0.0)) 1171 if (FDIFF(from, 0.0) || FDIFF(range, 0.0))
1172 { 1172 {
1173 if (machine) 1173 if (machine)
@@ -1176,13 +1176,13 @@ program_details(Evas_Object *ed, const char *program)
1176 } 1176 }
1177 } 1177 }
1178 1178
1179 lst = edje_edit_program_targets_get(ed, program); 1179 lst = edje_edit_program_targets_get(ed, pprogram);
1180 EINA_LIST_FOREACH(lst, l, str) 1180 EINA_LIST_FOREACH(lst, l, str)
1181 if (machine) printf("TARGET: %s\n", str); 1181 if (machine) printf("TARGET: %s\n", str);
1182 else printf(INDENT3 "target: \"%s\";\n", str); 1182 else printf(INDENT3 "target: \"%s\";\n", str);
1183 edje_edit_string_list_free(lst); 1183 edje_edit_string_list_free(lst);
1184 1184
1185 lst = edje_edit_program_afters_get(ed, program); 1185 lst = edje_edit_program_afters_get(ed, pprogram);
1186 EINA_LIST_FOREACH(lst, l, str) 1186 EINA_LIST_FOREACH(lst, l, str)
1187 if (machine) printf("AFTER: %s\n", str); 1187 if (machine) printf("AFTER: %s\n", str);
1188 else printf(INDENT3 "after: \"%s\";\n", str); 1188 else printf(INDENT3 "after: \"%s\";\n", str);
diff --git a/libraries/edje/src/bin/edje_multisense_convert.c b/libraries/edje/src/bin/edje_multisense_convert.c
index d37d218..62c2f67 100644
--- a/libraries/edje/src/bin/edje_multisense_convert.c
+++ b/libraries/edje/src/bin/edje_multisense_convert.c
@@ -12,7 +12,7 @@
12# endif 12# endif
13 13
14Edje_Sound_Encode * 14Edje_Sound_Encode *
15_edje_multisense_encode(const char *filename, Edje_Sound_Sample *sample, double quality) 15_edje_multisense_encode(const char *filename, Edje_Sound_Sample *sample, double quality __UNUSED__)
16{ 16{
17 SF_INFO sfinfo; 17 SF_INFO sfinfo;
18 SNDFILE* sfile; 18 SNDFILE* sfile;
diff --git a/libraries/edje/src/bin/epp/Makefile.in b/libraries/edje/src/bin/epp/Makefile.in
index 2ef2e56..c1a8ee5 100644
--- a/libraries/edje/src/bin/epp/Makefile.in
+++ b/libraries/edje/src/bin/epp/Makefile.in
@@ -225,8 +225,6 @@ PACKAGE_URL = @PACKAGE_URL@
225PACKAGE_VERSION = @PACKAGE_VERSION@ 225PACKAGE_VERSION = @PACKAGE_VERSION@
226PATH_SEPARATOR = @PATH_SEPARATOR@ 226PATH_SEPARATOR = @PATH_SEPARATOR@
227PKG_CONFIG = @PKG_CONFIG@ 227PKG_CONFIG = @PKG_CONFIG@
228PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
229PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
230PYTHON = @PYTHON@ 228PYTHON = @PYTHON@
231PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 229PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
232PYTHON_PLATFORM = @PYTHON_PLATFORM@ 230PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/bin/epp/cppmain.c b/libraries/edje/src/bin/epp/cppmain.c
index 45b67b5..ea0a0b2 100644
--- a/libraries/edje/src/bin/epp/cppmain.c
+++ b/libraries/edje/src/bin/epp/cppmain.c
@@ -44,7 +44,9 @@ main(int argc, char **argv)
44 int argi = 1; /* Next argument to handle. */ 44 int argi = 1; /* Next argument to handle. */
45 struct cpp_options *opts = &options; 45 struct cpp_options *opts = &options;
46 enum cpp_token kind; 46 enum cpp_token kind;
47 int got_text; 47#if EPP_DEBUG
48 int got_text = 0;
49#endif
48 50
49 p = argv[0] + strlen(argv[0]); 51 p = argv[0] + strlen(argv[0]);
50#ifndef __EMX__ 52#ifndef __EMX__
@@ -76,7 +78,6 @@ main(int argc, char **argv)
76 else if (!freopen(opts->out_fname, "w", stdout)) 78 else if (!freopen(opts->out_fname, "w", stdout))
77 cpp_pfatal_with_name(&parse_in, opts->out_fname); 79 cpp_pfatal_with_name(&parse_in, opts->out_fname);
78 80
79 got_text = 0;
80 for (i = 0;; i++) 81 for (i = 0;; i++)
81 { 82 {
82 kind = cpp_get_token(&parse_in); 83 kind = cpp_get_token(&parse_in);
@@ -108,7 +109,9 @@ main(int argc, char **argv)
108 case CPP_COMMA: 109 case CPP_COMMA:
109 case CPP_SEMICOLON: 110 case CPP_SEMICOLON:
110 case CPP_3DOTS: 111 case CPP_3DOTS:
111 got_text = 1; 112#if EPP_DEBUG
113 got_text = 1;
114#endif
112 continue; 115 continue;
113 116
114 case CPP_COMMENT: 117 case CPP_COMMENT:
@@ -130,7 +133,9 @@ main(int argc, char **argv)
130 exit(FATAL_EXIT_CODE); 133 exit(FATAL_EXIT_CODE);
131 } 134 }
132 parse_in.limit = parse_in.token_buffer; 135 parse_in.limit = parse_in.token_buffer;
133 got_text = 0; 136#if EPP_DEBUG
137 got_text = 0;
138#endif
134 } 139 }
135 140
136 done: 141 done:
diff --git a/libraries/edje/src/examples/Makefile.am b/libraries/edje/src/examples/Makefile.am
index 20e2c81..579f148 100644
--- a/libraries/edje/src/examples/Makefile.am
+++ b/libraries/edje/src/examples/Makefile.am
@@ -1,12 +1,15 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3pkglibdir = $(datadir)/$(PACKAGE)/examples 3examplesdir = $(datadir)/$(PACKAGE)/examples
4
4if ENABLE_MULTISENSE 5if ENABLE_MULTISENSE
5MULTISENSE_EDC_FILE = multisense.edc 6MULTISENSE_EDC_FILE = multisense.edc
6SND_DIR = -sd $(srcdir) 7SND_DIR = -sd $(srcdir)
7endif 8endif
9
8#put here all EDCs one needs to the examples 10#put here all EDCs one needs to the examples
9EDCS = basic.edc \ 11EDCS = \
12 basic.edc \
10 swallow.edc \ 13 swallow.edc \
11 text.edc \ 14 text.edc \
12 table.edc \ 15 table.edc \
@@ -20,26 +23,48 @@ EDCS = basic.edc \
20 sigtest.edc \ 23 sigtest.edc \
21 $(MULTISENSE_EDC_FILE) 24 $(MULTISENSE_EDC_FILE)
22 25
26.edc.edj:
27 $(edje_cc) -v -fd $(srcdir) -id $(srcdir) $(SND_DIR) $< $(builddir)/$(@F)
28
29EDJS = $(EDCS:%.edc=%.edj)
30
23filesdir = $(datadir)/$(PACKAGE)/examples 31filesdir = $(datadir)/$(PACKAGE)/examples
24files_DATA = 32files_DATA = \
33 $(EDCS) \
34 bubble.png \
35 red.png \
36 test.png \
37 Vera.ttf \
38 edje-basic.c \
39 edje-swallow.c \
40 edje-text.c \
41 edje-table.c \
42 edje-box.c \
43 edje-box2.c \
44 edje-drag.c \
45 edje-signals-messages.c \
46 edje-color-class.c \
47 edje-perspective.c \
48 edje-animations.c \
49 sigtest.c
50
51EXTRA_DIST = $(files_DATA)
25 52
26if BUILD_EXAMPLES 53if BUILD_EXAMPLES
27 54
28AM_CPPFLAGS = \ 55AM_CPPFLAGS = \
29-I. \ 56 -I. \
30-I$(top_srcdir)/src/lib \ 57 -I$(top_srcdir)/src/lib \
31-I$(top_srcdir)/src/lib/include \ 58 -I$(top_srcdir)/src/lib/include \
32-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 59 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
33-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 60 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
34-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 61 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
35-DPACKAGE_EXAMPLES_DIR=\"$(datadir)/$(PACKAGE)/examples\" 62 -DPACKAGE_EXAMPLES_DIR=\"$(datadir)/$(PACKAGE)/examples\" \
36 63 @EDJE_CFLAGS@
37pkglib_PROGRAMS =
38 64
39#the ones using ecore_evas follow 65files_DATA += $(EDJS)
40AM_CPPFLAGS += @EDJE_CFLAGS@
41 66
42pkglib_PROGRAMS += \ 67examples_PROGRAMS = \
43 edje-basic \ 68 edje-basic \
44 edje-swallow \ 69 edje-swallow \
45 edje-text \ 70 edje-text \
@@ -55,53 +80,4 @@ pkglib_PROGRAMS += \
55 80
56LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_LIBS@ 81LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_LIBS@
57 82
58.edc.edj:
59 $(edje_cc) -v -id $(srcdir) $(SND_DIR) $< $(builddir)/$(@F)
60
61EDJS = $(EDCS:%.edc=%.edj)
62
63files_DATA += $(EDJS)
64
65endif # if BUILD_EXAMPLES
66
67if INSTALL_EXAMPLES
68
69#put here additional data when installing examples
70files_DATA += \
71 $(srcdir)/bubble.png \
72 $(srcdir)/red.png \
73 $(srcdir)/test.png \
74 $(srcdir)/Vera.ttf
75
76files_DATA += \
77 $(EDCS) \
78 $(srcdir)/edje-basic.c \
79 $(srcdir)/edje-swallow.c \
80 $(srcdir)/edje-text.c \
81 $(srcdir)/edje-table.c \
82 $(srcdir)/edje-box.c \
83 $(srcdir)/edje-box2.c \
84 $(srcdir)/edje-drag.c \
85 $(srcdir)/edje-signals-messages.c \
86 $(srcdir)/edje-color-class.c \
87 $(srcdir)/edje-perspective.c \
88 $(srcdir)/edje-animations.c \
89 $(srcdir)/sigtest.c
90endif 83endif
91
92EXTRA_DIST = $(EDCS) \
93 $(srcdir)/bubble.png \
94 $(srcdir)/red.png \
95 $(srcdir)/test.png \
96 $(srcdir)/edje-basic.c \
97 $(srcdir)/edje-swallow.c \
98 $(srcdir)/edje-text.c \
99 $(srcdir)/edje-table.c \
100 $(srcdir)/edje-box.c \
101 $(srcdir)/edje-box2.c \
102 $(srcdir)/edje-drag.c \
103 $(srcdir)/edje-signals-messages.c \
104 $(srcdir)/edje-color-class.c \
105 $(srcdir)/edje-perspective.c \
106 $(srcdir)/edje-animations.c \
107 $(srcdir)/sigtest.c
diff --git a/libraries/edje/src/examples/Makefile.in b/libraries/edje/src/examples/Makefile.in
index bde628f..7f867e0 100644
--- a/libraries/edje/src/examples/Makefile.in
+++ b/libraries/edje/src/examples/Makefile.in
@@ -19,6 +19,7 @@
19VPATH = @srcdir@ 19VPATH = @srcdir@
20pkgdatadir = $(datadir)/@PACKAGE@ 20pkgdatadir = $(datadir)/@PACKAGE@
21pkgincludedir = $(includedir)/@PACKAGE@ 21pkgincludedir = $(includedir)/@PACKAGE@
22pkglibdir = $(libdir)/@PACKAGE@
22pkglibexecdir = $(libexecdir)/@PACKAGE@ 23pkglibexecdir = $(libexecdir)/@PACKAGE@
23am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 24am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
24install_sh_DATA = $(install_sh) -c -m 644 25install_sh_DATA = $(install_sh) -c -m 644
@@ -34,7 +35,8 @@ PRE_UNINSTALL = :
34POST_UNINSTALL = : 35POST_UNINSTALL = :
35build_triplet = @build@ 36build_triplet = @build@
36host_triplet = @host@ 37host_triplet = @host@
37@BUILD_EXAMPLES_TRUE@pkglib_PROGRAMS = edje-basic$(EXEEXT) \ 38@BUILD_EXAMPLES_TRUE@am__append_1 = $(EDJS)
39@BUILD_EXAMPLES_TRUE@examples_PROGRAMS = edje-basic$(EXEEXT) \
38@BUILD_EXAMPLES_TRUE@ edje-swallow$(EXEEXT) edje-text$(EXEEXT) \ 40@BUILD_EXAMPLES_TRUE@ edje-swallow$(EXEEXT) edje-text$(EXEEXT) \
39@BUILD_EXAMPLES_TRUE@ edje-table$(EXEEXT) edje-box$(EXEEXT) \ 41@BUILD_EXAMPLES_TRUE@ edje-table$(EXEEXT) edje-box$(EXEEXT) \
40@BUILD_EXAMPLES_TRUE@ edje-box2$(EXEEXT) edje-drag$(EXEEXT) \ 42@BUILD_EXAMPLES_TRUE@ edje-box2$(EXEEXT) edje-drag$(EXEEXT) \
@@ -42,24 +44,6 @@ host_triplet = @host@
42@BUILD_EXAMPLES_TRUE@ edje-color-class$(EXEEXT) \ 44@BUILD_EXAMPLES_TRUE@ edje-color-class$(EXEEXT) \
43@BUILD_EXAMPLES_TRUE@ edje-perspective$(EXEEXT) \ 45@BUILD_EXAMPLES_TRUE@ edje-perspective$(EXEEXT) \
44@BUILD_EXAMPLES_TRUE@ edje-animations$(EXEEXT) sigtest$(EXEEXT) 46@BUILD_EXAMPLES_TRUE@ edje-animations$(EXEEXT) sigtest$(EXEEXT)
45@BUILD_EXAMPLES_TRUE@am__append_1 = $(EDJS)
46
47#put here additional data when installing examples
48@INSTALL_EXAMPLES_TRUE@am__append_2 = $(srcdir)/bubble.png \
49@INSTALL_EXAMPLES_TRUE@ $(srcdir)/red.png $(srcdir)/test.png \
50@INSTALL_EXAMPLES_TRUE@ $(srcdir)/Vera.ttf $(EDCS) \
51@INSTALL_EXAMPLES_TRUE@ $(srcdir)/edje-basic.c \
52@INSTALL_EXAMPLES_TRUE@ $(srcdir)/edje-swallow.c \
53@INSTALL_EXAMPLES_TRUE@ $(srcdir)/edje-text.c \
54@INSTALL_EXAMPLES_TRUE@ $(srcdir)/edje-table.c \
55@INSTALL_EXAMPLES_TRUE@ $(srcdir)/edje-box.c \
56@INSTALL_EXAMPLES_TRUE@ $(srcdir)/edje-box2.c \
57@INSTALL_EXAMPLES_TRUE@ $(srcdir)/edje-drag.c \
58@INSTALL_EXAMPLES_TRUE@ $(srcdir)/edje-signals-messages.c \
59@INSTALL_EXAMPLES_TRUE@ $(srcdir)/edje-color-class.c \
60@INSTALL_EXAMPLES_TRUE@ $(srcdir)/edje-perspective.c \
61@INSTALL_EXAMPLES_TRUE@ $(srcdir)/edje-animations.c \
62@INSTALL_EXAMPLES_TRUE@ $(srcdir)/sigtest.c
63subdir = src/examples 47subdir = src/examples
64DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 48DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
65ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 49ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -77,8 +61,8 @@ mkinstalldirs = $(install_sh) -d
77CONFIG_HEADER = $(top_builddir)/config.h 61CONFIG_HEADER = $(top_builddir)/config.h
78CONFIG_CLEAN_FILES = 62CONFIG_CLEAN_FILES =
79CONFIG_CLEAN_VPATH_FILES = 63CONFIG_CLEAN_VPATH_FILES =
80am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(filesdir)" 64am__installdirs = "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(filesdir)"
81PROGRAMS = $(pkglib_PROGRAMS) 65PROGRAMS = $(examples_PROGRAMS)
82edje_animations_SOURCES = edje-animations.c 66edje_animations_SOURCES = edje-animations.c
83edje_animations_OBJECTS = edje-animations.$(OBJEXT) 67edje_animations_OBJECTS = edje-animations.$(OBJEXT)
84edje_animations_LDADD = $(LDADD) 68edje_animations_LDADD = $(LDADD)
@@ -201,7 +185,6 @@ DATA = $(files_DATA)
201ETAGS = etags 185ETAGS = etags
202CTAGS = ctags 186CTAGS = ctags
203DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) 187DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
204pkglibdir = $(datadir)/$(PACKAGE)/examples
205ACLOCAL = @ACLOCAL@ 188ACLOCAL = @ACLOCAL@
206ALLOCA = @ALLOCA@ 189ALLOCA = @ALLOCA@
207ALSA_CFLAGS = @ALSA_CFLAGS@ 190ALSA_CFLAGS = @ALSA_CFLAGS@
@@ -296,8 +279,6 @@ PACKAGE_URL = @PACKAGE_URL@
296PACKAGE_VERSION = @PACKAGE_VERSION@ 279PACKAGE_VERSION = @PACKAGE_VERSION@
297PATH_SEPARATOR = @PATH_SEPARATOR@ 280PATH_SEPARATOR = @PATH_SEPARATOR@
298PKG_CONFIG = @PKG_CONFIG@ 281PKG_CONFIG = @PKG_CONFIG@
299PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
300PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
301PYTHON = @PYTHON@ 282PYTHON = @PYTHON@
302PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 283PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
303PYTHON_PLATFORM = @PYTHON_PLATFORM@ 284PYTHON_PLATFORM = @PYTHON_PLATFORM@
@@ -385,10 +366,13 @@ top_srcdir = @top_srcdir@
385version_info = @version_info@ 366version_info = @version_info@
386vimdir = @vimdir@ 367vimdir = @vimdir@
387MAINTAINERCLEANFILES = Makefile.in 368MAINTAINERCLEANFILES = Makefile.in
369examplesdir = $(datadir)/$(PACKAGE)/examples
388@ENABLE_MULTISENSE_TRUE@MULTISENSE_EDC_FILE = multisense.edc 370@ENABLE_MULTISENSE_TRUE@MULTISENSE_EDC_FILE = multisense.edc
389@ENABLE_MULTISENSE_TRUE@SND_DIR = -sd $(srcdir) 371@ENABLE_MULTISENSE_TRUE@SND_DIR = -sd $(srcdir)
372
390#put here all EDCs one needs to the examples 373#put here all EDCs one needs to the examples
391EDCS = basic.edc \ 374EDCS = \
375 basic.edc \
392 swallow.edc \ 376 swallow.edc \
393 text.edc \ 377 text.edc \
394 table.edc \ 378 table.edc \
@@ -402,36 +386,24 @@ EDCS = basic.edc \
402 sigtest.edc \ 386 sigtest.edc \
403 $(MULTISENSE_EDC_FILE) 387 $(MULTISENSE_EDC_FILE)
404 388
389EDJS = $(EDCS:%.edc=%.edj)
405filesdir = $(datadir)/$(PACKAGE)/examples 390filesdir = $(datadir)/$(PACKAGE)/examples
406files_DATA = $(am__append_1) $(am__append_2) 391files_DATA = $(EDCS) bubble.png red.png test.png Vera.ttf edje-basic.c \
407 392 edje-swallow.c edje-text.c edje-table.c edje-box.c edje-box2.c \
408#the ones using ecore_evas follow 393 edje-drag.c edje-signals-messages.c edje-color-class.c \
409@BUILD_EXAMPLES_TRUE@AM_CPPFLAGS = -I. -I$(top_srcdir)/src/lib \ 394 edje-perspective.c edje-animations.c sigtest.c $(am__append_1)
410@BUILD_EXAMPLES_TRUE@ -I$(top_srcdir)/src/lib/include \ 395EXTRA_DIST = $(files_DATA)
411@BUILD_EXAMPLES_TRUE@ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ 396@BUILD_EXAMPLES_TRUE@AM_CPPFLAGS = \
412@BUILD_EXAMPLES_TRUE@ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ 397@BUILD_EXAMPLES_TRUE@ -I. \
413@BUILD_EXAMPLES_TRUE@ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 398@BUILD_EXAMPLES_TRUE@ -I$(top_srcdir)/src/lib \
414@BUILD_EXAMPLES_TRUE@ -DPACKAGE_EXAMPLES_DIR=\"$(datadir)/$(PACKAGE)/examples\" \ 399@BUILD_EXAMPLES_TRUE@ -I$(top_srcdir)/src/lib/include \
415@BUILD_EXAMPLES_TRUE@ @EDJE_CFLAGS@ $(am__empty) 400@BUILD_EXAMPLES_TRUE@ -DPACKAGE_BIN_DIR=\"$(bindir)\" \
416@BUILD_EXAMPLES_TRUE@LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_LIBS@ 401@BUILD_EXAMPLES_TRUE@ -DPACKAGE_LIB_DIR=\"$(libdir)\" \
417@BUILD_EXAMPLES_TRUE@EDJS = $(EDCS:%.edc=%.edj) 402@BUILD_EXAMPLES_TRUE@ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
418EXTRA_DIST = $(EDCS) \ 403@BUILD_EXAMPLES_TRUE@ -DPACKAGE_EXAMPLES_DIR=\"$(datadir)/$(PACKAGE)/examples\" \
419 $(srcdir)/bubble.png \ 404@BUILD_EXAMPLES_TRUE@ @EDJE_CFLAGS@
420 $(srcdir)/red.png \
421 $(srcdir)/test.png \
422 $(srcdir)/edje-basic.c \
423 $(srcdir)/edje-swallow.c \
424 $(srcdir)/edje-text.c \
425 $(srcdir)/edje-table.c \
426 $(srcdir)/edje-box.c \
427 $(srcdir)/edje-box2.c \
428 $(srcdir)/edje-drag.c \
429 $(srcdir)/edje-signals-messages.c \
430 $(srcdir)/edje-color-class.c \
431 $(srcdir)/edje-perspective.c \
432 $(srcdir)/edje-animations.c \
433 $(srcdir)/sigtest.c
434 405
406@BUILD_EXAMPLES_TRUE@LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_LIBS@
435all: all-am 407all: all-am
436 408
437.SUFFIXES: 409.SUFFIXES:
@@ -466,10 +438,10 @@ $(top_srcdir)/configure: $(am__configure_deps)
466$(ACLOCAL_M4): $(am__aclocal_m4_deps) 438$(ACLOCAL_M4): $(am__aclocal_m4_deps)
467 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 439 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
468$(am__aclocal_m4_deps): 440$(am__aclocal_m4_deps):
469install-pkglibPROGRAMS: $(pkglib_PROGRAMS) 441install-examplesPROGRAMS: $(examples_PROGRAMS)
470 @$(NORMAL_INSTALL) 442 @$(NORMAL_INSTALL)
471 test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" 443 test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)"
472 @list='$(pkglib_PROGRAMS)'; test -n "$(pkglibdir)" || list=; \ 444 @list='$(examples_PROGRAMS)'; test -n "$(examplesdir)" || list=; \
473 for p in $$list; do echo "$$p $$p"; done | \ 445 for p in $$list; do echo "$$p $$p"; done | \
474 sed 's/$(EXEEXT)$$//' | \ 446 sed 's/$(EXEEXT)$$//' | \
475 while read p p1; do if test -f $$p || test -f $$p1; \ 447 while read p p1; do if test -f $$p || test -f $$p1; \
@@ -486,23 +458,23 @@ install-pkglibPROGRAMS: $(pkglib_PROGRAMS)
486 while read type dir files; do \ 458 while read type dir files; do \
487 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ 459 if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
488 test -z "$$files" || { \ 460 test -z "$$files" || { \
489 echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkglibdir)$$dir'"; \ 461 echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(examplesdir)$$dir'"; \
490 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkglibdir)$$dir" || exit $$?; \ 462 $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(examplesdir)$$dir" || exit $$?; \
491 } \ 463 } \
492 ; done 464 ; done
493 465
494uninstall-pkglibPROGRAMS: 466uninstall-examplesPROGRAMS:
495 @$(NORMAL_UNINSTALL) 467 @$(NORMAL_UNINSTALL)
496 @list='$(pkglib_PROGRAMS)'; test -n "$(pkglibdir)" || list=; \ 468 @list='$(examples_PROGRAMS)'; test -n "$(examplesdir)" || list=; \
497 files=`for p in $$list; do echo "$$p"; done | \ 469 files=`for p in $$list; do echo "$$p"; done | \
498 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ 470 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
499 -e 's/$$/$(EXEEXT)/' `; \ 471 -e 's/$$/$(EXEEXT)/' `; \
500 test -n "$$list" || exit 0; \ 472 test -n "$$list" || exit 0; \
501 echo " ( cd '$(DESTDIR)$(pkglibdir)' && rm -f" $$files ")"; \ 473 echo " ( cd '$(DESTDIR)$(examplesdir)' && rm -f" $$files ")"; \
502 cd "$(DESTDIR)$(pkglibdir)" && rm -f $$files 474 cd "$(DESTDIR)$(examplesdir)" && rm -f $$files
503 475
504clean-pkglibPROGRAMS: 476clean-examplesPROGRAMS:
505 @list='$(pkglib_PROGRAMS)'; test -n "$$list" || exit 0; \ 477 @list='$(examples_PROGRAMS)'; test -n "$$list" || exit 0; \
506 echo " rm -f" $$list; \ 478 echo " rm -f" $$list; \
507 rm -f $$list || exit $$?; \ 479 rm -f $$list || exit $$?; \
508 test -n "$(EXEEXT)" || exit 0; \ 480 test -n "$(EXEEXT)" || exit 0; \
@@ -701,7 +673,7 @@ check-am: all-am
701check: check-am 673check: check-am
702all-am: Makefile $(PROGRAMS) $(DATA) 674all-am: Makefile $(PROGRAMS) $(DATA)
703installdirs: 675installdirs:
704 for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(filesdir)"; do \ 676 for dir in "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(filesdir)"; do \
705 test -z "$$dir" || $(MKDIR_P) "$$dir"; \ 677 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
706 done 678 done
707install: install-am 679install: install-am
@@ -732,7 +704,7 @@ maintainer-clean-generic:
732 -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) 704 -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
733clean: clean-am 705clean: clean-am
734 706
735clean-am: clean-generic clean-libtool clean-pkglibPROGRAMS \ 707clean-am: clean-examplesPROGRAMS clean-generic clean-libtool \
736 mostlyclean-am 708 mostlyclean-am
737 709
738distclean: distclean-am 710distclean: distclean-am
@@ -753,13 +725,13 @@ info: info-am
753 725
754info-am: 726info-am:
755 727
756install-data-am: install-filesDATA 728install-data-am: install-examplesPROGRAMS install-filesDATA
757 729
758install-dvi: install-dvi-am 730install-dvi: install-dvi-am
759 731
760install-dvi-am: 732install-dvi-am:
761 733
762install-exec-am: install-pkglibPROGRAMS 734install-exec-am:
763 735
764install-html: install-html-am 736install-html: install-html-am
765 737
@@ -799,28 +771,29 @@ ps: ps-am
799 771
800ps-am: 772ps-am:
801 773
802uninstall-am: uninstall-filesDATA uninstall-pkglibPROGRAMS 774uninstall-am: uninstall-examplesPROGRAMS uninstall-filesDATA
803 775
804.MAKE: install-am install-strip 776.MAKE: install-am install-strip
805 777
806.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ 778.PHONY: CTAGS GTAGS all all-am check check-am clean \
807 clean-libtool clean-pkglibPROGRAMS ctags distclean \ 779 clean-examplesPROGRAMS clean-generic clean-libtool ctags \
808 distclean-compile distclean-generic distclean-libtool \ 780 distclean distclean-compile distclean-generic \
809 distclean-tags distdir dvi dvi-am html html-am info info-am \ 781 distclean-libtool distclean-tags distdir dvi dvi-am html \
810 install install-am install-data install-data-am install-dvi \ 782 html-am info info-am install install-am install-data \
811 install-dvi-am install-exec install-exec-am install-filesDATA \ 783 install-data-am install-dvi install-dvi-am \
812 install-html install-html-am install-info install-info-am \ 784 install-examplesPROGRAMS install-exec install-exec-am \
813 install-man install-pdf install-pdf-am install-pkglibPROGRAMS \ 785 install-filesDATA install-html install-html-am install-info \
786 install-info-am install-man install-pdf install-pdf-am \
814 install-ps install-ps-am install-strip installcheck \ 787 install-ps install-ps-am install-strip installcheck \
815 installcheck-am installdirs maintainer-clean \ 788 installcheck-am installdirs maintainer-clean \
816 maintainer-clean-generic mostlyclean mostlyclean-compile \ 789 maintainer-clean-generic mostlyclean mostlyclean-compile \
817 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ 790 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
818 tags uninstall uninstall-am uninstall-filesDATA \ 791 tags uninstall uninstall-am uninstall-examplesPROGRAMS \
819 uninstall-pkglibPROGRAMS 792 uninstall-filesDATA
820 793
821 794
822@BUILD_EXAMPLES_TRUE@.edc.edj: 795.edc.edj:
823@BUILD_EXAMPLES_TRUE@ $(edje_cc) -v -id $(srcdir) $(SND_DIR) $< $(builddir)/$(@F) 796 $(edje_cc) -v -fd $(srcdir) -id $(srcdir) $(SND_DIR) $< $(builddir)/$(@F)
824 797
825# Tell versions [3.59,3.63) of GNU make to not export all variables. 798# Tell versions [3.59,3.63) of GNU make to not export all variables.
826# Otherwise a system limit (for SysV at least) may be exceeded. 799# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libraries/edje/src/examples/Vera.ttf b/libraries/edje/src/examples/Vera.ttf
new file mode 100644
index 0000000..58cd6b5
--- /dev/null
+++ b/libraries/edje/src/examples/Vera.ttf
Binary files differ
diff --git a/libraries/edje/src/examples/lua_script.edc b/libraries/edje/src/examples/lua_script.edc
index 24e8ebe..23c2926 100644
--- a/libraries/edje/src/examples/lua_script.edc
+++ b/libraries/edje/src/examples/lua_script.edc
@@ -104,6 +104,10 @@ collections {
104 print("lua::init ... " .. D.val); 104 print("lua::init ... " .. D.val);
105 edje.echo("lua::echo('hello world')"); 105 edje.echo("lua::echo('hello world')");
106 106
107 --// How to check the edje version.
108 version = edje.version();
109 print("The edje version number is " .. version.major .. "." .. version.minor);
110
107 --// actually add the timer to call mycb in 1.23 sec 111 --// actually add the timer to call mycb in 1.23 sec
108 D.tim = edje.timer(1.23, mycb); 112 D.tim = edje.timer(1.23, mycb);
109 D.tra = edje.transition(5.0, mycb3); 113 D.tra = edje.transition(5.0, mycb3);
@@ -168,6 +172,14 @@ collections {
168 print(D.text:text()); 172 print(D.text:text());
169 D.text:show(); 173 D.text:show();
170 174
175 --// Put a few bogus API calls here to test the bogus API protection,
176 --// If the bogus API protection works, these should get ignored, but everything else runs smoothly.
177 --// Otherwise, the map is not done, the bubbles are not done, but the timers keep runinng.
178 bogus.failme(1, "two", D.rect);
179 temp = bogus.failme2();
180 D.text.bogus();
181 edje.bogus2();
182
171 --// Fun with maps! 183 --// Fun with maps!
172 D.map = edje.map(4); --// 4 is the only supported map size at the moment. 184 D.map = edje.map(4); --// 4 is the only supported map size at the moment.
173 --// These all do the same thing. 185 --// These all do the same thing.
diff --git a/libraries/edje/src/examples/multisense.edc b/libraries/edje/src/examples/multisense.edc
new file mode 100644
index 0000000..5a3cf79
--- /dev/null
+++ b/libraries/edje/src/examples/multisense.edc
@@ -0,0 +1,139 @@
1#if 0
2collections {
3 sounds {
4 sample {
5 name: "sound_name1" RAW;
6 source: "8806__jovica__basic-sine-wave-g-1.wav";
7// source: "sample.wav";
8// source: "sample-flac10k.wav";
9// source: "sample-flac10k-mono.wav";
10 }
11// sample {
12// name: "sound_name2" COMP;
13// source: "sample.wav";
14// }
15/*
16 sample {
17 name: "sound_name3" LOSSY 0.5;
18 source: "sample.wav";
19 }
20 sample {
21 name: "sound_name4" AS_IS;
22 source: "sample.wav";
23 }
24 */
25 sample {
26// name: "sound_name5" AS_IS;
27// name: "sound_name5" COMP;
28 name: "sound_name5" RAW;
29// source: "sample-ogg.wav";
30 source: "sample-ogg-mono.wav";
31// source: "sample-ogg10k.wav";
32// source: "sample-flac10k.wav";
33// source: "sample-flac10k-mono.wav";
34 }
35 sample {
36 name: "sound_name6" AS_IS;
37// name: "sound_name6" LOSSY 45.0;
38 source: "sample-flac44k-mono.wav";
39// source: "sample-flac.wav";
40// source: "sample.ogg";
41 }
42 tone: "tone-name" 2600;
43 }
44 group {
45 name: "example_group";
46 parts {
47 part {
48 name: "sample_bg";
49 type: RECT;
50 mouse_events: 1;
51 description {
52 state: "default" 0.0;
53 min: 300 150;
54 max: 300 150;
55 color: 200 200 200 100;
56 align: 0.5 0.0;
57 rel1 {
58 relative: 0.0 0.0;
59 }
60 }
61 }
62 part {
63 name: "sample_text";
64 type: TEXT;
65 mouse_events: 1;
66 repeat_events: 1;
67 description {
68 state: "default" 0.0;
69 rel1.to: "sample_bg";
70 rel2.to: "sample_bg";
71 text {
72 font: "Sans";
73 size: 20;
74 text: "Play Sound Sample";
75 }
76 }
77 }
78 part {
79 name: "tone_bg";
80 type: RECT;
81 mouse_events: 1;
82 description {
83 state: "default" 0.0;
84 min: 300 150;
85 max: 300 150;
86 align: 0.5 0.0;
87 color: 180 180 180 100;
88 rel1 {
89 relative: 0.0 1.0;
90 to: "sample_bg";
91 }
92 }
93 }
94 part {
95 name: "tone_text";
96 type: TEXT;
97 mouse_events: 1;
98 repeat_events : 1;
99 description {
100 state: "default" 0.0;
101 rel1.to: "tone_bg";
102 rel2.to: "tone_bg";
103 text {
104 font: "Sans";
105 size: 20;
106 text: "Play Tone";
107 }
108 }
109 }
110 programs {
111 program {
112 name: "click_sample1";
113 signal: "mouse,down,1";
114 source: "sample_bg";
115 action: PLAY_SAMPLE "sound_name1" 1.0;
116 }
117 program {
118 name: "click_sample2";
119 signal: "mouse,down,2";
120 source: "sample_bg";
121 action: PLAY_SAMPLE "sound_name5" 1.0;
122 }
123 program {
124 name: "click_sample3";
125 signal: "mouse,down,3";
126 source: "sample_bg";
127 action: PLAY_SAMPLE "sound_name6" 1.0;
128 }
129 program {
130 name: "click_tone";
131 signal: "mouse,down,1";
132 source: "tone_bg";
133 action: PLAY_TONE "tone-name" 0.1;
134 }
135 }
136 }
137 }
138}
139#endif
diff --git a/libraries/edje/src/examples/signals-messages.edc b/libraries/edje/src/examples/signals-messages.edc
index 45d9c58..b251368 100644
--- a/libraries/edje/src/examples/signals-messages.edc
+++ b/libraries/edje/src/examples/signals-messages.edc
@@ -105,10 +105,10 @@ collections {
105 if ((type == MSG_INT_SET) && (id == MSG_COLOR)) { 105 if ((type == MSG_INT_SET) && (id == MSG_COLOR)) {
106 new r, g, b, a; 106 new r, g, b, a;
107 107
108 r = getarg(3); 108 r = getarg(2);
109 g = getarg(4); 109 g = getarg(3);
110 b = getarg(5); 110 b = getarg(4);
111 a = getarg(6); 111 a = getarg(5);
112 112
113 set_color_class("cc", r, g, b, a); 113 set_color_class("cc", r, g, b, a);
114 } 114 }
diff --git a/libraries/edje/src/lib/Edje.h b/libraries/edje/src/lib/Edje.h
index c8094b4..6413014 100644
--- a/libraries/edje/src/lib/Edje.h
+++ b/libraries/edje/src/lib/Edje.h
@@ -377,6 +377,13 @@ part of Edje's API:
377@author Sebastian Dransfeld <sd@@tango.flipp.net> 377@author Sebastian Dransfeld <sd@@tango.flipp.net>
378@author Tom Hacohen <tom@@stosb.com> 378@author Tom Hacohen <tom@@stosb.com>
379@author Aharon Hillel <a.hillel@@partner.samsung.com> 379@author Aharon Hillel <a.hillel@@partner.samsung.com>
380@author Shilpa Singh <shilpa.singh@samsung.com> <shilpasingh.o@gmail.com>
381@author Mike Blumenkrantz <michael.blumenkrantz@gmail.com
382@author Jaehwan Kim <jae.hwan.kim@samsung.com>
383@author billiob (Boris Faure) <billiob@gmail.com>
384@author Govindaraju SM <govi.sm@samsung.com> <govism@gmail.com>
385@author Prince Kumar Dubey <prince.dubey@samsung.com> <prince.dubey@gmail.com>
386@author David Seikel <onefang at gmail.com>
380 387
381Please contact <enlightenment-devel@lists.sourceforge.net> to get in 388Please contact <enlightenment-devel@lists.sourceforge.net> to get in
382contact with the developers and maintainers. 389contact with the developers and maintainers.
@@ -472,7 +479,7 @@ extern "C" {
472#endif 479#endif
473 480
474#define EDJE_VERSION_MAJOR 1 481#define EDJE_VERSION_MAJOR 1
475#define EDJE_VERSION_MINOR 0 482#define EDJE_VERSION_MINOR 2
476 483
477 typedef struct _Edje_Version 484 typedef struct _Edje_Version
478 { 485 {
@@ -794,7 +801,7 @@ typedef enum _Edje_External_Param_Flags
794 EDJE_EXTERNAL_PARAM_FLAGS_STATE) /**< Convenience flag that sets property as GET, SET and STATE. */ 801 EDJE_EXTERNAL_PARAM_FLAGS_STATE) /**< Convenience flag that sets property as GET, SET and STATE. */
795} Edje_External_Param_Flags; 802} Edje_External_Param_Flags;
796 803
797typedef enum 804typedef enum _Edje_Input_Panel_Layout
798{ 805{
799 EDJE_INPUT_PANEL_LAYOUT_NORMAL, /**< Default layout */ 806 EDJE_INPUT_PANEL_LAYOUT_NORMAL, /**< Default layout */
800 EDJE_INPUT_PANEL_LAYOUT_NUMBER, /**< Number layout */ 807 EDJE_INPUT_PANEL_LAYOUT_NUMBER, /**< Number layout */
@@ -804,7 +811,10 @@ typedef enum
804 EDJE_INPUT_PANEL_LAYOUT_IP, /**< IP layout */ 811 EDJE_INPUT_PANEL_LAYOUT_IP, /**< IP layout */
805 EDJE_INPUT_PANEL_LAYOUT_MONTH, /**< Month layout */ 812 EDJE_INPUT_PANEL_LAYOUT_MONTH, /**< Month layout */
806 EDJE_INPUT_PANEL_LAYOUT_NUMBERONLY, /**< Number Only layout */ 813 EDJE_INPUT_PANEL_LAYOUT_NUMBERONLY, /**< Number Only layout */
807 EDJE_INPUT_PANEL_LAYOUT_INVALID 814 EDJE_INPUT_PANEL_LAYOUT_INVALID, /**< Never use this */
815 EDJE_INPUT_PANEL_LAYOUT_HEX, /**< Hexadecimal layout @since 1.2 */
816 EDJE_INPUT_PANEL_LAYOUT_TERMINAL, /**< Command-line terminal layout @since 1.2 */
817 EDJE_INPUT_PANEL_LAYOUT_PASSWORD /**< Like normal, but no auto-correct, no auto-capitalization etc. @since 1.2 */
808} Edje_Input_Panel_Layout; 818} Edje_Input_Panel_Layout;
809 819
810/** 820/**
@@ -1650,8 +1660,21 @@ EAPI void edje_box_layout_register (const char *name, Evas_Object
1650 * } 1660 * }
1651 * 1661 *
1652 * @endcode 1662 * @endcode
1663 *
1664 * @note You can get a callback every time edje re-calculates the object
1665 * (either due to animation or some kind of signal or input). This is called
1666 * in-line just after the recalculation has occured. It is a good idea not
1667 * to go and delete or alter the object inside this callbacks, simply make
1668 * a note that the recalculation has taken place and then do somethnig about
1669 * it outside the callback. to register a callback use code like:
1670 *
1671 * @code
1672 * evas_object_smart_callback_add(edje_obj, "recalc", my_cb, my_cb_data);
1673 * @endcode
1674 *
1675 * @see evas_object_smart_callback_add()
1653 * 1676 *
1654 * @note before creating the first Edje object in your code, remember 1677 * @note Before creating the first Edje object in your code, remember
1655 * to initialize the library, with edje_init(), or unexpected behavior 1678 * to initialize the library, with edje_init(), or unexpected behavior
1656 * might occur. 1679 * might occur.
1657 */ 1680 */
@@ -2757,12 +2780,15 @@ EAPI Eina_Bool edje_object_part_text_cursor_is_visible_format_get(const E
2757/** 2780/**
2758 * @brief Returns the content (char) at the cursor position. 2781 * @brief Returns the content (char) at the cursor position.
2759 * @see evas_textblock_cursor_content_get 2782 * @see evas_textblock_cursor_content_get
2783 *
2784 * You must free the return (if not NULL) after you are done with it.
2760 * 2785 *
2761 * @param obj A valid Evas_Object handle 2786 * @param obj A valid Evas_Object handle
2762 * @param part The part name 2787 * @param part The part name
2763 * @param cur The cursor to use 2788 * @param cur The cursor to use
2789 * @return The character string pointed to (may be a multi-byte utf8 sequence) terminated by a nul byte.
2764 */ 2790 */
2765EAPI const char *edje_object_part_text_cursor_content_get (const Evas_Object *obj, const char *part, Edje_Cursor cur); 2791EAPI char *edje_object_part_text_cursor_content_get (const Evas_Object *obj, const char *part, Edje_Cursor cur);
2766 2792
2767/** 2793/**
2768 * @brief Sets the cursor position to the given value 2794 * @brief Sets the cursor position to the given value
@@ -2941,7 +2967,9 @@ EAPI Eina_Bool edje_object_part_swallow (Evas_Object *obj, const c
2941 * 2967 *
2942 * Causes the edje to regurgitate a previously swallowed object. :) 2968 * Causes the edje to regurgitate a previously swallowed object. :)
2943 * 2969 *
2944 * @note @p obj_swallow will @b not be deleted. 2970 * @note @p obj_swallow will @b not be deleted or hidden.
2971 * @note @p obj_swallow may appear shown on the evas depending on its state when
2972 * it got unswallowed. Make sure you delete it or hide it if you do not want it to.
2945 */ 2973 */
2946EAPI void edje_object_part_unswallow (Evas_Object *obj, Evas_Object *obj_swallow); 2974EAPI void edje_object_part_unswallow (Evas_Object *obj, Evas_Object *obj_swallow);
2947 2975
diff --git a/libraries/edje/src/lib/Makefile.in b/libraries/edje/src/lib/Makefile.in
index cf73390..e67d90c 100644
--- a/libraries/edje/src/lib/Makefile.in
+++ b/libraries/edje/src/lib/Makefile.in
@@ -230,8 +230,6 @@ PACKAGE_URL = @PACKAGE_URL@
230PACKAGE_VERSION = @PACKAGE_VERSION@ 230PACKAGE_VERSION = @PACKAGE_VERSION@
231PATH_SEPARATOR = @PATH_SEPARATOR@ 231PATH_SEPARATOR = @PATH_SEPARATOR@
232PKG_CONFIG = @PKG_CONFIG@ 232PKG_CONFIG = @PKG_CONFIG@
233PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
234PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
235PYTHON = @PYTHON@ 233PYTHON = @PYTHON@
236PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 234PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
237PYTHON_PLATFORM = @PYTHON_PLATFORM@ 235PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/lib/edje_cache.c b/libraries/edje/src/lib/edje_cache.c
index a8b355f..0ce6b30 100644
--- a/libraries/edje/src/lib/edje_cache.c
+++ b/libraries/edje/src/lib/edje_cache.c
@@ -128,18 +128,11 @@ _edje_file_coll_open(Edje_File *edf, const char *coll)
128} 128}
129 129
130static Edje_File * 130static Edje_File *
131_edje_file_open(const char *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret) 131_edje_file_open(const char *file, const char *coll, int *error_ret, Edje_Part_Collection **edc_ret, time_t mtime)
132{ 132{
133 Edje_File *edf; 133 Edje_File *edf;
134 Edje_Part_Collection *edc; 134 Edje_Part_Collection *edc;
135 Eet_File *ef; 135 Eet_File *ef;
136 struct stat st;
137
138 if (stat(file, &st) != 0)
139 {
140 *error_ret = EDJE_LOAD_ERROR_DOES_NOT_EXIST;
141 return NULL;
142 }
143 136
144 ef = eet_open(file, EET_FILE_MODE_READ); 137 ef = eet_open(file, EET_FILE_MODE_READ);
145 if (!ef) 138 if (!ef)
@@ -156,7 +149,7 @@ _edje_file_open(const char *file, const char *coll, int *error_ret, Edje_Part_Co
156 } 149 }
157 150
158 edf->ef = ef; 151 edf->ef = ef;
159 edf->mtime = st.st_mtime; 152 edf->mtime = mtime;
160 153
161 if (edf->version != EDJE_FILE_VERSION) 154 if (edf->version != EDJE_FILE_VERSION)
162 { 155 {
@@ -262,7 +255,7 @@ open_new:
262 if (!_edje_file_hash) 255 if (!_edje_file_hash)
263 _edje_file_hash = eina_hash_string_small_new(NULL); 256 _edje_file_hash = eina_hash_string_small_new(NULL);
264 257
265 edf = _edje_file_open(file, coll, error_ret, edc_ret); 258 edf = _edje_file_open(file, coll, error_ret, edc_ret, st.st_mtime);
266 if (!edf) 259 if (!edf)
267 return NULL; 260 return NULL;
268 261
diff --git a/libraries/edje/src/lib/edje_calc.c b/libraries/edje/src/lib/edje_calc.c
index d9fd51d..213e266 100644
--- a/libraries/edje/src/lib/edje_calc.c
+++ b/libraries/edje/src/lib/edje_calc.c
@@ -8,7 +8,8 @@ static void _edje_part_recalc_single(Edje *ed, Edje_Real_Part *ep,
8 Edje_Real_Part *center, Edje_Real_Part *light, Edje_Real_Part *persp, 8 Edje_Real_Part *center, Edje_Real_Part *light, Edje_Real_Part *persp,
9 Edje_Real_Part *rel1_to_x, Edje_Real_Part *rel1_to_y, 9 Edje_Real_Part *rel1_to_x, Edje_Real_Part *rel1_to_y,
10 Edje_Real_Part *rel2_to_x, Edje_Real_Part *rel2_to_y, 10 Edje_Real_Part *rel2_to_x, Edje_Real_Part *rel2_to_y,
11 Edje_Real_Part *confine_to, Edje_Calc_Params *params); 11 Edje_Real_Part *confine_to, Edje_Calc_Params *params,
12 FLOAT_T pos);
12 13
13void 14void
14_edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T v1, FLOAT_T v2) 15_edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T v1, FLOAT_T v2)
@@ -115,6 +116,7 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, FLOAT_T pos, FLOAT_T
115 ep->description_pos = npos; 116 ep->description_pos = npos;
116 117
117 ed->dirty = 1; 118 ed->dirty = 1;
119 ed->recalc_call = 1;
118#ifdef EDJE_CALC_CACHE 120#ifdef EDJE_CALC_CACHE
119 ep->invalidate = 1; 121 ep->invalidate = 1;
120#endif 122#endif
@@ -304,6 +306,179 @@ _edje_part_description_find(Edje *ed, Edje_Real_Part *rp, const char *name,
304 return ret; 306 return ret;
305} 307}
306 308
309static int
310_edje_image_find(Evas_Object *obj, Edje *ed, Edje_Real_Part_Set **eps, Edje_Part_Description_Image *st, Edje_Part_Image_Id *imid)
311{
312 Edje_Image_Directory_Set_Entry *entry;
313 Edje_Image_Directory_Set *set = NULL;
314 Eina_List *l;
315 int w = 0;
316 int h = 0;
317 int id;
318
319 if (!st && !imid)
320 return -1;
321
322 if (st && !st->image.set)
323 return st->image.id;
324
325 if (imid && !imid->set)
326 return imid->id;
327
328 if (imid)
329 id = imid->id;
330 else
331 id = st->image.id;
332
333 evas_object_geometry_get(obj, NULL, NULL, &w, &h);
334
335 if (eps && *eps)
336 {
337 if ((*eps)->id == id)
338 set = (*eps)->set;
339
340 if (set)
341 if ((*eps)->entry->size.min.w <= w && w <= (*eps)->entry->size.max.w)
342 if ((*eps)->entry->size.min.h <= h && h <= (*eps)->entry->size.max.h)
343 return (*eps)->entry->id;
344 }
345
346 if (!set)
347 set = ed->file->image_dir->sets + id;
348
349 EINA_LIST_FOREACH(set->entries, l, entry)
350 {
351 if (entry->size.min.w <= w && w <= entry->size.max.w)
352 if (entry->size.min.h <= h && h <= entry->size.max.h)
353 {
354 if (eps)
355 {
356 if (!*eps)
357 *eps = calloc(1, sizeof (Edje_Real_Part_Set));
358
359 if (*eps)
360 {
361 (*eps)->entry = entry;
362 (*eps)->set = set;
363 (*eps)->id = id;
364 }
365 }
366 return entry->id;
367 }
368 }
369
370 return -1;
371}
372
373static void
374_edje_real_part_image_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T pos)
375{
376 int image_id;
377 int image_count, image_num;
378
379 image_id = _edje_image_find(ep->object, ed,
380 &ep->param1.set,
381 (Edje_Part_Description_Image*) ep->param1.description,
382 NULL);
383 if (image_id < 0)
384 {
385 Edje_Image_Directory_Entry *ie;
386
387 if (!ed->file->image_dir) ie = NULL;
388 else ie = ed->file->image_dir->entries + (-image_id) - 1;
389 if ((ie) &&
390 (ie->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) &&
391 (ie->entry))
392 {
393 evas_object_image_file_set(ep->object, ie->entry, NULL);
394 }
395 }
396 else
397 {
398 image_count = 2;
399 if (ep->param2)
400 image_count += ((Edje_Part_Description_Image*) ep->param2->description)->image.tweens_count;
401 image_num = TO_INT(MUL(pos, SUB(FROM_INT(image_count),
402 FROM_DOUBLE(0.5))));
403 if (image_num > (image_count - 1))
404 image_num = image_count - 1;
405 if (image_num == 0)
406 {
407 image_id = _edje_image_find(ep->object, ed,
408 &ep->param1.set,
409 (Edje_Part_Description_Image*) ep->param1.description,
410 NULL);
411 }
412 else
413 if (ep->param2)
414 {
415 if (image_num == (image_count - 1))
416 {
417 image_id = _edje_image_find(ep->object, ed,
418 &ep->param2->set,
419 (Edje_Part_Description_Image*) ep->param2->description,
420 NULL);
421 }
422 else
423 {
424 Edje_Part_Image_Id *imid;
425
426 imid = ((Edje_Part_Description_Image*) ep->param2->description)->image.tweens[image_num - 1];
427 image_id = _edje_image_find(ep->object, ed, NULL, NULL, imid);
428 }
429 }
430 if (image_id < 0)
431 {
432 ERR("¨Part \"%s\" has description, "
433 "\"%s\" %3.3f with a missing image id!!!",
434 ep->part->name,
435 ep->param1.description->state.name,
436 ep->param1.description->state.value);
437 }
438 else
439 {
440 char buf[1024];
441
442 /* Replace snprint("edje/images/%i") == memcpy + itoa */
443#define IMAGES "edje/images/"
444 memcpy(buf, IMAGES, strlen(IMAGES));
445 eina_convert_itoa(image_id, buf + strlen(IMAGES)); /* No need to check length as 2³² need only 10 characteres. */
446
447 evas_object_image_file_set(ep->object, ed->file->path, buf);
448 if (evas_object_image_load_error_get(ep->object) != EVAS_LOAD_ERROR_NONE)
449 {
450 ERR("Error loading image collection \"%s\" from "
451 "file \"%s\". Missing EET Evas loader module?",
452 buf, ed->file->path);
453 switch (evas_object_image_load_error_get(ep->object))
454 {
455 case EVAS_LOAD_ERROR_GENERIC:
456 ERR("Error type: EVAS_LOAD_ERROR_GENERIC");
457 break;
458 case EVAS_LOAD_ERROR_DOES_NOT_EXIST:
459 ERR("Error type: EVAS_LOAD_ERROR_DOES_NOT_EXIST");
460 break;
461 case EVAS_LOAD_ERROR_PERMISSION_DENIED:
462 ERR("Error type: EVAS_LOAD_ERROR_PERMISSION_DENIED");
463 break;
464 case EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED:
465 ERR("Error type: EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED");
466 break;
467 case EVAS_LOAD_ERROR_CORRUPT_FILE:
468 ERR("Error type: EVAS_LOAD_ERROR_CORRUPT_FILE");
469 break;
470 case EVAS_LOAD_ERROR_UNKNOWN_FORMAT:
471 ERR("Error type: EVAS_LOAD_ERROR_UNKNOWN_FORMAT");
472 break;
473 default:
474 ERR("Error type: ???");
475 break;
476 }
477 }
478 }
479 }
480}
481
307static void 482static void
308_edje_real_part_rel_to_apply(Edje *ed, Edje_Real_Part *ep, Edje_Real_Part_State *state) 483_edje_real_part_rel_to_apply(Edje *ed, Edje_Real_Part *ep, Edje_Real_Part_State *state)
309{ 484{
@@ -398,6 +573,7 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, const char *d1, doubl
398 _edje_external_recalc_apply(ed, ep, NULL, chosen_desc); 573 _edje_external_recalc_apply(ed, ep, NULL, chosen_desc);
399 574
400 ed->dirty = 1; 575 ed->dirty = 1;
576 ed->recalc_call = 1;
401#ifdef EDJE_CALC_CACHE 577#ifdef EDJE_CALC_CACHE
402 ep->invalidate = 1; 578 ep->invalidate = 1;
403#endif 579#endif
@@ -423,17 +599,23 @@ _edje_recalc(Edje *ed)
423 return; 599 return;
424 } 600 }
425 } 601 }
426 if (ed->postponed) return; 602// XXX: dont need this with current smart calc infra. remove me later
427 evas_object_smart_changed(ed->obj); 603// if (ed->postponed) return;
428 ed->postponed = 1; 604// if (!ed->calc_only)
605 evas_object_smart_changed(ed->obj);
606// XXX: dont need this with current smart calc infra. remove me later
607// ed->postponed = 1;
429} 608}
430 609
431void 610void
432_edje_recalc_do(Edje *ed) 611_edje_recalc_do(Edje *ed)
433{ 612{
434 unsigned int i; 613 unsigned int i;
614 Eina_Bool need_calc;
435 615
436 ed->postponed = 0; 616// XXX: dont need this with current smart calc infra. remove me later
617// ed->postponed = 0;
618 need_calc = evas_object_smart_need_recalculate_get(ed->obj);
437 evas_object_smart_need_recalculate_set(ed->obj, 0); 619 evas_object_smart_need_recalculate_set(ed->obj, 0);
438 if (!ed->dirty) return; 620 if (!ed->dirty) return;
439 ed->have_mapped_part = 0; 621 ed->have_mapped_part = 0;
@@ -460,6 +642,14 @@ _edje_recalc_do(Edje *ed)
460 ed->all_part_change = 0; 642 ed->all_part_change = 0;
461 ed->text_part_change = 0; 643 ed->text_part_change = 0;
462#endif 644#endif
645 if (!ed->calc_only)
646 {
647 if (ed->recalc_call)
648 evas_object_smart_callback_call(ed->obj, "recalc", NULL);
649 }
650 else
651 evas_object_smart_need_recalculate_set(ed->obj, need_calc);
652 ed->recalc_call = 0;
463} 653}
464 654
465void 655void
@@ -527,6 +717,7 @@ _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y)
527 ep->drag->tmp.x = 0; 717 ep->drag->tmp.x = 0;
528 ep->drag->need_reset = 0; 718 ep->drag->need_reset = 0;
529 ed->dirty = 1; 719 ed->dirty = 1;
720 ed->recalc_call = 1;
530 } 721 }
531 722
532 if (ep->drag->y != y || ep->drag->tmp.y) 723 if (ep->drag->y != y || ep->drag->tmp.y)
@@ -535,6 +726,7 @@ _edje_dragable_pos_set(Edje *ed, Edje_Real_Part *ep, FLOAT_T x, FLOAT_T y)
535 ep->drag->tmp.y = 0; 726 ep->drag->tmp.y = 0;
536 ep->drag->need_reset = 0; 727 ep->drag->need_reset = 0;
537 ed->dirty = 1; 728 ed->dirty = 1;
729 ed->recalc_call = 1;
538 } 730 }
539 731
540#ifdef EDJE_CALC_CACHE 732#ifdef EDJE_CALC_CACHE
@@ -598,11 +790,13 @@ _edje_part_recalc_single_rel(Edje *ed,
598} 790}
599 791
600static Edje_Internal_Aspect 792static Edje_Internal_Aspect
601_edje_part_recalc_single_aspect(Edje_Real_Part *ep, 793_edje_part_recalc_single_aspect(Edje *ed,
794 Edje_Real_Part *ep,
602 Edje_Part_Description_Common *desc, 795 Edje_Part_Description_Common *desc,
603 Edje_Calc_Params *params, 796 Edje_Calc_Params *params,
604 int *minw, int *minh, 797 int *minw, int *minh,
605 int *maxw, int *maxh) 798 int *maxw, int *maxh,
799 FLOAT_T pos)
606{ 800{
607 Edje_Internal_Aspect apref = EDJE_ASPECT_PREFER_NONE; 801 Edje_Internal_Aspect apref = EDJE_ASPECT_PREFER_NONE;
608 FLOAT_T aspect, amax, amin; 802 FLOAT_T aspect, amax, amin;
@@ -612,6 +806,17 @@ _edje_part_recalc_single_aspect(Edje_Real_Part *ep,
612 else aspect = DIV(FROM_INT(params->w), FROM_INT(params->h)); 806 else aspect = DIV(FROM_INT(params->w), FROM_INT(params->h));
613 amax = desc->aspect.max; 807 amax = desc->aspect.max;
614 amin = desc->aspect.min; 808 amin = desc->aspect.min;
809 if (desc->aspect.prefer == EDJE_ASPECT_PREFER_SOURCE &&
810 ep->part->type == EDJE_PART_TYPE_IMAGE)
811 {
812 Evas_Coord w, h;
813
814 /* We only need pose to find the right image that would be displayed,
815 and the right aspect ratio in that case */
816 _edje_real_part_image_set(ed, ep, pos);
817 evas_object_image_size_get(ep->object, &w, &h);
818 amin = amax = DIV(FROM_INT(w), FROM_INT(h));
819 }
615 if ((ep->swallow_params.aspect.w > 0) && 820 if ((ep->swallow_params.aspect.w > 0) &&
616 (ep->swallow_params.aspect.h > 0)) 821 (ep->swallow_params.aspect.h > 0))
617 amin = amax = 822 amin = amax =
@@ -693,6 +898,7 @@ _edje_part_recalc_single_aspect(Edje_Real_Part *ep,
693 if ((amin > ZERO) && (aspect < amin)) 898 if ((amin > ZERO) && (aspect < amin))
694 new_h = DIV(FROM_INT(params->w), amin); 899 new_h = DIV(FROM_INT(params->w), amin);
695 break; 900 break;
901 case EDJE_ASPECT_PREFER_SOURCE:
696 case EDJE_ASPECT_PREFER_BOTH: 902 case EDJE_ASPECT_PREFER_BOTH:
697 /* keep both dimensions in check */ 903 /* keep both dimensions in check */
698 /* adjust for max aspect (width / height) */ 904 /* adjust for max aspect (width / height) */
@@ -1255,6 +1461,7 @@ _edje_part_recalc_single_min(Edje_Part_Description_Common *desc,
1255 minh = tmp; 1461 minh = tmp;
1256 break; 1462 break;
1257 } 1463 }
1464 case EDJE_ASPECT_PREFER_SOURCE:
1258 case EDJE_ASPECT_PREFER_BOTH: 1465 case EDJE_ASPECT_PREFER_BOTH:
1259 tmp = minh * params->w / h; 1466 tmp = minh * params->w / h;
1260 if (tmp >= minw) 1467 if (tmp >= minw)
@@ -1321,6 +1528,7 @@ _edje_part_recalc_single_max(Edje_Part_Description_Common *desc,
1321 maxh = tmp; 1528 maxh = tmp;
1322 break; 1529 break;
1323 } 1530 }
1531 case EDJE_ASPECT_PREFER_SOURCE:
1324 case EDJE_ASPECT_PREFER_BOTH: 1532 case EDJE_ASPECT_PREFER_BOTH:
1325 tmp = maxh * params->w / h; 1533 tmp = maxh * params->w / h;
1326 if (tmp <= maxw) 1534 if (tmp <= maxw)
@@ -1481,6 +1689,15 @@ _edje_part_recalc_single_min_max(FLOAT_T sc,
1481 if (ep->swallow_params.min.w > desc->min.w) 1689 if (ep->swallow_params.min.w > desc->min.w)
1482 *minw = ep->swallow_params.min.w; 1690 *minw = ep->swallow_params.min.w;
1483 1691
1692 if (ep->edje->calc_only)
1693 {
1694 if (desc->minmul.have)
1695 {
1696 FLOAT_T mmw = desc->minmul.w;
1697 if (mmw != FROM_INT(1)) *minw = TO_INT(SCALE(mmw, *minw));
1698 }
1699 }
1700
1484 /* XXX TODO: remove need of EDJE_INF_MAX_W, see edje_util.c */ 1701 /* XXX TODO: remove need of EDJE_INF_MAX_W, see edje_util.c */
1485 if ((ep->swallow_params.max.w <= 0) || 1702 if ((ep->swallow_params.max.w <= 0) ||
1486 (ep->swallow_params.max.w == EDJE_INF_MAX_W)) 1703 (ep->swallow_params.max.w == EDJE_INF_MAX_W))
@@ -1508,6 +1725,8 @@ _edje_part_recalc_single_min_max(FLOAT_T sc,
1508 *maxw = ep->swallow_params.max.w; 1725 *maxw = ep->swallow_params.max.w;
1509 } 1726 }
1510 } 1727 }
1728 if ((ep->edje->calc_only) && (desc->minmul.have) &&
1729 (desc->minmul.w != FROM_INT(1))) *maxw = *minw;
1511 if (*maxw >= 0) 1730 if (*maxw >= 0)
1512 { 1731 {
1513 if (*maxw < *minw) *maxw = *minw; 1732 if (*maxw < *minw) *maxw = *minw;
@@ -1518,6 +1737,16 @@ _edje_part_recalc_single_min_max(FLOAT_T sc,
1518 if (ep->swallow_params.min.h > desc->min.h) 1737 if (ep->swallow_params.min.h > desc->min.h)
1519 *minh = ep->swallow_params.min.h; 1738 *minh = ep->swallow_params.min.h;
1520 1739
1740 if (ep->edje->calc_only)
1741 {
1742 if (desc->minmul.have)
1743 {
1744 FLOAT_T mmh = desc->minmul.h;
1745 if (mmh != FROM_INT(1)) *minh = TO_INT(SCALE(mmh, *minh));
1746 }
1747 }
1748
1749
1521 /* XXX TODO: remove need of EDJE_INF_MAX_H, see edje_util.c */ 1750 /* XXX TODO: remove need of EDJE_INF_MAX_H, see edje_util.c */
1522 if ((ep->swallow_params.max.h <= 0) || 1751 if ((ep->swallow_params.max.h <= 0) ||
1523 (ep->swallow_params.max.h == EDJE_INF_MAX_H)) 1752 (ep->swallow_params.max.h == EDJE_INF_MAX_H))
@@ -1544,7 +1773,9 @@ _edje_part_recalc_single_min_max(FLOAT_T sc,
1544 if (ep->swallow_params.max.h < *maxh) 1773 if (ep->swallow_params.max.h < *maxh)
1545 *maxh = ep->swallow_params.max.h; 1774 *maxh = ep->swallow_params.max.h;
1546 } 1775 }
1547 } 1776 }
1777 if ((ep->edje->calc_only) && (desc->minmul.have) &&
1778 (desc->minmul.h != FROM_INT(1))) *maxh = *minh;
1548 if (*maxh >= 0) 1779 if (*maxh >= 0)
1549 { 1780 {
1550 if (*maxh < *minh) *maxh = *minh; 1781 if (*maxh < *minh) *maxh = *minh;
@@ -1665,7 +1896,8 @@ _edje_part_recalc_single(Edje *ed,
1665 Edje_Real_Part *rel2_to_x, 1896 Edje_Real_Part *rel2_to_x,
1666 Edje_Real_Part *rel2_to_y, 1897 Edje_Real_Part *rel2_to_y,
1667 Edje_Real_Part *confine_to, 1898 Edje_Real_Part *confine_to,
1668 Edje_Calc_Params *params) 1899 Edje_Calc_Params *params,
1900 FLOAT_T pos)
1669{ 1901{
1670 Edje_Color_Class *cc = NULL; 1902 Edje_Color_Class *cc = NULL;
1671 Edje_Internal_Aspect apref; 1903 Edje_Internal_Aspect apref;
@@ -1675,12 +1907,12 @@ _edje_part_recalc_single(Edje *ed,
1675 sc = ed->scale; 1907 sc = ed->scale;
1676 if (sc == ZERO) sc = _edje_scale; 1908 if (sc == ZERO) sc = _edje_scale;
1677 _edje_part_recalc_single_min_max(sc, ep, desc, &minw, &minh, &maxw, &maxh); 1909 _edje_part_recalc_single_min_max(sc, ep, desc, &minw, &minh, &maxw, &maxh);
1678 1910
1679 /* relative coords of top left & bottom right */ 1911 /* relative coords of top left & bottom right */
1680 _edje_part_recalc_single_rel(ed, ep, desc, rel1_to_x, rel1_to_y, rel2_to_x, rel2_to_y, params); 1912 _edje_part_recalc_single_rel(ed, ep, desc, rel1_to_x, rel1_to_y, rel2_to_x, rel2_to_y, params);
1681 1913
1682 /* aspect */ 1914 /* aspect */
1683 apref = _edje_part_recalc_single_aspect(ep, desc, params, &minw, &minh, &maxw, &maxh); 1915 apref = _edje_part_recalc_single_aspect(ed, ep, desc, params, &minw, &minh, &maxw, &maxh, pos);
1684 1916
1685 /* size step */ 1917 /* size step */
1686 _edje_part_recalc_single_step(desc, params); 1918 _edje_part_recalc_single_step(desc, params);
@@ -1855,77 +2087,13 @@ _edje_table_recalc_apply(Edje *ed __UNUSED__,
1855 } 2087 }
1856} 2088}
1857 2089
1858static int
1859_edje_image_find(Evas_Object *obj, Edje *ed, Edje_Real_Part_Set **eps, Edje_Part_Description_Image *st, Edje_Part_Image_Id *imid)
1860{
1861 Edje_Image_Directory_Set_Entry *entry;
1862 Edje_Image_Directory_Set *set = NULL;
1863 Eina_List *l;
1864 int w = 0;
1865 int h = 0;
1866 int id;
1867
1868 if (!st && !imid)
1869 return -1;
1870
1871 if (st && !st->image.set)
1872 return st->image.id;
1873
1874 if (imid && !imid->set)
1875 return imid->id;
1876
1877 if (imid)
1878 id = imid->id;
1879 else
1880 id = st->image.id;
1881
1882 evas_object_geometry_get(obj, NULL, NULL, &w, &h);
1883
1884 if (eps && *eps)
1885 {
1886 if ((*eps)->id == id)
1887 set = (*eps)->set;
1888
1889 if (set)
1890 if ((*eps)->entry->size.min.w <= w && w <= (*eps)->entry->size.max.w)
1891 if ((*eps)->entry->size.min.h <= h && h <= (*eps)->entry->size.max.h)
1892 return (*eps)->entry->id;
1893 }
1894
1895 if (!set)
1896 set = ed->file->image_dir->sets + id;
1897
1898 EINA_LIST_FOREACH(set->entries, l, entry)
1899 {
1900 if (entry->size.min.w <= w && w <= entry->size.max.w)
1901 if (entry->size.min.h <= h && h <= entry->size.max.h)
1902 {
1903 if (eps)
1904 {
1905 if (!*eps)
1906 *eps = calloc(1, sizeof (Edje_Real_Part_Set));
1907
1908 if (*eps)
1909 {
1910 (*eps)->entry = entry;
1911 (*eps)->set = set;
1912 (*eps)->id = id;
1913 }
1914 }
1915 return entry->id;
1916 }
1917 }
1918
1919 return -1;
1920}
1921
1922static void 2090static void
1923_edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edje_Part_Description_Proxy *chosen_desc, FLOAT_T pos) 2091_edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edje_Part_Description_Proxy *chosen_desc, FLOAT_T pos)
1924{ 2092{
1925 Edje_Real_Part *pp; 2093 Edje_Real_Part *pp;
1926 int part_id = -1; 2094 int part_id = -1;
1927 2095
1928 if (pos >= 0.5) 2096 if (pos >= FROM_DOUBLE(0.5))
1929 part_id = ((Edje_Part_Description_Proxy*) ep->param2->description)->proxy.id; 2097 part_id = ((Edje_Part_Description_Proxy*) ep->param2->description)->proxy.id;
1930 else 2098 else
1931 part_id = chosen_desc->proxy.id; 2099 part_id = chosen_desc->proxy.id;
@@ -1967,8 +2135,6 @@ _edje_proxy_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
1967static void 2135static void
1968_edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edje_Part_Description_Image *chosen_desc, FLOAT_T pos) 2136_edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edje_Part_Description_Image *chosen_desc, FLOAT_T pos)
1969{ 2137{
1970 int image_id;
1971 int image_count, image_num;
1972 FLOAT_T sc; 2138 FLOAT_T sc;
1973 2139
1974 sc = ed->scale; 2140 sc = ed->scale;
@@ -2003,107 +2169,7 @@ _edje_image_recalc_apply(Edje *ed, Edje_Real_Part *ep, Edje_Calc_Params *p3, Edj
2003 else if (chosen_desc->image.border.no_fill == 2) 2169 else if (chosen_desc->image.border.no_fill == 2)
2004 evas_object_image_border_center_fill_set(ep->object, EVAS_BORDER_FILL_SOLID); 2170 evas_object_image_border_center_fill_set(ep->object, EVAS_BORDER_FILL_SOLID);
2005 2171
2006 image_id = _edje_image_find(ep->object, ed, 2172 _edje_real_part_image_set(ed, ep, pos);
2007 &ep->param1.set,
2008 (Edje_Part_Description_Image*) ep->param1.description,
2009 NULL);
2010 if (image_id < 0)
2011 {
2012 Edje_Image_Directory_Entry *ie;
2013
2014 if (!ed->file->image_dir) ie = NULL;
2015 else ie = ed->file->image_dir->entries + (-image_id) - 1;
2016 if ((ie) &&
2017 (ie->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) &&
2018 (ie->entry))
2019 {
2020 evas_object_image_file_set(ep->object, ie->entry, NULL);
2021 }
2022 }
2023 else
2024 {
2025 image_count = 2;
2026 if (ep->param2)
2027 image_count += ((Edje_Part_Description_Image*) ep->param2->description)->image.tweens_count;
2028 image_num = TO_INT(MUL(pos, SUB(FROM_INT(image_count),
2029 FROM_DOUBLE(0.5))));
2030 if (image_num > (image_count - 1))
2031 image_num = image_count - 1;
2032 if (image_num == 0)
2033 {
2034 image_id = _edje_image_find(ep->object, ed,
2035 &ep->param1.set,
2036 (Edje_Part_Description_Image*) ep->param1.description,
2037 NULL);
2038 }
2039 else
2040 if (ep->param2)
2041 {
2042 if (image_num == (image_count - 1))
2043 {
2044 image_id = _edje_image_find(ep->object, ed,
2045 &ep->param2->set,
2046 (Edje_Part_Description_Image*) ep->param2->description,
2047 NULL);
2048 }
2049 else
2050 {
2051 Edje_Part_Image_Id *imid;
2052
2053 imid = ((Edje_Part_Description_Image*) ep->param2->description)->image.tweens[image_num - 1];
2054 image_id = _edje_image_find(ep->object, ed, NULL, NULL, imid);
2055 }
2056 }
2057 if (image_id < 0)
2058 {
2059 ERR("¨Part \"%s\" has description, "
2060 "\"%s\" %3.3f with a missing image id!!!",
2061 ep->part->name,
2062 ep->param1.description->state.name,
2063 ep->param1.description->state.value);
2064 }
2065 else
2066 {
2067 char buf[1024];
2068
2069 /* Replace snprint("edje/images/%i") == memcpy + itoa */
2070#define IMAGES "edje/images/"
2071 memcpy(buf, IMAGES, strlen(IMAGES));
2072 eina_convert_itoa(image_id, buf + strlen(IMAGES)); /* No need to check length as 2³² need only 10 characteres. */
2073
2074 evas_object_image_file_set(ep->object, ed->file->path, buf);
2075 if (evas_object_image_load_error_get(ep->object) != EVAS_LOAD_ERROR_NONE)
2076 {
2077 ERR("Error loading image collection \"%s\" from "
2078 "file \"%s\". Missing EET Evas loader module?",
2079 buf, ed->file->path);
2080 switch (evas_object_image_load_error_get(ep->object))
2081 {
2082 case EVAS_LOAD_ERROR_GENERIC:
2083 ERR("Error type: EVAS_LOAD_ERROR_GENERIC");
2084 break;
2085 case EVAS_LOAD_ERROR_DOES_NOT_EXIST:
2086 ERR("Error type: EVAS_LOAD_ERROR_DOES_NOT_EXIST");
2087 break;
2088 case EVAS_LOAD_ERROR_PERMISSION_DENIED:
2089 ERR("Error type: EVAS_LOAD_ERROR_PERMISSION_DENIED");
2090 break;
2091 case EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED:
2092 ERR("Error type: EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED");
2093 break;
2094 case EVAS_LOAD_ERROR_CORRUPT_FILE:
2095 ERR("Error type: EVAS_LOAD_ERROR_CORRUPT_FILE");
2096 break;
2097 case EVAS_LOAD_ERROR_UNKNOWN_FORMAT:
2098 ERR("Error type: EVAS_LOAD_ERROR_UNKNOWN_FORMAT");
2099 break;
2100 default:
2101 ERR("Error type: ???");
2102 break;
2103 }
2104 }
2105 }
2106 }
2107} 2173}
2108 2174
2109static Edje_Real_Part * 2175static Edje_Real_Part *
@@ -2299,13 +2365,15 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
2299 Edje_Real_Part *pp; 2365 Edje_Real_Part *pp;
2300 int part_id = -1; 2366 int part_id = -1;
2301 2367
2302 if (pos >= 0.5) 2368 if (pos >= FROM_DOUBLE(0.5))
2303 part_id = ((Edje_Part_Description_Proxy*) ep->param2->description)->proxy.id; 2369 part_id = ((Edje_Part_Description_Proxy*) ep->param2->description)->proxy.id;
2304 else 2370 else
2305 part_id = ((Edje_Part_Description_Proxy*) chosen_desc)->proxy.id; 2371 part_id = ((Edje_Part_Description_Proxy*) chosen_desc)->proxy.id;
2306 2372
2307 pp = _edje_real_part_state_get(ed, ep, flags, part_id, NULL); 2373 pp = _edje_real_part_state_get(ed, ep, flags, part_id, NULL);
2374#ifdef EDJE_CALC_CACHE
2308 if (pp && pp->invalidate) proxy_invalidate = EINA_TRUE; 2375 if (pp && pp->invalidate) proxy_invalidate = EINA_TRUE;
2376#endif
2309 } 2377 }
2310 2378
2311 /* Recalc if needed the map center && light source */ 2379 /* Recalc if needed the map center && light source */
@@ -2355,7 +2423,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
2355 _edje_part_recalc_single(ed, ep, ep->param1.description, chosen_desc, center[0], light[0], persp[0], 2423 _edje_part_recalc_single(ed, ep, ep->param1.description, chosen_desc, center[0], light[0], persp[0],
2356 ep->param1.rel1_to_x, ep->param1.rel1_to_y, ep->param1.rel2_to_x, ep->param1.rel2_to_y, 2424 ep->param1.rel1_to_x, ep->param1.rel1_to_y, ep->param1.rel2_to_x, ep->param1.rel2_to_y,
2357 confine_to, 2425 confine_to,
2358 p1); 2426 p1, pos);
2359 2427
2360#ifdef EDJE_CALC_CACHE 2428#ifdef EDJE_CALC_CACHE
2361 ep->param1.state = ed->state; 2429 ep->param1.state = ed->state;
@@ -2400,10 +2468,15 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
2400 ((ep->part->type == EDJE_PART_TYPE_TEXT || ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) && ed->text_part_change)) 2468 ((ep->part->type == EDJE_PART_TYPE_TEXT || ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) && ed->text_part_change))
2401#endif 2469#endif
2402 { 2470 {
2403 _edje_part_recalc_single(ed, ep, ep->param2->description, chosen_desc, center[1], light[1], persp[1], 2471 _edje_part_recalc_single(ed, ep, ep->param2->description,
2404 ep->param2->rel1_to_x, ep->param2->rel1_to_y, ep->param2->rel2_to_x, ep->param2->rel2_to_y, 2472 chosen_desc,
2473 center[1], light[1], persp[1],
2474 ep->param2->rel1_to_x,
2475 ep->param2->rel1_to_y,
2476 ep->param2->rel2_to_x,
2477 ep->param2->rel2_to_y,
2405 confine_to, 2478 confine_to,
2406 p2); 2479 p2, pos);
2407#ifdef EDJE_CALC_CACHE 2480#ifdef EDJE_CALC_CACHE
2408 ep->param2->state = ed->state; 2481 ep->param2->state = ed->state;
2409#endif 2482#endif
@@ -2449,7 +2522,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
2449 p3->req.y = INTP(p1->req.y, p2->req.y, pos); 2522 p3->req.y = INTP(p1->req.y, p2->req.y, pos);
2450 p3->req.w = INTP(p1->req.w, p2->req.w, pos); 2523 p3->req.w = INTP(p1->req.w, p2->req.w, pos);
2451 p3->req.h = INTP(p1->req.h, p2->req.h, pos); 2524 p3->req.h = INTP(p1->req.h, p2->req.h, pos);
2452 2525
2453 if (ep->part->dragable.x) 2526 if (ep->part->dragable.x)
2454 { 2527 {
2455 p3->req_drag.x = INTP(p1->req_drag.x, p2->req_drag.x, pos); 2528 p3->req_drag.x = INTP(p1->req_drag.x, p2->req_drag.x, pos);
@@ -2543,11 +2616,11 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
2543 } 2616 }
2544 else if (p1->persp_on) 2617 else if (p1->persp_on)
2545 { 2618 {
2546 memcpy(&p3->map.persp, &p1->map.persp, sizeof (p1->map.light)); 2619 memcpy(&p3->map.persp, &p1->map.persp, sizeof (p1->map.persp));
2547 } 2620 }
2548 else if (p2->persp_on) 2621 else if (p2->persp_on)
2549 { 2622 {
2550 memcpy(&p3->map.persp, &p2->map.persp, sizeof (p2->map.light)); 2623 memcpy(&p3->map.persp, &p2->map.persp, sizeof (p2->map.persp));
2551 } 2624 }
2552 } 2625 }
2553 2626
diff --git a/libraries/edje/src/lib/edje_callbacks.c b/libraries/edje/src/lib/edje_callbacks.c
index e0b0eae..2b02891 100644
--- a/libraries/edje/src/lib/edje_callbacks.c
+++ b/libraries/edje/src/lib/edje_callbacks.c
@@ -134,6 +134,7 @@ _edje_mouse_down_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, voi
134 _edje_emit(ed, buf, events->part->name); 134 _edje_emit(ed, buf, events->part->name);
135 } 135 }
136 ed->dirty = 1; 136 ed->dirty = 1;
137 ed->recalc_call = 1;
137#ifdef EDJE_CALC_CACHE 138#ifdef EDJE_CALC_CACHE
138 rp->invalidate = 1; 139 rp->invalidate = 1;
139#endif 140#endif
@@ -157,6 +158,7 @@ _edje_mouse_down_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, voi
157 rp->drag->val.y = dy; 158 rp->drag->val.y = dy;
158 if (!ignored) 159 if (!ignored)
159 _edje_emit(ed, "drag", rp->part->name); 160 _edje_emit(ed, "drag", rp->part->name);
161 ed->recalc_call = 1;
160 ed->dirty = 1; 162 ed->dirty = 1;
161#ifdef EDJE_CALC_CACHE 163#ifdef EDJE_CALC_CACHE
162 rp->invalidate = 1; 164 rp->invalidate = 1;
@@ -235,6 +237,7 @@ _edje_mouse_up_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void
235 if (rp->drag->down.count == 0) 237 if (rp->drag->down.count == 0)
236 { 238 {
237 rp->drag->need_reset = 1; 239 rp->drag->need_reset = 1;
240 ed->recalc_call = 1;
238 ed->dirty = 1; 241 ed->dirty = 1;
239#ifdef EDJE_CALC_CACHE 242#ifdef EDJE_CALC_CACHE
240 rp->invalidate = 1; 243 rp->invalidate = 1;
@@ -314,6 +317,7 @@ _edje_mouse_move_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, voi
314 rp->drag->tmp.x = ev->cur.canvas.x - rp->drag->down.x; 317 rp->drag->tmp.x = ev->cur.canvas.x - rp->drag->down.x;
315 if (rp->part->dragable.y) 318 if (rp->part->dragable.y)
316 rp->drag->tmp.y = ev->cur.canvas.y - rp->drag->down.y; 319 rp->drag->tmp.y = ev->cur.canvas.y - rp->drag->down.y;
320 ed->recalc_call = 1;
317 ed->dirty = 1; 321 ed->dirty = 1;
318#ifdef EDJE_CALC_CACHE 322#ifdef EDJE_CALC_CACHE
319 rp->invalidate = 1; 323 rp->invalidate = 1;
@@ -332,6 +336,7 @@ _edje_mouse_move_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, voi
332 rp->drag->val.y = dy; 336 rp->drag->val.y = dy;
333 if (!ignored) 337 if (!ignored)
334 _edje_emit(ed, "drag", rp->part->name); 338 _edje_emit(ed, "drag", rp->part->name);
339 ed->recalc_call = 1;
335 ed->dirty = 1; 340 ed->dirty = 1;
336#ifdef EDJE_CALC_CACHE 341#ifdef EDJE_CALC_CACHE
337 rp->invalidate = 1; 342 rp->invalidate = 1;
diff --git a/libraries/edje/src/lib/edje_data.c b/libraries/edje/src/lib/edje_data.c
index 6b7b395..32b17b6 100644
--- a/libraries/edje/src/lib/edje_data.c
+++ b/libraries/edje/src/lib/edje_data.c
@@ -451,6 +451,9 @@ _edje_edd_init(void)
451 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "align.y", align.y, EDJE_T_FLOAT); \ 451 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "align.y", align.y, EDJE_T_FLOAT); \
452 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "fixed.w", fixed.w, EET_T_UCHAR); \ 452 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "fixed.w", fixed.w, EET_T_UCHAR); \
453 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "fixed.h", fixed.h, EET_T_UCHAR); \ 453 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "fixed.h", fixed.h, EET_T_UCHAR); \
454 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "minmul.have", minmul.have, EET_T_UCHAR); \
455 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "minmul.w", minmul.w, EDJE_T_FLOAT); \
456 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "minmul.h", minmul.h, EDJE_T_FLOAT); \
454 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.w", min.w, EET_T_INT); \ 457 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.w", min.w, EET_T_INT); \
455 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.h", min.h, EET_T_INT); \ 458 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "min.h", min.h, EET_T_INT); \
456 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "max.w", max.w, EET_T_INT); \ 459 EET_DATA_DESCRIPTOR_ADD_BASIC(Edd, Type, "max.w", max.w, EET_T_INT); \
diff --git a/libraries/edje/src/lib/edje_edit.c b/libraries/edje/src/lib/edje_edit.c
index 901a1b1..eec5e04 100644
--- a/libraries/edje/src/lib/edje_edit.c
+++ b/libraries/edje/src/lib/edje_edit.c
@@ -20,14 +20,18 @@ EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_CURRENTLY_USED = 0 ;
20EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_REFERENCED = 0; 20EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_REFERENCED = 0;
21EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_DOES_NOT_EXIST = 0; 21EAPI Eina_Error EDJE_EDIT_ERROR_GROUP_DOES_NOT_EXIST = 0;
22 22
23/* Get ed(Edje*) from obj(Evas_Object*) */ 23/* Get eed(Edje_Edit*) from obj(Evas_Object*) */
24#define GET_ED_OR_RETURN(RET) \ 24#define GET_EED_OR_RETURN(RET) \
25 Edje *ed; \
26 Edje_Edit *eed; \ 25 Edje_Edit *eed; \
27 if (!evas_object_smart_type_check_ptr(obj, _edje_edit_type)) \ 26 if (!evas_object_smart_type_check_ptr(obj, _edje_edit_type)) \
28 return RET; \ 27 return RET; \
29 eed = evas_object_smart_data_get(obj); \ 28 eed = evas_object_smart_data_get(obj); \
30 if (!eed) return RET; \ 29 if (!eed) return RET;
30
31/* Get ed(Edje*) from obj(Evas_Object*) */
32#define GET_ED_OR_RETURN(RET) \
33 Edje *ed; \
34 GET_EED_OR_RETURN(RET); \
31 ed = (Edje *)eed; 35 ed = (Edje *)eed;
32 36
33/* Get rp(Edje_Real_Part*) from obj(Evas_Object*) and part(char*) */ 37/* Get rp(Edje_Real_Part*) from obj(Evas_Object*) and part(char*) */
@@ -388,72 +392,59 @@ _edje_real_part_free(Edje_Real_Part *rp)
388static Eina_Bool 392static Eina_Bool
389_edje_import_font_file(Edje *ed, const char *path, const char *entry) 393_edje_import_font_file(Edje *ed, const char *path, const char *entry)
390{ 394{
395 Eina_File *f;
396 Eet_File *eetf = NULL;
391 void *fdata = NULL; 397 void *fdata = NULL;
392 long fsize = 0; 398 long fsize = 0;
393 399
394 /* Read font data from file */ 400 /* Read font data from file */
395 { 401 f = eina_file_open(path, 0);
396 FILE *f = fopen(path, "rb"); 402 if (!f)
397 if (!f) 403 {
398 { 404 ERR("Unable to open font file \"%s\"", path);
399 ERR("Unable to open font file \"%s\"", path); 405 return EINA_FALSE;
400 return EINA_FALSE; 406 }
401 }
402 407
403 fseek(f, 0, SEEK_END); 408 fsize = eina_file_size_get(f);
404 fsize = ftell(f); 409 fdata = eina_file_map_all(f, EINA_FILE_SEQUENTIAL);
405 rewind(f); 410 if (!fdata)
406 fdata = malloc(fsize); 411 {
407 if (!fdata) 412 ERR("Unable to map font file \"%s\"", path);
408 { 413 goto on_error;
409 ERR("Unable to alloc font file \"%s\"", path); 414 }
410 fclose(f);
411 return EINA_FALSE;
412 }
413 if (fread(fdata, fsize, 1, f) != 1)
414 {
415 free(fdata);
416 fclose(f);
417 ERR("Unable to read all of font file \"%s\"", path);
418 return EINA_FALSE;
419 }
420 fclose(f);
421 }
422 415
423 /* Write font to edje file */ 416 /* Write font to edje file */
424 { 417 eetf = eet_open(ed->path, EET_FILE_MODE_READ_WRITE);
425 /* open the eet file */ 418 if (!eetf)
426 Eet_File *eetf = eet_open(ed->path, EET_FILE_MODE_READ_WRITE); 419 {
427 if (!eetf) 420 ERR("Unable to open \"%s\" for writing output", ed->path);
428 { 421 goto on_error;
429 ERR("Unable to open \"%s\" for writing output", ed->path); 422 }
430 free(fdata);
431 return EINA_FALSE;
432 }
433 423
434 if (eet_write(eetf, entry, fdata, fsize, 1) <= 0) 424 if (eet_write(eetf, entry, fdata, fsize, 1) <= 0)
435 { 425 {
436 ERR("Unable to write font part \"%s\" as \"%s\" part entry", 426 ERR("Unable to write font part \"%s\" as \"%s\" part entry",
437 path, entry); 427 path, entry);
438 eet_close(eetf); 428 goto on_error;
439 free(fdata); 429 }
440 return EINA_FALSE;
441 }
442 430
443 free(fdata); 431 /* write the edje_file */
432 if (!_edje_edit_edje_file_save(eetf, ed->file))
433 goto on_error;
444 434
445 /* write the edje_file */ 435 eet_close(eetf);
446 if (!_edje_edit_edje_file_save(eetf, ed->file))
447 {
448 eet_delete(eetf, entry);
449 eet_close(eetf);
450 return EINA_FALSE;
451 }
452 436
453 eet_close(eetf); 437 eina_file_map_free(f, fdata);
454 } 438 eina_file_close(f);
455 439
456 return EINA_TRUE; 440 return EINA_TRUE;
441
442 on_error:
443 if (eetf) eet_close(eetf);
444 eina_file_map_free(f, fdata);
445 eina_file_close(f);
446
447 return EINA_FALSE;
457} 448}
458 449
459 450
@@ -4791,7 +4782,7 @@ edje_edit_image_id_get(Evas_Object *obj, const char *image_name)
4791{ 4782{
4792 eina_error_set(0); 4783 eina_error_set(0);
4793 4784
4794 GET_ED_OR_RETURN(-1); 4785 GET_EED_OR_RETURN(-1);
4795 4786
4796 return _edje_image_id_find(eed, image_name); 4787 return _edje_image_id_find(eed, image_name);
4797} 4788}
@@ -5174,7 +5165,6 @@ EAPI Eina_Bool
5174edje_edit_program_add(Evas_Object *obj, const char *name) 5165edje_edit_program_add(Evas_Object *obj, const char *name)
5175{ 5166{
5176 Edje_Program *epr; 5167 Edje_Program *epr;
5177 Edje_Part_Collection *pc;
5178 5168
5179 eina_error_set(0); 5169 eina_error_set(0);
5180 5170
@@ -5191,7 +5181,7 @@ edje_edit_program_add(Evas_Object *obj, const char *name)
5191 if (!epr) return EINA_FALSE; 5181 if (!epr) return EINA_FALSE;
5192 5182
5193 //Add program to group 5183 //Add program to group
5194 pc = ed->collection; 5184 // pc = ed->collection;
5195 5185
5196 /* By default, source and signal are empty, so they fill in nocmp category */ 5186 /* By default, source and signal are empty, so they fill in nocmp category */
5197 ed->collection->programs.nocmp = realloc(ed->collection->programs.nocmp, 5187 ed->collection->programs.nocmp = realloc(ed->collection->programs.nocmp,
@@ -5237,7 +5227,6 @@ edje_edit_program_del(Evas_Object *obj, const char *prog)
5237 Eina_List *l, *l_next; 5227 Eina_List *l, *l_next;
5238 Edje_Program_Target *prt; 5228 Edje_Program_Target *prt;
5239 Edje_Program_After *pa; 5229 Edje_Program_After *pa;
5240 Edje_Part_Collection *pc;
5241 Edje_Program *p; 5230 Edje_Program *p;
5242 Program_Script *ps, *old_ps; 5231 Program_Script *ps, *old_ps;
5243 int id, i; 5232 int id, i;
@@ -5248,7 +5237,7 @@ edje_edit_program_del(Evas_Object *obj, const char *prog)
5248 GET_ED_OR_RETURN(EINA_FALSE); 5237 GET_ED_OR_RETURN(EINA_FALSE);
5249 GET_EPR_OR_RETURN(EINA_FALSE); 5238 GET_EPR_OR_RETURN(EINA_FALSE);
5250 5239
5251 pc = ed->collection; 5240 //pc = ed->collection;
5252 5241
5253 //Remove program from programs list 5242 //Remove program from programs list
5254 id = epr->id; 5243 id = epr->id;
@@ -5737,7 +5726,7 @@ edje_edit_program_action_set(Evas_Object *obj, const char *prog, Edje_Action_Typ
5737 5726
5738 eina_error_set(0); 5727 eina_error_set(0);
5739 5728
5740 GET_ED_OR_RETURN(EINA_FALSE); 5729 GET_EED_OR_RETURN(EINA_FALSE);
5741 GET_EPR_OR_RETURN(EINA_FALSE); 5730 GET_EPR_OR_RETURN(EINA_FALSE);
5742 5731
5743 //printf("SET ACTION for program: %s [%d]\n", prog, action); 5732 //printf("SET ACTION for program: %s [%d]\n", prog, action);
@@ -6081,7 +6070,7 @@ edje_edit_script_set(Evas_Object *obj, const char *code)
6081{ 6070{
6082 eina_error_set(0); 6071 eina_error_set(0);
6083 6072
6084 GET_ED_OR_RETURN(); 6073 GET_EED_OR_RETURN();
6085 6074
6086 free(eed->embryo_source); 6075 free(eed->embryo_source);
6087 free(eed->embryo_processed); 6076 free(eed->embryo_processed);
@@ -6104,7 +6093,7 @@ edje_edit_script_program_get(Evas_Object *obj, const char *prog)
6104 6093
6105 eina_error_set(0); 6094 eina_error_set(0);
6106 6095
6107 GET_ED_OR_RETURN(NULL); 6096 GET_EED_OR_RETURN(NULL);
6108 GET_EPR_OR_RETURN(NULL); 6097 GET_EPR_OR_RETURN(NULL);
6109 6098
6110 if (epr->action != EDJE_ACTION_TYPE_SCRIPT) 6099 if (epr->action != EDJE_ACTION_TYPE_SCRIPT)
@@ -6124,7 +6113,7 @@ edje_edit_script_program_set(Evas_Object *obj, const char *prog, const char *cod
6124 6113
6125 eina_error_set(0); 6114 eina_error_set(0);
6126 6115
6127 GET_ED_OR_RETURN(); 6116 GET_EED_OR_RETURN();
6128 GET_EPR_OR_RETURN(); 6117 GET_EPR_OR_RETURN();
6129 6118
6130 if (epr->action != EDJE_ACTION_TYPE_SCRIPT) 6119 if (epr->action != EDJE_ACTION_TYPE_SCRIPT)
@@ -6550,7 +6539,7 @@ almost_out:
6550EAPI Eina_Bool 6539EAPI Eina_Bool
6551edje_edit_script_compile(Evas_Object *obj) 6540edje_edit_script_compile(Evas_Object *obj)
6552{ 6541{
6553 GET_ED_OR_RETURN(EINA_FALSE); 6542 GET_EED_OR_RETURN(EINA_FALSE);
6554 6543
6555 if (!eed->script_need_recompile) 6544 if (!eed->script_need_recompile)
6556 return EINA_TRUE; 6545 return EINA_TRUE;
@@ -6561,7 +6550,7 @@ edje_edit_script_compile(Evas_Object *obj)
6561EAPI const Eina_List * 6550EAPI const Eina_List *
6562edje_edit_script_error_list_get(Evas_Object *obj) 6551edje_edit_script_error_list_get(Evas_Object *obj)
6563{ 6552{
6564 GET_ED_OR_RETURN(NULL); 6553 GET_EED_OR_RETURN(NULL);
6565 return eed->errors; 6554 return eed->errors;
6566} 6555}
6567 6556
@@ -6643,7 +6632,7 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, Eina_Str
6643 const char *api_name, *api_description; 6632 const char *api_name, *api_description;
6644 Edje_Program *epr; 6633 Edje_Program *epr;
6645 6634
6646 GET_ED_OR_RETURN(EINA_FALSE); 6635 GET_EED_OR_RETURN(EINA_FALSE);
6647 6636
6648 epr = _edje_program_get_byname(obj, program); 6637 epr = _edje_program_get_byname(obj, program);
6649 6638
@@ -6816,7 +6805,7 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
6816 if (pd->aspect.min || pd->aspect.max) 6805 if (pd->aspect.min || pd->aspect.max)
6817 BUF_APPENDF(I5"aspect: %g %g;\n", TO_DOUBLE(pd->aspect.min), TO_DOUBLE(pd->aspect.max)); 6806 BUF_APPENDF(I5"aspect: %g %g;\n", TO_DOUBLE(pd->aspect.min), TO_DOUBLE(pd->aspect.max));
6818 if (pd->aspect.prefer) 6807 if (pd->aspect.prefer)
6819 BUF_APPENDF(I5"aspect_preference: %s;\n", prefers[pd->aspect.prefer]); 6808 BUF_APPENDF(I5"aspect_preference: %s;\n", prefers[(int) pd->aspect.prefer]);
6820 6809
6821 if (pd->color_class) 6810 if (pd->color_class)
6822 BUF_APPENDF(I5"color_class: \"%s\";\n", pd->color_class); 6811 BUF_APPENDF(I5"color_class: \"%s\";\n", pd->color_class);
@@ -7786,7 +7775,7 @@ edje_edit_print_internal_status(Evas_Object *obj)
7786*/ 7775*/
7787 eina_error_set(0); 7776 eina_error_set(0);
7788 7777
7789 GET_ED_OR_RETURN(); 7778 GET_EED_OR_RETURN();
7790 7779
7791 _edje_generate_source(obj); 7780 _edje_generate_source(obj);
7792/* 7781/*
diff --git a/libraries/edje/src/lib/edje_embryo.c b/libraries/edje/src/lib/edje_embryo.c
index c89a4f4..1ad2377 100644
--- a/libraries/edje/src/lib/edje_embryo.c
+++ b/libraries/edje/src/lib/edje_embryo.c
@@ -674,6 +674,7 @@ _edje_embryo_fn_set_min_size(Embryo_Program *ep, Embryo_Cell *params)
674 if (h < 0.0) h = 0.0; 674 if (h < 0.0) h = 0.0;
675 ed->collection->prop.min.w = w; 675 ed->collection->prop.min.w = w;
676 ed->collection->prop.min.h = h; 676 ed->collection->prop.min.h = h;
677 ed->recalc_call = 1;
677 ed->dirty = 1; 678 ed->dirty = 1;
678#ifdef EDJE_CALC_CACHE 679#ifdef EDJE_CALC_CACHE
679 ed->all_part_change = 1; 680 ed->all_part_change = 1;
@@ -701,6 +702,7 @@ _edje_embryo_fn_set_max_size(Embryo_Program *ep, Embryo_Cell *params)
701 if (h < 0.0) h = 0.0; 702 if (h < 0.0) h = 0.0;
702 ed->collection->prop.max.w = w; 703 ed->collection->prop.max.w = w;
703 ed->collection->prop.max.h = h; 704 ed->collection->prop.max.h = h;
705 ed->recalc_call = 1;
704 ed->dirty = 1; 706 ed->dirty = 1;
705#ifdef EDJE_CALC_CACHE 707#ifdef EDJE_CALC_CACHE
706 ed->all_part_change = 1; 708 ed->all_part_change = 1;
diff --git a/libraries/edje/src/lib/edje_entry.c b/libraries/edje/src/lib/edje_entry.c
index e25397a..563497d 100644
--- a/libraries/edje/src/lib/edje_entry.c
+++ b/libraries/edje/src/lib/edje_entry.c
@@ -2,9 +2,9 @@
2 2
3#ifdef HAVE_ECORE_IMF 3#ifdef HAVE_ECORE_IMF
4static Eina_Bool _edje_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos); 4static Eina_Bool _edje_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos);
5static Eina_Bool _edje_entry_imf_event_commit_cb(void *data, int type, void *event); 5static void _edje_entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx, void *event_info);
6static Eina_Bool _edje_entry_imf_event_preedit_changed_cb(void *data, int type, void *event); 6static void _edje_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx, void *event_info);
7static Eina_Bool _edje_entry_imf_event_delete_surrounding_cb(void *data, int type, void *event); 7static void _edje_entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx, void *event);
8#endif 8#endif
9 9
10typedef struct _Entry Entry; 10typedef struct _Entry Entry;
@@ -39,10 +39,6 @@ struct _Entry
39#ifdef HAVE_ECORE_IMF 39#ifdef HAVE_ECORE_IMF
40 Eina_Bool have_preedit : 1; 40 Eina_Bool have_preedit : 1;
41 Ecore_IMF_Context *imf_context; 41 Ecore_IMF_Context *imf_context;
42
43 Ecore_Event_Handler *imf_ee_handler_commit;
44 Ecore_Event_Handler *imf_ee_handler_delete;
45 Ecore_Event_Handler *imf_ee_handler_changed;
46#endif 42#endif
47}; 43};
48 44
@@ -272,20 +268,6 @@ _curs_update_from_curs(Evas_Textblock_Cursor *c, Evas_Object *o __UNUSED__, Entr
272 *cy += (ch / 2); 268 *cy += (ch / 2);
273} 269}
274 270
275static void
276_curs_back(Evas_Textblock_Cursor *c, Evas_Object *o __UNUSED__,
277 Entry *en __UNUSED__)
278{
279 evas_textblock_cursor_char_prev(c);
280}
281
282static void
283_curs_next(Evas_Textblock_Cursor *c, Evas_Object *o __UNUSED__,
284 Entry *en __UNUSED__)
285{
286 evas_textblock_cursor_char_next(c);
287}
288
289static int 271static int
290_curs_line_last_get(Evas_Textblock_Cursor *c __UNUSED__, Evas_Object *o, Entry *en __UNUSED__) 272_curs_line_last_get(Evas_Textblock_Cursor *c __UNUSED__, Evas_Object *o, Entry *en __UNUSED__)
291{ 273{
@@ -415,6 +397,7 @@ static void
415_sel_extend(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) 397_sel_extend(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
416{ 398{
417 if (!en->sel_end) return; 399 if (!en->sel_end) return;
400 _edje_entry_imf_context_reset(en);
418 _sel_enable(c, o, en); 401 _sel_enable(c, o, en);
419 if (!evas_textblock_cursor_compare(c, en->sel_end)) return; 402 if (!evas_textblock_cursor_compare(c, en->sel_end)) return;
420 evas_textblock_cursor_copy(c, en->sel_end); 403 evas_textblock_cursor_copy(c, en->sel_end);
@@ -424,13 +407,13 @@ _sel_extend(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
424 en->selection = NULL; 407 en->selection = NULL;
425 } 408 }
426 _edje_emit(en->rp->edje, "selection,changed", en->rp->part->name); 409 _edje_emit(en->rp->edje, "selection,changed", en->rp->part->name);
427 _edje_entry_imf_context_reset(en);
428} 410}
429 411
430static void 412static void
431_sel_preextend(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en) 413_sel_preextend(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
432{ 414{
433 if (!en->sel_end) return; 415 if (!en->sel_end) return;
416 _edje_entry_imf_context_reset(en);
434 _sel_enable(c, o, en); 417 _sel_enable(c, o, en);
435 if (!evas_textblock_cursor_compare(c, en->sel_start)) return; 418 if (!evas_textblock_cursor_compare(c, en->sel_start)) return;
436 evas_textblock_cursor_copy(c, en->sel_start); 419 evas_textblock_cursor_copy(c, en->sel_start);
@@ -440,7 +423,6 @@ _sel_preextend(Evas_Textblock_Cursor *c, Evas_Object *o, Entry *en)
440 en->selection = NULL; 423 en->selection = NULL;
441 } 424 }
442 _edje_emit(en->rp->edje, "selection,changed", en->rp->part->name); 425 _edje_emit(en->rp->edje, "selection,changed", en->rp->part->name);
443 _edje_entry_imf_context_reset(en);
444} 426}
445 427
446static void 428static void
@@ -1107,6 +1089,10 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1107 } 1089 }
1108#endif 1090#endif
1109 1091
1092 if ((!strcmp(ev->key, "Escape")) ||
1093 (!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter")))
1094 _edje_entry_imf_context_reset(en);
1095
1110 old_cur_pos = evas_textblock_cursor_pos_get(en->cursor); 1096 old_cur_pos = evas_textblock_cursor_pos_get(en->cursor);
1111 1097
1112 control = evas_key_modifier_is_set(ev->modifiers, "Control"); 1098 control = evas_key_modifier_is_set(ev->modifiers, "Control");
@@ -1138,6 +1124,7 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1138 } 1124 }
1139 _sel_clear(en->cursor, rp->object, en); 1125 _sel_clear(en->cursor, rp->object, en);
1140 _edje_emit(ed, "entry,key,up", rp->part->name); 1126 _edje_emit(ed, "entry,key,up", rp->part->name);
1127 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1141 } 1128 }
1142 else if (!strcmp(ev->key, "Down") || !strcmp(ev->key, "KP_Down")) 1129 else if (!strcmp(ev->key, "Down") || !strcmp(ev->key, "KP_Down"))
1143 { 1130 {
@@ -1157,6 +1144,7 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1157 } 1144 }
1158 _sel_clear(en->cursor, rp->object, en); 1145 _sel_clear(en->cursor, rp->object, en);
1159 _edje_emit(ed, "entry,key,down", rp->part->name); 1146 _edje_emit(ed, "entry,key,down", rp->part->name);
1147 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1160 } 1148 }
1161 else if (!strcmp(ev->key, "Left") || !strcmp(ev->key, "KP_Left")) 1149 else if (!strcmp(ev->key, "Left") || !strcmp(ev->key, "KP_Left"))
1162 { 1150 {
@@ -1165,13 +1153,16 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1165 if (shift) _sel_start(en->cursor, rp->object, en); 1153 if (shift) _sel_start(en->cursor, rp->object, en);
1166 else _sel_clear(en->cursor, rp->object, en); 1154 else _sel_clear(en->cursor, rp->object, en);
1167 } 1155 }
1168 _curs_back(en->cursor, rp->object, en); 1156 evas_textblock_cursor_char_prev(en->cursor);
1157 /* If control is pressed, go to the start of the word */
1158 if (control) evas_textblock_cursor_word_start(en->cursor);
1169 if (en->select_allow) 1159 if (en->select_allow)
1170 { 1160 {
1171 if (shift) _sel_extend(en->cursor, rp->object, en); 1161 if (shift) _sel_extend(en->cursor, rp->object, en);
1172 } 1162 }
1173 _sel_clear(en->cursor, rp->object, en); 1163 _sel_clear(en->cursor, rp->object, en);
1174 _edje_emit(ed, "entry,key,left", rp->part->name); 1164 _edje_emit(ed, "entry,key,left", rp->part->name);
1165 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1175 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1166 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1176 } 1167 }
1177 else if (!strcmp(ev->key, "Right") || !strcmp(ev->key, "KP_Right")) 1168 else if (!strcmp(ev->key, "Right") || !strcmp(ev->key, "KP_Right"))
@@ -1181,20 +1172,31 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1181 if (shift) _sel_start(en->cursor, rp->object, en); 1172 if (shift) _sel_start(en->cursor, rp->object, en);
1182 else _sel_clear(en->cursor, rp->object, en); 1173 else _sel_clear(en->cursor, rp->object, en);
1183 } 1174 }
1184 _curs_next(en->cursor, rp->object, en); 1175 /* If control is pressed, go to the start of the word */
1176 if (control) evas_textblock_cursor_word_end(en->cursor);
1177 evas_textblock_cursor_char_next(en->cursor);
1185 if (en->select_allow) 1178 if (en->select_allow)
1186 { 1179 {
1187 if (shift) _sel_extend(en->cursor, rp->object, en); 1180 if (shift) _sel_extend(en->cursor, rp->object, en);
1188 } 1181 }
1189 _sel_clear(en->cursor, rp->object, en); 1182 _sel_clear(en->cursor, rp->object, en);
1190 _edje_emit(ed, "entry,key,right", rp->part->name); 1183 _edje_emit(ed, "entry,key,right", rp->part->name);
1184 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1191 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1185 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1192 } 1186 }
1193 else if (!strcmp(ev->key, "BackSpace")) 1187 else if (!strcmp(ev->key, "BackSpace"))
1194 { 1188 {
1195 if (control) 1189 if (control && !en->have_selection)
1196 { 1190 {
1197 // del to start of previous word 1191 // del to start of previous word
1192 _sel_start(en->cursor, rp->object, en);
1193
1194 evas_textblock_cursor_char_prev(en->cursor);
1195 evas_textblock_cursor_word_start(en->cursor);
1196
1197 _sel_extend(en->cursor, rp->object, en);
1198
1199 _range_del_emit(ed, en->cursor, rp->object, en);
1198 } 1200 }
1199 else if ((alt) && (shift)) 1201 else if ((alt) && (shift))
1200 { 1202 {
@@ -1224,6 +1226,14 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1224 if (control) 1226 if (control)
1225 { 1227 {
1226 // del to end of next word 1228 // del to end of next word
1229 _sel_start(en->cursor, rp->object, en);
1230
1231 evas_textblock_cursor_word_end(en->cursor);
1232 evas_textblock_cursor_char_next(en->cursor);
1233
1234 _sel_extend(en->cursor, rp->object, en);
1235
1236 _range_del_emit(ed, en->cursor, rp->object, en);
1227 } 1237 }
1228 else if (shift) 1238 else if (shift)
1229 { 1239 {
@@ -1281,10 +1291,6 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1281 _edje_emit(ed, "entry,key,end", rp->part->name); 1291 _edje_emit(ed, "entry,key,end", rp->part->name);
1282 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1292 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1283 } 1293 }
1284 else if (!strcmp(ev->key, "Shift_L") || !strcmp(ev->key, "Shift_R"))
1285 {
1286 return;
1287 }
1288 else if ((control) && (!strcmp(ev->key, "v"))) 1294 else if ((control) && (!strcmp(ev->key, "v")))
1289 { 1295 {
1290 _edje_emit(ed, "entry,paste,request", rp->part->name); 1296 _edje_emit(ed, "entry,paste,request", rp->part->name);
@@ -1303,13 +1309,11 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1303 } 1309 }
1304 else if ((control) && ((!strcmp(ev->key, "c") || (!strcmp(ev->key, "Insert"))))) 1310 else if ((control) && ((!strcmp(ev->key, "c") || (!strcmp(ev->key, "Insert")))))
1305 { 1311 {
1306 // FIXME: copy - save selection
1307 _edje_emit(ed, "entry,copy,notify", rp->part->name); 1312 _edje_emit(ed, "entry,copy,notify", rp->part->name);
1308 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1313 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1309 } 1314 }
1310 else if ((control) && ((!strcmp(ev->key, "x") || (!strcmp(ev->key, "m"))))) 1315 else if ((control) && ((!strcmp(ev->key, "x") || (!strcmp(ev->key, "m")))))
1311 { 1316 {
1312 // FIXME: cut - save selection, delete seletion
1313 _edje_emit(ed, "entry,cut,notify", rp->part->name); 1317 _edje_emit(ed, "entry,cut,notify", rp->part->name);
1314 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1318 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1315 } 1319 }
@@ -1336,7 +1340,7 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1336 else if ((control) && (!strcmp(ev->key, "w"))) 1340 else if ((control) && (!strcmp(ev->key, "w")))
1337 { 1341 {
1338 _sel_clear(en->cursor, rp->object, en); 1342 _sel_clear(en->cursor, rp->object, en);
1339 // select current word 1343 // select current word?
1340 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD; 1344 ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
1341 } 1345 }
1342 else if (!strcmp(ev->key, "Tab")) 1346 else if (!strcmp(ev->key, "Tab"))
@@ -1361,10 +1365,10 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1361 _sel_clear(en->cursor, rp->object, en); 1365 _sel_clear(en->cursor, rp->object, en);
1362 info->change.insert.pos = 1366 info->change.insert.pos =
1363 evas_textblock_cursor_pos_get(en->cursor); 1367 evas_textblock_cursor_pos_get(en->cursor);
1364 info->change.insert.content = eina_stringshare_add("<\t>"); 1368 info->change.insert.content = eina_stringshare_add("<tab/>");
1365 //yy 1369 //yy
1366// evas_textblock_cursor_format_prepend(en->cursor, "\t"); 1370// evas_textblock_cursor_format_prepend(en->cursor, "tab");
1367 _text_filter_format_prepend(en, en->cursor, "\t"); 1371 _text_filter_format_prepend(en, en->cursor, "tab");
1368 _anchors_get(en->cursor, rp->object, en); 1372 _anchors_get(en->cursor, rp->object, en);
1369 _edje_emit(ed, "entry,changed", rp->part->name); 1373 _edje_emit(ed, "entry,changed", rp->part->name);
1370 _edje_emit_full(ed, "entry,changed,user", rp->part->name, 1374 _edje_emit_full(ed, "entry,changed,user", rp->part->name,
@@ -1427,19 +1431,20 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1427 1431
1428 info->change.insert.pos = 1432 info->change.insert.pos =
1429 evas_textblock_cursor_pos_get(en->cursor); 1433 evas_textblock_cursor_pos_get(en->cursor);
1430 if (shift) 1434 if (shift ||
1435 evas_object_textblock_legacy_newline_get(rp->object))
1431 { 1436 {
1432 //yy 1437 //yy
1433// evas_textblock_cursor_format_prepend(en->cursor, "\n"); 1438// evas_textblock_cursor_format_prepend(en->cursor, "br");
1434 _text_filter_format_prepend(en, en->cursor, "\n"); 1439 _text_filter_format_prepend(en, en->cursor, "br");
1435 info->change.insert.content = eina_stringshare_add("<\n>"); 1440 info->change.insert.content = eina_stringshare_add("<br/>");
1436 } 1441 }
1437 else 1442 else
1438 { 1443 {
1439 //yy 1444 //yy
1440// evas_textblock_cursor_format_prepend(en->cursor, "ps"); 1445// evas_textblock_cursor_format_prepend(en->cursor, "ps");
1441 _text_filter_format_prepend(en, en->cursor, "ps"); 1446 _text_filter_format_prepend(en, en->cursor, "ps");
1442 info->change.insert.content = eina_stringshare_add("<ps>"); 1447 info->change.insert.content = eina_stringshare_add("<ps/>");
1443 } 1448 }
1444 _anchors_get(en->cursor, rp->object, en); 1449 _anchors_get(en->cursor, rp->object, en);
1445 _edje_emit(ed, "entry,changed", rp->part->name); 1450 _edje_emit(ed, "entry,changed", rp->part->name);
@@ -1499,7 +1504,6 @@ _edje_key_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
1499 if (!cursor_changed && (old_cur_pos != evas_textblock_cursor_pos_get(en->cursor))) 1504 if (!cursor_changed && (old_cur_pos != evas_textblock_cursor_pos_get(en->cursor)))
1500 _edje_emit(ed, "cursor,changed", rp->part->name); 1505 _edje_emit(ed, "cursor,changed", rp->part->name);
1501 1506
1502 _edje_entry_imf_context_reset(en);
1503 _edje_entry_imf_cursor_info_set(en); 1507 _edje_entry_imf_cursor_info_set(en);
1504 _edje_entry_real_part_configure(rp); 1508 _edje_entry_real_part_configure(rp);
1505} 1509}
@@ -1576,6 +1580,8 @@ _edje_part_mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
1576 } 1580 }
1577#endif 1581#endif
1578 1582
1583 _edje_entry_imf_context_reset(en);
1584
1579 en->select_mod_start = EINA_FALSE; 1585 en->select_mod_start = EINA_FALSE;
1580 en->select_mod_end = EINA_FALSE; 1586 en->select_mod_end = EINA_FALSE;
1581 if (rp->part->select_mode == EDJE_ENTRY_SELECTION_MODE_DEFAULT) 1587 if (rp->part->select_mode == EDJE_ENTRY_SELECTION_MODE_DEFAULT)
@@ -1690,10 +1696,12 @@ _edje_part_mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
1690 } 1696 }
1691 } 1697 }
1692 if (evas_textblock_cursor_compare(tc, en->cursor)) 1698 if (evas_textblock_cursor_compare(tc, en->cursor))
1693 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 1699 {
1700 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
1701 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1702 }
1694 evas_textblock_cursor_free(tc); 1703 evas_textblock_cursor_free(tc);
1695 1704
1696 _edje_entry_imf_context_reset(en);
1697 _edje_entry_imf_cursor_info_set(en); 1705 _edje_entry_imf_cursor_info_set(en);
1698 1706
1699 _edje_entry_real_part_configure(rp); 1707 _edje_entry_real_part_configure(rp);
@@ -1733,6 +1741,8 @@ _edje_part_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
1733 } 1741 }
1734#endif 1742#endif
1735 1743
1744 _edje_entry_imf_context_reset(en);
1745
1736 tc = evas_object_textblock_cursor_new(rp->object); 1746 tc = evas_object_textblock_cursor_new(rp->object);
1737 evas_textblock_cursor_copy(en->cursor, tc); 1747 evas_textblock_cursor_copy(en->cursor, tc);
1738 evas_object_geometry_get(rp->object, &x, &y, &w, &h); 1748 evas_object_geometry_get(rp->object, &x, &y, &w, &h);
@@ -1799,10 +1809,12 @@ _edje_part_mouse_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
1799 en->selecting = EINA_FALSE; 1809 en->selecting = EINA_FALSE;
1800 } 1810 }
1801 if (evas_textblock_cursor_compare(tc, en->cursor)) 1811 if (evas_textblock_cursor_compare(tc, en->cursor))
1802 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 1812 {
1813 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
1814 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1815 }
1803 evas_textblock_cursor_free(tc); 1816 evas_textblock_cursor_free(tc);
1804 1817
1805 _edje_entry_imf_context_reset(en);
1806 _edje_entry_imf_cursor_info_set(en); 1818 _edje_entry_imf_cursor_info_set(en);
1807 _edje_entry_real_part_configure(rp); 1819 _edje_entry_real_part_configure(rp);
1808} 1820}
@@ -1893,7 +1905,10 @@ _edje_part_mouse_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
1893 _sel_update(en->cursor, rp->object, en); 1905 _sel_update(en->cursor, rp->object, en);
1894 } 1906 }
1895 if (evas_textblock_cursor_compare(tc, en->cursor)) 1907 if (evas_textblock_cursor_compare(tc, en->cursor))
1896 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 1908 {
1909 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
1910 _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
1911 }
1897 evas_textblock_cursor_free(tc); 1912 evas_textblock_cursor_free(tc);
1898 1913
1899 _edje_entry_imf_context_reset(en); 1914 _edje_entry_imf_context_reset(en);
@@ -2014,6 +2029,8 @@ _edje_entry_real_part_init(Edje_Real_Part *rp)
2014 evas_object_pass_events_set(en->cursor_fg, EINA_TRUE); 2029 evas_object_pass_events_set(en->cursor_fg, EINA_TRUE);
2015 _edje_subobj_register(en->rp->edje, en->cursor_fg); 2030 _edje_subobj_register(en->rp->edje, en->cursor_fg);
2016 2031
2032 evas_object_textblock_legacy_newline_set(rp->object, EINA_TRUE);
2033
2017 if (rp->part->entry_mode >= EDJE_ENTRY_EDIT_MODE_EDITABLE) 2034 if (rp->part->entry_mode >= EDJE_ENTRY_EDIT_MODE_EDITABLE)
2018 { 2035 {
2019 evas_object_show(en->cursor_bg); 2036 evas_object_show(en->cursor_bg);
@@ -2055,9 +2072,9 @@ _edje_entry_real_part_init(Edje_Real_Part *rp)
2055 2072
2056 ecore_imf_context_retrieve_surrounding_callback_set(en->imf_context, 2073 ecore_imf_context_retrieve_surrounding_callback_set(en->imf_context,
2057 _edje_entry_imf_retrieve_surrounding_cb, rp->edje); 2074 _edje_entry_imf_retrieve_surrounding_cb, rp->edje);
2058 en->imf_ee_handler_commit = ecore_event_handler_add(ECORE_IMF_EVENT_COMMIT, _edje_entry_imf_event_commit_cb, rp->edje); 2075 ecore_imf_context_event_callback_add(en->imf_context, ECORE_IMF_CALLBACK_COMMIT, _edje_entry_imf_event_commit_cb, rp->edje);
2059 en->imf_ee_handler_delete = ecore_event_handler_add(ECORE_IMF_EVENT_DELETE_SURROUNDING, _edje_entry_imf_event_delete_surrounding_cb, rp->edje); 2076 ecore_imf_context_event_callback_add(en->imf_context, ECORE_IMF_CALLBACK_DELETE_SURROUNDING, _edje_entry_imf_event_delete_surrounding_cb, rp->edje);
2060 en->imf_ee_handler_changed = ecore_event_handler_add(ECORE_IMF_EVENT_PREEDIT_CHANGED, _edje_entry_imf_event_preedit_changed_cb, rp->edje); 2077 ecore_imf_context_event_callback_add(en->imf_context, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, _edje_entry_imf_event_preedit_changed_cb, rp->edje);
2061 ecore_imf_context_input_mode_set(en->imf_context, 2078 ecore_imf_context_input_mode_set(en->imf_context,
2062 rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD ? 2079 rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD ?
2063 ECORE_IMF_INPUT_MODE_INVISIBLE : ECORE_IMF_INPUT_MODE_FULL); 2080 ECORE_IMF_INPUT_MODE_INVISIBLE : ECORE_IMF_INPUT_MODE_FULL);
@@ -2094,23 +2111,9 @@ _edje_entry_real_part_shutdown(Edje_Real_Part *rp)
2094 { 2111 {
2095 if (en->imf_context) 2112 if (en->imf_context)
2096 { 2113 {
2097 if (en->imf_ee_handler_commit) 2114 ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_COMMIT, _edje_entry_imf_event_commit_cb);
2098 { 2115 ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_DELETE_SURROUNDING, _edje_entry_imf_event_delete_surrounding_cb);
2099 ecore_event_handler_del(en->imf_ee_handler_commit); 2116 ecore_imf_context_event_callback_del(en->imf_context, ECORE_IMF_CALLBACK_PREEDIT_CHANGED, _edje_entry_imf_event_preedit_changed_cb);
2100 en->imf_ee_handler_commit = NULL;
2101 }
2102
2103 if (en->imf_ee_handler_delete)
2104 {
2105 ecore_event_handler_del(en->imf_ee_handler_delete);
2106 en->imf_ee_handler_delete = NULL;
2107 }
2108
2109 if (en->imf_ee_handler_changed)
2110 {
2111 ecore_event_handler_del(en->imf_ee_handler_changed);
2112 en->imf_ee_handler_changed = NULL;
2113 }
2114 2117
2115 ecore_imf_context_del(en->imf_context); 2118 ecore_imf_context_del(en->imf_context);
2116 en->imf_context = NULL; 2119 en->imf_context = NULL;
@@ -2189,7 +2192,7 @@ _edje_entry_text_markup_set(Edje_Real_Part *rp, const char *text)
2189{ 2192{
2190 Entry *en = rp->entry_data; 2193 Entry *en = rp->entry_data;
2191 if (!en) return; 2194 if (!en) return;
2192 2195 _edje_entry_imf_context_reset(en);
2193 // set text as markup 2196 // set text as markup
2194 _sel_clear(en->cursor, rp->object, en); 2197 _sel_clear(en->cursor, rp->object, en);
2195 evas_object_textblock_text_markup_set(rp->object, text); 2198 evas_object_textblock_text_markup_set(rp->object, text);
@@ -2228,6 +2231,8 @@ _edje_entry_text_markup_insert(Edje_Real_Part *rp, const char *text)
2228{ 2231{
2229 Entry *en = rp->entry_data; 2232 Entry *en = rp->entry_data;
2230 if (!en) return; 2233 if (!en) return;
2234 _edje_entry_imf_context_reset(en);
2235
2231 // prepend markup @ cursor pos 2236 // prepend markup @ cursor pos
2232 if (en->have_selection) 2237 if (en->have_selection)
2233 _range_del(en->cursor, rp->object, en); 2238 _range_del(en->cursor, rp->object, en);
@@ -2239,9 +2244,7 @@ _edje_entry_text_markup_insert(Edje_Real_Part *rp, const char *text)
2239 _edje_emit(rp->edje, "entry,changed", rp->part->name); 2244 _edje_emit(rp->edje, "entry,changed", rp->part->name);
2240 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 2245 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
2241 2246
2242 _edje_entry_imf_context_reset(en);
2243 _edje_entry_imf_cursor_info_set(en); 2247 _edje_entry_imf_cursor_info_set(en);
2244
2245 _edje_entry_real_part_configure(rp); 2248 _edje_entry_real_part_configure(rp);
2246} 2249}
2247 2250
@@ -2278,6 +2281,9 @@ _edje_entry_select_all(Edje_Real_Part *rp)
2278{ 2281{
2279 Entry *en = rp->entry_data; 2282 Entry *en = rp->entry_data;
2280 if (!en) return; 2283 if (!en) return;
2284
2285 _edje_entry_imf_context_reset(en);
2286
2281 _sel_clear(en->cursor, rp->object, en); 2287 _sel_clear(en->cursor, rp->object, en);
2282 _curs_start(en->cursor, rp->object, en); 2288 _curs_start(en->cursor, rp->object, en);
2283 _sel_enable(en->cursor, rp->object, en); 2289 _sel_enable(en->cursor, rp->object, en);
@@ -2285,7 +2291,6 @@ _edje_entry_select_all(Edje_Real_Part *rp)
2285 _curs_end(en->cursor, rp->object, en); 2291 _curs_end(en->cursor, rp->object, en);
2286 _sel_extend(en->cursor, rp->object, en); 2292 _sel_extend(en->cursor, rp->object, en);
2287 2293
2288 _edje_entry_imf_context_reset(en);
2289 _edje_entry_imf_cursor_info_set(en); 2294 _edje_entry_imf_cursor_info_set(en);
2290 _edje_entry_real_part_configure(rp); 2295 _edje_entry_real_part_configure(rp);
2291} 2296}
@@ -2295,12 +2300,14 @@ _edje_entry_select_begin(Edje_Real_Part *rp)
2295{ 2300{
2296 Entry *en = rp->entry_data; 2301 Entry *en = rp->entry_data;
2297 if (!en) return; 2302 if (!en) return;
2303
2304 _edje_entry_imf_context_reset(en);
2305
2298 _sel_clear(en->cursor, rp->object, en); 2306 _sel_clear(en->cursor, rp->object, en);
2299 _sel_enable(en->cursor, rp->object, en); 2307 _sel_enable(en->cursor, rp->object, en);
2300 _sel_start(en->cursor, rp->object, en); 2308 _sel_start(en->cursor, rp->object, en);
2301 _sel_extend(en->cursor, rp->object, en); 2309 _sel_extend(en->cursor, rp->object, en);
2302 2310
2303 _edje_entry_imf_context_reset(en);
2304 _edje_entry_imf_cursor_info_set(en); 2311 _edje_entry_imf_cursor_info_set(en);
2305 2312
2306 _edje_entry_real_part_configure(rp); 2313 _edje_entry_real_part_configure(rp);
@@ -2311,9 +2318,9 @@ _edje_entry_select_extend(Edje_Real_Part *rp)
2311{ 2318{
2312 Entry *en = rp->entry_data; 2319 Entry *en = rp->entry_data;
2313 if (!en) return; 2320 if (!en) return;
2321 _edje_entry_imf_context_reset(en);
2314 _sel_extend(en->cursor, rp->object, en); 2322 _sel_extend(en->cursor, rp->object, en);
2315 2323
2316 _edje_entry_imf_context_reset(en);
2317 _edje_entry_imf_cursor_info_set(en); 2324 _edje_entry_imf_cursor_info_set(en);
2318 2325
2319 _edje_entry_real_part_configure(rp); 2326 _edje_entry_real_part_configure(rp);
@@ -2560,13 +2567,14 @@ _edje_entry_cursor_next(Edje_Real_Part *rp, Edje_Cursor cur)
2560 Entry *en = rp->entry_data; 2567 Entry *en = rp->entry_data;
2561 Evas_Textblock_Cursor *c = _cursor_get(rp, cur); 2568 Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
2562 if (!c) return EINA_FALSE; 2569 if (!c) return EINA_FALSE;
2570
2571 _edje_entry_imf_context_reset(en);
2572
2563 if (!evas_textblock_cursor_char_next(c)) 2573 if (!evas_textblock_cursor_char_next(c))
2564 { 2574 {
2565 return EINA_FALSE; 2575 return EINA_FALSE;
2566 } 2576 }
2567 _sel_update(c, rp->object, rp->entry_data); 2577 _sel_update(c, rp->object, rp->entry_data);
2568
2569 _edje_entry_imf_context_reset(en);
2570 _edje_entry_imf_cursor_info_set(en); 2578 _edje_entry_imf_cursor_info_set(en);
2571 2579
2572 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 2580 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
@@ -2580,6 +2588,9 @@ _edje_entry_cursor_prev(Edje_Real_Part *rp, Edje_Cursor cur)
2580 Entry *en = rp->entry_data; 2588 Entry *en = rp->entry_data;
2581 Evas_Textblock_Cursor *c = _cursor_get(rp, cur); 2589 Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
2582 if (!c) return EINA_FALSE; 2590 if (!c) return EINA_FALSE;
2591
2592 _edje_entry_imf_context_reset(en);
2593
2583 if (!evas_textblock_cursor_char_prev(c)) 2594 if (!evas_textblock_cursor_char_prev(c))
2584 { 2595 {
2585 if (evas_textblock_cursor_paragraph_prev(c)) goto ok; 2596 if (evas_textblock_cursor_paragraph_prev(c)) goto ok;
@@ -2588,7 +2599,6 @@ _edje_entry_cursor_prev(Edje_Real_Part *rp, Edje_Cursor cur)
2588ok: 2599ok:
2589 _sel_update(c, rp->object, rp->entry_data); 2600 _sel_update(c, rp->object, rp->entry_data);
2590 2601
2591 _edje_entry_imf_context_reset(en);
2592 _edje_entry_imf_cursor_info_set(en); 2602 _edje_entry_imf_cursor_info_set(en);
2593 2603
2594 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 2604 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
@@ -2604,6 +2614,9 @@ _edje_entry_cursor_up(Edje_Real_Part *rp, Edje_Cursor cur)
2604 Evas_Coord lx, ly, lw, lh, cx, cy, cw, ch; 2614 Evas_Coord lx, ly, lw, lh, cx, cy, cw, ch;
2605 int ln; 2615 int ln;
2606 if (!c) return EINA_FALSE; 2616 if (!c) return EINA_FALSE;
2617
2618 _edje_entry_imf_context_reset(en);
2619
2607 ln = evas_textblock_cursor_line_geometry_get(c, NULL, NULL, NULL, NULL); 2620 ln = evas_textblock_cursor_line_geometry_get(c, NULL, NULL, NULL, NULL);
2608 ln--; 2621 ln--;
2609 if (ln < 0) return EINA_FALSE; 2622 if (ln < 0) return EINA_FALSE;
@@ -2620,7 +2633,6 @@ _edje_entry_cursor_up(Edje_Real_Part *rp, Edje_Cursor cur)
2620 } 2633 }
2621 _sel_update(c, rp->object, rp->entry_data); 2634 _sel_update(c, rp->object, rp->entry_data);
2622 2635
2623 _edje_entry_imf_context_reset(en);
2624 _edje_entry_imf_cursor_info_set(en); 2636 _edje_entry_imf_cursor_info_set(en);
2625 2637
2626 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 2638 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
@@ -2636,6 +2648,9 @@ _edje_entry_cursor_down(Edje_Real_Part *rp, Edje_Cursor cur)
2636 Evas_Coord lx, ly, lw, lh, cx, cy, cw, ch; 2648 Evas_Coord lx, ly, lw, lh, cx, cy, cw, ch;
2637 int ln; 2649 int ln;
2638 if (!c) return EINA_FALSE; 2650 if (!c) return EINA_FALSE;
2651
2652 _edje_entry_imf_context_reset(en);
2653
2639 ln = evas_textblock_cursor_line_geometry_get(c, NULL, NULL, NULL, NULL); 2654 ln = evas_textblock_cursor_line_geometry_get(c, NULL, NULL, NULL, NULL);
2640 ln++; 2655 ln++;
2641 if (!evas_object_textblock_line_number_geometry_get(rp->object, ln, 2656 if (!evas_object_textblock_line_number_geometry_get(rp->object, ln,
@@ -2651,7 +2666,6 @@ _edje_entry_cursor_down(Edje_Real_Part *rp, Edje_Cursor cur)
2651 } 2666 }
2652 _sel_update(c, rp->object, rp->entry_data); 2667 _sel_update(c, rp->object, rp->entry_data);
2653 2668
2654 _edje_entry_imf_context_reset(en);
2655 _edje_entry_imf_cursor_info_set(en); 2669 _edje_entry_imf_cursor_info_set(en);
2656 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 2670 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
2657 _edje_entry_real_part_configure(rp); 2671 _edje_entry_real_part_configure(rp);
@@ -2664,10 +2678,12 @@ _edje_entry_cursor_begin(Edje_Real_Part *rp, Edje_Cursor cur)
2664 Entry *en = rp->entry_data; 2678 Entry *en = rp->entry_data;
2665 Evas_Textblock_Cursor *c = _cursor_get(rp, cur); 2679 Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
2666 if (!c) return; 2680 if (!c) return;
2681
2682 _edje_entry_imf_context_reset(en);
2683
2667 evas_textblock_cursor_paragraph_first(c); 2684 evas_textblock_cursor_paragraph_first(c);
2668 _sel_update(c, rp->object, rp->entry_data); 2685 _sel_update(c, rp->object, rp->entry_data);
2669 2686
2670 _edje_entry_imf_context_reset(en);
2671 _edje_entry_imf_cursor_info_set(en); 2687 _edje_entry_imf_cursor_info_set(en);
2672 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 2688 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
2673 _edje_entry_real_part_configure(rp); 2689 _edje_entry_real_part_configure(rp);
@@ -2679,10 +2695,12 @@ _edje_entry_cursor_end(Edje_Real_Part *rp, Edje_Cursor cur)
2679 Entry *en = rp->entry_data; 2695 Entry *en = rp->entry_data;
2680 Evas_Textblock_Cursor *c = _cursor_get(rp, cur); 2696 Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
2681 if (!c) return; 2697 if (!c) return;
2698
2699 _edje_entry_imf_context_reset(en);
2700
2682 _curs_end(c, rp->object, rp->entry_data); 2701 _curs_end(c, rp->object, rp->entry_data);
2683 _sel_update(c, rp->object, rp->entry_data); 2702 _sel_update(c, rp->object, rp->entry_data);
2684 2703
2685 _edje_entry_imf_context_reset(en);
2686 _edje_entry_imf_cursor_info_set(en); 2704 _edje_entry_imf_cursor_info_set(en);
2687 2705
2688 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 2706 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
@@ -2715,10 +2733,11 @@ _edje_entry_cursor_line_begin(Edje_Real_Part *rp, Edje_Cursor cur)
2715 Entry *en = rp->entry_data; 2733 Entry *en = rp->entry_data;
2716 Evas_Textblock_Cursor *c = _cursor_get(rp, cur); 2734 Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
2717 if (!c) return; 2735 if (!c) return;
2736 _edje_entry_imf_context_reset(en);
2737
2718 evas_textblock_cursor_line_char_first(c); 2738 evas_textblock_cursor_line_char_first(c);
2719 _sel_update(c, rp->object, rp->entry_data); 2739 _sel_update(c, rp->object, rp->entry_data);
2720 2740
2721 _edje_entry_imf_context_reset(en);
2722 _edje_entry_imf_cursor_info_set(en); 2741 _edje_entry_imf_cursor_info_set(en);
2723 2742
2724 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 2743 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
@@ -2731,10 +2750,10 @@ _edje_entry_cursor_line_end(Edje_Real_Part *rp, Edje_Cursor cur)
2731 Entry *en = rp->entry_data; 2750 Entry *en = rp->entry_data;
2732 Evas_Textblock_Cursor *c = _cursor_get(rp, cur); 2751 Evas_Textblock_Cursor *c = _cursor_get(rp, cur);
2733 if (!c) return; 2752 if (!c) return;
2753 _edje_entry_imf_context_reset(en);
2734 evas_textblock_cursor_line_char_last(c); 2754 evas_textblock_cursor_line_char_last(c);
2735 _sel_update(c, rp->object, rp->entry_data); 2755 _sel_update(c, rp->object, rp->entry_data);
2736 2756
2737 _edje_entry_imf_context_reset(en);
2738 _edje_entry_imf_cursor_info_set(en); 2757 _edje_entry_imf_cursor_info_set(en);
2739 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 2758 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
2740 _edje_entry_real_part_configure(rp); 2759 _edje_entry_real_part_configure(rp);
@@ -2766,7 +2785,7 @@ _edje_entry_cursor_is_visible_format_get(Edje_Real_Part *rp, Edje_Cursor cur)
2766 return evas_textblock_cursor_format_is_visible_get(c); 2785 return evas_textblock_cursor_format_is_visible_get(c);
2767} 2786}
2768 2787
2769const char * 2788char *
2770_edje_entry_cursor_content_get(Edje_Real_Part *rp, Edje_Cursor cur) 2789_edje_entry_cursor_content_get(Edje_Real_Part *rp, Edje_Cursor cur)
2771{ 2790{
2772 static char *s = NULL; 2791 static char *s = NULL;
@@ -2793,10 +2812,10 @@ _edje_entry_cursor_pos_set(Edje_Real_Part *rp, Edje_Cursor cur, int pos)
2793 if (evas_textblock_cursor_pos_get(c) == pos) 2812 if (evas_textblock_cursor_pos_get(c) == pos)
2794 return; 2813 return;
2795 2814
2815 _edje_entry_imf_context_reset(en);
2796 evas_textblock_cursor_pos_set(c, pos); 2816 evas_textblock_cursor_pos_set(c, pos);
2797 _sel_update(c, rp->object, rp->entry_data); 2817 _sel_update(c, rp->object, rp->entry_data);
2798 2818
2799 _edje_entry_imf_context_reset(en);
2800 _edje_entry_imf_cursor_info_set(en); 2819 _edje_entry_imf_cursor_info_set(en);
2801 _edje_emit(rp->edje, "cursor,changed", rp->part->name); 2820 _edje_emit(rp->edje, "cursor,changed", rp->part->name);
2802 _edje_entry_real_part_configure(rp); 2821 _edje_entry_real_part_configure(rp);
@@ -2891,43 +2910,33 @@ _edje_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx __UNU
2891 return EINA_TRUE; 2910 return EINA_TRUE;
2892} 2911}
2893 2912
2894static Eina_Bool 2913static void
2895_edje_entry_imf_event_commit_cb(void *data, int type __UNUSED__, void *event) 2914_edje_entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx __UNUSED__, void *event_info)
2896{ 2915{
2897 Edje *ed = data; 2916 Edje *ed = data;
2898 Edje_Real_Part *rp = ed->focused_part; 2917 Edje_Real_Part *rp = ed->focused_part;
2899 Entry *en; 2918 Entry *en;
2900 Ecore_IMF_Event_Commit *ev = event; 2919 char *commit_str = event_info;
2901 Evas_Textblock_Cursor *tc; 2920 int start_pos;
2902 Eina_Bool cursor_move = EINA_FALSE;
2903 2921
2904 if ((!rp) || (!ev) || (!ev->str)) return ECORE_CALLBACK_PASS_ON; 2922 if ((!rp)) return;
2905 2923
2906 en = rp->entry_data; 2924 en = rp->entry_data;
2907 if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) || 2925 if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) ||
2908 (rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_SELECTABLE)) 2926 (rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_SELECTABLE))
2909 return ECORE_CALLBACK_PASS_ON; 2927 return;
2910
2911 if (!en->imf_context) return ECORE_CALLBACK_PASS_ON;
2912 if (en->imf_context != ev->ctx) return ECORE_CALLBACK_PASS_ON;
2913 2928
2914 if (en->have_selection) 2929 if (en->have_selection)
2915 { 2930 {
2916 if (strcmp(ev->str, "")) 2931 if (strcmp(commit_str, ""))
2917 { 2932 {
2918 /* delete selected characters */ 2933 /* delete selected characters */
2919 _range_del(en->cursor, rp->object, en); 2934 _range_del_emit(ed, en->cursor, rp->object, en);
2920 _sel_clear(en->cursor, rp->object, en); 2935 _sel_clear(en->cursor, rp->object, en);
2921 } 2936 }
2922 } 2937 }
2923 2938
2924 tc = evas_object_textblock_cursor_new(rp->object); 2939 start_pos = evas_textblock_cursor_pos_get(en->cursor);
2925
2926 /* calculate the cursor position to insert commit string */
2927 if (en->preedit_start)
2928 evas_textblock_cursor_copy(en->preedit_start, tc);
2929 else
2930 evas_textblock_cursor_copy(en->cursor, tc);
2931 2940
2932#ifdef HAVE_ECORE_IMF 2941#ifdef HAVE_ECORE_IMF
2933 /* delete preedit characters */ 2942 /* delete preedit characters */
@@ -2935,17 +2944,16 @@ _edje_entry_imf_event_commit_cb(void *data, int type __UNUSED__, void *event)
2935 _preedit_clear(en); 2944 _preedit_clear(en);
2936#endif 2945#endif
2937 2946
2938 if (evas_textblock_cursor_compare(en->cursor, tc))
2939 cursor_move = EINA_TRUE;
2940 if ((rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD) && 2947 if ((rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD) &&
2941 _edje_password_show_last) 2948 _edje_password_show_last)
2942 _edje_entry_hide_visible_password(en->rp); 2949 _edje_entry_hide_visible_password(en->rp);
2943 if ((rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD) && 2950 if ((rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD) &&
2944 _edje_password_show_last && (!en->preedit_start)) 2951 _edje_password_show_last && (!en->preedit_start))
2945 { 2952 {
2946 _text_filter_format_prepend(en, tc, "+ password=off"); 2953 _text_filter_format_prepend(en, en->cursor, "+ password=off");
2947 _text_filter_markup_prepend(en, tc, ev->str); 2954 _text_filter_text_prepend(en, en->cursor, commit_str);
2948 _text_filter_format_prepend(en, tc, "- password"); 2955 _text_filter_format_prepend(en, en->cursor, "- password");
2956
2949 if (en->pw_timer) 2957 if (en->pw_timer)
2950 { 2958 {
2951 ecore_timer_del(en->pw_timer); 2959 ecore_timer_del(en->pw_timer);
@@ -2955,51 +2963,54 @@ _edje_entry_imf_event_commit_cb(void *data, int type __UNUSED__, void *event)
2955 _password_timer_cb, en); 2963 _password_timer_cb, en);
2956 } 2964 }
2957 else 2965 else
2958 _text_filter_text_prepend(en, tc, ev->str); 2966 _text_filter_text_prepend(en, en->cursor, commit_str);
2959
2960 if (!cursor_move)
2961 {
2962 /* move cursor to the end of commit string */
2963 evas_textblock_cursor_copy(tc, en->cursor);
2964 }
2965 2967
2966 evas_textblock_cursor_free(tc);
2967 2968
2968 _edje_entry_imf_cursor_info_set(en); 2969 _edje_entry_imf_cursor_info_set(en);
2969 _anchors_get(en->cursor, rp->object, en); 2970 _anchors_get(en->cursor, rp->object, en);
2970 _edje_emit(rp->edje, "entry,changed", rp->part->name); 2971 _edje_emit(rp->edje, "entry,changed", rp->part->name);
2971 _edje_emit(ed, "entry,changed,user", rp->part->name);
2972 _edje_emit(ed, "cursor,changed", rp->part->name);
2973 2972
2974 return ECORE_CALLBACK_DONE; 2973 {
2974 Edje_Entry_Change_Info *info = calloc(1, sizeof(*info));
2975 info->insert = EINA_TRUE;
2976 info->change.insert.pos = start_pos;
2977 info->change.insert.content = eina_stringshare_add(commit_str);
2978 info->change.insert.plain_length =
2979 eina_unicode_utf8_get_len(info->change.insert.content);
2980 _edje_emit_full(ed, "entry,changed,user", rp->part->name,
2981 info, _free_entry_change_info);
2982 _edje_emit(ed, "cursor,changed", rp->part->name);
2983 }
2975} 2984}
2976 2985
2977static Eina_Bool 2986static void
2978_edje_entry_imf_event_preedit_changed_cb(void *data, int type __UNUSED__, void *event) 2987_edje_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx __UNUSED__, void *event_info __UNUSED__)
2979{ 2988{
2980 Edje *ed = data; 2989 Edje *ed = data;
2981 Edje_Real_Part *rp = ed->focused_part; 2990 Edje_Real_Part *rp = ed->focused_part;
2982 Entry *en; 2991 Entry *en;
2983 Ecore_IMF_Event_Preedit_Changed *ev = event;
2984 int cursor_pos; 2992 int cursor_pos;
2985 int preedit_start_pos, preedit_end_pos; 2993 int preedit_start_pos, preedit_end_pos;
2986 char *preedit_string; 2994 char *preedit_string;
2987 int i; 2995 int i;
2988 Eina_Bool preedit_end_state = EINA_FALSE; 2996 Eina_Bool preedit_end_state = EINA_FALSE;
2997 Eina_List *attrs = NULL, *l = NULL;
2998 Ecore_IMF_Preedit_Attr *attr;
2999 Eina_Strbuf *buf;
2989 3000
2990 if ((!rp) || (!ev)) return ECORE_CALLBACK_PASS_ON; 3001 if ((!rp)) return;
2991 3002
2992 en = rp->entry_data; 3003 en = rp->entry_data;
2993 if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) || 3004 if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) ||
2994 (rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_SELECTABLE)) 3005 (rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_SELECTABLE))
2995 return ECORE_CALLBACK_PASS_ON; 3006 return;
2996
2997 if (!en->imf_context) return ECORE_CALLBACK_PASS_ON;
2998 3007
2999 if (en->imf_context != ev->ctx) return ECORE_CALLBACK_PASS_ON; 3008 if (!en->imf_context) return;
3000 3009
3001 ecore_imf_context_preedit_string_get(en->imf_context, &preedit_string, &cursor_pos); 3010 ecore_imf_context_preedit_string_with_attributes_get(en->imf_context,
3002 if (!preedit_string) return ECORE_CALLBACK_PASS_ON; 3011 &preedit_string,
3012 &attrs, &cursor_pos);
3013 if (!preedit_string) return;
3003 3014
3004 if (!strcmp(preedit_string, "")) 3015 if (!strcmp(preedit_string, ""))
3005 preedit_end_state = EINA_TRUE; 3016 preedit_end_state = EINA_TRUE;
@@ -3007,7 +3018,7 @@ _edje_entry_imf_event_preedit_changed_cb(void *data, int type __UNUSED__, void *
3007 if (en->have_selection && !preedit_end_state) 3018 if (en->have_selection && !preedit_end_state)
3008 { 3019 {
3009 /* delete selected characters */ 3020 /* delete selected characters */
3010 _range_del(en->cursor, rp->object, en); 3021 _range_del_emit(ed, en->cursor, rp->object, en);
3011 _sel_clear(en->cursor, rp->object, en); 3022 _sel_clear(en->cursor, rp->object, en);
3012 } 3023 }
3013 3024
@@ -3017,23 +3028,51 @@ _edje_entry_imf_event_preedit_changed_cb(void *data, int type __UNUSED__, void *
3017 preedit_start_pos = evas_textblock_cursor_pos_get(en->cursor); 3028 preedit_start_pos = evas_textblock_cursor_pos_get(en->cursor);
3018 3029
3019 /* insert preedit character(s) */ 3030 /* insert preedit character(s) */
3020 if ((rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD) && 3031 if (strlen(preedit_string) > 0)
3021 _edje_password_show_last)
3022 { 3032 {
3023 _text_filter_format_prepend(en, en->cursor, "+ password=off"); 3033 buf = eina_strbuf_new();
3024 _text_filter_markup_prepend(en, en->cursor, preedit_string); 3034 if (attrs)
3025 _text_filter_format_prepend(en, en->cursor, "- password");
3026 if (en->pw_timer)
3027 { 3035 {
3028 ecore_timer_del(en->pw_timer); 3036 EINA_LIST_FOREACH(attrs, l, attr)
3029 en->pw_timer = NULL; 3037 {
3038 if (attr->preedit_type == ECORE_IMF_PREEDIT_TYPE_SUB1)
3039 {
3040 eina_strbuf_append(buf, "<preedit>");
3041 eina_strbuf_append_n(buf, preedit_string + attr->start_index,
3042 attr->end_index - attr->start_index);
3043 eina_strbuf_append(buf, "</preedit>");
3044 }
3045
3046 else if (attr->preedit_type == ECORE_IMF_PREEDIT_TYPE_SUB2 ||
3047 attr->preedit_type == ECORE_IMF_PREEDIT_TYPE_SUB3)
3048 {
3049 eina_strbuf_append(buf, "<preedit_sel>");
3050 eina_strbuf_append_n(buf, preedit_string + attr->start_index,
3051 attr->end_index - attr->start_index);
3052 eina_strbuf_append(buf, "</preedit_sel>");
3053 }
3054 }
3030 } 3055 }
3031 en->pw_timer = ecore_timer_add(_edje_password_show_last_timeout, 3056 if ((rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD) &&
3032 _password_timer_cb, en); 3057 _edje_password_show_last)
3033 } 3058 {
3034 else 3059 _edje_entry_hide_visible_password(en->rp);
3035 { 3060 _text_filter_format_prepend(en, en->cursor, "+ password=off");
3036 _text_filter_markup_prepend(en, en->cursor, preedit_string); 3061 _text_filter_markup_prepend(en, en->cursor, eina_strbuf_string_get(buf));
3062 _text_filter_format_prepend(en, en->cursor, "- password");
3063 if (en->pw_timer)
3064 {
3065 ecore_timer_del(en->pw_timer);
3066 en->pw_timer = NULL;
3067 }
3068 en->pw_timer = ecore_timer_add(_edje_password_show_last_timeout,
3069 _password_timer_cb, en);
3070 }
3071 else
3072 {
3073 _text_filter_markup_prepend(en, en->cursor, eina_strbuf_string_get(buf));
3074 }
3075 eina_strbuf_free(buf);
3037 } 3076 }
3038 3077
3039 if (!preedit_end_state) 3078 if (!preedit_end_state)
@@ -3066,29 +3105,30 @@ _edje_entry_imf_event_preedit_changed_cb(void *data, int type __UNUSED__, void *
3066 _edje_emit(rp->edje, "preedit,changed", rp->part->name); 3105 _edje_emit(rp->edje, "preedit,changed", rp->part->name);
3067 _edje_emit(ed, "cursor,changed", rp->part->name); 3106 _edje_emit(ed, "cursor,changed", rp->part->name);
3068 3107
3069 free(preedit_string); 3108 /* delete attribute list */
3109 if (attrs)
3110 {
3111 EINA_LIST_FREE(attrs, attr) free(attr);
3112 }
3070 3113
3071 return ECORE_CALLBACK_DONE; 3114 free(preedit_string);
3072} 3115}
3073 3116
3074static Eina_Bool 3117static void
3075_edje_entry_imf_event_delete_surrounding_cb(void *data, int type __UNUSED__, void *event) 3118_edje_entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx __UNUSED__, void *event_info)
3076{ 3119{
3077 Edje *ed = data; 3120 Edje *ed = data;
3078 Edje_Real_Part *rp = ed->focused_part; 3121 Edje_Real_Part *rp = ed->focused_part;
3079 Entry *en; 3122 Entry *en;
3080 Ecore_IMF_Event_Delete_Surrounding *ev = event; 3123 Ecore_IMF_Event_Delete_Surrounding *ev = event_info;
3081 Evas_Textblock_Cursor *del_start, *del_end; 3124 Evas_Textblock_Cursor *del_start, *del_end;
3082 int cursor_pos; 3125 int cursor_pos;
3083 3126
3084 if ((!rp) || (!ev)) return ECORE_CALLBACK_PASS_ON; 3127 if ((!rp) || (!ev)) return;
3085 en = rp->entry_data; 3128 en = rp->entry_data;
3086 if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) || 3129 if ((!en) || (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK) ||
3087 (rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_SELECTABLE)) 3130 (rp->part->entry_mode < EDJE_ENTRY_EDIT_MODE_SELECTABLE))
3088 return ECORE_CALLBACK_PASS_ON; 3131 return;
3089
3090 if (!en->imf_context) return ECORE_CALLBACK_PASS_ON;
3091 if (en->imf_context != ev->ctx) return ECORE_CALLBACK_PASS_ON;
3092 3132
3093 cursor_pos = evas_textblock_cursor_pos_get(en->cursor); 3133 cursor_pos = evas_textblock_cursor_pos_get(en->cursor);
3094 3134
@@ -3102,8 +3142,6 @@ _edje_entry_imf_event_delete_surrounding_cb(void *data, int type __UNUSED__, voi
3102 3142
3103 evas_textblock_cursor_free(del_start); 3143 evas_textblock_cursor_free(del_start);
3104 evas_textblock_cursor_free(del_end); 3144 evas_textblock_cursor_free(del_end);
3105
3106 return ECORE_CALLBACK_DONE;
3107} 3145}
3108#endif 3146#endif
3109 3147
diff --git a/libraries/edje/src/lib/edje_load.c b/libraries/edje/src/lib/edje_load.c
index 644bb7c..8fe5842 100644
--- a/libraries/edje/src/lib/edje_load.c
+++ b/libraries/edje/src/lib/edje_load.c
@@ -262,6 +262,10 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
262{ 262{
263 Edje *ed; 263 Edje *ed;
264 Evas *tev; 264 Evas *tev;
265 Edje_Real_Part *rp;
266 Eina_List *textblocks = NULL;
267 Eina_List *sources = NULL;
268 Eina_List *externals = NULL;
265 Eina_List *old_swallows; 269 Eina_List *old_swallows;
266 unsigned int n; 270 unsigned int n;
267 Eina_List *parts = NULL; 271 Eina_List *parts = NULL;
@@ -323,7 +327,6 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
323 else 327 else
324 { 328 {
325 unsigned int i; 329 unsigned int i;
326 int errors = 0;
327 330
328 /* colorclass stuff */ 331 /* colorclass stuff */
329 for (i = 0; i < ed->collection->parts_count; ++i) 332 for (i = 0; i < ed->collection->parts_count; ++i)
@@ -333,8 +336,6 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
333 336
334 ep = ed->collection->parts[i]; 337 ep = ed->collection->parts[i];
335 338
336 if (errors)
337 break;
338 /* Register any color classes in this parts descriptions. */ 339 /* Register any color classes in this parts descriptions. */
339 if ((ep->default_desc) && (ep->default_desc->color_class)) 340 if ((ep->default_desc) && (ep->default_desc->color_class))
340 _edje_color_class_member_add(ed, ep->default_desc->color_class); 341 _edje_color_class_member_add(ed, ep->default_desc->color_class);
@@ -353,12 +354,12 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
353 for (n = 0; n < ed->collection->parts_count; n++) 354 for (n = 0; n < ed->collection->parts_count; n++)
354 { 355 {
355 Edje_Part *ep; 356 Edje_Part *ep;
356 Edje_Real_Part *rp;
357 357
358 ep = ed->collection->parts[n]; 358 ep = ed->collection->parts[n];
359 rp = eina_mempool_malloc(_edje_real_part_mp, sizeof(Edje_Real_Part)); 359 rp = eina_mempool_malloc(_edje_real_part_mp, sizeof(Edje_Real_Part));
360 if (!rp) 360 if (!rp)
361 { 361 {
362 /* FIXME: destroy all allocated ressource, need to have a common exit point */
362 ed->load_error = EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED; 363 ed->load_error = EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
363 evas_event_thaw(tev); 364 evas_event_thaw(tev);
364 evas_event_thaw_eval(tev); 365 evas_event_thaw_eval(tev);
@@ -373,7 +374,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
373 if (!rp->drag) 374 if (!rp->drag)
374 { 375 {
375 ed->load_error = EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED; 376 ed->load_error = EDJE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
376 free(rp); 377 eina_mempool_free(_edje_real_part_mp, rp);
377 evas_event_thaw(tev); 378 evas_event_thaw(tev);
378 evas_event_thaw_eval(tev); 379 evas_event_thaw_eval(tev);
379 return 0; 380 return 0;
@@ -407,9 +408,12 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
407 rp->object = evas_object_text_add(ed->base.evas); 408 rp->object = evas_object_text_add(ed->base.evas);
408 evas_object_text_font_source_set(rp->object, ed->path); 409 evas_object_text_font_source_set(rp->object, ed->path);
409 break; 410 break;
410 case EDJE_PART_TYPE_SWALLOW:
411 case EDJE_PART_TYPE_GROUP: 411 case EDJE_PART_TYPE_GROUP:
412 sources = eina_list_append(sources, rp);
413 case EDJE_PART_TYPE_SWALLOW:
412 case EDJE_PART_TYPE_EXTERNAL: 414 case EDJE_PART_TYPE_EXTERNAL:
415 if (ep->type == EDJE_PART_TYPE_EXTERNAL)
416 externals = eina_list_append(externals, rp);
413 rp->object = evas_object_rectangle_add(ed->base.evas); 417 rp->object = evas_object_rectangle_add(ed->base.evas);
414 evas_object_color_set(rp->object, 0, 0, 0, 0); 418 evas_object_color_set(rp->object, 0, 0, 0, 0);
415 evas_object_pass_events_set(rp->object, 1); 419 evas_object_pass_events_set(rp->object, 1);
@@ -417,13 +421,16 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
417 _edje_callbacks_focus_add(rp->object, ed, rp); 421 _edje_callbacks_focus_add(rp->object, ed, rp);
418 break; 422 break;
419 case EDJE_PART_TYPE_TEXTBLOCK: 423 case EDJE_PART_TYPE_TEXTBLOCK:
424 textblocks = eina_list_append(textblocks, rp);
420 rp->object = evas_object_textblock_add(ed->base.evas); 425 rp->object = evas_object_textblock_add(ed->base.evas);
421 break; 426 break;
422 case EDJE_PART_TYPE_BOX: 427 case EDJE_PART_TYPE_BOX:
428 sources = eina_list_append(sources, rp);
423 rp->object = evas_object_box_add(ed->base.evas); 429 rp->object = evas_object_box_add(ed->base.evas);
424 rp->anim = _edje_box_layout_anim_new(rp->object); 430 rp->anim = _edje_box_layout_anim_new(rp->object);
425 break; 431 break;
426 case EDJE_PART_TYPE_TABLE: 432 case EDJE_PART_TYPE_TABLE:
433 sources = eina_list_append(sources, rp);
427 rp->object = evas_object_table_add(ed->base.evas); 434 rp->object = evas_object_table_add(ed->base.evas);
428 break; 435 break;
429 case EDJE_PART_TYPE_GRADIENT: 436 case EDJE_PART_TYPE_GRADIENT:
@@ -463,7 +470,6 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
463 } 470 }
464 if (n > 0) 471 if (n > 0)
465 { 472 {
466 Edje_Real_Part *rp;
467 Eina_List *l; 473 Eina_List *l;
468 474
469 ed->table_parts = malloc(sizeof(Edje_Real_Part *) * n); 475 ed->table_parts = malloc(sizeof(Edje_Real_Part *) * n);
@@ -519,7 +525,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
519 } 525 }
520 526
521 rp->swallow_params.min.w = 0; 527 rp->swallow_params.min.w = 0;
522 rp->swallow_params.min.w = 0; 528 rp->swallow_params.min.h = 0;
523 rp->swallow_params.max.w = -1; 529 rp->swallow_params.max.w = -1;
524 rp->swallow_params.max.h = -1; 530 rp->swallow_params.max.h = -1;
525 531
@@ -587,8 +593,6 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
587 _edje_var_init(ed); 593 _edje_var_init(ed);
588 for (i = 0; i < ed->table_parts_size; i++) 594 for (i = 0; i < ed->table_parts_size; i++)
589 { 595 {
590 Edje_Real_Part *rp;
591
592 rp = ed->table_parts[i]; 596 rp = ed->table_parts[i];
593 evas_object_show(rp->object); 597 evas_object_show(rp->object);
594 if (_edje_block_break(ed)) break; 598 if (_edje_block_break(ed)) break;
@@ -599,6 +603,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
599 _edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y); 603 _edje_dragable_pos_set(ed, rp, rp->drag->val.x, rp->drag->val.y);
600 } 604 }
601 } 605 }
606 ed->recalc_call = 1;
602 ed->dirty = 1; 607 ed->dirty = 1;
603#ifdef EDJE_CALC_CACHE 608#ifdef EDJE_CALC_CACHE
604 ed->all_part_change = 1; 609 ed->all_part_change = 1;
@@ -606,11 +611,28 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
606 if ((evas_object_clipees_get(ed->base.clipper)) && 611 if ((evas_object_clipees_get(ed->base.clipper)) &&
607 (evas_object_visible_get(obj))) 612 (evas_object_visible_get(obj)))
608 evas_object_show(ed->base.clipper); 613 evas_object_show(ed->base.clipper);
609 614
610 /* instantiate 'internal swallows' */ 615 /* instantiate 'internal swallows' */
611 for (i = 0; i < ed->table_parts_size; i++) 616 EINA_LIST_FREE(externals, rp)
617 {
618 Edje_Part_Description_External *external;
619 Evas_Object *child_obj;
620
621 external = (Edje_Part_Description_External *) rp->part->default_desc;
622 child_obj = _edje_external_type_add(rp->part->source,
623 evas_object_evas_get(ed->obj), ed->obj,
624 external->external_params, rp->part->name);
625 if (child_obj)
626 {
627 _edje_real_part_swallow(rp, child_obj, EINA_TRUE);
628 rp->param1.external_params = _edje_external_params_parse(child_obj,
629 external->external_params);
630 _edje_external_recalc_apply(ed, rp, NULL, rp->chosen_description);
631 }
632 }
633
634 EINA_LIST_FREE(sources, rp)
612 { 635 {
613 Edje_Real_Part *rp;
614 /* XXX: curr_item and pack_it don't require to be NULL since 636 /* XXX: curr_item and pack_it don't require to be NULL since
615 * XXX: they are just used when source != NULL and type == BOX, 637 * XXX: they are just used when source != NULL and type == BOX,
616 * XXX: and they're always set in this case, but GCC fails to 638 * XXX: and they're always set in this case, but GCC fails to
@@ -620,8 +642,6 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
620 unsigned int item_count = 0; 642 unsigned int item_count = 0;
621 Edje_Pack_Element *pack_it = NULL; 643 Edje_Pack_Element *pack_it = NULL;
622 const char *source = NULL; 644 const char *source = NULL;
623
624 rp = ed->table_parts[i];
625 645
626 switch (rp->part->type) 646 switch (rp->part->type)
627 { 647 {
@@ -643,25 +663,9 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
643 } 663 }
644 } 664 }
645 break; 665 break;
646 case EDJE_PART_TYPE_EXTERNAL:
647 {
648 Edje_Part_Description_External *external;
649 Evas_Object *child_obj;
650
651 external = (Edje_Part_Description_External *) rp->part->default_desc;
652 child_obj = _edje_external_type_add(rp->part->source,
653 evas_object_evas_get(ed->obj), ed->obj,
654 external->external_params, rp->part->name);
655 if (child_obj)
656 {
657 _edje_real_part_swallow(rp, child_obj, EINA_TRUE);
658 rp->param1.external_params = _edje_external_params_parse(child_obj,
659 external->external_params);
660 _edje_external_recalc_apply(ed, rp, NULL, rp->chosen_description);
661 }
662 }
663 continue;
664 default: 666 default:
667 /* This list should only be filled by group, box or table, nothing else. */
668 abort();
665 continue; 669 continue;
666 } 670 }
667 671
@@ -682,6 +686,11 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
682 { 686 {
683 if (data == group_path_entry) 687 if (data == group_path_entry)
684 { 688 {
689 ERR("recursive loop group '%s' already included inside part '%s' of group '%s' from file '%s'",
690 group_path_entry, rp->part->name, group, file);
691 textblocks = eina_list_free(textblocks);
692 externals = eina_list_free(externals);
693 sources = eina_list_free(sources);
685 _edje_thaw(ed); 694 _edje_thaw(ed);
686 _edje_unblock(ed); 695 _edje_unblock(ed);
687 _edje_unref(ed); 696 _edje_unref(ed);
@@ -698,7 +707,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
698 return 0; 707 return 0;
699 } 708 }
700 } 709 }
701 710
702 child_obj = edje_object_add(ed->base.evas); 711 child_obj = edje_object_add(ed->base.evas);
703 group_path = eina_list_append(group_path, group_path_entry); 712 group_path = eina_list_append(group_path, group_path_entry);
704 if (rp->part->type == EDJE_PART_TYPE_GROUP) 713 if (rp->part->type == EDJE_PART_TYPE_GROUP)
@@ -708,11 +717,16 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
708 717
709 if (!_edje_object_file_set_internal(child_obj, file, source, rp->part->name, group_path)) 718 if (!_edje_object_file_set_internal(child_obj, file, source, rp->part->name, group_path))
710 { 719 {
720 ERR("impossible to set part '%s' of group '%s' from file '%s' to '%s'",
721 rp->part->name, group_path_entry, file, source);
722 textblocks = eina_list_free(textblocks);
723 externals = eina_list_free(externals);
724 sources = eina_list_free(sources);
711 _edje_thaw(ed); 725 _edje_thaw(ed);
712 _edje_unblock(ed); 726 _edje_unblock(ed);
713 _edje_unref(ed); 727 _edje_unref(ed);
714 _edje_file_del(ed); 728 _edje_file_del(ed);
715 729
716 if (group_path_started) 730 if (group_path_started)
717 { 731 {
718 while (group_path) 732 while (group_path)
@@ -794,56 +808,51 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
794 { 808 {
795 const char *name; 809 const char *name;
796 Evas_Object *swallow; 810 Evas_Object *swallow;
797 811
798 name = eina_list_data_get(old_swallows); 812 name = eina_list_data_get(old_swallows);
799 old_swallows = eina_list_remove_list(old_swallows, old_swallows); 813 old_swallows = eina_list_remove_list(old_swallows, old_swallows);
800 814
801 swallow = eina_list_data_get(old_swallows); 815 swallow = eina_list_data_get(old_swallows);
802 old_swallows = eina_list_remove_list(old_swallows, old_swallows); 816 old_swallows = eina_list_remove_list(old_swallows, old_swallows);
803 817
804 edje_object_part_swallow(obj, name, swallow); 818 edje_object_part_swallow(obj, name, swallow);
805 eina_stringshare_del(name); 819 eina_stringshare_del(name);
806 } 820 }
807 } 821 }
808 822
809 _edje_recalc(ed); 823 _edje_recalc(ed);
810 _edje_thaw(ed); 824 _edje_thaw(ed);
811 _edje_unblock(ed); 825 _edje_unblock(ed);
812 _edje_unref(ed); 826 _edje_unref(ed);
813 ed->load_error = EDJE_LOAD_ERROR_NONE; 827 ed->load_error = EDJE_LOAD_ERROR_NONE;
814 _edje_emit(ed, "load", NULL); 828 _edje_emit(ed, "load", NULL);
815 /* instantiate 'internal swallows' */ 829
816 for (i = 0; i < ed->table_parts_size; i++) 830 /* instantiate 'internal textblock style' */
817 { 831 EINA_LIST_FREE(textblocks, rp)
818 Edje_Real_Part *rp; 832 if (rp->part->default_desc)
819 833 {
820 rp = ed->table_parts[i]; 834 Edje_Part_Description_Text *text;
821 if ((rp->part->type == EDJE_PART_TYPE_TEXTBLOCK) && 835 Edje_Style *stl = NULL;
822 (rp->part->default_desc)) 836 const char *style;
823 { 837
824 Edje_Part_Description_Text *text; 838 text = (Edje_Part_Description_Text *) rp->part->default_desc;
825 Edje_Style *stl = NULL; 839 style = edje_string_get(&text->text.style);
826 const char *style; 840 if (style)
827 841 {
828 text = (Edje_Part_Description_Text *) rp->part->default_desc; 842 Eina_List *l;
829 style = edje_string_get(&text->text.style); 843
830 if (style) 844 EINA_LIST_FOREACH(ed->file->styles, l, stl)
831 { 845 {
832 Eina_List *l; 846 if ((stl->name) && (!strcmp(stl->name, style))) break;
833 847 stl = NULL;
834 EINA_LIST_FOREACH(ed->file->styles, l, stl) 848 }
835 { 849 }
836 if ((stl->name) && (!strcmp(stl->name, style))) break; 850 if (stl)
837 stl = NULL; 851 {
838 } 852 if (evas_object_textblock_style_get(rp->object) != stl->style)
839 } 853 evas_object_textblock_style_set(rp->object, stl->style);
840 if (stl) 854 }
841 { 855 }
842 if (evas_object_textblock_style_get(rp->object) != stl->style)
843 evas_object_textblock_style_set(rp->object, stl->style);
844 }
845 }
846 }
847 } 856 }
848 _edje_entry_init(ed); 857 _edje_entry_init(ed);
849 evas_event_thaw(tev); 858 evas_event_thaw(tev);
diff --git a/libraries/edje/src/lib/edje_lua2.c b/libraries/edje/src/lib/edje_lua2.c
index 2318af9..1d167e9 100644
--- a/libraries/edje/src/lib/edje_lua2.c
+++ b/libraries/edje/src/lib/edje_lua2.c
@@ -376,7 +376,7 @@ _elua_gc(lua_State *L) // Stack usage [-0, +0, e]
376// nil ~ 376// nil ~
377 377
378static char * 378static char *
379_elua_push_name(lua_State *L, char *q, int index) // Stack usage [-0, +1, e or m] 379_elua_push_name(lua_State *L, char *q, int idx) // Stack usage [-0, +1, e or m]
380{ 380{
381 char *p = q; 381 char *p = q;
382 char temp = '\0'; 382 char temp = '\0';
@@ -387,8 +387,8 @@ _elua_push_name(lua_State *L, char *q, int index) // Stack usage [-0, +1, e or
387 q++; 387 q++;
388 temp = *q; 388 temp = *q;
389 *q = '\0'; 389 *q = '\0';
390 if (index > 0) 390 if (idx > 0)
391 lua_getfield(L, index, p); // Stack usage [-0, +1, e] 391 lua_getfield(L, idx, p); // Stack usage [-0, +1, e]
392 else 392 else
393 lua_pushstring(L, p); // Stack usage [-0, +1, m] 393 lua_pushstring(L, p); // Stack usage [-0, +1, m]
394 *q = temp; 394 *q = temp;
@@ -614,6 +614,7 @@ static int _elua_echo(lua_State *L);
614static int _elua_date(lua_State *L); 614static int _elua_date(lua_State *L);
615static int _elua_looptime(lua_State *L); 615static int _elua_looptime(lua_State *L);
616static int _elua_seconds(lua_State *L); 616static int _elua_seconds(lua_State *L);
617static int _elua_version(lua_State *L);
617 618
618static int _elua_objgeom(lua_State *L); 619static int _elua_objgeom(lua_State *L);
619static int _elua_objpos(lua_State *L); 620static int _elua_objpos(lua_State *L);
@@ -649,6 +650,7 @@ static const struct luaL_reg _elua_edje_funcs [] =
649 {"date", _elua_date}, // get date in a table 650 {"date", _elua_date}, // get date in a table
650 {"looptime", _elua_looptime}, // get loop time 651 {"looptime", _elua_looptime}, // get loop time
651 {"seconds", _elua_seconds}, // get seconds 652 {"seconds", _elua_seconds}, // get seconds
653 {"version", _elua_version}, // edje version
652 654
653 // query edje - size, pos 655 // query edje - size, pos
654 {"geom", _elua_objgeom}, // get while edje object geometry in canvas 656 {"geom", _elua_objgeom}, // get while edje object geometry in canvas
@@ -801,6 +803,25 @@ _elua_seconds(lua_State *L) // Stack usage [-0, +1, -]
801 return 1; 803 return 1;
802} 804}
803 805
806/**
807@page luaref
808@subsubsection edje_version edje:version()
809
810Retrieves the current edje version number.
811
812@returns A table with these fields:
813 - integer major: The edje version major number.
814 - integer minor: The edje version minor number.
815
816@since 1.2.0
817*/
818static int
819_elua_version(lua_State *L) // Stack usage [-4, +5, em]
820{
821 _elua_ret(L, "%major %minor", EDJE_VERSION_MAJOR, EDJE_VERSION_MINOR); // Stack usage [-4, +5, em]
822 return 1;
823}
824
804//------------- 825//-------------
805/** 826/**
806@page luaref 827@page luaref
@@ -2936,7 +2957,9 @@ static int _elua_line_xy(lua_State *L) // Stack usage [
2936 2957
2937The lua evas map class includes functions for dealing with evas map objects. 2958The lua evas map class includes functions for dealing with evas map objects.
2938The evas map objects must have been previously created by lua using the lua 2959The evas map objects must have been previously created by lua using the lua
2939map object creation function edje:map(). 2960map object creation function edje:map(). The evas map system is complex, rather
2961than repeat the copious documentation here, please refer to the evas map
2962documentation. It has pictures and everything. B-)
2940 2963
2941In the following, "map_object" is a place holder for any lua variable that 2964In the following, "map_object" is a place holder for any lua variable that
2942holds a reference to an evas map object. 2965holds a reference to an evas map object.
@@ -2980,8 +3003,18 @@ static const struct luaL_reg _elua_evas_map_funcs [] =
2980 3003
2981/** 3004/**
2982@page luaref 3005@page luaref
2983@subsubsection map_alpha map_object:alpha() 3006@subsubsection map_alpha map_object:alpha(alpha)
3007
3008Get (and optionally set) the maps alpha mode.
3009
3010Wraps evas_map_alpha_set().
2984 3011
3012@param alpha The alpha mode.
3013
3014Note that the argument is optional, without it this function just queries the
3015current value.
3016
3017@return A boolean reflecting the alpha mode.
2985 3018
2986@since 1.1.0 3019@since 1.1.0
2987*/ 3020*/
@@ -3008,6 +3041,11 @@ _elua_map_alpha(lua_State *L) // Stack usage [
3008@page luaref 3041@page luaref
3009@subsubsection map_clockwise map_object:clockwise() 3042@subsubsection map_clockwise map_object:clockwise()
3010 3043
3044Get the maps clockwise state.
3045
3046Wraps evas_map_util_clockwise_get().
3047
3048@return A boolean reflecting if the map is clockwise or not.
3011 3049
3012@since 1.1.0 3050@since 1.1.0
3013*/ 3051*/
@@ -3025,8 +3063,30 @@ _elua_map_clockwise(lua_State *L) // Stack usage [
3025 3063
3026/** 3064/**
3027@page luaref 3065@page luaref
3028@subsubsection map_colour map_object:colour() 3066@subsubsection map_colour map_object:colour(index, r, g, b, a)
3029 3067
3068Gets or sets colour information for the map. There are two variations, with or
3069without the index. With the index parameter it gets (and optionally sets) the
3070colour of the point the index refers to, without it sets the colour for the
3071entire map.
3072
3073Wraps evas_map_point_color_set() or evas_map_util_points_color_set()
3074
3075@param index Which point to change the colour of.
3076@param r The new red value.
3077@param g The new green value.
3078@param b The new blue value.
3079@param a The new alpha value.
3080
3081Note that the arguments are optional, without them this function just queries
3082the current values. The colour arguments can be separate values, or named
3083fields in a table.
3084
3085@return A table with these fields:
3086 - integer r: The red value.
3087 - integer g: The green value.
3088 - integer b: The blue value.
3089 - integer a: The alpha value.
3030 3090
3031@since 1.1.0 3091@since 1.1.0
3032*/ 3092*/
@@ -3073,8 +3133,24 @@ _elua_map_colour(lua_State *L) // Stack usage [
3073 3133
3074/** 3134/**
3075@page luaref 3135@page luaref
3076@subsubsection map_coord map_object:coord() 3136@subsubsection map_coord map_object:coord(index, x, y, z)
3137
3138Gets (and optionally sets) the 3D coordinates of a point on the map.
3139
3140Wraps evas_map_point_coord_set().
3141
3142@param x The x coordinate of the point.
3143@param y The y coordinate of the point.
3144@param z The z coordinate of the point.
3145
3146Note that the arguments are optional, without them this function just queries
3147the current values. The coordinate arguments can be separate values, or named
3148fields in a table.
3077 3149
3150@return A table with these fields:
3151 - integer x: The x coordinate of the point.
3152 - integer y: The y coordinate of the point.
3153 - integer z: The z coordinate of the point.
3078 3154
3079@since 1.1.0 3155@since 1.1.0
3080*/ 3156*/
@@ -3104,8 +3180,21 @@ _elua_map_coord(lua_State *L) // Stack usage [
3104 3180
3105/** 3181/**
3106@page luaref 3182@page luaref
3107@subsubsection map_lighting map_object:lighting() 3183@subsubsection map_lighting map_object:lighting(x, y, z, r, g, b, ar, ag, ab)
3184
3185Set the 3D lights for the map. The three triplets can be tables.
3108 3186
3187Wraps evas_map_util_3d_lighting().
3188
3189@param x The x coordinate of the light point.
3190@param y The y coordinate of the light point.
3191@param z The z coordinate of the light point.
3192@param r The new red value of the light point.
3193@param g The new green value of the light point.
3194@param b The new blue value of the light point.
3195@param ar The new red value of the ambient light.
3196@param ag The new green value of the ambient light.
3197@param ab The new blue value of the ambient light.
3109 3198
3110@since 1.1.0 3199@since 1.1.0
3111*/ 3200*/
@@ -3133,8 +3222,18 @@ _elua_map_lighting(lua_State *L) // Stack usage [
3133 3222
3134/** 3223/**
3135@page luaref 3224@page luaref
3136@subsubsection map_perspective map_object:perspective() 3225@subsubsection map_perspective map_object:perspective(x, y, z, f)
3226
3227Apply a perspective transform to the map.
3228
3229Wraps evas_map_util_3d_perspective().
3137 3230
3231The arguments can be separate values, or named fields in a table.
3232
3233@param x The perspective distance X coordinate
3234@param y The perspective distance Y coordinate
3235@param z The "0" z plane value
3236@param f The focal distance
3138 3237
3139@since 1.1.0 3238@since 1.1.0
3140*/ 3239*/
@@ -3156,8 +3255,28 @@ _elua_map_perspective(lua_State *L) // Stack usage [
3156 3255
3157/** 3256/**
3158@page luaref 3257@page luaref
3159@subsubsection map_populate map_object:populate() 3258@subsubsection map_populate map_object:populate(...)
3259
3260Populate the points in a map, in one of three different methods.
3261
32621) Wraps evas_map_util_points_populate_from_object().
3263
3264@param source An evas object to copy points from.
3265
32662) Wraps evas_map_util_paints_populate_from_object_full().
3267
3268@param source An evas object to copy points from.
3269@param z Common Z coordinate hint for all four points.
3160 3270
32713) Wraps evas_map_util_points_populate_from_geometry().
3272
3273The first four arguments can be separate values, or named fields in a table.
3274
3275@param x Point X coordinate
3276@param y Point Y coordinate
3277@param w Width to use to calculate second and third points.
3278@param h Height to use to calculate third and fourth points.
3279@param z Common Z coordinate hint for all four points.
3161 3280
3162@since 1.1.0 3281@since 1.1.0
3163*/ 3282*/
@@ -3210,8 +3329,17 @@ _elua_map_populate(lua_State *L) // Stack usage [
3210 3329
3211/** 3330/**
3212@page luaref 3331@page luaref
3213@subsubsection map_rotate map_object:rotate() 3332@subsubsection map_rotate map_object:rotate(degrees, x, y)
3333
3334Rotate the maps coordinates in 2D.
3214 3335
3336Wraps evas_map_util_rotate().
3337
3338The coordinates can be separate values, or named fields in a table.
3339
3340@param degrees Amount of degrees from 0.0 to 360.0 to rotate.
3341@param x Rotation's centre horizontal position.
3342@param y Rotation's centre vertical position.
3215 3343
3216@since 1.1.0 3344@since 1.1.0
3217*/ 3345*/
@@ -3238,8 +3366,21 @@ _elua_map_rotate(lua_State *L) // Stack usage [
3238 3366
3239/** 3367/**
3240@page luaref 3368@page luaref
3241@subsubsection map_rotate3d map_object:rotate3d() 3369@subsubsection map_rotate3d map_object:rotate3d(dx, dy, dz, x, y, z)
3370
3371Rotate the maps coordinates in 3D.
3242 3372
3373Wraps evas_map_util_3d_rotate().
3374
3375The coordinates can be separate values, or named fields in a table. The same
3376with the rotation.
3377
3378@param dx Amount of degrees from 0.0 to 360.0 to rotate around X axis.
3379@param dy Amount of degrees from 0.0 to 360.0 to rotate around Y axis.
3380@param dz Amount of degrees from 0.0 to 360.0 to rotate around Z axis.
3381@param x Rotation's centre horizontal position.
3382@param y Rotation's centre vertical position.
3383@param z Rotation's centre vertical position.
3243 3384
3244@since 1.1.0 3385@since 1.1.0
3245*/ 3386*/
@@ -3265,8 +3406,18 @@ _elua_map_rotate3d(lua_State *L) // Stack usage [
3265 3406
3266/** 3407/**
3267@page luaref 3408@page luaref
3268@subsubsection map_smooth map_object:smooth() 3409@subsubsection map_smooth map_object:smooth(smooth)
3410
3411Get (and optionally set) the maps smooth mode.
3412
3413Wraps evas_map_smooth_set().
3414
3415@param smooth The smooth mode.
3416
3417Note that the argument is optional, without it this function just queries the
3418current value.
3269 3419
3420@return A boolean reflecting the smooth mode.
3270 3421
3271@since 1.1.0 3422@since 1.1.0
3272*/ 3423*/
@@ -3291,8 +3442,23 @@ _elua_map_smooth(lua_State *L) // Stack usage [
3291 3442
3292/** 3443/**
3293@page luaref 3444@page luaref
3294@subsubsection map_uv map_object:uv() 3445@subsubsection map_uv map_object:uv(index, u, v)
3446
3447Gets (and optionally sets) the texture U and V texture coordinates for this map.
3448
3449Wraps evas_map_point_image_uv_set().
3450
3451@param index Index of the point to change. Must be smaller than map size.
3452@param u The X coordinate within the image/texture source.
3453@param v The Y coordinate within the image/texture source.
3454
3455Note that the U,V arguments are optional, without them this function just queries
3456the current values. The coordinate arguments can be separate values, or named
3457fields in a table.
3295 3458
3459@return A table with these fields:
3460 - number u: The X coordinate within the image/texture source.
3461 - number v: The Y coordinate within the image/texture source.
3296 3462
3297@since 1.1.0 3463@since 1.1.0
3298*/ 3464*/
@@ -3322,8 +3488,18 @@ _elua_map_uv(lua_State *L) // Stack usage [
3322 3488
3323/** 3489/**
3324@page luaref 3490@page luaref
3325@subsubsection map_zoom map_object:zoom() 3491@subsubsection map_zoom map_object:zoom(x, y, x, y)
3492
3493Apply a zoom to the map.
3494
3495Wraps evas_map_util_zoom().
3326 3496
3497The arguments can be two separate values, or named fields in a table.
3498
3499@param x The horizontal zoom amount.
3500@param y The vertical zoom amount.
3501@param x The X coordinate of the centre of the zoom.
3502@param y The Y coordinate of the centre of the zoom.
3327 3503
3328@since 1.1.0 3504@since 1.1.0
3329*/ 3505*/
@@ -3530,7 +3706,7 @@ _elua_text_font(lua_State *L) // Stack usage [
3530@page luaref 3706@page luaref
3531@subsubsection text_text text_object:text(text) 3707@subsubsection text_text text_object:text(text)
3532 3708
3533Get (and optionally set) the actual tetx for this text object. 3709Get (and optionally set) the actual text for this text object.
3534 3710
3535Wraps evas_object_text_text_set(). 3711Wraps evas_object_text_text_set().
3536 3712
@@ -3569,25 +3745,80 @@ _elua_text_text(lua_State *L) // Stack usage [
3569 3745
3570 3746
3571//--------------------------------------------------------------------------// 3747//--------------------------------------------------------------------------//
3748
3749// A metatable and functions so that calling non existant API does not crash Lua scripts.
3750
3751static int _elua_bogan_nilfunc(lua_State *L);
3752static int _elua_bogan_index(lua_State *L);
3753
3754static const struct luaL_reg _elua_bogan_funcs [] =
3755{
3756 {"nilfunc", _elua_bogan_nilfunc}, // Just return a nil.
3757 {"__index", _elua_bogan_index}, // Return the above func.
3758
3759 {NULL, NULL} // end
3760};
3761
3762static int
3763_elua_bogan_nilfunc(lua_State *L)
3764{
3765 lua_getglobal(L, "nil");
3766 return 1;
3767}
3768
3769static int
3770_elua_bogan_index(lua_State *L)
3771{
3772 const char *key;
3773
3774 key = lua_tostring(L, 2);
3775 LE("%s does not exist!", key);
3776 lua_pushcfunction(L, _elua_bogan_nilfunc);
3777 return 1;
3778}
3779
3780static void
3781_elua_bogan_protect(lua_State *L) // Stack usage [-3, +3, m]
3782{
3783 lua_pushnil(L); // Stack usage [-0, +1, -]
3784 luaL_newmetatable(L, "bogan"); // Stack usage [-0, +1, m]
3785 luaL_register(L, 0, _elua_bogan_funcs); // Stack usage [-1, +1, m]
3786 lua_setmetatable(L, -2); // Stack usage [-1, +0, -]
3787 lua_pop(L, 1); // Stack usage [-1, +0, -]
3788}
3789
3790//--------------------------------------------------------------------------//
3791
3572// Brain dead inheritance thingy, built for speed. Kinda. Part 1. 3792// Brain dead inheritance thingy, built for speed. Kinda. Part 1.
3573static void 3793static void
3574_elua_add_functions(lua_State *L, const char *api, const luaL_Reg *funcs, const char *meta, const char *parent, const char *base) // Stack usage [-3, +5, m] if inheriting [-6, +11, em] 3794_elua_add_functions(lua_State *L, const char *api, const luaL_Reg *funcs, const char *meta, const char *parent, const char *base) // Stack usage [-3, +5, m] if inheriting [-6, +11, em]
3575{ 3795{
3796 // Create an api table, fill it full of the methods.
3576 luaL_register(L, api, funcs); // Stack usage [-0, +1, m] 3797 luaL_register(L, api, funcs); // Stack usage [-0, +1, m]
3798 // Set the api metatable to the bogan metatable.
3799 luaL_getmetatable(L, "bogan"); // Stack usage [-0, +1, -]
3800 lua_setmetatable(L, -2); // Stack usage [-1, +0, -]
3801 // Creat a meta metatable.
3577 luaL_newmetatable(L, meta); // Stack usage [-0, +1, m] 3802 luaL_newmetatable(L, meta); // Stack usage [-0, +1, m]
3803 // Put the gc functions in the metatable.
3578 luaL_register(L, 0, _elua_edje_gc_funcs); // Stack usage [-1, +1, m] 3804 luaL_register(L, 0, _elua_edje_gc_funcs); // Stack usage [-1, +1, m]
3805 // Create an __index entry in the metatable, make it point to the api table.
3579 lua_pushliteral(L, "__index"); // Stack usage [-0, +1, m] 3806 lua_pushliteral(L, "__index"); // Stack usage [-0, +1, m]
3580 lua_pushvalue(L, -3); // Stack usage [-0, +1, -] 3807 lua_pushvalue(L, -3); // Stack usage [-0, +1, -]
3581 lua_rawset(L, -3); // Stack usage [-2, +0, m] 3808 lua_rawset(L, -3); // Stack usage [-2, +0, m]
3809 // Later this metatable is used as the metatable for newly created objects of this class.
3582 3810
3583 if (base && parent) 3811 if (base && parent)
3584 { 3812 {
3585 // Inherit from base 3813 // Inherit from base
3586 lua_getglobal(L, base); // Stack usage [-0, +1, e] 3814 lua_getglobal(L, base); // Stack usage [-0, +1, e]
3815 // Create a new parent metatable.
3587 luaL_newmetatable(L, parent); // Stack usage [-0, +1, m] 3816 luaL_newmetatable(L, parent); // Stack usage [-0, +1, m]
3817 // Create an __index entry in the metatable, make it point to the base table.
3588 lua_pushliteral(L, "__index"); // Stack usage [-0, +1, m] 3818 lua_pushliteral(L, "__index"); // Stack usage [-0, +1, m]
3589 lua_pushvalue(L, -3); // Stack usage [-0, +1, -] 3819 lua_pushvalue(L, -3); // Stack usage [-0, +1, -]
3590 lua_rawset(L, -3); // Stack usage [-2, +0, m] 3820 lua_rawset(L, -3); // Stack usage [-2, +0, m]
3821 // Set the metatable for the api table to the parent metatable.
3591 lua_getglobal(L, api); // Stack usage [-0, +1, e] 3822 lua_getglobal(L, api); // Stack usage [-0, +1, e]
3592 luaL_getmetatable(L, parent); // Stack usage [-0, +1, -] 3823 luaL_getmetatable(L, parent); // Stack usage [-0, +1, -]
3593 lua_setmetatable(L, -2); // Stack usage [-1, +0, -] 3824 lua_setmetatable(L, -2); // Stack usage [-1, +0, -]
@@ -3695,7 +3926,11 @@ _edje_lua2_script_init(Edje *ed) // Stack usage
3695 lua_call(L, 1, 0); // Stack usage [-2, +0, m] 3926 lua_call(L, 1, 0); // Stack usage [-2, +0, m]
3696 } 3927 }
3697 3928
3929 _elua_bogan_protect(L); // Stack usage [+3, -3, m]
3930
3698 luaL_register(L, _elua_edje_api, _elua_edje_funcs); // Stack usage [-0, +1, m] 3931 luaL_register(L, _elua_edje_api, _elua_edje_funcs); // Stack usage [-0, +1, m]
3932 luaL_getmetatable(L, "bogan"); // Stack usage [-0, +1, -]
3933 lua_setmetatable(L, -2); // Stack usage [-1, +0, -]
3699 luaL_newmetatable(L, _elua_edje_meta); // Stack usage [-0, +1, m] 3934 luaL_newmetatable(L, _elua_edje_meta); // Stack usage [-0, +1, m]
3700 luaL_register(L, 0, _elua_edje_gc_funcs); // Stack usage [-1, +1, m] 3935 luaL_register(L, 0, _elua_edje_gc_funcs); // Stack usage [-1, +1, m]
3701 3936
@@ -3737,6 +3972,8 @@ _edje_lua2_script_init(Edje *ed) // Stack usage
3737 { 3972 {
3738 int err; 3973 int err;
3739 3974
3975 /* This ends up pushing a function onto the stack for the lua_pcall() below to use.
3976 * The function is the compiled code. */
3740 err = luaL_loadbuffer(L, data, size, "edje_lua_script"); // Stack usage [-0, +1, m] 3977 err = luaL_loadbuffer(L, data, size, "edje_lua_script"); // Stack usage [-0, +1, m]
3741 if (err) 3978 if (err)
3742 { 3979 {
diff --git a/libraries/edje/src/lib/edje_main.c b/libraries/edje/src/lib/edje_main.c
index cf443c7..5d011ad 100644
--- a/libraries/edje/src/lib/edje_main.c
+++ b/libraries/edje/src/lib/edje_main.c
@@ -22,10 +22,7 @@ edje_init(void)
22 srand(time(NULL)); 22 srand(time(NULL));
23 23
24 if (!eina_init()) 24 if (!eina_init())
25 { 25 return --_edje_init_count;
26 fprintf(stderr, "Edje: Eina init failed");
27 return --_edje_init_count;
28 }
29 26
30 _edje_default_log_dom = eina_log_domain_register 27 _edje_default_log_dom = eina_log_domain_register
31 ("edje", EDJE_DEFAULT_LOG_COLOR); 28 ("edje", EDJE_DEFAULT_LOG_COLOR);
diff --git a/libraries/edje/src/lib/edje_message_queue.c b/libraries/edje/src/lib/edje_message_queue.c
index 1a313a5..5628ccc 100644
--- a/libraries/edje/src/lib/edje_message_queue.c
+++ b/libraries/edje/src/lib/edje_message_queue.c
@@ -364,8 +364,8 @@ _edje_message_propornot_send(Edje *ed, Edje_Queue queue, Edje_Message_Type type,
364 } 364 }
365 if (_injob > 0) 365 if (_injob > 0)
366 { 366 {
367 if (_job_loss_timer) ecore_timer_del(_job_loss_timer); 367 if (!_job_loss_timer)
368 _job_loss_timer = ecore_timer_add(0.001, _edje_job_loss_timer, NULL); 368 _job_loss_timer = ecore_timer_add(0.001, _edje_job_loss_timer, NULL);
369 } 369 }
370 else 370 else
371 { 371 {
diff --git a/libraries/edje/src/lib/edje_module.c b/libraries/edje/src/lib/edje_module.c
index effcee1..358295b 100644
--- a/libraries/edje/src/lib/edje_module.c
+++ b/libraries/edje/src/lib/edje_module.c
@@ -136,12 +136,12 @@ edje_available_modules_get(void)
136 136
137 snprintf(tmp, sizeof (tmp), "%s/%s/" EDJE_MODULE_NAME, info->path, MODULE_ARCH 137 snprintf(tmp, sizeof (tmp), "%s/%s/" EDJE_MODULE_NAME, info->path, MODULE_ARCH
138#ifdef EDJE_EXTRA_MODULE_NAME 138#ifdef EDJE_EXTRA_MODULE_NAME
139 , ecore_file_file_get(info->path) 139 , info->path + info->name_start
140#endif 140#endif
141 ); 141 );
142 142
143 if (ecore_file_exists(tmp)) 143 if (ecore_file_exists(tmp))
144 result = eina_list_append(result, eina_stringshare_add(ecore_file_file_get(info->path))); 144 result = eina_list_append(result, eina_stringshare_add(info->path + info->name_start));
145 } 145 }
146 146
147 eina_iterator_free(it); 147 eina_iterator_free(it);
diff --git a/libraries/edje/src/lib/edje_multisense.c b/libraries/edje/src/lib/edje_multisense.c
index f9c7f91..f3324e7 100644
--- a/libraries/edje/src/lib/edje_multisense.c
+++ b/libraries/edje/src/lib/edje_multisense.c
@@ -351,8 +351,10 @@ _edje_multisense_internal_sound_sample_play(Edje *ed, const char *sample_name, c
351 command.type.sample.speed = speed; 351 command.type.sample.speed = speed;
352 size = write(command_pipe[1], &command, sizeof(command)); 352 size = write(command_pipe[1], &command, sizeof(command));
353#else 353#else
354 ed = NULL; // warning shh 354 // warning shh
355 if (speed > 0) sample_name = NULL; // warning shh 355 (void) ed;
356 (void) sample_name;
357 (void) speed;
356#endif 358#endif
357 return (size == sizeof(Edje_Multisense_Sound_Action)); 359 return (size == sizeof(Edje_Multisense_Sound_Action));
358} 360}
@@ -371,8 +373,10 @@ _edje_multisense_internal_sound_tone_play(Edje *ed, const char *tone_name, const
371 command.type.tone.duration = duration; 373 command.type.tone.duration = duration;
372 size = write(command_pipe[1], &command, sizeof(command)); 374 size = write(command_pipe[1], &command, sizeof(command));
373#else 375#else
374 ed = NULL; // warning shh 376 // warning shh
375 if (duration > 0) tone_name = NULL; // warning shh 377 (void) ed;
378 (void) duration;
379 (void) tone_name;
376#endif 380#endif
377 return (size == sizeof(Edje_Multisense_Sound_Action)); 381 return (size == sizeof(Edje_Multisense_Sound_Action));
378 382
diff --git a/libraries/edje/src/lib/edje_private.h b/libraries/edje/src/lib/edje_private.h
index cbb3e03..8bf18eb 100644
--- a/libraries/edje/src/lib/edje_private.h
+++ b/libraries/edje/src/lib/edje_private.h
@@ -192,7 +192,8 @@ typedef enum
192 EDJE_ASPECT_PREFER_NONE, 192 EDJE_ASPECT_PREFER_NONE,
193 EDJE_ASPECT_PREFER_VERTICAL, 193 EDJE_ASPECT_PREFER_VERTICAL,
194 EDJE_ASPECT_PREFER_HORIZONTAL, 194 EDJE_ASPECT_PREFER_HORIZONTAL,
195 EDJE_ASPECT_PREFER_BOTH 195 EDJE_ASPECT_PREFER_BOTH,
196 EDJE_ASPECT_PREFER_SOURCE
196} Edje_Internal_Aspect; 197} Edje_Internal_Aspect;
197 198
198struct _Edje_Perspective 199struct _Edje_Perspective
@@ -232,7 +233,7 @@ struct _Edje_Color
232struct _Edje_Aspect_Prefer 233struct _Edje_Aspect_Prefer
233{ 234{
234 FLOAT_T min, max; 235 FLOAT_T min, max;
235 Edje_Internal_Aspect prefer; 236 char prefer;
236}; 237};
237 238
238struct _Edje_Aspect 239struct _Edje_Aspect
@@ -834,6 +835,11 @@ struct _Edje_Part_Description_Common
834 unsigned char w, h; /* width or height is fixed in side (cannot expand with Edje object size) */ 835 unsigned char w, h; /* width or height is fixed in side (cannot expand with Edje object size) */
835 } fixed; 836 } fixed;
836 837
838 struct { // only during recalc
839 unsigned char have;
840 FLOAT_T w, h;
841 } minmul;
842
837 Edje_Size min, max; 843 Edje_Size min, max;
838 Edje_Position step; /* size stepping by n pixels, 0 = none */ 844 Edje_Position step; /* size stepping by n pixels, 0 = none */
839 Edje_Aspect_Prefer aspect; 845 Edje_Aspect_Prefer aspect;
@@ -1138,6 +1144,7 @@ struct _Edje
1138 unsigned int all_part_change : 1; 1144 unsigned int all_part_change : 1;
1139#endif 1145#endif
1140 unsigned int have_mapped_part : 1; 1146 unsigned int have_mapped_part : 1;
1147 unsigned int recalc_call : 1;
1141}; 1148};
1142 1149
1143struct _Edje_Calc_Params 1150struct _Edje_Calc_Params
@@ -1915,7 +1922,7 @@ void _edje_entry_cursor_line_end(Edje_Real_Part *rp, Edje_Cursor cur);
1915Eina_Bool _edje_entry_cursor_coord_set(Edje_Real_Part *rp, Edje_Cursor cur, int x, int y); 1922Eina_Bool _edje_entry_cursor_coord_set(Edje_Real_Part *rp, Edje_Cursor cur, int x, int y);
1916Eina_Bool _edje_entry_cursor_is_format_get(Edje_Real_Part *rp, Edje_Cursor cur); 1923Eina_Bool _edje_entry_cursor_is_format_get(Edje_Real_Part *rp, Edje_Cursor cur);
1917Eina_Bool _edje_entry_cursor_is_visible_format_get(Edje_Real_Part *rp, Edje_Cursor cur); 1924Eina_Bool _edje_entry_cursor_is_visible_format_get(Edje_Real_Part *rp, Edje_Cursor cur);
1918const char *_edje_entry_cursor_content_get(Edje_Real_Part *rp, Edje_Cursor cur); 1925char *_edje_entry_cursor_content_get(Edje_Real_Part *rp, Edje_Cursor cur);
1919void _edje_entry_cursor_pos_set(Edje_Real_Part *rp, Edje_Cursor cur, int pos); 1926void _edje_entry_cursor_pos_set(Edje_Real_Part *rp, Edje_Cursor cur, int pos);
1920int _edje_entry_cursor_pos_get(Edje_Real_Part *rp, Edje_Cursor cur); 1927int _edje_entry_cursor_pos_get(Edje_Real_Part *rp, Edje_Cursor cur);
1921void _edje_entry_input_panel_layout_set(Edje_Real_Part *rp, Edje_Input_Panel_Layout layout); 1928void _edje_entry_input_panel_layout_set(Edje_Real_Part *rp, Edje_Input_Panel_Layout layout);
diff --git a/libraries/edje/src/lib/edje_program.c b/libraries/edje/src/lib/edje_program.c
index 505b6a2..d80c7c9 100644
--- a/libraries/edje/src/lib/edje_program.c
+++ b/libraries/edje/src/lib/edje_program.c
@@ -992,7 +992,7 @@ _edje_emit_full(Edje *ed, const char *sig, const char *src, void *data, void (*f
992 break ; 992 break ;
993 993
994 default: 994 default:
995 fprintf(stderr, "SPANK SPANK SPANK !!!\nYou should never be here !\n"); 995 ERR("SPANK SPANK SPANK !!!\nYou should never be here !");
996 break; 996 break;
997 } 997 }
998 } 998 }
@@ -1621,6 +1621,7 @@ _edje_param_native_set(Edje_Real_Part *rp, const char *name, const Edje_External
1621 if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) 1621 if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
1622 return EINA_FALSE; 1622 return EINA_FALSE;
1623 rp->drag->size.x = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0)); 1623 rp->drag->size.x = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
1624 rp->edje->recalc_call = 1;
1624 rp->edje->dirty = 1; 1625 rp->edje->dirty = 1;
1625#ifdef EDJE_CALC_CACHE 1626#ifdef EDJE_CALC_CACHE
1626 rp->invalidate = 1; 1627 rp->invalidate = 1;
@@ -1633,6 +1634,7 @@ _edje_param_native_set(Edje_Real_Part *rp, const char *name, const Edje_External
1633 if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) 1634 if (param->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
1634 return EINA_FALSE; 1635 return EINA_FALSE;
1635 rp->drag->size.y = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0)); 1636 rp->drag->size.y = FROM_DOUBLE(CLAMP(param->d, 0.0, 1.0));
1637 rp->edje->recalc_call = 1;
1636 rp->edje->dirty = 1; 1638 rp->edje->dirty = 1;
1637#ifdef EDJE_CALC_CACHE 1639#ifdef EDJE_CALC_CACHE
1638 rp->invalidate = 1; 1640 rp->invalidate = 1;
diff --git a/libraries/edje/src/lib/edje_util.c b/libraries/edje/src/lib/edje_util.c
index dbb37a7..2205ba3 100644
--- a/libraries/edje/src/lib/edje_util.c
+++ b/libraries/edje/src/lib/edje_util.c
@@ -438,6 +438,7 @@ edje_color_class_set(const char *color_class, int r, int g, int b, int a, int r2
438 438
439 ed = eina_list_data_get(members); 439 ed = eina_list_data_get(members);
440 ed->dirty = 1; 440 ed->dirty = 1;
441 ed->recalc_call = 1;
441#ifdef EDJE_CALC_CACHE 442#ifdef EDJE_CALC_CACHE
442 ed->all_part_change = 1; 443 ed->all_part_change = 1;
443#endif 444#endif
@@ -504,6 +505,7 @@ edje_color_class_del(const char *color_class)
504 505
505 ed = eina_list_data_get(members); 506 ed = eina_list_data_get(members);
506 ed->dirty = 1; 507 ed->dirty = 1;
508 ed->recalc_call = 1;
507#ifdef EDJE_CALC_CACHE 509#ifdef EDJE_CALC_CACHE
508 ed->all_part_change = 1; 510 ed->all_part_change = 1;
509#endif 511#endif
@@ -583,6 +585,7 @@ edje_object_color_class_set(Evas_Object *obj, const char *color_class, int r, in
583 cc->b3 = b3; 585 cc->b3 = b3;
584 cc->a3 = a3; 586 cc->a3 = a3;
585 ed->dirty = 1; 587 ed->dirty = 1;
588 ed->recalc_call = 1;
586#ifdef EDJE_CALC_CACHE 589#ifdef EDJE_CALC_CACHE
587 ed->all_part_change = 1; 590 ed->all_part_change = 1;
588#endif 591#endif
@@ -611,6 +614,7 @@ edje_object_color_class_set(Evas_Object *obj, const char *color_class, int r, in
611 cc->a3 = a3; 614 cc->a3 = a3;
612 ed->color_classes = eina_list_append(ed->color_classes, cc); 615 ed->color_classes = eina_list_append(ed->color_classes, cc);
613 ed->dirty = 1; 616 ed->dirty = 1;
617 ed->recalc_call = 1;
614#ifdef EDJE_CALC_CACHE 618#ifdef EDJE_CALC_CACHE
615 ed->all_part_change = 1; 619 ed->all_part_change = 1;
616#endif 620#endif
@@ -693,6 +697,7 @@ edje_object_color_class_del(Evas_Object *obj, const char *color_class)
693 } 697 }
694 698
695 ed->dirty = 1; 699 ed->dirty = 1;
700 ed->recalc_call = 1;
696#ifdef EDJE_CALC_CACHE 701#ifdef EDJE_CALC_CACHE
697 ed->all_part_change = 1; 702 ed->all_part_change = 1;
698#endif 703#endif
@@ -752,6 +757,7 @@ edje_text_class_set(const char *text_class, const char *font, Evas_Font_Size siz
752 757
753 ed = eina_list_data_get(members); 758 ed = eina_list_data_get(members);
754 ed->dirty = 1; 759 ed->dirty = 1;
760 ed->recalc_call = 1;
755 _edje_textblock_style_all_update(ed); 761 _edje_textblock_style_all_update(ed);
756#ifdef EDJE_CALC_CACHE 762#ifdef EDJE_CALC_CACHE
757 ed->text_part_change = 1; 763 ed->text_part_change = 1;
@@ -847,6 +853,7 @@ edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char
847 853
848 /* Update edje */ 854 /* Update edje */
849 ed->dirty = 1; 855 ed->dirty = 1;
856 ed->recalc_call = 1;
850#ifdef EDJE_CALC_CACHE 857#ifdef EDJE_CALC_CACHE
851 ed->text_part_change = 1; 858 ed->text_part_change = 1;
852#endif 859#endif
@@ -881,6 +888,7 @@ edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char
881 /* Add to edje's text class list */ 888 /* Add to edje's text class list */
882 ed->text_classes = eina_list_append(ed->text_classes, tc); 889 ed->text_classes = eina_list_append(ed->text_classes, tc);
883 ed->dirty = 1; 890 ed->dirty = 1;
891 ed->recalc_call = 1;
884#ifdef EDJE_CALC_CACHE 892#ifdef EDJE_CALC_CACHE
885 ed->text_part_change = 1; 893 ed->text_part_change = 1;
886#endif 894#endif
@@ -1005,6 +1013,7 @@ _edje_object_part_text_raw_set(Evas_Object *obj, Edje_Real_Part *rp, const char
1005 else 1013 else
1006 if (text) rp->text.text = eina_stringshare_add(text); 1014 if (text) rp->text.text = eina_stringshare_add(text);
1007 rp->edje->dirty = 1; 1015 rp->edje->dirty = 1;
1016 rp->edje->recalc_call = 1;
1008#ifdef EDJE_CALC_CACHE 1017#ifdef EDJE_CALC_CACHE
1009 rp->invalidate = 1; 1018 rp->invalidate = 1;
1010#endif 1019#endif
@@ -1039,6 +1048,7 @@ _edje_object_part_text_raw_append(Evas_Object *obj, Edje_Real_Part *rp, const ch
1039 } 1048 }
1040 } 1049 }
1041 rp->edje->dirty = 1; 1050 rp->edje->dirty = 1;
1051 rp->edje->recalc_call = 1;
1042#ifdef EDJE_CALC_CACHE 1052#ifdef EDJE_CALC_CACHE
1043 rp->invalidate = 1; 1053 rp->invalidate = 1;
1044#endif 1054#endif
@@ -1307,6 +1317,7 @@ edje_object_part_text_insert(Evas_Object *obj, const char *part, const char *tex
1307 if (rp->part->entry_mode <= EDJE_ENTRY_EDIT_MODE_NONE) return; 1317 if (rp->part->entry_mode <= EDJE_ENTRY_EDIT_MODE_NONE) return;
1308 _edje_entry_text_markup_insert(rp, text); 1318 _edje_entry_text_markup_insert(rp, text);
1309 rp->edje->dirty = 1; 1319 rp->edje->dirty = 1;
1320 rp->edje->recalc_call = 1;
1310#ifdef EDJE_CALC_CACHE 1321#ifdef EDJE_CALC_CACHE
1311 rp->invalidate = 1; 1322 rp->invalidate = 1;
1312#endif 1323#endif
@@ -1328,6 +1339,7 @@ edje_object_part_text_append(Evas_Object *obj, const char *part, const char *tex
1328 if ((rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) return; 1339 if ((rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) return;
1329 _edje_object_part_text_raw_append(obj, rp, part, text); 1340 _edje_object_part_text_raw_append(obj, rp, part, text);
1330 rp->edje->dirty = 1; 1341 rp->edje->dirty = 1;
1342 rp->edje->recalc_call = 1;
1331#ifdef EDJE_CALC_CACHE 1343#ifdef EDJE_CALC_CACHE
1332 rp->invalidate = 1; 1344 rp->invalidate = 1;
1333#endif 1345#endif
@@ -1675,7 +1687,7 @@ edje_object_part_text_cursor_is_visible_format_get(const Evas_Object *obj, const
1675 return 0; 1687 return 0;
1676} 1688}
1677 1689
1678EAPI const char * 1690EAPI char *
1679edje_object_part_text_cursor_content_get(const Evas_Object *obj, const char *part, Edje_Cursor cur) 1691edje_object_part_text_cursor_content_get(const Evas_Object *obj, const char *part, Edje_Cursor cur)
1680{ 1692{
1681 Edje *ed; 1693 Edje *ed;
@@ -1908,6 +1920,13 @@ edje_object_part_swallow(Evas_Object *obj, const char *part, Evas_Object *obj_sw
1908 // XXX: by Sachiel, January 21th 2009, 19:30 UTC 1920 // XXX: by Sachiel, January 21th 2009, 19:30 UTC
1909 _edje_recalc_do(ed); 1921 _edje_recalc_do(ed);
1910 1922
1923 rp = evas_object_data_get(obj_swallow, "\377 edje.swallowing_part");
1924 if (rp)
1925 {
1926 /* The object is already swallowed somewhere, unswallow it first */
1927 edje_object_part_unswallow(rp->edje->obj, obj_swallow);
1928 }
1929
1911 rp = _edje_real_part_recursive_get(ed, (char *)part); 1930 rp = _edje_real_part_recursive_get(ed, (char *)part);
1912 if (!rp) return EINA_FALSE; 1931 if (!rp) return EINA_FALSE;
1913 if (rp->part->type != EDJE_PART_TYPE_SWALLOW) 1932 if (rp->part->type != EDJE_PART_TYPE_SWALLOW)
@@ -1929,6 +1948,7 @@ _recalc_extern_parent(Evas_Object *obj)
1929 ed = _edje_fetch(parent); 1948 ed = _edje_fetch(parent);
1930 1949
1931 ed->dirty = 1; 1950 ed->dirty = 1;
1951 ed->recalc_call = 1; // ZZZ: ???
1932 _edje_recalc(ed); 1952 _edje_recalc(ed);
1933} 1953}
1934 1954
@@ -2110,11 +2130,7 @@ _edje_box_layout_external_new(const char *name, Evas_Object_Box_Layout func, voi
2110 2130
2111 name_len = strlen(name) + 1; 2131 name_len = strlen(name) + 1;
2112 l = malloc(sizeof(Edje_Box_Layout) + name_len); 2132 l = malloc(sizeof(Edje_Box_Layout) + name_len);
2113 if (!l) 2133 if (!l) return NULL;
2114 {
2115 perror("malloc");
2116 return NULL;
2117 }
2118 2134
2119 l->func = func; 2135 l->func = func;
2120 l->layout_data_get = layout_data_get; 2136 l->layout_data_get = layout_data_get;
@@ -2224,6 +2240,7 @@ edje_object_part_unswallow(Evas_Object *obj __UNUSED__, Evas_Object *obj_swallow
2224 rp->swallow_params.max.w = 0; 2240 rp->swallow_params.max.w = 0;
2225 rp->swallow_params.max.h = 0; 2241 rp->swallow_params.max.h = 0;
2226 rp->edje->dirty = 1; 2242 rp->edje->dirty = 1;
2243 rp->edje->recalc_call = 1;
2227#ifdef EDJE_CALC_CACHE 2244#ifdef EDJE_CALC_CACHE
2228 rp->invalidate = 1; 2245 rp->invalidate = 1;
2229#endif 2246#endif
@@ -2684,6 +2701,7 @@ edje_object_part_drag_size_set(Evas_Object *obj, const char *part, double dw, do
2684 rp->drag->size.x = FROM_DOUBLE(dw); 2701 rp->drag->size.x = FROM_DOUBLE(dw);
2685 rp->drag->size.y = FROM_DOUBLE(dh); 2702 rp->drag->size.y = FROM_DOUBLE(dh);
2686 rp->edje->dirty = 1; 2703 rp->edje->dirty = 1;
2704 rp->edje->recalc_call = 1;
2687#ifdef EDJE_CALC_CACHE 2705#ifdef EDJE_CALC_CACHE
2688 rp->invalidate = 1; 2706 rp->invalidate = 1;
2689#endif 2707#endif
@@ -3018,6 +3036,7 @@ _edje_box_child_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *child __UNUS
3018 Edje_Real_Part *rp = data; 3036 Edje_Real_Part *rp = data;
3019 3037
3020 rp->edje->dirty = 1; 3038 rp->edje->dirty = 1;
3039 rp->edje->recalc_call = 1;
3021#ifdef EDJE_CALC_CACHE 3040#ifdef EDJE_CALC_CACHE
3022 rp->invalidate = 1; 3041 rp->invalidate = 1;
3023#endif 3042#endif
@@ -3031,6 +3050,7 @@ _edje_box_child_add(Edje_Real_Part *rp, Evas_Object *child)
3031 (child, EVAS_CALLBACK_DEL, _edje_box_child_del_cb, rp); 3050 (child, EVAS_CALLBACK_DEL, _edje_box_child_del_cb, rp);
3032 3051
3033 rp->edje->dirty = 1; 3052 rp->edje->dirty = 1;
3053 rp->edje->recalc_call = 1;
3034#ifdef EDJE_CALC_CACHE 3054#ifdef EDJE_CALC_CACHE
3035 rp->invalidate = 1; 3055 rp->invalidate = 1;
3036#endif 3056#endif
@@ -3044,6 +3064,7 @@ _edje_box_child_remove(Edje_Real_Part *rp, Evas_Object *child)
3044 (child, EVAS_CALLBACK_DEL, _edje_box_child_del_cb, rp); 3064 (child, EVAS_CALLBACK_DEL, _edje_box_child_del_cb, rp);
3045 3065
3046 rp->edje->dirty = 1; 3066 rp->edje->dirty = 1;
3067 rp->edje->recalc_call = 1;
3047#ifdef EDJE_CALC_CACHE 3068#ifdef EDJE_CALC_CACHE
3048 rp->invalidate = 1; 3069 rp->invalidate = 1;
3049#endif 3070#endif
@@ -3186,6 +3207,7 @@ _edje_table_child_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *child __UN
3186 Edje_Real_Part *rp = data; 3207 Edje_Real_Part *rp = data;
3187 3208
3188 rp->edje->dirty = 1; 3209 rp->edje->dirty = 1;
3210 rp->edje->recalc_call = 1;
3189#ifdef EDJE_CALC_CACHE 3211#ifdef EDJE_CALC_CACHE
3190 rp->invalidate = 1; 3212 rp->invalidate = 1;
3191#endif 3213#endif
@@ -3199,6 +3221,7 @@ _edje_table_child_add(Edje_Real_Part *rp, Evas_Object *child)
3199 (child, EVAS_CALLBACK_DEL, _edje_table_child_del_cb, rp); 3221 (child, EVAS_CALLBACK_DEL, _edje_table_child_del_cb, rp);
3200 3222
3201 rp->edje->dirty = 1; 3223 rp->edje->dirty = 1;
3224 rp->edje->recalc_call = 1;
3202#ifdef EDJE_CALC_CACHE 3225#ifdef EDJE_CALC_CACHE
3203 rp->invalidate = 1; 3226 rp->invalidate = 1;
3204#endif 3227#endif
@@ -3212,6 +3235,7 @@ _edje_table_child_remove(Edje_Real_Part *rp, Evas_Object *child)
3212 (child, EVAS_CALLBACK_DEL, _edje_table_child_del_cb, rp); 3235 (child, EVAS_CALLBACK_DEL, _edje_table_child_del_cb, rp);
3213 3236
3214 rp->edje->dirty = 1; 3237 rp->edje->dirty = 1;
3238 rp->edje->recalc_call = 1;
3215#ifdef EDJE_CALC_CACHE 3239#ifdef EDJE_CALC_CACHE
3216 rp->invalidate = 1; 3240 rp->invalidate = 1;
3217#endif 3241#endif
@@ -3314,6 +3338,7 @@ _edje_perspective_obj_del(void *data, __UNUSED__ Evas *e, __UNUSED__ Evas_Object
3314 if (!ed) continue; 3338 if (!ed) continue;
3315 ed->persp = NULL; 3339 ed->persp = NULL;
3316 ed->dirty = 1; 3340 ed->dirty = 1;
3341 ed->recalc_call = 1;
3317 _edje_recalc_do(ed); 3342 _edje_recalc_do(ed);
3318 } 3343 }
3319 free(ps); 3344 free(ps);
@@ -3367,6 +3392,7 @@ edje_perspective_set(Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Co
3367 if (!ed->persp) 3392 if (!ed->persp)
3368 { 3393 {
3369 ed->dirty = 1; 3394 ed->dirty = 1;
3395 ed->recalc_call = 1;
3370 _edje_recalc_do(ed); 3396 _edje_recalc_do(ed);
3371 } 3397 }
3372 } 3398 }
@@ -3381,6 +3407,7 @@ edje_perspective_set(Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Co
3381 if (!ed->persp) 3407 if (!ed->persp)
3382 { 3408 {
3383 ed->dirty = 1; 3409 ed->dirty = 1;
3410 ed->recalc_call = 1;
3384 _edje_recalc_do(ed); 3411 _edje_recalc_do(ed);
3385 } 3412 }
3386 } 3413 }
@@ -3414,6 +3441,7 @@ edje_perspective_global_set(Edje_Perspective *ps, Eina_Bool global)
3414 if (!ed->persp) 3441 if (!ed->persp)
3415 { 3442 {
3416 ed->dirty = 1; 3443 ed->dirty = 1;
3444 ed->recalc_call = 1;
3417 _edje_recalc_do(ed); 3445 _edje_recalc_do(ed);
3418 } 3446 }
3419 } 3447 }
@@ -3453,6 +3481,7 @@ edje_object_perspective_set(Evas_Object *obj, Edje_Perspective *ps)
3453 ed->persp = ps; 3481 ed->persp = ps;
3454 if (ps) ps->users = eina_list_append(ps->users, obj); 3482 if (ps) ps->users = eina_list_append(ps->users, obj);
3455 ed->dirty = 1; 3483 ed->dirty = 1;
3484 ed->recalc_call = 1;
3456 _edje_recalc_do(ed); 3485 _edje_recalc_do(ed);
3457} 3486}
3458 3487
@@ -4075,6 +4104,7 @@ _edje_object_part_swallow_changed_hints_cb(void *data, __UNUSED__ Evas *e, __UNU
4075 rp = data; 4104 rp = data;
4076 _edje_real_part_swallow_hints_update(rp); 4105 _edje_real_part_swallow_hints_update(rp);
4077 rp->edje->dirty = 1; 4106 rp->edje->dirty = 1;
4107 rp->edje->recalc_call = 1;
4078 _edje_recalc(rp->edje); 4108 _edje_recalc(rp->edje);
4079 return; 4109 return;
4080} 4110}
@@ -4096,6 +4126,7 @@ _edje_real_part_swallow(Edje_Real_Part *rp,
4096 if (hints_update) 4126 if (hints_update)
4097 _edje_real_part_swallow_hints_update(rp); 4127 _edje_real_part_swallow_hints_update(rp);
4098 rp->edje->dirty = 1; 4128 rp->edje->dirty = 1;
4129 rp->edje->recalc_call = 1;
4099 _edje_recalc(rp->edje); 4130 _edje_recalc(rp->edje);
4100 return; 4131 return;
4101 } 4132 }
@@ -4139,6 +4170,7 @@ _edje_real_part_swallow(Edje_Real_Part *rp,
4139 evas_object_precise_is_inside_set(obj_swallow, 1); 4170 evas_object_precise_is_inside_set(obj_swallow, 1);
4140 4171
4141 rp->edje->dirty = 1; 4172 rp->edje->dirty = 1;
4173 rp->edje->recalc_call = 1;
4142 _edje_recalc(rp->edje); 4174 _edje_recalc(rp->edje);
4143} 4175}
4144 4176
diff --git a/libraries/edje/src/modules/Makefile.in b/libraries/edje/src/modules/Makefile.in
index 55c47d6..5e81050 100644
--- a/libraries/edje/src/modules/Makefile.in
+++ b/libraries/edje/src/modules/Makefile.in
@@ -193,8 +193,6 @@ PACKAGE_URL = @PACKAGE_URL@
193PACKAGE_VERSION = @PACKAGE_VERSION@ 193PACKAGE_VERSION = @PACKAGE_VERSION@
194PATH_SEPARATOR = @PATH_SEPARATOR@ 194PATH_SEPARATOR = @PATH_SEPARATOR@
195PKG_CONFIG = @PKG_CONFIG@ 195PKG_CONFIG = @PKG_CONFIG@
196PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
197PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
198PYTHON = @PYTHON@ 196PYTHON = @PYTHON@
199PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 197PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
200PYTHON_PLATFORM = @PYTHON_PLATFORM@ 198PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/modules/alsa_snd_player/Makefile.in b/libraries/edje/src/modules/alsa_snd_player/Makefile.in
index ce68f41..1fe2fb1 100644
--- a/libraries/edje/src/modules/alsa_snd_player/Makefile.in
+++ b/libraries/edje/src/modules/alsa_snd_player/Makefile.in
@@ -210,8 +210,6 @@ PACKAGE_URL = @PACKAGE_URL@
210PACKAGE_VERSION = @PACKAGE_VERSION@ 210PACKAGE_VERSION = @PACKAGE_VERSION@
211PATH_SEPARATOR = @PATH_SEPARATOR@ 211PATH_SEPARATOR = @PATH_SEPARATOR@
212PKG_CONFIG = @PKG_CONFIG@ 212PKG_CONFIG = @PKG_CONFIG@
213PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
214PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
215PYTHON = @PYTHON@ 213PYTHON = @PYTHON@
216PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 214PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
217PYTHON_PLATFORM = @PYTHON_PLATFORM@ 215PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/modules/eet_snd_reader/Makefile.in b/libraries/edje/src/modules/eet_snd_reader/Makefile.in
index f4d99bb..12d0487 100644
--- a/libraries/edje/src/modules/eet_snd_reader/Makefile.in
+++ b/libraries/edje/src/modules/eet_snd_reader/Makefile.in
@@ -211,8 +211,6 @@ PACKAGE_URL = @PACKAGE_URL@
211PACKAGE_VERSION = @PACKAGE_VERSION@ 211PACKAGE_VERSION = @PACKAGE_VERSION@
212PATH_SEPARATOR = @PATH_SEPARATOR@ 212PATH_SEPARATOR = @PATH_SEPARATOR@
213PKG_CONFIG = @PKG_CONFIG@ 213PKG_CONFIG = @PKG_CONFIG@
214PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
215PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
216PYTHON = @PYTHON@ 214PYTHON = @PYTHON@
217PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 215PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
218PYTHON_PLATFORM = @PYTHON_PLATFORM@ 216PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/modules/multisense_factory/Makefile.in b/libraries/edje/src/modules/multisense_factory/Makefile.in
index ed0c3e4..8fbc0aa 100644
--- a/libraries/edje/src/modules/multisense_factory/Makefile.in
+++ b/libraries/edje/src/modules/multisense_factory/Makefile.in
@@ -208,8 +208,6 @@ PACKAGE_URL = @PACKAGE_URL@
208PACKAGE_VERSION = @PACKAGE_VERSION@ 208PACKAGE_VERSION = @PACKAGE_VERSION@
209PATH_SEPARATOR = @PATH_SEPARATOR@ 209PATH_SEPARATOR = @PATH_SEPARATOR@
210PKG_CONFIG = @PKG_CONFIG@ 210PKG_CONFIG = @PKG_CONFIG@
211PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
212PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
213PYTHON = @PYTHON@ 211PYTHON = @PYTHON@
214PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 212PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
215PYTHON_PLATFORM = @PYTHON_PLATFORM@ 213PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/src/modules/multisense_factory/multisense_factory.c b/libraries/edje/src/modules/multisense_factory/multisense_factory.c
index f89ae9b..8b17be1 100644
--- a/libraries/edje/src/modules/multisense_factory/multisense_factory.c
+++ b/libraries/edje/src/modules/multisense_factory/multisense_factory.c
@@ -1,33 +1,33 @@
1#include "config.h" 1#include "config.h"
2#include "edje_private.h" 2#include "edje_private.h"
3 3
4#define DEFAULT_SAMPLERATE 44100 4#define DEFAULT_SAMPLERATE 44100
5 5
6#ifdef HAVE_LIBREMIX 6#ifdef HAVE_LIBREMIX
7EAPI RemixBase * 7EAPI RemixBase *
8multisense_sound_player_get(Edje_Multisense_Env *msenv) 8multisense_sound_player_get(Edje_Multisense_Env *msenv)
9{ 9{
10 RemixEnv *env = msenv->remixenv; 10 RemixEnv *env = msenv->remixenv;
11 RemixPlugin *player_plugin; 11 RemixPlugin *player_plugin;
12 RemixBase *player; 12 RemixBase *player;
13 13
14 player_plugin = remix_find_plugin(env, "alsa_snd_player"); 14 player_plugin = remix_find_plugin(env, "alsa_snd_player");
15 if (!player_plugin) 15 if (!player_plugin)
16 { 16 {
17 WRN("ALSA player_plugin init fail\n"); 17 WRN("ALSA player_plugin init fail\n");
18 return remix_monitor_new(env); 18 return remix_monitor_new(env);
19 } 19 }
20 player = remix_new(env, player_plugin, NULL); 20 player = remix_new(env, player_plugin, NULL);
21 return player; 21 return player;
22} 22}
23#endif 23#endif
24 24
25EAPI Eina_Bool 25EAPI Eina_Bool
26multisense_factory_init(Edje_Multisense_Env *env) 26multisense_factory_init(Edje_Multisense_Env *env __UNUSED__)
27{ 27{
28#ifdef HAVE_LIBREMIX 28#ifdef HAVE_LIBREMIX
29 remix_set_samplerate(env->remixenv, DEFAULT_SAMPLERATE); 29 remix_set_samplerate(env->remixenv, DEFAULT_SAMPLERATE);
30 remix_set_channels(env->remixenv, REMIX_STEREO); 30 remix_set_channels(env->remixenv, REMIX_STEREO);
31#endif 31#endif
32 return EINA_TRUE; 32 return EINA_TRUE;
33} 33}
diff --git a/libraries/edje/src/tests/Makefile.in b/libraries/edje/src/tests/Makefile.in
index f610548..ff5193e 100644
--- a/libraries/edje/src/tests/Makefile.in
+++ b/libraries/edje/src/tests/Makefile.in
@@ -189,8 +189,6 @@ PACKAGE_URL = @PACKAGE_URL@
189PACKAGE_VERSION = @PACKAGE_VERSION@ 189PACKAGE_VERSION = @PACKAGE_VERSION@
190PATH_SEPARATOR = @PATH_SEPARATOR@ 190PATH_SEPARATOR = @PATH_SEPARATOR@
191PKG_CONFIG = @PKG_CONFIG@ 191PKG_CONFIG = @PKG_CONFIG@
192PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
193PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
194PYTHON = @PYTHON@ 192PYTHON = @PYTHON@
195PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 193PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
196PYTHON_PLATFORM = @PYTHON_PLATFORM@ 194PYTHON_PLATFORM = @PYTHON_PLATFORM@
diff --git a/libraries/edje/utils/Makefile.in b/libraries/edje/utils/Makefile.in
index 4c05fe5..4df8fbd 100644
--- a/libraries/edje/utils/Makefile.in
+++ b/libraries/edje/utils/Makefile.in
@@ -177,8 +177,6 @@ PACKAGE_URL = @PACKAGE_URL@
177PACKAGE_VERSION = @PACKAGE_VERSION@ 177PACKAGE_VERSION = @PACKAGE_VERSION@
178PATH_SEPARATOR = @PATH_SEPARATOR@ 178PATH_SEPARATOR = @PATH_SEPARATOR@
179PKG_CONFIG = @PKG_CONFIG@ 179PKG_CONFIG = @PKG_CONFIG@
180PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
181PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
182PYTHON = @PYTHON@ 180PYTHON = @PYTHON@
183PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ 181PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
184PYTHON_PLATFORM = @PYTHON_PLATFORM@ 182PYTHON_PLATFORM = @PYTHON_PLATFORM@
generated by cgit v1.1 at 2024-11-19 21:52:32 +0000