Merge lp:~indicator-applet-developers/libindicator/ubuntu into lp:~ubuntu-desktop/libindicator/ubuntu
- ubuntu
- Merge into ubuntu
Proposed by
Ted Gould
Status: | Merged | ||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 272 | ||||||||||||||||||||||||||||
Proposed branch: | lp:~indicator-applet-developers/libindicator/ubuntu | ||||||||||||||||||||||||||||
Merge into: | lp:~ubuntu-desktop/libindicator/ubuntu | ||||||||||||||||||||||||||||
Diff against target: |
2067 lines (+416/-359) 12 files modified
Makefile.in (+2/-0) aclocal.m4 (+31/-31) config.guess (+59/-90) config.sub (+34/-13) configure (+242/-211) configure.ac (+2/-2) debian/changelog (+16/-1) debian/source/format (+1/-0) libindicator/Makefile.in (+2/-0) libindicator/indicator-image-helper.c (+23/-11) tests/Makefile.in (+2/-0) tools/Makefile.in (+2/-0) |
||||||||||||||||||||||||||||
To merge this branch: | bzr merge lp:~indicator-applet-developers/libindicator/ubuntu | ||||||||||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Pending | ||
Review via email: mp+32506@code.launchpad.net |
Commit message
Description of the change
0.3.11
To post a comment you must log in.
Revision history for this message
Karl Lattimer (karl-qdh) wrote : | # |
Revision history for this message
Ken VanDine (ken-vandine) wrote : | # |
It's a diff of a source package branch, which includes an import of the release tarball (configure, Makefile.in, etc). So if you made a change in this type of a packaging branch, it would pick up changes to all the autotools stuff that got touched.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile.in' |
2 | --- Makefile.in 2010-07-15 14:58:36 +0000 |
3 | +++ Makefile.in 2010-08-12 19:45:57 +0000 |
4 | @@ -170,6 +170,8 @@ |
5 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
6 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
7 | PKG_CONFIG = @PKG_CONFIG@ |
8 | +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
9 | +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
10 | PREFIX = @PREFIX@ |
11 | RANLIB = @RANLIB@ |
12 | SED = @SED@ |
13 | |
14 | === modified file 'aclocal.m4' |
15 | --- aclocal.m4 2010-07-15 14:58:36 +0000 |
16 | +++ aclocal.m4 2010-08-12 19:45:57 +0000 |
17 | @@ -13,8 +13,8 @@ |
18 | |
19 | m4_ifndef([AC_AUTOCONF_VERSION], |
20 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
21 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, |
22 | -[m4_warning([this file was generated for autoconf 2.65. |
23 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, |
24 | +[m4_warning([this file was generated for autoconf 2.67. |
25 | You have another version of autoconf. It may work, but is not guaranteed to. |
26 | If you have problems, you may need to regenerate the build system entirely. |
27 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
28 | @@ -7986,6 +7986,7 @@ |
29 | m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) |
30 | |
31 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
32 | +# serial 1 (pkg-config-0.24) |
33 | # |
34 | # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
35 | # |
36 | @@ -8013,7 +8014,10 @@ |
37 | AC_DEFUN([PKG_PROG_PKG_CONFIG], |
38 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
39 | m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) |
40 | -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl |
41 | +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
42 | +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
43 | +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) |
44 | + |
45 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
46 | AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
47 | fi |
48 | @@ -8026,7 +8030,6 @@ |
49 | AC_MSG_RESULT([no]) |
50 | PKG_CONFIG="" |
51 | fi |
52 | - |
53 | fi[]dnl |
54 | ])# PKG_PROG_PKG_CONFIG |
55 | |
56 | @@ -8035,34 +8038,31 @@ |
57 | # Check to see whether a particular set of modules exists. Similar |
58 | # to PKG_CHECK_MODULES(), but does not set variables or print errors. |
59 | # |
60 | -# |
61 | -# Similar to PKG_CHECK_MODULES, make sure that the first instance of |
62 | -# this or PKG_CHECK_MODULES is called, or make sure to call |
63 | -# PKG_CHECK_EXISTS manually |
64 | +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
65 | +# only at the first occurence in configure.ac, so if the first place |
66 | +# it's called might be skipped (such as if it is within an "if", you |
67 | +# have to call PKG_CHECK_EXISTS manually |
68 | # -------------------------------------------------------------- |
69 | AC_DEFUN([PKG_CHECK_EXISTS], |
70 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
71 | if test -n "$PKG_CONFIG" && \ |
72 | AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
73 | - m4_ifval([$2], [$2], [:]) |
74 | + m4_default([$2], [:]) |
75 | m4_ifvaln([$3], [else |
76 | $3])dnl |
77 | fi]) |
78 | |
79 | - |
80 | # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
81 | # --------------------------------------------- |
82 | m4_define([_PKG_CONFIG], |
83 | -[if test -n "$PKG_CONFIG"; then |
84 | - if test -n "$$1"; then |
85 | - pkg_cv_[]$1="$$1" |
86 | - else |
87 | - PKG_CHECK_EXISTS([$3], |
88 | - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
89 | - [pkg_failed=yes]) |
90 | - fi |
91 | -else |
92 | - pkg_failed=untried |
93 | +[if test -n "$$1"; then |
94 | + pkg_cv_[]$1="$$1" |
95 | + elif test -n "$PKG_CONFIG"; then |
96 | + PKG_CHECK_EXISTS([$3], |
97 | + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
98 | + [pkg_failed=yes]) |
99 | + else |
100 | + pkg_failed=untried |
101 | fi[]dnl |
102 | ])# _PKG_CONFIG |
103 | |
104 | @@ -8104,16 +8104,17 @@ |
105 | See the pkg-config man page for more details.]) |
106 | |
107 | if test $pkg_failed = yes; then |
108 | + AC_MSG_RESULT([no]) |
109 | _PKG_SHORT_ERRORS_SUPPORTED |
110 | if test $_pkg_short_errors_supported = yes; then |
111 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` |
112 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` |
113 | else |
114 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` |
115 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` |
116 | fi |
117 | # Put the nasty error message in config.log where it belongs |
118 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
119 | |
120 | - ifelse([$4], , [AC_MSG_ERROR(dnl |
121 | + m4_default([$4], [AC_MSG_ERROR( |
122 | [Package requirements ($2) were not met: |
123 | |
124 | $$1_PKG_ERRORS |
125 | @@ -8121,25 +8122,24 @@ |
126 | Consider adjusting the PKG_CONFIG_PATH environment variable if you |
127 | installed software in a non-standard prefix. |
128 | |
129 | -_PKG_TEXT |
130 | -])], |
131 | - [AC_MSG_RESULT([no]) |
132 | - $4]) |
133 | +_PKG_TEXT])dnl |
134 | + ]) |
135 | elif test $pkg_failed = untried; then |
136 | - ifelse([$4], , [AC_MSG_FAILURE(dnl |
137 | + AC_MSG_RESULT([no]) |
138 | + m4_default([$4], [AC_MSG_FAILURE( |
139 | [The pkg-config script could not be found or is too old. Make sure it |
140 | is in your PATH or set the PKG_CONFIG environment variable to the full |
141 | path to pkg-config. |
142 | |
143 | _PKG_TEXT |
144 | |
145 | -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], |
146 | - [$4]) |
147 | +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl |
148 | + ]) |
149 | else |
150 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
151 | $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
152 | AC_MSG_RESULT([yes]) |
153 | - ifelse([$3], , :, [$3]) |
154 | + $3 |
155 | fi[]dnl |
156 | ])# PKG_CHECK_MODULES |
157 | |
158 | |
159 | === modified file 'config.guess' |
160 | --- config.guess 2010-04-09 16:57:53 +0000 |
161 | +++ config.guess 2010-08-12 19:45:57 +0000 |
162 | @@ -1,10 +1,10 @@ |
163 | #! /bin/sh |
164 | # Attempt to guess a canonical system name. |
165 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
166 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
167 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
168 | # Free Software Foundation, Inc. |
169 | |
170 | -timestamp='2009-06-10' |
171 | +timestamp='2009-12-30' |
172 | |
173 | # This file is free software; you can redistribute it and/or modify it |
174 | # under the terms of the GNU General Public License as published by |
175 | @@ -27,16 +27,16 @@ |
176 | # the same distribution terms that you use for the rest of that program. |
177 | |
178 | |
179 | -# Originally written by Per Bothner <per@bothner.com>. |
180 | -# Please send patches to <config-patches@gnu.org>. Submit a context |
181 | -# diff and a properly formatted ChangeLog entry. |
182 | +# Originally written by Per Bothner. Please send patches (context |
183 | +# diff format) to <config-patches@gnu.org> and include a ChangeLog |
184 | +# entry. |
185 | # |
186 | # This script attempts to guess a canonical system name similar to |
187 | # config.sub. If it succeeds, it prints the system name on stdout, and |
188 | # exits with 0. Otherwise, it exits with 1. |
189 | # |
190 | -# The plan is that this can be called by configure scripts if you |
191 | -# don't specify an explicit build system type. |
192 | +# You can get the latest version of this script from: |
193 | +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
194 | |
195 | me=`echo "$0" | sed -e 's,.*/,,'` |
196 | |
197 | @@ -56,8 +56,9 @@ |
198 | GNU config.guess ($timestamp) |
199 | |
200 | Originally written by Per Bothner. |
201 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
202 | -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
203 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
204 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
205 | +Software Foundation, Inc. |
206 | |
207 | This is free software; see the source for copying conditions. There is NO |
208 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
209 | @@ -333,6 +334,9 @@ |
210 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
211 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
212 | exit ;; |
213 | + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
214 | + echo i386-pc-auroraux${UNAME_RELEASE} |
215 | + exit ;; |
216 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
217 | eval $set_cc_for_build |
218 | SUN_ARCH="i386" |
219 | @@ -807,12 +811,12 @@ |
220 | i*:PW*:*) |
221 | echo ${UNAME_MACHINE}-pc-pw32 |
222 | exit ;; |
223 | - *:Interix*:[3456]*) |
224 | + *:Interix*:*) |
225 | case ${UNAME_MACHINE} in |
226 | x86) |
227 | echo i586-pc-interix${UNAME_RELEASE} |
228 | exit ;; |
229 | - EM64T | authenticamd | genuineintel) |
230 | + authenticamd | genuineintel | EM64T) |
231 | echo x86_64-unknown-interix${UNAME_RELEASE} |
232 | exit ;; |
233 | IA64) |
234 | @@ -854,6 +858,20 @@ |
235 | i*86:Minix:*:*) |
236 | echo ${UNAME_MACHINE}-pc-minix |
237 | exit ;; |
238 | + alpha:Linux:*:*) |
239 | + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
240 | + EV5) UNAME_MACHINE=alphaev5 ;; |
241 | + EV56) UNAME_MACHINE=alphaev56 ;; |
242 | + PCA56) UNAME_MACHINE=alphapca56 ;; |
243 | + PCA57) UNAME_MACHINE=alphapca56 ;; |
244 | + EV6) UNAME_MACHINE=alphaev6 ;; |
245 | + EV67) UNAME_MACHINE=alphaev67 ;; |
246 | + EV68*) UNAME_MACHINE=alphaev68 ;; |
247 | + esac |
248 | + objdump --private-headers /bin/sh | grep -q ld.so.1 |
249 | + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
250 | + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
251 | + exit ;; |
252 | arm*:Linux:*:*) |
253 | eval $set_cc_for_build |
254 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
255 | @@ -876,6 +894,17 @@ |
256 | frv:Linux:*:*) |
257 | echo frv-unknown-linux-gnu |
258 | exit ;; |
259 | + i*86:Linux:*:*) |
260 | + LIBC=gnu |
261 | + eval $set_cc_for_build |
262 | + sed 's/^ //' << EOF >$dummy.c |
263 | + #ifdef __dietlibc__ |
264 | + LIBC=dietlibc |
265 | + #endif |
266 | +EOF |
267 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
268 | + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
269 | + exit ;; |
270 | ia64:Linux:*:*) |
271 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
272 | exit ;; |
273 | @@ -901,39 +930,18 @@ |
274 | #endif |
275 | #endif |
276 | EOF |
277 | - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' |
278 | - /^CPU/{ |
279 | - s: ::g |
280 | - p |
281 | - }'`" |
282 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
283 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
284 | ;; |
285 | or32:Linux:*:*) |
286 | echo or32-unknown-linux-gnu |
287 | exit ;; |
288 | - ppc:Linux:*:*) |
289 | - echo powerpc-unknown-linux-gnu |
290 | - exit ;; |
291 | - ppc64:Linux:*:*) |
292 | - echo powerpc64-unknown-linux-gnu |
293 | - exit ;; |
294 | - alpha:Linux:*:*) |
295 | - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
296 | - EV5) UNAME_MACHINE=alphaev5 ;; |
297 | - EV56) UNAME_MACHINE=alphaev56 ;; |
298 | - PCA56) UNAME_MACHINE=alphapca56 ;; |
299 | - PCA57) UNAME_MACHINE=alphapca56 ;; |
300 | - EV6) UNAME_MACHINE=alphaev6 ;; |
301 | - EV67) UNAME_MACHINE=alphaev67 ;; |
302 | - EV68*) UNAME_MACHINE=alphaev68 ;; |
303 | - esac |
304 | - objdump --private-headers /bin/sh | grep -q ld.so.1 |
305 | - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
306 | - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
307 | - exit ;; |
308 | padre:Linux:*:*) |
309 | echo sparc-unknown-linux-gnu |
310 | exit ;; |
311 | + parisc64:Linux:*:* | hppa64:Linux:*:*) |
312 | + echo hppa64-unknown-linux-gnu |
313 | + exit ;; |
314 | parisc:Linux:*:* | hppa:Linux:*:*) |
315 | # Look for CPU level |
316 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
317 | @@ -942,8 +950,11 @@ |
318 | *) echo hppa-unknown-linux-gnu ;; |
319 | esac |
320 | exit ;; |
321 | - parisc64:Linux:*:* | hppa64:Linux:*:*) |
322 | - echo hppa64-unknown-linux-gnu |
323 | + ppc64:Linux:*:*) |
324 | + echo powerpc64-unknown-linux-gnu |
325 | + exit ;; |
326 | + ppc:Linux:*:*) |
327 | + echo powerpc-unknown-linux-gnu |
328 | exit ;; |
329 | s390:Linux:*:* | s390x:Linux:*:*) |
330 | echo ${UNAME_MACHINE}-ibm-linux |
331 | @@ -966,58 +977,6 @@ |
332 | xtensa*:Linux:*:*) |
333 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
334 | exit ;; |
335 | - i*86:Linux:*:*) |
336 | - # The BFD linker knows what the default object file format is, so |
337 | - # first see if it will tell us. cd to the root directory to prevent |
338 | - # problems with other programs or directories called `ld' in the path. |
339 | - # Set LC_ALL=C to ensure ld outputs messages in English. |
340 | - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ |
341 | - | sed -ne '/supported targets:/!d |
342 | - s/[ ][ ]*/ /g |
343 | - s/.*supported targets: *// |
344 | - s/ .*// |
345 | - p'` |
346 | - case "$ld_supported_targets" in |
347 | - elf32-i386) |
348 | - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" |
349 | - ;; |
350 | - esac |
351 | - # Determine whether the default compiler is a.out or elf |
352 | - eval $set_cc_for_build |
353 | - sed 's/^ //' << EOF >$dummy.c |
354 | - #include <features.h> |
355 | - #ifdef __ELF__ |
356 | - # ifdef __GLIBC__ |
357 | - # if __GLIBC__ >= 2 |
358 | - LIBC=gnu |
359 | - # else |
360 | - LIBC=gnulibc1 |
361 | - # endif |
362 | - # else |
363 | - LIBC=gnulibc1 |
364 | - # endif |
365 | - #else |
366 | - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) |
367 | - LIBC=gnu |
368 | - #else |
369 | - LIBC=gnuaout |
370 | - #endif |
371 | - #endif |
372 | - #ifdef __dietlibc__ |
373 | - LIBC=dietlibc |
374 | - #endif |
375 | -EOF |
376 | - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' |
377 | - /^LIBC/{ |
378 | - s: ::g |
379 | - p |
380 | - }'`" |
381 | - test x"${LIBC}" != x && { |
382 | - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
383 | - exit |
384 | - } |
385 | - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } |
386 | - ;; |
387 | i*86:DYNIX/ptx:4*:*) |
388 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
389 | # earlier versions are messed up and put the nodename in both |
390 | @@ -1247,6 +1206,16 @@ |
391 | *:Darwin:*:*) |
392 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
393 | case $UNAME_PROCESSOR in |
394 | + i386) |
395 | + eval $set_cc_for_build |
396 | + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
397 | + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
398 | + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
399 | + grep IS_64BIT_ARCH >/dev/null |
400 | + then |
401 | + UNAME_PROCESSOR="x86_64" |
402 | + fi |
403 | + fi ;; |
404 | unknown) UNAME_PROCESSOR=powerpc ;; |
405 | esac |
406 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
407 | |
408 | === modified file 'config.sub' |
409 | --- config.sub 2010-04-09 16:57:53 +0000 |
410 | +++ config.sub 2010-08-12 19:45:57 +0000 |
411 | @@ -1,10 +1,10 @@ |
412 | #! /bin/sh |
413 | # Configuration validation subroutine script. |
414 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
415 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
416 | +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
417 | # Free Software Foundation, Inc. |
418 | |
419 | -timestamp='2009-06-11' |
420 | +timestamp='2010-01-22' |
421 | |
422 | # This file is (in principle) common to ALL GNU software. |
423 | # The presence of a machine in this file suggests that SOME GNU software |
424 | @@ -32,13 +32,16 @@ |
425 | |
426 | |
427 | # Please send patches to <config-patches@gnu.org>. Submit a context |
428 | -# diff and a properly formatted ChangeLog entry. |
429 | +# diff and a properly formatted GNU ChangeLog entry. |
430 | # |
431 | # Configuration subroutine to validate and canonicalize a configuration type. |
432 | # Supply the specified configuration type as an argument. |
433 | # If it is invalid, we print an error message on stderr and exit with code 1. |
434 | # Otherwise, we print the canonical config type on stdout and succeed. |
435 | |
436 | +# You can get the latest version of this script from: |
437 | +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
438 | + |
439 | # This file is supposed to be the same for all GNU packages |
440 | # and recognize all the CPU types, system types and aliases |
441 | # that are meaningful with *any* GNU software. |
442 | @@ -72,8 +75,9 @@ |
443 | version="\ |
444 | GNU config.sub ($timestamp) |
445 | |
446 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, |
447 | -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
448 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
449 | +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
450 | +Software Foundation, Inc. |
451 | |
452 | This is free software; see the source for copying conditions. There is NO |
453 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
454 | @@ -149,7 +153,7 @@ |
455 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
456 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
457 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
458 | - -apple | -axis | -knuth | -cray) |
459 | + -apple | -axis | -knuth | -cray | -microblaze) |
460 | os= |
461 | basic_machine=$1 |
462 | ;; |
463 | @@ -284,6 +288,7 @@ |
464 | | pdp10 | pdp11 | pj | pjl \ |
465 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
466 | | pyramid \ |
467 | + | rx \ |
468 | | score \ |
469 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
470 | | sh64 | sh64le \ |
471 | @@ -291,13 +296,14 @@ |
472 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
473 | | spu | strongarm \ |
474 | | tahoe | thumb | tic4x | tic80 | tron \ |
475 | + | ubicom32 \ |
476 | | v850 | v850e \ |
477 | | we32k \ |
478 | | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
479 | | z8k | z80) |
480 | basic_machine=$basic_machine-unknown |
481 | ;; |
482 | - m6811 | m68hc11 | m6812 | m68hc12) |
483 | + m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
484 | # Motorola 68HC11/12. |
485 | basic_machine=$basic_machine-unknown |
486 | os=-none |
487 | @@ -340,7 +346,7 @@ |
488 | | lm32-* \ |
489 | | m32c-* | m32r-* | m32rle-* \ |
490 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
491 | - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ |
492 | + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ |
493 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
494 | | mips16-* \ |
495 | | mips64-* | mips64el-* \ |
496 | @@ -368,15 +374,17 @@ |
497 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
498 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
499 | | pyramid-* \ |
500 | - | romp-* | rs6000-* \ |
501 | + | romp-* | rs6000-* | rx-* \ |
502 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
503 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
504 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
505 | | sparclite-* \ |
506 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
507 | | tahoe-* | thumb-* \ |
508 | - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ |
509 | + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
510 | + | tile-* | tilegx-* \ |
511 | | tron-* \ |
512 | + | ubicom32-* \ |
513 | | v850-* | v850e-* | vax-* \ |
514 | | we32k-* \ |
515 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
516 | @@ -726,6 +734,9 @@ |
517 | basic_machine=ns32k-utek |
518 | os=-sysv |
519 | ;; |
520 | + microblaze) |
521 | + basic_machine=microblaze-xilinx |
522 | + ;; |
523 | mingw32) |
524 | basic_machine=i386-pc |
525 | os=-mingw32 |
526 | @@ -1076,6 +1087,11 @@ |
527 | basic_machine=tic6x-unknown |
528 | os=-coff |
529 | ;; |
530 | + # This must be matched before tile*. |
531 | + tilegx*) |
532 | + basic_machine=tilegx-unknown |
533 | + os=-linux-gnu |
534 | + ;; |
535 | tile*) |
536 | basic_machine=tile-unknown |
537 | os=-linux-gnu |
538 | @@ -1247,6 +1263,9 @@ |
539 | # First match some system type aliases |
540 | # that might get confused with valid system types. |
541 | # -solaris* is a basic system type, with this one exception. |
542 | + -auroraux) |
543 | + os=-auroraux |
544 | + ;; |
545 | -solaris1 | -solaris1.*) |
546 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
547 | ;; |
548 | @@ -1268,8 +1287,8 @@ |
549 | # -sysv* is not here because it comes later, after sysvr4. |
550 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
551 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
552 | - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ |
553 | - | -kopensolaris* \ |
554 | + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
555 | + | -sym* | -kopensolaris* \ |
556 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
557 | | -aos* | -aros* \ |
558 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
559 | @@ -1290,7 +1309,7 @@ |
560 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
561 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
562 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
563 | - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) |
564 | + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
565 | # Remember, each alternative MUST END IN *, to match a version number. |
566 | ;; |
567 | -qnx*) |
568 | @@ -1423,6 +1442,8 @@ |
569 | -dicos*) |
570 | os=-dicos |
571 | ;; |
572 | + -nacl*) |
573 | + ;; |
574 | -none) |
575 | ;; |
576 | *) |
577 | |
578 | === modified file 'configure' |
579 | --- configure 2010-07-15 14:58:36 +0000 |
580 | +++ configure 2010-08-12 19:45:57 +0000 |
581 | @@ -1,13 +1,13 @@ |
582 | #! /bin/sh |
583 | # Guess values for system-dependent variables and create Makefiles. |
584 | -# Generated by GNU Autoconf 2.65 for libindicator 0.3.10. |
585 | +# Generated by GNU Autoconf 2.67 for libindicator 0.3.11. |
586 | # |
587 | # Report bugs to <ted@canonical.com>. |
588 | # |
589 | # |
590 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
591 | -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
592 | -# Inc. |
593 | +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
594 | +# Foundation, Inc. |
595 | # |
596 | # |
597 | # This configure script is free software; the Free Software Foundation |
598 | @@ -319,7 +319,7 @@ |
599 | test -d "$as_dir" && break |
600 | done |
601 | test -z "$as_dirs" || eval "mkdir $as_dirs" |
602 | - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" |
603 | + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
604 | |
605 | |
606 | } # as_fn_mkdir_p |
607 | @@ -359,19 +359,19 @@ |
608 | fi # as_fn_arith |
609 | |
610 | |
611 | -# as_fn_error ERROR [LINENO LOG_FD] |
612 | -# --------------------------------- |
613 | +# as_fn_error STATUS ERROR [LINENO LOG_FD] |
614 | +# ---------------------------------------- |
615 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
616 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
617 | -# script with status $?, using 1 if that was 0. |
618 | +# script with STATUS, using 1 if that was 0. |
619 | as_fn_error () |
620 | { |
621 | - as_status=$?; test $as_status -eq 0 && as_status=1 |
622 | - if test "$3"; then |
623 | - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
624 | - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 |
625 | + as_status=$1; test $as_status -eq 0 && as_status=1 |
626 | + if test "$4"; then |
627 | + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
628 | + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
629 | fi |
630 | - $as_echo "$as_me: error: $1" >&2 |
631 | + $as_echo "$as_me: error: $2" >&2 |
632 | as_fn_exit $as_status |
633 | } # as_fn_error |
634 | |
635 | @@ -682,7 +682,7 @@ |
636 | exec 6>&1 |
637 | |
638 | # Name of the host. |
639 | -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, |
640 | +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, |
641 | # so uname gets run too. |
642 | ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` |
643 | |
644 | @@ -701,8 +701,8 @@ |
645 | # Identity of this package. |
646 | PACKAGE_NAME='libindicator' |
647 | PACKAGE_TARNAME='libindicator' |
648 | -PACKAGE_VERSION='0.3.10' |
649 | -PACKAGE_STRING='libindicator 0.3.10' |
650 | +PACKAGE_VERSION='0.3.11' |
651 | +PACKAGE_STRING='libindicator 0.3.11' |
652 | PACKAGE_BUGREPORT='ted@canonical.com' |
653 | PACKAGE_URL='' |
654 | |
655 | @@ -752,6 +752,8 @@ |
656 | EXPANDED_SYSCONFDIR |
657 | LIBINDICATOR_LIBS |
658 | LIBINDICATOR_CFLAGS |
659 | +PKG_CONFIG_LIBDIR |
660 | +PKG_CONFIG_PATH |
661 | PKG_CONFIG |
662 | GLIB_GENMARSHAL |
663 | GLIB_MKENUMS |
664 | @@ -888,6 +890,8 @@ |
665 | CPPFLAGS |
666 | CPP |
667 | PKG_CONFIG |
668 | +PKG_CONFIG_PATH |
669 | +PKG_CONFIG_LIBDIR |
670 | LIBINDICATOR_CFLAGS |
671 | LIBINDICATOR_LIBS' |
672 | |
673 | @@ -952,8 +956,9 @@ |
674 | fi |
675 | |
676 | case $ac_option in |
677 | - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
678 | - *) ac_optarg=yes ;; |
679 | + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
680 | + *=) ac_optarg= ;; |
681 | + *) ac_optarg=yes ;; |
682 | esac |
683 | |
684 | # Accept the important Cygnus configure options, so we can diagnose typos. |
685 | @@ -998,7 +1003,7 @@ |
686 | ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
687 | # Reject names that are not valid shell variable names. |
688 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
689 | - as_fn_error "invalid feature name: $ac_useropt" |
690 | + as_fn_error $? "invalid feature name: $ac_useropt" |
691 | ac_useropt_orig=$ac_useropt |
692 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
693 | case $ac_user_opts in |
694 | @@ -1024,7 +1029,7 @@ |
695 | ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
696 | # Reject names that are not valid shell variable names. |
697 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
698 | - as_fn_error "invalid feature name: $ac_useropt" |
699 | + as_fn_error $? "invalid feature name: $ac_useropt" |
700 | ac_useropt_orig=$ac_useropt |
701 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
702 | case $ac_user_opts in |
703 | @@ -1228,7 +1233,7 @@ |
704 | ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
705 | # Reject names that are not valid shell variable names. |
706 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
707 | - as_fn_error "invalid package name: $ac_useropt" |
708 | + as_fn_error $? "invalid package name: $ac_useropt" |
709 | ac_useropt_orig=$ac_useropt |
710 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
711 | case $ac_user_opts in |
712 | @@ -1244,7 +1249,7 @@ |
713 | ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
714 | # Reject names that are not valid shell variable names. |
715 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
716 | - as_fn_error "invalid package name: $ac_useropt" |
717 | + as_fn_error $? "invalid package name: $ac_useropt" |
718 | ac_useropt_orig=$ac_useropt |
719 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
720 | case $ac_user_opts in |
721 | @@ -1274,8 +1279,8 @@ |
722 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) |
723 | x_libraries=$ac_optarg ;; |
724 | |
725 | - -*) as_fn_error "unrecognized option: \`$ac_option' |
726 | -Try \`$0 --help' for more information." |
727 | + -*) as_fn_error $? "unrecognized option: \`$ac_option' |
728 | +Try \`$0 --help' for more information" |
729 | ;; |
730 | |
731 | *=*) |
732 | @@ -1283,7 +1288,7 @@ |
733 | # Reject names that are not valid shell variable names. |
734 | case $ac_envvar in #( |
735 | '' | [0-9]* | *[!_$as_cr_alnum]* ) |
736 | - as_fn_error "invalid variable name: \`$ac_envvar'" ;; |
737 | + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; |
738 | esac |
739 | eval $ac_envvar=\$ac_optarg |
740 | export $ac_envvar ;; |
741 | @@ -1301,13 +1306,13 @@ |
742 | |
743 | if test -n "$ac_prev"; then |
744 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` |
745 | - as_fn_error "missing argument to $ac_option" |
746 | + as_fn_error $? "missing argument to $ac_option" |
747 | fi |
748 | |
749 | if test -n "$ac_unrecognized_opts"; then |
750 | case $enable_option_checking in |
751 | no) ;; |
752 | - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; |
753 | + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; |
754 | *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; |
755 | esac |
756 | fi |
757 | @@ -1330,7 +1335,7 @@ |
758 | [\\/$]* | ?:[\\/]* ) continue;; |
759 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; |
760 | esac |
761 | - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" |
762 | + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" |
763 | done |
764 | |
765 | # There might be people who depend on the old broken behavior: `$host' |
766 | @@ -1344,8 +1349,8 @@ |
767 | if test "x$host_alias" != x; then |
768 | if test "x$build_alias" = x; then |
769 | cross_compiling=maybe |
770 | - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. |
771 | - If a cross compiler is detected then cross compile mode will be used." >&2 |
772 | + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
773 | + If a cross compiler is detected then cross compile mode will be used" >&2 |
774 | elif test "x$build_alias" != "x$host_alias"; then |
775 | cross_compiling=yes |
776 | fi |
777 | @@ -1360,9 +1365,9 @@ |
778 | ac_pwd=`pwd` && test -n "$ac_pwd" && |
779 | ac_ls_di=`ls -di .` && |
780 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || |
781 | - as_fn_error "working directory cannot be determined" |
782 | + as_fn_error $? "working directory cannot be determined" |
783 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
784 | - as_fn_error "pwd does not report name of working directory" |
785 | + as_fn_error $? "pwd does not report name of working directory" |
786 | |
787 | |
788 | # Find the source files, if location was not specified. |
789 | @@ -1401,11 +1406,11 @@ |
790 | fi |
791 | if test ! -r "$srcdir/$ac_unique_file"; then |
792 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." |
793 | - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" |
794 | + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" |
795 | fi |
796 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" |
797 | ac_abs_confdir=`( |
798 | - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" |
799 | + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" |
800 | pwd)` |
801 | # When building in place, set srcdir=. |
802 | if test "$ac_abs_confdir" = "$ac_pwd"; then |
803 | @@ -1431,7 +1436,7 @@ |
804 | # Omit some internal or obsolete options to make the list less imposing. |
805 | # This message is too long to be a string in the A/UX 3.1 sh. |
806 | cat <<_ACEOF |
807 | -\`configure' configures libindicator 0.3.10 to adapt to many kinds of systems. |
808 | +\`configure' configures libindicator 0.3.11 to adapt to many kinds of systems. |
809 | |
810 | Usage: $0 [OPTION]... [VAR=VALUE]... |
811 | |
812 | @@ -1445,7 +1450,7 @@ |
813 | --help=short display options specific to this package |
814 | --help=recursive display the short help of all the included packages |
815 | -V, --version display version information and exit |
816 | - -q, --quiet, --silent do not print \`checking...' messages |
817 | + -q, --quiet, --silent do not print \`checking ...' messages |
818 | --cache-file=FILE cache test results in FILE [disabled] |
819 | -C, --config-cache alias for \`--cache-file=config.cache' |
820 | -n, --no-create do not create output files |
821 | @@ -1501,7 +1506,7 @@ |
822 | |
823 | if test -n "$ac_init_help"; then |
824 | case $ac_init_help in |
825 | - short | recursive ) echo "Configuration of libindicator 0.3.10:";; |
826 | + short | recursive ) echo "Configuration of libindicator 0.3.11:";; |
827 | esac |
828 | cat <<\_ACEOF |
829 | |
830 | @@ -1538,6 +1543,10 @@ |
831 | you have headers in a nonstandard directory <include dir> |
832 | CPP C preprocessor |
833 | PKG_CONFIG path to pkg-config utility |
834 | + PKG_CONFIG_PATH |
835 | + directories to add to pkg-config's search path |
836 | + PKG_CONFIG_LIBDIR |
837 | + path overriding pkg-config's built-in search path |
838 | LIBINDICATOR_CFLAGS |
839 | C compiler flags for LIBINDICATOR, overriding pkg-config |
840 | LIBINDICATOR_LIBS |
841 | @@ -1609,10 +1618,10 @@ |
842 | test -n "$ac_init_help" && exit $ac_status |
843 | if $ac_init_version; then |
844 | cat <<\_ACEOF |
845 | -libindicator configure 0.3.10 |
846 | -generated by GNU Autoconf 2.65 |
847 | +libindicator configure 0.3.11 |
848 | +generated by GNU Autoconf 2.67 |
849 | |
850 | -Copyright (C) 2009 Free Software Foundation, Inc. |
851 | +Copyright (C) 2010 Free Software Foundation, Inc. |
852 | This configure script is free software; the Free Software Foundation |
853 | gives unlimited permission to copy, distribute and modify it. |
854 | _ACEOF |
855 | @@ -1728,7 +1737,7 @@ |
856 | mv -f conftest.er1 conftest.err |
857 | fi |
858 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
859 | - test $ac_status = 0; } >/dev/null && { |
860 | + test $ac_status = 0; } > conftest.i && { |
861 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
862 | test ! -s conftest.err |
863 | }; then : |
864 | @@ -1795,7 +1804,7 @@ |
865 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
866 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
867 | $as_echo_n "checking for $2... " >&6; } |
868 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
869 | +if eval "test \"\${$3+set}\"" = set; then : |
870 | $as_echo_n "(cached) " >&6 |
871 | else |
872 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
873 | @@ -1825,7 +1834,7 @@ |
874 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
875 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
876 | $as_echo_n "checking for $2... " >&6; } |
877 | -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : |
878 | +if eval "test \"\${$3+set}\"" = set; then : |
879 | $as_echo_n "(cached) " >&6 |
880 | else |
881 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
882 | @@ -1887,8 +1896,8 @@ |
883 | This file contains any messages produced by compilers while |
884 | running configure, to aid debugging if configure makes a mistake. |
885 | |
886 | -It was created by libindicator $as_me 0.3.10, which was |
887 | -generated by GNU Autoconf 2.65. Invocation command line was |
888 | +It was created by libindicator $as_me 0.3.11, which was |
889 | +generated by GNU Autoconf 2.67. Invocation command line was |
890 | |
891 | $ $0 $@ |
892 | |
893 | @@ -1998,11 +2007,9 @@ |
894 | { |
895 | echo |
896 | |
897 | - cat <<\_ASBOX |
898 | -## ---------------- ## |
899 | + $as_echo "## ---------------- ## |
900 | ## Cache variables. ## |
901 | -## ---------------- ## |
902 | -_ASBOX |
903 | +## ---------------- ##" |
904 | echo |
905 | # The following way of writing the cache mishandles newlines in values, |
906 | ( |
907 | @@ -2036,11 +2043,9 @@ |
908 | ) |
909 | echo |
910 | |
911 | - cat <<\_ASBOX |
912 | -## ----------------- ## |
913 | + $as_echo "## ----------------- ## |
914 | ## Output variables. ## |
915 | -## ----------------- ## |
916 | -_ASBOX |
917 | +## ----------------- ##" |
918 | echo |
919 | for ac_var in $ac_subst_vars |
920 | do |
921 | @@ -2053,11 +2058,9 @@ |
922 | echo |
923 | |
924 | if test -n "$ac_subst_files"; then |
925 | - cat <<\_ASBOX |
926 | -## ------------------- ## |
927 | + $as_echo "## ------------------- ## |
928 | ## File substitutions. ## |
929 | -## ------------------- ## |
930 | -_ASBOX |
931 | +## ------------------- ##" |
932 | echo |
933 | for ac_var in $ac_subst_files |
934 | do |
935 | @@ -2071,11 +2074,9 @@ |
936 | fi |
937 | |
938 | if test -s confdefs.h; then |
939 | - cat <<\_ASBOX |
940 | -## ----------- ## |
941 | + $as_echo "## ----------- ## |
942 | ## confdefs.h. ## |
943 | -## ----------- ## |
944 | -_ASBOX |
945 | +## ----------- ##" |
946 | echo |
947 | cat confdefs.h |
948 | echo |
949 | @@ -2130,7 +2131,12 @@ |
950 | ac_site_file1=NONE |
951 | ac_site_file2=NONE |
952 | if test -n "$CONFIG_SITE"; then |
953 | - ac_site_file1=$CONFIG_SITE |
954 | + # We do not want a PATH search for config.site. |
955 | + case $CONFIG_SITE in #(( |
956 | + -*) ac_site_file1=./$CONFIG_SITE;; |
957 | + */*) ac_site_file1=$CONFIG_SITE;; |
958 | + *) ac_site_file1=./$CONFIG_SITE;; |
959 | + esac |
960 | elif test "x$prefix" != xNONE; then |
961 | ac_site_file1=$prefix/share/config.site |
962 | ac_site_file2=$prefix/etc/config.site |
963 | @@ -2145,7 +2151,11 @@ |
964 | { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 |
965 | $as_echo "$as_me: loading site script $ac_site_file" >&6;} |
966 | sed 's/^/| /' "$ac_site_file" >&5 |
967 | - . "$ac_site_file" |
968 | + . "$ac_site_file" \ |
969 | + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
970 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
971 | +as_fn_error $? "failed to load site script $ac_site_file |
972 | +See \`config.log' for more details" "$LINENO" 5 ; } |
973 | fi |
974 | done |
975 | |
976 | @@ -2221,7 +2231,7 @@ |
977 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
978 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 |
979 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
980 | - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
981 | + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
982 | fi |
983 | ## -------------------- ## |
984 | ## Main body of script. ## |
985 | @@ -2243,16 +2253,22 @@ |
986 | |
987 | ac_aux_dir= |
988 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do |
989 | - for ac_t in install-sh install.sh shtool; do |
990 | - if test -f "$ac_dir/$ac_t"; then |
991 | - ac_aux_dir=$ac_dir |
992 | - ac_install_sh="$ac_aux_dir/$ac_t -c" |
993 | - break 2 |
994 | - fi |
995 | - done |
996 | + if test -f "$ac_dir/install-sh"; then |
997 | + ac_aux_dir=$ac_dir |
998 | + ac_install_sh="$ac_aux_dir/install-sh -c" |
999 | + break |
1000 | + elif test -f "$ac_dir/install.sh"; then |
1001 | + ac_aux_dir=$ac_dir |
1002 | + ac_install_sh="$ac_aux_dir/install.sh -c" |
1003 | + break |
1004 | + elif test -f "$ac_dir/shtool"; then |
1005 | + ac_aux_dir=$ac_dir |
1006 | + ac_install_sh="$ac_aux_dir/shtool install -c" |
1007 | + break |
1008 | + fi |
1009 | done |
1010 | if test -z "$ac_aux_dir"; then |
1011 | - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 |
1012 | + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 |
1013 | fi |
1014 | |
1015 | # These three variables are undocumented and unsupported, |
1016 | @@ -2368,11 +2384,11 @@ |
1017 | ' |
1018 | case `pwd` in |
1019 | *[\\\"\#\$\&\'\`$am_lf]*) |
1020 | - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; |
1021 | + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; |
1022 | esac |
1023 | case $srcdir in |
1024 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) |
1025 | - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; |
1026 | + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; |
1027 | esac |
1028 | |
1029 | # Do `set' in a subshell so we don't clobber the current shell's |
1030 | @@ -2394,7 +2410,7 @@ |
1031 | # if, for instance, CONFIG_SHELL is bash and it inherits a |
1032 | # broken ls alias from the environment. This has actually |
1033 | # happened. Such a system could not be considered "sane". |
1034 | - as_fn_error "ls -t appears to fail. Make sure there is not a broken |
1035 | + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken |
1036 | alias in your environment" "$LINENO" 5 |
1037 | fi |
1038 | |
1039 | @@ -2404,7 +2420,7 @@ |
1040 | # Ok. |
1041 | : |
1042 | else |
1043 | - as_fn_error "newly created file is older than distributed files! |
1044 | + as_fn_error $? "newly created file is older than distributed files! |
1045 | Check your system clock" "$LINENO" 5 |
1046 | fi |
1047 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1048 | @@ -2642,7 +2658,7 @@ |
1049 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
1050 | set x ${MAKE-make} |
1051 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
1052 | -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : |
1053 | +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : |
1054 | $as_echo_n "(cached) " >&6 |
1055 | else |
1056 | cat >conftest.make <<\_ACEOF |
1057 | @@ -2650,7 +2666,7 @@ |
1058 | all: |
1059 | @echo '@@@%%%=$(MAKE)=@@@%%%' |
1060 | _ACEOF |
1061 | -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. |
1062 | +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. |
1063 | case `${MAKE-make} -f conftest.make 2>/dev/null` in |
1064 | *@@@%%%=?*=@@@%%%*) |
1065 | eval ac_cv_prog_make_${ac_make}_set=yes;; |
1066 | @@ -2684,7 +2700,7 @@ |
1067 | am__isrc=' -I$(srcdir)' |
1068 | # test to see if srcdir already configured |
1069 | if test -f $srcdir/config.status; then |
1070 | - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
1071 | + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
1072 | fi |
1073 | fi |
1074 | |
1075 | @@ -2700,7 +2716,7 @@ |
1076 | |
1077 | # Define the identity of the package. |
1078 | PACKAGE=libindicator |
1079 | - VERSION=0.3.10 |
1080 | + VERSION=0.3.11 |
1081 | |
1082 | |
1083 | cat >>confdefs.h <<_ACEOF |
1084 | @@ -3139,8 +3155,8 @@ |
1085 | |
1086 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1087 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1088 | -as_fn_error "no acceptable C compiler found in \$PATH |
1089 | -See \`config.log' for more details." "$LINENO" 5; } |
1090 | +as_fn_error $? "no acceptable C compiler found in \$PATH |
1091 | +See \`config.log' for more details" "$LINENO" 5 ; } |
1092 | |
1093 | # Provide some information about the compiler. |
1094 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
1095 | @@ -3254,9 +3270,8 @@ |
1096 | |
1097 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1098 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1099 | -{ as_fn_set_status 77 |
1100 | -as_fn_error "C compiler cannot create executables |
1101 | -See \`config.log' for more details." "$LINENO" 5; }; } |
1102 | +as_fn_error 77 "C compiler cannot create executables |
1103 | +See \`config.log' for more details" "$LINENO" 5 ; } |
1104 | else |
1105 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1106 | $as_echo "yes" >&6; } |
1107 | @@ -3298,8 +3313,8 @@ |
1108 | else |
1109 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1110 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1111 | -as_fn_error "cannot compute suffix of executables: cannot compile and link |
1112 | -See \`config.log' for more details." "$LINENO" 5; } |
1113 | +as_fn_error $? "cannot compute suffix of executables: cannot compile and link |
1114 | +See \`config.log' for more details" "$LINENO" 5 ; } |
1115 | fi |
1116 | rm -f conftest conftest$ac_cv_exeext |
1117 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
1118 | @@ -3356,9 +3371,9 @@ |
1119 | else |
1120 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1121 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1122 | -as_fn_error "cannot run C compiled programs. |
1123 | +as_fn_error $? "cannot run C compiled programs. |
1124 | If you meant to cross compile, use \`--host'. |
1125 | -See \`config.log' for more details." "$LINENO" 5; } |
1126 | +See \`config.log' for more details" "$LINENO" 5 ; } |
1127 | fi |
1128 | fi |
1129 | fi |
1130 | @@ -3409,8 +3424,8 @@ |
1131 | |
1132 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1133 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1134 | -as_fn_error "cannot compute suffix of object files: cannot compile |
1135 | -See \`config.log' for more details." "$LINENO" 5; } |
1136 | +as_fn_error $? "cannot compute suffix of object files: cannot compile |
1137 | +See \`config.log' for more details" "$LINENO" 5 ; } |
1138 | fi |
1139 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
1140 | fi |
1141 | @@ -4114,8 +4129,8 @@ |
1142 | |
1143 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1144 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1145 | -as_fn_error "no acceptable C compiler found in \$PATH |
1146 | -See \`config.log' for more details." "$LINENO" 5; } |
1147 | +as_fn_error $? "no acceptable C compiler found in \$PATH |
1148 | +See \`config.log' for more details" "$LINENO" 5 ; } |
1149 | |
1150 | # Provide some information about the compiler. |
1151 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
1152 | @@ -4490,7 +4505,7 @@ |
1153 | fi |
1154 | set dummy $CC; ac_cc=`$as_echo "$2" | |
1155 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
1156 | -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : |
1157 | +if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : |
1158 | $as_echo_n "(cached) " >&6 |
1159 | else |
1160 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1161 | @@ -4649,7 +4664,7 @@ |
1162 | # Broken: fails on valid input. |
1163 | continue |
1164 | fi |
1165 | -rm -f conftest.err conftest.$ac_ext |
1166 | +rm -f conftest.err conftest.i conftest.$ac_ext |
1167 | |
1168 | # OK, works on sane cases. Now check whether nonexistent headers |
1169 | # can be detected and how. |
1170 | @@ -4665,11 +4680,11 @@ |
1171 | ac_preproc_ok=: |
1172 | break |
1173 | fi |
1174 | -rm -f conftest.err conftest.$ac_ext |
1175 | +rm -f conftest.err conftest.i conftest.$ac_ext |
1176 | |
1177 | done |
1178 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
1179 | -rm -f conftest.err conftest.$ac_ext |
1180 | +rm -f conftest.i conftest.err conftest.$ac_ext |
1181 | if $ac_preproc_ok; then : |
1182 | break |
1183 | fi |
1184 | @@ -4708,7 +4723,7 @@ |
1185 | # Broken: fails on valid input. |
1186 | continue |
1187 | fi |
1188 | -rm -f conftest.err conftest.$ac_ext |
1189 | +rm -f conftest.err conftest.i conftest.$ac_ext |
1190 | |
1191 | # OK, works on sane cases. Now check whether nonexistent headers |
1192 | # can be detected and how. |
1193 | @@ -4724,18 +4739,18 @@ |
1194 | ac_preproc_ok=: |
1195 | break |
1196 | fi |
1197 | -rm -f conftest.err conftest.$ac_ext |
1198 | +rm -f conftest.err conftest.i conftest.$ac_ext |
1199 | |
1200 | done |
1201 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
1202 | -rm -f conftest.err conftest.$ac_ext |
1203 | +rm -f conftest.i conftest.err conftest.$ac_ext |
1204 | if $ac_preproc_ok; then : |
1205 | |
1206 | else |
1207 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1208 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1209 | -as_fn_error "C preprocessor \"$CPP\" fails sanity check |
1210 | -See \`config.log' for more details." "$LINENO" 5; } |
1211 | +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
1212 | +See \`config.log' for more details" "$LINENO" 5 ; } |
1213 | fi |
1214 | |
1215 | ac_ext=c |
1216 | @@ -4796,7 +4811,7 @@ |
1217 | done |
1218 | IFS=$as_save_IFS |
1219 | if test -z "$ac_cv_path_GREP"; then |
1220 | - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
1221 | + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
1222 | fi |
1223 | else |
1224 | ac_cv_path_GREP=$GREP |
1225 | @@ -4862,7 +4877,7 @@ |
1226 | done |
1227 | IFS=$as_save_IFS |
1228 | if test -z "$ac_cv_path_EGREP"; then |
1229 | - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
1230 | + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
1231 | fi |
1232 | else |
1233 | ac_cv_path_EGREP=$EGREP |
1234 | @@ -5014,7 +5029,7 @@ |
1235 | |
1236 | # Make sure we can run config.sub. |
1237 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
1238 | - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
1239 | + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
1240 | |
1241 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 |
1242 | $as_echo_n "checking build system type... " >&6; } |
1243 | @@ -5025,16 +5040,16 @@ |
1244 | test "x$ac_build_alias" = x && |
1245 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` |
1246 | test "x$ac_build_alias" = x && |
1247 | - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 |
1248 | + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 |
1249 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || |
1250 | - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
1251 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
1252 | |
1253 | fi |
1254 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 |
1255 | $as_echo "$ac_cv_build" >&6; } |
1256 | case $ac_cv_build in |
1257 | *-*-*) ;; |
1258 | -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; |
1259 | +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; |
1260 | esac |
1261 | build=$ac_cv_build |
1262 | ac_save_IFS=$IFS; IFS='-' |
1263 | @@ -5059,7 +5074,7 @@ |
1264 | ac_cv_host=$ac_cv_build |
1265 | else |
1266 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || |
1267 | - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
1268 | + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
1269 | fi |
1270 | |
1271 | fi |
1272 | @@ -5067,7 +5082,7 @@ |
1273 | $as_echo "$ac_cv_host" >&6; } |
1274 | case $ac_cv_host in |
1275 | *-*-*) ;; |
1276 | -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; |
1277 | +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; |
1278 | esac |
1279 | host=$ac_cv_host |
1280 | ac_save_IFS=$IFS; IFS='-' |
1281 | @@ -5140,7 +5155,7 @@ |
1282 | done |
1283 | IFS=$as_save_IFS |
1284 | if test -z "$ac_cv_path_SED"; then |
1285 | - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
1286 | + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
1287 | fi |
1288 | else |
1289 | ac_cv_path_SED=$SED |
1290 | @@ -5219,7 +5234,7 @@ |
1291 | done |
1292 | IFS=$as_save_IFS |
1293 | if test -z "$ac_cv_path_FGREP"; then |
1294 | - as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
1295 | + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
1296 | fi |
1297 | else |
1298 | ac_cv_path_FGREP=$FGREP |
1299 | @@ -5335,7 +5350,7 @@ |
1300 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1301 | $as_echo "no" >&6; } |
1302 | fi |
1303 | -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 |
1304 | +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 |
1305 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 |
1306 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
1307 | if test "${lt_cv_prog_gnu_ld+set}" = set; then : |
1308 | @@ -5537,13 +5552,13 @@ |
1309 | else |
1310 | lt_cv_nm_interface="BSD nm" |
1311 | echo "int some_variable = 0;" > conftest.$ac_ext |
1312 | - (eval echo "\"\$as_me:5540: $ac_compile\"" >&5) |
1313 | + (eval echo "\"\$as_me:5555: $ac_compile\"" >&5) |
1314 | (eval "$ac_compile" 2>conftest.err) |
1315 | cat conftest.err >&5 |
1316 | - (eval echo "\"\$as_me:5543: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
1317 | + (eval echo "\"\$as_me:5558: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
1318 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
1319 | cat conftest.err >&5 |
1320 | - (eval echo "\"\$as_me:5546: output\"" >&5) |
1321 | + (eval echo "\"\$as_me:5561: output\"" >&5) |
1322 | cat conftest.out >&5 |
1323 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
1324 | lt_cv_nm_interface="MS dumpbin" |
1325 | @@ -6748,7 +6763,7 @@ |
1326 | ;; |
1327 | *-*-irix6*) |
1328 | # Find out which ABI we are using. |
1329 | - echo '#line 6751 "configure"' > conftest.$ac_ext |
1330 | + echo '#line 6766 "configure"' > conftest.$ac_ext |
1331 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
1332 | (eval $ac_compile) 2>&5 |
1333 | ac_status=$? |
1334 | @@ -7502,8 +7517,7 @@ |
1335 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
1336 | ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default |
1337 | " |
1338 | -eval as_val=\$$as_ac_Header |
1339 | - if test "x$as_val" = x""yes; then : |
1340 | +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
1341 | cat >>confdefs.h <<_ACEOF |
1342 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
1343 | _ACEOF |
1344 | @@ -8024,11 +8038,11 @@ |
1345 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1346 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1347 | -e 's:$: $lt_compiler_flag:'` |
1348 | - (eval echo "\"\$as_me:8027: $lt_compile\"" >&5) |
1349 | + (eval echo "\"\$as_me:8041: $lt_compile\"" >&5) |
1350 | (eval "$lt_compile" 2>conftest.err) |
1351 | ac_status=$? |
1352 | cat conftest.err >&5 |
1353 | - echo "$as_me:8031: \$? = $ac_status" >&5 |
1354 | + echo "$as_me:8045: \$? = $ac_status" >&5 |
1355 | if (exit $ac_status) && test -s "$ac_outfile"; then |
1356 | # The compiler can only warn and ignore the option if not recognized |
1357 | # So say no if there are warnings other than the usual output. |
1358 | @@ -8363,11 +8377,11 @@ |
1359 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1360 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1361 | -e 's:$: $lt_compiler_flag:'` |
1362 | - (eval echo "\"\$as_me:8366: $lt_compile\"" >&5) |
1363 | + (eval echo "\"\$as_me:8380: $lt_compile\"" >&5) |
1364 | (eval "$lt_compile" 2>conftest.err) |
1365 | ac_status=$? |
1366 | cat conftest.err >&5 |
1367 | - echo "$as_me:8370: \$? = $ac_status" >&5 |
1368 | + echo "$as_me:8384: \$? = $ac_status" >&5 |
1369 | if (exit $ac_status) && test -s "$ac_outfile"; then |
1370 | # The compiler can only warn and ignore the option if not recognized |
1371 | # So say no if there are warnings other than the usual output. |
1372 | @@ -8468,11 +8482,11 @@ |
1373 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1374 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1375 | -e 's:$: $lt_compiler_flag:'` |
1376 | - (eval echo "\"\$as_me:8471: $lt_compile\"" >&5) |
1377 | + (eval echo "\"\$as_me:8485: $lt_compile\"" >&5) |
1378 | (eval "$lt_compile" 2>out/conftest.err) |
1379 | ac_status=$? |
1380 | cat out/conftest.err >&5 |
1381 | - echo "$as_me:8475: \$? = $ac_status" >&5 |
1382 | + echo "$as_me:8489: \$? = $ac_status" >&5 |
1383 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1384 | then |
1385 | # The compiler can only warn and ignore the option if not recognized |
1386 | @@ -8523,11 +8537,11 @@ |
1387 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1388 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1389 | -e 's:$: $lt_compiler_flag:'` |
1390 | - (eval echo "\"\$as_me:8526: $lt_compile\"" >&5) |
1391 | + (eval echo "\"\$as_me:8540: $lt_compile\"" >&5) |
1392 | (eval "$lt_compile" 2>out/conftest.err) |
1393 | ac_status=$? |
1394 | cat out/conftest.err >&5 |
1395 | - echo "$as_me:8530: \$? = $ac_status" >&5 |
1396 | + echo "$as_me:8544: \$? = $ac_status" >&5 |
1397 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1398 | then |
1399 | # The compiler can only warn and ignore the option if not recognized |
1400 | @@ -10907,7 +10921,7 @@ |
1401 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
1402 | lt_status=$lt_dlunknown |
1403 | cat > conftest.$ac_ext <<_LT_EOF |
1404 | -#line 10910 "configure" |
1405 | +#line 10924 "configure" |
1406 | #include "confdefs.h" |
1407 | |
1408 | #if HAVE_DLFCN_H |
1409 | @@ -11003,7 +11017,7 @@ |
1410 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
1411 | lt_status=$lt_dlunknown |
1412 | cat > conftest.$ac_ext <<_LT_EOF |
1413 | -#line 11006 "configure" |
1414 | +#line 11020 "configure" |
1415 | #include "confdefs.h" |
1416 | |
1417 | #if HAVE_DLFCN_H |
1418 | @@ -11339,6 +11353,10 @@ |
1419 | |
1420 | |
1421 | |
1422 | + |
1423 | + |
1424 | + |
1425 | + |
1426 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
1427 | if test -n "$ac_tool_prefix"; then |
1428 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
1429 | @@ -11451,18 +11469,16 @@ |
1430 | $as_echo "no" >&6; } |
1431 | PKG_CONFIG="" |
1432 | fi |
1433 | - |
1434 | fi |
1435 | |
1436 | pkg_failed=no |
1437 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBINDICATOR" >&5 |
1438 | $as_echo_n "checking for LIBINDICATOR... " >&6; } |
1439 | |
1440 | -if test -n "$PKG_CONFIG"; then |
1441 | - if test -n "$LIBINDICATOR_CFLAGS"; then |
1442 | - pkg_cv_LIBINDICATOR_CFLAGS="$LIBINDICATOR_CFLAGS" |
1443 | - else |
1444 | - if test -n "$PKG_CONFIG" && \ |
1445 | +if test -n "$LIBINDICATOR_CFLAGS"; then |
1446 | + pkg_cv_LIBINDICATOR_CFLAGS="$LIBINDICATOR_CFLAGS" |
1447 | + elif test -n "$PKG_CONFIG"; then |
1448 | + if test -n "$PKG_CONFIG" && \ |
1449 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION |
1450 | gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION |
1451 | dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5 |
1452 | @@ -11478,15 +11494,13 @@ |
1453 | else |
1454 | pkg_failed=yes |
1455 | fi |
1456 | - fi |
1457 | -else |
1458 | - pkg_failed=untried |
1459 | + else |
1460 | + pkg_failed=untried |
1461 | fi |
1462 | -if test -n "$PKG_CONFIG"; then |
1463 | - if test -n "$LIBINDICATOR_LIBS"; then |
1464 | - pkg_cv_LIBINDICATOR_LIBS="$LIBINDICATOR_LIBS" |
1465 | - else |
1466 | - if test -n "$PKG_CONFIG" && \ |
1467 | +if test -n "$LIBINDICATOR_LIBS"; then |
1468 | + pkg_cv_LIBINDICATOR_LIBS="$LIBINDICATOR_LIBS" |
1469 | + elif test -n "$PKG_CONFIG"; then |
1470 | + if test -n "$PKG_CONFIG" && \ |
1471 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION |
1472 | gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION |
1473 | dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5 |
1474 | @@ -11502,14 +11516,15 @@ |
1475 | else |
1476 | pkg_failed=yes |
1477 | fi |
1478 | - fi |
1479 | -else |
1480 | - pkg_failed=untried |
1481 | + else |
1482 | + pkg_failed=untried |
1483 | fi |
1484 | |
1485 | |
1486 | |
1487 | if test $pkg_failed = yes; then |
1488 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1489 | +$as_echo "no" >&6; } |
1490 | |
1491 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
1492 | _pkg_short_errors_supported=yes |
1493 | @@ -11517,18 +11532,18 @@ |
1494 | _pkg_short_errors_supported=no |
1495 | fi |
1496 | if test $_pkg_short_errors_supported = yes; then |
1497 | - LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION |
1498 | + LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION |
1499 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION |
1500 | - dbus-glib-1 >= $DBUS_REQUIRED_VERSION"` |
1501 | + dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1` |
1502 | else |
1503 | - LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION |
1504 | + LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION |
1505 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION |
1506 | - dbus-glib-1 >= $DBUS_REQUIRED_VERSION"` |
1507 | + dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1` |
1508 | fi |
1509 | # Put the nasty error message in config.log where it belongs |
1510 | echo "$LIBINDICATOR_PKG_ERRORS" >&5 |
1511 | |
1512 | - as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION |
1513 | + as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION |
1514 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION |
1515 | dbus-glib-1 >= $DBUS_REQUIRED_VERSION) were not met: |
1516 | |
1517 | @@ -11539,12 +11554,13 @@ |
1518 | |
1519 | Alternatively, you may set the environment variables LIBINDICATOR_CFLAGS |
1520 | and LIBINDICATOR_LIBS to avoid the need to call pkg-config. |
1521 | -See the pkg-config man page for more details. |
1522 | -" "$LINENO" 5 |
1523 | +See the pkg-config man page for more details." "$LINENO" 5 |
1524 | elif test $pkg_failed = untried; then |
1525 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1526 | +$as_echo "no" >&6; } |
1527 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1528 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1529 | -as_fn_error "The pkg-config script could not be found or is too old. Make sure it |
1530 | +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it |
1531 | is in your PATH or set the PKG_CONFIG environment variable to the full |
1532 | path to pkg-config. |
1533 | |
1534 | @@ -11553,13 +11569,13 @@ |
1535 | See the pkg-config man page for more details. |
1536 | |
1537 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. |
1538 | -See \`config.log' for more details." "$LINENO" 5; } |
1539 | +See \`config.log' for more details" "$LINENO" 5 ; } |
1540 | else |
1541 | LIBINDICATOR_CFLAGS=$pkg_cv_LIBINDICATOR_CFLAGS |
1542 | LIBINDICATOR_LIBS=$pkg_cv_LIBINDICATOR_LIBS |
1543 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1544 | $as_echo "yes" >&6; } |
1545 | - : |
1546 | + |
1547 | fi |
1548 | |
1549 | |
1550 | @@ -11724,6 +11740,7 @@ |
1551 | |
1552 | ac_libobjs= |
1553 | ac_ltlibobjs= |
1554 | +U= |
1555 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue |
1556 | # 1. Remove the extension, and $U if already installed. |
1557 | ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' |
1558 | @@ -11747,19 +11764,19 @@ |
1559 | fi |
1560 | |
1561 | if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then |
1562 | - as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. |
1563 | + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. |
1564 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
1565 | fi |
1566 | if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then |
1567 | - as_fn_error "conditional \"AMDEP\" was never defined. |
1568 | -Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
1569 | -fi |
1570 | -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then |
1571 | - as_fn_error "conditional \"am__fastdepCC\" was never defined. |
1572 | -Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
1573 | -fi |
1574 | -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then |
1575 | - as_fn_error "conditional \"am__fastdepCC\" was never defined. |
1576 | + as_fn_error $? "conditional \"AMDEP\" was never defined. |
1577 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
1578 | +fi |
1579 | +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then |
1580 | + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. |
1581 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
1582 | +fi |
1583 | +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then |
1584 | + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. |
1585 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
1586 | fi |
1587 | |
1588 | @@ -11909,19 +11926,19 @@ |
1589 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
1590 | |
1591 | |
1592 | -# as_fn_error ERROR [LINENO LOG_FD] |
1593 | -# --------------------------------- |
1594 | +# as_fn_error STATUS ERROR [LINENO LOG_FD] |
1595 | +# ---------------------------------------- |
1596 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
1597 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
1598 | -# script with status $?, using 1 if that was 0. |
1599 | +# script with STATUS, using 1 if that was 0. |
1600 | as_fn_error () |
1601 | { |
1602 | - as_status=$?; test $as_status -eq 0 && as_status=1 |
1603 | - if test "$3"; then |
1604 | - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1605 | - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 |
1606 | + as_status=$1; test $as_status -eq 0 && as_status=1 |
1607 | + if test "$4"; then |
1608 | + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1609 | + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
1610 | fi |
1611 | - $as_echo "$as_me: error: $1" >&2 |
1612 | + $as_echo "$as_me: error: $2" >&2 |
1613 | as_fn_exit $as_status |
1614 | } # as_fn_error |
1615 | |
1616 | @@ -12117,7 +12134,7 @@ |
1617 | test -d "$as_dir" && break |
1618 | done |
1619 | test -z "$as_dirs" || eval "mkdir $as_dirs" |
1620 | - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" |
1621 | + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
1622 | |
1623 | |
1624 | } # as_fn_mkdir_p |
1625 | @@ -12170,8 +12187,8 @@ |
1626 | # report actual input values of CONFIG_FILES etc. instead of their |
1627 | # values after options handling. |
1628 | ac_log=" |
1629 | -This file was extended by libindicator $as_me 0.3.10, which was |
1630 | -generated by GNU Autoconf 2.65. Invocation command line was |
1631 | +This file was extended by libindicator $as_me 0.3.11, which was |
1632 | +generated by GNU Autoconf 2.67. Invocation command line was |
1633 | |
1634 | CONFIG_FILES = $CONFIG_FILES |
1635 | CONFIG_HEADERS = $CONFIG_HEADERS |
1636 | @@ -12236,11 +12253,11 @@ |
1637 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
1638 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
1639 | ac_cs_version="\\ |
1640 | -libindicator config.status 0.3.10 |
1641 | -configured by $0, generated by GNU Autoconf 2.65, |
1642 | +libindicator config.status 0.3.11 |
1643 | +configured by $0, generated by GNU Autoconf 2.67, |
1644 | with options \\"\$ac_cs_config\\" |
1645 | |
1646 | -Copyright (C) 2009 Free Software Foundation, Inc. |
1647 | +Copyright (C) 2010 Free Software Foundation, Inc. |
1648 | This config.status script is free software; the Free Software Foundation |
1649 | gives unlimited permission to copy, distribute and modify it." |
1650 | |
1651 | @@ -12258,11 +12275,16 @@ |
1652 | while test $# != 0 |
1653 | do |
1654 | case $1 in |
1655 | - --*=*) |
1656 | + --*=?*) |
1657 | ac_option=`expr "X$1" : 'X\([^=]*\)='` |
1658 | ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` |
1659 | ac_shift=: |
1660 | ;; |
1661 | + --*=) |
1662 | + ac_option=`expr "X$1" : 'X\([^=]*\)='` |
1663 | + ac_optarg= |
1664 | + ac_shift=: |
1665 | + ;; |
1666 | *) |
1667 | ac_option=$1 |
1668 | ac_optarg=$2 |
1669 | @@ -12284,6 +12306,7 @@ |
1670 | $ac_shift |
1671 | case $ac_optarg in |
1672 | *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; |
1673 | + '') as_fn_error $? "missing file argument" ;; |
1674 | esac |
1675 | as_fn_append CONFIG_FILES " '$ac_optarg'" |
1676 | ac_need_defaults=false;; |
1677 | @@ -12296,7 +12319,7 @@ |
1678 | ac_need_defaults=false;; |
1679 | --he | --h) |
1680 | # Conflict between --help and --header |
1681 | - as_fn_error "ambiguous option: \`$1' |
1682 | + as_fn_error $? "ambiguous option: \`$1' |
1683 | Try \`$0 --help' for more information.";; |
1684 | --help | --hel | -h ) |
1685 | $as_echo "$ac_cs_usage"; exit ;; |
1686 | @@ -12305,7 +12328,7 @@ |
1687 | ac_cs_silent=: ;; |
1688 | |
1689 | # This is an error. |
1690 | - -*) as_fn_error "unrecognized option: \`$1' |
1691 | + -*) as_fn_error $? "unrecognized option: \`$1' |
1692 | Try \`$0 --help' for more information." ;; |
1693 | |
1694 | *) as_fn_append ac_config_targets " $1" |
1695 | @@ -12623,7 +12646,7 @@ |
1696 | "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; |
1697 | "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; |
1698 | |
1699 | - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
1700 | + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; |
1701 | esac |
1702 | done |
1703 | |
1704 | @@ -12661,7 +12684,7 @@ |
1705 | { |
1706 | tmp=./conf$$-$RANDOM |
1707 | (umask 077 && mkdir "$tmp") |
1708 | -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 |
1709 | +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 |
1710 | |
1711 | # Set up the scripts for CONFIG_FILES section. |
1712 | # No need to generate them if there are no CONFIG_FILES. |
1713 | @@ -12678,7 +12701,7 @@ |
1714 | fi |
1715 | ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` |
1716 | if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then |
1717 | - ac_cs_awk_cr='\r' |
1718 | + ac_cs_awk_cr='\\r' |
1719 | else |
1720 | ac_cs_awk_cr=$ac_cr |
1721 | fi |
1722 | @@ -12692,18 +12715,18 @@ |
1723 | echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && |
1724 | echo "_ACEOF" |
1725 | } >conf$$subs.sh || |
1726 | - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 |
1727 | -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` |
1728 | + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
1729 | +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` |
1730 | ac_delim='%!_!# ' |
1731 | for ac_last_try in false false false false false :; do |
1732 | . ./conf$$subs.sh || |
1733 | - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 |
1734 | + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
1735 | |
1736 | ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` |
1737 | if test $ac_delim_n = $ac_delim_num; then |
1738 | break |
1739 | elif $ac_last_try; then |
1740 | - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 |
1741 | + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
1742 | else |
1743 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
1744 | fi |
1745 | @@ -12792,20 +12815,28 @@ |
1746 | else |
1747 | cat |
1748 | fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ |
1749 | - || as_fn_error "could not setup config files machinery" "$LINENO" 5 |
1750 | + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 |
1751 | _ACEOF |
1752 | |
1753 | -# VPATH may cause trouble with some makes, so we remove $(srcdir), |
1754 | -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and |
1755 | +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), |
1756 | +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and |
1757 | # trailing colons and then remove the whole line if VPATH becomes empty |
1758 | # (actually we leave an empty line to preserve line numbers). |
1759 | if test "x$srcdir" = x.; then |
1760 | - ac_vpsub='/^[ ]*VPATH[ ]*=/{ |
1761 | -s/:*\$(srcdir):*/:/ |
1762 | -s/:*\${srcdir}:*/:/ |
1763 | -s/:*@srcdir@:*/:/ |
1764 | -s/^\([^=]*=[ ]*\):*/\1/ |
1765 | + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ |
1766 | +h |
1767 | +s/// |
1768 | +s/^/:/ |
1769 | +s/[ ]*$/:/ |
1770 | +s/:\$(srcdir):/:/g |
1771 | +s/:\${srcdir}:/:/g |
1772 | +s/:@srcdir@:/:/g |
1773 | +s/^:*// |
1774 | s/:*$// |
1775 | +x |
1776 | +s/\(=[ ]*\).*/\1/ |
1777 | +G |
1778 | +s/\n// |
1779 | s/^[^=]*=[ ]*$// |
1780 | }' |
1781 | fi |
1782 | @@ -12833,7 +12864,7 @@ |
1783 | if test -z "$ac_t"; then |
1784 | break |
1785 | elif $ac_last_try; then |
1786 | - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 |
1787 | + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 |
1788 | else |
1789 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
1790 | fi |
1791 | @@ -12918,7 +12949,7 @@ |
1792 | _ACAWK |
1793 | _ACEOF |
1794 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
1795 | - as_fn_error "could not setup config headers machinery" "$LINENO" 5 |
1796 | + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 |
1797 | fi # test -n "$CONFIG_HEADERS" |
1798 | |
1799 | |
1800 | @@ -12931,7 +12962,7 @@ |
1801 | esac |
1802 | case $ac_mode$ac_tag in |
1803 | :[FHL]*:*);; |
1804 | - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; |
1805 | + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; |
1806 | :[FH]-) ac_tag=-:-;; |
1807 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; |
1808 | esac |
1809 | @@ -12959,7 +12990,7 @@ |
1810 | [\\/$]*) false;; |
1811 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; |
1812 | esac || |
1813 | - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; |
1814 | + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; |
1815 | esac |
1816 | case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac |
1817 | as_fn_append ac_file_inputs " '$ac_f'" |
1818 | @@ -12986,7 +13017,7 @@ |
1819 | |
1820 | case $ac_tag in |
1821 | *:-:* | *:-) cat >"$tmp/stdin" \ |
1822 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; |
1823 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; |
1824 | esac |
1825 | ;; |
1826 | esac |
1827 | @@ -13123,22 +13154,22 @@ |
1828 | $ac_datarootdir_hack |
1829 | " |
1830 | eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ |
1831 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 |
1832 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
1833 | |
1834 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && |
1835 | { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && |
1836 | { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && |
1837 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
1838 | -which seems to be undefined. Please make sure it is defined." >&5 |
1839 | +which seems to be undefined. Please make sure it is defined" >&5 |
1840 | $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
1841 | -which seems to be undefined. Please make sure it is defined." >&2;} |
1842 | +which seems to be undefined. Please make sure it is defined" >&2;} |
1843 | |
1844 | rm -f "$tmp/stdin" |
1845 | case $ac_file in |
1846 | -) cat "$tmp/out" && rm -f "$tmp/out";; |
1847 | *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; |
1848 | esac \ |
1849 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 |
1850 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
1851 | ;; |
1852 | :H) |
1853 | # |
1854 | @@ -13149,19 +13180,19 @@ |
1855 | $as_echo "/* $configure_input */" \ |
1856 | && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" |
1857 | } >"$tmp/config.h" \ |
1858 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 |
1859 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
1860 | if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then |
1861 | { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 |
1862 | $as_echo "$as_me: $ac_file is unchanged" >&6;} |
1863 | else |
1864 | rm -f "$ac_file" |
1865 | mv "$tmp/config.h" "$ac_file" \ |
1866 | - || as_fn_error "could not create $ac_file" "$LINENO" 5 |
1867 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
1868 | fi |
1869 | else |
1870 | $as_echo "/* $configure_input */" \ |
1871 | && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ |
1872 | - || as_fn_error "could not create -" "$LINENO" 5 |
1873 | + || as_fn_error $? "could not create -" "$LINENO" 5 |
1874 | fi |
1875 | # Compute "$ac_file"'s index in $config_headers. |
1876 | _am_arg="$ac_file" |
1877 | @@ -13946,7 +13977,7 @@ |
1878 | ac_clean_files=$ac_clean_files_save |
1879 | |
1880 | test $ac_write_fail = 0 || |
1881 | - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 |
1882 | + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 |
1883 | |
1884 | |
1885 | # configure is writing to config.log, and then calls config.status. |
1886 | @@ -13967,7 +13998,7 @@ |
1887 | exec 5>>config.log |
1888 | # Use ||, not &&, to avoid exiting from the if with $? = 1, which |
1889 | # would make configure fail if this is the last instruction. |
1890 | - $ac_cs_success || as_fn_exit $? |
1891 | + $ac_cs_success || as_fn_exit 1 |
1892 | fi |
1893 | if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then |
1894 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 |
1895 | |
1896 | === modified file 'configure.ac' |
1897 | --- configure.ac 2010-07-15 15:02:16 +0000 |
1898 | +++ configure.ac 2010-08-12 19:45:57 +0000 |
1899 | @@ -1,10 +1,10 @@ |
1900 | |
1901 | -AC_INIT(libindicator, 0.3.10, ted@canonical.com) |
1902 | +AC_INIT(libindicator, 0.3.11, ted@canonical.com) |
1903 | |
1904 | AC_PREREQ(2.53) |
1905 | |
1906 | AM_CONFIG_HEADER(config.h) |
1907 | -AM_INIT_AUTOMAKE(libindicator, 0.3.10) |
1908 | +AM_INIT_AUTOMAKE(libindicator, 0.3.11) |
1909 | |
1910 | AM_MAINTAINER_MODE |
1911 | m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) |
1912 | |
1913 | === modified file 'debian/changelog' |
1914 | --- debian/changelog 2010-07-15 15:55:34 +0000 |
1915 | +++ debian/changelog 2010-08-12 19:45:57 +0000 |
1916 | @@ -1,3 +1,10 @@ |
1917 | +libindicator (0.3.11-0ubuntu1~ppa1) maverick; urgency=low |
1918 | + |
1919 | + * New upstream release. |
1920 | + * Allowing absolute paths in the image name (LP: #564034) |
1921 | + |
1922 | + -- Ted Gould <ted@ubuntu.com> Thu, 12 Aug 2010 14:42:46 -0500 |
1923 | + |
1924 | libindicator (0.3.10-0ubuntu1) maverick; urgency=low |
1925 | |
1926 | * New upstream release. |
1927 | @@ -6,6 +13,14 @@ |
1928 | |
1929 | -- Ted Gould <ted@ubuntu.com> Thu, 15 Jul 2010 10:02:56 -0500 |
1930 | |
1931 | +libindicator (0.3.9-1) unstable; urgency=low |
1932 | + |
1933 | + * Merging new upstream release and some changes from Ubuntu. |
1934 | + * Don't drop debian/source/* |
1935 | + * Standards-Version: 3.9.0 |
1936 | + |
1937 | + -- Evgeni Golov <evgeni@debian.org> Wed, 14 Jul 2010 10:07:36 +0200 |
1938 | + |
1939 | libindicator (0.3.9-0ubuntu2) maverick; urgency=low |
1940 | |
1941 | * Merged in fix for (LP: #603489) |
1942 | @@ -24,7 +39,7 @@ |
1943 | |
1944 | -- Ted Gould <ted@ubuntu.com> Thu, 08 Jul 2010 15:19:08 -0500 |
1945 | |
1946 | -libindicator (0.3.8-2) unstable; urgency=low |
1947 | +libindicator (0.3.8-2) UNRELEASED; urgency=low |
1948 | |
1949 | * Revert cdbs drop, as requested by the Ubuntu maintainers. |
1950 | * Update Maintainer and Vcs-* fields for pkg-ayatana. |
1951 | |
1952 | === added directory 'debian/source' |
1953 | === added file 'debian/source/format' |
1954 | --- debian/source/format 1970-01-01 00:00:00 +0000 |
1955 | +++ debian/source/format 2010-08-12 19:45:57 +0000 |
1956 | @@ -0,0 +1,1 @@ |
1957 | +3.0 (quilt) |
1958 | |
1959 | === modified file 'libindicator/Makefile.in' |
1960 | --- libindicator/Makefile.in 2010-07-15 14:58:36 +0000 |
1961 | +++ libindicator/Makefile.in 2010-08-12 19:45:57 +0000 |
1962 | @@ -202,6 +202,8 @@ |
1963 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
1964 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
1965 | PKG_CONFIG = @PKG_CONFIG@ |
1966 | +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
1967 | +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
1968 | PREFIX = @PREFIX@ |
1969 | RANLIB = @RANLIB@ |
1970 | SED = @SED@ |
1971 | |
1972 | === modified file 'libindicator/indicator-image-helper.c' |
1973 | --- libindicator/indicator-image-helper.c 2010-07-06 14:47:12 +0000 |
1974 | +++ libindicator/indicator-image-helper.c 2010-08-12 19:45:57 +0000 |
1975 | @@ -30,6 +30,9 @@ |
1976 | refresh_image (GtkImage * image) |
1977 | { |
1978 | g_return_if_fail(GTK_IS_IMAGE(image)); |
1979 | + const gchar * icon_filename = NULL; |
1980 | + GtkIconInfo * icon_info = NULL; |
1981 | + gint icon_size = 22; |
1982 | |
1983 | GIcon * icon_names = (GIcon *)g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA); |
1984 | g_return_if_fail(icon_names != NULL); |
1985 | @@ -38,23 +41,30 @@ |
1986 | GtkIconTheme * default_theme = gtk_icon_theme_get_default(); |
1987 | g_return_if_fail(default_theme != NULL); |
1988 | |
1989 | - gint icon_size = 22; |
1990 | - |
1991 | /* Look through the themes for that icon */ |
1992 | - GtkIconInfo * icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, icon_size, 0); |
1993 | + icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, icon_size, 0); |
1994 | if (icon_info == NULL) { |
1995 | - g_warning("Unable to find icon in theme."); |
1996 | - return; |
1997 | + /* Try using the second item in the names, which should be the original filename supplied */ |
1998 | + const gchar * const * names = g_themed_icon_get_names(G_THEMED_ICON( icon_names )); |
1999 | + if (names) { |
2000 | + icon_filename = names[1]; |
2001 | + } else { |
2002 | + g_warning("Unable to find icon\n"); |
2003 | + return; |
2004 | + } |
2005 | + } else { |
2006 | + /* Grab the filename */ |
2007 | + icon_filename = gtk_icon_info_get_filename(icon_info); |
2008 | } |
2009 | - |
2010 | - /* Grab the filename */ |
2011 | - const gchar * icon_filename = gtk_icon_info_get_filename(icon_info); |
2012 | - g_return_if_fail(icon_filename != NULL); /* An error because we shouldn't get info without a filename */ |
2013 | + g_return_if_fail(icon_filename != NULL); /* An error because we don't have a filename */ |
2014 | |
2015 | /* Build a pixbuf */ |
2016 | GError * error = NULL; |
2017 | GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file(icon_filename, &error); |
2018 | - gtk_icon_info_free(icon_info); |
2019 | + |
2020 | + if (icon_info != NULL) { |
2021 | + gtk_icon_info_free(icon_info); |
2022 | + } |
2023 | |
2024 | if (pixbuf == NULL) { |
2025 | g_error("Unable to load icon from file '%s' because: %s", icon_filename, error == NULL ? "I don't know" : error->message); |
2026 | @@ -126,12 +136,14 @@ |
2027 | g_return_if_fail(name != NULL); |
2028 | g_return_if_fail(name[0] != '\0'); |
2029 | g_return_if_fail(image != NULL); |
2030 | + gboolean seen_previously = FALSE; |
2031 | |
2032 | /* Build us a GIcon */ |
2033 | GIcon * icon_names = g_themed_icon_new_with_default_fallbacks(name); |
2034 | + g_warn_if_fail(icon_names != NULL); |
2035 | g_return_if_fail(icon_names != NULL); |
2036 | |
2037 | - gboolean seen_previously = (g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA) != NULL); |
2038 | + seen_previously = (g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA) != NULL); |
2039 | |
2040 | /* Attach our names to the image */ |
2041 | g_object_set_data_full(G_OBJECT(image), INDICATOR_NAMES_DATA, icon_names, g_object_unref); |
2042 | |
2043 | === modified file 'tests/Makefile.in' |
2044 | --- tests/Makefile.in 2010-07-15 15:02:16 +0000 |
2045 | +++ tests/Makefile.in 2010-08-12 19:45:57 +0000 |
2046 | @@ -363,6 +363,8 @@ |
2047 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
2048 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
2049 | PKG_CONFIG = @PKG_CONFIG@ |
2050 | +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
2051 | +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
2052 | PREFIX = @PREFIX@ |
2053 | RANLIB = @RANLIB@ |
2054 | SED = @SED@ |
2055 | |
2056 | === modified file 'tools/Makefile.in' |
2057 | --- tools/Makefile.in 2010-07-15 14:58:36 +0000 |
2058 | +++ tools/Makefile.in 2010-08-12 19:45:57 +0000 |
2059 | @@ -152,6 +152,8 @@ |
2060 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
2061 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
2062 | PKG_CONFIG = @PKG_CONFIG@ |
2063 | +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
2064 | +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
2065 | PREFIX = @PREFIX@ |
2066 | RANLIB = @RANLIB@ |
2067 | SED = @SED@ |
This doesn't look right.
My branch has "Diff: 72 lines (+22/-12) 1 file modified",
this has "2067 lines (+416/-359) 12 files modified".
Looks like an older branch I'd deleted because I'd messed up pushing requesting a merge in the wrong place?