diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/ecore/configure | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to '')
-rwxr-xr-x | libraries/ecore/configure | 3345 | ||||
-rw-r--r-- | libraries/ecore/configure.ac | 295 |
2 files changed, 1916 insertions, 1724 deletions
diff --git a/libraries/ecore/configure b/libraries/ecore/configure index 2ea7dd2..1b2ed41 100755 --- a/libraries/ecore/configure +++ b/libraries/ecore/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.65 for ecore 1.1.99.67344. | 3 | # Generated by GNU Autoconf 2.67 for ecore 1.2.0-alpha. |
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 Free Software Foundation, | 9 | # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
10 | # Inc. | 10 | # Foundation, 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 | |||
359 | fi # as_fn_arith | 359 | fi # as_fn_arith |
360 | 360 | ||
361 | 361 | ||
362 | # as_fn_error ERROR [LINENO LOG_FD] | 362 | # as_fn_error STATUS 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. |
367 | as_fn_error () | 367 | as_fn_error () |
368 | { | 368 | { |
369 | as_status=$?; test $as_status -eq 0 && as_status=1 | 369 | as_status=$1; test $as_status -eq 0 && as_status=1 |
370 | if test "$3"; then | 370 | if test "$4"; then |
371 | as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 371 | as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
372 | $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 | 372 | $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
373 | fi | 373 | fi |
374 | $as_echo "$as_me: error: $1" >&2 | 374 | $as_echo "$as_me: error: $2" >&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 | |||
682 | exec 6>&1 | 682 | exec 6>&1 |
683 | 683 | ||
684 | # Name of the host. | 684 | # Name of the host. |
685 | # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, | 685 | # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, |
686 | # so uname gets run too. | 686 | # so uname gets run too. |
687 | ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` | 687 | ac_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. |
702 | PACKAGE_NAME='ecore' | 702 | PACKAGE_NAME='ecore' |
703 | PACKAGE_TARNAME='ecore' | 703 | PACKAGE_TARNAME='ecore' |
704 | PACKAGE_VERSION='1.1.99.67344' | 704 | PACKAGE_VERSION='1.2.0-alpha' |
705 | PACKAGE_STRING='ecore 1.1.99.67344' | 705 | PACKAGE_STRING='ecore 1.2.0-alpha' |
706 | PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net' | 706 | PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net' |
707 | PACKAGE_URL='' | 707 | PACKAGE_URL='' |
708 | 708 | ||
@@ -772,6 +772,10 @@ EFL_INSTALL_EXAMPLES_FALSE | |||
772 | EFL_INSTALL_EXAMPLES_TRUE | 772 | EFL_INSTALL_EXAMPLES_TRUE |
773 | EFL_BUILD_EXAMPLES_FALSE | 773 | EFL_BUILD_EXAMPLES_FALSE |
774 | EFL_BUILD_EXAMPLES_TRUE | 774 | EFL_BUILD_EXAMPLES_TRUE |
775 | EFL_ENABLE_TESTS_FALSE | ||
776 | EFL_ENABLE_TESTS_TRUE | ||
777 | CHECK_LIBS | ||
778 | CHECK_CFLAGS | ||
775 | WAYLAND_EGL_LIBS | 779 | WAYLAND_EGL_LIBS |
776 | WAYLAND_EGL_CFLAGS | 780 | WAYLAND_EGL_CFLAGS |
777 | ecore_wayland_libs | 781 | ecore_wayland_libs |
@@ -875,6 +879,7 @@ ecore_con_libs | |||
875 | ecore_con_cflags | 879 | ecore_con_cflags |
876 | BUILD_ECORE_CON_FALSE | 880 | BUILD_ECORE_CON_FALSE |
877 | BUILD_ECORE_CON_TRUE | 881 | BUILD_ECORE_CON_TRUE |
882 | SHM_OPEN_LIBS | ||
878 | ALLOCA | 883 | ALLOCA |
879 | lt_enable_auto_import | 884 | lt_enable_auto_import |
880 | WIN32_CFLAGS | 885 | WIN32_CFLAGS |
@@ -992,11 +997,18 @@ EFL_ECORE_FILE_BUILD | |||
992 | EFL_ECORE_EVAS_BUILD | 997 | EFL_ECORE_EVAS_BUILD |
993 | EFL_ECORE_CON_BUILD | 998 | EFL_ECORE_CON_BUILD |
994 | EFL_ECORE_BUILD | 999 | EFL_ECORE_BUILD |
1000 | ECORE_HAVE_EXOTIC_FALSE | ||
1001 | ECORE_HAVE_EXOTIC_TRUE | ||
1002 | EXOTIC_LIBS | ||
1003 | EXOTIC_CFLAGS | ||
995 | ESCAPE_LIBS | 1004 | ESCAPE_LIBS |
996 | ESCAPE_CFLAGS | 1005 | ESCAPE_CFLAGS |
997 | EVIL_LIBS | 1006 | EVIL_LIBS |
998 | EVIL_CFLAGS | 1007 | EVIL_CFLAGS |
999 | pkgconfig_requires_private | 1008 | pkgconfig_requires_private |
1009 | PKG_CONFIG_LIBDIR | ||
1010 | PKG_CONFIG_PATH | ||
1011 | PKG_CONFIG | ||
1000 | EFL_BUILD_DOC_FALSE | 1012 | EFL_BUILD_DOC_FALSE |
1001 | EFL_BUILD_DOC_TRUE | 1013 | EFL_BUILD_DOC_TRUE |
1002 | efl_doxygen | 1014 | efl_doxygen |
@@ -1014,11 +1026,6 @@ OBJCDEPMODE | |||
1014 | ac_ct_OBJC | 1026 | ac_ct_OBJC |
1015 | OBJCFLAGS | 1027 | OBJCFLAGS |
1016 | OBJC | 1028 | OBJC |
1017 | EFL_ENABLE_TESTS_FALSE | ||
1018 | EFL_ENABLE_TESTS_TRUE | ||
1019 | CHECK_LIBS | ||
1020 | CHECK_CFLAGS | ||
1021 | PKG_CONFIG | ||
1022 | HAVE_PO_FALSE | 1029 | HAVE_PO_FALSE |
1023 | HAVE_PO_TRUE | 1030 | HAVE_PO_TRUE |
1024 | POSUB | 1031 | POSUB |
@@ -1172,7 +1179,6 @@ enable_local_sockets | |||
1172 | enable_abstract_sockets | 1179 | enable_abstract_sockets |
1173 | enable_simple_x11 | 1180 | enable_simple_x11 |
1174 | enable_xim | 1181 | enable_xim |
1175 | enable_tests | ||
1176 | enable_doc | 1182 | enable_doc |
1177 | with_doxygen | 1183 | with_doxygen |
1178 | enable_ecore_timer_dump | 1184 | enable_ecore_timer_dump |
@@ -1243,7 +1249,6 @@ enable_ecore_evas_software_ddraw | |||
1243 | enable_ecore_evas_direct3d | 1249 | enable_ecore_evas_direct3d |
1244 | enable_ecore_evas_opengl_glew | 1250 | enable_ecore_evas_opengl_glew |
1245 | enable_ecore_evas_software_16_ddraw | 1251 | enable_ecore_evas_software_16_ddraw |
1246 | enable_ecore_evas_software_sdl | ||
1247 | enable_ecore_evas_opengl_sdl | 1252 | enable_ecore_evas_opengl_sdl |
1248 | enable_ecore_evas_opengl_cocoa | 1253 | enable_ecore_evas_opengl_cocoa |
1249 | enable_ecore_evas_directfb | 1254 | enable_ecore_evas_directfb |
@@ -1254,6 +1259,7 @@ enable_ecore_evas_psl1ght | |||
1254 | enable_ecore_wayland | 1259 | enable_ecore_wayland |
1255 | enable_ecore_evas_wayland_shm | 1260 | enable_ecore_evas_wayland_shm |
1256 | enable_ecore_evas_wayland_egl | 1261 | enable_ecore_evas_wayland_egl |
1262 | enable_tests | ||
1257 | enable_build_examples | 1263 | enable_build_examples |
1258 | enable_install_examples | 1264 | enable_install_examples |
1259 | ' | 1265 | ' |
@@ -1266,19 +1272,21 @@ LDFLAGS | |||
1266 | LIBS | 1272 | LIBS |
1267 | CPPFLAGS | 1273 | CPPFLAGS |
1268 | CPP | 1274 | CPP |
1269 | PKG_CONFIG | ||
1270 | CHECK_CFLAGS | ||
1271 | CHECK_LIBS | ||
1272 | OBJC | 1275 | OBJC |
1273 | OBJCFLAGS | 1276 | OBJCFLAGS |
1274 | CXX | 1277 | CXX |
1275 | CXXFLAGS | 1278 | CXXFLAGS |
1276 | CCC | 1279 | CCC |
1277 | CXXCPP | 1280 | CXXCPP |
1281 | PKG_CONFIG | ||
1282 | PKG_CONFIG_PATH | ||
1283 | PKG_CONFIG_LIBDIR | ||
1278 | EVIL_CFLAGS | 1284 | EVIL_CFLAGS |
1279 | EVIL_LIBS | 1285 | EVIL_LIBS |
1280 | ESCAPE_CFLAGS | 1286 | ESCAPE_CFLAGS |
1281 | ESCAPE_LIBS | 1287 | ESCAPE_LIBS |
1288 | EXOTIC_CFLAGS | ||
1289 | EXOTIC_LIBS | ||
1282 | EINA_CFLAGS | 1290 | EINA_CFLAGS |
1283 | EINA_LIBS | 1291 | EINA_LIBS |
1284 | GLIB_CFLAGS | 1292 | GLIB_CFLAGS |
@@ -1343,7 +1351,9 @@ XCB_X11_LIBS | |||
1343 | WAYLAND_CFLAGS | 1351 | WAYLAND_CFLAGS |
1344 | WAYLAND_LIBS | 1352 | WAYLAND_LIBS |
1345 | WAYLAND_EGL_CFLAGS | 1353 | WAYLAND_EGL_CFLAGS |
1346 | WAYLAND_EGL_LIBS' | 1354 | WAYLAND_EGL_LIBS |
1355 | CHECK_CFLAGS | ||
1356 | CHECK_LIBS' | ||
1347 | 1357 | ||
1348 | 1358 | ||
1349 | # Initialize some variables set by options. | 1359 | # Initialize some variables set by options. |
@@ -1406,8 +1416,9 @@ do | |||
1406 | fi | 1416 | fi |
1407 | 1417 | ||
1408 | case $ac_option in | 1418 | case $ac_option in |
1409 | *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; | 1419 | *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
1410 | *) ac_optarg=yes ;; | 1420 | *=) ac_optarg= ;; |
1421 | *) ac_optarg=yes ;; | ||
1411 | esac | 1422 | esac |
1412 | 1423 | ||
1413 | # Accept the important Cygnus configure options, so we can diagnose typos. | 1424 | # Accept the important Cygnus configure options, so we can diagnose typos. |
@@ -1452,7 +1463,7 @@ do | |||
1452 | ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` | 1463 | ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
1453 | # Reject names that are not valid shell variable names. | 1464 | # Reject names that are not valid shell variable names. |
1454 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | 1465 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
1455 | as_fn_error "invalid feature name: $ac_useropt" | 1466 | as_fn_error $? "invalid feature name: $ac_useropt" |
1456 | ac_useropt_orig=$ac_useropt | 1467 | ac_useropt_orig=$ac_useropt |
1457 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | 1468 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
1458 | case $ac_user_opts in | 1469 | case $ac_user_opts in |
@@ -1478,7 +1489,7 @@ do | |||
1478 | ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` | 1489 | ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
1479 | # Reject names that are not valid shell variable names. | 1490 | # Reject names that are not valid shell variable names. |
1480 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | 1491 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
1481 | as_fn_error "invalid feature name: $ac_useropt" | 1492 | as_fn_error $? "invalid feature name: $ac_useropt" |
1482 | ac_useropt_orig=$ac_useropt | 1493 | ac_useropt_orig=$ac_useropt |
1483 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | 1494 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
1484 | case $ac_user_opts in | 1495 | case $ac_user_opts in |
@@ -1682,7 +1693,7 @@ do | |||
1682 | ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` | 1693 | ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
1683 | # Reject names that are not valid shell variable names. | 1694 | # Reject names that are not valid shell variable names. |
1684 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | 1695 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
1685 | as_fn_error "invalid package name: $ac_useropt" | 1696 | as_fn_error $? "invalid package name: $ac_useropt" |
1686 | ac_useropt_orig=$ac_useropt | 1697 | ac_useropt_orig=$ac_useropt |
1687 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | 1698 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
1688 | case $ac_user_opts in | 1699 | case $ac_user_opts in |
@@ -1698,7 +1709,7 @@ do | |||
1698 | ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` | 1709 | ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
1699 | # Reject names that are not valid shell variable names. | 1710 | # Reject names that are not valid shell variable names. |
1700 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | 1711 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
1701 | as_fn_error "invalid package name: $ac_useropt" | 1712 | as_fn_error $? "invalid package name: $ac_useropt" |
1702 | ac_useropt_orig=$ac_useropt | 1713 | ac_useropt_orig=$ac_useropt |
1703 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | 1714 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
1704 | case $ac_user_opts in | 1715 | case $ac_user_opts in |
@@ -1728,8 +1739,8 @@ do | |||
1728 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) | 1739 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) |
1729 | x_libraries=$ac_optarg ;; | 1740 | x_libraries=$ac_optarg ;; |
1730 | 1741 | ||
1731 | -*) as_fn_error "unrecognized option: \`$ac_option' | 1742 | -*) as_fn_error $? "unrecognized option: \`$ac_option' |
1732 | Try \`$0 --help' for more information." | 1743 | Try \`$0 --help' for more information" |
1733 | ;; | 1744 | ;; |
1734 | 1745 | ||
1735 | *=*) | 1746 | *=*) |
@@ -1737,7 +1748,7 @@ Try \`$0 --help' for more information." | |||
1737 | # Reject names that are not valid shell variable names. | 1748 | # Reject names that are not valid shell variable names. |
1738 | case $ac_envvar in #( | 1749 | case $ac_envvar in #( |
1739 | '' | [0-9]* | *[!_$as_cr_alnum]* ) | 1750 | '' | [0-9]* | *[!_$as_cr_alnum]* ) |
1740 | as_fn_error "invalid variable name: \`$ac_envvar'" ;; | 1751 | as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; |
1741 | esac | 1752 | esac |
1742 | eval $ac_envvar=\$ac_optarg | 1753 | eval $ac_envvar=\$ac_optarg |
1743 | export $ac_envvar ;; | 1754 | export $ac_envvar ;; |
@@ -1755,13 +1766,13 @@ done | |||
1755 | 1766 | ||
1756 | if test -n "$ac_prev"; then | 1767 | if test -n "$ac_prev"; then |
1757 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` | 1768 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` |
1758 | as_fn_error "missing argument to $ac_option" | 1769 | as_fn_error $? "missing argument to $ac_option" |
1759 | fi | 1770 | fi |
1760 | 1771 | ||
1761 | if test -n "$ac_unrecognized_opts"; then | 1772 | if test -n "$ac_unrecognized_opts"; then |
1762 | case $enable_option_checking in | 1773 | case $enable_option_checking in |
1763 | no) ;; | 1774 | no) ;; |
1764 | fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; | 1775 | fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; |
1765 | *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; | 1776 | *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; |
1766 | esac | 1777 | esac |
1767 | fi | 1778 | fi |
@@ -1784,7 +1795,7 @@ do | |||
1784 | [\\/$]* | ?:[\\/]* ) continue;; | 1795 | [\\/$]* | ?:[\\/]* ) continue;; |
1785 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; | 1796 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; |
1786 | esac | 1797 | esac |
1787 | as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" | 1798 | as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" |
1788 | done | 1799 | done |
1789 | 1800 | ||
1790 | # There might be people who depend on the old broken behavior: `$host' | 1801 | # There might be people who depend on the old broken behavior: `$host' |
@@ -1798,8 +1809,8 @@ target=$target_alias | |||
1798 | if test "x$host_alias" != x; then | 1809 | if test "x$host_alias" != x; then |
1799 | if test "x$build_alias" = x; then | 1810 | if test "x$build_alias" = x; then |
1800 | cross_compiling=maybe | 1811 | cross_compiling=maybe |
1801 | $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. | 1812 | $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
1802 | If a cross compiler is detected then cross compile mode will be used." >&2 | 1813 | If a cross compiler is detected then cross compile mode will be used" >&2 |
1803 | elif test "x$build_alias" != "x$host_alias"; then | 1814 | elif test "x$build_alias" != "x$host_alias"; then |
1804 | cross_compiling=yes | 1815 | cross_compiling=yes |
1805 | fi | 1816 | fi |
@@ -1814,9 +1825,9 @@ test "$silent" = yes && exec 6>/dev/null | |||
1814 | ac_pwd=`pwd` && test -n "$ac_pwd" && | 1825 | ac_pwd=`pwd` && test -n "$ac_pwd" && |
1815 | ac_ls_di=`ls -di .` && | 1826 | ac_ls_di=`ls -di .` && |
1816 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || | 1827 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || |
1817 | as_fn_error "working directory cannot be determined" | 1828 | as_fn_error $? "working directory cannot be determined" |
1818 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || | 1829 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
1819 | as_fn_error "pwd does not report name of working directory" | 1830 | as_fn_error $? "pwd does not report name of working directory" |
1820 | 1831 | ||
1821 | 1832 | ||
1822 | # Find the source files, if location was not specified. | 1833 | # Find the source files, if location was not specified. |
@@ -1855,11 +1866,11 @@ else | |||
1855 | fi | 1866 | fi |
1856 | if test ! -r "$srcdir/$ac_unique_file"; then | 1867 | if test ! -r "$srcdir/$ac_unique_file"; then |
1857 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." | 1868 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." |
1858 | as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" | 1869 | as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" |
1859 | fi | 1870 | fi |
1860 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" | 1871 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" |
1861 | ac_abs_confdir=`( | 1872 | ac_abs_confdir=`( |
1862 | cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" | 1873 | cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" |
1863 | pwd)` | 1874 | pwd)` |
1864 | # When building in place, set srcdir=. | 1875 | # When building in place, set srcdir=. |
1865 | if test "$ac_abs_confdir" = "$ac_pwd"; then | 1876 | if test "$ac_abs_confdir" = "$ac_pwd"; then |
@@ -1885,7 +1896,7 @@ if test "$ac_init_help" = "long"; then | |||
1885 | # Omit some internal or obsolete options to make the list less imposing. | 1896 | # Omit some internal or obsolete options to make the list less imposing. |
1886 | # This message is too long to be a string in the A/UX 3.1 sh. | 1897 | # This message is too long to be a string in the A/UX 3.1 sh. |
1887 | cat <<_ACEOF | 1898 | cat <<_ACEOF |
1888 | \`configure' configures ecore 1.1.99.67344 to adapt to many kinds of systems. | 1899 | \`configure' configures ecore 1.2.0-alpha to adapt to many kinds of systems. |
1889 | 1900 | ||
1890 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1901 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1891 | 1902 | ||
@@ -1899,7 +1910,7 @@ Configuration: | |||
1899 | --help=short display options specific to this package | 1910 | --help=short display options specific to this package |
1900 | --help=recursive display the short help of all the included packages | 1911 | --help=recursive display the short help of all the included packages |
1901 | -V, --version display version information and exit | 1912 | -V, --version display version information and exit |
1902 | -q, --quiet, --silent do not print \`checking...' messages | 1913 | -q, --quiet, --silent do not print \`checking ...' messages |
1903 | --cache-file=FILE cache test results in FILE [disabled] | 1914 | --cache-file=FILE cache test results in FILE [disabled] |
1904 | -C, --config-cache alias for \`--cache-file=config.cache' | 1915 | -C, --config-cache alias for \`--cache-file=config.cache' |
1905 | -n, --no-create do not create output files | 1916 | -n, --no-create do not create output files |
@@ -1959,7 +1970,7 @@ fi | |||
1959 | 1970 | ||
1960 | if test -n "$ac_init_help"; then | 1971 | if test -n "$ac_init_help"; then |
1961 | case $ac_init_help in | 1972 | case $ac_init_help in |
1962 | short | recursive ) echo "Configuration of ecore 1.1.99.67344:";; | 1973 | short | recursive ) echo "Configuration of ecore 1.2.0-alpha:";; |
1963 | esac | 1974 | esac |
1964 | cat <<\_ACEOF | 1975 | cat <<\_ACEOF |
1965 | 1976 | ||
@@ -1987,7 +1998,6 @@ Optional Features: | |||
1987 | disable abstract sockets. | 1998 | disable abstract sockets. |
1988 | --enable-simple-x11 enable simple x11 linking | 1999 | --enable-simple-x11 enable simple x11 linking |
1989 | --disable-xim disable X Input Method. | 2000 | --disable-xim disable X Input Method. |
1990 | --enable-tests enable tests [default=disabled] | ||
1991 | --disable-doc Disable documentation build [default=enabled] | 2001 | --disable-doc Disable documentation build [default=enabled] |
1992 | --disable-ecore-timer-dump | 2002 | --disable-ecore-timer-dump |
1993 | disable tracking of timer allocation. | 2003 | disable tracking of timer allocation. |
@@ -2102,9 +2112,6 @@ Optional Features: | |||
2102 | --enable-ecore-evas-software-16-ddraw | 2112 | --enable-ecore-evas-software-16-ddraw |
2103 | enable 16 bpp Software DirectDraw support in the | 2113 | enable 16 bpp Software DirectDraw support in the |
2104 | ecore_evas module. | 2114 | ecore_evas module. |
2105 | --enable-ecore-evas-software-sdl | ||
2106 | enable Software SDL support in the ecore_evas | ||
2107 | module. | ||
2108 | --enable-ecore-evas-opengl-sdl | 2115 | --enable-ecore-evas-opengl-sdl |
2109 | enable OpenGL SDL support in the ecore_evas module. | 2116 | enable OpenGL SDL support in the ecore_evas module. |
2110 | --enable-ecore-evas-opengl-cocoa | 2117 | --enable-ecore-evas-opengl-cocoa |
@@ -2126,6 +2133,7 @@ Optional Features: | |||
2126 | enable Wayland Shm support in the ecore_evas module. | 2133 | enable Wayland Shm support in the ecore_evas module. |
2127 | --enable-ecore-evas-wayland-egl | 2134 | --enable-ecore-evas-wayland-egl |
2128 | enable Wayland Egl support in the ecore_evas module. | 2135 | enable Wayland Egl support in the ecore_evas module. |
2136 | --enable-tests enable tests [default=disabled] | ||
2129 | --enable-build-examples enable building examples [default=disabled] | 2137 | --enable-build-examples enable building examples [default=disabled] |
2130 | --enable-install-examples | 2138 | --enable-install-examples |
2131 | enable installing example source files | 2139 | enable installing example source files |
@@ -2164,20 +2172,24 @@ Some influential environment variables: | |||
2164 | CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if | 2172 | CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if |
2165 | you have headers in a nonstandard directory <include dir> | 2173 | you have headers in a nonstandard directory <include dir> |
2166 | CPP C preprocessor | 2174 | CPP C preprocessor |
2167 | PKG_CONFIG path to pkg-config utility | ||
2168 | CHECK_CFLAGS | ||
2169 | C compiler flags for CHECK, overriding pkg-config | ||
2170 | CHECK_LIBS linker flags for CHECK, overriding pkg-config | ||
2171 | OBJC Objective C compiler command | 2175 | OBJC Objective C compiler command |
2172 | OBJCFLAGS Objective C compiler flags | 2176 | OBJCFLAGS Objective C compiler flags |
2173 | CXX C++ compiler command | 2177 | CXX C++ compiler command |
2174 | CXXFLAGS C++ compiler flags | 2178 | CXXFLAGS C++ compiler flags |
2175 | CXXCPP C++ preprocessor | 2179 | CXXCPP C++ preprocessor |
2180 | PKG_CONFIG path to pkg-config utility | ||
2181 | PKG_CONFIG_PATH | ||
2182 | directories to add to pkg-config's search path | ||
2183 | PKG_CONFIG_LIBDIR | ||
2184 | path overriding pkg-config's built-in search path | ||
2176 | EVIL_CFLAGS C compiler flags for EVIL, overriding pkg-config | 2185 | EVIL_CFLAGS C compiler flags for EVIL, overriding pkg-config |
2177 | EVIL_LIBS linker flags for EVIL, overriding pkg-config | 2186 | EVIL_LIBS linker flags for EVIL, overriding pkg-config |
2178 | ESCAPE_CFLAGS | 2187 | ESCAPE_CFLAGS |
2179 | C compiler flags for ESCAPE, overriding pkg-config | 2188 | C compiler flags for ESCAPE, overriding pkg-config |
2180 | ESCAPE_LIBS linker flags for ESCAPE, overriding pkg-config | 2189 | ESCAPE_LIBS linker flags for ESCAPE, overriding pkg-config |
2190 | EXOTIC_CFLAGS | ||
2191 | C compiler flags for EXOTIC, overriding pkg-config | ||
2192 | EXOTIC_LIBS linker flags for EXOTIC, overriding pkg-config | ||
2181 | EINA_CFLAGS C compiler flags for EINA, overriding pkg-config | 2193 | EINA_CFLAGS C compiler flags for EINA, overriding pkg-config |
2182 | EINA_LIBS linker flags for EINA, overriding pkg-config | 2194 | EINA_LIBS linker flags for EINA, overriding pkg-config |
2183 | GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config | 2195 | GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config |
@@ -2286,6 +2298,9 @@ Some influential environment variables: | |||
2286 | C compiler flags for WAYLAND_EGL, overriding pkg-config | 2298 | C compiler flags for WAYLAND_EGL, overriding pkg-config |
2287 | WAYLAND_EGL_LIBS | 2299 | WAYLAND_EGL_LIBS |
2288 | linker flags for WAYLAND_EGL, overriding pkg-config | 2300 | linker flags for WAYLAND_EGL, overriding pkg-config |
2301 | CHECK_CFLAGS | ||
2302 | C compiler flags for CHECK, overriding pkg-config | ||
2303 | CHECK_LIBS linker flags for CHECK, overriding pkg-config | ||
2289 | 2304 | ||
2290 | Use these variables to override the choices made by `configure' or to help | 2305 | Use these variables to override the choices made by `configure' or to help |
2291 | it to find libraries and programs with nonstandard names/locations. | 2306 | it to find libraries and programs with nonstandard names/locations. |
@@ -2353,10 +2368,10 @@ fi | |||
2353 | test -n "$ac_init_help" && exit $ac_status | 2368 | test -n "$ac_init_help" && exit $ac_status |
2354 | if $ac_init_version; then | 2369 | if $ac_init_version; then |
2355 | cat <<\_ACEOF | 2370 | cat <<\_ACEOF |
2356 | ecore configure 1.1.99.67344 | 2371 | ecore configure 1.2.0-alpha |
2357 | generated by GNU Autoconf 2.65 | 2372 | generated by GNU Autoconf 2.67 |
2358 | 2373 | ||
2359 | Copyright (C) 2009 Free Software Foundation, Inc. | 2374 | Copyright (C) 2010 Free Software Foundation, Inc. |
2360 | This configure script is free software; the Free Software Foundation | 2375 | This configure script is free software; the Free Software Foundation |
2361 | gives unlimited permission to copy, distribute and modify it. | 2376 | gives unlimited permission to copy, distribute and modify it. |
2362 | _ACEOF | 2377 | _ACEOF |
@@ -2426,7 +2441,7 @@ $as_echo "$ac_try_echo"; } >&5 | |||
2426 | mv -f conftest.er1 conftest.err | 2441 | mv -f conftest.er1 conftest.err |
2427 | fi | 2442 | fi |
2428 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 2443 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2429 | test $ac_status = 0; } >/dev/null && { | 2444 | test $ac_status = 0; } > conftest.i && { |
2430 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | 2445 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
2431 | test ! -s conftest.err | 2446 | test ! -s conftest.err |
2432 | }; then : | 2447 | }; then : |
@@ -2450,10 +2465,10 @@ fi | |||
2450 | ac_fn_c_check_header_mongrel () | 2465 | ac_fn_c_check_header_mongrel () |
2451 | { | 2466 | { |
2452 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 2467 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2453 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | 2468 | if eval "test \"\${$3+set}\"" = set; then : |
2454 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | 2469 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2455 | $as_echo_n "checking for $2... " >&6; } | 2470 | $as_echo_n "checking for $2... " >&6; } |
2456 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | 2471 | if eval "test \"\${$3+set}\"" = set; then : |
2457 | $as_echo_n "(cached) " >&6 | 2472 | $as_echo_n "(cached) " >&6 |
2458 | fi | 2473 | fi |
2459 | eval ac_res=\$$3 | 2474 | eval ac_res=\$$3 |
@@ -2489,7 +2504,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : | |||
2489 | else | 2504 | else |
2490 | ac_header_preproc=no | 2505 | ac_header_preproc=no |
2491 | fi | 2506 | fi |
2492 | rm -f conftest.err conftest.$ac_ext | 2507 | rm -f conftest.err conftest.i conftest.$ac_ext |
2493 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 | 2508 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 |
2494 | $as_echo "$ac_header_preproc" >&6; } | 2509 | $as_echo "$ac_header_preproc" >&6; } |
2495 | 2510 | ||
@@ -2512,17 +2527,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} | |||
2512 | $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} | 2527 | $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} |
2513 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 | 2528 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 |
2514 | $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} | 2529 | $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} |
2515 | ( cat <<\_ASBOX | 2530 | ( $as_echo "## -------------------------------------------------------- ## |
2516 | ## -------------------------------------------------------- ## | ||
2517 | ## Report this to enlightenment-devel@lists.sourceforge.net ## | 2531 | ## Report this to enlightenment-devel@lists.sourceforge.net ## |
2518 | ## -------------------------------------------------------- ## | 2532 | ## -------------------------------------------------------- ##" |
2519 | _ASBOX | ||
2520 | ) | sed "s/^/$as_me: WARNING: /" >&2 | 2533 | ) | sed "s/^/$as_me: WARNING: /" >&2 |
2521 | ;; | 2534 | ;; |
2522 | esac | 2535 | esac |
2523 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | 2536 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2524 | $as_echo_n "checking for $2... " >&6; } | 2537 | $as_echo_n "checking for $2... " >&6; } |
2525 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | 2538 | if eval "test \"\${$3+set}\"" = set; then : |
2526 | $as_echo_n "(cached) " >&6 | 2539 | $as_echo_n "(cached) " >&6 |
2527 | else | 2540 | else |
2528 | eval "$3=\$ac_header_compiler" | 2541 | eval "$3=\$ac_header_compiler" |
@@ -2586,7 +2599,7 @@ ac_fn_c_check_header_compile () | |||
2586 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 2599 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2587 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | 2600 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2588 | $as_echo_n "checking for $2... " >&6; } | 2601 | $as_echo_n "checking for $2... " >&6; } |
2589 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | 2602 | if eval "test \"\${$3+set}\"" = set; then : |
2590 | $as_echo_n "(cached) " >&6 | 2603 | $as_echo_n "(cached) " >&6 |
2591 | else | 2604 | else |
2592 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 2605 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
@@ -2662,7 +2675,7 @@ ac_fn_c_check_func () | |||
2662 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 2675 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
2663 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | 2676 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
2664 | $as_echo_n "checking for $2... " >&6; } | 2677 | $as_echo_n "checking for $2... " >&6; } |
2665 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | 2678 | if eval "test \"\${$3+set}\"" = set; then : |
2666 | $as_echo_n "(cached) " >&6 | 2679 | $as_echo_n "(cached) " >&6 |
2667 | else | 2680 | else |
2668 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 2681 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
@@ -2721,45 +2734,6 @@ $as_echo "$ac_res" >&6; } | |||
2721 | 2734 | ||
2722 | } # ac_fn_c_check_func | 2735 | } # ac_fn_c_check_func |
2723 | 2736 | ||
2724 | # ac_fn_c_check_decl LINENO SYMBOL VAR | ||
2725 | # ------------------------------------ | ||
2726 | # Tests whether SYMBOL is declared, setting cache variable VAR accordingly. | ||
2727 | ac_fn_c_check_decl () | ||
2728 | { | ||
2729 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2730 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 | ||
2731 | $as_echo_n "checking whether $2 is declared... " >&6; } | ||
2732 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | ||
2733 | $as_echo_n "(cached) " >&6 | ||
2734 | else | ||
2735 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2736 | /* end confdefs.h. */ | ||
2737 | $4 | ||
2738 | int | ||
2739 | main () | ||
2740 | { | ||
2741 | #ifndef $2 | ||
2742 | (void) $2; | ||
2743 | #endif | ||
2744 | |||
2745 | ; | ||
2746 | return 0; | ||
2747 | } | ||
2748 | _ACEOF | ||
2749 | if ac_fn_c_try_compile "$LINENO"; then : | ||
2750 | eval "$3=yes" | ||
2751 | else | ||
2752 | eval "$3=no" | ||
2753 | fi | ||
2754 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2755 | fi | ||
2756 | eval ac_res=\$$3 | ||
2757 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
2758 | $as_echo "$ac_res" >&6; } | ||
2759 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
2760 | |||
2761 | } # ac_fn_c_check_decl | ||
2762 | |||
2763 | # ac_fn_objc_try_compile LINENO | 2737 | # ac_fn_objc_try_compile LINENO |
2764 | # ----------------------------- | 2738 | # ----------------------------- |
2765 | # Try to compile conftest.$ac_ext, and return whether this succeeded. | 2739 | # Try to compile conftest.$ac_ext, and return whether this succeeded. |
@@ -2857,7 +2831,7 @@ $as_echo "$ac_try_echo"; } >&5 | |||
2857 | mv -f conftest.er1 conftest.err | 2831 | mv -f conftest.er1 conftest.err |
2858 | fi | 2832 | fi |
2859 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 2833 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2860 | test $ac_status = 0; } >/dev/null && { | 2834 | test $ac_status = 0; } > conftest.i && { |
2861 | test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || | 2835 | test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || |
2862 | test ! -s conftest.err | 2836 | test ! -s conftest.err |
2863 | }; then : | 2837 | }; then : |
@@ -2919,6 +2893,52 @@ fi | |||
2919 | 2893 | ||
2920 | } # ac_fn_cxx_try_link | 2894 | } # ac_fn_cxx_try_link |
2921 | 2895 | ||
2896 | # ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES | ||
2897 | # --------------------------------------------- | ||
2898 | # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR | ||
2899 | # accordingly. | ||
2900 | ac_fn_c_check_decl () | ||
2901 | { | ||
2902 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | ||
2903 | as_decl_name=`echo $2|sed 's/ *(.*//'` | ||
2904 | as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` | ||
2905 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 | ||
2906 | $as_echo_n "checking whether $as_decl_name is declared... " >&6; } | ||
2907 | if eval "test \"\${$3+set}\"" = set; then : | ||
2908 | $as_echo_n "(cached) " >&6 | ||
2909 | else | ||
2910 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2911 | /* end confdefs.h. */ | ||
2912 | $4 | ||
2913 | int | ||
2914 | main () | ||
2915 | { | ||
2916 | #ifndef $as_decl_name | ||
2917 | #ifdef __cplusplus | ||
2918 | (void) $as_decl_use; | ||
2919 | #else | ||
2920 | (void) $as_decl_name; | ||
2921 | #endif | ||
2922 | #endif | ||
2923 | |||
2924 | ; | ||
2925 | return 0; | ||
2926 | } | ||
2927 | _ACEOF | ||
2928 | if ac_fn_c_try_compile "$LINENO"; then : | ||
2929 | eval "$3=yes" | ||
2930 | else | ||
2931 | eval "$3=no" | ||
2932 | fi | ||
2933 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
2934 | fi | ||
2935 | eval ac_res=\$$3 | ||
2936 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 | ||
2937 | $as_echo "$ac_res" >&6; } | ||
2938 | eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} | ||
2939 | |||
2940 | } # ac_fn_c_check_decl | ||
2941 | |||
2922 | # ac_fn_objc_try_link LINENO | 2942 | # ac_fn_objc_try_link LINENO |
2923 | # -------------------------- | 2943 | # -------------------------- |
2924 | # Try to link conftest.$ac_ext, and return whether this succeeded. | 2944 | # Try to link conftest.$ac_ext, and return whether this succeeded. |
@@ -3152,7 +3172,7 @@ ac_fn_c_check_type () | |||
3152 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 3172 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
3153 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | 3173 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
3154 | $as_echo_n "checking for $2... " >&6; } | 3174 | $as_echo_n "checking for $2... " >&6; } |
3155 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | 3175 | if eval "test \"\${$3+set}\"" = set; then : |
3156 | $as_echo_n "(cached) " >&6 | 3176 | $as_echo_n "(cached) " >&6 |
3157 | else | 3177 | else |
3158 | eval "$3=no" | 3178 | eval "$3=no" |
@@ -3200,8 +3220,8 @@ cat >config.log <<_ACEOF | |||
3200 | This file contains any messages produced by compilers while | 3220 | This file contains any messages produced by compilers while |
3201 | running configure, to aid debugging if configure makes a mistake. | 3221 | running configure, to aid debugging if configure makes a mistake. |
3202 | 3222 | ||
3203 | It was created by ecore $as_me 1.1.99.67344, which was | 3223 | It was created by ecore $as_me 1.2.0-alpha, which was |
3204 | generated by GNU Autoconf 2.65. Invocation command line was | 3224 | generated by GNU Autoconf 2.67. Invocation command line was |
3205 | 3225 | ||
3206 | $ $0 $@ | 3226 | $ $0 $@ |
3207 | 3227 | ||
@@ -3311,11 +3331,9 @@ trap 'exit_status=$? | |||
3311 | { | 3331 | { |
3312 | echo | 3332 | echo |
3313 | 3333 | ||
3314 | cat <<\_ASBOX | 3334 | $as_echo "## ---------------- ## |
3315 | ## ---------------- ## | ||
3316 | ## Cache variables. ## | 3335 | ## Cache variables. ## |
3317 | ## ---------------- ## | 3336 | ## ---------------- ##" |
3318 | _ASBOX | ||
3319 | echo | 3337 | echo |
3320 | # The following way of writing the cache mishandles newlines in values, | 3338 | # The following way of writing the cache mishandles newlines in values, |
3321 | ( | 3339 | ( |
@@ -3349,11 +3367,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; | |||
3349 | ) | 3367 | ) |
3350 | echo | 3368 | echo |
3351 | 3369 | ||
3352 | cat <<\_ASBOX | 3370 | $as_echo "## ----------------- ## |
3353 | ## ----------------- ## | ||
3354 | ## Output variables. ## | 3371 | ## Output variables. ## |
3355 | ## ----------------- ## | 3372 | ## ----------------- ##" |
3356 | _ASBOX | ||
3357 | echo | 3373 | echo |
3358 | for ac_var in $ac_subst_vars | 3374 | for ac_var in $ac_subst_vars |
3359 | do | 3375 | do |
@@ -3366,11 +3382,9 @@ _ASBOX | |||
3366 | echo | 3382 | echo |
3367 | 3383 | ||
3368 | if test -n "$ac_subst_files"; then | 3384 | if test -n "$ac_subst_files"; then |
3369 | cat <<\_ASBOX | 3385 | $as_echo "## ------------------- ## |
3370 | ## ------------------- ## | ||
3371 | ## File substitutions. ## | 3386 | ## File substitutions. ## |
3372 | ## ------------------- ## | 3387 | ## ------------------- ##" |
3373 | _ASBOX | ||
3374 | echo | 3388 | echo |
3375 | for ac_var in $ac_subst_files | 3389 | for ac_var in $ac_subst_files |
3376 | do | 3390 | do |
@@ -3384,11 +3398,9 @@ _ASBOX | |||
3384 | fi | 3398 | fi |
3385 | 3399 | ||
3386 | if test -s confdefs.h; then | 3400 | if test -s confdefs.h; then |
3387 | cat <<\_ASBOX | 3401 | $as_echo "## ----------- ## |
3388 | ## ----------- ## | ||
3389 | ## confdefs.h. ## | 3402 | ## confdefs.h. ## |
3390 | ## ----------- ## | 3403 | ## ----------- ##" |
3391 | _ASBOX | ||
3392 | echo | 3404 | echo |
3393 | cat confdefs.h | 3405 | cat confdefs.h |
3394 | echo | 3406 | echo |
@@ -3443,7 +3455,12 @@ _ACEOF | |||
3443 | ac_site_file1=NONE | 3455 | ac_site_file1=NONE |
3444 | ac_site_file2=NONE | 3456 | ac_site_file2=NONE |
3445 | if test -n "$CONFIG_SITE"; then | 3457 | if test -n "$CONFIG_SITE"; then |
3446 | ac_site_file1=$CONFIG_SITE | 3458 | # We do not want a PATH search for config.site. |
3459 | case $CONFIG_SITE in #(( | ||
3460 | -*) ac_site_file1=./$CONFIG_SITE;; | ||
3461 | */*) ac_site_file1=$CONFIG_SITE;; | ||
3462 | *) ac_site_file1=./$CONFIG_SITE;; | ||
3463 | esac | ||
3447 | elif test "x$prefix" != xNONE; then | 3464 | elif test "x$prefix" != xNONE; then |
3448 | ac_site_file1=$prefix/share/config.site | 3465 | ac_site_file1=$prefix/share/config.site |
3449 | ac_site_file2=$prefix/etc/config.site | 3466 | ac_site_file2=$prefix/etc/config.site |
@@ -3458,7 +3475,11 @@ do | |||
3458 | { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 | 3475 | { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 |
3459 | $as_echo "$as_me: loading site script $ac_site_file" >&6;} | 3476 | $as_echo "$as_me: loading site script $ac_site_file" >&6;} |
3460 | sed 's/^/| /' "$ac_site_file" >&5 | 3477 | sed 's/^/| /' "$ac_site_file" >&5 |
3461 | . "$ac_site_file" | 3478 | . "$ac_site_file" \ |
3479 | || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
3480 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
3481 | as_fn_error $? "failed to load site script $ac_site_file | ||
3482 | See \`config.log' for more details" "$LINENO" 5 ; } | ||
3462 | fi | 3483 | fi |
3463 | done | 3484 | done |
3464 | 3485 | ||
@@ -3535,7 +3556,7 @@ if $ac_cache_corrupted; then | |||
3535 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 3556 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3536 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 | 3557 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 |
3537 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} | 3558 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
3538 | as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 | 3559 | as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
3539 | fi | 3560 | fi |
3540 | ## -------------------- ## | 3561 | ## -------------------- ## |
3541 | ## Main body of script. ## | 3562 | ## Main body of script. ## |
@@ -3561,16 +3582,22 @@ am__api_version='1.11' | |||
3561 | 3582 | ||
3562 | ac_aux_dir= | 3583 | ac_aux_dir= |
3563 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do | 3584 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do |
3564 | for ac_t in install-sh install.sh shtool; do | 3585 | if test -f "$ac_dir/install-sh"; then |
3565 | if test -f "$ac_dir/$ac_t"; then | 3586 | ac_aux_dir=$ac_dir |
3566 | ac_aux_dir=$ac_dir | 3587 | ac_install_sh="$ac_aux_dir/install-sh -c" |
3567 | ac_install_sh="$ac_aux_dir/$ac_t -c" | 3588 | break |
3568 | break 2 | 3589 | elif test -f "$ac_dir/install.sh"; then |
3569 | fi | 3590 | ac_aux_dir=$ac_dir |
3570 | done | 3591 | ac_install_sh="$ac_aux_dir/install.sh -c" |
3592 | break | ||
3593 | elif test -f "$ac_dir/shtool"; then | ||
3594 | ac_aux_dir=$ac_dir | ||
3595 | ac_install_sh="$ac_aux_dir/shtool install -c" | ||
3596 | break | ||
3597 | fi | ||
3571 | done | 3598 | done |
3572 | if test -z "$ac_aux_dir"; then | 3599 | if test -z "$ac_aux_dir"; then |
3573 | as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 | 3600 | as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 |
3574 | fi | 3601 | fi |
3575 | 3602 | ||
3576 | # These three variables are undocumented and unsupported, | 3603 | # These three variables are undocumented and unsupported, |
@@ -3686,11 +3713,11 @@ am_lf=' | |||
3686 | ' | 3713 | ' |
3687 | case `pwd` in | 3714 | case `pwd` in |
3688 | *[\\\"\#\$\&\'\`$am_lf]*) | 3715 | *[\\\"\#\$\&\'\`$am_lf]*) |
3689 | as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; | 3716 | as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; |
3690 | esac | 3717 | esac |
3691 | case $srcdir in | 3718 | case $srcdir in |
3692 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) | 3719 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) |
3693 | as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; | 3720 | as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; |
3694 | esac | 3721 | esac |
3695 | 3722 | ||
3696 | # Do `set' in a subshell so we don't clobber the current shell's | 3723 | # Do `set' in a subshell so we don't clobber the current shell's |
@@ -3712,7 +3739,7 @@ if ( | |||
3712 | # if, for instance, CONFIG_SHELL is bash and it inherits a | 3739 | # if, for instance, CONFIG_SHELL is bash and it inherits a |
3713 | # broken ls alias from the environment. This has actually | 3740 | # broken ls alias from the environment. This has actually |
3714 | # happened. Such a system could not be considered "sane". | 3741 | # happened. Such a system could not be considered "sane". |
3715 | as_fn_error "ls -t appears to fail. Make sure there is not a broken | 3742 | as_fn_error $? "ls -t appears to fail. Make sure there is not a broken |
3716 | alias in your environment" "$LINENO" 5 | 3743 | alias in your environment" "$LINENO" 5 |
3717 | fi | 3744 | fi |
3718 | 3745 | ||
@@ -3722,7 +3749,7 @@ then | |||
3722 | # Ok. | 3749 | # Ok. |
3723 | : | 3750 | : |
3724 | else | 3751 | else |
3725 | as_fn_error "newly created file is older than distributed files! | 3752 | as_fn_error $? "newly created file is older than distributed files! |
3726 | Check your system clock" "$LINENO" 5 | 3753 | Check your system clock" "$LINENO" 5 |
3727 | fi | 3754 | fi |
3728 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 3755 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
@@ -3960,7 +3987,7 @@ done | |||
3960 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } | 3987 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
3961 | set x ${MAKE-make} | 3988 | set x ${MAKE-make} |
3962 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` | 3989 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
3963 | if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : | 3990 | if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : |
3964 | $as_echo_n "(cached) " >&6 | 3991 | $as_echo_n "(cached) " >&6 |
3965 | else | 3992 | else |
3966 | cat >conftest.make <<\_ACEOF | 3993 | cat >conftest.make <<\_ACEOF |
@@ -3968,7 +3995,7 @@ SHELL = /bin/sh | |||
3968 | all: | 3995 | all: |
3969 | @echo '@@@%%%=$(MAKE)=@@@%%%' | 3996 | @echo '@@@%%%=$(MAKE)=@@@%%%' |
3970 | _ACEOF | 3997 | _ACEOF |
3971 | # GNU make sometimes prints "make[1]: Entering...", which would confuse us. | 3998 | # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. |
3972 | case `${MAKE-make} -f conftest.make 2>/dev/null` in | 3999 | case `${MAKE-make} -f conftest.make 2>/dev/null` in |
3973 | *@@@%%%=?*=@@@%%%*) | 4000 | *@@@%%%=?*=@@@%%%*) |
3974 | eval ac_cv_prog_make_${ac_make}_set=yes;; | 4001 | eval ac_cv_prog_make_${ac_make}_set=yes;; |
@@ -4002,7 +4029,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then | |||
4002 | am__isrc=' -I$(srcdir)' | 4029 | am__isrc=' -I$(srcdir)' |
4003 | # test to see if srcdir already configured | 4030 | # test to see if srcdir already configured |
4004 | if test -f $srcdir/config.status; then | 4031 | if test -f $srcdir/config.status; then |
4005 | as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 | 4032 | as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
4006 | fi | 4033 | fi |
4007 | fi | 4034 | fi |
4008 | 4035 | ||
@@ -4018,7 +4045,7 @@ fi | |||
4018 | 4045 | ||
4019 | # Define the identity of the package. | 4046 | # Define the identity of the package. |
4020 | PACKAGE='ecore' | 4047 | PACKAGE='ecore' |
4021 | VERSION='1.1.99.67344' | 4048 | VERSION='1.2.0-alpha' |
4022 | 4049 | ||
4023 | 4050 | ||
4024 | cat >>confdefs.h <<_ACEOF | 4051 | cat >>confdefs.h <<_ACEOF |
@@ -4433,8 +4460,8 @@ fi | |||
4433 | 4460 | ||
4434 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 4461 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4435 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 4462 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4436 | as_fn_error "no acceptable C compiler found in \$PATH | 4463 | as_fn_error $? "no acceptable C compiler found in \$PATH |
4437 | See \`config.log' for more details." "$LINENO" 5; } | 4464 | See \`config.log' for more details" "$LINENO" 5 ; } |
4438 | 4465 | ||
4439 | # Provide some information about the compiler. | 4466 | # Provide some information about the compiler. |
4440 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 | 4467 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
@@ -4548,9 +4575,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
4548 | 4575 | ||
4549 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 4576 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4550 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 4577 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4551 | { as_fn_set_status 77 | 4578 | as_fn_error 77 "C compiler cannot create executables |
4552 | as_fn_error "C compiler cannot create executables | 4579 | See \`config.log' for more details" "$LINENO" 5 ; } |
4553 | See \`config.log' for more details." "$LINENO" 5; }; } | ||
4554 | else | 4580 | else |
4555 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 4581 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
4556 | $as_echo "yes" >&6; } | 4582 | $as_echo "yes" >&6; } |
@@ -4592,8 +4618,8 @@ done | |||
4592 | else | 4618 | else |
4593 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 4619 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4594 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 4620 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4595 | as_fn_error "cannot compute suffix of executables: cannot compile and link | 4621 | as_fn_error $? "cannot compute suffix of executables: cannot compile and link |
4596 | See \`config.log' for more details." "$LINENO" 5; } | 4622 | See \`config.log' for more details" "$LINENO" 5 ; } |
4597 | fi | 4623 | fi |
4598 | rm -f conftest conftest$ac_cv_exeext | 4624 | rm -f conftest conftest$ac_cv_exeext |
4599 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 | 4625 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
@@ -4650,9 +4676,9 @@ $as_echo "$ac_try_echo"; } >&5 | |||
4650 | else | 4676 | else |
4651 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 4677 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4652 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 4678 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4653 | as_fn_error "cannot run C compiled programs. | 4679 | as_fn_error $? "cannot run C compiled programs. |
4654 | If you meant to cross compile, use \`--host'. | 4680 | If you meant to cross compile, use \`--host'. |
4655 | See \`config.log' for more details." "$LINENO" 5; } | 4681 | See \`config.log' for more details" "$LINENO" 5 ; } |
4656 | fi | 4682 | fi |
4657 | fi | 4683 | fi |
4658 | fi | 4684 | fi |
@@ -4703,8 +4729,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 | |||
4703 | 4729 | ||
4704 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 4730 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4705 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 4731 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4706 | as_fn_error "cannot compute suffix of object files: cannot compile | 4732 | as_fn_error $? "cannot compute suffix of object files: cannot compile |
4707 | See \`config.log' for more details." "$LINENO" 5; } | 4733 | See \`config.log' for more details" "$LINENO" 5 ; } |
4708 | fi | 4734 | fi |
4709 | rm -f conftest.$ac_cv_objext conftest.$ac_ext | 4735 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
4710 | fi | 4736 | fi |
@@ -5094,7 +5120,7 @@ else | |||
5094 | # Broken: fails on valid input. | 5120 | # Broken: fails on valid input. |
5095 | continue | 5121 | continue |
5096 | fi | 5122 | fi |
5097 | rm -f conftest.err conftest.$ac_ext | 5123 | rm -f conftest.err conftest.i conftest.$ac_ext |
5098 | 5124 | ||
5099 | # OK, works on sane cases. Now check whether nonexistent headers | 5125 | # OK, works on sane cases. Now check whether nonexistent headers |
5100 | # can be detected and how. | 5126 | # can be detected and how. |
@@ -5110,11 +5136,11 @@ else | |||
5110 | ac_preproc_ok=: | 5136 | ac_preproc_ok=: |
5111 | break | 5137 | break |
5112 | fi | 5138 | fi |
5113 | rm -f conftest.err conftest.$ac_ext | 5139 | rm -f conftest.err conftest.i conftest.$ac_ext |
5114 | 5140 | ||
5115 | done | 5141 | done |
5116 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. | 5142 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
5117 | rm -f conftest.err conftest.$ac_ext | 5143 | rm -f conftest.i conftest.err conftest.$ac_ext |
5118 | if $ac_preproc_ok; then : | 5144 | if $ac_preproc_ok; then : |
5119 | break | 5145 | break |
5120 | fi | 5146 | fi |
@@ -5153,7 +5179,7 @@ else | |||
5153 | # Broken: fails on valid input. | 5179 | # Broken: fails on valid input. |
5154 | continue | 5180 | continue |
5155 | fi | 5181 | fi |
5156 | rm -f conftest.err conftest.$ac_ext | 5182 | rm -f conftest.err conftest.i conftest.$ac_ext |
5157 | 5183 | ||
5158 | # OK, works on sane cases. Now check whether nonexistent headers | 5184 | # OK, works on sane cases. Now check whether nonexistent headers |
5159 | # can be detected and how. | 5185 | # can be detected and how. |
@@ -5169,18 +5195,18 @@ else | |||
5169 | ac_preproc_ok=: | 5195 | ac_preproc_ok=: |
5170 | break | 5196 | break |
5171 | fi | 5197 | fi |
5172 | rm -f conftest.err conftest.$ac_ext | 5198 | rm -f conftest.err conftest.i conftest.$ac_ext |
5173 | 5199 | ||
5174 | done | 5200 | done |
5175 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. | 5201 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
5176 | rm -f conftest.err conftest.$ac_ext | 5202 | rm -f conftest.i conftest.err conftest.$ac_ext |
5177 | if $ac_preproc_ok; then : | 5203 | if $ac_preproc_ok; then : |
5178 | 5204 | ||
5179 | else | 5205 | else |
5180 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 5206 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
5181 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 5207 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
5182 | as_fn_error "C preprocessor \"$CPP\" fails sanity check | 5208 | as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
5183 | See \`config.log' for more details." "$LINENO" 5; } | 5209 | See \`config.log' for more details" "$LINENO" 5 ; } |
5184 | fi | 5210 | fi |
5185 | 5211 | ||
5186 | ac_ext=c | 5212 | ac_ext=c |
@@ -5241,7 +5267,7 @@ esac | |||
5241 | done | 5267 | done |
5242 | IFS=$as_save_IFS | 5268 | IFS=$as_save_IFS |
5243 | if test -z "$ac_cv_path_GREP"; then | 5269 | if test -z "$ac_cv_path_GREP"; then |
5244 | as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 | 5270 | as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
5245 | fi | 5271 | fi |
5246 | else | 5272 | else |
5247 | ac_cv_path_GREP=$GREP | 5273 | ac_cv_path_GREP=$GREP |
@@ -5307,7 +5333,7 @@ esac | |||
5307 | done | 5333 | done |
5308 | IFS=$as_save_IFS | 5334 | IFS=$as_save_IFS |
5309 | if test -z "$ac_cv_path_EGREP"; then | 5335 | if test -z "$ac_cv_path_EGREP"; then |
5310 | as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 | 5336 | as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
5311 | fi | 5337 | fi |
5312 | else | 5338 | else |
5313 | ac_cv_path_EGREP=$EGREP | 5339 | ac_cv_path_EGREP=$EGREP |
@@ -5439,8 +5465,7 @@ do : | |||
5439 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | 5465 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
5440 | ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default | 5466 | ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default |
5441 | " | 5467 | " |
5442 | eval as_val=\$$as_ac_Header | 5468 | if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
5443 | if test "x$as_val" = x""yes; then : | ||
5444 | cat >>confdefs.h <<_ACEOF | 5469 | cat >>confdefs.h <<_ACEOF |
5445 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 5470 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
5446 | _ACEOF | 5471 | _ACEOF |
@@ -5515,7 +5540,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; } | |||
5515 | 5540 | ||
5516 | # Make sure we can run config.sub. | 5541 | # Make sure we can run config.sub. |
5517 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | 5542 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
5518 | as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 | 5543 | as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
5519 | 5544 | ||
5520 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 | 5545 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 |
5521 | $as_echo_n "checking build system type... " >&6; } | 5546 | $as_echo_n "checking build system type... " >&6; } |
@@ -5526,16 +5551,16 @@ else | |||
5526 | test "x$ac_build_alias" = x && | 5551 | test "x$ac_build_alias" = x && |
5527 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` | 5552 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` |
5528 | test "x$ac_build_alias" = x && | 5553 | test "x$ac_build_alias" = x && |
5529 | as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 | 5554 | as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 |
5530 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || | 5555 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || |
5531 | as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 | 5556 | as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
5532 | 5557 | ||
5533 | fi | 5558 | fi |
5534 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 | 5559 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 |
5535 | $as_echo "$ac_cv_build" >&6; } | 5560 | $as_echo "$ac_cv_build" >&6; } |
5536 | case $ac_cv_build in | 5561 | case $ac_cv_build in |
5537 | *-*-*) ;; | 5562 | *-*-*) ;; |
5538 | *) as_fn_error "invalid value of canonical build" "$LINENO" 5;; | 5563 | *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; |
5539 | esac | 5564 | esac |
5540 | build=$ac_cv_build | 5565 | build=$ac_cv_build |
5541 | ac_save_IFS=$IFS; IFS='-' | 5566 | ac_save_IFS=$IFS; IFS='-' |
@@ -5560,7 +5585,7 @@ else | |||
5560 | ac_cv_host=$ac_cv_build | 5585 | ac_cv_host=$ac_cv_build |
5561 | else | 5586 | else |
5562 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || | 5587 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || |
5563 | as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 | 5588 | as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
5564 | fi | 5589 | fi |
5565 | 5590 | ||
5566 | fi | 5591 | fi |
@@ -5568,7 +5593,7 @@ fi | |||
5568 | $as_echo "$ac_cv_host" >&6; } | 5593 | $as_echo "$ac_cv_host" >&6; } |
5569 | case $ac_cv_host in | 5594 | case $ac_cv_host in |
5570 | *-*-*) ;; | 5595 | *-*-*) ;; |
5571 | *) as_fn_error "invalid value of canonical host" "$LINENO" 5;; | 5596 | *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; |
5572 | esac | 5597 | esac |
5573 | host=$ac_cv_host | 5598 | host=$ac_cv_host |
5574 | ac_save_IFS=$IFS; IFS='-' | 5599 | ac_save_IFS=$IFS; IFS='-' |
@@ -5969,7 +5994,7 @@ esac | |||
5969 | done | 5994 | done |
5970 | IFS=$as_save_IFS | 5995 | IFS=$as_save_IFS |
5971 | if test -z "$ac_cv_path_SED"; then | 5996 | if test -z "$ac_cv_path_SED"; then |
5972 | as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 | 5997 | as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
5973 | fi | 5998 | fi |
5974 | else | 5999 | else |
5975 | ac_cv_path_SED=$SED | 6000 | ac_cv_path_SED=$SED |
@@ -6048,7 +6073,7 @@ esac | |||
6048 | done | 6073 | done |
6049 | IFS=$as_save_IFS | 6074 | IFS=$as_save_IFS |
6050 | if test -z "$ac_cv_path_FGREP"; then | 6075 | if test -z "$ac_cv_path_FGREP"; then |
6051 | as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 | 6076 | as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
6052 | fi | 6077 | fi |
6053 | else | 6078 | else |
6054 | ac_cv_path_FGREP=$FGREP | 6079 | ac_cv_path_FGREP=$FGREP |
@@ -6164,7 +6189,7 @@ else | |||
6164 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 6189 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
6165 | $as_echo "no" >&6; } | 6190 | $as_echo "no" >&6; } |
6166 | fi | 6191 | fi |
6167 | test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 | 6192 | test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 |
6168 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 | 6193 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 |
6169 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } | 6194 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
6170 | if test "${lt_cv_prog_gnu_ld+set}" = set; then : | 6195 | if test "${lt_cv_prog_gnu_ld+set}" = set; then : |
@@ -6366,13 +6391,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : | |||
6366 | else | 6391 | else |
6367 | lt_cv_nm_interface="BSD nm" | 6392 | lt_cv_nm_interface="BSD nm" |
6368 | echo "int some_variable = 0;" > conftest.$ac_ext | 6393 | echo "int some_variable = 0;" > conftest.$ac_ext |
6369 | (eval echo "\"\$as_me:6369: $ac_compile\"" >&5) | 6394 | (eval echo "\"\$as_me:6394: $ac_compile\"" >&5) |
6370 | (eval "$ac_compile" 2>conftest.err) | 6395 | (eval "$ac_compile" 2>conftest.err) |
6371 | cat conftest.err >&5 | 6396 | cat conftest.err >&5 |
6372 | (eval echo "\"\$as_me:6372: $NM \\\"conftest.$ac_objext\\\"\"" >&5) | 6397 | (eval echo "\"\$as_me:6397: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
6373 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) | 6398 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
6374 | cat conftest.err >&5 | 6399 | cat conftest.err >&5 |
6375 | (eval echo "\"\$as_me:6375: output\"" >&5) | 6400 | (eval echo "\"\$as_me:6400: output\"" >&5) |
6376 | cat conftest.out >&5 | 6401 | cat conftest.out >&5 |
6377 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then | 6402 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
6378 | lt_cv_nm_interface="MS dumpbin" | 6403 | lt_cv_nm_interface="MS dumpbin" |
@@ -7574,7 +7599,7 @@ ia64-*-hpux*) | |||
7574 | ;; | 7599 | ;; |
7575 | *-*-irix6*) | 7600 | *-*-irix6*) |
7576 | # Find out which ABI we are using. | 7601 | # Find out which ABI we are using. |
7577 | echo '#line 7577 "configure"' > conftest.$ac_ext | 7602 | echo '#line 7602 "configure"' > conftest.$ac_ext |
7578 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 7603 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
7579 | (eval $ac_compile) 2>&5 | 7604 | (eval $ac_compile) 2>&5 |
7580 | ac_status=$? | 7605 | ac_status=$? |
@@ -8834,11 +8859,11 @@ else | |||
8834 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 8859 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
8835 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 8860 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
8836 | -e 's:$: $lt_compiler_flag:'` | 8861 | -e 's:$: $lt_compiler_flag:'` |
8837 | (eval echo "\"\$as_me:8837: $lt_compile\"" >&5) | 8862 | (eval echo "\"\$as_me:8862: $lt_compile\"" >&5) |
8838 | (eval "$lt_compile" 2>conftest.err) | 8863 | (eval "$lt_compile" 2>conftest.err) |
8839 | ac_status=$? | 8864 | ac_status=$? |
8840 | cat conftest.err >&5 | 8865 | cat conftest.err >&5 |
8841 | echo "$as_me:8841: \$? = $ac_status" >&5 | 8866 | echo "$as_me:8866: \$? = $ac_status" >&5 |
8842 | if (exit $ac_status) && test -s "$ac_outfile"; then | 8867 | if (exit $ac_status) && test -s "$ac_outfile"; then |
8843 | # The compiler can only warn and ignore the option if not recognized | 8868 | # The compiler can only warn and ignore the option if not recognized |
8844 | # So say no if there are warnings other than the usual output. | 8869 | # So say no if there are warnings other than the usual output. |
@@ -9173,11 +9198,11 @@ else | |||
9173 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 9198 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
9174 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 9199 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
9175 | -e 's:$: $lt_compiler_flag:'` | 9200 | -e 's:$: $lt_compiler_flag:'` |
9176 | (eval echo "\"\$as_me:9176: $lt_compile\"" >&5) | 9201 | (eval echo "\"\$as_me:9201: $lt_compile\"" >&5) |
9177 | (eval "$lt_compile" 2>conftest.err) | 9202 | (eval "$lt_compile" 2>conftest.err) |
9178 | ac_status=$? | 9203 | ac_status=$? |
9179 | cat conftest.err >&5 | 9204 | cat conftest.err >&5 |
9180 | echo "$as_me:9180: \$? = $ac_status" >&5 | 9205 | echo "$as_me:9205: \$? = $ac_status" >&5 |
9181 | if (exit $ac_status) && test -s "$ac_outfile"; then | 9206 | if (exit $ac_status) && test -s "$ac_outfile"; then |
9182 | # The compiler can only warn and ignore the option if not recognized | 9207 | # The compiler can only warn and ignore the option if not recognized |
9183 | # So say no if there are warnings other than the usual output. | 9208 | # So say no if there are warnings other than the usual output. |
@@ -9278,11 +9303,11 @@ else | |||
9278 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 9303 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
9279 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 9304 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
9280 | -e 's:$: $lt_compiler_flag:'` | 9305 | -e 's:$: $lt_compiler_flag:'` |
9281 | (eval echo "\"\$as_me:9281: $lt_compile\"" >&5) | 9306 | (eval echo "\"\$as_me:9306: $lt_compile\"" >&5) |
9282 | (eval "$lt_compile" 2>out/conftest.err) | 9307 | (eval "$lt_compile" 2>out/conftest.err) |
9283 | ac_status=$? | 9308 | ac_status=$? |
9284 | cat out/conftest.err >&5 | 9309 | cat out/conftest.err >&5 |
9285 | echo "$as_me:9285: \$? = $ac_status" >&5 | 9310 | echo "$as_me:9310: \$? = $ac_status" >&5 |
9286 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 9311 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
9287 | then | 9312 | then |
9288 | # The compiler can only warn and ignore the option if not recognized | 9313 | # The compiler can only warn and ignore the option if not recognized |
@@ -9333,11 +9358,11 @@ else | |||
9333 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 9358 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
9334 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 9359 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
9335 | -e 's:$: $lt_compiler_flag:'` | 9360 | -e 's:$: $lt_compiler_flag:'` |
9336 | (eval echo "\"\$as_me:9336: $lt_compile\"" >&5) | 9361 | (eval echo "\"\$as_me:9361: $lt_compile\"" >&5) |
9337 | (eval "$lt_compile" 2>out/conftest.err) | 9362 | (eval "$lt_compile" 2>out/conftest.err) |
9338 | ac_status=$? | 9363 | ac_status=$? |
9339 | cat out/conftest.err >&5 | 9364 | cat out/conftest.err >&5 |
9340 | echo "$as_me:9340: \$? = $ac_status" >&5 | 9365 | echo "$as_me:9365: \$? = $ac_status" >&5 |
9341 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 9366 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
9342 | then | 9367 | then |
9343 | # The compiler can only warn and ignore the option if not recognized | 9368 | # The compiler can only warn and ignore the option if not recognized |
@@ -11717,7 +11742,7 @@ else | |||
11717 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 11742 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
11718 | lt_status=$lt_dlunknown | 11743 | lt_status=$lt_dlunknown |
11719 | cat > conftest.$ac_ext <<_LT_EOF | 11744 | cat > conftest.$ac_ext <<_LT_EOF |
11720 | #line 11720 "configure" | 11745 | #line 11745 "configure" |
11721 | #include "confdefs.h" | 11746 | #include "confdefs.h" |
11722 | 11747 | ||
11723 | #if HAVE_DLFCN_H | 11748 | #if HAVE_DLFCN_H |
@@ -11813,7 +11838,7 @@ else | |||
11813 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 11838 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
11814 | lt_status=$lt_dlunknown | 11839 | lt_status=$lt_dlunknown |
11815 | cat > conftest.$ac_ext <<_LT_EOF | 11840 | cat > conftest.$ac_ext <<_LT_EOF |
11816 | #line 11816 "configure" | 11841 | #line 11841 "configure" |
11817 | #include "confdefs.h" | 11842 | #include "confdefs.h" |
11818 | 11843 | ||
11819 | #if HAVE_DLFCN_H | 11844 | #if HAVE_DLFCN_H |
@@ -12052,20 +12077,20 @@ _ACEOF | |||
12052 | 12077 | ||
12053 | 12078 | ||
12054 | cat >>confdefs.h <<_ACEOF | 12079 | cat >>confdefs.h <<_ACEOF |
12055 | #define VERS_MIN 1 | 12080 | #define VERS_MIN 2 |
12056 | _ACEOF | 12081 | _ACEOF |
12057 | 12082 | ||
12058 | 12083 | ||
12059 | cat >>confdefs.h <<_ACEOF | 12084 | cat >>confdefs.h <<_ACEOF |
12060 | #define VERS_MIC 99 | 12085 | #define VERS_MIC 0 |
12061 | _ACEOF | 12086 | _ACEOF |
12062 | 12087 | ||
12063 | 12088 | ||
12064 | cat >>confdefs.h <<_ACEOF | 12089 | cat >>confdefs.h <<_ACEOF |
12065 | #define VERS_REV 67344 | 12090 | #define VERS_REV 0 |
12066 | _ACEOF | 12091 | _ACEOF |
12067 | 12092 | ||
12068 | version_info="2:99:1" | 12093 | version_info="3:0:2" |
12069 | release_info="" | 12094 | release_info="" |
12070 | 12095 | ||
12071 | 12096 | ||
@@ -12489,7 +12514,7 @@ else | |||
12489 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 12514 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
12490 | $as_echo "no" >&6; } | 12515 | $as_echo "no" >&6; } |
12491 | fi | 12516 | fi |
12492 | test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 | 12517 | test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 |
12493 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 | 12518 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 |
12494 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } | 12519 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
12495 | if test "${acl_cv_prog_gnu_ld+set}" = set; then : | 12520 | if test "${acl_cv_prog_gnu_ld+set}" = set; then : |
@@ -13136,7 +13161,7 @@ typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; | |||
13136 | 13161 | ||
13137 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 | 13162 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 |
13138 | $as_echo_n "checking for GNU gettext in libc... " >&6; } | 13163 | $as_echo_n "checking for GNU gettext in libc... " >&6; } |
13139 | if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then : | 13164 | if eval "test \"\${$gt_func_gnugettext_libc+set}\"" = set; then : |
13140 | $as_echo_n "(cached) " >&6 | 13165 | $as_echo_n "(cached) " >&6 |
13141 | else | 13166 | else |
13142 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 13167 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
@@ -13807,7 +13832,7 @@ fi | |||
13807 | 13832 | ||
13808 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 | 13833 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 |
13809 | $as_echo_n "checking for GNU gettext in libintl... " >&6; } | 13834 | $as_echo_n "checking for GNU gettext in libintl... " >&6; } |
13810 | if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then : | 13835 | if eval "test \"\${$gt_func_gnugettext_libintl+set}\"" = set; then : |
13811 | $as_echo_n "(cached) " >&6 | 13836 | $as_echo_n "(cached) " >&6 |
13812 | else | 13837 | else |
13813 | gt_save_CPPFLAGS="$CPPFLAGS" | 13838 | gt_save_CPPFLAGS="$CPPFLAGS" |
@@ -14016,7 +14041,7 @@ _ACEOF | |||
14016 | 14041 | ||
14017 | with_max_log_level="${withval}" | 14042 | with_max_log_level="${withval}" |
14018 | else | 14043 | else |
14019 | as_fn_error "--with-internal-maximum-log-level takes a decimal number, got \"${withval}\" instead." "$LINENO" 5 | 14044 | as_fn_error $? "--with-internal-maximum-log-level takes a decimal number, got \"${withval}\" instead." "$LINENO" 5 |
14020 | fi | 14045 | fi |
14021 | fi | 14046 | fi |
14022 | 14047 | ||
@@ -14106,6 +14131,7 @@ want_ecore_evas_directfb="no" | |||
14106 | want_ecore_evas_fb="no" | 14131 | want_ecore_evas_fb="no" |
14107 | want_ecore_evas_software_16_wince="no" | 14132 | want_ecore_evas_software_16_wince="no" |
14108 | want_ecore_evas_ews="yes" | 14133 | want_ecore_evas_ews="yes" |
14134 | want_ecore_evas_extn="yes" | ||
14109 | want_ecore_evas_wayland_shm="no" | 14135 | want_ecore_evas_wayland_shm="no" |
14110 | want_ecore_evas_wayland_egl="no" | 14136 | want_ecore_evas_wayland_egl="no" |
14111 | 14137 | ||
@@ -14114,11 +14140,12 @@ want_ecore_imf_xim="no" | |||
14114 | want_ecore_imf_scim="no" | 14140 | want_ecore_imf_scim="no" |
14115 | 14141 | ||
14116 | case "$host_os" in | 14142 | case "$host_os" in |
14117 | mingw32ce* | cegcc*) | 14143 | mingw32ce*) |
14118 | want_ecore_con="no" | 14144 | want_ecore_con="no" |
14119 | want_ecore_ipc="no" | 14145 | want_ecore_ipc="no" |
14120 | want_ecore_wince="yes" | 14146 | want_ecore_wince="yes" |
14121 | want_ecore_evas_software_16_wince="yes" | 14147 | want_ecore_evas_software_16_wince="yes" |
14148 | want_ecore_evas_extn="no" | ||
14122 | ;; | 14149 | ;; |
14123 | mingw*) | 14150 | mingw*) |
14124 | want_notify_win32="yes" | 14151 | want_notify_win32="yes" |
@@ -14205,60 +14232,6 @@ requirements_ecore_imf_xim="" | |||
14205 | requirements_ecore_imf_scim="" | 14232 | requirements_ecore_imf_scim="" |
14206 | requirements_ecore_wayland="" | 14233 | requirements_ecore_wayland="" |
14207 | 14234 | ||
14208 | ac_fn_c_check_decl "$LINENO" "MAXHOSTNAMELEN" "ac_cv_have_decl_MAXHOSTNAMELEN" "$ac_includes_default" | ||
14209 | if test "x$ac_cv_have_decl_MAXHOSTNAMELEN" = x""yes; then : | ||
14210 | FOUND_MAXHOSTNAMELEN=yes | ||
14211 | fi | ||
14212 | |||
14213 | |||
14214 | if test x$FOUND_MAXHOSTNAMELEN != xyes ; then | ||
14215 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for header that defines MAXHOSTNAMELEN" >&5 | ||
14216 | $as_echo_n "checking for header that defines MAXHOSTNAMELEN... " >&6; } | ||
14217 | |||
14218 | FOUND_MAXHOSTNAMELEN='not found' | ||
14219 | |||
14220 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
14221 | /* end confdefs.h. */ | ||
14222 | #include <sys/param.h> | ||
14223 | int | ||
14224 | main () | ||
14225 | { | ||
14226 | int h = MAXHOSTNAMELEN; | ||
14227 | ; | ||
14228 | return 0; | ||
14229 | } | ||
14230 | _ACEOF | ||
14231 | if ac_fn_c_try_compile "$LINENO"; then : | ||
14232 | FOUND_MAXHOSTNAMELEN='sys/param.h' | ||
14233 | |||
14234 | $as_echo "#define NEED_SYS_PARAM_H 1" >>confdefs.h | ||
14235 | |||
14236 | fi | ||
14237 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14238 | |||
14239 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
14240 | /* end confdefs.h. */ | ||
14241 | #include <netdb.h> | ||
14242 | int | ||
14243 | main () | ||
14244 | { | ||
14245 | int h = MAXHOSTNAMELEN; | ||
14246 | ; | ||
14247 | return 0; | ||
14248 | } | ||
14249 | _ACEOF | ||
14250 | if ac_fn_c_try_compile "$LINENO"; then : | ||
14251 | FOUND_MAXHOSTNAMELEN='netdb.h' | ||
14252 | |||
14253 | $as_echo "#define NEED_NETDB_H 1" >>confdefs.h | ||
14254 | |||
14255 | fi | ||
14256 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
14257 | |||
14258 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOUND_MAXHOSTNAMELEN" >&5 | ||
14259 | $as_echo "$FOUND_MAXHOSTNAMELEN" >&6; } | ||
14260 | fi | ||
14261 | |||
14262 | ### Additional options to configure | 14235 | ### Additional options to configure |
14263 | 14236 | ||
14264 | want_glib_integration_always=no | 14237 | want_glib_integration_always=no |
@@ -14290,7 +14263,7 @@ $as_echo "#define USE_G_MAIN_LOOP 1" >>confdefs.h | |||
14290 | fi | 14263 | fi |
14291 | 14264 | ||
14292 | if test "x${want_glib_integration_always}" = "xyes" -a "x${want_g_main_loop}" = "xyes"; then | 14265 | if test "x${want_glib_integration_always}" = "xyes" -a "x${want_g_main_loop}" = "xyes"; then |
14293 | as_fn_error "--enable-glib-integration-always and --enable-glib-main-loop are mutually exclusive" "$LINENO" 5 | 14266 | as_fn_error $? "--enable-glib-integration-always and --enable-glib-main-loop are mutually exclusive" "$LINENO" 5 |
14294 | fi | 14267 | fi |
14295 | 14268 | ||
14296 | # local sockets (ecore_con.c) | 14269 | # local sockets (ecore_con.c) |
@@ -14364,238 +14337,6 @@ $as_echo "#define ENABLE_XIM 1" >>confdefs.h | |||
14364 | 14337 | ||
14365 | fi | 14338 | fi |
14366 | 14339 | ||
14367 | # Unit tests | ||
14368 | |||
14369 | |||
14370 | |||
14371 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
14372 | if test -n "$ac_tool_prefix"; then | ||
14373 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
14374 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
14375 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
14376 | $as_echo_n "checking for $ac_word... " >&6; } | ||
14377 | if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : | ||
14378 | $as_echo_n "(cached) " >&6 | ||
14379 | else | ||
14380 | case $PKG_CONFIG in | ||
14381 | [\\/]* | ?:[\\/]*) | ||
14382 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
14383 | ;; | ||
14384 | *) | ||
14385 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
14386 | for as_dir in $PATH | ||
14387 | do | ||
14388 | IFS=$as_save_IFS | ||
14389 | test -z "$as_dir" && as_dir=. | ||
14390 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
14391 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
14392 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
14393 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
14394 | break 2 | ||
14395 | fi | ||
14396 | done | ||
14397 | done | ||
14398 | IFS=$as_save_IFS | ||
14399 | |||
14400 | ;; | ||
14401 | esac | ||
14402 | fi | ||
14403 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
14404 | if test -n "$PKG_CONFIG"; then | ||
14405 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 | ||
14406 | $as_echo "$PKG_CONFIG" >&6; } | ||
14407 | else | ||
14408 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
14409 | $as_echo "no" >&6; } | ||
14410 | fi | ||
14411 | |||
14412 | |||
14413 | fi | ||
14414 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
14415 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
14416 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
14417 | set dummy pkg-config; ac_word=$2 | ||
14418 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
14419 | $as_echo_n "checking for $ac_word... " >&6; } | ||
14420 | if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : | ||
14421 | $as_echo_n "(cached) " >&6 | ||
14422 | else | ||
14423 | case $ac_pt_PKG_CONFIG in | ||
14424 | [\\/]* | ?:[\\/]*) | ||
14425 | ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. | ||
14426 | ;; | ||
14427 | *) | ||
14428 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
14429 | for as_dir in $PATH | ||
14430 | do | ||
14431 | IFS=$as_save_IFS | ||
14432 | test -z "$as_dir" && as_dir=. | ||
14433 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
14434 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
14435 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
14436 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
14437 | break 2 | ||
14438 | fi | ||
14439 | done | ||
14440 | done | ||
14441 | IFS=$as_save_IFS | ||
14442 | |||
14443 | ;; | ||
14444 | esac | ||
14445 | fi | ||
14446 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
14447 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
14448 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 | ||
14449 | $as_echo "$ac_pt_PKG_CONFIG" >&6; } | ||
14450 | else | ||
14451 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
14452 | $as_echo "no" >&6; } | ||
14453 | fi | ||
14454 | |||
14455 | if test "x$ac_pt_PKG_CONFIG" = x; then | ||
14456 | PKG_CONFIG="" | ||
14457 | else | ||
14458 | case $cross_compiling:$ac_tool_warned in | ||
14459 | yes:) | ||
14460 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
14461 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
14462 | ac_tool_warned=yes ;; | ||
14463 | esac | ||
14464 | PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
14465 | fi | ||
14466 | else | ||
14467 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
14468 | fi | ||
14469 | |||
14470 | fi | ||
14471 | if test -n "$PKG_CONFIG"; then | ||
14472 | _pkg_min_version=0.9.0 | ||
14473 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
14474 | $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } | ||
14475 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
14476 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
14477 | $as_echo "yes" >&6; } | ||
14478 | else | ||
14479 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
14480 | $as_echo "no" >&6; } | ||
14481 | PKG_CONFIG="" | ||
14482 | fi | ||
14483 | |||
14484 | fi | ||
14485 | |||
14486 | |||
14487 | |||
14488 | # Check whether --enable-tests was given. | ||
14489 | if test "${enable_tests+set}" = set; then : | ||
14490 | enableval=$enable_tests; | ||
14491 | if test "x${enableval}" = "xyes" ; then | ||
14492 | _efl_enable_tests="yes" | ||
14493 | else | ||
14494 | _efl_enable_tests="no" | ||
14495 | fi | ||
14496 | |||
14497 | else | ||
14498 | _efl_enable_tests="no" | ||
14499 | fi | ||
14500 | |||
14501 | |||
14502 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tests are built" >&5 | ||
14503 | $as_echo_n "checking whether tests are built... " >&6; } | ||
14504 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_efl_enable_tests}" >&5 | ||
14505 | $as_echo "${_efl_enable_tests}" >&6; } | ||
14506 | |||
14507 | |||
14508 | |||
14509 | if test "x${_efl_enable_tests}" = "xyes" ; then | ||
14510 | |||
14511 | pkg_failed=no | ||
14512 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5 | ||
14513 | $as_echo_n "checking for CHECK... " >&6; } | ||
14514 | |||
14515 | if test -n "$PKG_CONFIG"; then | ||
14516 | if test -n "$CHECK_CFLAGS"; then | ||
14517 | pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS" | ||
14518 | else | ||
14519 | if test -n "$PKG_CONFIG" && \ | ||
14520 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5 | ||
14521 | ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5 | ||
14522 | ac_status=$? | ||
14523 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
14524 | test $ac_status = 0; }; then | ||
14525 | pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >= 0.9.5" 2>/dev/null` | ||
14526 | else | ||
14527 | pkg_failed=yes | ||
14528 | fi | ||
14529 | fi | ||
14530 | else | ||
14531 | pkg_failed=untried | ||
14532 | fi | ||
14533 | if test -n "$PKG_CONFIG"; then | ||
14534 | if test -n "$CHECK_LIBS"; then | ||
14535 | pkg_cv_CHECK_LIBS="$CHECK_LIBS" | ||
14536 | else | ||
14537 | if test -n "$PKG_CONFIG" && \ | ||
14538 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5 | ||
14539 | ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5 | ||
14540 | ac_status=$? | ||
14541 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
14542 | test $ac_status = 0; }; then | ||
14543 | pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >= 0.9.5" 2>/dev/null` | ||
14544 | else | ||
14545 | pkg_failed=yes | ||
14546 | fi | ||
14547 | fi | ||
14548 | else | ||
14549 | pkg_failed=untried | ||
14550 | fi | ||
14551 | |||
14552 | |||
14553 | |||
14554 | if test $pkg_failed = yes; then | ||
14555 | |||
14556 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | ||
14557 | _pkg_short_errors_supported=yes | ||
14558 | else | ||
14559 | _pkg_short_errors_supported=no | ||
14560 | fi | ||
14561 | if test $_pkg_short_errors_supported = yes; then | ||
14562 | CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "check >= 0.9.5"` | ||
14563 | else | ||
14564 | CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "check >= 0.9.5"` | ||
14565 | fi | ||
14566 | # Put the nasty error message in config.log where it belongs | ||
14567 | echo "$CHECK_PKG_ERRORS" >&5 | ||
14568 | |||
14569 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
14570 | $as_echo "no" >&6; } | ||
14571 | _efl_enable_tests="no" | ||
14572 | elif test $pkg_failed = untried; then | ||
14573 | _efl_enable_tests="no" | ||
14574 | else | ||
14575 | CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS | ||
14576 | CHECK_LIBS=$pkg_cv_CHECK_LIBS | ||
14577 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
14578 | $as_echo "yes" >&6; } | ||
14579 | dummy="yes" | ||
14580 | fi | ||
14581 | fi | ||
14582 | |||
14583 | if test "x${_efl_enable_tests}" = "xyes"; then | ||
14584 | EFL_ENABLE_TESTS_TRUE= | ||
14585 | EFL_ENABLE_TESTS_FALSE='#' | ||
14586 | else | ||
14587 | EFL_ENABLE_TESTS_TRUE='#' | ||
14588 | EFL_ENABLE_TESTS_FALSE= | ||
14589 | fi | ||
14590 | |||
14591 | |||
14592 | if test "x$_efl_enable_tests" = "xyes"; then : | ||
14593 | enable_tests="yes" | ||
14594 | else | ||
14595 | enable_tests="no" | ||
14596 | fi | ||
14597 | |||
14598 | |||
14599 | ### Checks for programs | 14340 | ### Checks for programs |
14600 | 14341 | ||
14601 | 14342 | ||
@@ -15923,7 +15664,7 @@ else | |||
15923 | # Broken: fails on valid input. | 15664 | # Broken: fails on valid input. |
15924 | continue | 15665 | continue |
15925 | fi | 15666 | fi |
15926 | rm -f conftest.err conftest.$ac_ext | 15667 | rm -f conftest.err conftest.i conftest.$ac_ext |
15927 | 15668 | ||
15928 | # OK, works on sane cases. Now check whether nonexistent headers | 15669 | # OK, works on sane cases. Now check whether nonexistent headers |
15929 | # can be detected and how. | 15670 | # can be detected and how. |
@@ -15939,11 +15680,11 @@ else | |||
15939 | ac_preproc_ok=: | 15680 | ac_preproc_ok=: |
15940 | break | 15681 | break |
15941 | fi | 15682 | fi |
15942 | rm -f conftest.err conftest.$ac_ext | 15683 | rm -f conftest.err conftest.i conftest.$ac_ext |
15943 | 15684 | ||
15944 | done | 15685 | done |
15945 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. | 15686 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
15946 | rm -f conftest.err conftest.$ac_ext | 15687 | rm -f conftest.i conftest.err conftest.$ac_ext |
15947 | if $ac_preproc_ok; then : | 15688 | if $ac_preproc_ok; then : |
15948 | break | 15689 | break |
15949 | fi | 15690 | fi |
@@ -15982,7 +15723,7 @@ else | |||
15982 | # Broken: fails on valid input. | 15723 | # Broken: fails on valid input. |
15983 | continue | 15724 | continue |
15984 | fi | 15725 | fi |
15985 | rm -f conftest.err conftest.$ac_ext | 15726 | rm -f conftest.err conftest.i conftest.$ac_ext |
15986 | 15727 | ||
15987 | # OK, works on sane cases. Now check whether nonexistent headers | 15728 | # OK, works on sane cases. Now check whether nonexistent headers |
15988 | # can be detected and how. | 15729 | # can be detected and how. |
@@ -15998,11 +15739,11 @@ else | |||
15998 | ac_preproc_ok=: | 15739 | ac_preproc_ok=: |
15999 | break | 15740 | break |
16000 | fi | 15741 | fi |
16001 | rm -f conftest.err conftest.$ac_ext | 15742 | rm -f conftest.err conftest.i conftest.$ac_ext |
16002 | 15743 | ||
16003 | done | 15744 | done |
16004 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. | 15745 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
16005 | rm -f conftest.err conftest.$ac_ext | 15746 | rm -f conftest.i conftest.err conftest.$ac_ext |
16006 | if $ac_preproc_ok; then : | 15747 | if $ac_preproc_ok; then : |
16007 | 15748 | ||
16008 | else | 15749 | else |
@@ -16231,7 +15972,7 @@ else | |||
16231 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 15972 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
16232 | $as_echo "no" >&6; } | 15973 | $as_echo "no" >&6; } |
16233 | fi | 15974 | fi |
16234 | test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 | 15975 | test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 |
16235 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 | 15976 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 |
16236 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } | 15977 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
16237 | if test "${lt_cv_prog_gnu_ld+set}" = set; then : | 15978 | if test "${lt_cv_prog_gnu_ld+set}" = set; then : |
@@ -17772,11 +17513,11 @@ else | |||
17772 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 17513 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
17773 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 17514 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
17774 | -e 's:$: $lt_compiler_flag:'` | 17515 | -e 's:$: $lt_compiler_flag:'` |
17775 | (eval echo "\"\$as_me:17775: $lt_compile\"" >&5) | 17516 | (eval echo "\"\$as_me:17516: $lt_compile\"" >&5) |
17776 | (eval "$lt_compile" 2>conftest.err) | 17517 | (eval "$lt_compile" 2>conftest.err) |
17777 | ac_status=$? | 17518 | ac_status=$? |
17778 | cat conftest.err >&5 | 17519 | cat conftest.err >&5 |
17779 | echo "$as_me:17779: \$? = $ac_status" >&5 | 17520 | echo "$as_me:17520: \$? = $ac_status" >&5 |
17780 | if (exit $ac_status) && test -s "$ac_outfile"; then | 17521 | if (exit $ac_status) && test -s "$ac_outfile"; then |
17781 | # The compiler can only warn and ignore the option if not recognized | 17522 | # The compiler can only warn and ignore the option if not recognized |
17782 | # So say no if there are warnings other than the usual output. | 17523 | # So say no if there are warnings other than the usual output. |
@@ -17871,11 +17612,11 @@ else | |||
17871 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 17612 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
17872 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 17613 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
17873 | -e 's:$: $lt_compiler_flag:'` | 17614 | -e 's:$: $lt_compiler_flag:'` |
17874 | (eval echo "\"\$as_me:17874: $lt_compile\"" >&5) | 17615 | (eval echo "\"\$as_me:17615: $lt_compile\"" >&5) |
17875 | (eval "$lt_compile" 2>out/conftest.err) | 17616 | (eval "$lt_compile" 2>out/conftest.err) |
17876 | ac_status=$? | 17617 | ac_status=$? |
17877 | cat out/conftest.err >&5 | 17618 | cat out/conftest.err >&5 |
17878 | echo "$as_me:17878: \$? = $ac_status" >&5 | 17619 | echo "$as_me:17619: \$? = $ac_status" >&5 |
17879 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 17620 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
17880 | then | 17621 | then |
17881 | # The compiler can only warn and ignore the option if not recognized | 17622 | # The compiler can only warn and ignore the option if not recognized |
@@ -17923,11 +17664,11 @@ else | |||
17923 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 17664 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
17924 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 17665 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
17925 | -e 's:$: $lt_compiler_flag:'` | 17666 | -e 's:$: $lt_compiler_flag:'` |
17926 | (eval echo "\"\$as_me:17926: $lt_compile\"" >&5) | 17667 | (eval echo "\"\$as_me:17667: $lt_compile\"" >&5) |
17927 | (eval "$lt_compile" 2>out/conftest.err) | 17668 | (eval "$lt_compile" 2>out/conftest.err) |
17928 | ac_status=$? | 17669 | ac_status=$? |
17929 | cat out/conftest.err >&5 | 17670 | cat out/conftest.err >&5 |
17930 | echo "$as_me:17930: \$? = $ac_status" >&5 | 17671 | echo "$as_me:17671: \$? = $ac_status" >&5 |
17931 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 17672 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
17932 | then | 17673 | then |
17933 | # The compiler can only warn and ignore the option if not recognized | 17674 | # The compiler can only warn and ignore the option if not recognized |
@@ -19171,8 +18912,8 @@ fi | |||
19171 | 18912 | ||
19172 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 18913 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
19173 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 18914 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
19174 | as_fn_error "no acceptable C compiler found in \$PATH | 18915 | as_fn_error $? "no acceptable C compiler found in \$PATH |
19175 | See \`config.log' for more details." "$LINENO" 5; } | 18916 | See \`config.log' for more details" "$LINENO" 5 ; } |
19176 | 18917 | ||
19177 | # Provide some information about the compiler. | 18918 | # Provide some information about the compiler. |
19178 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 | 18919 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
@@ -19798,6 +19539,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | |||
19798 | # so we should include this here: | 19539 | # so we should include this here: |
19799 | 19540 | ||
19800 | 19541 | ||
19542 | |||
19543 | |||
19544 | |||
19545 | |||
19801 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | 19546 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
19802 | if test -n "$ac_tool_prefix"; then | 19547 | if test -n "$ac_tool_prefix"; then |
19803 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | 19548 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
@@ -19910,7 +19655,6 @@ $as_echo "yes" >&6; } | |||
19910 | $as_echo "no" >&6; } | 19655 | $as_echo "no" >&6; } |
19911 | PKG_CONFIG="" | 19656 | PKG_CONFIG="" |
19912 | fi | 19657 | fi |
19913 | |||
19914 | fi | 19658 | fi |
19915 | 19659 | ||
19916 | # Check whether pkg-config supports Requires.private | 19660 | # Check whether pkg-config supports Requires.private |
@@ -19960,11 +19704,10 @@ pkg_failed=no | |||
19960 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVIL" >&5 | 19704 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVIL" >&5 |
19961 | $as_echo_n "checking for EVIL... " >&6; } | 19705 | $as_echo_n "checking for EVIL... " >&6; } |
19962 | 19706 | ||
19963 | if test -n "$PKG_CONFIG"; then | 19707 | if test -n "$EVIL_CFLAGS"; then |
19964 | if test -n "$EVIL_CFLAGS"; then | 19708 | pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS" |
19965 | pkg_cv_EVIL_CFLAGS="$EVIL_CFLAGS" | 19709 | elif test -n "$PKG_CONFIG"; then |
19966 | else | 19710 | if test -n "$PKG_CONFIG" && \ |
19967 | if test -n "$PKG_CONFIG" && \ | ||
19968 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5 | 19711 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5 |
19969 | ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5 | 19712 | ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5 |
19970 | ac_status=$? | 19713 | ac_status=$? |
@@ -19974,15 +19717,13 @@ if test -n "$PKG_CONFIG"; then | |||
19974 | else | 19717 | else |
19975 | pkg_failed=yes | 19718 | pkg_failed=yes |
19976 | fi | 19719 | fi |
19977 | fi | 19720 | else |
19978 | else | 19721 | pkg_failed=untried |
19979 | pkg_failed=untried | ||
19980 | fi | 19722 | fi |
19981 | if test -n "$PKG_CONFIG"; then | 19723 | if test -n "$EVIL_LIBS"; then |
19982 | if test -n "$EVIL_LIBS"; then | 19724 | pkg_cv_EVIL_LIBS="$EVIL_LIBS" |
19983 | pkg_cv_EVIL_LIBS="$EVIL_LIBS" | 19725 | elif test -n "$PKG_CONFIG"; then |
19984 | else | 19726 | if test -n "$PKG_CONFIG" && \ |
19985 | if test -n "$PKG_CONFIG" && \ | ||
19986 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5 | 19727 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evil >= 1.0.0\""; } >&5 |
19987 | ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5 | 19728 | ($PKG_CONFIG --exists --print-errors "evil >= 1.0.0") 2>&5 |
19988 | ac_status=$? | 19729 | ac_status=$? |
@@ -19992,14 +19733,15 @@ if test -n "$PKG_CONFIG"; then | |||
19992 | else | 19733 | else |
19993 | pkg_failed=yes | 19734 | pkg_failed=yes |
19994 | fi | 19735 | fi |
19995 | fi | 19736 | else |
19996 | else | 19737 | pkg_failed=untried |
19997 | pkg_failed=untried | ||
19998 | fi | 19738 | fi |
19999 | 19739 | ||
20000 | 19740 | ||
20001 | 19741 | ||
20002 | if test $pkg_failed = yes; then | 19742 | if test $pkg_failed = yes; then |
19743 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
19744 | $as_echo "no" >&6; } | ||
20003 | 19745 | ||
20004 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 19746 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
20005 | _pkg_short_errors_supported=yes | 19747 | _pkg_short_errors_supported=yes |
@@ -20007,14 +19749,14 @@ else | |||
20007 | _pkg_short_errors_supported=no | 19749 | _pkg_short_errors_supported=no |
20008 | fi | 19750 | fi |
20009 | if test $_pkg_short_errors_supported = yes; then | 19751 | if test $_pkg_short_errors_supported = yes; then |
20010 | EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evil >= 1.0.0"` | 19752 | EVIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evil >= 1.0.0" 2>&1` |
20011 | else | 19753 | else |
20012 | EVIL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evil >= 1.0.0"` | 19754 | EVIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "evil >= 1.0.0" 2>&1` |
20013 | fi | 19755 | fi |
20014 | # Put the nasty error message in config.log where it belongs | 19756 | # Put the nasty error message in config.log where it belongs |
20015 | echo "$EVIL_PKG_ERRORS" >&5 | 19757 | echo "$EVIL_PKG_ERRORS" >&5 |
20016 | 19758 | ||
20017 | as_fn_error "Package requirements (evil >= 1.0.0) were not met: | 19759 | as_fn_error $? "Package requirements (evil >= 1.0.0) were not met: |
20018 | 19760 | ||
20019 | $EVIL_PKG_ERRORS | 19761 | $EVIL_PKG_ERRORS |
20020 | 19762 | ||
@@ -20023,12 +19765,13 @@ installed software in a non-standard prefix. | |||
20023 | 19765 | ||
20024 | Alternatively, you may set the environment variables EVIL_CFLAGS | 19766 | Alternatively, you may set the environment variables EVIL_CFLAGS |
20025 | and EVIL_LIBS to avoid the need to call pkg-config. | 19767 | and EVIL_LIBS to avoid the need to call pkg-config. |
20026 | See the pkg-config man page for more details. | 19768 | See the pkg-config man page for more details." "$LINENO" 5 |
20027 | " "$LINENO" 5 | ||
20028 | elif test $pkg_failed = untried; then | 19769 | elif test $pkg_failed = untried; then |
19770 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
19771 | $as_echo "no" >&6; } | ||
20029 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 19772 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
20030 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 19773 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
20031 | as_fn_error "The pkg-config script could not be found or is too old. Make sure it | 19774 | as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it |
20032 | is in your PATH or set the PKG_CONFIG environment variable to the full | 19775 | is in your PATH or set the PKG_CONFIG environment variable to the full |
20033 | path to pkg-config. | 19776 | path to pkg-config. |
20034 | 19777 | ||
@@ -20037,13 +19780,13 @@ and EVIL_LIBS to avoid the need to call pkg-config. | |||
20037 | See the pkg-config man page for more details. | 19780 | See the pkg-config man page for more details. |
20038 | 19781 | ||
20039 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | 19782 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. |
20040 | See \`config.log' for more details." "$LINENO" 5; } | 19783 | See \`config.log' for more details" "$LINENO" 5 ; } |
20041 | else | 19784 | else |
20042 | EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS | 19785 | EVIL_CFLAGS=$pkg_cv_EVIL_CFLAGS |
20043 | EVIL_LIBS=$pkg_cv_EVIL_LIBS | 19786 | EVIL_LIBS=$pkg_cv_EVIL_LIBS |
20044 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 19787 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
20045 | $as_echo "yes" >&6; } | 19788 | $as_echo "yes" >&6; } |
20046 | : | 19789 | |
20047 | fi | 19790 | fi |
20048 | 19791 | ||
20049 | $as_echo "#define HAVE_EVIL 1" >>confdefs.h | 19792 | $as_echo "#define HAVE_EVIL 1" >>confdefs.h |
@@ -20091,11 +19834,10 @@ pkg_failed=no | |||
20091 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ESCAPE" >&5 | 19834 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ESCAPE" >&5 |
20092 | $as_echo_n "checking for ESCAPE... " >&6; } | 19835 | $as_echo_n "checking for ESCAPE... " >&6; } |
20093 | 19836 | ||
20094 | if test -n "$PKG_CONFIG"; then | 19837 | if test -n "$ESCAPE_CFLAGS"; then |
20095 | if test -n "$ESCAPE_CFLAGS"; then | 19838 | pkg_cv_ESCAPE_CFLAGS="$ESCAPE_CFLAGS" |
20096 | pkg_cv_ESCAPE_CFLAGS="$ESCAPE_CFLAGS" | 19839 | elif test -n "$PKG_CONFIG"; then |
20097 | else | 19840 | if test -n "$PKG_CONFIG" && \ |
20098 | if test -n "$PKG_CONFIG" && \ | ||
20099 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"escape\""; } >&5 | 19841 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"escape\""; } >&5 |
20100 | ($PKG_CONFIG --exists --print-errors "escape") 2>&5 | 19842 | ($PKG_CONFIG --exists --print-errors "escape") 2>&5 |
20101 | ac_status=$? | 19843 | ac_status=$? |
@@ -20105,15 +19847,13 @@ if test -n "$PKG_CONFIG"; then | |||
20105 | else | 19847 | else |
20106 | pkg_failed=yes | 19848 | pkg_failed=yes |
20107 | fi | 19849 | fi |
20108 | fi | 19850 | else |
20109 | else | 19851 | pkg_failed=untried |
20110 | pkg_failed=untried | ||
20111 | fi | 19852 | fi |
20112 | if test -n "$PKG_CONFIG"; then | 19853 | if test -n "$ESCAPE_LIBS"; then |
20113 | if test -n "$ESCAPE_LIBS"; then | 19854 | pkg_cv_ESCAPE_LIBS="$ESCAPE_LIBS" |
20114 | pkg_cv_ESCAPE_LIBS="$ESCAPE_LIBS" | 19855 | elif test -n "$PKG_CONFIG"; then |
20115 | else | 19856 | if test -n "$PKG_CONFIG" && \ |
20116 | if test -n "$PKG_CONFIG" && \ | ||
20117 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"escape\""; } >&5 | 19857 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"escape\""; } >&5 |
20118 | ($PKG_CONFIG --exists --print-errors "escape") 2>&5 | 19858 | ($PKG_CONFIG --exists --print-errors "escape") 2>&5 |
20119 | ac_status=$? | 19859 | ac_status=$? |
@@ -20123,14 +19863,15 @@ if test -n "$PKG_CONFIG"; then | |||
20123 | else | 19863 | else |
20124 | pkg_failed=yes | 19864 | pkg_failed=yes |
20125 | fi | 19865 | fi |
20126 | fi | 19866 | else |
20127 | else | 19867 | pkg_failed=untried |
20128 | pkg_failed=untried | ||
20129 | fi | 19868 | fi |
20130 | 19869 | ||
20131 | 19870 | ||
20132 | 19871 | ||
20133 | if test $pkg_failed = yes; then | 19872 | if test $pkg_failed = yes; then |
19873 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
19874 | $as_echo "no" >&6; } | ||
20134 | 19875 | ||
20135 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 19876 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
20136 | _pkg_short_errors_supported=yes | 19877 | _pkg_short_errors_supported=yes |
@@ -20138,14 +19879,14 @@ else | |||
20138 | _pkg_short_errors_supported=no | 19879 | _pkg_short_errors_supported=no |
20139 | fi | 19880 | fi |
20140 | if test $_pkg_short_errors_supported = yes; then | 19881 | if test $_pkg_short_errors_supported = yes; then |
20141 | ESCAPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "escape"` | 19882 | ESCAPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "escape" 2>&1` |
20142 | else | 19883 | else |
20143 | ESCAPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "escape"` | 19884 | ESCAPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "escape" 2>&1` |
20144 | fi | 19885 | fi |
20145 | # Put the nasty error message in config.log where it belongs | 19886 | # Put the nasty error message in config.log where it belongs |
20146 | echo "$ESCAPE_PKG_ERRORS" >&5 | 19887 | echo "$ESCAPE_PKG_ERRORS" >&5 |
20147 | 19888 | ||
20148 | as_fn_error "Package requirements (escape) were not met: | 19889 | as_fn_error $? "Package requirements (escape) were not met: |
20149 | 19890 | ||
20150 | $ESCAPE_PKG_ERRORS | 19891 | $ESCAPE_PKG_ERRORS |
20151 | 19892 | ||
@@ -20154,12 +19895,13 @@ installed software in a non-standard prefix. | |||
20154 | 19895 | ||
20155 | Alternatively, you may set the environment variables ESCAPE_CFLAGS | 19896 | Alternatively, you may set the environment variables ESCAPE_CFLAGS |
20156 | and ESCAPE_LIBS to avoid the need to call pkg-config. | 19897 | and ESCAPE_LIBS to avoid the need to call pkg-config. |
20157 | See the pkg-config man page for more details. | 19898 | See the pkg-config man page for more details." "$LINENO" 5 |
20158 | " "$LINENO" 5 | ||
20159 | elif test $pkg_failed = untried; then | 19899 | elif test $pkg_failed = untried; then |
19900 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
19901 | $as_echo "no" >&6; } | ||
20160 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 19902 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
20161 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 19903 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
20162 | as_fn_error "The pkg-config script could not be found or is too old. Make sure it | 19904 | as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it |
20163 | is in your PATH or set the PKG_CONFIG environment variable to the full | 19905 | is in your PATH or set the PKG_CONFIG environment variable to the full |
20164 | path to pkg-config. | 19906 | path to pkg-config. |
20165 | 19907 | ||
@@ -20168,13 +19910,13 @@ and ESCAPE_LIBS to avoid the need to call pkg-config. | |||
20168 | See the pkg-config man page for more details. | 19910 | See the pkg-config man page for more details. |
20169 | 19911 | ||
20170 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | 19912 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. |
20171 | See \`config.log' for more details." "$LINENO" 5; } | 19913 | See \`config.log' for more details" "$LINENO" 5 ; } |
20172 | else | 19914 | else |
20173 | ESCAPE_CFLAGS=$pkg_cv_ESCAPE_CFLAGS | 19915 | ESCAPE_CFLAGS=$pkg_cv_ESCAPE_CFLAGS |
20174 | ESCAPE_LIBS=$pkg_cv_ESCAPE_LIBS | 19916 | ESCAPE_LIBS=$pkg_cv_ESCAPE_LIBS |
20175 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 19917 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
20176 | $as_echo "yes" >&6; } | 19918 | $as_echo "yes" >&6; } |
20177 | : | 19919 | |
20178 | fi | 19920 | fi |
20179 | CFLAGS="$CFLAGS $ESCAPE_CFLAGS" | 19921 | CFLAGS="$CFLAGS $ESCAPE_CFLAGS" |
20180 | 19922 | ||
@@ -20193,6 +19935,95 @@ $as_echo "#define HAVE_ESCAPE 1" >>confdefs.h | |||
20193 | esac | 19935 | esac |
20194 | 19936 | ||
20195 | 19937 | ||
19938 | ### Checks for portability layer | ||
19939 | |||
19940 | |||
19941 | pkg_failed=no | ||
19942 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXOTIC" >&5 | ||
19943 | $as_echo_n "checking for EXOTIC... " >&6; } | ||
19944 | |||
19945 | if test -n "$EXOTIC_CFLAGS"; then | ||
19946 | pkg_cv_EXOTIC_CFLAGS="$EXOTIC_CFLAGS" | ||
19947 | elif test -n "$PKG_CONFIG"; then | ||
19948 | if test -n "$PKG_CONFIG" && \ | ||
19949 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exotic\""; } >&5 | ||
19950 | ($PKG_CONFIG --exists --print-errors "exotic") 2>&5 | ||
19951 | ac_status=$? | ||
19952 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
19953 | test $ac_status = 0; }; then | ||
19954 | pkg_cv_EXOTIC_CFLAGS=`$PKG_CONFIG --cflags "exotic" 2>/dev/null` | ||
19955 | else | ||
19956 | pkg_failed=yes | ||
19957 | fi | ||
19958 | else | ||
19959 | pkg_failed=untried | ||
19960 | fi | ||
19961 | if test -n "$EXOTIC_LIBS"; then | ||
19962 | pkg_cv_EXOTIC_LIBS="$EXOTIC_LIBS" | ||
19963 | elif test -n "$PKG_CONFIG"; then | ||
19964 | if test -n "$PKG_CONFIG" && \ | ||
19965 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exotic\""; } >&5 | ||
19966 | ($PKG_CONFIG --exists --print-errors "exotic") 2>&5 | ||
19967 | ac_status=$? | ||
19968 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
19969 | test $ac_status = 0; }; then | ||
19970 | pkg_cv_EXOTIC_LIBS=`$PKG_CONFIG --libs "exotic" 2>/dev/null` | ||
19971 | else | ||
19972 | pkg_failed=yes | ||
19973 | fi | ||
19974 | else | ||
19975 | pkg_failed=untried | ||
19976 | fi | ||
19977 | |||
19978 | |||
19979 | |||
19980 | if test $pkg_failed = yes; then | ||
19981 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
19982 | $as_echo "no" >&6; } | ||
19983 | |||
19984 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | ||
19985 | _pkg_short_errors_supported=yes | ||
19986 | else | ||
19987 | _pkg_short_errors_supported=no | ||
19988 | fi | ||
19989 | if test $_pkg_short_errors_supported = yes; then | ||
19990 | EXOTIC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "exotic" 2>&1` | ||
19991 | else | ||
19992 | EXOTIC_PKG_ERRORS=`$PKG_CONFIG --print-errors "exotic" 2>&1` | ||
19993 | fi | ||
19994 | # Put the nasty error message in config.log where it belongs | ||
19995 | echo "$EXOTIC_PKG_ERRORS" >&5 | ||
19996 | |||
19997 | enable_exotic="no" | ||
19998 | elif test $pkg_failed = untried; then | ||
19999 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20000 | $as_echo "no" >&6; } | ||
20001 | enable_exotic="no" | ||
20002 | else | ||
20003 | EXOTIC_CFLAGS=$pkg_cv_EXOTIC_CFLAGS | ||
20004 | EXOTIC_LIBS=$pkg_cv_EXOTIC_LIBS | ||
20005 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
20006 | $as_echo "yes" >&6; } | ||
20007 | enable_exotic="yes" | ||
20008 | fi | ||
20009 | |||
20010 | if test "x${enable_exotic}" = "xyes"; then | ||
20011 | requirements_ecore="exotic ${requirements_ecore}" | ||
20012 | |||
20013 | |||
20014 | $as_echo "#define HAVE_EXOTIC 1" >>confdefs.h | ||
20015 | |||
20016 | fi | ||
20017 | if test "x${enable_exotic}" = "xyes"; then | ||
20018 | ECORE_HAVE_EXOTIC_TRUE= | ||
20019 | ECORE_HAVE_EXOTIC_FALSE='#' | ||
20020 | else | ||
20021 | ECORE_HAVE_EXOTIC_TRUE='#' | ||
20022 | ECORE_HAVE_EXOTIC_FALSE= | ||
20023 | fi | ||
20024 | |||
20025 | |||
20026 | |||
20196 | 20027 | ||
20197 | 20028 | ||
20198 | 20029 | ||
@@ -20431,46 +20262,44 @@ pkg_failed=no | |||
20431 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EINA" >&5 | 20262 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EINA" >&5 |
20432 | $as_echo_n "checking for EINA... " >&6; } | 20263 | $as_echo_n "checking for EINA... " >&6; } |
20433 | 20264 | ||
20434 | if test -n "$PKG_CONFIG"; then | 20265 | if test -n "$EINA_CFLAGS"; then |
20435 | if test -n "$EINA_CFLAGS"; then | 20266 | pkg_cv_EINA_CFLAGS="$EINA_CFLAGS" |
20436 | pkg_cv_EINA_CFLAGS="$EINA_CFLAGS" | 20267 | elif test -n "$PKG_CONFIG"; then |
20437 | else | 20268 | if test -n "$PKG_CONFIG" && \ |
20438 | if test -n "$PKG_CONFIG" && \ | 20269 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.2.0\""; } >&5 |
20439 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.1.0\""; } >&5 | 20270 | ($PKG_CONFIG --exists --print-errors "eina >= 1.2.0") 2>&5 |
20440 | ($PKG_CONFIG --exists --print-errors "eina >= 1.1.0") 2>&5 | ||
20441 | ac_status=$? | 20271 | ac_status=$? |
20442 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 20272 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
20443 | test $ac_status = 0; }; then | 20273 | test $ac_status = 0; }; then |
20444 | pkg_cv_EINA_CFLAGS=`$PKG_CONFIG --cflags "eina >= 1.1.0" 2>/dev/null` | 20274 | pkg_cv_EINA_CFLAGS=`$PKG_CONFIG --cflags "eina >= 1.2.0" 2>/dev/null` |
20445 | else | 20275 | else |
20446 | pkg_failed=yes | 20276 | pkg_failed=yes |
20447 | fi | 20277 | fi |
20448 | fi | 20278 | else |
20449 | else | 20279 | pkg_failed=untried |
20450 | pkg_failed=untried | ||
20451 | fi | 20280 | fi |
20452 | if test -n "$PKG_CONFIG"; then | 20281 | if test -n "$EINA_LIBS"; then |
20453 | if test -n "$EINA_LIBS"; then | 20282 | pkg_cv_EINA_LIBS="$EINA_LIBS" |
20454 | pkg_cv_EINA_LIBS="$EINA_LIBS" | 20283 | elif test -n "$PKG_CONFIG"; then |
20455 | else | 20284 | if test -n "$PKG_CONFIG" && \ |
20456 | if test -n "$PKG_CONFIG" && \ | 20285 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.2.0\""; } >&5 |
20457 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"eina >= 1.1.0\""; } >&5 | 20286 | ($PKG_CONFIG --exists --print-errors "eina >= 1.2.0") 2>&5 |
20458 | ($PKG_CONFIG --exists --print-errors "eina >= 1.1.0") 2>&5 | ||
20459 | ac_status=$? | 20287 | ac_status=$? |
20460 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 20288 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
20461 | test $ac_status = 0; }; then | 20289 | test $ac_status = 0; }; then |
20462 | pkg_cv_EINA_LIBS=`$PKG_CONFIG --libs "eina >= 1.1.0" 2>/dev/null` | 20290 | pkg_cv_EINA_LIBS=`$PKG_CONFIG --libs "eina >= 1.2.0" 2>/dev/null` |
20463 | else | 20291 | else |
20464 | pkg_failed=yes | 20292 | pkg_failed=yes |
20465 | fi | 20293 | fi |
20466 | fi | 20294 | else |
20467 | else | 20295 | pkg_failed=untried |
20468 | pkg_failed=untried | ||
20469 | fi | 20296 | fi |
20470 | 20297 | ||
20471 | 20298 | ||
20472 | 20299 | ||
20473 | if test $pkg_failed = yes; then | 20300 | if test $pkg_failed = yes; then |
20301 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20302 | $as_echo "no" >&6; } | ||
20474 | 20303 | ||
20475 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 20304 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
20476 | _pkg_short_errors_supported=yes | 20305 | _pkg_short_errors_supported=yes |
@@ -20478,14 +20307,14 @@ else | |||
20478 | _pkg_short_errors_supported=no | 20307 | _pkg_short_errors_supported=no |
20479 | fi | 20308 | fi |
20480 | if test $_pkg_short_errors_supported = yes; then | 20309 | if test $_pkg_short_errors_supported = yes; then |
20481 | EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "eina >= 1.1.0"` | 20310 | EINA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "eina >= 1.2.0" 2>&1` |
20482 | else | 20311 | else |
20483 | EINA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "eina >= 1.1.0"` | 20312 | EINA_PKG_ERRORS=`$PKG_CONFIG --print-errors "eina >= 1.2.0" 2>&1` |
20484 | fi | 20313 | fi |
20485 | # Put the nasty error message in config.log where it belongs | 20314 | # Put the nasty error message in config.log where it belongs |
20486 | echo "$EINA_PKG_ERRORS" >&5 | 20315 | echo "$EINA_PKG_ERRORS" >&5 |
20487 | 20316 | ||
20488 | as_fn_error "Package requirements (eina >= 1.1.0) were not met: | 20317 | as_fn_error $? "Package requirements (eina >= 1.2.0) were not met: |
20489 | 20318 | ||
20490 | $EINA_PKG_ERRORS | 20319 | $EINA_PKG_ERRORS |
20491 | 20320 | ||
@@ -20494,12 +20323,13 @@ installed software in a non-standard prefix. | |||
20494 | 20323 | ||
20495 | Alternatively, you may set the environment variables EINA_CFLAGS | 20324 | Alternatively, you may set the environment variables EINA_CFLAGS |
20496 | and EINA_LIBS to avoid the need to call pkg-config. | 20325 | and EINA_LIBS to avoid the need to call pkg-config. |
20497 | See the pkg-config man page for more details. | 20326 | See the pkg-config man page for more details." "$LINENO" 5 |
20498 | " "$LINENO" 5 | ||
20499 | elif test $pkg_failed = untried; then | 20327 | elif test $pkg_failed = untried; then |
20328 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20329 | $as_echo "no" >&6; } | ||
20500 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 20330 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
20501 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 20331 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
20502 | as_fn_error "The pkg-config script could not be found or is too old. Make sure it | 20332 | as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it |
20503 | is in your PATH or set the PKG_CONFIG environment variable to the full | 20333 | is in your PATH or set the PKG_CONFIG environment variable to the full |
20504 | path to pkg-config. | 20334 | path to pkg-config. |
20505 | 20335 | ||
@@ -20508,33 +20338,33 @@ and EINA_LIBS to avoid the need to call pkg-config. | |||
20508 | See the pkg-config man page for more details. | 20338 | See the pkg-config man page for more details. |
20509 | 20339 | ||
20510 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | 20340 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. |
20511 | See \`config.log' for more details." "$LINENO" 5; } | 20341 | See \`config.log' for more details" "$LINENO" 5 ; } |
20512 | else | 20342 | else |
20513 | EINA_CFLAGS=$pkg_cv_EINA_CFLAGS | 20343 | EINA_CFLAGS=$pkg_cv_EINA_CFLAGS |
20514 | EINA_LIBS=$pkg_cv_EINA_LIBS | 20344 | EINA_LIBS=$pkg_cv_EINA_LIBS |
20515 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 20345 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
20516 | $as_echo "yes" >&6; } | 20346 | $as_echo "yes" >&6; } |
20517 | : | 20347 | |
20518 | fi | 20348 | fi |
20519 | #FIXME check all the requirements when the eina move will be finished | 20349 | #FIXME check all the requirements when the eina move will be finished |
20520 | requirements_ecore="eina >= 1.1.0 ${requirements_ecore}" | 20350 | requirements_ecore="eina >= 1.2.0 ${requirements_ecore}" |
20521 | requirements_ecore_con="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_con}" | 20351 | requirements_ecore_con="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_con}" |
20522 | #requirements_ecore_config="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_config}" | 20352 | #requirements_ecore_config="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_config}" |
20523 | requirements_ecore_directfb="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_directfb}" | 20353 | requirements_ecore_directfb="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_directfb}" |
20524 | requirements_ecore_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_evas}" | 20354 | requirements_ecore_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_evas}" |
20525 | requirements_ecore_fb="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_fb}" | 20355 | requirements_ecore_fb="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_fb}" |
20526 | requirements_ecore_file="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_file}" | 20356 | requirements_ecore_file="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_file}" |
20527 | requirements_ecore_imf="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_imf}" | 20357 | requirements_ecore_imf="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_imf}" |
20528 | requirements_ecore_imf_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_imf_evas}" | 20358 | requirements_ecore_imf_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_imf_evas}" |
20529 | requirements_ecore_input="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_input}" | 20359 | requirements_ecore_input="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_input}" |
20530 | requirements_ecore_input_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_input_evas}" | 20360 | requirements_ecore_input_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_input_evas}" |
20531 | requirements_ecore_ipc="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_ipc}" | 20361 | requirements_ecore_ipc="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_ipc}" |
20532 | requirements_ecore_cocoa="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_cocoa}" | 20362 | requirements_ecore_cocoa="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_cocoa}" |
20533 | requirements_ecore_sdl="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_sdl}" | 20363 | requirements_ecore_sdl="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_sdl}" |
20534 | requirements_ecore_psl1ght="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_sdl}" | 20364 | requirements_ecore_psl1ght="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_sdl}" |
20535 | requirements_ecore_win32="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_win32}" | 20365 | requirements_ecore_win32="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_win32}" |
20536 | requirements_ecore_wince="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_wince}" | 20366 | requirements_ecore_wince="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_wince}" |
20537 | requirements_ecore_x="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_x}" | 20367 | requirements_ecore_x="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_x}" |
20538 | 20368 | ||
20539 | 20369 | ||
20540 | # glib support (main loop integration) | 20370 | # glib support (main loop integration) |
@@ -20550,11 +20380,10 @@ pkg_failed=no | |||
20550 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 | 20380 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 |
20551 | $as_echo_n "checking for GLIB... " >&6; } | 20381 | $as_echo_n "checking for GLIB... " >&6; } |
20552 | 20382 | ||
20553 | if test -n "$PKG_CONFIG"; then | 20383 | if test -n "$GLIB_CFLAGS"; then |
20554 | if test -n "$GLIB_CFLAGS"; then | 20384 | pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" |
20555 | pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" | 20385 | elif test -n "$PKG_CONFIG"; then |
20556 | else | 20386 | if test -n "$PKG_CONFIG" && \ |
20557 | if test -n "$PKG_CONFIG" && \ | ||
20558 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 | 20387 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 |
20559 | ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 | 20388 | ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 |
20560 | ac_status=$? | 20389 | ac_status=$? |
@@ -20564,15 +20393,13 @@ if test -n "$PKG_CONFIG"; then | |||
20564 | else | 20393 | else |
20565 | pkg_failed=yes | 20394 | pkg_failed=yes |
20566 | fi | 20395 | fi |
20567 | fi | 20396 | else |
20568 | else | 20397 | pkg_failed=untried |
20569 | pkg_failed=untried | ||
20570 | fi | 20398 | fi |
20571 | if test -n "$PKG_CONFIG"; then | 20399 | if test -n "$GLIB_LIBS"; then |
20572 | if test -n "$GLIB_LIBS"; then | 20400 | pkg_cv_GLIB_LIBS="$GLIB_LIBS" |
20573 | pkg_cv_GLIB_LIBS="$GLIB_LIBS" | 20401 | elif test -n "$PKG_CONFIG"; then |
20574 | else | 20402 | if test -n "$PKG_CONFIG" && \ |
20575 | if test -n "$PKG_CONFIG" && \ | ||
20576 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 | 20403 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 |
20577 | ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 | 20404 | ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 |
20578 | ac_status=$? | 20405 | ac_status=$? |
@@ -20582,14 +20409,15 @@ if test -n "$PKG_CONFIG"; then | |||
20582 | else | 20409 | else |
20583 | pkg_failed=yes | 20410 | pkg_failed=yes |
20584 | fi | 20411 | fi |
20585 | fi | 20412 | else |
20586 | else | 20413 | pkg_failed=untried |
20587 | pkg_failed=untried | ||
20588 | fi | 20414 | fi |
20589 | 20415 | ||
20590 | 20416 | ||
20591 | 20417 | ||
20592 | if test $pkg_failed = yes; then | 20418 | if test $pkg_failed = yes; then |
20419 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20420 | $as_echo "no" >&6; } | ||
20593 | 20421 | ||
20594 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 20422 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
20595 | _pkg_short_errors_supported=yes | 20423 | _pkg_short_errors_supported=yes |
@@ -20597,17 +20425,17 @@ else | |||
20597 | _pkg_short_errors_supported=no | 20425 | _pkg_short_errors_supported=no |
20598 | fi | 20426 | fi |
20599 | if test $_pkg_short_errors_supported = yes; then | 20427 | if test $_pkg_short_errors_supported = yes; then |
20600 | GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0"` | 20428 | GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0" 2>&1` |
20601 | else | 20429 | else |
20602 | GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"` | 20430 | GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0" 2>&1` |
20603 | fi | 20431 | fi |
20604 | # Put the nasty error message in config.log where it belongs | 20432 | # Put the nasty error message in config.log where it belongs |
20605 | echo "$GLIB_PKG_ERRORS" >&5 | 20433 | echo "$GLIB_PKG_ERRORS" >&5 |
20606 | 20434 | ||
20607 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 20435 | have_glib="no" |
20608 | $as_echo "no" >&6; } | ||
20609 | have_glib="no" | ||
20610 | elif test $pkg_failed = untried; then | 20436 | elif test $pkg_failed = untried; then |
20437 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20438 | $as_echo "no" >&6; } | ||
20611 | have_glib="no" | 20439 | have_glib="no" |
20612 | else | 20440 | else |
20613 | GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS | 20441 | GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS |
@@ -20620,7 +20448,7 @@ else | |||
20620 | have_glib="no" | 20448 | have_glib="no" |
20621 | fi | 20449 | fi |
20622 | if test "x$want_glib" = "xyes" -a "x$have_glib" = "xno"; then | 20450 | if test "x$want_glib" = "xyes" -a "x$have_glib" = "xno"; then |
20623 | as_fn_error "GLib support requested, but no GLib found by pkg-config." "$LINENO" 5 | 20451 | as_fn_error $? "GLib support requested, but no GLib found by pkg-config." "$LINENO" 5 |
20624 | elif test "x$have_glib" = "xyes"; then | 20452 | elif test "x$have_glib" = "xyes"; then |
20625 | 20453 | ||
20626 | $as_echo "#define HAVE_GLIB 1" >>confdefs.h | 20454 | $as_echo "#define HAVE_GLIB 1" >>confdefs.h |
@@ -20637,11 +20465,10 @@ pkg_failed=no | |||
20637 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5 | 20465 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5 |
20638 | $as_echo_n "checking for SDL... " >&6; } | 20466 | $as_echo_n "checking for SDL... " >&6; } |
20639 | 20467 | ||
20640 | if test -n "$PKG_CONFIG"; then | 20468 | if test -n "$SDL_CFLAGS"; then |
20641 | if test -n "$SDL_CFLAGS"; then | 20469 | pkg_cv_SDL_CFLAGS="$SDL_CFLAGS" |
20642 | pkg_cv_SDL_CFLAGS="$SDL_CFLAGS" | 20470 | elif test -n "$PKG_CONFIG"; then |
20643 | else | 20471 | if test -n "$PKG_CONFIG" && \ |
20644 | if test -n "$PKG_CONFIG" && \ | ||
20645 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.0\""; } >&5 | 20472 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.0\""; } >&5 |
20646 | ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.0") 2>&5 | 20473 | ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.0") 2>&5 |
20647 | ac_status=$? | 20474 | ac_status=$? |
@@ -20651,15 +20478,13 @@ if test -n "$PKG_CONFIG"; then | |||
20651 | else | 20478 | else |
20652 | pkg_failed=yes | 20479 | pkg_failed=yes |
20653 | fi | 20480 | fi |
20654 | fi | 20481 | else |
20655 | else | 20482 | pkg_failed=untried |
20656 | pkg_failed=untried | ||
20657 | fi | 20483 | fi |
20658 | if test -n "$PKG_CONFIG"; then | 20484 | if test -n "$SDL_LIBS"; then |
20659 | if test -n "$SDL_LIBS"; then | 20485 | pkg_cv_SDL_LIBS="$SDL_LIBS" |
20660 | pkg_cv_SDL_LIBS="$SDL_LIBS" | 20486 | elif test -n "$PKG_CONFIG"; then |
20661 | else | 20487 | if test -n "$PKG_CONFIG" && \ |
20662 | if test -n "$PKG_CONFIG" && \ | ||
20663 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.0\""; } >&5 | 20488 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.0\""; } >&5 |
20664 | ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.0") 2>&5 | 20489 | ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.0") 2>&5 |
20665 | ac_status=$? | 20490 | ac_status=$? |
@@ -20669,14 +20494,15 @@ if test -n "$PKG_CONFIG"; then | |||
20669 | else | 20494 | else |
20670 | pkg_failed=yes | 20495 | pkg_failed=yes |
20671 | fi | 20496 | fi |
20672 | fi | 20497 | else |
20673 | else | 20498 | pkg_failed=untried |
20674 | pkg_failed=untried | ||
20675 | fi | 20499 | fi |
20676 | 20500 | ||
20677 | 20501 | ||
20678 | 20502 | ||
20679 | if test $pkg_failed = yes; then | 20503 | if test $pkg_failed = yes; then |
20504 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20505 | $as_echo "no" >&6; } | ||
20680 | 20506 | ||
20681 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 20507 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
20682 | _pkg_short_errors_supported=yes | 20508 | _pkg_short_errors_supported=yes |
@@ -20684,17 +20510,17 @@ else | |||
20684 | _pkg_short_errors_supported=no | 20510 | _pkg_short_errors_supported=no |
20685 | fi | 20511 | fi |
20686 | if test $_pkg_short_errors_supported = yes; then | 20512 | if test $_pkg_short_errors_supported = yes; then |
20687 | SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sdl >= 1.2.0"` | 20513 | SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sdl >= 1.2.0" 2>&1` |
20688 | else | 20514 | else |
20689 | SDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sdl >= 1.2.0"` | 20515 | SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors "sdl >= 1.2.0" 2>&1` |
20690 | fi | 20516 | fi |
20691 | # Put the nasty error message in config.log where it belongs | 20517 | # Put the nasty error message in config.log where it belongs |
20692 | echo "$SDL_PKG_ERRORS" >&5 | 20518 | echo "$SDL_PKG_ERRORS" >&5 |
20693 | 20519 | ||
20694 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 20520 | have_sdl="no" |
20695 | $as_echo "no" >&6; } | ||
20696 | have_sdl="no" | ||
20697 | elif test $pkg_failed = untried; then | 20521 | elif test $pkg_failed = untried; then |
20522 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20523 | $as_echo "no" >&6; } | ||
20698 | have_sdl="no" | 20524 | have_sdl="no" |
20699 | else | 20525 | else |
20700 | SDL_CFLAGS=$pkg_cv_SDL_CFLAGS | 20526 | SDL_CFLAGS=$pkg_cv_SDL_CFLAGS |
@@ -20788,11 +20614,10 @@ pkg_failed=no | |||
20788 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5 | 20614 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5 |
20789 | $as_echo_n "checking for DIRECTFB... " >&6; } | 20615 | $as_echo_n "checking for DIRECTFB... " >&6; } |
20790 | 20616 | ||
20791 | if test -n "$PKG_CONFIG"; then | 20617 | if test -n "$DIRECTFB_CFLAGS"; then |
20792 | if test -n "$DIRECTFB_CFLAGS"; then | 20618 | pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS" |
20793 | pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS" | 20619 | elif test -n "$PKG_CONFIG"; then |
20794 | else | 20620 | if test -n "$PKG_CONFIG" && \ |
20795 | if test -n "$PKG_CONFIG" && \ | ||
20796 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.16\""; } >&5 | 20621 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.16\""; } >&5 |
20797 | ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.16") 2>&5 | 20622 | ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.16") 2>&5 |
20798 | ac_status=$? | 20623 | ac_status=$? |
@@ -20802,15 +20627,13 @@ if test -n "$PKG_CONFIG"; then | |||
20802 | else | 20627 | else |
20803 | pkg_failed=yes | 20628 | pkg_failed=yes |
20804 | fi | 20629 | fi |
20805 | fi | 20630 | else |
20806 | else | 20631 | pkg_failed=untried |
20807 | pkg_failed=untried | ||
20808 | fi | 20632 | fi |
20809 | if test -n "$PKG_CONFIG"; then | 20633 | if test -n "$DIRECTFB_LIBS"; then |
20810 | if test -n "$DIRECTFB_LIBS"; then | 20634 | pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS" |
20811 | pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS" | 20635 | elif test -n "$PKG_CONFIG"; then |
20812 | else | 20636 | if test -n "$PKG_CONFIG" && \ |
20813 | if test -n "$PKG_CONFIG" && \ | ||
20814 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.16\""; } >&5 | 20637 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= 0.9.16\""; } >&5 |
20815 | ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.16") 2>&5 | 20638 | ($PKG_CONFIG --exists --print-errors "directfb >= 0.9.16") 2>&5 |
20816 | ac_status=$? | 20639 | ac_status=$? |
@@ -20820,14 +20643,15 @@ if test -n "$PKG_CONFIG"; then | |||
20820 | else | 20643 | else |
20821 | pkg_failed=yes | 20644 | pkg_failed=yes |
20822 | fi | 20645 | fi |
20823 | fi | 20646 | else |
20824 | else | 20647 | pkg_failed=untried |
20825 | pkg_failed=untried | ||
20826 | fi | 20648 | fi |
20827 | 20649 | ||
20828 | 20650 | ||
20829 | 20651 | ||
20830 | if test $pkg_failed = yes; then | 20652 | if test $pkg_failed = yes; then |
20653 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20654 | $as_echo "no" >&6; } | ||
20831 | 20655 | ||
20832 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 20656 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
20833 | _pkg_short_errors_supported=yes | 20657 | _pkg_short_errors_supported=yes |
@@ -20835,17 +20659,17 @@ else | |||
20835 | _pkg_short_errors_supported=no | 20659 | _pkg_short_errors_supported=no |
20836 | fi | 20660 | fi |
20837 | if test $_pkg_short_errors_supported = yes; then | 20661 | if test $_pkg_short_errors_supported = yes; then |
20838 | DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "directfb >= 0.9.16"` | 20662 | DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "directfb >= 0.9.16" 2>&1` |
20839 | else | 20663 | else |
20840 | DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "directfb >= 0.9.16"` | 20664 | DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --print-errors "directfb >= 0.9.16" 2>&1` |
20841 | fi | 20665 | fi |
20842 | # Put the nasty error message in config.log where it belongs | 20666 | # Put the nasty error message in config.log where it belongs |
20843 | echo "$DIRECTFB_PKG_ERRORS" >&5 | 20667 | echo "$DIRECTFB_PKG_ERRORS" >&5 |
20844 | 20668 | ||
20845 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 20669 | have_directfb="no" |
20846 | $as_echo "no" >&6; } | ||
20847 | have_directfb="no" | ||
20848 | elif test $pkg_failed = untried; then | 20670 | elif test $pkg_failed = untried; then |
20671 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
20672 | $as_echo "no" >&6; } | ||
20849 | have_directfb="no" | 20673 | have_directfb="no" |
20850 | else | 20674 | else |
20851 | DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS | 20675 | DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS |
@@ -20866,6 +20690,75 @@ fi | |||
20866 | 20690 | ||
20867 | # Xlib and XCB (ecore_x) | 20691 | # Xlib and XCB (ecore_x) |
20868 | 20692 | ||
20693 | ac_fn_c_check_decl "$LINENO" "MAXHOSTNAMELEN" "ac_cv_have_decl_MAXHOSTNAMELEN" "$ac_includes_default" | ||
20694 | if test "x$ac_cv_have_decl_MAXHOSTNAMELEN" = x""yes; then : | ||
20695 | FOUND_MAXHOSTNAMELEN=yes | ||
20696 | fi | ||
20697 | |||
20698 | |||
20699 | if test "x${FOUND_MAXHOSTNAMELEN}" != "xyes" ; then | ||
20700 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for header that defines MAXHOSTNAMELEN" >&5 | ||
20701 | $as_echo_n "checking for header that defines MAXHOSTNAMELEN... " >&6; } | ||
20702 | FOUND_MAXHOSTNAMELEN="not found" | ||
20703 | |||
20704 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
20705 | /* end confdefs.h. */ | ||
20706 | |||
20707 | |||
20708 | #include <sys/param.h> | ||
20709 | |||
20710 | int | ||
20711 | main () | ||
20712 | { | ||
20713 | |||
20714 | int h = MAXHOSTNAMELEN; | ||
20715 | |||
20716 | ; | ||
20717 | return 0; | ||
20718 | } | ||
20719 | |||
20720 | _ACEOF | ||
20721 | if ac_fn_c_try_compile "$LINENO"; then : | ||
20722 | |||
20723 | FOUND_MAXHOSTNAMELEN="sys/param.h" | ||
20724 | |||
20725 | $as_echo "#define NEED_SYS_PARAM_H 1" >>confdefs.h | ||
20726 | |||
20727 | |||
20728 | fi | ||
20729 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
20730 | |||
20731 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
20732 | /* end confdefs.h. */ | ||
20733 | |||
20734 | |||
20735 | #include <netdb.h> | ||
20736 | |||
20737 | int | ||
20738 | main () | ||
20739 | { | ||
20740 | |||
20741 | int h = MAXHOSTNAMELEN; | ||
20742 | |||
20743 | ; | ||
20744 | return 0; | ||
20745 | } | ||
20746 | |||
20747 | _ACEOF | ||
20748 | if ac_fn_c_try_compile "$LINENO"; then : | ||
20749 | |||
20750 | FOUND_MAXHOSTNAMELEN="netdb.h" | ||
20751 | |||
20752 | $as_echo "#define NEED_NETDB_H 1" >>confdefs.h | ||
20753 | |||
20754 | |||
20755 | fi | ||
20756 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
20757 | |||
20758 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOUND_MAXHOSTNAMELEN" >&5 | ||
20759 | $as_echo "$FOUND_MAXHOSTNAMELEN" >&6; } | ||
20760 | fi | ||
20761 | |||
20869 | have_x="no" | 20762 | have_x="no" |
20870 | have_ecore_x="no" | 20763 | have_ecore_x="no" |
20871 | have_ecore_x_xlib="no" | 20764 | have_ecore_x_xlib="no" |
@@ -20995,7 +20888,7 @@ $as_echo_n "checking keysym definitions... " >&6; } | |||
20995 | if test -f "$KEYSYMDEFDIR/$i"; then | 20888 | if test -f "$KEYSYMDEFDIR/$i"; then |
20996 | KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i" | 20889 | KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i" |
20997 | elif test "x$i" = "xkeysymdef.h"; then | 20890 | elif test "x$i" = "xkeysymdef.h"; then |
20998 | as_fn_error "Cannot find keysymdef.h" "$LINENO" 5 | 20891 | as_fn_error $? "Cannot find keysymdef.h" "$LINENO" 5 |
20999 | fi | 20892 | fi |
21000 | done | 20893 | done |
21001 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KEYSYMDEFS" >&5 | 20894 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KEYSYMDEFS" >&5 |
@@ -21159,11 +21052,10 @@ pkg_failed=no | |||
21159 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECORE_XCB" >&5 | 21052 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECORE_XCB" >&5 |
21160 | $as_echo_n "checking for ECORE_XCB... " >&6; } | 21053 | $as_echo_n "checking for ECORE_XCB... " >&6; } |
21161 | 21054 | ||
21162 | if test -n "$PKG_CONFIG"; then | 21055 | if test -n "$ECORE_XCB_CFLAGS"; then |
21163 | if test -n "$ECORE_XCB_CFLAGS"; then | 21056 | pkg_cv_ECORE_XCB_CFLAGS="$ECORE_XCB_CFLAGS" |
21164 | pkg_cv_ECORE_XCB_CFLAGS="$ECORE_XCB_CFLAGS" | 21057 | elif test -n "$PKG_CONFIG"; then |
21165 | else | 21058 | if test -n "$PKG_CONFIG" && \ |
21166 | if test -n "$PKG_CONFIG" && \ | ||
21167 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8\""; } >&5 | 21059 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8\""; } >&5 |
21168 | ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8") 2>&5 | 21060 | ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8") 2>&5 |
21169 | ac_status=$? | 21061 | ac_status=$? |
@@ -21173,15 +21065,13 @@ if test -n "$PKG_CONFIG"; then | |||
21173 | else | 21065 | else |
21174 | pkg_failed=yes | 21066 | pkg_failed=yes |
21175 | fi | 21067 | fi |
21176 | fi | 21068 | else |
21177 | else | 21069 | pkg_failed=untried |
21178 | pkg_failed=untried | ||
21179 | fi | 21070 | fi |
21180 | if test -n "$PKG_CONFIG"; then | 21071 | if test -n "$ECORE_XCB_LIBS"; then |
21181 | if test -n "$ECORE_XCB_LIBS"; then | 21072 | pkg_cv_ECORE_XCB_LIBS="$ECORE_XCB_LIBS" |
21182 | pkg_cv_ECORE_XCB_LIBS="$ECORE_XCB_LIBS" | 21073 | elif test -n "$PKG_CONFIG"; then |
21183 | else | 21074 | if test -n "$PKG_CONFIG" && \ |
21184 | if test -n "$PKG_CONFIG" && \ | ||
21185 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8\""; } >&5 | 21075 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8\""; } >&5 |
21186 | ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8") 2>&5 | 21076 | ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8") 2>&5 |
21187 | ac_status=$? | 21077 | ac_status=$? |
@@ -21191,14 +21081,15 @@ if test -n "$PKG_CONFIG"; then | |||
21191 | else | 21081 | else |
21192 | pkg_failed=yes | 21082 | pkg_failed=yes |
21193 | fi | 21083 | fi |
21194 | fi | 21084 | else |
21195 | else | 21085 | pkg_failed=untried |
21196 | pkg_failed=untried | ||
21197 | fi | 21086 | fi |
21198 | 21087 | ||
21199 | 21088 | ||
21200 | 21089 | ||
21201 | if test $pkg_failed = yes; then | 21090 | if test $pkg_failed = yes; then |
21091 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21092 | $as_echo "no" >&6; } | ||
21202 | 21093 | ||
21203 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 21094 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
21204 | _pkg_short_errors_supported=yes | 21095 | _pkg_short_errors_supported=yes |
@@ -21206,26 +21097,23 @@ else | |||
21206 | _pkg_short_errors_supported=no | 21097 | _pkg_short_errors_supported=no |
21207 | fi | 21098 | fi |
21208 | if test $_pkg_short_errors_supported = yes; then | 21099 | if test $_pkg_short_errors_supported = yes; then |
21209 | ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8"` | 21100 | ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8" 2>&1` |
21210 | else | 21101 | else |
21211 | ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8"` | 21102 | ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11-xcb xcb xcb-shm xcb-event xcb-icccm >= 0.3.8 xcb-util >= 0.3.8 xcb-image xcb-keysyms >= 0.3.8" 2>&1` |
21212 | fi | 21103 | fi |
21213 | # Put the nasty error message in config.log where it belongs | 21104 | # Put the nasty error message in config.log where it belongs |
21214 | echo "$ECORE_XCB_PKG_ERRORS" >&5 | 21105 | echo "$ECORE_XCB_PKG_ERRORS" >&5 |
21215 | 21106 | ||
21216 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21217 | $as_echo "no" >&6; } | ||
21218 | 21107 | ||
21219 | 21108 | ||
21220 | pkg_failed=no | 21109 | pkg_failed=no |
21221 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECORE_XCB" >&5 | 21110 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECORE_XCB" >&5 |
21222 | $as_echo_n "checking for ECORE_XCB... " >&6; } | 21111 | $as_echo_n "checking for ECORE_XCB... " >&6; } |
21223 | 21112 | ||
21224 | if test -n "$PKG_CONFIG"; then | 21113 | if test -n "$ECORE_XCB_CFLAGS"; then |
21225 | if test -n "$ECORE_XCB_CFLAGS"; then | 21114 | pkg_cv_ECORE_XCB_CFLAGS="$ECORE_XCB_CFLAGS" |
21226 | pkg_cv_ECORE_XCB_CFLAGS="$ECORE_XCB_CFLAGS" | 21115 | elif test -n "$PKG_CONFIG"; then |
21227 | else | 21116 | if test -n "$PKG_CONFIG" && \ |
21228 | if test -n "$PKG_CONFIG" && \ | ||
21229 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms\""; } >&5 | 21117 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms\""; } >&5 |
21230 | ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms") 2>&5 | 21118 | ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms") 2>&5 |
21231 | ac_status=$? | 21119 | ac_status=$? |
@@ -21235,15 +21123,13 @@ if test -n "$PKG_CONFIG"; then | |||
21235 | else | 21123 | else |
21236 | pkg_failed=yes | 21124 | pkg_failed=yes |
21237 | fi | 21125 | fi |
21238 | fi | 21126 | else |
21239 | else | 21127 | pkg_failed=untried |
21240 | pkg_failed=untried | ||
21241 | fi | 21128 | fi |
21242 | if test -n "$PKG_CONFIG"; then | 21129 | if test -n "$ECORE_XCB_LIBS"; then |
21243 | if test -n "$ECORE_XCB_LIBS"; then | 21130 | pkg_cv_ECORE_XCB_LIBS="$ECORE_XCB_LIBS" |
21244 | pkg_cv_ECORE_XCB_LIBS="$ECORE_XCB_LIBS" | 21131 | elif test -n "$PKG_CONFIG"; then |
21245 | else | 21132 | if test -n "$PKG_CONFIG" && \ |
21246 | if test -n "$PKG_CONFIG" && \ | ||
21247 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms\""; } >&5 | 21133 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms\""; } >&5 |
21248 | ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms") 2>&5 | 21134 | ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms") 2>&5 |
21249 | ac_status=$? | 21135 | ac_status=$? |
@@ -21253,14 +21139,15 @@ if test -n "$PKG_CONFIG"; then | |||
21253 | else | 21139 | else |
21254 | pkg_failed=yes | 21140 | pkg_failed=yes |
21255 | fi | 21141 | fi |
21256 | fi | 21142 | else |
21257 | else | 21143 | pkg_failed=untried |
21258 | pkg_failed=untried | ||
21259 | fi | 21144 | fi |
21260 | 21145 | ||
21261 | 21146 | ||
21262 | 21147 | ||
21263 | if test $pkg_failed = yes; then | 21148 | if test $pkg_failed = yes; then |
21149 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21150 | $as_echo "no" >&6; } | ||
21264 | 21151 | ||
21265 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 21152 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
21266 | _pkg_short_errors_supported=yes | 21153 | _pkg_short_errors_supported=yes |
@@ -21268,17 +21155,17 @@ else | |||
21268 | _pkg_short_errors_supported=no | 21155 | _pkg_short_errors_supported=no |
21269 | fi | 21156 | fi |
21270 | if test $_pkg_short_errors_supported = yes; then | 21157 | if test $_pkg_short_errors_supported = yes; then |
21271 | ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms"` | 21158 | ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms" 2>&1` |
21272 | else | 21159 | else |
21273 | ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms"` | 21160 | ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms" 2>&1` |
21274 | fi | 21161 | fi |
21275 | # Put the nasty error message in config.log where it belongs | 21162 | # Put the nasty error message in config.log where it belongs |
21276 | echo "$ECORE_XCB_PKG_ERRORS" >&5 | 21163 | echo "$ECORE_XCB_PKG_ERRORS" >&5 |
21277 | 21164 | ||
21278 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 21165 | have_ecore_x_xcb="no" |
21279 | $as_echo "no" >&6; } | ||
21280 | have_ecore_x_xcb="no" | ||
21281 | elif test $pkg_failed = untried; then | 21166 | elif test $pkg_failed = untried; then |
21167 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21168 | $as_echo "no" >&6; } | ||
21282 | have_ecore_x_xcb="no" | 21169 | have_ecore_x_xcb="no" |
21283 | else | 21170 | else |
21284 | ECORE_XCB_CFLAGS=$pkg_cv_ECORE_XCB_CFLAGS | 21171 | ECORE_XCB_CFLAGS=$pkg_cv_ECORE_XCB_CFLAGS |
@@ -21293,17 +21180,18 @@ $as_echo "#define OLD_XCB_VERSION 1" >>confdefs.h | |||
21293 | fi | 21180 | fi |
21294 | 21181 | ||
21295 | elif test $pkg_failed = untried; then | 21182 | elif test $pkg_failed = untried; then |
21183 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21184 | $as_echo "no" >&6; } | ||
21296 | 21185 | ||
21297 | 21186 | ||
21298 | pkg_failed=no | 21187 | pkg_failed=no |
21299 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECORE_XCB" >&5 | 21188 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECORE_XCB" >&5 |
21300 | $as_echo_n "checking for ECORE_XCB... " >&6; } | 21189 | $as_echo_n "checking for ECORE_XCB... " >&6; } |
21301 | 21190 | ||
21302 | if test -n "$PKG_CONFIG"; then | 21191 | if test -n "$ECORE_XCB_CFLAGS"; then |
21303 | if test -n "$ECORE_XCB_CFLAGS"; then | 21192 | pkg_cv_ECORE_XCB_CFLAGS="$ECORE_XCB_CFLAGS" |
21304 | pkg_cv_ECORE_XCB_CFLAGS="$ECORE_XCB_CFLAGS" | 21193 | elif test -n "$PKG_CONFIG"; then |
21305 | else | 21194 | if test -n "$PKG_CONFIG" && \ |
21306 | if test -n "$PKG_CONFIG" && \ | ||
21307 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms\""; } >&5 | 21195 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms\""; } >&5 |
21308 | ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms") 2>&5 | 21196 | ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms") 2>&5 |
21309 | ac_status=$? | 21197 | ac_status=$? |
@@ -21313,15 +21201,13 @@ if test -n "$PKG_CONFIG"; then | |||
21313 | else | 21201 | else |
21314 | pkg_failed=yes | 21202 | pkg_failed=yes |
21315 | fi | 21203 | fi |
21316 | fi | 21204 | else |
21317 | else | 21205 | pkg_failed=untried |
21318 | pkg_failed=untried | ||
21319 | fi | 21206 | fi |
21320 | if test -n "$PKG_CONFIG"; then | 21207 | if test -n "$ECORE_XCB_LIBS"; then |
21321 | if test -n "$ECORE_XCB_LIBS"; then | 21208 | pkg_cv_ECORE_XCB_LIBS="$ECORE_XCB_LIBS" |
21322 | pkg_cv_ECORE_XCB_LIBS="$ECORE_XCB_LIBS" | 21209 | elif test -n "$PKG_CONFIG"; then |
21323 | else | 21210 | if test -n "$PKG_CONFIG" && \ |
21324 | if test -n "$PKG_CONFIG" && \ | ||
21325 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms\""; } >&5 | 21211 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms\""; } >&5 |
21326 | ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms") 2>&5 | 21212 | ($PKG_CONFIG --exists --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms") 2>&5 |
21327 | ac_status=$? | 21213 | ac_status=$? |
@@ -21331,14 +21217,15 @@ if test -n "$PKG_CONFIG"; then | |||
21331 | else | 21217 | else |
21332 | pkg_failed=yes | 21218 | pkg_failed=yes |
21333 | fi | 21219 | fi |
21334 | fi | 21220 | else |
21335 | else | 21221 | pkg_failed=untried |
21336 | pkg_failed=untried | ||
21337 | fi | 21222 | fi |
21338 | 21223 | ||
21339 | 21224 | ||
21340 | 21225 | ||
21341 | if test $pkg_failed = yes; then | 21226 | if test $pkg_failed = yes; then |
21227 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21228 | $as_echo "no" >&6; } | ||
21342 | 21229 | ||
21343 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 21230 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
21344 | _pkg_short_errors_supported=yes | 21231 | _pkg_short_errors_supported=yes |
@@ -21346,17 +21233,17 @@ else | |||
21346 | _pkg_short_errors_supported=no | 21233 | _pkg_short_errors_supported=no |
21347 | fi | 21234 | fi |
21348 | if test $_pkg_short_errors_supported = yes; then | 21235 | if test $_pkg_short_errors_supported = yes; then |
21349 | ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms"` | 21236 | ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms" 2>&1` |
21350 | else | 21237 | else |
21351 | ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms"` | 21238 | ECORE_XCB_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11-xcb xcb xcb-event xcb-shm xcb-icccm xcb-image xcb-keysyms" 2>&1` |
21352 | fi | 21239 | fi |
21353 | # Put the nasty error message in config.log where it belongs | 21240 | # Put the nasty error message in config.log where it belongs |
21354 | echo "$ECORE_XCB_PKG_ERRORS" >&5 | 21241 | echo "$ECORE_XCB_PKG_ERRORS" >&5 |
21355 | 21242 | ||
21356 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 21243 | have_ecore_x_xcb="no" |
21357 | $as_echo "no" >&6; } | ||
21358 | have_ecore_x_xcb="no" | ||
21359 | elif test $pkg_failed = untried; then | 21244 | elif test $pkg_failed = untried; then |
21245 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21246 | $as_echo "no" >&6; } | ||
21360 | have_ecore_x_xcb="no" | 21247 | have_ecore_x_xcb="no" |
21361 | else | 21248 | else |
21362 | ECORE_XCB_CFLAGS=$pkg_cv_ECORE_XCB_CFLAGS | 21249 | ECORE_XCB_CFLAGS=$pkg_cv_ECORE_XCB_CFLAGS |
@@ -21387,11 +21274,10 @@ pkg_failed=no | |||
21387 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PIXMAN" >&5 | 21274 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PIXMAN" >&5 |
21388 | $as_echo_n "checking for PIXMAN... " >&6; } | 21275 | $as_echo_n "checking for PIXMAN... " >&6; } |
21389 | 21276 | ||
21390 | if test -n "$PKG_CONFIG"; then | 21277 | if test -n "$PIXMAN_CFLAGS"; then |
21391 | if test -n "$PIXMAN_CFLAGS"; then | 21278 | pkg_cv_PIXMAN_CFLAGS="$PIXMAN_CFLAGS" |
21392 | pkg_cv_PIXMAN_CFLAGS="$PIXMAN_CFLAGS" | 21279 | elif test -n "$PKG_CONFIG"; then |
21393 | else | 21280 | if test -n "$PKG_CONFIG" && \ |
21394 | if test -n "$PKG_CONFIG" && \ | ||
21395 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1\""; } >&5 | 21281 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1\""; } >&5 |
21396 | ($PKG_CONFIG --exists --print-errors "pixman-1") 2>&5 | 21282 | ($PKG_CONFIG --exists --print-errors "pixman-1") 2>&5 |
21397 | ac_status=$? | 21283 | ac_status=$? |
@@ -21401,15 +21287,13 @@ if test -n "$PKG_CONFIG"; then | |||
21401 | else | 21287 | else |
21402 | pkg_failed=yes | 21288 | pkg_failed=yes |
21403 | fi | 21289 | fi |
21404 | fi | 21290 | else |
21405 | else | 21291 | pkg_failed=untried |
21406 | pkg_failed=untried | ||
21407 | fi | 21292 | fi |
21408 | if test -n "$PKG_CONFIG"; then | 21293 | if test -n "$PIXMAN_LIBS"; then |
21409 | if test -n "$PIXMAN_LIBS"; then | 21294 | pkg_cv_PIXMAN_LIBS="$PIXMAN_LIBS" |
21410 | pkg_cv_PIXMAN_LIBS="$PIXMAN_LIBS" | 21295 | elif test -n "$PKG_CONFIG"; then |
21411 | else | 21296 | if test -n "$PKG_CONFIG" && \ |
21412 | if test -n "$PKG_CONFIG" && \ | ||
21413 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1\""; } >&5 | 21297 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pixman-1\""; } >&5 |
21414 | ($PKG_CONFIG --exists --print-errors "pixman-1") 2>&5 | 21298 | ($PKG_CONFIG --exists --print-errors "pixman-1") 2>&5 |
21415 | ac_status=$? | 21299 | ac_status=$? |
@@ -21419,14 +21303,15 @@ if test -n "$PKG_CONFIG"; then | |||
21419 | else | 21303 | else |
21420 | pkg_failed=yes | 21304 | pkg_failed=yes |
21421 | fi | 21305 | fi |
21422 | fi | 21306 | else |
21423 | else | 21307 | pkg_failed=untried |
21424 | pkg_failed=untried | ||
21425 | fi | 21308 | fi |
21426 | 21309 | ||
21427 | 21310 | ||
21428 | 21311 | ||
21429 | if test $pkg_failed = yes; then | 21312 | if test $pkg_failed = yes; then |
21313 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21314 | $as_echo "no" >&6; } | ||
21430 | 21315 | ||
21431 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 21316 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
21432 | _pkg_short_errors_supported=yes | 21317 | _pkg_short_errors_supported=yes |
@@ -21434,24 +21319,24 @@ else | |||
21434 | _pkg_short_errors_supported=no | 21319 | _pkg_short_errors_supported=no |
21435 | fi | 21320 | fi |
21436 | if test $_pkg_short_errors_supported = yes; then | 21321 | if test $_pkg_short_errors_supported = yes; then |
21437 | PIXMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pixman-1"` | 21322 | PIXMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pixman-1" 2>&1` |
21438 | else | 21323 | else |
21439 | PIXMAN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pixman-1"` | 21324 | PIXMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors "pixman-1" 2>&1` |
21440 | fi | 21325 | fi |
21441 | # Put the nasty error message in config.log where it belongs | 21326 | # Put the nasty error message in config.log where it belongs |
21442 | echo "$PIXMAN_PKG_ERRORS" >&5 | 21327 | echo "$PIXMAN_PKG_ERRORS" >&5 |
21443 | 21328 | ||
21444 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21445 | $as_echo "no" >&6; } | ||
21446 | 21329 | ||
21447 | if test "x${want_pixman}" = "xyes" -a "x${use_strict}" = "xyes" ; then | 21330 | if test "x${want_pixman}" = "xyes" -a "x${use_strict}" = "xyes" ; then |
21448 | as_fn_error "Pixman not found (strict dependencies checking)" "$LINENO" 5 | 21331 | as_fn_error $? "Pixman not found (strict dependencies checking)" "$LINENO" 5 |
21449 | fi | 21332 | fi |
21450 | 21333 | ||
21451 | elif test $pkg_failed = untried; then | 21334 | elif test $pkg_failed = untried; then |
21335 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21336 | $as_echo "no" >&6; } | ||
21452 | 21337 | ||
21453 | if test "x${want_pixman}" = "xyes" -a "x${use_strict}" = "xyes" ; then | 21338 | if test "x${want_pixman}" = "xyes" -a "x${use_strict}" = "xyes" ; then |
21454 | as_fn_error "Pixman not found (strict dependencies checking)" "$LINENO" 5 | 21339 | as_fn_error $? "Pixman not found (strict dependencies checking)" "$LINENO" 5 |
21455 | fi | 21340 | fi |
21456 | 21341 | ||
21457 | else | 21342 | else |
@@ -21474,11 +21359,10 @@ pkg_failed=no | |||
21474 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_COMPOSITE" >&5 | 21359 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_COMPOSITE" >&5 |
21475 | $as_echo_n "checking for XCB_COMPOSITE... " >&6; } | 21360 | $as_echo_n "checking for XCB_COMPOSITE... " >&6; } |
21476 | 21361 | ||
21477 | if test -n "$PKG_CONFIG"; then | 21362 | if test -n "$XCB_COMPOSITE_CFLAGS"; then |
21478 | if test -n "$XCB_COMPOSITE_CFLAGS"; then | 21363 | pkg_cv_XCB_COMPOSITE_CFLAGS="$XCB_COMPOSITE_CFLAGS" |
21479 | pkg_cv_XCB_COMPOSITE_CFLAGS="$XCB_COMPOSITE_CFLAGS" | 21364 | elif test -n "$PKG_CONFIG"; then |
21480 | else | 21365 | if test -n "$PKG_CONFIG" && \ |
21481 | if test -n "$PKG_CONFIG" && \ | ||
21482 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-composite\""; } >&5 | 21366 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-composite\""; } >&5 |
21483 | ($PKG_CONFIG --exists --print-errors "xcb-composite") 2>&5 | 21367 | ($PKG_CONFIG --exists --print-errors "xcb-composite") 2>&5 |
21484 | ac_status=$? | 21368 | ac_status=$? |
@@ -21488,15 +21372,13 @@ if test -n "$PKG_CONFIG"; then | |||
21488 | else | 21372 | else |
21489 | pkg_failed=yes | 21373 | pkg_failed=yes |
21490 | fi | 21374 | fi |
21491 | fi | 21375 | else |
21492 | else | 21376 | pkg_failed=untried |
21493 | pkg_failed=untried | ||
21494 | fi | 21377 | fi |
21495 | if test -n "$PKG_CONFIG"; then | 21378 | if test -n "$XCB_COMPOSITE_LIBS"; then |
21496 | if test -n "$XCB_COMPOSITE_LIBS"; then | 21379 | pkg_cv_XCB_COMPOSITE_LIBS="$XCB_COMPOSITE_LIBS" |
21497 | pkg_cv_XCB_COMPOSITE_LIBS="$XCB_COMPOSITE_LIBS" | 21380 | elif test -n "$PKG_CONFIG"; then |
21498 | else | 21381 | if test -n "$PKG_CONFIG" && \ |
21499 | if test -n "$PKG_CONFIG" && \ | ||
21500 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-composite\""; } >&5 | 21382 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-composite\""; } >&5 |
21501 | ($PKG_CONFIG --exists --print-errors "xcb-composite") 2>&5 | 21383 | ($PKG_CONFIG --exists --print-errors "xcb-composite") 2>&5 |
21502 | ac_status=$? | 21384 | ac_status=$? |
@@ -21506,14 +21388,15 @@ if test -n "$PKG_CONFIG"; then | |||
21506 | else | 21388 | else |
21507 | pkg_failed=yes | 21389 | pkg_failed=yes |
21508 | fi | 21390 | fi |
21509 | fi | 21391 | else |
21510 | else | 21392 | pkg_failed=untried |
21511 | pkg_failed=untried | ||
21512 | fi | 21393 | fi |
21513 | 21394 | ||
21514 | 21395 | ||
21515 | 21396 | ||
21516 | if test $pkg_failed = yes; then | 21397 | if test $pkg_failed = yes; then |
21398 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21399 | $as_echo "no" >&6; } | ||
21517 | 21400 | ||
21518 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 21401 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
21519 | _pkg_short_errors_supported=yes | 21402 | _pkg_short_errors_supported=yes |
@@ -21521,17 +21404,17 @@ else | |||
21521 | _pkg_short_errors_supported=no | 21404 | _pkg_short_errors_supported=no |
21522 | fi | 21405 | fi |
21523 | if test $_pkg_short_errors_supported = yes; then | 21406 | if test $_pkg_short_errors_supported = yes; then |
21524 | XCB_COMPOSITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-composite"` | 21407 | XCB_COMPOSITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-composite" 2>&1` |
21525 | else | 21408 | else |
21526 | XCB_COMPOSITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-composite"` | 21409 | XCB_COMPOSITE_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-composite" 2>&1` |
21527 | fi | 21410 | fi |
21528 | # Put the nasty error message in config.log where it belongs | 21411 | # Put the nasty error message in config.log where it belongs |
21529 | echo "$XCB_COMPOSITE_PKG_ERRORS" >&5 | 21412 | echo "$XCB_COMPOSITE_PKG_ERRORS" >&5 |
21530 | 21413 | ||
21531 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 21414 | have_ecore_x_xcb_composite="no" |
21532 | $as_echo "no" >&6; } | ||
21533 | have_ecore_x_xcb_composite="no" | ||
21534 | elif test $pkg_failed = untried; then | 21415 | elif test $pkg_failed = untried; then |
21416 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21417 | $as_echo "no" >&6; } | ||
21535 | have_ecore_x_xcb_composite="no" | 21418 | have_ecore_x_xcb_composite="no" |
21536 | else | 21419 | else |
21537 | XCB_COMPOSITE_CFLAGS=$pkg_cv_XCB_COMPOSITE_CFLAGS | 21420 | XCB_COMPOSITE_CFLAGS=$pkg_cv_XCB_COMPOSITE_CFLAGS |
@@ -21556,11 +21439,10 @@ pkg_failed=no | |||
21556 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_DAMAGE" >&5 | 21439 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_DAMAGE" >&5 |
21557 | $as_echo_n "checking for XCB_DAMAGE... " >&6; } | 21440 | $as_echo_n "checking for XCB_DAMAGE... " >&6; } |
21558 | 21441 | ||
21559 | if test -n "$PKG_CONFIG"; then | 21442 | if test -n "$XCB_DAMAGE_CFLAGS"; then |
21560 | if test -n "$XCB_DAMAGE_CFLAGS"; then | 21443 | pkg_cv_XCB_DAMAGE_CFLAGS="$XCB_DAMAGE_CFLAGS" |
21561 | pkg_cv_XCB_DAMAGE_CFLAGS="$XCB_DAMAGE_CFLAGS" | 21444 | elif test -n "$PKG_CONFIG"; then |
21562 | else | 21445 | if test -n "$PKG_CONFIG" && \ |
21563 | if test -n "$PKG_CONFIG" && \ | ||
21564 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-damage\""; } >&5 | 21446 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-damage\""; } >&5 |
21565 | ($PKG_CONFIG --exists --print-errors "xcb-damage") 2>&5 | 21447 | ($PKG_CONFIG --exists --print-errors "xcb-damage") 2>&5 |
21566 | ac_status=$? | 21448 | ac_status=$? |
@@ -21570,15 +21452,13 @@ if test -n "$PKG_CONFIG"; then | |||
21570 | else | 21452 | else |
21571 | pkg_failed=yes | 21453 | pkg_failed=yes |
21572 | fi | 21454 | fi |
21573 | fi | 21455 | else |
21574 | else | 21456 | pkg_failed=untried |
21575 | pkg_failed=untried | ||
21576 | fi | 21457 | fi |
21577 | if test -n "$PKG_CONFIG"; then | 21458 | if test -n "$XCB_DAMAGE_LIBS"; then |
21578 | if test -n "$XCB_DAMAGE_LIBS"; then | 21459 | pkg_cv_XCB_DAMAGE_LIBS="$XCB_DAMAGE_LIBS" |
21579 | pkg_cv_XCB_DAMAGE_LIBS="$XCB_DAMAGE_LIBS" | 21460 | elif test -n "$PKG_CONFIG"; then |
21580 | else | 21461 | if test -n "$PKG_CONFIG" && \ |
21581 | if test -n "$PKG_CONFIG" && \ | ||
21582 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-damage\""; } >&5 | 21462 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-damage\""; } >&5 |
21583 | ($PKG_CONFIG --exists --print-errors "xcb-damage") 2>&5 | 21463 | ($PKG_CONFIG --exists --print-errors "xcb-damage") 2>&5 |
21584 | ac_status=$? | 21464 | ac_status=$? |
@@ -21588,14 +21468,15 @@ if test -n "$PKG_CONFIG"; then | |||
21588 | else | 21468 | else |
21589 | pkg_failed=yes | 21469 | pkg_failed=yes |
21590 | fi | 21470 | fi |
21591 | fi | 21471 | else |
21592 | else | 21472 | pkg_failed=untried |
21593 | pkg_failed=untried | ||
21594 | fi | 21473 | fi |
21595 | 21474 | ||
21596 | 21475 | ||
21597 | 21476 | ||
21598 | if test $pkg_failed = yes; then | 21477 | if test $pkg_failed = yes; then |
21478 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21479 | $as_echo "no" >&6; } | ||
21599 | 21480 | ||
21600 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 21481 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
21601 | _pkg_short_errors_supported=yes | 21482 | _pkg_short_errors_supported=yes |
@@ -21603,17 +21484,17 @@ else | |||
21603 | _pkg_short_errors_supported=no | 21484 | _pkg_short_errors_supported=no |
21604 | fi | 21485 | fi |
21605 | if test $_pkg_short_errors_supported = yes; then | 21486 | if test $_pkg_short_errors_supported = yes; then |
21606 | XCB_DAMAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-damage"` | 21487 | XCB_DAMAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-damage" 2>&1` |
21607 | else | 21488 | else |
21608 | XCB_DAMAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-damage"` | 21489 | XCB_DAMAGE_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-damage" 2>&1` |
21609 | fi | 21490 | fi |
21610 | # Put the nasty error message in config.log where it belongs | 21491 | # Put the nasty error message in config.log where it belongs |
21611 | echo "$XCB_DAMAGE_PKG_ERRORS" >&5 | 21492 | echo "$XCB_DAMAGE_PKG_ERRORS" >&5 |
21612 | 21493 | ||
21613 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 21494 | have_ecore_x_xcb_damage="no" |
21614 | $as_echo "no" >&6; } | ||
21615 | have_ecore_x_xcb_damage="no" | ||
21616 | elif test $pkg_failed = untried; then | 21495 | elif test $pkg_failed = untried; then |
21496 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21497 | $as_echo "no" >&6; } | ||
21617 | have_ecore_x_xcb_damage="no" | 21498 | have_ecore_x_xcb_damage="no" |
21618 | else | 21499 | else |
21619 | XCB_DAMAGE_CFLAGS=$pkg_cv_XCB_DAMAGE_CFLAGS | 21500 | XCB_DAMAGE_CFLAGS=$pkg_cv_XCB_DAMAGE_CFLAGS |
@@ -21638,11 +21519,10 @@ pkg_failed=no | |||
21638 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_DPMS" >&5 | 21519 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_DPMS" >&5 |
21639 | $as_echo_n "checking for XCB_DPMS... " >&6; } | 21520 | $as_echo_n "checking for XCB_DPMS... " >&6; } |
21640 | 21521 | ||
21641 | if test -n "$PKG_CONFIG"; then | 21522 | if test -n "$XCB_DPMS_CFLAGS"; then |
21642 | if test -n "$XCB_DPMS_CFLAGS"; then | 21523 | pkg_cv_XCB_DPMS_CFLAGS="$XCB_DPMS_CFLAGS" |
21643 | pkg_cv_XCB_DPMS_CFLAGS="$XCB_DPMS_CFLAGS" | 21524 | elif test -n "$PKG_CONFIG"; then |
21644 | else | 21525 | if test -n "$PKG_CONFIG" && \ |
21645 | if test -n "$PKG_CONFIG" && \ | ||
21646 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-dpms\""; } >&5 | 21526 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-dpms\""; } >&5 |
21647 | ($PKG_CONFIG --exists --print-errors "xcb-dpms") 2>&5 | 21527 | ($PKG_CONFIG --exists --print-errors "xcb-dpms") 2>&5 |
21648 | ac_status=$? | 21528 | ac_status=$? |
@@ -21652,15 +21532,13 @@ if test -n "$PKG_CONFIG"; then | |||
21652 | else | 21532 | else |
21653 | pkg_failed=yes | 21533 | pkg_failed=yes |
21654 | fi | 21534 | fi |
21655 | fi | 21535 | else |
21656 | else | 21536 | pkg_failed=untried |
21657 | pkg_failed=untried | ||
21658 | fi | 21537 | fi |
21659 | if test -n "$PKG_CONFIG"; then | 21538 | if test -n "$XCB_DPMS_LIBS"; then |
21660 | if test -n "$XCB_DPMS_LIBS"; then | 21539 | pkg_cv_XCB_DPMS_LIBS="$XCB_DPMS_LIBS" |
21661 | pkg_cv_XCB_DPMS_LIBS="$XCB_DPMS_LIBS" | 21540 | elif test -n "$PKG_CONFIG"; then |
21662 | else | 21541 | if test -n "$PKG_CONFIG" && \ |
21663 | if test -n "$PKG_CONFIG" && \ | ||
21664 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-dpms\""; } >&5 | 21542 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-dpms\""; } >&5 |
21665 | ($PKG_CONFIG --exists --print-errors "xcb-dpms") 2>&5 | 21543 | ($PKG_CONFIG --exists --print-errors "xcb-dpms") 2>&5 |
21666 | ac_status=$? | 21544 | ac_status=$? |
@@ -21670,14 +21548,15 @@ if test -n "$PKG_CONFIG"; then | |||
21670 | else | 21548 | else |
21671 | pkg_failed=yes | 21549 | pkg_failed=yes |
21672 | fi | 21550 | fi |
21673 | fi | 21551 | else |
21674 | else | 21552 | pkg_failed=untried |
21675 | pkg_failed=untried | ||
21676 | fi | 21553 | fi |
21677 | 21554 | ||
21678 | 21555 | ||
21679 | 21556 | ||
21680 | if test $pkg_failed = yes; then | 21557 | if test $pkg_failed = yes; then |
21558 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21559 | $as_echo "no" >&6; } | ||
21681 | 21560 | ||
21682 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 21561 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
21683 | _pkg_short_errors_supported=yes | 21562 | _pkg_short_errors_supported=yes |
@@ -21685,17 +21564,17 @@ else | |||
21685 | _pkg_short_errors_supported=no | 21564 | _pkg_short_errors_supported=no |
21686 | fi | 21565 | fi |
21687 | if test $_pkg_short_errors_supported = yes; then | 21566 | if test $_pkg_short_errors_supported = yes; then |
21688 | XCB_DPMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-dpms"` | 21567 | XCB_DPMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-dpms" 2>&1` |
21689 | else | 21568 | else |
21690 | XCB_DPMS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-dpms"` | 21569 | XCB_DPMS_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-dpms" 2>&1` |
21691 | fi | 21570 | fi |
21692 | # Put the nasty error message in config.log where it belongs | 21571 | # Put the nasty error message in config.log where it belongs |
21693 | echo "$XCB_DPMS_PKG_ERRORS" >&5 | 21572 | echo "$XCB_DPMS_PKG_ERRORS" >&5 |
21694 | 21573 | ||
21695 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 21574 | have_ecore_x_xcb_dpms="no" |
21696 | $as_echo "no" >&6; } | ||
21697 | have_ecore_x_xcb_dpms="no" | ||
21698 | elif test $pkg_failed = untried; then | 21575 | elif test $pkg_failed = untried; then |
21576 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21577 | $as_echo "no" >&6; } | ||
21699 | have_ecore_x_xcb_dpms="no" | 21578 | have_ecore_x_xcb_dpms="no" |
21700 | else | 21579 | else |
21701 | XCB_DPMS_CFLAGS=$pkg_cv_XCB_DPMS_CFLAGS | 21580 | XCB_DPMS_CFLAGS=$pkg_cv_XCB_DPMS_CFLAGS |
@@ -21720,11 +21599,10 @@ pkg_failed=no | |||
21720 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_RANDR" >&5 | 21599 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_RANDR" >&5 |
21721 | $as_echo_n "checking for XCB_RANDR... " >&6; } | 21600 | $as_echo_n "checking for XCB_RANDR... " >&6; } |
21722 | 21601 | ||
21723 | if test -n "$PKG_CONFIG"; then | 21602 | if test -n "$XCB_RANDR_CFLAGS"; then |
21724 | if test -n "$XCB_RANDR_CFLAGS"; then | 21603 | pkg_cv_XCB_RANDR_CFLAGS="$XCB_RANDR_CFLAGS" |
21725 | pkg_cv_XCB_RANDR_CFLAGS="$XCB_RANDR_CFLAGS" | 21604 | elif test -n "$PKG_CONFIG"; then |
21726 | else | 21605 | if test -n "$PKG_CONFIG" && \ |
21727 | if test -n "$PKG_CONFIG" && \ | ||
21728 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-randr\""; } >&5 | 21606 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-randr\""; } >&5 |
21729 | ($PKG_CONFIG --exists --print-errors "xcb-randr") 2>&5 | 21607 | ($PKG_CONFIG --exists --print-errors "xcb-randr") 2>&5 |
21730 | ac_status=$? | 21608 | ac_status=$? |
@@ -21734,15 +21612,13 @@ if test -n "$PKG_CONFIG"; then | |||
21734 | else | 21612 | else |
21735 | pkg_failed=yes | 21613 | pkg_failed=yes |
21736 | fi | 21614 | fi |
21737 | fi | 21615 | else |
21738 | else | 21616 | pkg_failed=untried |
21739 | pkg_failed=untried | ||
21740 | fi | 21617 | fi |
21741 | if test -n "$PKG_CONFIG"; then | 21618 | if test -n "$XCB_RANDR_LIBS"; then |
21742 | if test -n "$XCB_RANDR_LIBS"; then | 21619 | pkg_cv_XCB_RANDR_LIBS="$XCB_RANDR_LIBS" |
21743 | pkg_cv_XCB_RANDR_LIBS="$XCB_RANDR_LIBS" | 21620 | elif test -n "$PKG_CONFIG"; then |
21744 | else | 21621 | if test -n "$PKG_CONFIG" && \ |
21745 | if test -n "$PKG_CONFIG" && \ | ||
21746 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-randr\""; } >&5 | 21622 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-randr\""; } >&5 |
21747 | ($PKG_CONFIG --exists --print-errors "xcb-randr") 2>&5 | 21623 | ($PKG_CONFIG --exists --print-errors "xcb-randr") 2>&5 |
21748 | ac_status=$? | 21624 | ac_status=$? |
@@ -21752,14 +21628,15 @@ if test -n "$PKG_CONFIG"; then | |||
21752 | else | 21628 | else |
21753 | pkg_failed=yes | 21629 | pkg_failed=yes |
21754 | fi | 21630 | fi |
21755 | fi | 21631 | else |
21756 | else | 21632 | pkg_failed=untried |
21757 | pkg_failed=untried | ||
21758 | fi | 21633 | fi |
21759 | 21634 | ||
21760 | 21635 | ||
21761 | 21636 | ||
21762 | if test $pkg_failed = yes; then | 21637 | if test $pkg_failed = yes; then |
21638 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21639 | $as_echo "no" >&6; } | ||
21763 | 21640 | ||
21764 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 21641 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
21765 | _pkg_short_errors_supported=yes | 21642 | _pkg_short_errors_supported=yes |
@@ -21767,17 +21644,17 @@ else | |||
21767 | _pkg_short_errors_supported=no | 21644 | _pkg_short_errors_supported=no |
21768 | fi | 21645 | fi |
21769 | if test $_pkg_short_errors_supported = yes; then | 21646 | if test $_pkg_short_errors_supported = yes; then |
21770 | XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-randr"` | 21647 | XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-randr" 2>&1` |
21771 | else | 21648 | else |
21772 | XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-randr"` | 21649 | XCB_RANDR_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-randr" 2>&1` |
21773 | fi | 21650 | fi |
21774 | # Put the nasty error message in config.log where it belongs | 21651 | # Put the nasty error message in config.log where it belongs |
21775 | echo "$XCB_RANDR_PKG_ERRORS" >&5 | 21652 | echo "$XCB_RANDR_PKG_ERRORS" >&5 |
21776 | 21653 | ||
21777 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 21654 | have_ecore_x_xcb_randr="no" |
21778 | $as_echo "no" >&6; } | ||
21779 | have_ecore_x_xcb_randr="no" | ||
21780 | elif test $pkg_failed = untried; then | 21655 | elif test $pkg_failed = untried; then |
21656 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21657 | $as_echo "no" >&6; } | ||
21781 | have_ecore_x_xcb_randr="no" | 21658 | have_ecore_x_xcb_randr="no" |
21782 | else | 21659 | else |
21783 | XCB_RANDR_CFLAGS=$pkg_cv_XCB_RANDR_CFLAGS | 21660 | XCB_RANDR_CFLAGS=$pkg_cv_XCB_RANDR_CFLAGS |
@@ -21802,11 +21679,10 @@ pkg_failed=no | |||
21802 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_RENDER" >&5 | 21679 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_RENDER" >&5 |
21803 | $as_echo_n "checking for XCB_RENDER... " >&6; } | 21680 | $as_echo_n "checking for XCB_RENDER... " >&6; } |
21804 | 21681 | ||
21805 | if test -n "$PKG_CONFIG"; then | 21682 | if test -n "$XCB_RENDER_CFLAGS"; then |
21806 | if test -n "$XCB_RENDER_CFLAGS"; then | 21683 | pkg_cv_XCB_RENDER_CFLAGS="$XCB_RENDER_CFLAGS" |
21807 | pkg_cv_XCB_RENDER_CFLAGS="$XCB_RENDER_CFLAGS" | 21684 | elif test -n "$PKG_CONFIG"; then |
21808 | else | 21685 | if test -n "$PKG_CONFIG" && \ |
21809 | if test -n "$PKG_CONFIG" && \ | ||
21810 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-render xcb-renderutil\""; } >&5 | 21686 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-render xcb-renderutil\""; } >&5 |
21811 | ($PKG_CONFIG --exists --print-errors "xcb-render xcb-renderutil") 2>&5 | 21687 | ($PKG_CONFIG --exists --print-errors "xcb-render xcb-renderutil") 2>&5 |
21812 | ac_status=$? | 21688 | ac_status=$? |
@@ -21816,15 +21692,13 @@ if test -n "$PKG_CONFIG"; then | |||
21816 | else | 21692 | else |
21817 | pkg_failed=yes | 21693 | pkg_failed=yes |
21818 | fi | 21694 | fi |
21819 | fi | 21695 | else |
21820 | else | 21696 | pkg_failed=untried |
21821 | pkg_failed=untried | ||
21822 | fi | 21697 | fi |
21823 | if test -n "$PKG_CONFIG"; then | 21698 | if test -n "$XCB_RENDER_LIBS"; then |
21824 | if test -n "$XCB_RENDER_LIBS"; then | 21699 | pkg_cv_XCB_RENDER_LIBS="$XCB_RENDER_LIBS" |
21825 | pkg_cv_XCB_RENDER_LIBS="$XCB_RENDER_LIBS" | 21700 | elif test -n "$PKG_CONFIG"; then |
21826 | else | 21701 | if test -n "$PKG_CONFIG" && \ |
21827 | if test -n "$PKG_CONFIG" && \ | ||
21828 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-render xcb-renderutil\""; } >&5 | 21702 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-render xcb-renderutil\""; } >&5 |
21829 | ($PKG_CONFIG --exists --print-errors "xcb-render xcb-renderutil") 2>&5 | 21703 | ($PKG_CONFIG --exists --print-errors "xcb-render xcb-renderutil") 2>&5 |
21830 | ac_status=$? | 21704 | ac_status=$? |
@@ -21834,14 +21708,15 @@ if test -n "$PKG_CONFIG"; then | |||
21834 | else | 21708 | else |
21835 | pkg_failed=yes | 21709 | pkg_failed=yes |
21836 | fi | 21710 | fi |
21837 | fi | 21711 | else |
21838 | else | 21712 | pkg_failed=untried |
21839 | pkg_failed=untried | ||
21840 | fi | 21713 | fi |
21841 | 21714 | ||
21842 | 21715 | ||
21843 | 21716 | ||
21844 | if test $pkg_failed = yes; then | 21717 | if test $pkg_failed = yes; then |
21718 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21719 | $as_echo "no" >&6; } | ||
21845 | 21720 | ||
21846 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 21721 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
21847 | _pkg_short_errors_supported=yes | 21722 | _pkg_short_errors_supported=yes |
@@ -21849,17 +21724,17 @@ else | |||
21849 | _pkg_short_errors_supported=no | 21724 | _pkg_short_errors_supported=no |
21850 | fi | 21725 | fi |
21851 | if test $_pkg_short_errors_supported = yes; then | 21726 | if test $_pkg_short_errors_supported = yes; then |
21852 | XCB_RENDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-render xcb-renderutil"` | 21727 | XCB_RENDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-render xcb-renderutil" 2>&1` |
21853 | else | 21728 | else |
21854 | XCB_RENDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-render xcb-renderutil"` | 21729 | XCB_RENDER_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-render xcb-renderutil" 2>&1` |
21855 | fi | 21730 | fi |
21856 | # Put the nasty error message in config.log where it belongs | 21731 | # Put the nasty error message in config.log where it belongs |
21857 | echo "$XCB_RENDER_PKG_ERRORS" >&5 | 21732 | echo "$XCB_RENDER_PKG_ERRORS" >&5 |
21858 | 21733 | ||
21859 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 21734 | have_ecore_x_xcb_render="no" |
21860 | $as_echo "no" >&6; } | ||
21861 | have_ecore_x_xcb_render="no" | ||
21862 | elif test $pkg_failed = untried; then | 21735 | elif test $pkg_failed = untried; then |
21736 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21737 | $as_echo "no" >&6; } | ||
21863 | have_ecore_x_xcb_render="no" | 21738 | have_ecore_x_xcb_render="no" |
21864 | else | 21739 | else |
21865 | XCB_RENDER_CFLAGS=$pkg_cv_XCB_RENDER_CFLAGS | 21740 | XCB_RENDER_CFLAGS=$pkg_cv_XCB_RENDER_CFLAGS |
@@ -21884,11 +21759,10 @@ pkg_failed=no | |||
21884 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_SCREENSAVER" >&5 | 21759 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_SCREENSAVER" >&5 |
21885 | $as_echo_n "checking for XCB_SCREENSAVER... " >&6; } | 21760 | $as_echo_n "checking for XCB_SCREENSAVER... " >&6; } |
21886 | 21761 | ||
21887 | if test -n "$PKG_CONFIG"; then | 21762 | if test -n "$XCB_SCREENSAVER_CFLAGS"; then |
21888 | if test -n "$XCB_SCREENSAVER_CFLAGS"; then | 21763 | pkg_cv_XCB_SCREENSAVER_CFLAGS="$XCB_SCREENSAVER_CFLAGS" |
21889 | pkg_cv_XCB_SCREENSAVER_CFLAGS="$XCB_SCREENSAVER_CFLAGS" | 21764 | elif test -n "$PKG_CONFIG"; then |
21890 | else | 21765 | if test -n "$PKG_CONFIG" && \ |
21891 | if test -n "$PKG_CONFIG" && \ | ||
21892 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-screensaver\""; } >&5 | 21766 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-screensaver\""; } >&5 |
21893 | ($PKG_CONFIG --exists --print-errors "xcb-screensaver") 2>&5 | 21767 | ($PKG_CONFIG --exists --print-errors "xcb-screensaver") 2>&5 |
21894 | ac_status=$? | 21768 | ac_status=$? |
@@ -21898,15 +21772,13 @@ if test -n "$PKG_CONFIG"; then | |||
21898 | else | 21772 | else |
21899 | pkg_failed=yes | 21773 | pkg_failed=yes |
21900 | fi | 21774 | fi |
21901 | fi | 21775 | else |
21902 | else | 21776 | pkg_failed=untried |
21903 | pkg_failed=untried | ||
21904 | fi | 21777 | fi |
21905 | if test -n "$PKG_CONFIG"; then | 21778 | if test -n "$XCB_SCREENSAVER_LIBS"; then |
21906 | if test -n "$XCB_SCREENSAVER_LIBS"; then | 21779 | pkg_cv_XCB_SCREENSAVER_LIBS="$XCB_SCREENSAVER_LIBS" |
21907 | pkg_cv_XCB_SCREENSAVER_LIBS="$XCB_SCREENSAVER_LIBS" | 21780 | elif test -n "$PKG_CONFIG"; then |
21908 | else | 21781 | if test -n "$PKG_CONFIG" && \ |
21909 | if test -n "$PKG_CONFIG" && \ | ||
21910 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-screensaver\""; } >&5 | 21782 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-screensaver\""; } >&5 |
21911 | ($PKG_CONFIG --exists --print-errors "xcb-screensaver") 2>&5 | 21783 | ($PKG_CONFIG --exists --print-errors "xcb-screensaver") 2>&5 |
21912 | ac_status=$? | 21784 | ac_status=$? |
@@ -21916,14 +21788,15 @@ if test -n "$PKG_CONFIG"; then | |||
21916 | else | 21788 | else |
21917 | pkg_failed=yes | 21789 | pkg_failed=yes |
21918 | fi | 21790 | fi |
21919 | fi | 21791 | else |
21920 | else | 21792 | pkg_failed=untried |
21921 | pkg_failed=untried | ||
21922 | fi | 21793 | fi |
21923 | 21794 | ||
21924 | 21795 | ||
21925 | 21796 | ||
21926 | if test $pkg_failed = yes; then | 21797 | if test $pkg_failed = yes; then |
21798 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21799 | $as_echo "no" >&6; } | ||
21927 | 21800 | ||
21928 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 21801 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
21929 | _pkg_short_errors_supported=yes | 21802 | _pkg_short_errors_supported=yes |
@@ -21931,17 +21804,17 @@ else | |||
21931 | _pkg_short_errors_supported=no | 21804 | _pkg_short_errors_supported=no |
21932 | fi | 21805 | fi |
21933 | if test $_pkg_short_errors_supported = yes; then | 21806 | if test $_pkg_short_errors_supported = yes; then |
21934 | XCB_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-screensaver"` | 21807 | XCB_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-screensaver" 2>&1` |
21935 | else | 21808 | else |
21936 | XCB_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-screensaver"` | 21809 | XCB_SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-screensaver" 2>&1` |
21937 | fi | 21810 | fi |
21938 | # Put the nasty error message in config.log where it belongs | 21811 | # Put the nasty error message in config.log where it belongs |
21939 | echo "$XCB_SCREENSAVER_PKG_ERRORS" >&5 | 21812 | echo "$XCB_SCREENSAVER_PKG_ERRORS" >&5 |
21940 | 21813 | ||
21941 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 21814 | have_ecore_x_xcb_screensaver="no" |
21942 | $as_echo "no" >&6; } | ||
21943 | have_ecore_x_xcb_screensaver="no" | ||
21944 | elif test $pkg_failed = untried; then | 21815 | elif test $pkg_failed = untried; then |
21816 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21817 | $as_echo "no" >&6; } | ||
21945 | have_ecore_x_xcb_screensaver="no" | 21818 | have_ecore_x_xcb_screensaver="no" |
21946 | else | 21819 | else |
21947 | XCB_SCREENSAVER_CFLAGS=$pkg_cv_XCB_SCREENSAVER_CFLAGS | 21820 | XCB_SCREENSAVER_CFLAGS=$pkg_cv_XCB_SCREENSAVER_CFLAGS |
@@ -21966,11 +21839,10 @@ pkg_failed=no | |||
21966 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_SHAPE" >&5 | 21839 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_SHAPE" >&5 |
21967 | $as_echo_n "checking for XCB_SHAPE... " >&6; } | 21840 | $as_echo_n "checking for XCB_SHAPE... " >&6; } |
21968 | 21841 | ||
21969 | if test -n "$PKG_CONFIG"; then | 21842 | if test -n "$XCB_SHAPE_CFLAGS"; then |
21970 | if test -n "$XCB_SHAPE_CFLAGS"; then | 21843 | pkg_cv_XCB_SHAPE_CFLAGS="$XCB_SHAPE_CFLAGS" |
21971 | pkg_cv_XCB_SHAPE_CFLAGS="$XCB_SHAPE_CFLAGS" | 21844 | elif test -n "$PKG_CONFIG"; then |
21972 | else | 21845 | if test -n "$PKG_CONFIG" && \ |
21973 | if test -n "$PKG_CONFIG" && \ | ||
21974 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-shape\""; } >&5 | 21846 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-shape\""; } >&5 |
21975 | ($PKG_CONFIG --exists --print-errors "xcb-shape") 2>&5 | 21847 | ($PKG_CONFIG --exists --print-errors "xcb-shape") 2>&5 |
21976 | ac_status=$? | 21848 | ac_status=$? |
@@ -21980,15 +21852,13 @@ if test -n "$PKG_CONFIG"; then | |||
21980 | else | 21852 | else |
21981 | pkg_failed=yes | 21853 | pkg_failed=yes |
21982 | fi | 21854 | fi |
21983 | fi | 21855 | else |
21984 | else | 21856 | pkg_failed=untried |
21985 | pkg_failed=untried | ||
21986 | fi | 21857 | fi |
21987 | if test -n "$PKG_CONFIG"; then | 21858 | if test -n "$XCB_SHAPE_LIBS"; then |
21988 | if test -n "$XCB_SHAPE_LIBS"; then | 21859 | pkg_cv_XCB_SHAPE_LIBS="$XCB_SHAPE_LIBS" |
21989 | pkg_cv_XCB_SHAPE_LIBS="$XCB_SHAPE_LIBS" | 21860 | elif test -n "$PKG_CONFIG"; then |
21990 | else | 21861 | if test -n "$PKG_CONFIG" && \ |
21991 | if test -n "$PKG_CONFIG" && \ | ||
21992 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-shape\""; } >&5 | 21862 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-shape\""; } >&5 |
21993 | ($PKG_CONFIG --exists --print-errors "xcb-shape") 2>&5 | 21863 | ($PKG_CONFIG --exists --print-errors "xcb-shape") 2>&5 |
21994 | ac_status=$? | 21864 | ac_status=$? |
@@ -21998,14 +21868,15 @@ if test -n "$PKG_CONFIG"; then | |||
21998 | else | 21868 | else |
21999 | pkg_failed=yes | 21869 | pkg_failed=yes |
22000 | fi | 21870 | fi |
22001 | fi | 21871 | else |
22002 | else | 21872 | pkg_failed=untried |
22003 | pkg_failed=untried | ||
22004 | fi | 21873 | fi |
22005 | 21874 | ||
22006 | 21875 | ||
22007 | 21876 | ||
22008 | if test $pkg_failed = yes; then | 21877 | if test $pkg_failed = yes; then |
21878 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21879 | $as_echo "no" >&6; } | ||
22009 | 21880 | ||
22010 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 21881 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
22011 | _pkg_short_errors_supported=yes | 21882 | _pkg_short_errors_supported=yes |
@@ -22013,17 +21884,17 @@ else | |||
22013 | _pkg_short_errors_supported=no | 21884 | _pkg_short_errors_supported=no |
22014 | fi | 21885 | fi |
22015 | if test $_pkg_short_errors_supported = yes; then | 21886 | if test $_pkg_short_errors_supported = yes; then |
22016 | XCB_SHAPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-shape"` | 21887 | XCB_SHAPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-shape" 2>&1` |
22017 | else | 21888 | else |
22018 | XCB_SHAPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-shape"` | 21889 | XCB_SHAPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-shape" 2>&1` |
22019 | fi | 21890 | fi |
22020 | # Put the nasty error message in config.log where it belongs | 21891 | # Put the nasty error message in config.log where it belongs |
22021 | echo "$XCB_SHAPE_PKG_ERRORS" >&5 | 21892 | echo "$XCB_SHAPE_PKG_ERRORS" >&5 |
22022 | 21893 | ||
22023 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 21894 | have_ecore_x_xcb_shape="no" |
22024 | $as_echo "no" >&6; } | ||
22025 | have_ecore_x_xcb_shape="no" | ||
22026 | elif test $pkg_failed = untried; then | 21895 | elif test $pkg_failed = untried; then |
21896 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21897 | $as_echo "no" >&6; } | ||
22027 | have_ecore_x_xcb_shape="no" | 21898 | have_ecore_x_xcb_shape="no" |
22028 | else | 21899 | else |
22029 | XCB_SHAPE_CFLAGS=$pkg_cv_XCB_SHAPE_CFLAGS | 21900 | XCB_SHAPE_CFLAGS=$pkg_cv_XCB_SHAPE_CFLAGS |
@@ -22048,11 +21919,10 @@ pkg_failed=no | |||
22048 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XGESTURE" >&5 | 21919 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XGESTURE" >&5 |
22049 | $as_echo_n "checking for XCB_XGESTURE... " >&6; } | 21920 | $as_echo_n "checking for XCB_XGESTURE... " >&6; } |
22050 | 21921 | ||
22051 | if test -n "$PKG_CONFIG"; then | 21922 | if test -n "$XCB_XGESTURE_CFLAGS"; then |
22052 | if test -n "$XCB_XGESTURE_CFLAGS"; then | 21923 | pkg_cv_XCB_XGESTURE_CFLAGS="$XCB_XGESTURE_CFLAGS" |
22053 | pkg_cv_XCB_XGESTURE_CFLAGS="$XCB_XGESTURE_CFLAGS" | 21924 | elif test -n "$PKG_CONFIG"; then |
22054 | else | 21925 | if test -n "$PKG_CONFIG" && \ |
22055 | if test -n "$PKG_CONFIG" && \ | ||
22056 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-gesture\""; } >&5 | 21926 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-gesture\""; } >&5 |
22057 | ($PKG_CONFIG --exists --print-errors "xcb-gesture") 2>&5 | 21927 | ($PKG_CONFIG --exists --print-errors "xcb-gesture") 2>&5 |
22058 | ac_status=$? | 21928 | ac_status=$? |
@@ -22062,15 +21932,13 @@ if test -n "$PKG_CONFIG"; then | |||
22062 | else | 21932 | else |
22063 | pkg_failed=yes | 21933 | pkg_failed=yes |
22064 | fi | 21934 | fi |
22065 | fi | 21935 | else |
22066 | else | 21936 | pkg_failed=untried |
22067 | pkg_failed=untried | ||
22068 | fi | 21937 | fi |
22069 | if test -n "$PKG_CONFIG"; then | 21938 | if test -n "$XCB_XGESTURE_LIBS"; then |
22070 | if test -n "$XCB_XGESTURE_LIBS"; then | 21939 | pkg_cv_XCB_XGESTURE_LIBS="$XCB_XGESTURE_LIBS" |
22071 | pkg_cv_XCB_XGESTURE_LIBS="$XCB_XGESTURE_LIBS" | 21940 | elif test -n "$PKG_CONFIG"; then |
22072 | else | 21941 | if test -n "$PKG_CONFIG" && \ |
22073 | if test -n "$PKG_CONFIG" && \ | ||
22074 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-gesture\""; } >&5 | 21942 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-gesture\""; } >&5 |
22075 | ($PKG_CONFIG --exists --print-errors "xcb-gesture") 2>&5 | 21943 | ($PKG_CONFIG --exists --print-errors "xcb-gesture") 2>&5 |
22076 | ac_status=$? | 21944 | ac_status=$? |
@@ -22080,14 +21948,15 @@ if test -n "$PKG_CONFIG"; then | |||
22080 | else | 21948 | else |
22081 | pkg_failed=yes | 21949 | pkg_failed=yes |
22082 | fi | 21950 | fi |
22083 | fi | 21951 | else |
22084 | else | 21952 | pkg_failed=untried |
22085 | pkg_failed=untried | ||
22086 | fi | 21953 | fi |
22087 | 21954 | ||
22088 | 21955 | ||
22089 | 21956 | ||
22090 | if test $pkg_failed = yes; then | 21957 | if test $pkg_failed = yes; then |
21958 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21959 | $as_echo "no" >&6; } | ||
22091 | 21960 | ||
22092 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 21961 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
22093 | _pkg_short_errors_supported=yes | 21962 | _pkg_short_errors_supported=yes |
@@ -22095,17 +21964,17 @@ else | |||
22095 | _pkg_short_errors_supported=no | 21964 | _pkg_short_errors_supported=no |
22096 | fi | 21965 | fi |
22097 | if test $_pkg_short_errors_supported = yes; then | 21966 | if test $_pkg_short_errors_supported = yes; then |
22098 | XCB_XGESTURE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-gesture"` | 21967 | XCB_XGESTURE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-gesture" 2>&1` |
22099 | else | 21968 | else |
22100 | XCB_XGESTURE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-gesture"` | 21969 | XCB_XGESTURE_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-gesture" 2>&1` |
22101 | fi | 21970 | fi |
22102 | # Put the nasty error message in config.log where it belongs | 21971 | # Put the nasty error message in config.log where it belongs |
22103 | echo "$XCB_XGESTURE_PKG_ERRORS" >&5 | 21972 | echo "$XCB_XGESTURE_PKG_ERRORS" >&5 |
22104 | 21973 | ||
22105 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 21974 | have_ecore_x_xcb_gesture="no" |
22106 | $as_echo "no" >&6; } | ||
22107 | have_ecore_x_xcb_gesture="no" | ||
22108 | elif test $pkg_failed = untried; then | 21975 | elif test $pkg_failed = untried; then |
21976 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
21977 | $as_echo "no" >&6; } | ||
22109 | have_ecore_x_xcb_gesture="no" | 21978 | have_ecore_x_xcb_gesture="no" |
22110 | else | 21979 | else |
22111 | XCB_XGESTURE_CFLAGS=$pkg_cv_XCB_XGESTURE_CFLAGS | 21980 | XCB_XGESTURE_CFLAGS=$pkg_cv_XCB_XGESTURE_CFLAGS |
@@ -22130,11 +21999,10 @@ pkg_failed=no | |||
22130 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_SYNC" >&5 | 21999 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_SYNC" >&5 |
22131 | $as_echo_n "checking for XCB_SYNC... " >&6; } | 22000 | $as_echo_n "checking for XCB_SYNC... " >&6; } |
22132 | 22001 | ||
22133 | if test -n "$PKG_CONFIG"; then | 22002 | if test -n "$XCB_SYNC_CFLAGS"; then |
22134 | if test -n "$XCB_SYNC_CFLAGS"; then | 22003 | pkg_cv_XCB_SYNC_CFLAGS="$XCB_SYNC_CFLAGS" |
22135 | pkg_cv_XCB_SYNC_CFLAGS="$XCB_SYNC_CFLAGS" | 22004 | elif test -n "$PKG_CONFIG"; then |
22136 | else | 22005 | if test -n "$PKG_CONFIG" && \ |
22137 | if test -n "$PKG_CONFIG" && \ | ||
22138 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-sync\""; } >&5 | 22006 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-sync\""; } >&5 |
22139 | ($PKG_CONFIG --exists --print-errors "xcb-sync") 2>&5 | 22007 | ($PKG_CONFIG --exists --print-errors "xcb-sync") 2>&5 |
22140 | ac_status=$? | 22008 | ac_status=$? |
@@ -22144,15 +22012,13 @@ if test -n "$PKG_CONFIG"; then | |||
22144 | else | 22012 | else |
22145 | pkg_failed=yes | 22013 | pkg_failed=yes |
22146 | fi | 22014 | fi |
22147 | fi | 22015 | else |
22148 | else | 22016 | pkg_failed=untried |
22149 | pkg_failed=untried | ||
22150 | fi | 22017 | fi |
22151 | if test -n "$PKG_CONFIG"; then | 22018 | if test -n "$XCB_SYNC_LIBS"; then |
22152 | if test -n "$XCB_SYNC_LIBS"; then | 22019 | pkg_cv_XCB_SYNC_LIBS="$XCB_SYNC_LIBS" |
22153 | pkg_cv_XCB_SYNC_LIBS="$XCB_SYNC_LIBS" | 22020 | elif test -n "$PKG_CONFIG"; then |
22154 | else | 22021 | if test -n "$PKG_CONFIG" && \ |
22155 | if test -n "$PKG_CONFIG" && \ | ||
22156 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-sync\""; } >&5 | 22022 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-sync\""; } >&5 |
22157 | ($PKG_CONFIG --exists --print-errors "xcb-sync") 2>&5 | 22023 | ($PKG_CONFIG --exists --print-errors "xcb-sync") 2>&5 |
22158 | ac_status=$? | 22024 | ac_status=$? |
@@ -22162,14 +22028,15 @@ if test -n "$PKG_CONFIG"; then | |||
22162 | else | 22028 | else |
22163 | pkg_failed=yes | 22029 | pkg_failed=yes |
22164 | fi | 22030 | fi |
22165 | fi | 22031 | else |
22166 | else | 22032 | pkg_failed=untried |
22167 | pkg_failed=untried | ||
22168 | fi | 22033 | fi |
22169 | 22034 | ||
22170 | 22035 | ||
22171 | 22036 | ||
22172 | if test $pkg_failed = yes; then | 22037 | if test $pkg_failed = yes; then |
22038 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22039 | $as_echo "no" >&6; } | ||
22173 | 22040 | ||
22174 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 22041 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
22175 | _pkg_short_errors_supported=yes | 22042 | _pkg_short_errors_supported=yes |
@@ -22177,17 +22044,17 @@ else | |||
22177 | _pkg_short_errors_supported=no | 22044 | _pkg_short_errors_supported=no |
22178 | fi | 22045 | fi |
22179 | if test $_pkg_short_errors_supported = yes; then | 22046 | if test $_pkg_short_errors_supported = yes; then |
22180 | XCB_SYNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-sync"` | 22047 | XCB_SYNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-sync" 2>&1` |
22181 | else | 22048 | else |
22182 | XCB_SYNC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-sync"` | 22049 | XCB_SYNC_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-sync" 2>&1` |
22183 | fi | 22050 | fi |
22184 | # Put the nasty error message in config.log where it belongs | 22051 | # Put the nasty error message in config.log where it belongs |
22185 | echo "$XCB_SYNC_PKG_ERRORS" >&5 | 22052 | echo "$XCB_SYNC_PKG_ERRORS" >&5 |
22186 | 22053 | ||
22187 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 22054 | have_ecore_x_xcb_sync="no" |
22188 | $as_echo "no" >&6; } | ||
22189 | have_ecore_x_xcb_sync="no" | ||
22190 | elif test $pkg_failed = untried; then | 22055 | elif test $pkg_failed = untried; then |
22056 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22057 | $as_echo "no" >&6; } | ||
22191 | have_ecore_x_xcb_sync="no" | 22058 | have_ecore_x_xcb_sync="no" |
22192 | else | 22059 | else |
22193 | XCB_SYNC_CFLAGS=$pkg_cv_XCB_SYNC_CFLAGS | 22060 | XCB_SYNC_CFLAGS=$pkg_cv_XCB_SYNC_CFLAGS |
@@ -22212,11 +22079,10 @@ pkg_failed=no | |||
22212 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XFIXES" >&5 | 22079 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XFIXES" >&5 |
22213 | $as_echo_n "checking for XCB_XFIXES... " >&6; } | 22080 | $as_echo_n "checking for XCB_XFIXES... " >&6; } |
22214 | 22081 | ||
22215 | if test -n "$PKG_CONFIG"; then | 22082 | if test -n "$XCB_XFIXES_CFLAGS"; then |
22216 | if test -n "$XCB_XFIXES_CFLAGS"; then | 22083 | pkg_cv_XCB_XFIXES_CFLAGS="$XCB_XFIXES_CFLAGS" |
22217 | pkg_cv_XCB_XFIXES_CFLAGS="$XCB_XFIXES_CFLAGS" | 22084 | elif test -n "$PKG_CONFIG"; then |
22218 | else | 22085 | if test -n "$PKG_CONFIG" && \ |
22219 | if test -n "$PKG_CONFIG" && \ | ||
22220 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xfixes\""; } >&5 | 22086 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xfixes\""; } >&5 |
22221 | ($PKG_CONFIG --exists --print-errors "xcb-xfixes") 2>&5 | 22087 | ($PKG_CONFIG --exists --print-errors "xcb-xfixes") 2>&5 |
22222 | ac_status=$? | 22088 | ac_status=$? |
@@ -22226,15 +22092,13 @@ if test -n "$PKG_CONFIG"; then | |||
22226 | else | 22092 | else |
22227 | pkg_failed=yes | 22093 | pkg_failed=yes |
22228 | fi | 22094 | fi |
22229 | fi | 22095 | else |
22230 | else | 22096 | pkg_failed=untried |
22231 | pkg_failed=untried | ||
22232 | fi | 22097 | fi |
22233 | if test -n "$PKG_CONFIG"; then | 22098 | if test -n "$XCB_XFIXES_LIBS"; then |
22234 | if test -n "$XCB_XFIXES_LIBS"; then | 22099 | pkg_cv_XCB_XFIXES_LIBS="$XCB_XFIXES_LIBS" |
22235 | pkg_cv_XCB_XFIXES_LIBS="$XCB_XFIXES_LIBS" | 22100 | elif test -n "$PKG_CONFIG"; then |
22236 | else | 22101 | if test -n "$PKG_CONFIG" && \ |
22237 | if test -n "$PKG_CONFIG" && \ | ||
22238 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xfixes\""; } >&5 | 22102 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xfixes\""; } >&5 |
22239 | ($PKG_CONFIG --exists --print-errors "xcb-xfixes") 2>&5 | 22103 | ($PKG_CONFIG --exists --print-errors "xcb-xfixes") 2>&5 |
22240 | ac_status=$? | 22104 | ac_status=$? |
@@ -22244,14 +22108,15 @@ if test -n "$PKG_CONFIG"; then | |||
22244 | else | 22108 | else |
22245 | pkg_failed=yes | 22109 | pkg_failed=yes |
22246 | fi | 22110 | fi |
22247 | fi | 22111 | else |
22248 | else | 22112 | pkg_failed=untried |
22249 | pkg_failed=untried | ||
22250 | fi | 22113 | fi |
22251 | 22114 | ||
22252 | 22115 | ||
22253 | 22116 | ||
22254 | if test $pkg_failed = yes; then | 22117 | if test $pkg_failed = yes; then |
22118 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22119 | $as_echo "no" >&6; } | ||
22255 | 22120 | ||
22256 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 22121 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
22257 | _pkg_short_errors_supported=yes | 22122 | _pkg_short_errors_supported=yes |
@@ -22259,17 +22124,17 @@ else | |||
22259 | _pkg_short_errors_supported=no | 22124 | _pkg_short_errors_supported=no |
22260 | fi | 22125 | fi |
22261 | if test $_pkg_short_errors_supported = yes; then | 22126 | if test $_pkg_short_errors_supported = yes; then |
22262 | XCB_XFIXES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-xfixes"` | 22127 | XCB_XFIXES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-xfixes" 2>&1` |
22263 | else | 22128 | else |
22264 | XCB_XFIXES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-xfixes"` | 22129 | XCB_XFIXES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-xfixes" 2>&1` |
22265 | fi | 22130 | fi |
22266 | # Put the nasty error message in config.log where it belongs | 22131 | # Put the nasty error message in config.log where it belongs |
22267 | echo "$XCB_XFIXES_PKG_ERRORS" >&5 | 22132 | echo "$XCB_XFIXES_PKG_ERRORS" >&5 |
22268 | 22133 | ||
22269 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 22134 | have_ecore_x_xcb_xfixes="no" |
22270 | $as_echo "no" >&6; } | ||
22271 | have_ecore_x_xcb_xfixes="no" | ||
22272 | elif test $pkg_failed = untried; then | 22135 | elif test $pkg_failed = untried; then |
22136 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22137 | $as_echo "no" >&6; } | ||
22273 | have_ecore_x_xcb_xfixes="no" | 22138 | have_ecore_x_xcb_xfixes="no" |
22274 | else | 22139 | else |
22275 | XCB_XFIXES_CFLAGS=$pkg_cv_XCB_XFIXES_CFLAGS | 22140 | XCB_XFIXES_CFLAGS=$pkg_cv_XCB_XFIXES_CFLAGS |
@@ -22294,11 +22159,10 @@ pkg_failed=no | |||
22294 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XINERAMA" >&5 | 22159 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XINERAMA" >&5 |
22295 | $as_echo_n "checking for XCB_XINERAMA... " >&6; } | 22160 | $as_echo_n "checking for XCB_XINERAMA... " >&6; } |
22296 | 22161 | ||
22297 | if test -n "$PKG_CONFIG"; then | 22162 | if test -n "$XCB_XINERAMA_CFLAGS"; then |
22298 | if test -n "$XCB_XINERAMA_CFLAGS"; then | 22163 | pkg_cv_XCB_XINERAMA_CFLAGS="$XCB_XINERAMA_CFLAGS" |
22299 | pkg_cv_XCB_XINERAMA_CFLAGS="$XCB_XINERAMA_CFLAGS" | 22164 | elif test -n "$PKG_CONFIG"; then |
22300 | else | 22165 | if test -n "$PKG_CONFIG" && \ |
22301 | if test -n "$PKG_CONFIG" && \ | ||
22302 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xinerama\""; } >&5 | 22166 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xinerama\""; } >&5 |
22303 | ($PKG_CONFIG --exists --print-errors "xcb-xinerama") 2>&5 | 22167 | ($PKG_CONFIG --exists --print-errors "xcb-xinerama") 2>&5 |
22304 | ac_status=$? | 22168 | ac_status=$? |
@@ -22308,15 +22172,13 @@ if test -n "$PKG_CONFIG"; then | |||
22308 | else | 22172 | else |
22309 | pkg_failed=yes | 22173 | pkg_failed=yes |
22310 | fi | 22174 | fi |
22311 | fi | 22175 | else |
22312 | else | 22176 | pkg_failed=untried |
22313 | pkg_failed=untried | ||
22314 | fi | 22177 | fi |
22315 | if test -n "$PKG_CONFIG"; then | 22178 | if test -n "$XCB_XINERAMA_LIBS"; then |
22316 | if test -n "$XCB_XINERAMA_LIBS"; then | 22179 | pkg_cv_XCB_XINERAMA_LIBS="$XCB_XINERAMA_LIBS" |
22317 | pkg_cv_XCB_XINERAMA_LIBS="$XCB_XINERAMA_LIBS" | 22180 | elif test -n "$PKG_CONFIG"; then |
22318 | else | 22181 | if test -n "$PKG_CONFIG" && \ |
22319 | if test -n "$PKG_CONFIG" && \ | ||
22320 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xinerama\""; } >&5 | 22182 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xinerama\""; } >&5 |
22321 | ($PKG_CONFIG --exists --print-errors "xcb-xinerama") 2>&5 | 22183 | ($PKG_CONFIG --exists --print-errors "xcb-xinerama") 2>&5 |
22322 | ac_status=$? | 22184 | ac_status=$? |
@@ -22326,14 +22188,15 @@ if test -n "$PKG_CONFIG"; then | |||
22326 | else | 22188 | else |
22327 | pkg_failed=yes | 22189 | pkg_failed=yes |
22328 | fi | 22190 | fi |
22329 | fi | 22191 | else |
22330 | else | 22192 | pkg_failed=untried |
22331 | pkg_failed=untried | ||
22332 | fi | 22193 | fi |
22333 | 22194 | ||
22334 | 22195 | ||
22335 | 22196 | ||
22336 | if test $pkg_failed = yes; then | 22197 | if test $pkg_failed = yes; then |
22198 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22199 | $as_echo "no" >&6; } | ||
22337 | 22200 | ||
22338 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 22201 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
22339 | _pkg_short_errors_supported=yes | 22202 | _pkg_short_errors_supported=yes |
@@ -22341,17 +22204,17 @@ else | |||
22341 | _pkg_short_errors_supported=no | 22204 | _pkg_short_errors_supported=no |
22342 | fi | 22205 | fi |
22343 | if test $_pkg_short_errors_supported = yes; then | 22206 | if test $_pkg_short_errors_supported = yes; then |
22344 | XCB_XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-xinerama"` | 22207 | XCB_XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-xinerama" 2>&1` |
22345 | else | 22208 | else |
22346 | XCB_XINERAMA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-xinerama"` | 22209 | XCB_XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-xinerama" 2>&1` |
22347 | fi | 22210 | fi |
22348 | # Put the nasty error message in config.log where it belongs | 22211 | # Put the nasty error message in config.log where it belongs |
22349 | echo "$XCB_XINERAMA_PKG_ERRORS" >&5 | 22212 | echo "$XCB_XINERAMA_PKG_ERRORS" >&5 |
22350 | 22213 | ||
22351 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 22214 | have_ecore_x_xcb_xinerama="no" |
22352 | $as_echo "no" >&6; } | ||
22353 | have_ecore_x_xcb_xinerama="no" | ||
22354 | elif test $pkg_failed = untried; then | 22215 | elif test $pkg_failed = untried; then |
22216 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22217 | $as_echo "no" >&6; } | ||
22355 | have_ecore_x_xcb_xinerama="no" | 22218 | have_ecore_x_xcb_xinerama="no" |
22356 | else | 22219 | else |
22357 | XCB_XINERAMA_CFLAGS=$pkg_cv_XCB_XINERAMA_CFLAGS | 22220 | XCB_XINERAMA_CFLAGS=$pkg_cv_XCB_XINERAMA_CFLAGS |
@@ -22376,11 +22239,10 @@ pkg_failed=no | |||
22376 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XPRINT" >&5 | 22239 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XPRINT" >&5 |
22377 | $as_echo_n "checking for XCB_XPRINT... " >&6; } | 22240 | $as_echo_n "checking for XCB_XPRINT... " >&6; } |
22378 | 22241 | ||
22379 | if test -n "$PKG_CONFIG"; then | 22242 | if test -n "$XCB_XPRINT_CFLAGS"; then |
22380 | if test -n "$XCB_XPRINT_CFLAGS"; then | 22243 | pkg_cv_XCB_XPRINT_CFLAGS="$XCB_XPRINT_CFLAGS" |
22381 | pkg_cv_XCB_XPRINT_CFLAGS="$XCB_XPRINT_CFLAGS" | 22244 | elif test -n "$PKG_CONFIG"; then |
22382 | else | 22245 | if test -n "$PKG_CONFIG" && \ |
22383 | if test -n "$PKG_CONFIG" && \ | ||
22384 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xprint\""; } >&5 | 22246 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xprint\""; } >&5 |
22385 | ($PKG_CONFIG --exists --print-errors "xcb-xprint") 2>&5 | 22247 | ($PKG_CONFIG --exists --print-errors "xcb-xprint") 2>&5 |
22386 | ac_status=$? | 22248 | ac_status=$? |
@@ -22390,15 +22252,13 @@ if test -n "$PKG_CONFIG"; then | |||
22390 | else | 22252 | else |
22391 | pkg_failed=yes | 22253 | pkg_failed=yes |
22392 | fi | 22254 | fi |
22393 | fi | 22255 | else |
22394 | else | 22256 | pkg_failed=untried |
22395 | pkg_failed=untried | ||
22396 | fi | 22257 | fi |
22397 | if test -n "$PKG_CONFIG"; then | 22258 | if test -n "$XCB_XPRINT_LIBS"; then |
22398 | if test -n "$XCB_XPRINT_LIBS"; then | 22259 | pkg_cv_XCB_XPRINT_LIBS="$XCB_XPRINT_LIBS" |
22399 | pkg_cv_XCB_XPRINT_LIBS="$XCB_XPRINT_LIBS" | 22260 | elif test -n "$PKG_CONFIG"; then |
22400 | else | 22261 | if test -n "$PKG_CONFIG" && \ |
22401 | if test -n "$PKG_CONFIG" && \ | ||
22402 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xprint\""; } >&5 | 22262 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xprint\""; } >&5 |
22403 | ($PKG_CONFIG --exists --print-errors "xcb-xprint") 2>&5 | 22263 | ($PKG_CONFIG --exists --print-errors "xcb-xprint") 2>&5 |
22404 | ac_status=$? | 22264 | ac_status=$? |
@@ -22408,14 +22268,15 @@ if test -n "$PKG_CONFIG"; then | |||
22408 | else | 22268 | else |
22409 | pkg_failed=yes | 22269 | pkg_failed=yes |
22410 | fi | 22270 | fi |
22411 | fi | 22271 | else |
22412 | else | 22272 | pkg_failed=untried |
22413 | pkg_failed=untried | ||
22414 | fi | 22273 | fi |
22415 | 22274 | ||
22416 | 22275 | ||
22417 | 22276 | ||
22418 | if test $pkg_failed = yes; then | 22277 | if test $pkg_failed = yes; then |
22278 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22279 | $as_echo "no" >&6; } | ||
22419 | 22280 | ||
22420 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 22281 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
22421 | _pkg_short_errors_supported=yes | 22282 | _pkg_short_errors_supported=yes |
@@ -22423,17 +22284,17 @@ else | |||
22423 | _pkg_short_errors_supported=no | 22284 | _pkg_short_errors_supported=no |
22424 | fi | 22285 | fi |
22425 | if test $_pkg_short_errors_supported = yes; then | 22286 | if test $_pkg_short_errors_supported = yes; then |
22426 | XCB_XPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-xprint"` | 22287 | XCB_XPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-xprint" 2>&1` |
22427 | else | 22288 | else |
22428 | XCB_XPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-xprint"` | 22289 | XCB_XPRINT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-xprint" 2>&1` |
22429 | fi | 22290 | fi |
22430 | # Put the nasty error message in config.log where it belongs | 22291 | # Put the nasty error message in config.log where it belongs |
22431 | echo "$XCB_XPRINT_PKG_ERRORS" >&5 | 22292 | echo "$XCB_XPRINT_PKG_ERRORS" >&5 |
22432 | 22293 | ||
22433 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 22294 | have_ecore_x_xcb_xprint="no" |
22434 | $as_echo "no" >&6; } | ||
22435 | have_ecore_x_xcb_xprint="no" | ||
22436 | elif test $pkg_failed = untried; then | 22295 | elif test $pkg_failed = untried; then |
22296 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22297 | $as_echo "no" >&6; } | ||
22437 | have_ecore_x_xcb_xprint="no" | 22298 | have_ecore_x_xcb_xprint="no" |
22438 | else | 22299 | else |
22439 | XCB_XPRINT_CFLAGS=$pkg_cv_XCB_XPRINT_CFLAGS | 22300 | XCB_XPRINT_CFLAGS=$pkg_cv_XCB_XPRINT_CFLAGS |
@@ -22458,11 +22319,10 @@ pkg_failed=no | |||
22458 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XTEST" >&5 | 22319 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XTEST" >&5 |
22459 | $as_echo_n "checking for XCB_XTEST... " >&6; } | 22320 | $as_echo_n "checking for XCB_XTEST... " >&6; } |
22460 | 22321 | ||
22461 | if test -n "$PKG_CONFIG"; then | 22322 | if test -n "$XCB_XTEST_CFLAGS"; then |
22462 | if test -n "$XCB_XTEST_CFLAGS"; then | 22323 | pkg_cv_XCB_XTEST_CFLAGS="$XCB_XTEST_CFLAGS" |
22463 | pkg_cv_XCB_XTEST_CFLAGS="$XCB_XTEST_CFLAGS" | 22324 | elif test -n "$PKG_CONFIG"; then |
22464 | else | 22325 | if test -n "$PKG_CONFIG" && \ |
22465 | if test -n "$PKG_CONFIG" && \ | ||
22466 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xtest\""; } >&5 | 22326 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xtest\""; } >&5 |
22467 | ($PKG_CONFIG --exists --print-errors "xcb-xtest") 2>&5 | 22327 | ($PKG_CONFIG --exists --print-errors "xcb-xtest") 2>&5 |
22468 | ac_status=$? | 22328 | ac_status=$? |
@@ -22472,15 +22332,13 @@ if test -n "$PKG_CONFIG"; then | |||
22472 | else | 22332 | else |
22473 | pkg_failed=yes | 22333 | pkg_failed=yes |
22474 | fi | 22334 | fi |
22475 | fi | 22335 | else |
22476 | else | 22336 | pkg_failed=untried |
22477 | pkg_failed=untried | ||
22478 | fi | 22337 | fi |
22479 | if test -n "$PKG_CONFIG"; then | 22338 | if test -n "$XCB_XTEST_LIBS"; then |
22480 | if test -n "$XCB_XTEST_LIBS"; then | 22339 | pkg_cv_XCB_XTEST_LIBS="$XCB_XTEST_LIBS" |
22481 | pkg_cv_XCB_XTEST_LIBS="$XCB_XTEST_LIBS" | 22340 | elif test -n "$PKG_CONFIG"; then |
22482 | else | 22341 | if test -n "$PKG_CONFIG" && \ |
22483 | if test -n "$PKG_CONFIG" && \ | ||
22484 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xtest\""; } >&5 | 22342 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xtest\""; } >&5 |
22485 | ($PKG_CONFIG --exists --print-errors "xcb-xtest") 2>&5 | 22343 | ($PKG_CONFIG --exists --print-errors "xcb-xtest") 2>&5 |
22486 | ac_status=$? | 22344 | ac_status=$? |
@@ -22490,14 +22348,15 @@ if test -n "$PKG_CONFIG"; then | |||
22490 | else | 22348 | else |
22491 | pkg_failed=yes | 22349 | pkg_failed=yes |
22492 | fi | 22350 | fi |
22493 | fi | 22351 | else |
22494 | else | 22352 | pkg_failed=untried |
22495 | pkg_failed=untried | ||
22496 | fi | 22353 | fi |
22497 | 22354 | ||
22498 | 22355 | ||
22499 | 22356 | ||
22500 | if test $pkg_failed = yes; then | 22357 | if test $pkg_failed = yes; then |
22358 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22359 | $as_echo "no" >&6; } | ||
22501 | 22360 | ||
22502 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 22361 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
22503 | _pkg_short_errors_supported=yes | 22362 | _pkg_short_errors_supported=yes |
@@ -22505,17 +22364,17 @@ else | |||
22505 | _pkg_short_errors_supported=no | 22364 | _pkg_short_errors_supported=no |
22506 | fi | 22365 | fi |
22507 | if test $_pkg_short_errors_supported = yes; then | 22366 | if test $_pkg_short_errors_supported = yes; then |
22508 | XCB_XTEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-xtest"` | 22367 | XCB_XTEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-xtest" 2>&1` |
22509 | else | 22368 | else |
22510 | XCB_XTEST_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-xtest"` | 22369 | XCB_XTEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-xtest" 2>&1` |
22511 | fi | 22370 | fi |
22512 | # Put the nasty error message in config.log where it belongs | 22371 | # Put the nasty error message in config.log where it belongs |
22513 | echo "$XCB_XTEST_PKG_ERRORS" >&5 | 22372 | echo "$XCB_XTEST_PKG_ERRORS" >&5 |
22514 | 22373 | ||
22515 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 22374 | have_ecore_x_xcb_xtest="no" |
22516 | $as_echo "no" >&6; } | ||
22517 | have_ecore_x_xcb_xtest="no" | ||
22518 | elif test $pkg_failed = untried; then | 22375 | elif test $pkg_failed = untried; then |
22376 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22377 | $as_echo "no" >&6; } | ||
22519 | have_ecore_x_xcb_xtest="no" | 22378 | have_ecore_x_xcb_xtest="no" |
22520 | else | 22379 | else |
22521 | XCB_XTEST_CFLAGS=$pkg_cv_XCB_XTEST_CFLAGS | 22380 | XCB_XTEST_CFLAGS=$pkg_cv_XCB_XTEST_CFLAGS |
@@ -22542,11 +22401,10 @@ pkg_failed=no | |||
22542 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XINPUT" >&5 | 22401 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_XINPUT" >&5 |
22543 | $as_echo_n "checking for XCB_XINPUT... " >&6; } | 22402 | $as_echo_n "checking for XCB_XINPUT... " >&6; } |
22544 | 22403 | ||
22545 | if test -n "$PKG_CONFIG"; then | 22404 | if test -n "$XCB_XINPUT_CFLAGS"; then |
22546 | if test -n "$XCB_XINPUT_CFLAGS"; then | 22405 | pkg_cv_XCB_XINPUT_CFLAGS="$XCB_XINPUT_CFLAGS" |
22547 | pkg_cv_XCB_XINPUT_CFLAGS="$XCB_XINPUT_CFLAGS" | 22406 | elif test -n "$PKG_CONFIG"; then |
22548 | else | 22407 | if test -n "$PKG_CONFIG" && \ |
22549 | if test -n "$PKG_CONFIG" && \ | ||
22550 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xinput\""; } >&5 | 22408 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xinput\""; } >&5 |
22551 | ($PKG_CONFIG --exists --print-errors "xcb-xinput") 2>&5 | 22409 | ($PKG_CONFIG --exists --print-errors "xcb-xinput") 2>&5 |
22552 | ac_status=$? | 22410 | ac_status=$? |
@@ -22556,15 +22414,13 @@ if test -n "$PKG_CONFIG"; then | |||
22556 | else | 22414 | else |
22557 | pkg_failed=yes | 22415 | pkg_failed=yes |
22558 | fi | 22416 | fi |
22559 | fi | 22417 | else |
22560 | else | 22418 | pkg_failed=untried |
22561 | pkg_failed=untried | ||
22562 | fi | 22419 | fi |
22563 | if test -n "$PKG_CONFIG"; then | 22420 | if test -n "$XCB_XINPUT_LIBS"; then |
22564 | if test -n "$XCB_XINPUT_LIBS"; then | 22421 | pkg_cv_XCB_XINPUT_LIBS="$XCB_XINPUT_LIBS" |
22565 | pkg_cv_XCB_XINPUT_LIBS="$XCB_XINPUT_LIBS" | 22422 | elif test -n "$PKG_CONFIG"; then |
22566 | else | 22423 | if test -n "$PKG_CONFIG" && \ |
22567 | if test -n "$PKG_CONFIG" && \ | ||
22568 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xinput\""; } >&5 | 22424 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-xinput\""; } >&5 |
22569 | ($PKG_CONFIG --exists --print-errors "xcb-xinput") 2>&5 | 22425 | ($PKG_CONFIG --exists --print-errors "xcb-xinput") 2>&5 |
22570 | ac_status=$? | 22426 | ac_status=$? |
@@ -22574,14 +22430,15 @@ if test -n "$PKG_CONFIG"; then | |||
22574 | else | 22430 | else |
22575 | pkg_failed=yes | 22431 | pkg_failed=yes |
22576 | fi | 22432 | fi |
22577 | fi | 22433 | else |
22578 | else | 22434 | pkg_failed=untried |
22579 | pkg_failed=untried | ||
22580 | fi | 22435 | fi |
22581 | 22436 | ||
22582 | 22437 | ||
22583 | 22438 | ||
22584 | if test $pkg_failed = yes; then | 22439 | if test $pkg_failed = yes; then |
22440 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22441 | $as_echo "no" >&6; } | ||
22585 | 22442 | ||
22586 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 22443 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
22587 | _pkg_short_errors_supported=yes | 22444 | _pkg_short_errors_supported=yes |
@@ -22589,17 +22446,17 @@ else | |||
22589 | _pkg_short_errors_supported=no | 22446 | _pkg_short_errors_supported=no |
22590 | fi | 22447 | fi |
22591 | if test $_pkg_short_errors_supported = yes; then | 22448 | if test $_pkg_short_errors_supported = yes; then |
22592 | XCB_XINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-xinput"` | 22449 | XCB_XINPUT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-xinput" 2>&1` |
22593 | else | 22450 | else |
22594 | XCB_XINPUT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-xinput"` | 22451 | XCB_XINPUT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-xinput" 2>&1` |
22595 | fi | 22452 | fi |
22596 | # Put the nasty error message in config.log where it belongs | 22453 | # Put the nasty error message in config.log where it belongs |
22597 | echo "$XCB_XINPUT_PKG_ERRORS" >&5 | 22454 | echo "$XCB_XINPUT_PKG_ERRORS" >&5 |
22598 | 22455 | ||
22599 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 22456 | have_ecore_x_xcb_xinput="no" |
22600 | $as_echo "no" >&6; } | ||
22601 | have_ecore_x_xcb_xinput="no" | ||
22602 | elif test $pkg_failed = untried; then | 22457 | elif test $pkg_failed = untried; then |
22458 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22459 | $as_echo "no" >&6; } | ||
22603 | have_ecore_x_xcb_xinput="no" | 22460 | have_ecore_x_xcb_xinput="no" |
22604 | else | 22461 | else |
22605 | XCB_XINPUT_CFLAGS=$pkg_cv_XCB_XINPUT_CFLAGS | 22462 | XCB_XINPUT_CFLAGS=$pkg_cv_XCB_XINPUT_CFLAGS |
@@ -22624,11 +22481,10 @@ pkg_failed=no | |||
22624 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_CURSOR" >&5 | 22481 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_CURSOR" >&5 |
22625 | $as_echo_n "checking for XCB_CURSOR... " >&6; } | 22482 | $as_echo_n "checking for XCB_CURSOR... " >&6; } |
22626 | 22483 | ||
22627 | if test -n "$PKG_CONFIG"; then | 22484 | if test -n "$XCB_CURSOR_CFLAGS"; then |
22628 | if test -n "$XCB_CURSOR_CFLAGS"; then | 22485 | pkg_cv_XCB_CURSOR_CFLAGS="$XCB_CURSOR_CFLAGS" |
22629 | pkg_cv_XCB_CURSOR_CFLAGS="$XCB_CURSOR_CFLAGS" | 22486 | elif test -n "$PKG_CONFIG"; then |
22630 | else | 22487 | if test -n "$PKG_CONFIG" && \ |
22631 | if test -n "$PKG_CONFIG" && \ | ||
22632 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-render xcb-renderutil\""; } >&5 | 22488 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-render xcb-renderutil\""; } >&5 |
22633 | ($PKG_CONFIG --exists --print-errors "xcb-render xcb-renderutil") 2>&5 | 22489 | ($PKG_CONFIG --exists --print-errors "xcb-render xcb-renderutil") 2>&5 |
22634 | ac_status=$? | 22490 | ac_status=$? |
@@ -22638,15 +22494,13 @@ if test -n "$PKG_CONFIG"; then | |||
22638 | else | 22494 | else |
22639 | pkg_failed=yes | 22495 | pkg_failed=yes |
22640 | fi | 22496 | fi |
22641 | fi | 22497 | else |
22642 | else | 22498 | pkg_failed=untried |
22643 | pkg_failed=untried | ||
22644 | fi | 22499 | fi |
22645 | if test -n "$PKG_CONFIG"; then | 22500 | if test -n "$XCB_CURSOR_LIBS"; then |
22646 | if test -n "$XCB_CURSOR_LIBS"; then | 22501 | pkg_cv_XCB_CURSOR_LIBS="$XCB_CURSOR_LIBS" |
22647 | pkg_cv_XCB_CURSOR_LIBS="$XCB_CURSOR_LIBS" | 22502 | elif test -n "$PKG_CONFIG"; then |
22648 | else | 22503 | if test -n "$PKG_CONFIG" && \ |
22649 | if test -n "$PKG_CONFIG" && \ | ||
22650 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-render xcb-renderutil\""; } >&5 | 22504 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcb-render xcb-renderutil\""; } >&5 |
22651 | ($PKG_CONFIG --exists --print-errors "xcb-render xcb-renderutil") 2>&5 | 22505 | ($PKG_CONFIG --exists --print-errors "xcb-render xcb-renderutil") 2>&5 |
22652 | ac_status=$? | 22506 | ac_status=$? |
@@ -22656,14 +22510,15 @@ if test -n "$PKG_CONFIG"; then | |||
22656 | else | 22510 | else |
22657 | pkg_failed=yes | 22511 | pkg_failed=yes |
22658 | fi | 22512 | fi |
22659 | fi | 22513 | else |
22660 | else | 22514 | pkg_failed=untried |
22661 | pkg_failed=untried | ||
22662 | fi | 22515 | fi |
22663 | 22516 | ||
22664 | 22517 | ||
22665 | 22518 | ||
22666 | if test $pkg_failed = yes; then | 22519 | if test $pkg_failed = yes; then |
22520 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22521 | $as_echo "no" >&6; } | ||
22667 | 22522 | ||
22668 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 22523 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
22669 | _pkg_short_errors_supported=yes | 22524 | _pkg_short_errors_supported=yes |
@@ -22671,17 +22526,17 @@ else | |||
22671 | _pkg_short_errors_supported=no | 22526 | _pkg_short_errors_supported=no |
22672 | fi | 22527 | fi |
22673 | if test $_pkg_short_errors_supported = yes; then | 22528 | if test $_pkg_short_errors_supported = yes; then |
22674 | XCB_CURSOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb-render xcb-renderutil"` | 22529 | XCB_CURSOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xcb-render xcb-renderutil" 2>&1` |
22675 | else | 22530 | else |
22676 | XCB_CURSOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb-render xcb-renderutil"` | 22531 | XCB_CURSOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "xcb-render xcb-renderutil" 2>&1` |
22677 | fi | 22532 | fi |
22678 | # Put the nasty error message in config.log where it belongs | 22533 | # Put the nasty error message in config.log where it belongs |
22679 | echo "$XCB_CURSOR_PKG_ERRORS" >&5 | 22534 | echo "$XCB_CURSOR_PKG_ERRORS" >&5 |
22680 | 22535 | ||
22681 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 22536 | have_ecore_x_xcb_cursor="no" |
22682 | $as_echo "no" >&6; } | ||
22683 | have_ecore_x_xcb_cursor="no" | ||
22684 | elif test $pkg_failed = untried; then | 22537 | elif test $pkg_failed = untried; then |
22538 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
22539 | $as_echo "no" >&6; } | ||
22685 | have_ecore_x_xcb_cursor="no" | 22540 | have_ecore_x_xcb_cursor="no" |
22686 | else | 22541 | else |
22687 | XCB_CURSOR_CFLAGS=$pkg_cv_XCB_CURSOR_CFLAGS | 22542 | XCB_CURSOR_CFLAGS=$pkg_cv_XCB_CURSOR_CFLAGS |
@@ -22740,7 +22595,7 @@ if test "x$with_x" = xno; then | |||
22740 | have_x=disabled | 22595 | have_x=disabled |
22741 | else | 22596 | else |
22742 | case $x_includes,$x_libraries in #( | 22597 | case $x_includes,$x_libraries in #( |
22743 | *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( | 22598 | *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( |
22744 | *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : | 22599 | *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : |
22745 | $as_echo_n "(cached) " >&6 | 22600 | $as_echo_n "(cached) " >&6 |
22746 | else | 22601 | else |
@@ -22758,7 +22613,7 @@ libdir: | |||
22758 | @echo libdir='${LIBDIR}' | 22613 | @echo libdir='${LIBDIR}' |
22759 | _ACEOF | 22614 | _ACEOF |
22760 | if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then | 22615 | if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then |
22761 | # GNU make sometimes prints "make[1]: Entering...", which would confuse us. | 22616 | # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. |
22762 | for ac_var in incroot usrlibdir libdir; do | 22617 | for ac_var in incroot usrlibdir libdir; do |
22763 | eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" | 22618 | eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" |
22764 | done | 22619 | done |
@@ -22844,7 +22699,7 @@ else | |||
22844 | fi | 22699 | fi |
22845 | done | 22700 | done |
22846 | fi | 22701 | fi |
22847 | rm -f conftest.err conftest.$ac_ext | 22702 | rm -f conftest.err conftest.i conftest.$ac_ext |
22848 | fi # $ac_x_includes = no | 22703 | fi # $ac_x_includes = no |
22849 | 22704 | ||
22850 | if test "$ac_x_libraries" = no; then | 22705 | if test "$ac_x_libraries" = no; then |
@@ -24710,46 +24565,44 @@ pkg_failed=no | |||
24710 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVAS" >&5 | 24565 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVAS" >&5 |
24711 | $as_echo_n "checking for EVAS... " >&6; } | 24566 | $as_echo_n "checking for EVAS... " >&6; } |
24712 | 24567 | ||
24713 | if test -n "$PKG_CONFIG"; then | 24568 | if test -n "$EVAS_CFLAGS"; then |
24714 | if test -n "$EVAS_CFLAGS"; then | 24569 | pkg_cv_EVAS_CFLAGS="$EVAS_CFLAGS" |
24715 | pkg_cv_EVAS_CFLAGS="$EVAS_CFLAGS" | 24570 | elif test -n "$PKG_CONFIG"; then |
24716 | else | 24571 | if test -n "$PKG_CONFIG" && \ |
24717 | if test -n "$PKG_CONFIG" && \ | 24572 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.2.0\""; } >&5 |
24718 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.1.99\""; } >&5 | 24573 | ($PKG_CONFIG --exists --print-errors "evas >= 1.2.0") 2>&5 |
24719 | ($PKG_CONFIG --exists --print-errors "evas >= 1.1.99") 2>&5 | ||
24720 | ac_status=$? | 24574 | ac_status=$? |
24721 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 24575 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
24722 | test $ac_status = 0; }; then | 24576 | test $ac_status = 0; }; then |
24723 | pkg_cv_EVAS_CFLAGS=`$PKG_CONFIG --cflags "evas >= 1.1.99" 2>/dev/null` | 24577 | pkg_cv_EVAS_CFLAGS=`$PKG_CONFIG --cflags "evas >= 1.2.0" 2>/dev/null` |
24724 | else | 24578 | else |
24725 | pkg_failed=yes | 24579 | pkg_failed=yes |
24726 | fi | 24580 | fi |
24727 | fi | 24581 | else |
24728 | else | 24582 | pkg_failed=untried |
24729 | pkg_failed=untried | ||
24730 | fi | 24583 | fi |
24731 | if test -n "$PKG_CONFIG"; then | 24584 | if test -n "$EVAS_LIBS"; then |
24732 | if test -n "$EVAS_LIBS"; then | 24585 | pkg_cv_EVAS_LIBS="$EVAS_LIBS" |
24733 | pkg_cv_EVAS_LIBS="$EVAS_LIBS" | 24586 | elif test -n "$PKG_CONFIG"; then |
24734 | else | 24587 | if test -n "$PKG_CONFIG" && \ |
24735 | if test -n "$PKG_CONFIG" && \ | 24588 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.2.0\""; } >&5 |
24736 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas >= 1.1.99\""; } >&5 | 24589 | ($PKG_CONFIG --exists --print-errors "evas >= 1.2.0") 2>&5 |
24737 | ($PKG_CONFIG --exists --print-errors "evas >= 1.1.99") 2>&5 | ||
24738 | ac_status=$? | 24590 | ac_status=$? |
24739 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 24591 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
24740 | test $ac_status = 0; }; then | 24592 | test $ac_status = 0; }; then |
24741 | pkg_cv_EVAS_LIBS=`$PKG_CONFIG --libs "evas >= 1.1.99" 2>/dev/null` | 24593 | pkg_cv_EVAS_LIBS=`$PKG_CONFIG --libs "evas >= 1.2.0" 2>/dev/null` |
24742 | else | 24594 | else |
24743 | pkg_failed=yes | 24595 | pkg_failed=yes |
24744 | fi | 24596 | fi |
24745 | fi | 24597 | else |
24746 | else | 24598 | pkg_failed=untried |
24747 | pkg_failed=untried | ||
24748 | fi | 24599 | fi |
24749 | 24600 | ||
24750 | 24601 | ||
24751 | 24602 | ||
24752 | if test $pkg_failed = yes; then | 24603 | if test $pkg_failed = yes; then |
24604 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
24605 | $as_echo "no" >&6; } | ||
24753 | 24606 | ||
24754 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 24607 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
24755 | _pkg_short_errors_supported=yes | 24608 | _pkg_short_errors_supported=yes |
@@ -24757,17 +24610,17 @@ else | |||
24757 | _pkg_short_errors_supported=no | 24610 | _pkg_short_errors_supported=no |
24758 | fi | 24611 | fi |
24759 | if test $_pkg_short_errors_supported = yes; then | 24612 | if test $_pkg_short_errors_supported = yes; then |
24760 | EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evas >= 1.1.99"` | 24613 | EVAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "evas >= 1.2.0" 2>&1` |
24761 | else | 24614 | else |
24762 | EVAS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evas >= 1.1.99"` | 24615 | EVAS_PKG_ERRORS=`$PKG_CONFIG --print-errors "evas >= 1.2.0" 2>&1` |
24763 | fi | 24616 | fi |
24764 | # Put the nasty error message in config.log where it belongs | 24617 | # Put the nasty error message in config.log where it belongs |
24765 | echo "$EVAS_PKG_ERRORS" >&5 | 24618 | echo "$EVAS_PKG_ERRORS" >&5 |
24766 | 24619 | ||
24767 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 24620 | have_evas="no" |
24768 | $as_echo "no" >&6; } | ||
24769 | have_evas="no" | ||
24770 | elif test $pkg_failed = untried; then | 24621 | elif test $pkg_failed = untried; then |
24622 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
24623 | $as_echo "no" >&6; } | ||
24771 | have_evas="no" | 24624 | have_evas="no" |
24772 | else | 24625 | else |
24773 | EVAS_CFLAGS=$pkg_cv_EVAS_CFLAGS | 24626 | EVAS_CFLAGS=$pkg_cv_EVAS_CFLAGS |
@@ -24784,8 +24637,7 @@ for ac_header in sys/select.h sys/prctl.h | |||
24784 | do : | 24637 | do : |
24785 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | 24638 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
24786 | ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" | 24639 | ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" |
24787 | eval as_val=\$$as_ac_Header | 24640 | if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
24788 | if test "x$as_val" = x""yes; then : | ||
24789 | cat >>confdefs.h <<_ACEOF | 24641 | cat >>confdefs.h <<_ACEOF |
24790 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 24642 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
24791 | _ACEOF | 24643 | _ACEOF |
@@ -25106,8 +24958,7 @@ $as_echo "#define HAVE_SYS_TIME_H 1" >>confdefs.h | |||
25106 | do : | 24958 | do : |
25107 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | 24959 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
25108 | ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" | 24960 | ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" |
25109 | eval as_val=\$$as_ac_Header | 24961 | if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
25110 | if test "x$as_val" = x""yes; then : | ||
25111 | cat >>confdefs.h <<_ACEOF | 24962 | cat >>confdefs.h <<_ACEOF |
25112 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 24963 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
25113 | _ACEOF | 24964 | _ACEOF |
@@ -25121,12 +24972,49 @@ esac | |||
25121 | 24972 | ||
25122 | # ecore_con | 24973 | # ecore_con |
25123 | 24974 | ||
25124 | for ac_header in arpa/inet.h arpa/nameser.h netinet/tcp.h net/if.h netinet/in.h sys/socket.h sys/un.h ws2tcpip.h netdb.h | 24975 | for ac_header in sys/socket.h |
24976 | do : | ||
24977 | ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default" | ||
24978 | if test "x$ac_cv_header_sys_socket_h" = x""yes; then : | ||
24979 | cat >>confdefs.h <<_ACEOF | ||
24980 | #define HAVE_SYS_SOCKET_H 1 | ||
24981 | _ACEOF | ||
24982 | |||
24983 | fi | ||
24984 | |||
24985 | done | ||
24986 | |||
24987 | for ac_header in net/if.h | ||
24988 | do : | ||
24989 | ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" " | ||
24990 | #include <stdio.h> | ||
24991 | #ifdef STDC_HEADERS | ||
24992 | # include <stdlib.h> | ||
24993 | # include <stddef.h> | ||
24994 | #else | ||
24995 | # ifdef HAVE_STDLIB_H | ||
24996 | # include <stdlib.h> | ||
24997 | # endif | ||
24998 | #endif | ||
24999 | #ifdef HAVE_SYS_SOCKET_H | ||
25000 | # include <sys/socket.h> | ||
25001 | #endif | ||
25002 | |||
25003 | " | ||
25004 | if test "x$ac_cv_header_net_if_h" = x""yes; then : | ||
25005 | cat >>confdefs.h <<_ACEOF | ||
25006 | #define HAVE_NET_IF_H 1 | ||
25007 | _ACEOF | ||
25008 | |||
25009 | fi | ||
25010 | |||
25011 | done | ||
25012 | |||
25013 | for ac_header in sys/un.h arpa/inet.h arpa/nameser.h netinet/tcp.h netinet/in.h ws2tcpip.h netdb.h | ||
25125 | do : | 25014 | do : |
25126 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | 25015 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
25127 | ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" | 25016 | ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" |
25128 | eval as_val=\$$as_ac_Header | 25017 | if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
25129 | if test "x$as_val" = x""yes; then : | ||
25130 | cat >>confdefs.h <<_ACEOF | 25018 | cat >>confdefs.h <<_ACEOF |
25131 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 25019 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
25132 | _ACEOF | 25020 | _ACEOF |
@@ -25326,7 +25214,7 @@ if test "x${_efl_enable_win32_threads}" = "xyes" ; then | |||
25326 | mingw*) | 25214 | mingw*) |
25327 | ;; | 25215 | ;; |
25328 | *) | 25216 | *) |
25329 | as_fn_error "Win32 threads support requested but non Windows system found." "$LINENO" 5 | 25217 | as_fn_error $? "Win32 threads support requested but non Windows system found." "$LINENO" 5 |
25330 | ;; | 25218 | ;; |
25331 | esac | 25219 | esac |
25332 | fi | 25220 | fi |
@@ -25334,7 +25222,7 @@ fi | |||
25334 | if test "x${_efl_enable_posix_threads}" = "xyes" ; then | 25222 | if test "x${_efl_enable_posix_threads}" = "xyes" ; then |
25335 | case "$host_os" in | 25223 | case "$host_os" in |
25336 | mingw*) | 25224 | mingw*) |
25337 | as_fn_error "POSIX threads support requested but Windows system found." "$LINENO" 5 | 25225 | as_fn_error $? "POSIX threads support requested but Windows system found." "$LINENO" 5 |
25338 | ;; | 25226 | ;; |
25339 | *) | 25227 | *) |
25340 | ;; | 25228 | ;; |
@@ -25397,7 +25285,7 @@ $as_echo_n "checking whether system support POSIX threads... " >&6; } | |||
25397 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_efl_have_posix_threads}" >&5 | 25285 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_efl_have_posix_threads}" >&5 |
25398 | $as_echo "${_efl_have_posix_threads}" >&6; } | 25286 | $as_echo "${_efl_have_posix_threads}" >&6; } |
25399 | if test "$x{_efl_enable_posix_threads}" = "xyes" && test "x${_efl_have_posix_threads}" = "xno"; then | 25287 | if test "$x{_efl_enable_posix_threads}" = "xyes" && test "x${_efl_have_posix_threads}" = "xno"; then |
25400 | as_fn_error "POSIX threads support requested but not found." "$LINENO" 5 | 25288 | as_fn_error $? "POSIX threads support requested but not found." "$LINENO" 5 |
25401 | fi | 25289 | fi |
25402 | 25290 | ||
25403 | EFL_PTHREAD_CFLAGS="" | 25291 | EFL_PTHREAD_CFLAGS="" |
@@ -25497,9 +25385,8 @@ else | |||
25497 | if test "$ac_cv_type_int" = yes; then | 25385 | if test "$ac_cv_type_int" = yes; then |
25498 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 25386 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
25499 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 25387 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
25500 | { as_fn_set_status 77 | 25388 | as_fn_error 77 "cannot compute sizeof (int) |
25501 | as_fn_error "cannot compute sizeof (int) | 25389 | See \`config.log' for more details" "$LINENO" 5 ; } |
25502 | See \`config.log' for more details." "$LINENO" 5; }; } | ||
25503 | else | 25390 | else |
25504 | ac_cv_sizeof_int=0 | 25391 | ac_cv_sizeof_int=0 |
25505 | fi | 25392 | fi |
@@ -25531,9 +25418,8 @@ else | |||
25531 | if test "$ac_cv_type_long" = yes; then | 25418 | if test "$ac_cv_type_long" = yes; then |
25532 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 25419 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
25533 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 25420 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
25534 | { as_fn_set_status 77 | 25421 | as_fn_error 77 "cannot compute sizeof (long) |
25535 | as_fn_error "cannot compute sizeof (long) | 25422 | See \`config.log' for more details" "$LINENO" 5 ; } |
25536 | See \`config.log' for more details." "$LINENO" 5; }; } | ||
25537 | else | 25423 | else |
25538 | ac_cv_sizeof_long=0 | 25424 | ac_cv_sizeof_long=0 |
25539 | fi | 25425 | fi |
@@ -26149,8 +26035,8 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h | |||
26149 | 26035 | ||
26150 | ;; #( | 26036 | ;; #( |
26151 | *) | 26037 | *) |
26152 | as_fn_error "unknown endianness | 26038 | as_fn_error $? "unknown endianness |
26153 | presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; | 26039 | presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; |
26154 | esac | 26040 | esac |
26155 | 26041 | ||
26156 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 | 26042 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 |
@@ -26351,14 +26237,12 @@ esac | |||
26351 | 26237 | ||
26352 | 26238 | ||
26353 | ### Checks for library functions | 26239 | ### Checks for library functions |
26354 | 26240 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 | |
26355 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lcposix" >&5 | 26241 | $as_echo_n "checking for library containing strerror... " >&6; } |
26356 | $as_echo_n "checking for strerror in -lcposix... " >&6; } | 26242 | if test "${ac_cv_search_strerror+set}" = set; then : |
26357 | if test "${ac_cv_lib_cposix_strerror+set}" = set; then : | ||
26358 | $as_echo_n "(cached) " >&6 | 26243 | $as_echo_n "(cached) " >&6 |
26359 | else | 26244 | else |
26360 | ac_check_lib_save_LIBS=$LIBS | 26245 | ac_func_search_save_LIBS=$LIBS |
26361 | LIBS="-lcposix $LIBS" | ||
26362 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 26246 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
26363 | /* end confdefs.h. */ | 26247 | /* end confdefs.h. */ |
26364 | 26248 | ||
@@ -26377,22 +26261,37 @@ return strerror (); | |||
26377 | return 0; | 26261 | return 0; |
26378 | } | 26262 | } |
26379 | _ACEOF | 26263 | _ACEOF |
26380 | if ac_fn_c_try_link "$LINENO"; then : | 26264 | for ac_lib in '' cposix; do |
26381 | ac_cv_lib_cposix_strerror=yes | 26265 | if test -z "$ac_lib"; then |
26382 | else | 26266 | ac_res="none required" |
26383 | ac_cv_lib_cposix_strerror=no | 26267 | else |
26268 | ac_res=-l$ac_lib | ||
26269 | LIBS="-l$ac_lib $ac_func_search_save_LIBS" | ||
26270 | fi | ||
26271 | if ac_fn_c_try_link "$LINENO"; then : | ||
26272 | ac_cv_search_strerror=$ac_res | ||
26384 | fi | 26273 | fi |
26385 | rm -f core conftest.err conftest.$ac_objext \ | 26274 | rm -f core conftest.err conftest.$ac_objext \ |
26386 | conftest$ac_exeext conftest.$ac_ext | 26275 | conftest$ac_exeext |
26387 | LIBS=$ac_check_lib_save_LIBS | 26276 | if test "${ac_cv_search_strerror+set}" = set; then : |
26388 | fi | 26277 | break |
26389 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cposix_strerror" >&5 | ||
26390 | $as_echo "$ac_cv_lib_cposix_strerror" >&6; } | ||
26391 | if test "x$ac_cv_lib_cposix_strerror" = x""yes; then : | ||
26392 | LIBS="$LIBS -lcposix" | ||
26393 | fi | 26278 | fi |
26279 | done | ||
26280 | if test "${ac_cv_search_strerror+set}" = set; then : | ||
26394 | 26281 | ||
26282 | else | ||
26283 | ac_cv_search_strerror=no | ||
26284 | fi | ||
26285 | rm conftest.$ac_ext | ||
26286 | LIBS=$ac_func_search_save_LIBS | ||
26287 | fi | ||
26288 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 | ||
26289 | $as_echo "$ac_cv_search_strerror" >&6; } | ||
26290 | ac_res=$ac_cv_search_strerror | ||
26291 | if test "$ac_res" != no; then : | ||
26292 | test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" | ||
26395 | 26293 | ||
26294 | fi | ||
26396 | 26295 | ||
26397 | # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works | 26296 | # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works |
26398 | # for constant arguments. Useless! | 26297 | # for constant arguments. Useless! |
@@ -26521,8 +26420,7 @@ if test $ac_cv_os_cray = yes; then | |||
26521 | for ac_func in _getb67 GETB67 getb67; do | 26420 | for ac_func in _getb67 GETB67 getb67; do |
26522 | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | 26421 | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
26523 | ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | 26422 | ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" |
26524 | eval as_val=\$$as_ac_var | 26423 | if eval test \"x\$"$as_ac_var"\" = x"yes"; then : |
26525 | if test "x$as_val" = x""yes; then : | ||
26526 | 26424 | ||
26527 | cat >>confdefs.h <<_ACEOF | 26425 | cat >>confdefs.h <<_ACEOF |
26528 | #define CRAY_STACKSEG_END $ac_func | 26426 | #define CRAY_STACKSEG_END $ac_func |
@@ -26588,8 +26486,7 @@ for ac_func in gettimeofday strlcpy execvp | |||
26588 | do : | 26486 | do : |
26589 | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` | 26487 | as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` |
26590 | ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" | 26488 | ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" |
26591 | eval as_val=\$$as_ac_var | 26489 | if eval test \"x\$"$as_ac_var"\" = x"yes"; then : |
26592 | if test "x$as_val" = x""yes; then : | ||
26593 | cat >>confdefs.h <<_ACEOF | 26490 | cat >>confdefs.h <<_ACEOF |
26594 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 | 26491 | #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 |
26595 | _ACEOF | 26492 | _ACEOF |
@@ -26661,7 +26558,7 @@ $as_echo "#define HAVE_ATFILE_SOURCE 1" >>confdefs.h | |||
26661 | else | 26558 | else |
26662 | 26559 | ||
26663 | if test "x${have_atfile_source}" = "xyes" ; then | 26560 | if test "x${have_atfile_source}" = "xyes" ; then |
26664 | as_fn_error "required atfile-source but no mkdirat()" "$LINENO" 5 | 26561 | as_fn_error $? "required atfile-source but no mkdirat()" "$LINENO" 5 |
26665 | fi | 26562 | fi |
26666 | have_atfile_source="no" | 26563 | have_atfile_source="no" |
26667 | 26564 | ||
@@ -26670,6 +26567,94 @@ done | |||
26670 | 26567 | ||
26671 | fi | 26568 | fi |
26672 | 26569 | ||
26570 | SHM_OPEN_LIBS="" | ||
26571 | |||
26572 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether shm_open is in libc" >&5 | ||
26573 | $as_echo_n "checking whether shm_open is in libc... " >&6; } | ||
26574 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
26575 | /* end confdefs.h. */ | ||
26576 | |||
26577 | #include <sys/mman.h> | ||
26578 | #include <sys/stat.h> | ||
26579 | #include <fcntl.h> | ||
26580 | |||
26581 | int | ||
26582 | main () | ||
26583 | { | ||
26584 | |||
26585 | int fd; | ||
26586 | fd = shm_open("/", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); | ||
26587 | shm_unlink("/"); | ||
26588 | |||
26589 | ; | ||
26590 | return 0; | ||
26591 | } | ||
26592 | _ACEOF | ||
26593 | if ac_fn_c_try_link "$LINENO"; then : | ||
26594 | |||
26595 | have_shm_open="yes" | ||
26596 | |||
26597 | $as_echo "#define HAVE_SHM_OPEN 1" >>confdefs.h | ||
26598 | |||
26599 | |||
26600 | else | ||
26601 | have_shm_open="no" | ||
26602 | fi | ||
26603 | rm -f core conftest.err conftest.$ac_objext \ | ||
26604 | conftest$ac_exeext conftest.$ac_ext | ||
26605 | LIBS="${LIBS_save}" | ||
26606 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_shm_open}" >&5 | ||
26607 | $as_echo "${have_shm_open}" >&6; } | ||
26608 | |||
26609 | if ! test "x${have_shm_open}" = "xyes" ; then | ||
26610 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether shm_open is in librt" >&5 | ||
26611 | $as_echo_n "checking whether shm_open is in librt... " >&6; } | ||
26612 | LIBS_save="${LIBS}" | ||
26613 | LIBS="${LIBS} -lrt" | ||
26614 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
26615 | /* end confdefs.h. */ | ||
26616 | |||
26617 | #include <sys/mman.h> | ||
26618 | #include <sys/stat.h> | ||
26619 | #include <fcntl.h> | ||
26620 | |||
26621 | int | ||
26622 | main () | ||
26623 | { | ||
26624 | |||
26625 | int fd; | ||
26626 | fd = shm_open("/", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); | ||
26627 | shm_unlink("/"); | ||
26628 | |||
26629 | ; | ||
26630 | return 0; | ||
26631 | } | ||
26632 | _ACEOF | ||
26633 | if ac_fn_c_try_link "$LINENO"; then : | ||
26634 | |||
26635 | have_shm_open="yes" | ||
26636 | |||
26637 | $as_echo "#define HAVE_SHM_OPEN 1" >>confdefs.h | ||
26638 | |||
26639 | SHM_OPEN_LIBS="-lrt" | ||
26640 | |||
26641 | else | ||
26642 | have_shm_open="no" | ||
26643 | fi | ||
26644 | rm -f core conftest.err conftest.$ac_objext \ | ||
26645 | conftest$ac_exeext conftest.$ac_ext | ||
26646 | LIBS="${LIBS_save}" | ||
26647 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_shm_open}" >&5 | ||
26648 | $as_echo "${have_shm_open}" >&6; } | ||
26649 | fi | ||
26650 | |||
26651 | |||
26652 | |||
26653 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether shm_open is available" >&5 | ||
26654 | $as_echo_n "checking whether shm_open is available... " >&6; } | ||
26655 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${have_shm_open}" >&5 | ||
26656 | $as_echo "${have_shm_open}" >&6; } | ||
26657 | |||
26673 | ### Checks for optionnal feature | 26658 | ### Checks for optionnal feature |
26674 | ac_fn_c_check_func "$LINENO" "mallinfo" "ac_cv_func_mallinfo" | 26659 | ac_fn_c_check_func "$LINENO" "mallinfo" "ac_cv_func_mallinfo" |
26675 | if test "x$ac_cv_func_mallinfo" = x""yes; then : | 26660 | if test "x$ac_cv_func_mallinfo" = x""yes; then : |
@@ -26823,11 +26808,10 @@ pkg_failed=no | |||
26823 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5 | 26808 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5 |
26824 | $as_echo_n "checking for CURL... " >&6; } | 26809 | $as_echo_n "checking for CURL... " >&6; } |
26825 | 26810 | ||
26826 | if test -n "$PKG_CONFIG"; then | 26811 | if test -n "$CURL_CFLAGS"; then |
26827 | if test -n "$CURL_CFLAGS"; then | 26812 | pkg_cv_CURL_CFLAGS="$CURL_CFLAGS" |
26828 | pkg_cv_CURL_CFLAGS="$CURL_CFLAGS" | 26813 | elif test -n "$PKG_CONFIG"; then |
26829 | else | 26814 | if test -n "$PKG_CONFIG" && \ |
26830 | if test -n "$PKG_CONFIG" && \ | ||
26831 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 | 26815 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 |
26832 | ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5 | 26816 | ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5 |
26833 | ac_status=$? | 26817 | ac_status=$? |
@@ -26837,15 +26821,13 @@ if test -n "$PKG_CONFIG"; then | |||
26837 | else | 26821 | else |
26838 | pkg_failed=yes | 26822 | pkg_failed=yes |
26839 | fi | 26823 | fi |
26840 | fi | 26824 | else |
26841 | else | 26825 | pkg_failed=untried |
26842 | pkg_failed=untried | ||
26843 | fi | 26826 | fi |
26844 | if test -n "$PKG_CONFIG"; then | 26827 | if test -n "$CURL_LIBS"; then |
26845 | if test -n "$CURL_LIBS"; then | 26828 | pkg_cv_CURL_LIBS="$CURL_LIBS" |
26846 | pkg_cv_CURL_LIBS="$CURL_LIBS" | 26829 | elif test -n "$PKG_CONFIG"; then |
26847 | else | 26830 | if test -n "$PKG_CONFIG" && \ |
26848 | if test -n "$PKG_CONFIG" && \ | ||
26849 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 | 26831 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 |
26850 | ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5 | 26832 | ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5 |
26851 | ac_status=$? | 26833 | ac_status=$? |
@@ -26855,14 +26837,15 @@ if test -n "$PKG_CONFIG"; then | |||
26855 | else | 26837 | else |
26856 | pkg_failed=yes | 26838 | pkg_failed=yes |
26857 | fi | 26839 | fi |
26858 | fi | 26840 | else |
26859 | else | 26841 | pkg_failed=untried |
26860 | pkg_failed=untried | ||
26861 | fi | 26842 | fi |
26862 | 26843 | ||
26863 | 26844 | ||
26864 | 26845 | ||
26865 | if test $pkg_failed = yes; then | 26846 | if test $pkg_failed = yes; then |
26847 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
26848 | $as_echo "no" >&6; } | ||
26866 | 26849 | ||
26867 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 26850 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
26868 | _pkg_short_errors_supported=yes | 26851 | _pkg_short_errors_supported=yes |
@@ -26870,17 +26853,17 @@ else | |||
26870 | _pkg_short_errors_supported=no | 26853 | _pkg_short_errors_supported=no |
26871 | fi | 26854 | fi |
26872 | if test $_pkg_short_errors_supported = yes; then | 26855 | if test $_pkg_short_errors_supported = yes; then |
26873 | CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcurl"` | 26856 | CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcurl" 2>&1` |
26874 | else | 26857 | else |
26875 | CURL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcurl"` | 26858 | CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcurl" 2>&1` |
26876 | fi | 26859 | fi |
26877 | # Put the nasty error message in config.log where it belongs | 26860 | # Put the nasty error message in config.log where it belongs |
26878 | echo "$CURL_PKG_ERRORS" >&5 | 26861 | echo "$CURL_PKG_ERRORS" >&5 |
26879 | 26862 | ||
26880 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 26863 | _ecore_have_curl="no" |
26881 | $as_echo "no" >&6; } | ||
26882 | _ecore_have_curl="no" | ||
26883 | elif test $pkg_failed = untried; then | 26864 | elif test $pkg_failed = untried; then |
26865 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
26866 | $as_echo "no" >&6; } | ||
26884 | _ecore_have_curl="no" | 26867 | _ecore_have_curl="no" |
26885 | else | 26868 | else |
26886 | CURL_CFLAGS=$pkg_cv_CURL_CFLAGS | 26869 | CURL_CFLAGS=$pkg_cv_CURL_CFLAGS |
@@ -26928,11 +26911,10 @@ pkg_failed=no | |||
26928 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLS" >&5 | 26911 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLS" >&5 |
26929 | $as_echo_n "checking for TLS... " >&6; } | 26912 | $as_echo_n "checking for TLS... " >&6; } |
26930 | 26913 | ||
26931 | if test -n "$PKG_CONFIG"; then | 26914 | if test -n "$TLS_CFLAGS"; then |
26932 | if test -n "$TLS_CFLAGS"; then | 26915 | pkg_cv_TLS_CFLAGS="$TLS_CFLAGS" |
26933 | pkg_cv_TLS_CFLAGS="$TLS_CFLAGS" | 26916 | elif test -n "$PKG_CONFIG"; then |
26934 | else | 26917 | if test -n "$PKG_CONFIG" && \ |
26935 | if test -n "$PKG_CONFIG" && \ | ||
26936 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.10.2\""; } >&5 | 26918 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.10.2\""; } >&5 |
26937 | ($PKG_CONFIG --exists --print-errors "gnutls >= 2.10.2") 2>&5 | 26919 | ($PKG_CONFIG --exists --print-errors "gnutls >= 2.10.2") 2>&5 |
26938 | ac_status=$? | 26920 | ac_status=$? |
@@ -26942,15 +26924,13 @@ if test -n "$PKG_CONFIG"; then | |||
26942 | else | 26924 | else |
26943 | pkg_failed=yes | 26925 | pkg_failed=yes |
26944 | fi | 26926 | fi |
26945 | fi | 26927 | else |
26946 | else | 26928 | pkg_failed=untried |
26947 | pkg_failed=untried | ||
26948 | fi | 26929 | fi |
26949 | if test -n "$PKG_CONFIG"; then | 26930 | if test -n "$TLS_LIBS"; then |
26950 | if test -n "$TLS_LIBS"; then | 26931 | pkg_cv_TLS_LIBS="$TLS_LIBS" |
26951 | pkg_cv_TLS_LIBS="$TLS_LIBS" | 26932 | elif test -n "$PKG_CONFIG"; then |
26952 | else | 26933 | if test -n "$PKG_CONFIG" && \ |
26953 | if test -n "$PKG_CONFIG" && \ | ||
26954 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.10.2\""; } >&5 | 26934 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.10.2\""; } >&5 |
26955 | ($PKG_CONFIG --exists --print-errors "gnutls >= 2.10.2") 2>&5 | 26935 | ($PKG_CONFIG --exists --print-errors "gnutls >= 2.10.2") 2>&5 |
26956 | ac_status=$? | 26936 | ac_status=$? |
@@ -26960,14 +26940,15 @@ if test -n "$PKG_CONFIG"; then | |||
26960 | else | 26940 | else |
26961 | pkg_failed=yes | 26941 | pkg_failed=yes |
26962 | fi | 26942 | fi |
26963 | fi | 26943 | else |
26964 | else | 26944 | pkg_failed=untried |
26965 | pkg_failed=untried | ||
26966 | fi | 26945 | fi |
26967 | 26946 | ||
26968 | 26947 | ||
26969 | 26948 | ||
26970 | if test $pkg_failed = yes; then | 26949 | if test $pkg_failed = yes; then |
26950 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
26951 | $as_echo "no" >&6; } | ||
26971 | 26952 | ||
26972 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 26953 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
26973 | _pkg_short_errors_supported=yes | 26954 | _pkg_short_errors_supported=yes |
@@ -26975,17 +26956,17 @@ else | |||
26975 | _pkg_short_errors_supported=no | 26956 | _pkg_short_errors_supported=no |
26976 | fi | 26957 | fi |
26977 | if test $_pkg_short_errors_supported = yes; then | 26958 | if test $_pkg_short_errors_supported = yes; then |
26978 | TLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnutls >= 2.10.2"` | 26959 | TLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= 2.10.2" 2>&1` |
26979 | else | 26960 | else |
26980 | TLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 2.10.2"` | 26961 | TLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= 2.10.2" 2>&1` |
26981 | fi | 26962 | fi |
26982 | # Put the nasty error message in config.log where it belongs | 26963 | # Put the nasty error message in config.log where it belongs |
26983 | echo "$TLS_PKG_ERRORS" >&5 | 26964 | echo "$TLS_PKG_ERRORS" >&5 |
26984 | 26965 | ||
26985 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 26966 | _ecore_have_gnutls="no" |
26986 | $as_echo "no" >&6; } | ||
26987 | _ecore_have_gnutls="no" | ||
26988 | elif test $pkg_failed = untried; then | 26967 | elif test $pkg_failed = untried; then |
26968 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
26969 | $as_echo "no" >&6; } | ||
26989 | _ecore_have_gnutls="no" | 26970 | _ecore_have_gnutls="no" |
26990 | else | 26971 | else |
26991 | TLS_CFLAGS=$pkg_cv_TLS_CFLAGS | 26972 | TLS_CFLAGS=$pkg_cv_TLS_CFLAGS |
@@ -27005,11 +26986,10 @@ pkg_failed=no | |||
27005 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLS2" >&5 | 26986 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TLS2" >&5 |
27006 | $as_echo_n "checking for TLS2... " >&6; } | 26987 | $as_echo_n "checking for TLS2... " >&6; } |
27007 | 26988 | ||
27008 | if test -n "$PKG_CONFIG"; then | 26989 | if test -n "$TLS2_CFLAGS"; then |
27009 | if test -n "$TLS2_CFLAGS"; then | 26990 | pkg_cv_TLS2_CFLAGS="$TLS2_CFLAGS" |
27010 | pkg_cv_TLS2_CFLAGS="$TLS2_CFLAGS" | 26991 | elif test -n "$PKG_CONFIG"; then |
27011 | else | 26992 | if test -n "$PKG_CONFIG" && \ |
27012 | if test -n "$PKG_CONFIG" && \ | ||
27013 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.10.2\""; } >&5 | 26993 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.10.2\""; } >&5 |
27014 | ($PKG_CONFIG --exists --print-errors "gnutls >= 2.10.2") 2>&5 | 26994 | ($PKG_CONFIG --exists --print-errors "gnutls >= 2.10.2") 2>&5 |
27015 | ac_status=$? | 26995 | ac_status=$? |
@@ -27019,15 +26999,13 @@ if test -n "$PKG_CONFIG"; then | |||
27019 | else | 26999 | else |
27020 | pkg_failed=yes | 27000 | pkg_failed=yes |
27021 | fi | 27001 | fi |
27022 | fi | 27002 | else |
27023 | else | 27003 | pkg_failed=untried |
27024 | pkg_failed=untried | ||
27025 | fi | 27004 | fi |
27026 | if test -n "$PKG_CONFIG"; then | 27005 | if test -n "$TLS2_LIBS"; then |
27027 | if test -n "$TLS2_LIBS"; then | 27006 | pkg_cv_TLS2_LIBS="$TLS2_LIBS" |
27028 | pkg_cv_TLS2_LIBS="$TLS2_LIBS" | 27007 | elif test -n "$PKG_CONFIG"; then |
27029 | else | 27008 | if test -n "$PKG_CONFIG" && \ |
27030 | if test -n "$PKG_CONFIG" && \ | ||
27031 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.10.2\""; } >&5 | 27009 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 2.10.2\""; } >&5 |
27032 | ($PKG_CONFIG --exists --print-errors "gnutls >= 2.10.2") 2>&5 | 27010 | ($PKG_CONFIG --exists --print-errors "gnutls >= 2.10.2") 2>&5 |
27033 | ac_status=$? | 27011 | ac_status=$? |
@@ -27037,14 +27015,15 @@ if test -n "$PKG_CONFIG"; then | |||
27037 | else | 27015 | else |
27038 | pkg_failed=yes | 27016 | pkg_failed=yes |
27039 | fi | 27017 | fi |
27040 | fi | 27018 | else |
27041 | else | 27019 | pkg_failed=untried |
27042 | pkg_failed=untried | ||
27043 | fi | 27020 | fi |
27044 | 27021 | ||
27045 | 27022 | ||
27046 | 27023 | ||
27047 | if test $pkg_failed = yes; then | 27024 | if test $pkg_failed = yes; then |
27025 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
27026 | $as_echo "no" >&6; } | ||
27048 | 27027 | ||
27049 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 27028 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
27050 | _pkg_short_errors_supported=yes | 27029 | _pkg_short_errors_supported=yes |
@@ -27052,17 +27031,17 @@ else | |||
27052 | _pkg_short_errors_supported=no | 27031 | _pkg_short_errors_supported=no |
27053 | fi | 27032 | fi |
27054 | if test $_pkg_short_errors_supported = yes; then | 27033 | if test $_pkg_short_errors_supported = yes; then |
27055 | TLS2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnutls >= 2.10.2"` | 27034 | TLS2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= 2.10.2" 2>&1` |
27056 | else | 27035 | else |
27057 | TLS2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 2.10.2"` | 27036 | TLS2_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= 2.10.2" 2>&1` |
27058 | fi | 27037 | fi |
27059 | # Put the nasty error message in config.log where it belongs | 27038 | # Put the nasty error message in config.log where it belongs |
27060 | echo "$TLS2_PKG_ERRORS" >&5 | 27039 | echo "$TLS2_PKG_ERRORS" >&5 |
27061 | 27040 | ||
27062 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 27041 | dummy="no" |
27063 | $as_echo "no" >&6; } | ||
27064 | dummy="no" | ||
27065 | elif test $pkg_failed = untried; then | 27042 | elif test $pkg_failed = untried; then |
27043 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
27044 | $as_echo "no" >&6; } | ||
27066 | dummy="no" | 27045 | dummy="no" |
27067 | else | 27046 | else |
27068 | TLS2_CFLAGS=$pkg_cv_TLS2_CFLAGS | 27047 | TLS2_CFLAGS=$pkg_cv_TLS2_CFLAGS |
@@ -27220,11 +27199,10 @@ pkg_failed=no | |||
27220 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL" >&5 | 27199 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL" >&5 |
27221 | $as_echo_n "checking for SSL... " >&6; } | 27200 | $as_echo_n "checking for SSL... " >&6; } |
27222 | 27201 | ||
27223 | if test -n "$PKG_CONFIG"; then | 27202 | if test -n "$SSL_CFLAGS"; then |
27224 | if test -n "$SSL_CFLAGS"; then | 27203 | pkg_cv_SSL_CFLAGS="$SSL_CFLAGS" |
27225 | pkg_cv_SSL_CFLAGS="$SSL_CFLAGS" | 27204 | elif test -n "$PKG_CONFIG"; then |
27226 | else | 27205 | if test -n "$PKG_CONFIG" && \ |
27227 | if test -n "$PKG_CONFIG" && \ | ||
27228 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 | 27206 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 |
27229 | ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 | 27207 | ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 |
27230 | ac_status=$? | 27208 | ac_status=$? |
@@ -27234,15 +27212,13 @@ if test -n "$PKG_CONFIG"; then | |||
27234 | else | 27212 | else |
27235 | pkg_failed=yes | 27213 | pkg_failed=yes |
27236 | fi | 27214 | fi |
27237 | fi | 27215 | else |
27238 | else | 27216 | pkg_failed=untried |
27239 | pkg_failed=untried | ||
27240 | fi | 27217 | fi |
27241 | if test -n "$PKG_CONFIG"; then | 27218 | if test -n "$SSL_LIBS"; then |
27242 | if test -n "$SSL_LIBS"; then | 27219 | pkg_cv_SSL_LIBS="$SSL_LIBS" |
27243 | pkg_cv_SSL_LIBS="$SSL_LIBS" | 27220 | elif test -n "$PKG_CONFIG"; then |
27244 | else | 27221 | if test -n "$PKG_CONFIG" && \ |
27245 | if test -n "$PKG_CONFIG" && \ | ||
27246 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 | 27222 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 |
27247 | ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 | 27223 | ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 |
27248 | ac_status=$? | 27224 | ac_status=$? |
@@ -27252,14 +27228,15 @@ if test -n "$PKG_CONFIG"; then | |||
27252 | else | 27228 | else |
27253 | pkg_failed=yes | 27229 | pkg_failed=yes |
27254 | fi | 27230 | fi |
27255 | fi | 27231 | else |
27256 | else | 27232 | pkg_failed=untried |
27257 | pkg_failed=untried | ||
27258 | fi | 27233 | fi |
27259 | 27234 | ||
27260 | 27235 | ||
27261 | 27236 | ||
27262 | if test $pkg_failed = yes; then | 27237 | if test $pkg_failed = yes; then |
27238 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
27239 | $as_echo "no" >&6; } | ||
27263 | 27240 | ||
27264 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 27241 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
27265 | _pkg_short_errors_supported=yes | 27242 | _pkg_short_errors_supported=yes |
@@ -27267,17 +27244,17 @@ else | |||
27267 | _pkg_short_errors_supported=no | 27244 | _pkg_short_errors_supported=no |
27268 | fi | 27245 | fi |
27269 | if test $_pkg_short_errors_supported = yes; then | 27246 | if test $_pkg_short_errors_supported = yes; then |
27270 | SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "openssl"` | 27247 | SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "openssl" 2>&1` |
27271 | else | 27248 | else |
27272 | SSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl"` | 27249 | SSL_PKG_ERRORS=`$PKG_CONFIG --print-errors "openssl" 2>&1` |
27273 | fi | 27250 | fi |
27274 | # Put the nasty error message in config.log where it belongs | 27251 | # Put the nasty error message in config.log where it belongs |
27275 | echo "$SSL_PKG_ERRORS" >&5 | 27252 | echo "$SSL_PKG_ERRORS" >&5 |
27276 | 27253 | ||
27277 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 27254 | _ecore_have_openssl="no" |
27278 | $as_echo "no" >&6; } | ||
27279 | _ecore_have_openssl="no" | ||
27280 | elif test $pkg_failed = untried; then | 27255 | elif test $pkg_failed = untried; then |
27256 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
27257 | $as_echo "no" >&6; } | ||
27281 | _ecore_have_openssl="no" | 27258 | _ecore_have_openssl="no" |
27282 | else | 27259 | else |
27283 | SSL_CFLAGS=$pkg_cv_SSL_CFLAGS | 27260 | SSL_CFLAGS=$pkg_cv_SSL_CFLAGS |
@@ -27334,46 +27311,44 @@ pkg_failed=no | |||
27334 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CARES" >&5 | 27311 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CARES" >&5 |
27335 | $as_echo_n "checking for CARES... " >&6; } | 27312 | $as_echo_n "checking for CARES... " >&6; } |
27336 | 27313 | ||
27337 | if test -n "$PKG_CONFIG"; then | 27314 | if test -n "$CARES_CFLAGS"; then |
27338 | if test -n "$CARES_CFLAGS"; then | 27315 | pkg_cv_CARES_CFLAGS="$CARES_CFLAGS" |
27339 | pkg_cv_CARES_CFLAGS="$CARES_CFLAGS" | 27316 | elif test -n "$PKG_CONFIG"; then |
27340 | else | 27317 | if test -n "$PKG_CONFIG" && \ |
27341 | if test -n "$PKG_CONFIG" && \ | 27318 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares >= 1.6.1\""; } >&5 |
27342 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares >= 1.6.1 libcares != 1.7.5\""; } >&5 | 27319 | ($PKG_CONFIG --exists --print-errors "libcares >= 1.6.1") 2>&5 |
27343 | ($PKG_CONFIG --exists --print-errors "libcares >= 1.6.1 libcares != 1.7.5") 2>&5 | ||
27344 | ac_status=$? | 27320 | ac_status=$? |
27345 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 27321 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
27346 | test $ac_status = 0; }; then | 27322 | test $ac_status = 0; }; then |
27347 | pkg_cv_CARES_CFLAGS=`$PKG_CONFIG --cflags "libcares >= 1.6.1 libcares != 1.7.5" 2>/dev/null` | 27323 | pkg_cv_CARES_CFLAGS=`$PKG_CONFIG --cflags "libcares >= 1.6.1" 2>/dev/null` |
27348 | else | 27324 | else |
27349 | pkg_failed=yes | 27325 | pkg_failed=yes |
27350 | fi | 27326 | fi |
27351 | fi | 27327 | else |
27352 | else | 27328 | pkg_failed=untried |
27353 | pkg_failed=untried | ||
27354 | fi | 27329 | fi |
27355 | if test -n "$PKG_CONFIG"; then | 27330 | if test -n "$CARES_LIBS"; then |
27356 | if test -n "$CARES_LIBS"; then | 27331 | pkg_cv_CARES_LIBS="$CARES_LIBS" |
27357 | pkg_cv_CARES_LIBS="$CARES_LIBS" | 27332 | elif test -n "$PKG_CONFIG"; then |
27358 | else | 27333 | if test -n "$PKG_CONFIG" && \ |
27359 | if test -n "$PKG_CONFIG" && \ | 27334 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares >= 1.6.1\""; } >&5 |
27360 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares >= 1.6.1 libcares != 1.7.5\""; } >&5 | 27335 | ($PKG_CONFIG --exists --print-errors "libcares >= 1.6.1") 2>&5 |
27361 | ($PKG_CONFIG --exists --print-errors "libcares >= 1.6.1 libcares != 1.7.5") 2>&5 | ||
27362 | ac_status=$? | 27336 | ac_status=$? |
27363 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 27337 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
27364 | test $ac_status = 0; }; then | 27338 | test $ac_status = 0; }; then |
27365 | pkg_cv_CARES_LIBS=`$PKG_CONFIG --libs "libcares >= 1.6.1 libcares != 1.7.5" 2>/dev/null` | 27339 | pkg_cv_CARES_LIBS=`$PKG_CONFIG --libs "libcares >= 1.6.1" 2>/dev/null` |
27366 | else | 27340 | else |
27367 | pkg_failed=yes | 27341 | pkg_failed=yes |
27368 | fi | 27342 | fi |
27369 | fi | 27343 | else |
27370 | else | 27344 | pkg_failed=untried |
27371 | pkg_failed=untried | ||
27372 | fi | 27345 | fi |
27373 | 27346 | ||
27374 | 27347 | ||
27375 | 27348 | ||
27376 | if test $pkg_failed = yes; then | 27349 | if test $pkg_failed = yes; then |
27350 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
27351 | $as_echo "no" >&6; } | ||
27377 | 27352 | ||
27378 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 27353 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
27379 | _pkg_short_errors_supported=yes | 27354 | _pkg_short_errors_supported=yes |
@@ -27381,17 +27356,17 @@ else | |||
27381 | _pkg_short_errors_supported=no | 27356 | _pkg_short_errors_supported=no |
27382 | fi | 27357 | fi |
27383 | if test $_pkg_short_errors_supported = yes; then | 27358 | if test $_pkg_short_errors_supported = yes; then |
27384 | CARES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcares >= 1.6.1 libcares != 1.7.5"` | 27359 | CARES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcares >= 1.6.1" 2>&1` |
27385 | else | 27360 | else |
27386 | CARES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcares >= 1.6.1 libcares != 1.7.5"` | 27361 | CARES_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcares >= 1.6.1" 2>&1` |
27387 | fi | 27362 | fi |
27388 | # Put the nasty error message in config.log where it belongs | 27363 | # Put the nasty error message in config.log where it belongs |
27389 | echo "$CARES_PKG_ERRORS" >&5 | 27364 | echo "$CARES_PKG_ERRORS" >&5 |
27390 | 27365 | ||
27391 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 27366 | _ecore_have_cares="no" |
27392 | $as_echo "no" >&6; } | ||
27393 | _ecore_have_cares="no" | ||
27394 | elif test $pkg_failed = untried; then | 27367 | elif test $pkg_failed = untried; then |
27368 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
27369 | $as_echo "no" >&6; } | ||
27395 | _ecore_have_cares="no" | 27370 | _ecore_have_cares="no" |
27396 | else | 27371 | else |
27397 | CARES_CFLAGS=$pkg_cv_CARES_CFLAGS | 27372 | CARES_CFLAGS=$pkg_cv_CARES_CFLAGS |
@@ -27481,8 +27456,8 @@ fi | |||
27481 | 27456 | ||
27482 | if test "x$have_ecore_ipc" = "xyes"; then : | 27457 | if test "x$have_ecore_ipc" = "xyes"; then : |
27483 | 27458 | ||
27484 | requirements_ecore_ipc="ecore-con >= 1.1.99 ${requirements_ecore_ipc}" | 27459 | requirements_ecore_ipc="ecore-con >= 1.2.0 ${requirements_ecore_ipc}" |
27485 | requirements_ecore_evas="ecore-ipc >= 1.1.99 ${requirements_ecore_evas}" | 27460 | requirements_ecore_evas="ecore-ipc >= 1.2.0 ${requirements_ecore_evas}" |
27486 | 27461 | ||
27487 | fi | 27462 | fi |
27488 | 27463 | ||
@@ -27736,7 +27711,7 @@ fi | |||
27736 | 27711 | ||
27737 | 27712 | ||
27738 | if test "x${have_ecore_con}" = "xyes" ; then | 27713 | if test "x${have_ecore_con}" = "xyes" ; then |
27739 | requirements_ecore_file="ecore-con >= 1.1.99 ${requirements_ecore_file}" | 27714 | requirements_ecore_file="ecore-con >= 1.2.0 ${requirements_ecore_file}" |
27740 | else | 27715 | else |
27741 | 27716 | ||
27742 | _ecore_want_curl=${want_curl} | 27717 | _ecore_want_curl=${want_curl} |
@@ -27760,11 +27735,10 @@ pkg_failed=no | |||
27760 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5 | 27735 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5 |
27761 | $as_echo_n "checking for CURL... " >&6; } | 27736 | $as_echo_n "checking for CURL... " >&6; } |
27762 | 27737 | ||
27763 | if test -n "$PKG_CONFIG"; then | 27738 | if test -n "$CURL_CFLAGS"; then |
27764 | if test -n "$CURL_CFLAGS"; then | 27739 | pkg_cv_CURL_CFLAGS="$CURL_CFLAGS" |
27765 | pkg_cv_CURL_CFLAGS="$CURL_CFLAGS" | 27740 | elif test -n "$PKG_CONFIG"; then |
27766 | else | 27741 | if test -n "$PKG_CONFIG" && \ |
27767 | if test -n "$PKG_CONFIG" && \ | ||
27768 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 | 27742 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 |
27769 | ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5 | 27743 | ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5 |
27770 | ac_status=$? | 27744 | ac_status=$? |
@@ -27774,15 +27748,13 @@ if test -n "$PKG_CONFIG"; then | |||
27774 | else | 27748 | else |
27775 | pkg_failed=yes | 27749 | pkg_failed=yes |
27776 | fi | 27750 | fi |
27777 | fi | 27751 | else |
27778 | else | 27752 | pkg_failed=untried |
27779 | pkg_failed=untried | ||
27780 | fi | 27753 | fi |
27781 | if test -n "$PKG_CONFIG"; then | 27754 | if test -n "$CURL_LIBS"; then |
27782 | if test -n "$CURL_LIBS"; then | 27755 | pkg_cv_CURL_LIBS="$CURL_LIBS" |
27783 | pkg_cv_CURL_LIBS="$CURL_LIBS" | 27756 | elif test -n "$PKG_CONFIG"; then |
27784 | else | 27757 | if test -n "$PKG_CONFIG" && \ |
27785 | if test -n "$PKG_CONFIG" && \ | ||
27786 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 | 27758 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5 |
27787 | ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5 | 27759 | ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5 |
27788 | ac_status=$? | 27760 | ac_status=$? |
@@ -27792,14 +27764,15 @@ if test -n "$PKG_CONFIG"; then | |||
27792 | else | 27764 | else |
27793 | pkg_failed=yes | 27765 | pkg_failed=yes |
27794 | fi | 27766 | fi |
27795 | fi | 27767 | else |
27796 | else | 27768 | pkg_failed=untried |
27797 | pkg_failed=untried | ||
27798 | fi | 27769 | fi |
27799 | 27770 | ||
27800 | 27771 | ||
27801 | 27772 | ||
27802 | if test $pkg_failed = yes; then | 27773 | if test $pkg_failed = yes; then |
27774 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
27775 | $as_echo "no" >&6; } | ||
27803 | 27776 | ||
27804 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 27777 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
27805 | _pkg_short_errors_supported=yes | 27778 | _pkg_short_errors_supported=yes |
@@ -27807,17 +27780,17 @@ else | |||
27807 | _pkg_short_errors_supported=no | 27780 | _pkg_short_errors_supported=no |
27808 | fi | 27781 | fi |
27809 | if test $_pkg_short_errors_supported = yes; then | 27782 | if test $_pkg_short_errors_supported = yes; then |
27810 | CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libcurl"` | 27783 | CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libcurl" 2>&1` |
27811 | else | 27784 | else |
27812 | CURL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libcurl"` | 27785 | CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libcurl" 2>&1` |
27813 | fi | 27786 | fi |
27814 | # Put the nasty error message in config.log where it belongs | 27787 | # Put the nasty error message in config.log where it belongs |
27815 | echo "$CURL_PKG_ERRORS" >&5 | 27788 | echo "$CURL_PKG_ERRORS" >&5 |
27816 | 27789 | ||
27817 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 27790 | _ecore_have_curl="no" |
27818 | $as_echo "no" >&6; } | ||
27819 | _ecore_have_curl="no" | ||
27820 | elif test $pkg_failed = untried; then | 27791 | elif test $pkg_failed = untried; then |
27792 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
27793 | $as_echo "no" >&6; } | ||
27821 | _ecore_have_curl="no" | 27794 | _ecore_have_curl="no" |
27822 | else | 27795 | else |
27823 | CURL_CFLAGS=$pkg_cv_CURL_CFLAGS | 27796 | CURL_CFLAGS=$pkg_cv_CURL_CFLAGS |
@@ -27853,7 +27826,7 @@ fi | |||
27853 | #fi | 27826 | #fi |
27854 | 27827 | ||
27855 | #ECORE_CHECK_MODULE([config], [${want_ecore_config}], [Config], [${ecore_config_deps}], | 27828 | #ECORE_CHECK_MODULE([config], [${want_ecore_config}], [Config], [${ecore_config_deps}], |
27856 | # [requirements_ecore_config="ecore-ipc >= 1.1.99 evas >= 1.1.99 eet >= 1.5.0 ${requirements_ecore_config}"]) | 27829 | # [requirements_ecore_config="ecore-ipc >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 ${requirements_ecore_config}"]) |
27857 | 27830 | ||
27858 | if false; then | 27831 | if false; then |
27859 | BUILD_ECORE_CONFIG_TRUE= | 27832 | BUILD_ECORE_CONFIG_TRUE= |
@@ -27983,7 +27956,7 @@ fi | |||
27983 | 27956 | ||
27984 | 27957 | ||
27985 | if test "x$have_ecore_imf_evas" = "xyes"; then : | 27958 | if test "x$have_ecore_imf_evas" = "xyes"; then : |
27986 | requirements_ecore_imf_evas="ecore-imf >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_imf_evas}" | 27959 | requirements_ecore_imf_evas="ecore-imf >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_imf_evas}" |
27987 | fi | 27960 | fi |
27988 | 27961 | ||
27989 | 27962 | ||
@@ -28103,7 +28076,7 @@ fi | |||
28103 | 28076 | ||
28104 | 28077 | ||
28105 | if test "x$have_ecore_input_evas" = "xyes"; then : | 28078 | if test "x$have_ecore_input_evas" = "xyes"; then : |
28106 | requirements_ecore_input_evas="ecore-input >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_input}" | 28079 | requirements_ecore_input_evas="ecore-input >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_input}" |
28107 | fi | 28080 | fi |
28108 | 28081 | ||
28109 | 28082 | ||
@@ -28183,7 +28156,7 @@ fi | |||
28183 | 28156 | ||
28184 | 28157 | ||
28185 | if test "x$have_ecore_imf_xim" = "xyes"; then : | 28158 | if test "x$have_ecore_imf_xim" = "xyes"; then : |
28186 | requirements_ecore_imf_xim="ecore-imf >= 1.1.99 ecore-x >= 1.1.99 ecore-input >= 1.1.99 ${requirements_ecore_imf_xim}" | 28159 | requirements_ecore_imf_xim="ecore-imf >= 1.2.0 ecore-x >= 1.2.0 ecore-input >= 1.2.0 ${requirements_ecore_imf_xim}" |
28187 | fi | 28160 | fi |
28188 | 28161 | ||
28189 | 28162 | ||
@@ -28199,11 +28172,10 @@ pkg_failed=no | |||
28199 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCIM" >&5 | 28172 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCIM" >&5 |
28200 | $as_echo_n "checking for SCIM... " >&6; } | 28173 | $as_echo_n "checking for SCIM... " >&6; } |
28201 | 28174 | ||
28202 | if test -n "$PKG_CONFIG"; then | 28175 | if test -n "$SCIM_CFLAGS"; then |
28203 | if test -n "$SCIM_CFLAGS"; then | 28176 | pkg_cv_SCIM_CFLAGS="$SCIM_CFLAGS" |
28204 | pkg_cv_SCIM_CFLAGS="$SCIM_CFLAGS" | 28177 | elif test -n "$PKG_CONFIG"; then |
28205 | else | 28178 | if test -n "$PKG_CONFIG" && \ |
28206 | if test -n "$PKG_CONFIG" && \ | ||
28207 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"scim\""; } >&5 | 28179 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"scim\""; } >&5 |
28208 | ($PKG_CONFIG --exists --print-errors "scim") 2>&5 | 28180 | ($PKG_CONFIG --exists --print-errors "scim") 2>&5 |
28209 | ac_status=$? | 28181 | ac_status=$? |
@@ -28213,15 +28185,13 @@ if test -n "$PKG_CONFIG"; then | |||
28213 | else | 28185 | else |
28214 | pkg_failed=yes | 28186 | pkg_failed=yes |
28215 | fi | 28187 | fi |
28216 | fi | 28188 | else |
28217 | else | 28189 | pkg_failed=untried |
28218 | pkg_failed=untried | ||
28219 | fi | 28190 | fi |
28220 | if test -n "$PKG_CONFIG"; then | 28191 | if test -n "$SCIM_LIBS"; then |
28221 | if test -n "$SCIM_LIBS"; then | 28192 | pkg_cv_SCIM_LIBS="$SCIM_LIBS" |
28222 | pkg_cv_SCIM_LIBS="$SCIM_LIBS" | 28193 | elif test -n "$PKG_CONFIG"; then |
28223 | else | 28194 | if test -n "$PKG_CONFIG" && \ |
28224 | if test -n "$PKG_CONFIG" && \ | ||
28225 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"scim\""; } >&5 | 28195 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"scim\""; } >&5 |
28226 | ($PKG_CONFIG --exists --print-errors "scim") 2>&5 | 28196 | ($PKG_CONFIG --exists --print-errors "scim") 2>&5 |
28227 | ac_status=$? | 28197 | ac_status=$? |
@@ -28231,14 +28201,15 @@ if test -n "$PKG_CONFIG"; then | |||
28231 | else | 28201 | else |
28232 | pkg_failed=yes | 28202 | pkg_failed=yes |
28233 | fi | 28203 | fi |
28234 | fi | 28204 | else |
28235 | else | 28205 | pkg_failed=untried |
28236 | pkg_failed=untried | ||
28237 | fi | 28206 | fi |
28238 | 28207 | ||
28239 | 28208 | ||
28240 | 28209 | ||
28241 | if test $pkg_failed = yes; then | 28210 | if test $pkg_failed = yes; then |
28211 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
28212 | $as_echo "no" >&6; } | ||
28242 | 28213 | ||
28243 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 28214 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
28244 | _pkg_short_errors_supported=yes | 28215 | _pkg_short_errors_supported=yes |
@@ -28246,17 +28217,17 @@ else | |||
28246 | _pkg_short_errors_supported=no | 28217 | _pkg_short_errors_supported=no |
28247 | fi | 28218 | fi |
28248 | if test $_pkg_short_errors_supported = yes; then | 28219 | if test $_pkg_short_errors_supported = yes; then |
28249 | SCIM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "scim"` | 28220 | SCIM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "scim" 2>&1` |
28250 | else | 28221 | else |
28251 | SCIM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "scim"` | 28222 | SCIM_PKG_ERRORS=`$PKG_CONFIG --print-errors "scim" 2>&1` |
28252 | fi | 28223 | fi |
28253 | # Put the nasty error message in config.log where it belongs | 28224 | # Put the nasty error message in config.log where it belongs |
28254 | echo "$SCIM_PKG_ERRORS" >&5 | 28225 | echo "$SCIM_PKG_ERRORS" >&5 |
28255 | 28226 | ||
28256 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 28227 | have_scim="no" |
28257 | $as_echo "no" >&6; } | ||
28258 | have_scim="no" | ||
28259 | elif test $pkg_failed = untried; then | 28228 | elif test $pkg_failed = untried; then |
28229 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
28230 | $as_echo "no" >&6; } | ||
28260 | have_scim="no" | 28231 | have_scim="no" |
28261 | else | 28232 | else |
28262 | SCIM_CFLAGS=$pkg_cv_SCIM_CFLAGS | 28233 | SCIM_CFLAGS=$pkg_cv_SCIM_CFLAGS |
@@ -28335,7 +28306,7 @@ fi | |||
28335 | 28306 | ||
28336 | 28307 | ||
28337 | if test "x$have_ecore_imf_scim" = "xyes"; then : | 28308 | if test "x$have_ecore_imf_scim" = "xyes"; then : |
28338 | requirements_ecore_imf_scim="ecore-imf >= 1.1.0 ecore-x >= 1.1.0 ecore-input >= 1.1.0 ${requirements_ecore_imf_scim}" | 28309 | requirements_ecore_imf_scim="ecore-imf >= 1.2.0 ecore-x >= 1.2.0 ecore-input >= 1.2.0 ${requirements_ecore_imf_scim}" |
28339 | fi | 28310 | fi |
28340 | 28311 | ||
28341 | 28312 | ||
@@ -28407,7 +28378,7 @@ fi | |||
28407 | if test "x$have_ecore_x" = "xyes"; then : | 28378 | if test "x$have_ecore_x" = "xyes"; then : |
28408 | 28379 | ||
28409 | ecore_x_libs="$ecore_x_libs $x_libs" | 28380 | ecore_x_libs="$ecore_x_libs $x_libs" |
28410 | requirements_ecore_x="ecore-input >= 1.1.99 ${requirements_ecore_x}" | 28381 | requirements_ecore_x="ecore-input >= 1.2.0 ${requirements_ecore_x}" |
28411 | 28382 | ||
28412 | fi | 28383 | fi |
28413 | 28384 | ||
@@ -28472,7 +28443,7 @@ fi | |||
28472 | if test "x$have_ecore_win32" = "xyes"; then : | 28443 | if test "x$have_ecore_win32" = "xyes"; then : |
28473 | 28444 | ||
28474 | ecore_win32_libs="-lole32 -lgdi32" | 28445 | ecore_win32_libs="-lole32 -lgdi32" |
28475 | requirements_ecore_win32="ecore-input >= 1.1.99 ${requirements_ecore_win32}" | 28446 | requirements_ecore_win32="ecore-input >= 1.2.0 ${requirements_ecore_win32}" |
28476 | 28447 | ||
28477 | fi | 28448 | fi |
28478 | 28449 | ||
@@ -28541,7 +28512,7 @@ fi | |||
28541 | 28512 | ||
28542 | 28513 | ||
28543 | if test "x$have_ecore_cocoa" = "xyes"; then : | 28514 | if test "x$have_ecore_cocoa" = "xyes"; then : |
28544 | requirements_ecore_cocoa="ecore-input >= 1.1.99 ${requirements_ecore_cocoa}" | 28515 | requirements_ecore_cocoa="ecore-input >= 1.2.0 ${requirements_ecore_cocoa}" |
28545 | fi | 28516 | fi |
28546 | 28517 | ||
28547 | 28518 | ||
@@ -28608,7 +28579,7 @@ fi | |||
28608 | 28579 | ||
28609 | 28580 | ||
28610 | if test "x$have_ecore_sdl" = "xyes"; then : | 28581 | if test "x$have_ecore_sdl" = "xyes"; then : |
28611 | requirements_ecore_sdl="ecore-input >= 1.1.99 ${requirements_ecore_sdl}" | 28582 | requirements_ecore_sdl="ecore-input >= 1.2.0 ${requirements_ecore_sdl}" |
28612 | fi | 28583 | fi |
28613 | 28584 | ||
28614 | 28585 | ||
@@ -28668,7 +28639,7 @@ fi | |||
28668 | 28639 | ||
28669 | 28640 | ||
28670 | if test "x$have_ecore_psl1ght" = "xyes"; then : | 28641 | if test "x$have_ecore_psl1ght" = "xyes"; then : |
28671 | requirements_ecore_psl1ght="ecore-input >= 1.1.99 ${requirements_ecore_psl1ght}" | 28642 | requirements_ecore_psl1ght="ecore-input >= 1.2.0 ${requirements_ecore_psl1ght}" |
28672 | fi | 28643 | fi |
28673 | 28644 | ||
28674 | 28645 | ||
@@ -28765,11 +28736,10 @@ pkg_failed=no | |||
28765 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5 | 28736 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5 |
28766 | $as_echo_n "checking for TSLIB... " >&6; } | 28737 | $as_echo_n "checking for TSLIB... " >&6; } |
28767 | 28738 | ||
28768 | if test -n "$PKG_CONFIG"; then | 28739 | if test -n "$TSLIB_CFLAGS"; then |
28769 | if test -n "$TSLIB_CFLAGS"; then | 28740 | pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" |
28770 | pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" | 28741 | elif test -n "$PKG_CONFIG"; then |
28771 | else | 28742 | if test -n "$PKG_CONFIG" && \ |
28772 | if test -n "$PKG_CONFIG" && \ | ||
28773 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-1.0\""; } >&5 | 28743 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-1.0\""; } >&5 |
28774 | ($PKG_CONFIG --exists --print-errors "tslib-1.0") 2>&5 | 28744 | ($PKG_CONFIG --exists --print-errors "tslib-1.0") 2>&5 |
28775 | ac_status=$? | 28745 | ac_status=$? |
@@ -28779,15 +28749,13 @@ if test -n "$PKG_CONFIG"; then | |||
28779 | else | 28749 | else |
28780 | pkg_failed=yes | 28750 | pkg_failed=yes |
28781 | fi | 28751 | fi |
28782 | fi | 28752 | else |
28783 | else | 28753 | pkg_failed=untried |
28784 | pkg_failed=untried | ||
28785 | fi | 28754 | fi |
28786 | if test -n "$PKG_CONFIG"; then | 28755 | if test -n "$TSLIB_LIBS"; then |
28787 | if test -n "$TSLIB_LIBS"; then | 28756 | pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" |
28788 | pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" | 28757 | elif test -n "$PKG_CONFIG"; then |
28789 | else | 28758 | if test -n "$PKG_CONFIG" && \ |
28790 | if test -n "$PKG_CONFIG" && \ | ||
28791 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-1.0\""; } >&5 | 28759 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib-1.0\""; } >&5 |
28792 | ($PKG_CONFIG --exists --print-errors "tslib-1.0") 2>&5 | 28760 | ($PKG_CONFIG --exists --print-errors "tslib-1.0") 2>&5 |
28793 | ac_status=$? | 28761 | ac_status=$? |
@@ -28797,14 +28765,15 @@ if test -n "$PKG_CONFIG"; then | |||
28797 | else | 28765 | else |
28798 | pkg_failed=yes | 28766 | pkg_failed=yes |
28799 | fi | 28767 | fi |
28800 | fi | 28768 | else |
28801 | else | 28769 | pkg_failed=untried |
28802 | pkg_failed=untried | ||
28803 | fi | 28770 | fi |
28804 | 28771 | ||
28805 | 28772 | ||
28806 | 28773 | ||
28807 | if test $pkg_failed = yes; then | 28774 | if test $pkg_failed = yes; then |
28775 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
28776 | $as_echo "no" >&6; } | ||
28808 | 28777 | ||
28809 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 28778 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
28810 | _pkg_short_errors_supported=yes | 28779 | _pkg_short_errors_supported=yes |
@@ -28812,26 +28781,23 @@ else | |||
28812 | _pkg_short_errors_supported=no | 28781 | _pkg_short_errors_supported=no |
28813 | fi | 28782 | fi |
28814 | if test $_pkg_short_errors_supported = yes; then | 28783 | if test $_pkg_short_errors_supported = yes; then |
28815 | TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tslib-1.0"` | 28784 | TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib-1.0" 2>&1` |
28816 | else | 28785 | else |
28817 | TSLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tslib-1.0"` | 28786 | TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib-1.0" 2>&1` |
28818 | fi | 28787 | fi |
28819 | # Put the nasty error message in config.log where it belongs | 28788 | # Put the nasty error message in config.log where it belongs |
28820 | echo "$TSLIB_PKG_ERRORS" >&5 | 28789 | echo "$TSLIB_PKG_ERRORS" >&5 |
28821 | 28790 | ||
28822 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
28823 | $as_echo "no" >&6; } | ||
28824 | 28791 | ||
28825 | 28792 | ||
28826 | pkg_failed=no | 28793 | pkg_failed=no |
28827 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5 | 28794 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5 |
28828 | $as_echo_n "checking for TSLIB... " >&6; } | 28795 | $as_echo_n "checking for TSLIB... " >&6; } |
28829 | 28796 | ||
28830 | if test -n "$PKG_CONFIG"; then | 28797 | if test -n "$TSLIB_CFLAGS"; then |
28831 | if test -n "$TSLIB_CFLAGS"; then | 28798 | pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" |
28832 | pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" | 28799 | elif test -n "$PKG_CONFIG"; then |
28833 | else | 28800 | if test -n "$PKG_CONFIG" && \ |
28834 | if test -n "$PKG_CONFIG" && \ | ||
28835 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib\""; } >&5 | 28801 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib\""; } >&5 |
28836 | ($PKG_CONFIG --exists --print-errors "tslib") 2>&5 | 28802 | ($PKG_CONFIG --exists --print-errors "tslib") 2>&5 |
28837 | ac_status=$? | 28803 | ac_status=$? |
@@ -28841,15 +28807,13 @@ if test -n "$PKG_CONFIG"; then | |||
28841 | else | 28807 | else |
28842 | pkg_failed=yes | 28808 | pkg_failed=yes |
28843 | fi | 28809 | fi |
28844 | fi | 28810 | else |
28845 | else | 28811 | pkg_failed=untried |
28846 | pkg_failed=untried | ||
28847 | fi | 28812 | fi |
28848 | if test -n "$PKG_CONFIG"; then | 28813 | if test -n "$TSLIB_LIBS"; then |
28849 | if test -n "$TSLIB_LIBS"; then | 28814 | pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" |
28850 | pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" | 28815 | elif test -n "$PKG_CONFIG"; then |
28851 | else | 28816 | if test -n "$PKG_CONFIG" && \ |
28852 | if test -n "$PKG_CONFIG" && \ | ||
28853 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib\""; } >&5 | 28817 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib\""; } >&5 |
28854 | ($PKG_CONFIG --exists --print-errors "tslib") 2>&5 | 28818 | ($PKG_CONFIG --exists --print-errors "tslib") 2>&5 |
28855 | ac_status=$? | 28819 | ac_status=$? |
@@ -28859,14 +28823,15 @@ if test -n "$PKG_CONFIG"; then | |||
28859 | else | 28823 | else |
28860 | pkg_failed=yes | 28824 | pkg_failed=yes |
28861 | fi | 28825 | fi |
28862 | fi | 28826 | else |
28863 | else | 28827 | pkg_failed=untried |
28864 | pkg_failed=untried | ||
28865 | fi | 28828 | fi |
28866 | 28829 | ||
28867 | 28830 | ||
28868 | 28831 | ||
28869 | if test $pkg_failed = yes; then | 28832 | if test $pkg_failed = yes; then |
28833 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
28834 | $as_echo "no" >&6; } | ||
28870 | 28835 | ||
28871 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 28836 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
28872 | _pkg_short_errors_supported=yes | 28837 | _pkg_short_errors_supported=yes |
@@ -28874,15 +28839,13 @@ else | |||
28874 | _pkg_short_errors_supported=no | 28839 | _pkg_short_errors_supported=no |
28875 | fi | 28840 | fi |
28876 | if test $_pkg_short_errors_supported = yes; then | 28841 | if test $_pkg_short_errors_supported = yes; then |
28877 | TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tslib"` | 28842 | TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib" 2>&1` |
28878 | else | 28843 | else |
28879 | TSLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tslib"` | 28844 | TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib" 2>&1` |
28880 | fi | 28845 | fi |
28881 | # Put the nasty error message in config.log where it belongs | 28846 | # Put the nasty error message in config.log where it belongs |
28882 | echo "$TSLIB_PKG_ERRORS" >&5 | 28847 | echo "$TSLIB_PKG_ERRORS" >&5 |
28883 | 28848 | ||
28884 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
28885 | $as_echo "no" >&6; } | ||
28886 | 28849 | ||
28887 | ac_fn_c_check_header_mongrel "$LINENO" "tslib.h" "ac_cv_header_tslib_h" "$ac_includes_default" | 28850 | ac_fn_c_check_header_mongrel "$LINENO" "tslib.h" "ac_cv_header_tslib_h" "$ac_includes_default" |
28888 | if test "x$ac_cv_header_tslib_h" = x""yes; then : | 28851 | if test "x$ac_cv_header_tslib_h" = x""yes; then : |
@@ -28994,6 +28957,8 @@ fi | |||
28994 | 28957 | ||
28995 | 28958 | ||
28996 | elif test $pkg_failed = untried; then | 28959 | elif test $pkg_failed = untried; then |
28960 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
28961 | $as_echo "no" >&6; } | ||
28997 | 28962 | ||
28998 | ac_fn_c_check_header_mongrel "$LINENO" "tslib.h" "ac_cv_header_tslib_h" "$ac_includes_default" | 28963 | ac_fn_c_check_header_mongrel "$LINENO" "tslib.h" "ac_cv_header_tslib_h" "$ac_includes_default" |
28999 | if test "x$ac_cv_header_tslib_h" = x""yes; then : | 28964 | if test "x$ac_cv_header_tslib_h" = x""yes; then : |
@@ -29119,17 +29084,18 @@ $as_echo "#define HAVE_TSLIB 1" >>confdefs.h | |||
29119 | fi | 29084 | fi |
29120 | 29085 | ||
29121 | elif test $pkg_failed = untried; then | 29086 | elif test $pkg_failed = untried; then |
29087 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
29088 | $as_echo "no" >&6; } | ||
29122 | 29089 | ||
29123 | 29090 | ||
29124 | pkg_failed=no | 29091 | pkg_failed=no |
29125 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5 | 29092 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TSLIB" >&5 |
29126 | $as_echo_n "checking for TSLIB... " >&6; } | 29093 | $as_echo_n "checking for TSLIB... " >&6; } |
29127 | 29094 | ||
29128 | if test -n "$PKG_CONFIG"; then | 29095 | if test -n "$TSLIB_CFLAGS"; then |
29129 | if test -n "$TSLIB_CFLAGS"; then | 29096 | pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" |
29130 | pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" | 29097 | elif test -n "$PKG_CONFIG"; then |
29131 | else | 29098 | if test -n "$PKG_CONFIG" && \ |
29132 | if test -n "$PKG_CONFIG" && \ | ||
29133 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib\""; } >&5 | 29099 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib\""; } >&5 |
29134 | ($PKG_CONFIG --exists --print-errors "tslib") 2>&5 | 29100 | ($PKG_CONFIG --exists --print-errors "tslib") 2>&5 |
29135 | ac_status=$? | 29101 | ac_status=$? |
@@ -29139,15 +29105,13 @@ if test -n "$PKG_CONFIG"; then | |||
29139 | else | 29105 | else |
29140 | pkg_failed=yes | 29106 | pkg_failed=yes |
29141 | fi | 29107 | fi |
29142 | fi | 29108 | else |
29143 | else | 29109 | pkg_failed=untried |
29144 | pkg_failed=untried | ||
29145 | fi | 29110 | fi |
29146 | if test -n "$PKG_CONFIG"; then | 29111 | if test -n "$TSLIB_LIBS"; then |
29147 | if test -n "$TSLIB_LIBS"; then | 29112 | pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" |
29148 | pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" | 29113 | elif test -n "$PKG_CONFIG"; then |
29149 | else | 29114 | if test -n "$PKG_CONFIG" && \ |
29150 | if test -n "$PKG_CONFIG" && \ | ||
29151 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib\""; } >&5 | 29115 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tslib\""; } >&5 |
29152 | ($PKG_CONFIG --exists --print-errors "tslib") 2>&5 | 29116 | ($PKG_CONFIG --exists --print-errors "tslib") 2>&5 |
29153 | ac_status=$? | 29117 | ac_status=$? |
@@ -29157,14 +29121,15 @@ if test -n "$PKG_CONFIG"; then | |||
29157 | else | 29121 | else |
29158 | pkg_failed=yes | 29122 | pkg_failed=yes |
29159 | fi | 29123 | fi |
29160 | fi | 29124 | else |
29161 | else | 29125 | pkg_failed=untried |
29162 | pkg_failed=untried | ||
29163 | fi | 29126 | fi |
29164 | 29127 | ||
29165 | 29128 | ||
29166 | 29129 | ||
29167 | if test $pkg_failed = yes; then | 29130 | if test $pkg_failed = yes; then |
29131 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
29132 | $as_echo "no" >&6; } | ||
29168 | 29133 | ||
29169 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 29134 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
29170 | _pkg_short_errors_supported=yes | 29135 | _pkg_short_errors_supported=yes |
@@ -29172,15 +29137,13 @@ else | |||
29172 | _pkg_short_errors_supported=no | 29137 | _pkg_short_errors_supported=no |
29173 | fi | 29138 | fi |
29174 | if test $_pkg_short_errors_supported = yes; then | 29139 | if test $_pkg_short_errors_supported = yes; then |
29175 | TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tslib"` | 29140 | TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib" 2>&1` |
29176 | else | 29141 | else |
29177 | TSLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tslib"` | 29142 | TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib" 2>&1` |
29178 | fi | 29143 | fi |
29179 | # Put the nasty error message in config.log where it belongs | 29144 | # Put the nasty error message in config.log where it belongs |
29180 | echo "$TSLIB_PKG_ERRORS" >&5 | 29145 | echo "$TSLIB_PKG_ERRORS" >&5 |
29181 | 29146 | ||
29182 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
29183 | $as_echo "no" >&6; } | ||
29184 | 29147 | ||
29185 | ac_fn_c_check_header_mongrel "$LINENO" "tslib.h" "ac_cv_header_tslib_h" "$ac_includes_default" | 29148 | ac_fn_c_check_header_mongrel "$LINENO" "tslib.h" "ac_cv_header_tslib_h" "$ac_includes_default" |
29186 | if test "x$ac_cv_header_tslib_h" = x""yes; then : | 29149 | if test "x$ac_cv_header_tslib_h" = x""yes; then : |
@@ -29292,6 +29255,8 @@ fi | |||
29292 | 29255 | ||
29293 | 29256 | ||
29294 | elif test $pkg_failed = untried; then | 29257 | elif test $pkg_failed = untried; then |
29258 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
29259 | $as_echo "no" >&6; } | ||
29295 | 29260 | ||
29296 | ac_fn_c_check_header_mongrel "$LINENO" "tslib.h" "ac_cv_header_tslib_h" "$ac_includes_default" | 29261 | ac_fn_c_check_header_mongrel "$LINENO" "tslib.h" "ac_cv_header_tslib_h" "$ac_includes_default" |
29297 | if test "x$ac_cv_header_tslib_h" = x""yes; then : | 29262 | if test "x$ac_cv_header_tslib_h" = x""yes; then : |
@@ -29559,7 +29524,7 @@ fi | |||
29559 | 29524 | ||
29560 | 29525 | ||
29561 | if test "x$have_ecore_wince" = "xyes"; then : | 29526 | if test "x$have_ecore_wince" = "xyes"; then : |
29562 | requirements_ecore_win32="ecore-input >= 1.1.99 ${requirements_ecore_win32}" | 29527 | requirements_ecore_win32="ecore-input >= 1.2.0 ${requirements_ecore_win32}" |
29563 | fi | 29528 | fi |
29564 | 29529 | ||
29565 | 29530 | ||
@@ -29574,7 +29539,7 @@ fi | |||
29574 | # ecore_evas | 29539 | # ecore_evas |
29575 | 29540 | ||
29576 | ecore_evas_deps="no" | 29541 | ecore_evas_deps="no" |
29577 | if test "x${have_evas}" = "xyes" -a "x${have_ecore_input}" = "xyes" -a "x${have_ecore_input_evas}" = "xyes" ; then | 29542 | if test "x${have_evas}" = "xyes" && test "x${have_ecore_input}" = "xyes" && test "x${have_ecore_input_evas}" = "xyes" ; then |
29578 | ecore_evas_deps="yes" | 29543 | ecore_evas_deps="yes" |
29579 | fi | 29544 | fi |
29580 | 29545 | ||
@@ -29628,7 +29593,7 @@ fi | |||
29628 | 29593 | ||
29629 | 29594 | ||
29630 | if test "x$have_ecore_evas" = "xyes"; then : | 29595 | if test "x$have_ecore_evas" = "xyes"; then : |
29631 | requirements_ecore_evas="ecore-input >= 1.1.99 ecore-input-evas >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_evas}" | 29596 | requirements_ecore_evas="ecore-input >= 1.2.0 ecore-input-evas >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_evas}" |
29632 | fi | 29597 | fi |
29633 | 29598 | ||
29634 | 29599 | ||
@@ -29662,9 +29627,9 @@ $as_echo_n "checking whether ecore_evas Software Buffer support is to be built.. | |||
29662 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 29627 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
29663 | $as_echo "${want_module}" >&6; } | 29628 | $as_echo "${want_module}" >&6; } |
29664 | 29629 | ||
29665 | if test "xyes" = "xyes" -a \ | 29630 | if test "xyes" = "xyes" && \ |
29666 | "x$have_ecore_evas" = "xyes" -a \ | 29631 | test "x$have_ecore_evas" = "xyes" && \ |
29667 | "x$want_module" = "xyes" ; then | 29632 | test "x$want_module" = "xyes" ; then |
29668 | if test -n "$PKG_CONFIG" && \ | 29633 | if test -n "$PKG_CONFIG" && \ |
29669 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-buffer\""; } >&5 | 29634 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-buffer\""; } >&5 |
29670 | ($PKG_CONFIG --exists --print-errors "evas-software-buffer") 2>&5 | 29635 | ($PKG_CONFIG --exists --print-errors "evas-software-buffer") 2>&5 |
@@ -29719,9 +29684,9 @@ $as_echo_n "checking whether ecore_evas Software X11 support is to be built... " | |||
29719 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 29684 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
29720 | $as_echo "${want_module}" >&6; } | 29685 | $as_echo "${want_module}" >&6; } |
29721 | 29686 | ||
29722 | if test "x${have_ecore_x}" = "xyes" -a \ | 29687 | if test "x${have_ecore_x}" = "xyes" && \ |
29723 | "x$have_ecore_evas" = "xyes" -a \ | 29688 | test "x$have_ecore_evas" = "xyes" && \ |
29724 | "x$want_module" = "xyes" ; then | 29689 | test "x$want_module" = "xyes" ; then |
29725 | if test -n "$PKG_CONFIG" && \ | 29690 | if test -n "$PKG_CONFIG" && \ |
29726 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-x11\""; } >&5 | 29691 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-x11\""; } >&5 |
29727 | ($PKG_CONFIG --exists --print-errors "evas-software-x11") 2>&5 | 29692 | ($PKG_CONFIG --exists --print-errors "evas-software-x11") 2>&5 |
@@ -29797,9 +29762,9 @@ $as_echo_n "checking whether ecore_evas OpenGL Xlib support is to be built... " | |||
29797 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 29762 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
29798 | $as_echo "${want_module}" >&6; } | 29763 | $as_echo "${want_module}" >&6; } |
29799 | 29764 | ||
29800 | if test "x${have_ecore_x}" = "xyes" -a \ | 29765 | if test "x${have_ecore_x}" = "xyes" && \ |
29801 | "x$have_ecore_evas" = "xyes" -a \ | 29766 | test "x$have_ecore_evas" = "xyes" && \ |
29802 | "x$want_module" = "xyes" ; then | 29767 | test "x$want_module" = "xyes" ; then |
29803 | if test -n "$PKG_CONFIG" && \ | 29768 | if test -n "$PKG_CONFIG" && \ |
29804 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-opengl-x11\""; } >&5 | 29769 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-opengl-x11\""; } >&5 |
29805 | ($PKG_CONFIG --exists --print-errors "evas-opengl-x11") 2>&5 | 29770 | ($PKG_CONFIG --exists --print-errors "evas-opengl-x11") 2>&5 |
@@ -29849,11 +29814,10 @@ pkg_failed=no | |||
29849 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_X11" >&5 | 29814 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_X11" >&5 |
29850 | $as_echo_n "checking for XCB_X11... " >&6; } | 29815 | $as_echo_n "checking for XCB_X11... " >&6; } |
29851 | 29816 | ||
29852 | if test -n "$PKG_CONFIG"; then | 29817 | if test -n "$XCB_X11_CFLAGS"; then |
29853 | if test -n "$XCB_X11_CFLAGS"; then | 29818 | pkg_cv_XCB_X11_CFLAGS="$XCB_X11_CFLAGS" |
29854 | pkg_cv_XCB_X11_CFLAGS="$XCB_X11_CFLAGS" | 29819 | elif test -n "$PKG_CONFIG"; then |
29855 | else | 29820 | if test -n "$PKG_CONFIG" && \ |
29856 | if test -n "$PKG_CONFIG" && \ | ||
29857 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb\""; } >&5 | 29821 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb\""; } >&5 |
29858 | ($PKG_CONFIG --exists --print-errors "x11-xcb") 2>&5 | 29822 | ($PKG_CONFIG --exists --print-errors "x11-xcb") 2>&5 |
29859 | ac_status=$? | 29823 | ac_status=$? |
@@ -29863,15 +29827,13 @@ if test -n "$PKG_CONFIG"; then | |||
29863 | else | 29827 | else |
29864 | pkg_failed=yes | 29828 | pkg_failed=yes |
29865 | fi | 29829 | fi |
29866 | fi | 29830 | else |
29867 | else | 29831 | pkg_failed=untried |
29868 | pkg_failed=untried | ||
29869 | fi | 29832 | fi |
29870 | if test -n "$PKG_CONFIG"; then | 29833 | if test -n "$XCB_X11_LIBS"; then |
29871 | if test -n "$XCB_X11_LIBS"; then | 29834 | pkg_cv_XCB_X11_LIBS="$XCB_X11_LIBS" |
29872 | pkg_cv_XCB_X11_LIBS="$XCB_X11_LIBS" | 29835 | elif test -n "$PKG_CONFIG"; then |
29873 | else | 29836 | if test -n "$PKG_CONFIG" && \ |
29874 | if test -n "$PKG_CONFIG" && \ | ||
29875 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb\""; } >&5 | 29837 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb\""; } >&5 |
29876 | ($PKG_CONFIG --exists --print-errors "x11-xcb") 2>&5 | 29838 | ($PKG_CONFIG --exists --print-errors "x11-xcb") 2>&5 |
29877 | ac_status=$? | 29839 | ac_status=$? |
@@ -29881,14 +29843,15 @@ if test -n "$PKG_CONFIG"; then | |||
29881 | else | 29843 | else |
29882 | pkg_failed=yes | 29844 | pkg_failed=yes |
29883 | fi | 29845 | fi |
29884 | fi | 29846 | else |
29885 | else | 29847 | pkg_failed=untried |
29886 | pkg_failed=untried | ||
29887 | fi | 29848 | fi |
29888 | 29849 | ||
29889 | 29850 | ||
29890 | 29851 | ||
29891 | if test $pkg_failed = yes; then | 29852 | if test $pkg_failed = yes; then |
29853 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
29854 | $as_echo "no" >&6; } | ||
29892 | 29855 | ||
29893 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 29856 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
29894 | _pkg_short_errors_supported=yes | 29857 | _pkg_short_errors_supported=yes |
@@ -29896,17 +29859,17 @@ else | |||
29896 | _pkg_short_errors_supported=no | 29859 | _pkg_short_errors_supported=no |
29897 | fi | 29860 | fi |
29898 | if test $_pkg_short_errors_supported = yes; then | 29861 | if test $_pkg_short_errors_supported = yes; then |
29899 | XCB_X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11-xcb"` | 29862 | XCB_X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11-xcb" 2>&1` |
29900 | else | 29863 | else |
29901 | XCB_X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11-xcb"` | 29864 | XCB_X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11-xcb" 2>&1` |
29902 | fi | 29865 | fi |
29903 | # Put the nasty error message in config.log where it belongs | 29866 | # Put the nasty error message in config.log where it belongs |
29904 | echo "$XCB_X11_PKG_ERRORS" >&5 | 29867 | echo "$XCB_X11_PKG_ERRORS" >&5 |
29905 | 29868 | ||
29906 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 29869 | have_ecore_x_opengl_xcb="no" |
29907 | $as_echo "no" >&6; } | ||
29908 | have_ecore_x_opengl_xcb="no" | ||
29909 | elif test $pkg_failed = untried; then | 29870 | elif test $pkg_failed = untried; then |
29871 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
29872 | $as_echo "no" >&6; } | ||
29910 | have_ecore_x_opengl_xcb="no" | 29873 | have_ecore_x_opengl_xcb="no" |
29911 | else | 29874 | else |
29912 | XCB_X11_CFLAGS=$pkg_cv_XCB_X11_CFLAGS | 29875 | XCB_X11_CFLAGS=$pkg_cv_XCB_X11_CFLAGS |
@@ -29954,9 +29917,9 @@ $as_echo_n "checking whether ecore_evas Software Xlib 16 bits support is to be b | |||
29954 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 29917 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
29955 | $as_echo "${want_module}" >&6; } | 29918 | $as_echo "${want_module}" >&6; } |
29956 | 29919 | ||
29957 | if test "x${have_ecore_x_xlib}" = "xyes" -a \ | 29920 | if test "x${have_ecore_x_xlib}" = "xyes" && \ |
29958 | "x$have_ecore_evas" = "xyes" -a \ | 29921 | test "x$have_ecore_evas" = "xyes" && \ |
29959 | "x$want_module" = "xyes" ; then | 29922 | test "x$want_module" = "xyes" ; then |
29960 | if test -n "$PKG_CONFIG" && \ | 29923 | if test -n "$PKG_CONFIG" && \ |
29961 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-16-x11\""; } >&5 | 29924 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-16-x11\""; } >&5 |
29962 | ($PKG_CONFIG --exists --print-errors "evas-software-16-x11") 2>&5 | 29925 | ($PKG_CONFIG --exists --print-errors "evas-software-16-x11") 2>&5 |
@@ -30007,9 +29970,9 @@ $as_echo_n "checking whether ecore_evas Software 8bit X11 support is to be built | |||
30007 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 29970 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30008 | $as_echo "${want_module}" >&6; } | 29971 | $as_echo "${want_module}" >&6; } |
30009 | 29972 | ||
30010 | if test "x$have_ecore_x_xcb" = "xyes" -a \ | 29973 | if test "x$have_ecore_x_xcb" = "xyes" && \ |
30011 | "x$have_ecore_evas" = "xyes" -a \ | 29974 | test "x$have_ecore_evas" = "xyes" && \ |
30012 | "x$want_module" = "xyes" ; then | 29975 | test "x$want_module" = "xyes" ; then |
30013 | if test -n "$PKG_CONFIG" && \ | 29976 | if test -n "$PKG_CONFIG" && \ |
30014 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-8-x11\""; } >&5 | 29977 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-8-x11\""; } >&5 |
30015 | ($PKG_CONFIG --exists --print-errors "evas-software-8-x11") 2>&5 | 29978 | ($PKG_CONFIG --exists --print-errors "evas-software-8-x11") 2>&5 |
@@ -30047,7 +30010,7 @@ if test "x$have_ecore_evas_software_x11" = "xyes" -o \ | |||
30047 | 30010 | ||
30048 | $as_echo "#define BUILD_ECORE_EVAS_X11 1" >>confdefs.h | 30011 | $as_echo "#define BUILD_ECORE_EVAS_X11 1" >>confdefs.h |
30049 | 30012 | ||
30050 | requirements_ecore_evas="ecore-x >= 1.1.99 ${requirements_ecore_evas}" | 30013 | requirements_ecore_evas="ecore-x >= 1.2.0 ${requirements_ecore_evas}" |
30051 | fi | 30014 | fi |
30052 | 30015 | ||
30053 | # ecore_evas_win32 | 30016 | # ecore_evas_win32 |
@@ -30074,9 +30037,9 @@ $as_echo_n "checking whether ecore_evas Software GDI support is to be built... " | |||
30074 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 30037 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30075 | $as_echo "${want_module}" >&6; } | 30038 | $as_echo "${want_module}" >&6; } |
30076 | 30039 | ||
30077 | if test "x${have_ecore_win32}" = "xyes" -a \ | 30040 | if test "x${have_ecore_win32}" = "xyes" && \ |
30078 | "x$have_ecore_evas" = "xyes" -a \ | 30041 | test "x$have_ecore_evas" = "xyes" && \ |
30079 | "x$want_module" = "xyes" ; then | 30042 | test "x$want_module" = "xyes" ; then |
30080 | if test -n "$PKG_CONFIG" && \ | 30043 | if test -n "$PKG_CONFIG" && \ |
30081 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-gdi\""; } >&5 | 30044 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-gdi\""; } >&5 |
30082 | ($PKG_CONFIG --exists --print-errors "evas-software-gdi") 2>&5 | 30045 | ($PKG_CONFIG --exists --print-errors "evas-software-gdi") 2>&5 |
@@ -30127,9 +30090,9 @@ $as_echo_n "checking whether ecore_evas Software DirectDraw support is to be bui | |||
30127 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 30090 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30128 | $as_echo "${want_module}" >&6; } | 30091 | $as_echo "${want_module}" >&6; } |
30129 | 30092 | ||
30130 | if test "x${have_ecore_win32}" = "xyes" -a \ | 30093 | if test "x${have_ecore_win32}" = "xyes" && \ |
30131 | "x$have_ecore_evas" = "xyes" -a \ | 30094 | test "x$have_ecore_evas" = "xyes" && \ |
30132 | "x$want_module" = "xyes" ; then | 30095 | test "x$want_module" = "xyes" ; then |
30133 | if test -n "$PKG_CONFIG" && \ | 30096 | if test -n "$PKG_CONFIG" && \ |
30134 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-ddraw\""; } >&5 | 30097 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-ddraw\""; } >&5 |
30135 | ($PKG_CONFIG --exists --print-errors "evas-software-ddraw") 2>&5 | 30098 | ($PKG_CONFIG --exists --print-errors "evas-software-ddraw") 2>&5 |
@@ -30180,9 +30143,9 @@ $as_echo_n "checking whether ecore_evas Direct3d support is to be built... " >&6 | |||
30180 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 30143 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30181 | $as_echo "${want_module}" >&6; } | 30144 | $as_echo "${want_module}" >&6; } |
30182 | 30145 | ||
30183 | if test "x${have_ecore_win32}" = "xyes" -a \ | 30146 | if test "x${have_ecore_win32}" = "xyes" && \ |
30184 | "x$have_ecore_evas" = "xyes" -a \ | 30147 | test "x$have_ecore_evas" = "xyes" && \ |
30185 | "x$want_module" = "xyes" ; then | 30148 | test "x$want_module" = "xyes" ; then |
30186 | if test -n "$PKG_CONFIG" && \ | 30149 | if test -n "$PKG_CONFIG" && \ |
30187 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-direct3d\""; } >&5 | 30150 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-direct3d\""; } >&5 |
30188 | ($PKG_CONFIG --exists --print-errors "evas-direct3d") 2>&5 | 30151 | ($PKG_CONFIG --exists --print-errors "evas-direct3d") 2>&5 |
@@ -30233,9 +30196,9 @@ $as_echo_n "checking whether ecore_evas Glew OpenGL support is to be built... " | |||
30233 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 30196 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30234 | $as_echo "${want_module}" >&6; } | 30197 | $as_echo "${want_module}" >&6; } |
30235 | 30198 | ||
30236 | if test "x${have_ecore_win32}" = "xyes" -a \ | 30199 | if test "x${have_ecore_win32}" = "xyes" && \ |
30237 | "x$have_ecore_evas" = "xyes" -a \ | 30200 | test "x$have_ecore_evas" = "xyes" && \ |
30238 | "x$want_module" = "xyes" ; then | 30201 | test "x$want_module" = "xyes" ; then |
30239 | if test -n "$PKG_CONFIG" && \ | 30202 | if test -n "$PKG_CONFIG" && \ |
30240 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-opengl-glew\""; } >&5 | 30203 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-opengl-glew\""; } >&5 |
30241 | ($PKG_CONFIG --exists --print-errors "evas-opengl-glew") 2>&5 | 30204 | ($PKG_CONFIG --exists --print-errors "evas-opengl-glew") 2>&5 |
@@ -30286,9 +30249,9 @@ $as_echo_n "checking whether ecore_evas 16 bpp Software DirectDraw support is to | |||
30286 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 30249 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30287 | $as_echo "${want_module}" >&6; } | 30250 | $as_echo "${want_module}" >&6; } |
30288 | 30251 | ||
30289 | if test "x${have_ecore_win32}" = "xyes" -a \ | 30252 | if test "x${have_ecore_win32}" = "xyes" && \ |
30290 | "x$have_ecore_evas" = "xyes" -a \ | 30253 | test "x$have_ecore_evas" = "xyes" && \ |
30291 | "x$want_module" = "xyes" ; then | 30254 | test "x$want_module" = "xyes" ; then |
30292 | if test -n "$PKG_CONFIG" && \ | 30255 | if test -n "$PKG_CONFIG" && \ |
30293 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-16-ddraw\""; } >&5 | 30256 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-16-ddraw\""; } >&5 |
30294 | ($PKG_CONFIG --exists --print-errors "evas-software-16-ddraw") 2>&5 | 30257 | ($PKG_CONFIG --exists --print-errors "evas-software-16-ddraw") 2>&5 |
@@ -30325,64 +30288,21 @@ if test "x${have_ecore_evas_software_gdi}" = "xyes" -o \ | |||
30325 | 30288 | ||
30326 | $as_echo "#define BUILD_ECORE_EVAS_WIN32 1" >>confdefs.h | 30289 | $as_echo "#define BUILD_ECORE_EVAS_WIN32 1" >>confdefs.h |
30327 | 30290 | ||
30328 | requirements_ecore_evas="ecore-win32 >= 1.1.99 ${requirements_ecore_evas}" | 30291 | requirements_ecore_evas="ecore-win32 >= 1.2.0 ${requirements_ecore_evas}" |
30329 | fi | 30292 | fi |
30330 | 30293 | ||
30331 | # ecore_evas_software_sdl | 30294 | # ecore_evas_software_sdl |
30332 | 30295 | ||
30333 | |||
30334 | |||
30335 | have_ecore_evas_software_sdl="no" | 30296 | have_ecore_evas_software_sdl="no" |
30336 | want_module="${want_ecore_evas_software_sdl}" | 30297 | if test "x${have_ecore_sdl}" = "xyes"; then |
30337 | 30298 | requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}" | |
30338 | # Check whether --enable-ecore-evas-software-sdl was given. | 30299 | have_ecore_evas_software_sdl="yes" |
30339 | if test "${enable_ecore_evas_software_sdl+set}" = set; then : | ||
30340 | enableval=$enable_ecore_evas_software_sdl; | ||
30341 | if test "x${enableval}" = "xyes" ; then | ||
30342 | want_module="yes" | ||
30343 | else | ||
30344 | want_module="no" | ||
30345 | fi | ||
30346 | |||
30347 | fi | ||
30348 | |||
30349 | |||
30350 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ecore_evas Software SDL support is to be built" >&5 | ||
30351 | $as_echo_n "checking whether ecore_evas Software SDL support is to be built... " >&6; } | ||
30352 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | ||
30353 | $as_echo "${want_module}" >&6; } | ||
30354 | |||
30355 | if test "x${have_ecore_sdl}" = "xyes" -a \ | ||
30356 | "x$have_ecore_evas" = "xyes" -a \ | ||
30357 | "x$want_module" = "xyes" ; then | ||
30358 | if test -n "$PKG_CONFIG" && \ | ||
30359 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-sdl\""; } >&5 | ||
30360 | ($PKG_CONFIG --exists --print-errors "evas-software-sdl") 2>&5 | ||
30361 | ac_status=$? | ||
30362 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
30363 | test $ac_status = 0; }; then | ||
30364 | |||
30365 | 30300 | ||
30366 | $as_echo "#define BUILD_ECORE_EVAS_SOFTWARE_SDL 1" >>confdefs.h | 30301 | $as_echo "#define BUILD_ECORE_EVAS_SOFTWARE_SDL 1" >>confdefs.h |
30367 | 30302 | ||
30368 | have_ecore_evas_software_sdl="yes" | 30303 | requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}" |
30369 | |||
30370 | fi | ||
30371 | fi | ||
30372 | |||
30373 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ecore_evas Software SDL support is built" >&5 | ||
30374 | $as_echo_n "checking whether ecore_evas Software SDL support is built... " >&6; } | ||
30375 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_ecore_evas_software_sdl" >&5 | ||
30376 | $as_echo "$have_ecore_evas_software_sdl" >&6; } | ||
30377 | |||
30378 | if test "x$have_ecore_evas_software_sdl" = "xyes"; then : | ||
30379 | requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}" | ||
30380 | fi | 30304 | fi |
30381 | 30305 | ||
30382 | |||
30383 | |||
30384 | |||
30385 | |||
30386 | # ecore_evas_gl_sdl | 30306 | # ecore_evas_gl_sdl |
30387 | 30307 | ||
30388 | 30308 | ||
@@ -30407,9 +30327,9 @@ $as_echo_n "checking whether ecore_evas OpenGL SDL support is to be built... " > | |||
30407 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 30327 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30408 | $as_echo "${want_module}" >&6; } | 30328 | $as_echo "${want_module}" >&6; } |
30409 | 30329 | ||
30410 | if test "x${have_ecore_sdl}" = "xyes" -a \ | 30330 | if test "x${have_ecore_sdl}" = "xyes" && \ |
30411 | "x$have_ecore_evas" = "xyes" -a \ | 30331 | test "x$have_ecore_evas" = "xyes" && \ |
30412 | "x$want_module" = "xyes" ; then | 30332 | test "x$want_module" = "xyes" ; then |
30413 | if test -n "$PKG_CONFIG" && \ | 30333 | if test -n "$PKG_CONFIG" && \ |
30414 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-opengl-sdl\""; } >&5 | 30334 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-opengl-sdl\""; } >&5 |
30415 | ($PKG_CONFIG --exists --print-errors "evas-opengl-sdl") 2>&5 | 30335 | ($PKG_CONFIG --exists --print-errors "evas-opengl-sdl") 2>&5 |
@@ -30431,7 +30351,7 @@ $as_echo_n "checking whether ecore_evas OpenGL SDL support is built... " >&6; } | |||
30431 | $as_echo "$have_ecore_evas_opengl_sdl" >&6; } | 30351 | $as_echo "$have_ecore_evas_opengl_sdl" >&6; } |
30432 | 30352 | ||
30433 | if test "x$have_ecore_evas_opengl_sdl" = "xyes"; then : | 30353 | if test "x$have_ecore_evas_opengl_sdl" = "xyes"; then : |
30434 | requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}" | 30354 | requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}" |
30435 | fi | 30355 | fi |
30436 | 30356 | ||
30437 | 30357 | ||
@@ -30462,9 +30382,9 @@ $as_echo_n "checking whether ecore_evas OpenGL Cocoa support is to be built... " | |||
30462 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 30382 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30463 | $as_echo "${want_module}" >&6; } | 30383 | $as_echo "${want_module}" >&6; } |
30464 | 30384 | ||
30465 | if test "x${have_ecore_cocoa}" = "xyes" -a \ | 30385 | if test "x${have_ecore_cocoa}" = "xyes" && \ |
30466 | "x$have_ecore_evas" = "xyes" -a \ | 30386 | test "x$have_ecore_evas" = "xyes" && \ |
30467 | "x$want_module" = "xyes" ; then | 30387 | test "x$want_module" = "xyes" ; then |
30468 | if test -n "$PKG_CONFIG" && \ | 30388 | if test -n "$PKG_CONFIG" && \ |
30469 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-opengl-cocoa\""; } >&5 | 30389 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-opengl-cocoa\""; } >&5 |
30470 | ($PKG_CONFIG --exists --print-errors "evas-opengl-cocoa") 2>&5 | 30390 | ($PKG_CONFIG --exists --print-errors "evas-opengl-cocoa") 2>&5 |
@@ -30486,7 +30406,7 @@ $as_echo_n "checking whether ecore_evas OpenGL Cocoa support is built... " >&6; | |||
30486 | $as_echo "$have_ecore_evas_opengl_cocoa" >&6; } | 30406 | $as_echo "$have_ecore_evas_opengl_cocoa" >&6; } |
30487 | 30407 | ||
30488 | if test "x$have_ecore_evas_opengl_cocoa" = "xyes"; then : | 30408 | if test "x$have_ecore_evas_opengl_cocoa" = "xyes"; then : |
30489 | requirements_ecore_evas="ecore-cocoa >= 1.1.99 ${requirements_ecore_evas}" | 30409 | requirements_ecore_evas="ecore-cocoa >= 1.2.0 ${requirements_ecore_evas}" |
30490 | fi | 30410 | fi |
30491 | 30411 | ||
30492 | 30412 | ||
@@ -30517,9 +30437,9 @@ $as_echo_n "checking whether ecore_evas DirectFB support is to be built... " >&6 | |||
30517 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 30437 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30518 | $as_echo "${want_module}" >&6; } | 30438 | $as_echo "${want_module}" >&6; } |
30519 | 30439 | ||
30520 | if test "x${have_ecore_directfb}" = "xyes" -a \ | 30440 | if test "x${have_ecore_directfb}" = "xyes" && \ |
30521 | "x$have_ecore_evas" = "xyes" -a \ | 30441 | test "x$have_ecore_evas" = "xyes" && \ |
30522 | "x$want_module" = "xyes" ; then | 30442 | test "x$want_module" = "xyes" ; then |
30523 | if test -n "$PKG_CONFIG" && \ | 30443 | if test -n "$PKG_CONFIG" && \ |
30524 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-directfb\""; } >&5 | 30444 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-directfb\""; } >&5 |
30525 | ($PKG_CONFIG --exists --print-errors "evas-directfb") 2>&5 | 30445 | ($PKG_CONFIG --exists --print-errors "evas-directfb") 2>&5 |
@@ -30541,7 +30461,7 @@ $as_echo_n "checking whether ecore_evas DirectFB support is built... " >&6; } | |||
30541 | $as_echo "$have_ecore_evas_directfb" >&6; } | 30461 | $as_echo "$have_ecore_evas_directfb" >&6; } |
30542 | 30462 | ||
30543 | if test "x$have_ecore_evas_directfb" = "xyes"; then : | 30463 | if test "x$have_ecore_evas_directfb" = "xyes"; then : |
30544 | requirements_ecore_evas="ecore-directfb >= 1.1.99 ${requirements_ecore_evas}" | 30464 | requirements_ecore_evas="ecore-directfb >= 1.2.0 ${requirements_ecore_evas}" |
30545 | fi | 30465 | fi |
30546 | 30466 | ||
30547 | 30467 | ||
@@ -30572,9 +30492,9 @@ $as_echo_n "checking whether ecore_evas Linux Framebuffer support is to be built | |||
30572 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 30492 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30573 | $as_echo "${want_module}" >&6; } | 30493 | $as_echo "${want_module}" >&6; } |
30574 | 30494 | ||
30575 | if test "x${have_ecore_fb}" = "xyes" -a \ | 30495 | if test "x${have_ecore_fb}" = "xyes" && \ |
30576 | "x$have_ecore_evas" = "xyes" -a \ | 30496 | test "x$have_ecore_evas" = "xyes" && \ |
30577 | "x$want_module" = "xyes" ; then | 30497 | test "x$want_module" = "xyes" ; then |
30578 | if test -n "$PKG_CONFIG" && \ | 30498 | if test -n "$PKG_CONFIG" && \ |
30579 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-fb\""; } >&5 | 30499 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-fb\""; } >&5 |
30580 | ($PKG_CONFIG --exists --print-errors "evas-fb") 2>&5 | 30500 | ($PKG_CONFIG --exists --print-errors "evas-fb") 2>&5 |
@@ -30596,7 +30516,7 @@ $as_echo_n "checking whether ecore_evas Linux Framebuffer support is built... " | |||
30596 | $as_echo "$have_ecore_evas_fb" >&6; } | 30516 | $as_echo "$have_ecore_evas_fb" >&6; } |
30597 | 30517 | ||
30598 | if test "x$have_ecore_evas_fb" = "xyes"; then : | 30518 | if test "x$have_ecore_evas_fb" = "xyes"; then : |
30599 | requirements_ecore_evas="ecore-fb >= 1.1.99 ${requirements_ecore_evas}" | 30519 | requirements_ecore_evas="ecore-fb >= 1.2.0 ${requirements_ecore_evas}" |
30600 | fi | 30520 | fi |
30601 | 30521 | ||
30602 | 30522 | ||
@@ -30627,9 +30547,9 @@ $as_echo_n "checking whether ecore_evas 16 bpp Software Windows CE support is to | |||
30627 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 30547 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30628 | $as_echo "${want_module}" >&6; } | 30548 | $as_echo "${want_module}" >&6; } |
30629 | 30549 | ||
30630 | if test "x${have_ecore_wince}" = "xyes" -a \ | 30550 | if test "x${have_ecore_wince}" = "xyes" && \ |
30631 | "x$have_ecore_evas" = "xyes" -a \ | 30551 | test "x$have_ecore_evas" = "xyes" && \ |
30632 | "x$want_module" = "xyes" ; then | 30552 | test "x$want_module" = "xyes" ; then |
30633 | if test -n "$PKG_CONFIG" && \ | 30553 | if test -n "$PKG_CONFIG" && \ |
30634 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-16-wince\""; } >&5 | 30554 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-16-wince\""; } >&5 |
30635 | ($PKG_CONFIG --exists --print-errors "evas-software-16-wince") 2>&5 | 30555 | ($PKG_CONFIG --exists --print-errors "evas-software-16-wince") 2>&5 |
@@ -30651,7 +30571,7 @@ $as_echo_n "checking whether ecore_evas 16 bpp Software Windows CE support is bu | |||
30651 | $as_echo "$have_ecore_evas_software_16_wince" >&6; } | 30571 | $as_echo "$have_ecore_evas_software_16_wince" >&6; } |
30652 | 30572 | ||
30653 | if test "x$have_ecore_evas_software_16_wince" = "xyes"; then : | 30573 | if test "x$have_ecore_evas_software_16_wince" = "xyes"; then : |
30654 | requirements_ecore_evas="ecore-wince >= 1.1.99 ${requirements_ecore_evas}" | 30574 | requirements_ecore_evas="ecore-wince >= 1.2.0 ${requirements_ecore_evas}" |
30655 | fi | 30575 | fi |
30656 | 30576 | ||
30657 | 30577 | ||
@@ -30682,9 +30602,9 @@ $as_echo_n "checking whether ecore_evas Ecore Evas Single Process Windowing Syst | |||
30682 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 30602 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30683 | $as_echo "${want_module}" >&6; } | 30603 | $as_echo "${want_module}" >&6; } |
30684 | 30604 | ||
30685 | if test "xyes" = "xyes" -a \ | 30605 | if test "xyes" = "xyes" && \ |
30686 | "x$have_ecore_evas" = "xyes" -a \ | 30606 | test "x$have_ecore_evas" = "xyes" && \ |
30687 | "x$want_module" = "xyes" ; then | 30607 | test "x$want_module" = "xyes" ; then |
30688 | if test -n "$PKG_CONFIG" && \ | 30608 | if test -n "$PKG_CONFIG" && \ |
30689 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-buffer\""; } >&5 | 30609 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-software-buffer\""; } >&5 |
30690 | ($PKG_CONFIG --exists --print-errors "evas-software-buffer") 2>&5 | 30610 | ($PKG_CONFIG --exists --print-errors "evas-software-buffer") 2>&5 |
@@ -30713,6 +30633,25 @@ fi | |||
30713 | 30633 | ||
30714 | 30634 | ||
30715 | 30635 | ||
30636 | # ecore_evas_extn | ||
30637 | |||
30638 | have_extn="yes" | ||
30639 | if test "x${have_ecore_ipc}" = "xno" || \ | ||
30640 | test "x${have_ecore_evas_software_buffer}" = "xno" || \ | ||
30641 | test "x${have_shm_open}" = "xno" ; then | ||
30642 | have_extn="no" | ||
30643 | fi | ||
30644 | |||
30645 | have_ecore_evas_extn="no" | ||
30646 | if test "x${want_ecore_evas_extn}" = "xyes" && \ | ||
30647 | test "x${have_extn}" = "xyes" && \ | ||
30648 | test "x${have_ecore_evas}" = "xyes"; then | ||
30649 | |||
30650 | $as_echo "#define BUILD_ECORE_EVAS_EXTN 1" >>confdefs.h | ||
30651 | |||
30652 | have_ecore_evas_extn="yes" | ||
30653 | fi | ||
30654 | |||
30716 | # ecore_evas_psl1ght | 30655 | # ecore_evas_psl1ght |
30717 | 30656 | ||
30718 | 30657 | ||
@@ -30737,9 +30676,9 @@ $as_echo_n "checking whether ecore_evas PSL1GHT support is to be built... " >&6; | |||
30737 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 30676 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30738 | $as_echo "${want_module}" >&6; } | 30677 | $as_echo "${want_module}" >&6; } |
30739 | 30678 | ||
30740 | if test "x${have_ecore_psl1ght}" = "xyes" -a \ | 30679 | if test "x${have_ecore_psl1ght}" = "xyes" && \ |
30741 | "x$have_ecore_evas" = "xyes" -a \ | 30680 | test "x$have_ecore_evas" = "xyes" && \ |
30742 | "x$want_module" = "xyes" ; then | 30681 | test "x$want_module" = "xyes" ; then |
30743 | if test -n "$PKG_CONFIG" && \ | 30682 | if test -n "$PKG_CONFIG" && \ |
30744 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-psl1ght\""; } >&5 | 30683 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-psl1ght\""; } >&5 |
30745 | ($PKG_CONFIG --exists --print-errors "evas-psl1ght") 2>&5 | 30684 | ($PKG_CONFIG --exists --print-errors "evas-psl1ght") 2>&5 |
@@ -30761,7 +30700,7 @@ $as_echo_n "checking whether ecore_evas PSL1GHT support is built... " >&6; } | |||
30761 | $as_echo "$have_ecore_evas_psl1ght" >&6; } | 30700 | $as_echo "$have_ecore_evas_psl1ght" >&6; } |
30762 | 30701 | ||
30763 | if test "x$have_ecore_evas_psl1ght" = "xyes"; then : | 30702 | if test "x$have_ecore_evas_psl1ght" = "xyes"; then : |
30764 | requirements_ecore_evas="ecore-psl1ght >= 1.1.99 ${requirements_ecore_evas}" | 30703 | requirements_ecore_evas="ecore-psl1ght >= 1.2.0 ${requirements_ecore_evas}" |
30765 | fi | 30704 | fi |
30766 | 30705 | ||
30767 | 30706 | ||
@@ -30778,46 +30717,44 @@ pkg_failed=no | |||
30778 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAYLAND" >&5 | 30717 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAYLAND" >&5 |
30779 | $as_echo_n "checking for WAYLAND... " >&6; } | 30718 | $as_echo_n "checking for WAYLAND... " >&6; } |
30780 | 30719 | ||
30781 | if test -n "$PKG_CONFIG"; then | 30720 | if test -n "$WAYLAND_CFLAGS"; then |
30782 | if test -n "$WAYLAND_CFLAGS"; then | 30721 | pkg_cv_WAYLAND_CFLAGS="$WAYLAND_CFLAGS" |
30783 | pkg_cv_WAYLAND_CFLAGS="$WAYLAND_CFLAGS" | 30722 | elif test -n "$PKG_CONFIG"; then |
30784 | else | 30723 | if test -n "$PKG_CONFIG" && \ |
30785 | if test -n "$PKG_CONFIG" && \ | 30724 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl wayland-egl wayland-client xkbcommon\""; } >&5 |
30786 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-client xkbcommon\""; } >&5 | 30725 | ($PKG_CONFIG --exists --print-errors "egl wayland-egl wayland-client xkbcommon") 2>&5 |
30787 | ($PKG_CONFIG --exists --print-errors "wayland-client xkbcommon") 2>&5 | ||
30788 | ac_status=$? | 30726 | ac_status=$? |
30789 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 30727 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
30790 | test $ac_status = 0; }; then | 30728 | test $ac_status = 0; }; then |
30791 | pkg_cv_WAYLAND_CFLAGS=`$PKG_CONFIG --cflags "wayland-client xkbcommon" 2>/dev/null` | 30729 | pkg_cv_WAYLAND_CFLAGS=`$PKG_CONFIG --cflags "egl wayland-egl wayland-client xkbcommon" 2>/dev/null` |
30792 | else | 30730 | else |
30793 | pkg_failed=yes | 30731 | pkg_failed=yes |
30794 | fi | 30732 | fi |
30795 | fi | 30733 | else |
30796 | else | 30734 | pkg_failed=untried |
30797 | pkg_failed=untried | ||
30798 | fi | 30735 | fi |
30799 | if test -n "$PKG_CONFIG"; then | 30736 | if test -n "$WAYLAND_LIBS"; then |
30800 | if test -n "$WAYLAND_LIBS"; then | 30737 | pkg_cv_WAYLAND_LIBS="$WAYLAND_LIBS" |
30801 | pkg_cv_WAYLAND_LIBS="$WAYLAND_LIBS" | 30738 | elif test -n "$PKG_CONFIG"; then |
30802 | else | 30739 | if test -n "$PKG_CONFIG" && \ |
30803 | if test -n "$PKG_CONFIG" && \ | 30740 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"egl wayland-egl wayland-client xkbcommon\""; } >&5 |
30804 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-client xkbcommon\""; } >&5 | 30741 | ($PKG_CONFIG --exists --print-errors "egl wayland-egl wayland-client xkbcommon") 2>&5 |
30805 | ($PKG_CONFIG --exists --print-errors "wayland-client xkbcommon") 2>&5 | ||
30806 | ac_status=$? | 30742 | ac_status=$? |
30807 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 30743 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
30808 | test $ac_status = 0; }; then | 30744 | test $ac_status = 0; }; then |
30809 | pkg_cv_WAYLAND_LIBS=`$PKG_CONFIG --libs "wayland-client xkbcommon" 2>/dev/null` | 30745 | pkg_cv_WAYLAND_LIBS=`$PKG_CONFIG --libs "egl wayland-egl wayland-client xkbcommon" 2>/dev/null` |
30810 | else | 30746 | else |
30811 | pkg_failed=yes | 30747 | pkg_failed=yes |
30812 | fi | 30748 | fi |
30813 | fi | 30749 | else |
30814 | else | 30750 | pkg_failed=untried |
30815 | pkg_failed=untried | ||
30816 | fi | 30751 | fi |
30817 | 30752 | ||
30818 | 30753 | ||
30819 | 30754 | ||
30820 | if test $pkg_failed = yes; then | 30755 | if test $pkg_failed = yes; then |
30756 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
30757 | $as_echo "no" >&6; } | ||
30821 | 30758 | ||
30822 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 30759 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
30823 | _pkg_short_errors_supported=yes | 30760 | _pkg_short_errors_supported=yes |
@@ -30825,17 +30762,17 @@ else | |||
30825 | _pkg_short_errors_supported=no | 30762 | _pkg_short_errors_supported=no |
30826 | fi | 30763 | fi |
30827 | if test $_pkg_short_errors_supported = yes; then | 30764 | if test $_pkg_short_errors_supported = yes; then |
30828 | WAYLAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "wayland-client xkbcommon"` | 30765 | WAYLAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "egl wayland-egl wayland-client xkbcommon" 2>&1` |
30829 | else | 30766 | else |
30830 | WAYLAND_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "wayland-client xkbcommon"` | 30767 | WAYLAND_PKG_ERRORS=`$PKG_CONFIG --print-errors "egl wayland-egl wayland-client xkbcommon" 2>&1` |
30831 | fi | 30768 | fi |
30832 | # Put the nasty error message in config.log where it belongs | 30769 | # Put the nasty error message in config.log where it belongs |
30833 | echo "$WAYLAND_PKG_ERRORS" >&5 | 30770 | echo "$WAYLAND_PKG_ERRORS" >&5 |
30834 | 30771 | ||
30835 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 30772 | have_wayland="no" |
30836 | $as_echo "no" >&6; } | ||
30837 | have_wayland="no" | ||
30838 | elif test $pkg_failed = untried; then | 30773 | elif test $pkg_failed = untried; then |
30774 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
30775 | $as_echo "no" >&6; } | ||
30839 | have_wayland="no" | 30776 | have_wayland="no" |
30840 | else | 30777 | else |
30841 | WAYLAND_CFLAGS=$pkg_cv_WAYLAND_CFLAGS | 30778 | WAYLAND_CFLAGS=$pkg_cv_WAYLAND_CFLAGS |
@@ -30909,7 +30846,7 @@ fi | |||
30909 | 30846 | ||
30910 | 30847 | ||
30911 | if test "x${have_ecore_wayland}" = "xyes" ; then | 30848 | if test "x${have_ecore_wayland}" = "xyes" ; then |
30912 | requirements_ecore_wayland="ecore-input >= 1.1.0 wayland-client xkbcommon ${requirements_ecore_wayland}" | 30849 | requirements_ecore_wayland="ecore-input >= 1.2.0 egl wayland-egl wayland-client xkbcommon ${requirements_ecore_wayland}" |
30913 | fi | 30850 | fi |
30914 | 30851 | ||
30915 | 30852 | ||
@@ -30934,9 +30871,9 @@ $as_echo_n "checking whether ecore_evas Wayland Shm support is to be built... " | |||
30934 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 30871 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30935 | $as_echo "${want_module}" >&6; } | 30872 | $as_echo "${want_module}" >&6; } |
30936 | 30873 | ||
30937 | if test "x${have_ecore_wayland}" = "xyes" -a \ | 30874 | if test "x${have_ecore_wayland}" = "xyes" && \ |
30938 | "x$have_ecore_evas" = "xyes" -a \ | 30875 | test "x$have_ecore_evas" = "xyes" && \ |
30939 | "x$want_module" = "xyes" ; then | 30876 | test "x$want_module" = "xyes" ; then |
30940 | if test -n "$PKG_CONFIG" && \ | 30877 | if test -n "$PKG_CONFIG" && \ |
30941 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-wayland-shm\""; } >&5 | 30878 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-wayland-shm\""; } >&5 |
30942 | ($PKG_CONFIG --exists --print-errors "evas-wayland-shm") 2>&5 | 30879 | ($PKG_CONFIG --exists --print-errors "evas-wayland-shm") 2>&5 |
@@ -30987,12 +30924,12 @@ $as_echo_n "checking whether ecore_evas Wayland Egl support is to be built... " | |||
30987 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 | 30924 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${want_module}" >&5 |
30988 | $as_echo "${want_module}" >&6; } | 30925 | $as_echo "${want_module}" >&6; } |
30989 | 30926 | ||
30990 | if test "x${have_ecore_wayland}" = "xyes" -a \ | 30927 | if test "x${have_ecore_wayland}" = "xyes" && \ |
30991 | "x$have_ecore_evas" = "xyes" -a \ | 30928 | test "x$have_ecore_evas" = "xyes" && \ |
30992 | "x$want_module" = "xyes" ; then | 30929 | test "x$want_module" = "xyes" ; then |
30993 | if test -n "$PKG_CONFIG" && \ | 30930 | if test -n "$PKG_CONFIG" && \ |
30994 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-wayland-egl\""; } >&5 | 30931 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evas-wayland-egl egl\""; } >&5 |
30995 | ($PKG_CONFIG --exists --print-errors "evas-wayland-egl") 2>&5 | 30932 | ($PKG_CONFIG --exists --print-errors "evas-wayland-egl egl") 2>&5 |
30996 | ac_status=$? | 30933 | ac_status=$? |
30997 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 30934 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
30998 | test $ac_status = 0; }; then | 30935 | test $ac_status = 0; }; then |
@@ -31017,11 +30954,10 @@ pkg_failed=no | |||
31017 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAYLAND_EGL" >&5 | 30954 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAYLAND_EGL" >&5 |
31018 | $as_echo_n "checking for WAYLAND_EGL... " >&6; } | 30955 | $as_echo_n "checking for WAYLAND_EGL... " >&6; } |
31019 | 30956 | ||
31020 | if test -n "$PKG_CONFIG"; then | 30957 | if test -n "$WAYLAND_EGL_CFLAGS"; then |
31021 | if test -n "$WAYLAND_EGL_CFLAGS"; then | 30958 | pkg_cv_WAYLAND_EGL_CFLAGS="$WAYLAND_EGL_CFLAGS" |
31022 | pkg_cv_WAYLAND_EGL_CFLAGS="$WAYLAND_EGL_CFLAGS" | 30959 | elif test -n "$PKG_CONFIG"; then |
31023 | else | 30960 | if test -n "$PKG_CONFIG" && \ |
31024 | if test -n "$PKG_CONFIG" && \ | ||
31025 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5 | 30961 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5 |
31026 | ($PKG_CONFIG --exists --print-errors "wayland-egl") 2>&5 | 30962 | ($PKG_CONFIG --exists --print-errors "wayland-egl") 2>&5 |
31027 | ac_status=$? | 30963 | ac_status=$? |
@@ -31031,15 +30967,13 @@ if test -n "$PKG_CONFIG"; then | |||
31031 | else | 30967 | else |
31032 | pkg_failed=yes | 30968 | pkg_failed=yes |
31033 | fi | 30969 | fi |
31034 | fi | 30970 | else |
31035 | else | 30971 | pkg_failed=untried |
31036 | pkg_failed=untried | ||
31037 | fi | 30972 | fi |
31038 | if test -n "$PKG_CONFIG"; then | 30973 | if test -n "$WAYLAND_EGL_LIBS"; then |
31039 | if test -n "$WAYLAND_EGL_LIBS"; then | 30974 | pkg_cv_WAYLAND_EGL_LIBS="$WAYLAND_EGL_LIBS" |
31040 | pkg_cv_WAYLAND_EGL_LIBS="$WAYLAND_EGL_LIBS" | 30975 | elif test -n "$PKG_CONFIG"; then |
31041 | else | 30976 | if test -n "$PKG_CONFIG" && \ |
31042 | if test -n "$PKG_CONFIG" && \ | ||
31043 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5 | 30977 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-egl\""; } >&5 |
31044 | ($PKG_CONFIG --exists --print-errors "wayland-egl") 2>&5 | 30978 | ($PKG_CONFIG --exists --print-errors "wayland-egl") 2>&5 |
31045 | ac_status=$? | 30979 | ac_status=$? |
@@ -31049,14 +30983,15 @@ if test -n "$PKG_CONFIG"; then | |||
31049 | else | 30983 | else |
31050 | pkg_failed=yes | 30984 | pkg_failed=yes |
31051 | fi | 30985 | fi |
31052 | fi | 30986 | else |
31053 | else | 30987 | pkg_failed=untried |
31054 | pkg_failed=untried | ||
31055 | fi | 30988 | fi |
31056 | 30989 | ||
31057 | 30990 | ||
31058 | 30991 | ||
31059 | if test $pkg_failed = yes; then | 30992 | if test $pkg_failed = yes; then |
30993 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
30994 | $as_echo "no" >&6; } | ||
31060 | 30995 | ||
31061 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 30996 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
31062 | _pkg_short_errors_supported=yes | 30997 | _pkg_short_errors_supported=yes |
@@ -31064,17 +30999,17 @@ else | |||
31064 | _pkg_short_errors_supported=no | 30999 | _pkg_short_errors_supported=no |
31065 | fi | 31000 | fi |
31066 | if test $_pkg_short_errors_supported = yes; then | 31001 | if test $_pkg_short_errors_supported = yes; then |
31067 | WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "wayland-egl"` | 31002 | WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "wayland-egl" 2>&1` |
31068 | else | 31003 | else |
31069 | WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "wayland-egl"` | 31004 | WAYLAND_EGL_PKG_ERRORS=`$PKG_CONFIG --print-errors "wayland-egl" 2>&1` |
31070 | fi | 31005 | fi |
31071 | # Put the nasty error message in config.log where it belongs | 31006 | # Put the nasty error message in config.log where it belongs |
31072 | echo "$WAYLAND_EGL_PKG_ERRORS" >&5 | 31007 | echo "$WAYLAND_EGL_PKG_ERRORS" >&5 |
31073 | 31008 | ||
31074 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 31009 | have_wayland_egl="no" |
31075 | $as_echo "no" >&6; } | ||
31076 | have_wayland_egl="no" | ||
31077 | elif test $pkg_failed = untried; then | 31010 | elif test $pkg_failed = untried; then |
31011 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
31012 | $as_echo "no" >&6; } | ||
31078 | have_wayland_egl="no" | 31013 | have_wayland_egl="no" |
31079 | else | 31014 | else |
31080 | WAYLAND_EGL_CFLAGS=$pkg_cv_WAYLAND_EGL_CFLAGS | 31015 | WAYLAND_EGL_CFLAGS=$pkg_cv_WAYLAND_EGL_CFLAGS |
@@ -31093,6 +31028,120 @@ fi | |||
31093 | 31028 | ||
31094 | 31029 | ||
31095 | 31030 | ||
31031 | ### Unit tests | ||
31032 | |||
31033 | |||
31034 | |||
31035 | |||
31036 | # Check whether --enable-tests was given. | ||
31037 | if test "${enable_tests+set}" = set; then : | ||
31038 | enableval=$enable_tests; | ||
31039 | if test "x${enableval}" = "xyes" ; then | ||
31040 | _efl_enable_tests="yes" | ||
31041 | else | ||
31042 | _efl_enable_tests="no" | ||
31043 | fi | ||
31044 | |||
31045 | else | ||
31046 | _efl_enable_tests="no" | ||
31047 | fi | ||
31048 | |||
31049 | |||
31050 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tests are built" >&5 | ||
31051 | $as_echo_n "checking whether tests are built... " >&6; } | ||
31052 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_efl_enable_tests}" >&5 | ||
31053 | $as_echo "${_efl_enable_tests}" >&6; } | ||
31054 | |||
31055 | |||
31056 | |||
31057 | if test "x${_efl_enable_tests}" = "xyes" ; then | ||
31058 | |||
31059 | pkg_failed=no | ||
31060 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHECK" >&5 | ||
31061 | $as_echo_n "checking for CHECK... " >&6; } | ||
31062 | |||
31063 | if test -n "$CHECK_CFLAGS"; then | ||
31064 | pkg_cv_CHECK_CFLAGS="$CHECK_CFLAGS" | ||
31065 | elif test -n "$PKG_CONFIG"; then | ||
31066 | if test -n "$PKG_CONFIG" && \ | ||
31067 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5 | ||
31068 | ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5 | ||
31069 | ac_status=$? | ||
31070 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
31071 | test $ac_status = 0; }; then | ||
31072 | pkg_cv_CHECK_CFLAGS=`$PKG_CONFIG --cflags "check >= 0.9.5" 2>/dev/null` | ||
31073 | else | ||
31074 | pkg_failed=yes | ||
31075 | fi | ||
31076 | else | ||
31077 | pkg_failed=untried | ||
31078 | fi | ||
31079 | if test -n "$CHECK_LIBS"; then | ||
31080 | pkg_cv_CHECK_LIBS="$CHECK_LIBS" | ||
31081 | elif test -n "$PKG_CONFIG"; then | ||
31082 | if test -n "$PKG_CONFIG" && \ | ||
31083 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"check >= 0.9.5\""; } >&5 | ||
31084 | ($PKG_CONFIG --exists --print-errors "check >= 0.9.5") 2>&5 | ||
31085 | ac_status=$? | ||
31086 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
31087 | test $ac_status = 0; }; then | ||
31088 | pkg_cv_CHECK_LIBS=`$PKG_CONFIG --libs "check >= 0.9.5" 2>/dev/null` | ||
31089 | else | ||
31090 | pkg_failed=yes | ||
31091 | fi | ||
31092 | else | ||
31093 | pkg_failed=untried | ||
31094 | fi | ||
31095 | |||
31096 | |||
31097 | |||
31098 | if test $pkg_failed = yes; then | ||
31099 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
31100 | $as_echo "no" >&6; } | ||
31101 | |||
31102 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | ||
31103 | _pkg_short_errors_supported=yes | ||
31104 | else | ||
31105 | _pkg_short_errors_supported=no | ||
31106 | fi | ||
31107 | if test $_pkg_short_errors_supported = yes; then | ||
31108 | CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "check >= 0.9.5" 2>&1` | ||
31109 | else | ||
31110 | CHECK_PKG_ERRORS=`$PKG_CONFIG --print-errors "check >= 0.9.5" 2>&1` | ||
31111 | fi | ||
31112 | # Put the nasty error message in config.log where it belongs | ||
31113 | echo "$CHECK_PKG_ERRORS" >&5 | ||
31114 | |||
31115 | _efl_enable_tests="no" | ||
31116 | elif test $pkg_failed = untried; then | ||
31117 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
31118 | $as_echo "no" >&6; } | ||
31119 | _efl_enable_tests="no" | ||
31120 | else | ||
31121 | CHECK_CFLAGS=$pkg_cv_CHECK_CFLAGS | ||
31122 | CHECK_LIBS=$pkg_cv_CHECK_LIBS | ||
31123 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
31124 | $as_echo "yes" >&6; } | ||
31125 | dummy="yes" | ||
31126 | fi | ||
31127 | fi | ||
31128 | |||
31129 | if test "x${_efl_enable_tests}" = "xyes"; then | ||
31130 | EFL_ENABLE_TESTS_TRUE= | ||
31131 | EFL_ENABLE_TESTS_FALSE='#' | ||
31132 | else | ||
31133 | EFL_ENABLE_TESTS_TRUE='#' | ||
31134 | EFL_ENABLE_TESTS_FALSE= | ||
31135 | fi | ||
31136 | |||
31137 | |||
31138 | if test "x$_efl_enable_tests" = "xyes"; then : | ||
31139 | enable_tests="yes" | ||
31140 | else | ||
31141 | enable_tests="no" | ||
31142 | fi | ||
31143 | |||
31144 | |||
31096 | ### install and build examples | 31145 | ### install and build examples |
31097 | 31146 | ||
31098 | 31147 | ||
@@ -31280,6 +31329,7 @@ DEFS=-DHAVE_CONFIG_H | |||
31280 | 31329 | ||
31281 | ac_libobjs= | 31330 | ac_libobjs= |
31282 | ac_ltlibobjs= | 31331 | ac_ltlibobjs= |
31332 | U= | ||
31283 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue | 31333 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue |
31284 | # 1. Remove the extension, and $U if already installed. | 31334 | # 1. Remove the extension, and $U if already installed. |
31285 | ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' | 31335 | ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' |
@@ -31303,168 +31353,172 @@ else | |||
31303 | fi | 31353 | fi |
31304 | 31354 | ||
31305 | if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then | 31355 | if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then |
31306 | as_fn_error "conditional \"AMDEP\" was never defined. | 31356 | as_fn_error $? "conditional \"AMDEP\" was never defined. |
31307 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31357 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31308 | fi | 31358 | fi |
31309 | if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then | 31359 | if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then |
31310 | as_fn_error "conditional \"am__fastdepCC\" was never defined. | 31360 | as_fn_error $? "conditional \"am__fastdepCC\" was never defined. |
31311 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31361 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31312 | fi | 31362 | fi |
31313 | if test -z "${HAVE_PO_TRUE}" && test -z "${HAVE_PO_FALSE}"; then | 31363 | if test -z "${HAVE_PO_TRUE}" && test -z "${HAVE_PO_FALSE}"; then |
31314 | as_fn_error "conditional \"HAVE_PO\" was never defined. | 31364 | as_fn_error $? "conditional \"HAVE_PO\" was never defined. |
31315 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
31316 | fi | ||
31317 | if test -z "${EFL_ENABLE_TESTS_TRUE}" && test -z "${EFL_ENABLE_TESTS_FALSE}"; then | ||
31318 | as_fn_error "conditional \"EFL_ENABLE_TESTS\" was never defined. | ||
31319 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31365 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31320 | fi | 31366 | fi |
31321 | if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then | 31367 | if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then |
31322 | as_fn_error "conditional \"am__fastdepOBJC\" was never defined. | 31368 | as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined. |
31323 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31369 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31324 | fi | 31370 | fi |
31325 | if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then | 31371 | if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then |
31326 | as_fn_error "conditional \"am__fastdepOBJC\" was never defined. | 31372 | as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined. |
31327 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31373 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31328 | fi | 31374 | fi |
31329 | if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then | 31375 | if test -z "${am__fastdepOBJC_TRUE}" && test -z "${am__fastdepOBJC_FALSE}"; then |
31330 | as_fn_error "conditional \"am__fastdepOBJC\" was never defined. | 31376 | as_fn_error $? "conditional \"am__fastdepOBJC\" was never defined. |
31331 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31377 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31332 | fi | 31378 | fi |
31333 | if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then | 31379 | if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then |
31334 | as_fn_error "conditional \"am__fastdepCXX\" was never defined. | 31380 | as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. |
31335 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31381 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31336 | fi | 31382 | fi |
31337 | if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then | 31383 | if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then |
31338 | as_fn_error "conditional \"am__fastdepCXX\" was never defined. | 31384 | as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. |
31339 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31385 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31340 | fi | 31386 | fi |
31341 | if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then | 31387 | if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then |
31342 | as_fn_error "conditional \"am__fastdepCC\" was never defined. | 31388 | as_fn_error $? "conditional \"am__fastdepCC\" was never defined. |
31343 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31389 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31344 | fi | 31390 | fi |
31345 | if test -z "${EFL_BUILD_DOC_TRUE}" && test -z "${EFL_BUILD_DOC_FALSE}"; then | 31391 | if test -z "${EFL_BUILD_DOC_TRUE}" && test -z "${EFL_BUILD_DOC_FALSE}"; then |
31346 | as_fn_error "conditional \"EFL_BUILD_DOC\" was never defined. | 31392 | as_fn_error $? "conditional \"EFL_BUILD_DOC\" was never defined. |
31393 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
31394 | fi | ||
31395 | if test -z "${ECORE_HAVE_EXOTIC_TRUE}" && test -z "${ECORE_HAVE_EXOTIC_FALSE}"; then | ||
31396 | as_fn_error $? "conditional \"ECORE_HAVE_EXOTIC\" was never defined. | ||
31347 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31397 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31348 | fi | 31398 | fi |
31349 | if test -z "${ECORE_HAVE_WINCE_TRUE}" && test -z "${ECORE_HAVE_WINCE_FALSE}"; then | 31399 | if test -z "${ECORE_HAVE_WINCE_TRUE}" && test -z "${ECORE_HAVE_WINCE_FALSE}"; then |
31350 | as_fn_error "conditional \"ECORE_HAVE_WINCE\" was never defined. | 31400 | as_fn_error $? "conditional \"ECORE_HAVE_WINCE\" was never defined. |
31351 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31401 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31352 | fi | 31402 | fi |
31353 | if test -z "${ECORE_HAVE_WIN32_TRUE}" && test -z "${ECORE_HAVE_WIN32_FALSE}"; then | 31403 | if test -z "${ECORE_HAVE_WIN32_TRUE}" && test -z "${ECORE_HAVE_WIN32_FALSE}"; then |
31354 | as_fn_error "conditional \"ECORE_HAVE_WIN32\" was never defined. | 31404 | as_fn_error $? "conditional \"ECORE_HAVE_WIN32\" was never defined. |
31355 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31405 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31356 | fi | 31406 | fi |
31357 | if test -z "${ECORE_HAVE_PS3_TRUE}" && test -z "${ECORE_HAVE_PS3_FALSE}"; then | 31407 | if test -z "${ECORE_HAVE_PS3_TRUE}" && test -z "${ECORE_HAVE_PS3_FALSE}"; then |
31358 | as_fn_error "conditional \"ECORE_HAVE_PS3\" was never defined. | 31408 | as_fn_error $? "conditional \"ECORE_HAVE_PS3\" was never defined. |
31359 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31409 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31360 | fi | 31410 | fi |
31361 | if test -z "${BUILD_ECORE_X_XLIB_TRUE}" && test -z "${BUILD_ECORE_X_XLIB_FALSE}"; then | 31411 | if test -z "${BUILD_ECORE_X_XLIB_TRUE}" && test -z "${BUILD_ECORE_X_XLIB_FALSE}"; then |
31362 | as_fn_error "conditional \"BUILD_ECORE_X_XLIB\" was never defined. | 31412 | as_fn_error $? "conditional \"BUILD_ECORE_X_XLIB\" was never defined. |
31363 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31413 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31364 | fi | 31414 | fi |
31365 | if test -z "${BUILD_ECORE_X_XCB_TRUE}" && test -z "${BUILD_ECORE_X_XCB_FALSE}"; then | 31415 | if test -z "${BUILD_ECORE_X_XCB_TRUE}" && test -z "${BUILD_ECORE_X_XCB_FALSE}"; then |
31366 | as_fn_error "conditional \"BUILD_ECORE_X_XCB\" was never defined. | 31416 | as_fn_error $? "conditional \"BUILD_ECORE_X_XCB\" was never defined. |
31367 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31417 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31368 | fi | 31418 | fi |
31369 | 31419 | ||
31370 | if test -z "${BUILD_ECORE_CON_TRUE}" && test -z "${BUILD_ECORE_CON_FALSE}"; then | 31420 | if test -z "${BUILD_ECORE_CON_TRUE}" && test -z "${BUILD_ECORE_CON_FALSE}"; then |
31371 | as_fn_error "conditional \"BUILD_ECORE_CON\" was never defined. | 31421 | as_fn_error $? "conditional \"BUILD_ECORE_CON\" was never defined. |
31372 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31422 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31373 | fi | 31423 | fi |
31374 | if test -z "${HAVE_CARES_TRUE}" && test -z "${HAVE_CARES_FALSE}"; then | 31424 | if test -z "${HAVE_CARES_TRUE}" && test -z "${HAVE_CARES_FALSE}"; then |
31375 | as_fn_error "conditional \"HAVE_CARES\" was never defined. | 31425 | as_fn_error $? "conditional \"HAVE_CARES\" was never defined. |
31376 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31426 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31377 | fi | 31427 | fi |
31378 | if test -z "${BUILD_ECORE_IPC_TRUE}" && test -z "${BUILD_ECORE_IPC_FALSE}"; then | 31428 | if test -z "${BUILD_ECORE_IPC_TRUE}" && test -z "${BUILD_ECORE_IPC_FALSE}"; then |
31379 | as_fn_error "conditional \"BUILD_ECORE_IPC\" was never defined. | 31429 | as_fn_error $? "conditional \"BUILD_ECORE_IPC\" was never defined. |
31380 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31430 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31381 | fi | 31431 | fi |
31382 | if test -z "${BUILD_ECORE_FILE_TRUE}" && test -z "${BUILD_ECORE_FILE_FALSE}"; then | 31432 | if test -z "${BUILD_ECORE_FILE_TRUE}" && test -z "${BUILD_ECORE_FILE_FALSE}"; then |
31383 | as_fn_error "conditional \"BUILD_ECORE_FILE\" was never defined. | 31433 | as_fn_error $? "conditional \"BUILD_ECORE_FILE\" was never defined. |
31384 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31434 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31385 | fi | 31435 | fi |
31386 | if test -z "${BUILD_ECORE_CONFIG_TRUE}" && test -z "${BUILD_ECORE_CONFIG_FALSE}"; then | 31436 | if test -z "${BUILD_ECORE_CONFIG_TRUE}" && test -z "${BUILD_ECORE_CONFIG_FALSE}"; then |
31387 | as_fn_error "conditional \"BUILD_ECORE_CONFIG\" was never defined. | 31437 | as_fn_error $? "conditional \"BUILD_ECORE_CONFIG\" was never defined. |
31388 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31438 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31389 | fi | 31439 | fi |
31390 | if test -z "${BUILD_ECORE_IMF_TRUE}" && test -z "${BUILD_ECORE_IMF_FALSE}"; then | 31440 | if test -z "${BUILD_ECORE_IMF_TRUE}" && test -z "${BUILD_ECORE_IMF_FALSE}"; then |
31391 | as_fn_error "conditional \"BUILD_ECORE_IMF\" was never defined. | 31441 | as_fn_error $? "conditional \"BUILD_ECORE_IMF\" was never defined. |
31392 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31442 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31393 | fi | 31443 | fi |
31394 | if test -z "${BUILD_ECORE_IMF_EVAS_TRUE}" && test -z "${BUILD_ECORE_IMF_EVAS_FALSE}"; then | 31444 | if test -z "${BUILD_ECORE_IMF_EVAS_TRUE}" && test -z "${BUILD_ECORE_IMF_EVAS_FALSE}"; then |
31395 | as_fn_error "conditional \"BUILD_ECORE_IMF_EVAS\" was never defined. | 31445 | as_fn_error $? "conditional \"BUILD_ECORE_IMF_EVAS\" was never defined. |
31396 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31446 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31397 | fi | 31447 | fi |
31398 | if test -z "${BUILD_ECORE_INPUT_TRUE}" && test -z "${BUILD_ECORE_INPUT_FALSE}"; then | 31448 | if test -z "${BUILD_ECORE_INPUT_TRUE}" && test -z "${BUILD_ECORE_INPUT_FALSE}"; then |
31399 | as_fn_error "conditional \"BUILD_ECORE_INPUT\" was never defined. | 31449 | as_fn_error $? "conditional \"BUILD_ECORE_INPUT\" was never defined. |
31400 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31450 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31401 | fi | 31451 | fi |
31402 | if test -z "${BUILD_ECORE_INPUT_EVAS_TRUE}" && test -z "${BUILD_ECORE_INPUT_EVAS_FALSE}"; then | 31452 | if test -z "${BUILD_ECORE_INPUT_EVAS_TRUE}" && test -z "${BUILD_ECORE_INPUT_EVAS_FALSE}"; then |
31403 | as_fn_error "conditional \"BUILD_ECORE_INPUT_EVAS\" was never defined. | 31453 | as_fn_error $? "conditional \"BUILD_ECORE_INPUT_EVAS\" was never defined. |
31404 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31454 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31405 | fi | 31455 | fi |
31406 | if test -z "${BUILD_ECORE_IMF_XIM_TRUE}" && test -z "${BUILD_ECORE_IMF_XIM_FALSE}"; then | 31456 | if test -z "${BUILD_ECORE_IMF_XIM_TRUE}" && test -z "${BUILD_ECORE_IMF_XIM_FALSE}"; then |
31407 | as_fn_error "conditional \"BUILD_ECORE_IMF_XIM\" was never defined. | 31457 | as_fn_error $? "conditional \"BUILD_ECORE_IMF_XIM\" was never defined. |
31408 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31458 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31409 | fi | 31459 | fi |
31410 | if test -z "${BUILD_ECORE_IMF_XIM_TRUE}" && test -z "${BUILD_ECORE_IMF_XIM_FALSE}"; then | 31460 | if test -z "${BUILD_ECORE_IMF_XIM_TRUE}" && test -z "${BUILD_ECORE_IMF_XIM_FALSE}"; then |
31411 | as_fn_error "conditional \"BUILD_ECORE_IMF_XIM\" was never defined. | 31461 | as_fn_error $? "conditional \"BUILD_ECORE_IMF_XIM\" was never defined. |
31412 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31462 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31413 | fi | 31463 | fi |
31414 | if test -z "${BUILD_ECORE_IMF_SCIM_TRUE}" && test -z "${BUILD_ECORE_IMF_SCIM_FALSE}"; then | 31464 | if test -z "${BUILD_ECORE_IMF_SCIM_TRUE}" && test -z "${BUILD_ECORE_IMF_SCIM_FALSE}"; then |
31415 | as_fn_error "conditional \"BUILD_ECORE_IMF_SCIM\" was never defined. | 31465 | as_fn_error $? "conditional \"BUILD_ECORE_IMF_SCIM\" was never defined. |
31416 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31466 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31417 | fi | 31467 | fi |
31418 | if test -z "${BUILD_ECORE_IMF_SCIM_TRUE}" && test -z "${BUILD_ECORE_IMF_SCIM_FALSE}"; then | 31468 | if test -z "${BUILD_ECORE_IMF_SCIM_TRUE}" && test -z "${BUILD_ECORE_IMF_SCIM_FALSE}"; then |
31419 | as_fn_error "conditional \"BUILD_ECORE_IMF_SCIM\" was never defined. | 31469 | as_fn_error $? "conditional \"BUILD_ECORE_IMF_SCIM\" was never defined. |
31420 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31470 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31421 | fi | 31471 | fi |
31422 | if test -z "${BUILD_ECORE_X_TRUE}" && test -z "${BUILD_ECORE_X_FALSE}"; then | 31472 | if test -z "${BUILD_ECORE_X_TRUE}" && test -z "${BUILD_ECORE_X_FALSE}"; then |
31423 | as_fn_error "conditional \"BUILD_ECORE_X\" was never defined. | 31473 | as_fn_error $? "conditional \"BUILD_ECORE_X\" was never defined. |
31424 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31474 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31425 | fi | 31475 | fi |
31426 | if test -z "${BUILD_ECORE_WIN32_TRUE}" && test -z "${BUILD_ECORE_WIN32_FALSE}"; then | 31476 | if test -z "${BUILD_ECORE_WIN32_TRUE}" && test -z "${BUILD_ECORE_WIN32_FALSE}"; then |
31427 | as_fn_error "conditional \"BUILD_ECORE_WIN32\" was never defined. | 31477 | as_fn_error $? "conditional \"BUILD_ECORE_WIN32\" was never defined. |
31428 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31478 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31429 | fi | 31479 | fi |
31430 | if test -z "${BUILD_ECORE_COCOA_TRUE}" && test -z "${BUILD_ECORE_COCOA_FALSE}"; then | 31480 | if test -z "${BUILD_ECORE_COCOA_TRUE}" && test -z "${BUILD_ECORE_COCOA_FALSE}"; then |
31431 | as_fn_error "conditional \"BUILD_ECORE_COCOA\" was never defined. | 31481 | as_fn_error $? "conditional \"BUILD_ECORE_COCOA\" was never defined. |
31432 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31482 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31433 | fi | 31483 | fi |
31434 | if test -z "${BUILD_ECORE_SDL_TRUE}" && test -z "${BUILD_ECORE_SDL_FALSE}"; then | 31484 | if test -z "${BUILD_ECORE_SDL_TRUE}" && test -z "${BUILD_ECORE_SDL_FALSE}"; then |
31435 | as_fn_error "conditional \"BUILD_ECORE_SDL\" was never defined. | 31485 | as_fn_error $? "conditional \"BUILD_ECORE_SDL\" was never defined. |
31436 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31486 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31437 | fi | 31487 | fi |
31438 | if test -z "${BUILD_ECORE_PSL1GHT_TRUE}" && test -z "${BUILD_ECORE_PSL1GHT_FALSE}"; then | 31488 | if test -z "${BUILD_ECORE_PSL1GHT_TRUE}" && test -z "${BUILD_ECORE_PSL1GHT_FALSE}"; then |
31439 | as_fn_error "conditional \"BUILD_ECORE_PSL1GHT\" was never defined. | 31489 | as_fn_error $? "conditional \"BUILD_ECORE_PSL1GHT\" was never defined. |
31440 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31490 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31441 | fi | 31491 | fi |
31442 | if test -z "${BUILD_ECORE_FB_TRUE}" && test -z "${BUILD_ECORE_FB_FALSE}"; then | 31492 | if test -z "${BUILD_ECORE_FB_TRUE}" && test -z "${BUILD_ECORE_FB_FALSE}"; then |
31443 | as_fn_error "conditional \"BUILD_ECORE_FB\" was never defined. | 31493 | as_fn_error $? "conditional \"BUILD_ECORE_FB\" was never defined. |
31444 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31494 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31445 | fi | 31495 | fi |
31446 | if test -z "${BUILD_ECORE_DIRECTFB_TRUE}" && test -z "${BUILD_ECORE_DIRECTFB_FALSE}"; then | 31496 | if test -z "${BUILD_ECORE_DIRECTFB_TRUE}" && test -z "${BUILD_ECORE_DIRECTFB_FALSE}"; then |
31447 | as_fn_error "conditional \"BUILD_ECORE_DIRECTFB\" was never defined. | 31497 | as_fn_error $? "conditional \"BUILD_ECORE_DIRECTFB\" was never defined. |
31448 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31498 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31449 | fi | 31499 | fi |
31450 | if test -z "${BUILD_ECORE_WINCE_TRUE}" && test -z "${BUILD_ECORE_WINCE_FALSE}"; then | 31500 | if test -z "${BUILD_ECORE_WINCE_TRUE}" && test -z "${BUILD_ECORE_WINCE_FALSE}"; then |
31451 | as_fn_error "conditional \"BUILD_ECORE_WINCE\" was never defined. | 31501 | as_fn_error $? "conditional \"BUILD_ECORE_WINCE\" was never defined. |
31452 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31502 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31453 | fi | 31503 | fi |
31454 | if test -z "${BUILD_ECORE_EVAS_TRUE}" && test -z "${BUILD_ECORE_EVAS_FALSE}"; then | 31504 | if test -z "${BUILD_ECORE_EVAS_TRUE}" && test -z "${BUILD_ECORE_EVAS_FALSE}"; then |
31455 | as_fn_error "conditional \"BUILD_ECORE_EVAS\" was never defined. | 31505 | as_fn_error $? "conditional \"BUILD_ECORE_EVAS\" was never defined. |
31456 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31506 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31457 | fi | 31507 | fi |
31458 | if test -z "${BUILD_ECORE_WAYLAND_TRUE}" && test -z "${BUILD_ECORE_WAYLAND_FALSE}"; then | 31508 | if test -z "${BUILD_ECORE_WAYLAND_TRUE}" && test -z "${BUILD_ECORE_WAYLAND_FALSE}"; then |
31459 | as_fn_error "conditional \"BUILD_ECORE_WAYLAND\" was never defined. | 31509 | as_fn_error $? "conditional \"BUILD_ECORE_WAYLAND\" was never defined. |
31510 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
31511 | fi | ||
31512 | if test -z "${EFL_ENABLE_TESTS_TRUE}" && test -z "${EFL_ENABLE_TESTS_FALSE}"; then | ||
31513 | as_fn_error $? "conditional \"EFL_ENABLE_TESTS\" was never defined. | ||
31460 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31514 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31461 | fi | 31515 | fi |
31462 | if test -z "${EFL_BUILD_EXAMPLES_TRUE}" && test -z "${EFL_BUILD_EXAMPLES_FALSE}"; then | 31516 | if test -z "${EFL_BUILD_EXAMPLES_TRUE}" && test -z "${EFL_BUILD_EXAMPLES_FALSE}"; then |
31463 | as_fn_error "conditional \"EFL_BUILD_EXAMPLES\" was never defined. | 31517 | as_fn_error $? "conditional \"EFL_BUILD_EXAMPLES\" was never defined. |
31464 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31518 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31465 | fi | 31519 | fi |
31466 | if test -z "${EFL_INSTALL_EXAMPLES_TRUE}" && test -z "${EFL_INSTALL_EXAMPLES_FALSE}"; then | 31520 | if test -z "${EFL_INSTALL_EXAMPLES_TRUE}" && test -z "${EFL_INSTALL_EXAMPLES_FALSE}"; then |
31467 | as_fn_error "conditional \"EFL_INSTALL_EXAMPLES\" was never defined. | 31521 | as_fn_error $? "conditional \"EFL_INSTALL_EXAMPLES\" was never defined. |
31468 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 31522 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
31469 | fi | 31523 | fi |
31470 | 31524 | ||
@@ -31614,19 +31668,19 @@ export LANGUAGE | |||
31614 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH | 31668 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
31615 | 31669 | ||
31616 | 31670 | ||
31617 | # as_fn_error ERROR [LINENO LOG_FD] | 31671 | # as_fn_error STATUS ERROR [LINENO LOG_FD] |
31618 | # --------------------------------- | 31672 | # ---------------------------------------- |
31619 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are | 31673 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
31620 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the | 31674 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
31621 | # script with status $?, using 1 if that was 0. | 31675 | # script with STATUS, using 1 if that was 0. |
31622 | as_fn_error () | 31676 | as_fn_error () |
31623 | { | 31677 | { |
31624 | as_status=$?; test $as_status -eq 0 && as_status=1 | 31678 | as_status=$1; test $as_status -eq 0 && as_status=1 |
31625 | if test "$3"; then | 31679 | if test "$4"; then |
31626 | as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 31680 | as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
31627 | $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 | 31681 | $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
31628 | fi | 31682 | fi |
31629 | $as_echo "$as_me: error: $1" >&2 | 31683 | $as_echo "$as_me: error: $2" >&2 |
31630 | as_fn_exit $as_status | 31684 | as_fn_exit $as_status |
31631 | } # as_fn_error | 31685 | } # as_fn_error |
31632 | 31686 | ||
@@ -31822,7 +31876,7 @@ $as_echo X"$as_dir" | | |||
31822 | test -d "$as_dir" && break | 31876 | test -d "$as_dir" && break |
31823 | done | 31877 | done |
31824 | test -z "$as_dirs" || eval "mkdir $as_dirs" | 31878 | test -z "$as_dirs" || eval "mkdir $as_dirs" |
31825 | } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" | 31879 | } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
31826 | 31880 | ||
31827 | 31881 | ||
31828 | } # as_fn_mkdir_p | 31882 | } # as_fn_mkdir_p |
@@ -31875,8 +31929,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | |||
31875 | # report actual input values of CONFIG_FILES etc. instead of their | 31929 | # report actual input values of CONFIG_FILES etc. instead of their |
31876 | # values after options handling. | 31930 | # values after options handling. |
31877 | ac_log=" | 31931 | ac_log=" |
31878 | This file was extended by ecore $as_me 1.1.99.67344, which was | 31932 | This file was extended by ecore $as_me 1.2.0-alpha, which was |
31879 | generated by GNU Autoconf 2.65. Invocation command line was | 31933 | generated by GNU Autoconf 2.67. Invocation command line was |
31880 | 31934 | ||
31881 | CONFIG_FILES = $CONFIG_FILES | 31935 | CONFIG_FILES = $CONFIG_FILES |
31882 | CONFIG_HEADERS = $CONFIG_HEADERS | 31936 | CONFIG_HEADERS = $CONFIG_HEADERS |
@@ -31941,11 +31995,11 @@ _ACEOF | |||
31941 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 31995 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
31942 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 31996 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
31943 | ac_cs_version="\\ | 31997 | ac_cs_version="\\ |
31944 | ecore config.status 1.1.99.67344 | 31998 | ecore config.status 1.2.0-alpha |
31945 | configured by $0, generated by GNU Autoconf 2.65, | 31999 | configured by $0, generated by GNU Autoconf 2.67, |
31946 | with options \\"\$ac_cs_config\\" | 32000 | with options \\"\$ac_cs_config\\" |
31947 | 32001 | ||
31948 | Copyright (C) 2009 Free Software Foundation, Inc. | 32002 | Copyright (C) 2010 Free Software Foundation, Inc. |
31949 | This config.status script is free software; the Free Software Foundation | 32003 | This config.status script is free software; the Free Software Foundation |
31950 | gives unlimited permission to copy, distribute and modify it." | 32004 | gives unlimited permission to copy, distribute and modify it." |
31951 | 32005 | ||
@@ -31963,11 +32017,16 @@ ac_need_defaults=: | |||
31963 | while test $# != 0 | 32017 | while test $# != 0 |
31964 | do | 32018 | do |
31965 | case $1 in | 32019 | case $1 in |
31966 | --*=*) | 32020 | --*=?*) |
31967 | ac_option=`expr "X$1" : 'X\([^=]*\)='` | 32021 | ac_option=`expr "X$1" : 'X\([^=]*\)='` |
31968 | ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` | 32022 | ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` |
31969 | ac_shift=: | 32023 | ac_shift=: |
31970 | ;; | 32024 | ;; |
32025 | --*=) | ||
32026 | ac_option=`expr "X$1" : 'X\([^=]*\)='` | ||
32027 | ac_optarg= | ||
32028 | ac_shift=: | ||
32029 | ;; | ||
31971 | *) | 32030 | *) |
31972 | ac_option=$1 | 32031 | ac_option=$1 |
31973 | ac_optarg=$2 | 32032 | ac_optarg=$2 |
@@ -31989,6 +32048,7 @@ do | |||
31989 | $ac_shift | 32048 | $ac_shift |
31990 | case $ac_optarg in | 32049 | case $ac_optarg in |
31991 | *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; | 32050 | *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; |
32051 | '') as_fn_error $? "missing file argument" ;; | ||
31992 | esac | 32052 | esac |
31993 | as_fn_append CONFIG_FILES " '$ac_optarg'" | 32053 | as_fn_append CONFIG_FILES " '$ac_optarg'" |
31994 | ac_need_defaults=false;; | 32054 | ac_need_defaults=false;; |
@@ -32001,7 +32061,7 @@ do | |||
32001 | ac_need_defaults=false;; | 32061 | ac_need_defaults=false;; |
32002 | --he | --h) | 32062 | --he | --h) |
32003 | # Conflict between --help and --header | 32063 | # Conflict between --help and --header |
32004 | as_fn_error "ambiguous option: \`$1' | 32064 | as_fn_error $? "ambiguous option: \`$1' |
32005 | Try \`$0 --help' for more information.";; | 32065 | Try \`$0 --help' for more information.";; |
32006 | --help | --hel | -h ) | 32066 | --help | --hel | -h ) |
32007 | $as_echo "$ac_cs_usage"; exit ;; | 32067 | $as_echo "$ac_cs_usage"; exit ;; |
@@ -32010,7 +32070,7 @@ Try \`$0 --help' for more information.";; | |||
32010 | ac_cs_silent=: ;; | 32070 | ac_cs_silent=: ;; |
32011 | 32071 | ||
32012 | # This is an error. | 32072 | # This is an error. |
32013 | -*) as_fn_error "unrecognized option: \`$1' | 32073 | -*) as_fn_error $? "unrecognized option: \`$1' |
32014 | Try \`$0 --help' for more information." ;; | 32074 | Try \`$0 --help' for more information." ;; |
32015 | 32075 | ||
32016 | *) as_fn_append ac_config_targets " $1" | 32076 | *) as_fn_append ac_config_targets " $1" |
@@ -32484,7 +32544,7 @@ do | |||
32484 | "ecore.spec") CONFIG_FILES="$CONFIG_FILES ecore.spec" ;; | 32544 | "ecore.spec") CONFIG_FILES="$CONFIG_FILES ecore.spec" ;; |
32485 | "$po_makefile_in") CONFIG_FILES="$CONFIG_FILES $po_makefile_in" ;; | 32545 | "$po_makefile_in") CONFIG_FILES="$CONFIG_FILES $po_makefile_in" ;; |
32486 | 32546 | ||
32487 | *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; | 32547 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; |
32488 | esac | 32548 | esac |
32489 | done | 32549 | done |
32490 | 32550 | ||
@@ -32522,7 +32582,7 @@ $debug || | |||
32522 | { | 32582 | { |
32523 | tmp=./conf$$-$RANDOM | 32583 | tmp=./conf$$-$RANDOM |
32524 | (umask 077 && mkdir "$tmp") | 32584 | (umask 077 && mkdir "$tmp") |
32525 | } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 | 32585 | } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 |
32526 | 32586 | ||
32527 | # Set up the scripts for CONFIG_FILES section. | 32587 | # Set up the scripts for CONFIG_FILES section. |
32528 | # No need to generate them if there are no CONFIG_FILES. | 32588 | # No need to generate them if there are no CONFIG_FILES. |
@@ -32539,7 +32599,7 @@ if test "x$ac_cr" = x; then | |||
32539 | fi | 32599 | fi |
32540 | ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` | 32600 | ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` |
32541 | if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then | 32601 | if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then |
32542 | ac_cs_awk_cr='\r' | 32602 | ac_cs_awk_cr='\\r' |
32543 | else | 32603 | else |
32544 | ac_cs_awk_cr=$ac_cr | 32604 | ac_cs_awk_cr=$ac_cr |
32545 | fi | 32605 | fi |
@@ -32553,18 +32613,18 @@ _ACEOF | |||
32553 | echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && | 32613 | echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && |
32554 | echo "_ACEOF" | 32614 | echo "_ACEOF" |
32555 | } >conf$$subs.sh || | 32615 | } >conf$$subs.sh || |
32556 | as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 | 32616 | as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
32557 | ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` | 32617 | ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` |
32558 | ac_delim='%!_!# ' | 32618 | ac_delim='%!_!# ' |
32559 | for ac_last_try in false false false false false :; do | 32619 | for ac_last_try in false false false false false :; do |
32560 | . ./conf$$subs.sh || | 32620 | . ./conf$$subs.sh || |
32561 | as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 | 32621 | as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
32562 | 32622 | ||
32563 | ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` | 32623 | ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` |
32564 | if test $ac_delim_n = $ac_delim_num; then | 32624 | if test $ac_delim_n = $ac_delim_num; then |
32565 | break | 32625 | break |
32566 | elif $ac_last_try; then | 32626 | elif $ac_last_try; then |
32567 | as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 | 32627 | as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
32568 | else | 32628 | else |
32569 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | 32629 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
32570 | fi | 32630 | fi |
@@ -32653,20 +32713,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then | |||
32653 | else | 32713 | else |
32654 | cat | 32714 | cat |
32655 | fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ | 32715 | fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ |
32656 | || as_fn_error "could not setup config files machinery" "$LINENO" 5 | 32716 | || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 |
32657 | _ACEOF | 32717 | _ACEOF |
32658 | 32718 | ||
32659 | # VPATH may cause trouble with some makes, so we remove $(srcdir), | 32719 | # VPATH may cause trouble with some makes, so we remove sole $(srcdir), |
32660 | # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and | 32720 | # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and |
32661 | # trailing colons and then remove the whole line if VPATH becomes empty | 32721 | # trailing colons and then remove the whole line if VPATH becomes empty |
32662 | # (actually we leave an empty line to preserve line numbers). | 32722 | # (actually we leave an empty line to preserve line numbers). |
32663 | if test "x$srcdir" = x.; then | 32723 | if test "x$srcdir" = x.; then |
32664 | ac_vpsub='/^[ ]*VPATH[ ]*=/{ | 32724 | ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ |
32665 | s/:*\$(srcdir):*/:/ | 32725 | h |
32666 | s/:*\${srcdir}:*/:/ | 32726 | s/// |
32667 | s/:*@srcdir@:*/:/ | 32727 | s/^/:/ |
32668 | s/^\([^=]*=[ ]*\):*/\1/ | 32728 | s/[ ]*$/:/ |
32729 | s/:\$(srcdir):/:/g | ||
32730 | s/:\${srcdir}:/:/g | ||
32731 | s/:@srcdir@:/:/g | ||
32732 | s/^:*// | ||
32669 | s/:*$// | 32733 | s/:*$// |
32734 | x | ||
32735 | s/\(=[ ]*\).*/\1/ | ||
32736 | G | ||
32737 | s/\n// | ||
32670 | s/^[^=]*=[ ]*$// | 32738 | s/^[^=]*=[ ]*$// |
32671 | }' | 32739 | }' |
32672 | fi | 32740 | fi |
@@ -32694,7 +32762,7 @@ for ac_last_try in false false :; do | |||
32694 | if test -z "$ac_t"; then | 32762 | if test -z "$ac_t"; then |
32695 | break | 32763 | break |
32696 | elif $ac_last_try; then | 32764 | elif $ac_last_try; then |
32697 | as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 | 32765 | as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 |
32698 | else | 32766 | else |
32699 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | 32767 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
32700 | fi | 32768 | fi |
@@ -32779,7 +32847,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | |||
32779 | _ACAWK | 32847 | _ACAWK |
32780 | _ACEOF | 32848 | _ACEOF |
32781 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | 32849 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
32782 | as_fn_error "could not setup config headers machinery" "$LINENO" 5 | 32850 | as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 |
32783 | fi # test -n "$CONFIG_HEADERS" | 32851 | fi # test -n "$CONFIG_HEADERS" |
32784 | 32852 | ||
32785 | 32853 | ||
@@ -32792,7 +32860,7 @@ do | |||
32792 | esac | 32860 | esac |
32793 | case $ac_mode$ac_tag in | 32861 | case $ac_mode$ac_tag in |
32794 | :[FHL]*:*);; | 32862 | :[FHL]*:*);; |
32795 | :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; | 32863 | :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; |
32796 | :[FH]-) ac_tag=-:-;; | 32864 | :[FH]-) ac_tag=-:-;; |
32797 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; | 32865 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; |
32798 | esac | 32866 | esac |
@@ -32820,7 +32888,7 @@ do | |||
32820 | [\\/$]*) false;; | 32888 | [\\/$]*) false;; |
32821 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; | 32889 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; |
32822 | esac || | 32890 | esac || |
32823 | as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; | 32891 | as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; |
32824 | esac | 32892 | esac |
32825 | case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac | 32893 | case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac |
32826 | as_fn_append ac_file_inputs " '$ac_f'" | 32894 | as_fn_append ac_file_inputs " '$ac_f'" |
@@ -32847,7 +32915,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} | |||
32847 | 32915 | ||
32848 | case $ac_tag in | 32916 | case $ac_tag in |
32849 | *:-:* | *:-) cat >"$tmp/stdin" \ | 32917 | *:-:* | *:-) cat >"$tmp/stdin" \ |
32850 | || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; | 32918 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; |
32851 | esac | 32919 | esac |
32852 | ;; | 32920 | ;; |
32853 | esac | 32921 | esac |
@@ -32984,22 +33052,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t | |||
32984 | $ac_datarootdir_hack | 33052 | $ac_datarootdir_hack |
32985 | " | 33053 | " |
32986 | eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ | 33054 | eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ |
32987 | || as_fn_error "could not create $ac_file" "$LINENO" 5 | 33055 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
32988 | 33056 | ||
32989 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && | 33057 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && |
32990 | { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && | 33058 | { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && |
32991 | { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && | 33059 | { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && |
32992 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' | 33060 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
32993 | which seems to be undefined. Please make sure it is defined." >&5 | 33061 | which seems to be undefined. Please make sure it is defined" >&5 |
32994 | $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' | 33062 | $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
32995 | which seems to be undefined. Please make sure it is defined." >&2;} | 33063 | which seems to be undefined. Please make sure it is defined" >&2;} |
32996 | 33064 | ||
32997 | rm -f "$tmp/stdin" | 33065 | rm -f "$tmp/stdin" |
32998 | case $ac_file in | 33066 | case $ac_file in |
32999 | -) cat "$tmp/out" && rm -f "$tmp/out";; | 33067 | -) cat "$tmp/out" && rm -f "$tmp/out";; |
33000 | *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; | 33068 | *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; |
33001 | esac \ | 33069 | esac \ |
33002 | || as_fn_error "could not create $ac_file" "$LINENO" 5 | 33070 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
33003 | ;; | 33071 | ;; |
33004 | :H) | 33072 | :H) |
33005 | # | 33073 | # |
@@ -33010,19 +33078,19 @@ which seems to be undefined. Please make sure it is defined." >&2;} | |||
33010 | $as_echo "/* $configure_input */" \ | 33078 | $as_echo "/* $configure_input */" \ |
33011 | && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" | 33079 | && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" |
33012 | } >"$tmp/config.h" \ | 33080 | } >"$tmp/config.h" \ |
33013 | || as_fn_error "could not create $ac_file" "$LINENO" 5 | 33081 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
33014 | if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then | 33082 | if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then |
33015 | { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 | 33083 | { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 |
33016 | $as_echo "$as_me: $ac_file is unchanged" >&6;} | 33084 | $as_echo "$as_me: $ac_file is unchanged" >&6;} |
33017 | else | 33085 | else |
33018 | rm -f "$ac_file" | 33086 | rm -f "$ac_file" |
33019 | mv "$tmp/config.h" "$ac_file" \ | 33087 | mv "$tmp/config.h" "$ac_file" \ |
33020 | || as_fn_error "could not create $ac_file" "$LINENO" 5 | 33088 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
33021 | fi | 33089 | fi |
33022 | else | 33090 | else |
33023 | $as_echo "/* $configure_input */" \ | 33091 | $as_echo "/* $configure_input */" \ |
33024 | && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ | 33092 | && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ |
33025 | || as_fn_error "could not create -" "$LINENO" 5 | 33093 | || as_fn_error $? "could not create -" "$LINENO" 5 |
33026 | fi | 33094 | fi |
33027 | # Compute "$ac_file"'s index in $config_headers. | 33095 | # Compute "$ac_file"'s index in $config_headers. |
33028 | _am_arg="$ac_file" | 33096 | _am_arg="$ac_file" |
@@ -34093,7 +34161,7 @@ _ACEOF | |||
34093 | ac_clean_files=$ac_clean_files_save | 34161 | ac_clean_files=$ac_clean_files_save |
34094 | 34162 | ||
34095 | test $ac_write_fail = 0 || | 34163 | test $ac_write_fail = 0 || |
34096 | as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 | 34164 | as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 |
34097 | 34165 | ||
34098 | 34166 | ||
34099 | # configure is writing to config.log, and then calls config.status. | 34167 | # configure is writing to config.log, and then calls config.status. |
@@ -34114,7 +34182,7 @@ if test "$no_create" != yes; then | |||
34114 | exec 5>>config.log | 34182 | exec 5>>config.log |
34115 | # Use ||, not &&, to avoid exiting from the if with $? = 1, which | 34183 | # Use ||, not &&, to avoid exiting from the if with $? = 1, which |
34116 | # would make configure fail if this is the last instruction. | 34184 | # would make configure fail if this is the last instruction. |
34117 | $ac_cs_success || as_fn_exit $? | 34185 | $ac_cs_success || as_fn_exit 1 |
34118 | fi | 34186 | fi |
34119 | if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then | 34187 | if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then |
34120 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 | 34188 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 |
@@ -34266,6 +34334,7 @@ if test "x${have_ecore_evas}" = "xyes" ; then | |||
34266 | echo " Sing.Proc. Windowing System: $have_ecore_evas_ews" | 34334 | echo " Sing.Proc. Windowing System: $have_ecore_evas_ews" |
34267 | echo " Wayland Shm................: $have_ecore_evas_wayland_shm" | 34335 | echo " Wayland Shm................: $have_ecore_evas_wayland_shm" |
34268 | echo " Wayland Egl................: $have_ecore_evas_wayland_egl" | 34336 | echo " Wayland Egl................: $have_ecore_evas_wayland_egl" |
34337 | echo " Extn (Plug/socket Extn)....: $have_ecore_evas_extn" | ||
34269 | fi | 34338 | fi |
34270 | echo | 34339 | echo |
34271 | echo " Tests................: ${enable_tests}" | 34340 | echo " Tests................: ${enable_tests}" |
diff --git a/libraries/ecore/configure.ac b/libraries/ecore/configure.ac index 21393dd..3d93c9b 100644 --- a/libraries/ecore/configure.ac +++ b/libraries/ecore/configure.ac | |||
@@ -1,12 +1,12 @@ | |||
1 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 1 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 2 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
3 | m4_define([v_maj], [1]) | 3 | m4_define([v_maj], [1]) |
4 | m4_define([v_min], [1]) | 4 | m4_define([v_min], [2]) |
5 | m4_define([v_mic], [99]) | 5 | m4_define([v_mic], [0]) |
6 | m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n' | sed 's/Unversioneddirectory/0/' | tr -d '\n'])) | 6 | m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n' | sed 's/Unversioneddirectory/0/' | tr -d '\n'])) |
7 | m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) | 7 | m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) |
8 | ##-- When released, remove the dnl on the below line | 8 | ##-- When released, remove the dnl on the below line |
9 | dnl m4_undefine([v_rev]) | 9 | 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 |
11 | dnl m4_define([relname], [ver-pre-svn-07]) | 11 | dnl m4_define([relname], [ver-pre-svn-07]) |
12 | dnl m4_define([v_rel], [-release relname]) | 12 | dnl m4_define([v_rel], [-release relname]) |
@@ -18,7 +18,7 @@ m4_define([lt_age], v_min) | |||
18 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 18 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
19 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## | 19 | ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## |
20 | 20 | ||
21 | AC_INIT([ecore], [v_ver], [enlightenment-devel@lists.sourceforge.net]) | 21 | AC_INIT([ecore], [v_ver]-alpha, [enlightenment-devel@lists.sourceforge.net]) |
22 | AC_PREREQ([2.52]) | 22 | AC_PREREQ([2.52]) |
23 | AC_CONFIG_SRCDIR([configure.ac]) | 23 | AC_CONFIG_SRCDIR([configure.ac]) |
24 | AC_CONFIG_MACRO_DIR([m4]) | 24 | AC_CONFIG_MACRO_DIR([m4]) |
@@ -174,6 +174,7 @@ want_ecore_evas_directfb="no" | |||
174 | want_ecore_evas_fb="no" | 174 | want_ecore_evas_fb="no" |
175 | want_ecore_evas_software_16_wince="no" | 175 | want_ecore_evas_software_16_wince="no" |
176 | want_ecore_evas_ews="yes" | 176 | want_ecore_evas_ews="yes" |
177 | want_ecore_evas_extn="yes" | ||
177 | want_ecore_evas_wayland_shm="no" | 178 | want_ecore_evas_wayland_shm="no" |
178 | want_ecore_evas_wayland_egl="no" | 179 | want_ecore_evas_wayland_egl="no" |
179 | 180 | ||
@@ -182,11 +183,12 @@ want_ecore_imf_xim="no" | |||
182 | want_ecore_imf_scim="no" | 183 | want_ecore_imf_scim="no" |
183 | 184 | ||
184 | case "$host_os" in | 185 | case "$host_os" in |
185 | mingw32ce* | cegcc*) | 186 | mingw32ce*) |
186 | want_ecore_con="no" | 187 | want_ecore_con="no" |
187 | want_ecore_ipc="no" | 188 | want_ecore_ipc="no" |
188 | want_ecore_wince="yes" | 189 | want_ecore_wince="yes" |
189 | want_ecore_evas_software_16_wince="yes" | 190 | want_ecore_evas_software_16_wince="yes" |
191 | want_ecore_evas_extn="no" | ||
190 | ;; | 192 | ;; |
191 | mingw*) | 193 | mingw*) |
192 | want_notify_win32="yes" | 194 | want_notify_win32="yes" |
@@ -273,30 +275,6 @@ requirements_ecore_imf_xim="" | |||
273 | requirements_ecore_imf_scim="" | 275 | requirements_ecore_imf_scim="" |
274 | requirements_ecore_wayland="" | 276 | requirements_ecore_wayland="" |
275 | 277 | ||
276 | AC_CHECK_DECL([MAXHOSTNAMELEN],[FOUND_MAXHOSTNAMELEN=yes]) | ||
277 | |||
278 | if test x$FOUND_MAXHOSTNAMELEN != xyes ; then | ||
279 | AC_MSG_CHECKING([for header that defines MAXHOSTNAMELEN]) | ||
280 | |||
281 | FOUND_MAXHOSTNAMELEN='not found' | ||
282 | |||
283 | AC_COMPILE_IFELSE( | ||
284 | AC_LANG_PROGRAM([#include <sys/param.h>], | ||
285 | [int h = MAXHOSTNAMELEN;]), | ||
286 | [FOUND_MAXHOSTNAMELEN='sys/param.h' | ||
287 | AC_DEFINE(NEED_SYS_PARAM_H,1, | ||
288 | [Define to 1 if you need <sys/param.h> to define MAXHOSTNAMELEN])]) | ||
289 | |||
290 | AC_COMPILE_IFELSE( | ||
291 | AC_LANG_PROGRAM([#include <netdb.h>], | ||
292 | [int h = MAXHOSTNAMELEN;]), | ||
293 | [FOUND_MAXHOSTNAMELEN='netdb.h' | ||
294 | AC_DEFINE(NEED_NETDB_H,1, | ||
295 | [Define to 1 if you need <netdb.h> to define MAXHOSTNAMELEN])]) | ||
296 | |||
297 | AC_MSG_RESULT([$FOUND_MAXHOSTNAMELEN]) | ||
298 | fi | ||
299 | |||
300 | ### Additional options to configure | 278 | ### Additional options to configure |
301 | 279 | ||
302 | want_glib_integration_always=no | 280 | want_glib_integration_always=no |
@@ -377,10 +355,6 @@ if test "x${want_xim}" = "xyes" ; then | |||
377 | AC_DEFINE([ENABLE_XIM], [1], [Enable X Input Method]) | 355 | AC_DEFINE([ENABLE_XIM], [1], [Enable X Input Method]) |
378 | fi | 356 | fi |
379 | 357 | ||
380 | # Unit tests | ||
381 | |||
382 | EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"]) | ||
383 | |||
384 | ### Checks for programs | 358 | ### Checks for programs |
385 | 359 | ||
386 | m4_ifdef([AC_PROG_OBJC], | 360 | m4_ifdef([AC_PROG_OBJC], |
@@ -499,6 +473,21 @@ case "$host_vendor" in | |||
499 | ;; | 473 | ;; |
500 | esac | 474 | esac |
501 | 475 | ||
476 | |||
477 | ### Checks for portability layer | ||
478 | |||
479 | PKG_CHECK_MODULES([EXOTIC], | ||
480 | [exotic], | ||
481 | [enable_exotic="yes"], | ||
482 | [enable_exotic="no"]) | ||
483 | |||
484 | if test "x${enable_exotic}" = "xyes"; then | ||
485 | requirements_ecore="exotic ${requirements_ecore}" | ||
486 | |||
487 | AC_DEFINE([HAVE_EXOTIC], [1], [Define to 1 if you have Exotic.]) | ||
488 | fi | ||
489 | AM_CONDITIONAL([ECORE_HAVE_EXOTIC], [test "x${enable_exotic}" = "xyes"]) | ||
490 | |||
502 | AC_SUBST(EFL_ECORE_BUILD) | 491 | AC_SUBST(EFL_ECORE_BUILD) |
503 | AC_SUBST(EFL_ECORE_CON_BUILD) | 492 | AC_SUBST(EFL_ECORE_CON_BUILD) |
504 | AC_SUBST(EFL_ECORE_EVAS_BUILD) | 493 | AC_SUBST(EFL_ECORE_EVAS_BUILD) |
@@ -549,26 +538,26 @@ AC_SUBST(rt_libs) | |||
549 | 538 | ||
550 | # Eina library | 539 | # Eina library |
551 | 540 | ||
552 | PKG_CHECK_MODULES(EINA, [eina >= 1.1.0]) | 541 | PKG_CHECK_MODULES(EINA, [eina >= 1.2.0]) |
553 | #FIXME check all the requirements when the eina move will be finished | 542 | #FIXME check all the requirements when the eina move will be finished |
554 | requirements_ecore="eina >= 1.1.0 ${requirements_ecore}" | 543 | requirements_ecore="eina >= 1.2.0 ${requirements_ecore}" |
555 | requirements_ecore_con="ecore >= 1.1.0 eina >= 1.1.0 ${requirements_ecore_con}" | 544 | requirements_ecore_con="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_con}" |
556 | #requirements_ecore_config="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_config}" | 545 | #requirements_ecore_config="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_config}" |
557 | requirements_ecore_directfb="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_directfb}" | 546 | requirements_ecore_directfb="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_directfb}" |
558 | requirements_ecore_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_evas}" | 547 | requirements_ecore_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_evas}" |
559 | requirements_ecore_fb="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_fb}" | 548 | requirements_ecore_fb="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_fb}" |
560 | requirements_ecore_file="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_file}" | 549 | requirements_ecore_file="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_file}" |
561 | requirements_ecore_imf="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_imf}" | 550 | requirements_ecore_imf="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_imf}" |
562 | requirements_ecore_imf_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_imf_evas}" | 551 | requirements_ecore_imf_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_imf_evas}" |
563 | requirements_ecore_input="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_input}" | 552 | requirements_ecore_input="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_input}" |
564 | requirements_ecore_input_evas="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_input_evas}" | 553 | requirements_ecore_input_evas="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_input_evas}" |
565 | requirements_ecore_ipc="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_ipc}" | 554 | requirements_ecore_ipc="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_ipc}" |
566 | requirements_ecore_cocoa="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_cocoa}" | 555 | requirements_ecore_cocoa="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_cocoa}" |
567 | requirements_ecore_sdl="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_sdl}" | 556 | requirements_ecore_sdl="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_sdl}" |
568 | requirements_ecore_psl1ght="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_sdl}" | 557 | requirements_ecore_psl1ght="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_sdl}" |
569 | requirements_ecore_win32="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_win32}" | 558 | requirements_ecore_win32="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_win32}" |
570 | requirements_ecore_wince="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_wince}" | 559 | requirements_ecore_wince="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_wince}" |
571 | requirements_ecore_x="ecore >= 1.1.99 eina >= 1.1.0 ${requirements_ecore_x}" | 560 | requirements_ecore_x="ecore >= 1.2.0 eina >= 1.2.0 ${requirements_ecore_x}" |
572 | 561 | ||
573 | 562 | ||
574 | # glib support (main loop integration) | 563 | # glib support (main loop integration) |
@@ -637,6 +626,45 @@ PKG_CHECK_MODULES([DIRECTFB], | |||
637 | 626 | ||
638 | # Xlib and XCB (ecore_x) | 627 | # Xlib and XCB (ecore_x) |
639 | 628 | ||
629 | AC_CHECK_DECL([MAXHOSTNAMELEN], [FOUND_MAXHOSTNAMELEN=yes]) | ||
630 | |||
631 | if test "x${FOUND_MAXHOSTNAMELEN}" != "xyes" ; then | ||
632 | AC_MSG_CHECKING([for header that defines MAXHOSTNAMELEN]) | ||
633 | FOUND_MAXHOSTNAMELEN="not found" | ||
634 | |||
635 | AC_COMPILE_IFELSE( | ||
636 | [ | ||
637 | AC_LANG_PROGRAM( | ||
638 | [[ | ||
639 | #include <sys/param.h> | ||
640 | ]], | ||
641 | [[ | ||
642 | int h = MAXHOSTNAMELEN; | ||
643 | ]]) | ||
644 | ], | ||
645 | [ | ||
646 | FOUND_MAXHOSTNAMELEN="sys/param.h" | ||
647 | AC_DEFINE([NEED_SYS_PARAM_H], [1], [Define to 1 if you need <sys/param.h> to define MAXHOSTNAMELEN]) | ||
648 | ]) | ||
649 | |||
650 | AC_COMPILE_IFELSE( | ||
651 | [ | ||
652 | AC_LANG_PROGRAM( | ||
653 | [[ | ||
654 | #include <netdb.h> | ||
655 | ]], | ||
656 | [[ | ||
657 | int h = MAXHOSTNAMELEN; | ||
658 | ]]) | ||
659 | ], | ||
660 | [ | ||
661 | FOUND_MAXHOSTNAMELEN="netdb.h" | ||
662 | AC_DEFINE([NEED_NETDB_H], [1], [Define to 1 if you need <netdb.h> to define MAXHOSTNAMELEN]) | ||
663 | ]) | ||
664 | |||
665 | AC_MSG_RESULT([$FOUND_MAXHOSTNAMELEN]) | ||
666 | fi | ||
667 | |||
640 | have_x="no" | 668 | have_x="no" |
641 | have_ecore_x="no" | 669 | have_ecore_x="no" |
642 | have_ecore_x_xlib="no" | 670 | have_ecore_x_xlib="no" |
@@ -1171,7 +1199,7 @@ AM_CONDITIONAL(BUILD_ECORE_X_XCB, test $have_ecore_x_xcb = yes) | |||
1171 | 1199 | ||
1172 | # Evas library (ecore_config, ecore_input_evas, ecore_imf_evas and ecore_evas) | 1200 | # Evas library (ecore_config, ecore_input_evas, ecore_imf_evas and ecore_evas) |
1173 | 1201 | ||
1174 | PKG_CHECK_MODULES([EVAS], [evas >= 1.1.99], | 1202 | PKG_CHECK_MODULES([EVAS], [evas >= 1.2.0], |
1175 | [have_evas="yes"], | 1203 | [have_evas="yes"], |
1176 | [have_evas="no"]) | 1204 | [have_evas="no"]) |
1177 | 1205 | ||
@@ -1200,7 +1228,23 @@ esac | |||
1200 | 1228 | ||
1201 | # ecore_con | 1229 | # ecore_con |
1202 | 1230 | ||
1203 | AC_CHECK_HEADERS([arpa/inet.h arpa/nameser.h netinet/tcp.h net/if.h netinet/in.h sys/socket.h sys/un.h ws2tcpip.h netdb.h]) | 1231 | AC_CHECK_HEADERS([sys/socket.h]) |
1232 | AC_CHECK_HEADERS([net/if.h], [], [], | ||
1233 | [ | ||
1234 | #include <stdio.h> | ||
1235 | #ifdef STDC_HEADERS | ||
1236 | # include <stdlib.h> | ||
1237 | # include <stddef.h> | ||
1238 | #else | ||
1239 | # ifdef HAVE_STDLIB_H | ||
1240 | # include <stdlib.h> | ||
1241 | # endif | ||
1242 | #endif | ||
1243 | #ifdef HAVE_SYS_SOCKET_H | ||
1244 | # include <sys/socket.h> | ||
1245 | #endif | ||
1246 | ]) | ||
1247 | AC_CHECK_HEADERS([sys/un.h arpa/inet.h arpa/nameser.h netinet/tcp.h netinet/in.h ws2tcpip.h netdb.h]) | ||
1204 | 1248 | ||
1205 | if test "x${ac_cv_header_netdb_h}" = "xyes" ; then | 1249 | if test "x${ac_cv_header_netdb_h}" = "xyes" ; then |
1206 | have_addrinfo="yes" | 1250 | have_addrinfo="yes" |
@@ -1390,6 +1434,60 @@ if ! test "x${have_atfile_source}" = "xno" ; then | |||
1390 | ]) | 1434 | ]) |
1391 | fi | 1435 | fi |
1392 | 1436 | ||
1437 | SHM_OPEN_LIBS="" | ||
1438 | |||
1439 | AC_MSG_CHECKING([whether shm_open is in libc]) | ||
1440 | AC_LINK_IFELSE( | ||
1441 | [AC_LANG_PROGRAM( | ||
1442 | [[ | ||
1443 | #include <sys/mman.h> | ||
1444 | #include <sys/stat.h> | ||
1445 | #include <fcntl.h> | ||
1446 | ]], | ||
1447 | [[ | ||
1448 | int fd; | ||
1449 | fd = shm_open("/", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); | ||
1450 | shm_unlink("/"); | ||
1451 | ]])], | ||
1452 | [ | ||
1453 | have_shm_open="yes" | ||
1454 | AC_DEFINE(HAVE_SHM_OPEN, 1, [Have shm_open() call]) | ||
1455 | ], | ||
1456 | [have_shm_open="no"]) | ||
1457 | LIBS="${LIBS_save}" | ||
1458 | AC_MSG_RESULT([${have_shm_open}]) | ||
1459 | |||
1460 | if ! test "x${have_shm_open}" = "xyes" ; then | ||
1461 | AC_MSG_CHECKING([whether shm_open is in librt]) | ||
1462 | LIBS_save="${LIBS}" | ||
1463 | LIBS="${LIBS} -lrt" | ||
1464 | AC_LINK_IFELSE( | ||
1465 | [AC_LANG_PROGRAM( | ||
1466 | [[ | ||
1467 | #include <sys/mman.h> | ||
1468 | #include <sys/stat.h> | ||
1469 | #include <fcntl.h> | ||
1470 | ]], | ||
1471 | [[ | ||
1472 | int fd; | ||
1473 | fd = shm_open("/", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); | ||
1474 | shm_unlink("/"); | ||
1475 | ]])], | ||
1476 | [ | ||
1477 | have_shm_open="yes" | ||
1478 | AC_DEFINE(HAVE_SHM_OPEN, 1, [Have shm_open() call]) | ||
1479 | SHM_OPEN_LIBS="-lrt" | ||
1480 | ], | ||
1481 | [have_shm_open="no"]) | ||
1482 | LIBS="${LIBS_save}" | ||
1483 | AC_MSG_RESULT([${have_shm_open}]) | ||
1484 | fi | ||
1485 | |||
1486 | AC_SUBST([SHM_OPEN_LIBS]) | ||
1487 | |||
1488 | AC_MSG_CHECKING([whether shm_open is available]) | ||
1489 | AC_MSG_RESULT([${have_shm_open}]) | ||
1490 | |||
1393 | ### Checks for optionnal feature | 1491 | ### Checks for optionnal feature |
1394 | AC_CHECK_FUNC([mallinfo], | 1492 | AC_CHECK_FUNC([mallinfo], |
1395 | [ | 1493 | [ |
@@ -1485,8 +1583,8 @@ AM_CONDITIONAL([HAVE_CARES], [test "x${have_cares}" = "xyes"]) | |||
1485 | # ecore_ipc | 1583 | # ecore_ipc |
1486 | ECORE_CHECK_MODULE([ipc], [${want_ecore_ipc}], [Ipc], [${have_ecore_con}], | 1584 | ECORE_CHECK_MODULE([ipc], [${want_ecore_ipc}], [Ipc], [${have_ecore_con}], |
1487 | [ | 1585 | [ |
1488 | requirements_ecore_ipc="ecore-con >= 1.1.99 ${requirements_ecore_ipc}" | 1586 | requirements_ecore_ipc="ecore-con >= 1.2.0 ${requirements_ecore_ipc}" |
1489 | requirements_ecore_evas="ecore-ipc >= 1.1.99 ${requirements_ecore_evas}" | 1587 | requirements_ecore_evas="ecore-ipc >= 1.2.0 ${requirements_ecore_evas}" |
1490 | ]) | 1588 | ]) |
1491 | 1589 | ||
1492 | # ecore_file | 1590 | # ecore_file |
@@ -1501,7 +1599,7 @@ if test "x${have_ecore_file}" = "xyes" ; then | |||
1501 | ECORE_CHECK_NOTIFY_WIN32([${want_notify_win32}], [have_notify_win32="yes"], [have_notify_win32="no"]) | 1599 | ECORE_CHECK_NOTIFY_WIN32([${want_notify_win32}], [have_notify_win32="yes"], [have_notify_win32="no"]) |
1502 | 1600 | ||
1503 | if test "x${have_ecore_con}" = "xyes" ; then | 1601 | if test "x${have_ecore_con}" = "xyes" ; then |
1504 | requirements_ecore_file="ecore-con >= 1.1.99 ${requirements_ecore_file}" | 1602 | requirements_ecore_file="ecore-con >= 1.2.0 ${requirements_ecore_file}" |
1505 | else | 1603 | else |
1506 | ECORE_CHECK_CURL([${want_curl}], | 1604 | ECORE_CHECK_CURL([${want_curl}], |
1507 | [ | 1605 | [ |
@@ -1520,7 +1618,7 @@ fi | |||
1520 | #fi | 1618 | #fi |
1521 | 1619 | ||
1522 | #ECORE_CHECK_MODULE([config], [${want_ecore_config}], [Config], [${ecore_config_deps}], | 1620 | #ECORE_CHECK_MODULE([config], [${want_ecore_config}], [Config], [${ecore_config_deps}], |
1523 | # [requirements_ecore_config="ecore-ipc >= 1.1.99 evas >= 1.1.99 eet >= 1.5.0 ${requirements_ecore_config}"]) | 1621 | # [requirements_ecore_config="ecore-ipc >= 1.2.0 evas >= 1.2.0 eet >= 1.6.0 ${requirements_ecore_config}"]) |
1524 | 1622 | ||
1525 | AM_CONDITIONAL(BUILD_ECORE_CONFIG, false) | 1623 | AM_CONDITIONAL(BUILD_ECORE_CONFIG, false) |
1526 | 1624 | ||
@@ -1536,12 +1634,12 @@ if test "x${have_ecore_imf}" = "xyes" -a "x${have_evas}" = "xyes" ; then | |||
1536 | fi | 1634 | fi |
1537 | 1635 | ||
1538 | ECORE_CHECK_MODULE([imf-evas], [${want_ecore_imf}], [Imf_Evas], [${ecore_imf_evas_deps}], | 1636 | ECORE_CHECK_MODULE([imf-evas], [${want_ecore_imf}], [Imf_Evas], [${ecore_imf_evas_deps}], |
1539 | [requirements_ecore_imf_evas="ecore-imf >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_imf_evas}"]) | 1637 | [requirements_ecore_imf_evas="ecore-imf >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_imf_evas}"]) |
1540 | 1638 | ||
1541 | # ecore_input{_evas} | 1639 | # ecore_input{_evas} |
1542 | ECORE_CHECK_MODULE([input], [${want_ecore_input}], [Input]) | 1640 | ECORE_CHECK_MODULE([input], [${want_ecore_input}], [Input]) |
1543 | ECORE_CHECK_MODULE([input-evas], [${want_ecore_input}], [Input_Evas], [${have_evas}], | 1641 | ECORE_CHECK_MODULE([input-evas], [${want_ecore_input}], [Input_Evas], [${have_evas}], |
1544 | [requirements_ecore_input_evas="ecore-input >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_input}"]) | 1642 | [requirements_ecore_input_evas="ecore-input >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_input}"]) |
1545 | 1643 | ||
1546 | # ecore_imf_xim | 1644 | # ecore_imf_xim |
1547 | AM_CONDITIONAL(BUILD_ECORE_IMF_XIM, false) | 1645 | AM_CONDITIONAL(BUILD_ECORE_IMF_XIM, false) |
@@ -1555,7 +1653,7 @@ if test "x${have_ecore_imf}" = "xyes" \ | |||
1555 | fi | 1653 | fi |
1556 | 1654 | ||
1557 | ECORE_CHECK_MODULE([imf-xim], [${want_ecore_imf}], [Imf_XIM], [${ecore_imf_xim_deps}], | 1655 | ECORE_CHECK_MODULE([imf-xim], [${want_ecore_imf}], [Imf_XIM], [${ecore_imf_xim_deps}], |
1558 | [requirements_ecore_imf_xim="ecore-imf >= 1.1.99 ecore-x >= 1.1.99 ecore-input >= 1.1.99 ${requirements_ecore_imf_xim}"]) | 1656 | [requirements_ecore_imf_xim="ecore-imf >= 1.2.0 ecore-x >= 1.2.0 ecore-input >= 1.2.0 ${requirements_ecore_imf_xim}"]) |
1559 | 1657 | ||
1560 | # ecore_imf_scim | 1658 | # ecore_imf_scim |
1561 | PKG_CHECK_MODULES([SCIM], [scim], [have_scim="yes"], [have_scim="no"]) | 1659 | PKG_CHECK_MODULES([SCIM], [scim], [have_scim="yes"], [have_scim="no"]) |
@@ -1571,7 +1669,7 @@ if test "x${have_ecore_imf}" = "xyes" \ | |||
1571 | fi | 1669 | fi |
1572 | 1670 | ||
1573 | ECORE_CHECK_MODULE([imf-scim], [${want_ecore_imf}], [Imf_SCIM], [${ecore_imf_scim_deps}], | 1671 | ECORE_CHECK_MODULE([imf-scim], [${want_ecore_imf}], [Imf_SCIM], [${ecore_imf_scim_deps}], |
1574 | [requirements_ecore_imf_scim="ecore-imf >= 1.1.0 ecore-x >= 1.1.0 ecore-input >= 1.1.0 ${requirements_ecore_imf_scim}"]) | 1672 | [requirements_ecore_imf_scim="ecore-imf >= 1.2.0 ecore-x >= 1.2.0 ecore-input >= 1.2.0 ${requirements_ecore_imf_scim}"]) |
1575 | 1673 | ||
1576 | ## Graphic systems | 1674 | ## Graphic systems |
1577 | 1675 | ||
@@ -1586,7 +1684,7 @@ fi | |||
1586 | ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}], | 1684 | ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}], |
1587 | [ | 1685 | [ |
1588 | ecore_x_libs="$ecore_x_libs $x_libs" | 1686 | ecore_x_libs="$ecore_x_libs $x_libs" |
1589 | requirements_ecore_x="ecore-input >= 1.1.99 ${requirements_ecore_x}" | 1687 | requirements_ecore_x="ecore-input >= 1.2.0 ${requirements_ecore_x}" |
1590 | ]) | 1688 | ]) |
1591 | 1689 | ||
1592 | # ecore_win32 | 1690 | # ecore_win32 |
@@ -1594,7 +1692,7 @@ ECORE_CHECK_MODULE([x], [${want_ecore_x}], [X], [${ecore_x_deps}], | |||
1594 | ECORE_CHECK_MODULE([win32], [${want_ecore_win32}], [Win32], [${have_ecore_input}], | 1692 | ECORE_CHECK_MODULE([win32], [${want_ecore_win32}], [Win32], [${have_ecore_input}], |
1595 | [ | 1693 | [ |
1596 | ecore_win32_libs="-lole32 -lgdi32" | 1694 | ecore_win32_libs="-lole32 -lgdi32" |
1597 | requirements_ecore_win32="ecore-input >= 1.1.99 ${requirements_ecore_win32}" | 1695 | requirements_ecore_win32="ecore-input >= 1.2.0 ${requirements_ecore_win32}" |
1598 | ]) | 1696 | ]) |
1599 | AC_SUBST(ecore_win32_libs) | 1697 | AC_SUBST(ecore_win32_libs) |
1600 | 1698 | ||
@@ -1606,7 +1704,7 @@ if test "x${have_ecore_input}" = "xyes" -a "x${have_cocoa}" = "xyes" ; then | |||
1606 | fi | 1704 | fi |
1607 | 1705 | ||
1608 | ECORE_CHECK_MODULE([cocoa], [${want_ecore_cocoa}], [Cocoa], [${ecore_cocoa_deps}], | 1706 | ECORE_CHECK_MODULE([cocoa], [${want_ecore_cocoa}], [Cocoa], [${ecore_cocoa_deps}], |
1609 | [requirements_ecore_cocoa="ecore-input >= 1.1.99 ${requirements_ecore_cocoa}"]) | 1707 | [requirements_ecore_cocoa="ecore-input >= 1.2.0 ${requirements_ecore_cocoa}"]) |
1610 | 1708 | ||
1611 | # ecore_sdl | 1709 | # ecore_sdl |
1612 | 1710 | ||
@@ -1616,10 +1714,10 @@ if test "x${have_sdl}" = "xyes" -a "x${have_ecore_input}" = "xyes" ; then | |||
1616 | fi | 1714 | fi |
1617 | 1715 | ||
1618 | ECORE_CHECK_MODULE([sdl], [${want_ecore_sdl}], [Sdl], [${ecore_sdl_deps}], | 1716 | ECORE_CHECK_MODULE([sdl], [${want_ecore_sdl}], [Sdl], [${ecore_sdl_deps}], |
1619 | [requirements_ecore_sdl="ecore-input >= 1.1.99 ${requirements_ecore_sdl}"]) | 1717 | [requirements_ecore_sdl="ecore-input >= 1.2.0 ${requirements_ecore_sdl}"]) |
1620 | 1718 | ||
1621 | ECORE_CHECK_MODULE([psl1ght], [${want_ecore_psl1ght}], [psl1ght], [${ecore_psl1ght_deps}], | 1719 | ECORE_CHECK_MODULE([psl1ght], [${want_ecore_psl1ght}], [psl1ght], [${ecore_psl1ght_deps}], |
1622 | [requirements_ecore_psl1ght="ecore-input >= 1.1.99 ${requirements_ecore_psl1ght}"]) | 1720 | [requirements_ecore_psl1ght="ecore-input >= 1.2.0 ${requirements_ecore_psl1ght}"]) |
1623 | 1721 | ||
1624 | # ecore_fb | 1722 | # ecore_fb |
1625 | ECORE_CHECK_MODULE([fb], [${want_ecore_fb}], [FB], [$have_fb]) | 1723 | ECORE_CHECK_MODULE([fb], [${want_ecore_fb}], [FB], [$have_fb]) |
@@ -1641,19 +1739,19 @@ ECORE_CHECK_MODULE([directfb], [${want_ecore_directfb}], [DirectFB], [${have_dir | |||
1641 | # ecore_wince | 1739 | # ecore_wince |
1642 | 1740 | ||
1643 | ECORE_CHECK_MODULE([wince], [${want_ecore_wince}], [WinCE], [${have_ecore_input}], | 1741 | ECORE_CHECK_MODULE([wince], [${want_ecore_wince}], [WinCE], [${have_ecore_input}], |
1644 | [requirements_ecore_win32="ecore-input >= 1.1.99 ${requirements_ecore_win32}"]) | 1742 | [requirements_ecore_win32="ecore-input >= 1.2.0 ${requirements_ecore_win32}"]) |
1645 | 1743 | ||
1646 | ## Ecore Evas | 1744 | ## Ecore Evas |
1647 | 1745 | ||
1648 | # ecore_evas | 1746 | # ecore_evas |
1649 | 1747 | ||
1650 | ecore_evas_deps="no" | 1748 | ecore_evas_deps="no" |
1651 | if test "x${have_evas}" = "xyes" -a "x${have_ecore_input}" = "xyes" -a "x${have_ecore_input_evas}" = "xyes" ; then | 1749 | if test "x${have_evas}" = "xyes" && test "x${have_ecore_input}" = "xyes" && test "x${have_ecore_input_evas}" = "xyes" ; then |
1652 | ecore_evas_deps="yes" | 1750 | ecore_evas_deps="yes" |
1653 | fi | 1751 | fi |
1654 | 1752 | ||
1655 | ECORE_CHECK_MODULE([evas], [${want_ecore_evas}], [Evas], [${ecore_evas_deps}], | 1753 | ECORE_CHECK_MODULE([evas], [${want_ecore_evas}], [Evas], [${ecore_evas_deps}], |
1656 | [requirements_ecore_evas="ecore-input >= 1.1.99 ecore-input-evas >= 1.1.99 evas >= 1.1.99 ${requirements_ecore_evas}"]) | 1754 | [requirements_ecore_evas="ecore-input >= 1.2.0 ecore-input-evas >= 1.2.0 evas >= 1.2.0 ${requirements_ecore_evas}"]) |
1657 | 1755 | ||
1658 | # ecore_evas_buffer | 1756 | # ecore_evas_buffer |
1659 | 1757 | ||
@@ -1743,7 +1841,7 @@ if test "x$have_ecore_evas_software_x11" = "xyes" -o \ | |||
1743 | "x$have_ecore_evas_software_16_x11" = "xyes" -o \ | 1841 | "x$have_ecore_evas_software_16_x11" = "xyes" -o \ |
1744 | "x$have_ecore_evas_software_xcb" = "xyes"; then | 1842 | "x$have_ecore_evas_software_xcb" = "xyes"; then |
1745 | AC_DEFINE(BUILD_ECORE_EVAS_X11, 1, [Support for X Window Engines in Ecore_Evas]) | 1843 | AC_DEFINE(BUILD_ECORE_EVAS_X11, 1, [Support for X Window Engines in Ecore_Evas]) |
1746 | requirements_ecore_evas="ecore-x >= 1.1.99 ${requirements_ecore_evas}" | 1844 | requirements_ecore_evas="ecore-x >= 1.2.0 ${requirements_ecore_evas}" |
1747 | fi | 1845 | fi |
1748 | 1846 | ||
1749 | # ecore_evas_win32 | 1847 | # ecore_evas_win32 |
@@ -1779,16 +1877,18 @@ if test "x${have_ecore_evas_software_gdi}" = "xyes" -o \ | |||
1779 | "x${have_ecore_evas_opengl_glew}" = "xyes" -o \ | 1877 | "x${have_ecore_evas_opengl_glew}" = "xyes" -o \ |
1780 | "x${have_ecore_evas_software_16_ddraw}" = "xyes" ; then | 1878 | "x${have_ecore_evas_software_16_ddraw}" = "xyes" ; then |
1781 | AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas]) | 1879 | AC_DEFINE(BUILD_ECORE_EVAS_WIN32, 1, [Support for Win32 Engine in Ecore_Evas]) |
1782 | requirements_ecore_evas="ecore-win32 >= 1.1.99 ${requirements_ecore_evas}" | 1880 | requirements_ecore_evas="ecore-win32 >= 1.2.0 ${requirements_ecore_evas}" |
1783 | fi | 1881 | fi |
1784 | 1882 | ||
1785 | # ecore_evas_software_sdl | 1883 | # ecore_evas_software_sdl |
1786 | 1884 | ||
1787 | ECORE_EVAS_CHECK_MODULE([software-sdl], | 1885 | have_ecore_evas_software_sdl="no" |
1788 | [${want_ecore_evas_software_sdl}], | 1886 | if test "x${have_ecore_sdl}" = "xyes"; then |
1789 | [Software SDL], | 1887 | requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}" |
1790 | [${have_ecore_sdl}], | 1888 | have_ecore_evas_software_sdl="yes" |
1791 | [requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}"]) | 1889 | AC_DEFINE(BUILD_ECORE_EVAS_SOFTWARE_SDL, 1, [Support for Software SDL Engine in Ecore_Evas]) |
1890 | requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}" | ||
1891 | fi | ||
1792 | 1892 | ||
1793 | # ecore_evas_gl_sdl | 1893 | # ecore_evas_gl_sdl |
1794 | 1894 | ||
@@ -1796,7 +1896,7 @@ ECORE_EVAS_CHECK_MODULE([opengl-sdl], | |||
1796 | [${want_ecore_evas_gl_sdl}], | 1896 | [${want_ecore_evas_gl_sdl}], |
1797 | [OpenGL SDL], | 1897 | [OpenGL SDL], |
1798 | [${have_ecore_sdl}], | 1898 | [${have_ecore_sdl}], |
1799 | [requirements_ecore_evas="ecore-sdl >= 1.1.99 ${requirements_ecore_evas}"]) | 1899 | [requirements_ecore_evas="ecore-sdl >= 1.2.0 ${requirements_ecore_evas}"]) |
1800 | 1900 | ||
1801 | # ecore_evas_cocoa | 1901 | # ecore_evas_cocoa |
1802 | 1902 | ||
@@ -1804,7 +1904,7 @@ ECORE_EVAS_CHECK_MODULE([opengl-cocoa], | |||
1804 | [${want_ecore_evas_gl_cocoa}], | 1904 | [${want_ecore_evas_gl_cocoa}], |
1805 | [OpenGL Cocoa], | 1905 | [OpenGL Cocoa], |
1806 | [${have_ecore_cocoa}], | 1906 | [${have_ecore_cocoa}], |
1807 | [requirements_ecore_evas="ecore-cocoa >= 1.1.99 ${requirements_ecore_evas}"]) | 1907 | [requirements_ecore_evas="ecore-cocoa >= 1.2.0 ${requirements_ecore_evas}"]) |
1808 | 1908 | ||
1809 | # ecore_evas_directfb | 1909 | # ecore_evas_directfb |
1810 | 1910 | ||
@@ -1812,7 +1912,7 @@ ECORE_EVAS_CHECK_MODULE([directfb], | |||
1812 | [${want_ecore_evas_directfb}], | 1912 | [${want_ecore_evas_directfb}], |
1813 | [DirectFB], | 1913 | [DirectFB], |
1814 | [${have_ecore_directfb}], | 1914 | [${have_ecore_directfb}], |
1815 | [requirements_ecore_evas="ecore-directfb >= 1.1.99 ${requirements_ecore_evas}"]) | 1915 | [requirements_ecore_evas="ecore-directfb >= 1.2.0 ${requirements_ecore_evas}"]) |
1816 | 1916 | ||
1817 | # ecore_evas_fb | 1917 | # ecore_evas_fb |
1818 | 1918 | ||
@@ -1820,7 +1920,7 @@ ECORE_EVAS_CHECK_MODULE([fb], | |||
1820 | [${want_ecore_evas_fb}], | 1920 | [${want_ecore_evas_fb}], |
1821 | [Linux Framebuffer], | 1921 | [Linux Framebuffer], |
1822 | [${have_ecore_fb}], | 1922 | [${have_ecore_fb}], |
1823 | [requirements_ecore_evas="ecore-fb >= 1.1.99 ${requirements_ecore_evas}"]) | 1923 | [requirements_ecore_evas="ecore-fb >= 1.2.0 ${requirements_ecore_evas}"]) |
1824 | 1924 | ||
1825 | # ecore_evas_wince | 1925 | # ecore_evas_wince |
1826 | 1926 | ||
@@ -1828,7 +1928,7 @@ ECORE_EVAS_CHECK_MODULE([software-16-wince], | |||
1828 | [${want_ecore_evas_software_16_wince}], | 1928 | [${want_ecore_evas_software_16_wince}], |
1829 | [16 bpp Software Windows CE], | 1929 | [16 bpp Software Windows CE], |
1830 | [${have_ecore_wince}], | 1930 | [${have_ecore_wince}], |
1831 | [requirements_ecore_evas="ecore-wince >= 1.1.99 ${requirements_ecore_evas}"]) | 1931 | [requirements_ecore_evas="ecore-wince >= 1.2.0 ${requirements_ecore_evas}"]) |
1832 | 1932 | ||
1833 | # ecore_evas_ews | 1933 | # ecore_evas_ews |
1834 | 1934 | ||
@@ -1837,20 +1937,38 @@ ECORE_EVAS_CHECK_MODULE_FULL([ews], [software-buffer], | |||
1837 | [Ecore Evas Single Process Windowing System], | 1937 | [Ecore Evas Single Process Windowing System], |
1838 | [yes], []) | 1938 | [yes], []) |
1839 | 1939 | ||
1940 | # ecore_evas_extn | ||
1941 | |||
1942 | have_extn="yes" | ||
1943 | if test "x${have_ecore_ipc}" = "xno" || \ | ||
1944 | test "x${have_ecore_evas_software_buffer}" = "xno" || \ | ||
1945 | test "x${have_shm_open}" = "xno" ; then | ||
1946 | have_extn="no" | ||
1947 | fi | ||
1948 | |||
1949 | dnl THIS IS SPECIAL - dont use normal ECORE_EVAS_CHECK_MODULE | ||
1950 | have_ecore_evas_extn="no" | ||
1951 | if test "x${want_ecore_evas_extn}" = "xyes" && \ | ||
1952 | test "x${have_extn}" = "xyes" && \ | ||
1953 | test "x${have_ecore_evas}" = "xyes"; then | ||
1954 | AC_DEFINE([BUILD_ECORE_EVAS_EXTN], [1], [Support for Extn Engine in Ecore_Evas]) | ||
1955 | have_ecore_evas_extn="yes" | ||
1956 | fi | ||
1957 | |||
1840 | # ecore_evas_psl1ght | 1958 | # ecore_evas_psl1ght |
1841 | 1959 | ||
1842 | ECORE_EVAS_CHECK_MODULE([psl1ght], | 1960 | ECORE_EVAS_CHECK_MODULE([psl1ght], |
1843 | [${want_ecore_evas_psl1ght}], | 1961 | [${want_ecore_evas_psl1ght}], |
1844 | [PSL1GHT], | 1962 | [PSL1GHT], |
1845 | [${have_ecore_psl1ght}], | 1963 | [${have_ecore_psl1ght}], |
1846 | [requirements_ecore_evas="ecore-psl1ght >= 1.1.99 ${requirements_ecore_evas}"]) | 1964 | [requirements_ecore_evas="ecore-psl1ght >= 1.2.0 ${requirements_ecore_evas}"]) |
1847 | 1965 | ||
1848 | ### WAYLAND | 1966 | ### WAYLAND |
1849 | 1967 | ||
1850 | ecore_wayland_deps="no" | 1968 | ecore_wayland_deps="no" |
1851 | have_wayland="no" | 1969 | have_wayland="no" |
1852 | if test "x${want_ecore_wayland}" = "xyes" ; then | 1970 | if test "x${want_ecore_wayland}" = "xyes" ; then |
1853 | PKG_CHECK_MODULES([WAYLAND], [wayland-client xkbcommon], [have_wayland="yes"], [have_wayland="no"]) | 1971 | PKG_CHECK_MODULES([WAYLAND], [egl wayland-egl wayland-client xkbcommon], [have_wayland="yes"], [have_wayland="no"]) |
1854 | fi | 1972 | fi |
1855 | if test "x${have_ecore_input}" = "xyes" -a "x${have_wayland}" = "xyes" ; then | 1973 | if test "x${have_ecore_input}" = "xyes" -a "x${have_wayland}" = "xyes" ; then |
1856 | ecore_wayland_deps="yes" | 1974 | ecore_wayland_deps="yes" |
@@ -1858,7 +1976,7 @@ fi | |||
1858 | 1976 | ||
1859 | ECORE_CHECK_MODULE([wayland], [${want_ecore_wayland}], [Wayland], [${ecore_wayland_deps}]) | 1977 | ECORE_CHECK_MODULE([wayland], [${want_ecore_wayland}], [Wayland], [${ecore_wayland_deps}]) |
1860 | if test "x${have_ecore_wayland}" = "xyes" ; then | 1978 | if test "x${have_ecore_wayland}" = "xyes" ; then |
1861 | requirements_ecore_wayland="ecore-input >= 1.1.0 wayland-client xkbcommon ${requirements_ecore_wayland}" | 1979 | requirements_ecore_wayland="ecore-input >= 1.2.0 egl wayland-egl wayland-client xkbcommon ${requirements_ecore_wayland}" |
1862 | fi | 1980 | fi |
1863 | 1981 | ||
1864 | ECORE_EVAS_CHECK_MODULE_FULL([wayland-shm], [wayland-shm], | 1982 | ECORE_EVAS_CHECK_MODULE_FULL([wayland-shm], [wayland-shm], |
@@ -1867,7 +1985,7 @@ ECORE_EVAS_CHECK_MODULE_FULL([wayland-shm], [wayland-shm], | |||
1867 | [${have_ecore_wayland}], | 1985 | [${have_ecore_wayland}], |
1868 | [requirements_ecore_evas="${requirements_ecore_wayland} ${requirements_ecore_evas}"]) | 1986 | [requirements_ecore_evas="${requirements_ecore_wayland} ${requirements_ecore_evas}"]) |
1869 | 1987 | ||
1870 | ECORE_EVAS_CHECK_MODULE_FULL([wayland-egl], [wayland-egl], | 1988 | ECORE_EVAS_CHECK_MODULE_FULL([wayland-egl], [wayland-egl egl], |
1871 | [${want_ecore_evas_wayland_egl}], | 1989 | [${want_ecore_evas_wayland_egl}], |
1872 | [Wayland Egl], | 1990 | [Wayland Egl], |
1873 | [${have_ecore_wayland}], | 1991 | [${have_ecore_wayland}], |
@@ -1878,6 +1996,10 @@ ECORE_EVAS_CHECK_MODULE_FULL([wayland-egl], [wayland-egl], | |||
1878 | fi | 1996 | fi |
1879 | ]) | 1997 | ]) |
1880 | 1998 | ||
1999 | ### Unit tests | ||
2000 | |||
2001 | EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"]) | ||
2002 | |||
1881 | ### install and build examples | 2003 | ### install and build examples |
1882 | 2004 | ||
1883 | EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"]) | 2005 | EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"]) |
@@ -2112,6 +2234,7 @@ if test "x${have_ecore_evas}" = "xyes" ; then | |||
2112 | echo " Sing.Proc. Windowing System: $have_ecore_evas_ews" | 2234 | echo " Sing.Proc. Windowing System: $have_ecore_evas_ews" |
2113 | echo " Wayland Shm................: $have_ecore_evas_wayland_shm" | 2235 | echo " Wayland Shm................: $have_ecore_evas_wayland_shm" |
2114 | echo " Wayland Egl................: $have_ecore_evas_wayland_egl" | 2236 | echo " Wayland Egl................: $have_ecore_evas_wayland_egl" |
2237 | echo " Extn (Plug/socket Extn)....: $have_ecore_evas_extn" | ||
2115 | fi | 2238 | fi |
2116 | echo | 2239 | echo |
2117 | echo " Tests................: ${enable_tests}" | 2240 | echo " Tests................: ${enable_tests}" |