diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/evas/aclocal.m4 | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to 'libraries/evas/aclocal.m4')
-rw-r--r-- | libraries/evas/aclocal.m4 | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/libraries/evas/aclocal.m4 b/libraries/evas/aclocal.m4 index f74cf11..a816a9b 100644 --- a/libraries/evas/aclocal.m4 +++ b/libraries/evas/aclocal.m4 | |||
@@ -13,14 +13,13 @@ | |||
13 | 13 | ||
14 | m4_ifndef([AC_AUTOCONF_VERSION], | 14 | m4_ifndef([AC_AUTOCONF_VERSION], |
15 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 15 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
16 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, | 16 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, |
17 | [m4_warning([this file was generated for autoconf 2.67. | 17 | [m4_warning([this file was generated for autoconf 2.65. |
18 | You have another version of autoconf. It may work, but is not guaranteed to. | 18 | You have another version of autoconf. It may work, but is not guaranteed to. |
19 | If you have problems, you may need to regenerate the build system entirely. | 19 | If you have problems, you may need to regenerate the build system entirely. |
20 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) | 20 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
21 | 21 | ||
22 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | 22 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
23 | # serial 1 (pkg-config-0.24) | ||
24 | # | 23 | # |
25 | # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. | 24 | # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
26 | # | 25 | # |
@@ -48,10 +47,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.]) | |||
48 | AC_DEFUN([PKG_PROG_PKG_CONFIG], | 47 | AC_DEFUN([PKG_PROG_PKG_CONFIG], |
49 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) | 48 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
50 | m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) | 49 | m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) |
51 | AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) | 50 | AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl |
52 | AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) | ||
53 | AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) | ||
54 | |||
55 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | 51 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
56 | AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) | 52 | AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
57 | fi | 53 | fi |
@@ -64,6 +60,7 @@ if test -n "$PKG_CONFIG"; then | |||
64 | AC_MSG_RESULT([no]) | 60 | AC_MSG_RESULT([no]) |
65 | PKG_CONFIG="" | 61 | PKG_CONFIG="" |
66 | fi | 62 | fi |
63 | |||
67 | fi[]dnl | 64 | fi[]dnl |
68 | ])# PKG_PROG_PKG_CONFIG | 65 | ])# PKG_PROG_PKG_CONFIG |
69 | 66 | ||
@@ -72,31 +69,34 @@ fi[]dnl | |||
72 | # Check to see whether a particular set of modules exists. Similar | 69 | # Check to see whether a particular set of modules exists. Similar |
73 | # to PKG_CHECK_MODULES(), but does not set variables or print errors. | 70 | # to PKG_CHECK_MODULES(), but does not set variables or print errors. |
74 | # | 71 | # |
75 | # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | 72 | # |
76 | # only at the first occurence in configure.ac, so if the first place | 73 | # Similar to PKG_CHECK_MODULES, make sure that the first instance of |
77 | # it's called might be skipped (such as if it is within an "if", you | 74 | # this or PKG_CHECK_MODULES is called, or make sure to call |
78 | # have to call PKG_CHECK_EXISTS manually | 75 | # PKG_CHECK_EXISTS manually |
79 | # -------------------------------------------------------------- | 76 | # -------------------------------------------------------------- |
80 | AC_DEFUN([PKG_CHECK_EXISTS], | 77 | AC_DEFUN([PKG_CHECK_EXISTS], |
81 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | 78 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
82 | if test -n "$PKG_CONFIG" && \ | 79 | if test -n "$PKG_CONFIG" && \ |
83 | AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then | 80 | AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
84 | m4_default([$2], [:]) | 81 | m4_ifval([$2], [$2], [:]) |
85 | m4_ifvaln([$3], [else | 82 | m4_ifvaln([$3], [else |
86 | $3])dnl | 83 | $3])dnl |
87 | fi]) | 84 | fi]) |
88 | 85 | ||
86 | |||
89 | # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) | 87 | # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
90 | # --------------------------------------------- | 88 | # --------------------------------------------- |
91 | m4_define([_PKG_CONFIG], | 89 | m4_define([_PKG_CONFIG], |
92 | [if test -n "$$1"; then | 90 | [if test -n "$PKG_CONFIG"; then |
93 | pkg_cv_[]$1="$$1" | 91 | if test -n "$$1"; then |
94 | elif test -n "$PKG_CONFIG"; then | 92 | pkg_cv_[]$1="$$1" |
95 | PKG_CHECK_EXISTS([$3], | 93 | else |
96 | [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], | 94 | PKG_CHECK_EXISTS([$3], |
97 | [pkg_failed=yes]) | 95 | [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
98 | else | 96 | [pkg_failed=yes]) |
99 | pkg_failed=untried | 97 | fi |
98 | else | ||
99 | pkg_failed=untried | ||
100 | fi[]dnl | 100 | fi[]dnl |
101 | ])# _PKG_CONFIG | 101 | ])# _PKG_CONFIG |
102 | 102 | ||
@@ -138,17 +138,16 @@ and $1[]_LIBS to avoid the need to call pkg-config. | |||
138 | See the pkg-config man page for more details.]) | 138 | See the pkg-config man page for more details.]) |
139 | 139 | ||
140 | if test $pkg_failed = yes; then | 140 | if test $pkg_failed = yes; then |
141 | AC_MSG_RESULT([no]) | ||
142 | _PKG_SHORT_ERRORS_SUPPORTED | 141 | _PKG_SHORT_ERRORS_SUPPORTED |
143 | if test $_pkg_short_errors_supported = yes; then | 142 | if test $_pkg_short_errors_supported = yes; then |
144 | $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` | 143 | $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` |
145 | else | 144 | else |
146 | $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` | 145 | $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` |
147 | fi | 146 | fi |
148 | # Put the nasty error message in config.log where it belongs | 147 | # Put the nasty error message in config.log where it belongs |
149 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD | 148 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
150 | 149 | ||
151 | m4_default([$4], [AC_MSG_ERROR( | 150 | ifelse([$4], , [AC_MSG_ERROR(dnl |
152 | [Package requirements ($2) were not met: | 151 | [Package requirements ($2) were not met: |
153 | 152 | ||
154 | $$1_PKG_ERRORS | 153 | $$1_PKG_ERRORS |
@@ -156,24 +155,25 @@ $$1_PKG_ERRORS | |||
156 | Consider adjusting the PKG_CONFIG_PATH environment variable if you | 155 | Consider adjusting the PKG_CONFIG_PATH environment variable if you |
157 | installed software in a non-standard prefix. | 156 | installed software in a non-standard prefix. |
158 | 157 | ||
159 | _PKG_TEXT])[]dnl | 158 | _PKG_TEXT |
160 | ]) | 159 | ])], |
160 | [AC_MSG_RESULT([no]) | ||
161 | $4]) | ||
161 | elif test $pkg_failed = untried; then | 162 | elif test $pkg_failed = untried; then |
162 | AC_MSG_RESULT([no]) | 163 | ifelse([$4], , [AC_MSG_FAILURE(dnl |
163 | m4_default([$4], [AC_MSG_FAILURE( | ||
164 | [The pkg-config script could not be found or is too old. Make sure it | 164 | [The pkg-config script could not be found or is too old. Make sure it |
165 | is in your PATH or set the PKG_CONFIG environment variable to the full | 165 | is in your PATH or set the PKG_CONFIG environment variable to the full |
166 | path to pkg-config. | 166 | path to pkg-config. |
167 | 167 | ||
168 | _PKG_TEXT | 168 | _PKG_TEXT |
169 | 169 | ||
170 | To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl | 170 | To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], |
171 | ]) | 171 | [$4]) |
172 | else | 172 | else |
173 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS | 173 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
174 | $1[]_LIBS=$pkg_cv_[]$1[]_LIBS | 174 | $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
175 | AC_MSG_RESULT([yes]) | 175 | AC_MSG_RESULT([yes]) |
176 | $3 | 176 | ifelse([$3], , :, [$3]) |
177 | fi[]dnl | 177 | fi[]dnl |
178 | ])# PKG_CHECK_MODULES | 178 | ])# PKG_CHECK_MODULES |
179 | 179 | ||