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 | 170 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 170 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
6 | 171 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 171 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
7 | 172 | PKG_CONFIG = @PKG_CONFIG@ | 172 | PKG_CONFIG = @PKG_CONFIG@ |
8 | 173 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
9 | 174 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
10 | 173 | PREFIX = @PREFIX@ | 175 | PREFIX = @PREFIX@ |
11 | 174 | RANLIB = @RANLIB@ | 176 | RANLIB = @RANLIB@ |
12 | 175 | SED = @SED@ | 177 | SED = @SED@ |
13 | 176 | 178 | ||
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 | 13 | 13 | ||
19 | 14 | m4_ifndef([AC_AUTOCONF_VERSION], | 14 | m4_ifndef([AC_AUTOCONF_VERSION], |
20 | 15 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 15 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
23 | 16 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, | 16 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, |
24 | 17 | [m4_warning([this file was generated for autoconf 2.65. | 17 | [m4_warning([this file was generated for autoconf 2.67. |
25 | 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. |
26 | 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. |
27 | 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'.])]) |
28 | @@ -7986,6 +7986,7 @@ | |||
29 | 7986 | m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) | 7986 | m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) |
30 | 7987 | 7987 | ||
31 | 7988 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | 7988 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
32 | 7989 | # serial 1 (pkg-config-0.24) | ||
33 | 7989 | # | 7990 | # |
34 | 7990 | # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. | 7991 | # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. |
35 | 7991 | # | 7992 | # |
36 | @@ -8013,7 +8014,10 @@ | |||
37 | 8013 | AC_DEFUN([PKG_PROG_PKG_CONFIG], | 8014 | AC_DEFUN([PKG_PROG_PKG_CONFIG], |
38 | 8014 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) | 8015 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
39 | 8015 | m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) | 8016 | m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) |
41 | 8016 | AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl | 8017 | AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
42 | 8018 | AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) | ||
43 | 8019 | AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) | ||
44 | 8020 | |||
45 | 8017 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | 8021 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
46 | 8018 | AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) | 8022 | AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) |
47 | 8019 | fi | 8023 | fi |
48 | @@ -8026,7 +8030,6 @@ | |||
49 | 8026 | AC_MSG_RESULT([no]) | 8030 | AC_MSG_RESULT([no]) |
50 | 8027 | PKG_CONFIG="" | 8031 | PKG_CONFIG="" |
51 | 8028 | fi | 8032 | fi |
52 | 8029 | |||
53 | 8030 | fi[]dnl | 8033 | fi[]dnl |
54 | 8031 | ])# PKG_PROG_PKG_CONFIG | 8034 | ])# PKG_PROG_PKG_CONFIG |
55 | 8032 | 8035 | ||
56 | @@ -8035,34 +8038,31 @@ | |||
57 | 8035 | # Check to see whether a particular set of modules exists. Similar | 8038 | # Check to see whether a particular set of modules exists. Similar |
58 | 8036 | # to PKG_CHECK_MODULES(), but does not set variables or print errors. | 8039 | # to PKG_CHECK_MODULES(), but does not set variables or print errors. |
59 | 8037 | # | 8040 | # |
64 | 8038 | # | 8041 | # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) |
65 | 8039 | # Similar to PKG_CHECK_MODULES, make sure that the first instance of | 8042 | # only at the first occurence in configure.ac, so if the first place |
66 | 8040 | # this or PKG_CHECK_MODULES is called, or make sure to call | 8043 | # it's called might be skipped (such as if it is within an "if", you |
67 | 8041 | # PKG_CHECK_EXISTS manually | 8044 | # have to call PKG_CHECK_EXISTS manually |
68 | 8042 | # -------------------------------------------------------------- | 8045 | # -------------------------------------------------------------- |
69 | 8043 | AC_DEFUN([PKG_CHECK_EXISTS], | 8046 | AC_DEFUN([PKG_CHECK_EXISTS], |
70 | 8044 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | 8047 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
71 | 8045 | if test -n "$PKG_CONFIG" && \ | 8048 | if test -n "$PKG_CONFIG" && \ |
72 | 8046 | AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then | 8049 | AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then |
74 | 8047 | m4_ifval([$2], [$2], [:]) | 8050 | m4_default([$2], [:]) |
75 | 8048 | m4_ifvaln([$3], [else | 8051 | m4_ifvaln([$3], [else |
76 | 8049 | $3])dnl | 8052 | $3])dnl |
77 | 8050 | fi]) | 8053 | fi]) |
78 | 8051 | 8054 | ||
79 | 8052 | |||
80 | 8053 | # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) | 8055 | # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) |
81 | 8054 | # --------------------------------------------- | 8056 | # --------------------------------------------- |
82 | 8055 | m4_define([_PKG_CONFIG], | 8057 | m4_define([_PKG_CONFIG], |
93 | 8056 | [if test -n "$PKG_CONFIG"; then | 8058 | [if test -n "$$1"; then |
94 | 8057 | if test -n "$$1"; then | 8059 | pkg_cv_[]$1="$$1" |
95 | 8058 | pkg_cv_[]$1="$$1" | 8060 | elif test -n "$PKG_CONFIG"; then |
96 | 8059 | else | 8061 | PKG_CHECK_EXISTS([$3], |
97 | 8060 | PKG_CHECK_EXISTS([$3], | 8062 | [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
98 | 8061 | [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], | 8063 | [pkg_failed=yes]) |
99 | 8062 | [pkg_failed=yes]) | 8064 | else |
100 | 8063 | fi | 8065 | pkg_failed=untried |
91 | 8064 | else | ||
92 | 8065 | pkg_failed=untried | ||
101 | 8066 | fi[]dnl | 8066 | fi[]dnl |
102 | 8067 | ])# _PKG_CONFIG | 8067 | ])# _PKG_CONFIG |
103 | 8068 | 8068 | ||
104 | @@ -8104,16 +8104,17 @@ | |||
105 | 8104 | See the pkg-config man page for more details.]) | 8104 | See the pkg-config man page for more details.]) |
106 | 8105 | 8105 | ||
107 | 8106 | if test $pkg_failed = yes; then | 8106 | if test $pkg_failed = yes; then |
108 | 8107 | AC_MSG_RESULT([no]) | ||
109 | 8107 | _PKG_SHORT_ERRORS_SUPPORTED | 8108 | _PKG_SHORT_ERRORS_SUPPORTED |
110 | 8108 | if test $_pkg_short_errors_supported = yes; then | 8109 | if test $_pkg_short_errors_supported = yes; then |
112 | 8109 | $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` | 8110 | $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` |
113 | 8110 | else | 8111 | else |
115 | 8111 | $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` | 8112 | $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` |
116 | 8112 | fi | 8113 | fi |
117 | 8113 | # Put the nasty error message in config.log where it belongs | 8114 | # Put the nasty error message in config.log where it belongs |
118 | 8114 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD | 8115 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
119 | 8115 | 8116 | ||
121 | 8116 | ifelse([$4], , [AC_MSG_ERROR(dnl | 8117 | m4_default([$4], [AC_MSG_ERROR( |
122 | 8117 | [Package requirements ($2) were not met: | 8118 | [Package requirements ($2) were not met: |
123 | 8118 | 8119 | ||
124 | 8119 | $$1_PKG_ERRORS | 8120 | $$1_PKG_ERRORS |
125 | @@ -8121,25 +8122,24 @@ | |||
126 | 8121 | Consider adjusting the PKG_CONFIG_PATH environment variable if you | 8122 | Consider adjusting the PKG_CONFIG_PATH environment variable if you |
127 | 8122 | installed software in a non-standard prefix. | 8123 | installed software in a non-standard prefix. |
128 | 8123 | 8124 | ||
133 | 8124 | _PKG_TEXT | 8125 | _PKG_TEXT])dnl |
134 | 8125 | ])], | 8126 | ]) |
131 | 8126 | [AC_MSG_RESULT([no]) | ||
132 | 8127 | $4]) | ||
135 | 8128 | elif test $pkg_failed = untried; then | 8127 | elif test $pkg_failed = untried; then |
137 | 8129 | ifelse([$4], , [AC_MSG_FAILURE(dnl | 8128 | AC_MSG_RESULT([no]) |
138 | 8129 | m4_default([$4], [AC_MSG_FAILURE( | ||
139 | 8130 | [The pkg-config script could not be found or is too old. Make sure it | 8130 | [The pkg-config script could not be found or is too old. Make sure it |
140 | 8131 | is in your PATH or set the PKG_CONFIG environment variable to the full | 8131 | is in your PATH or set the PKG_CONFIG environment variable to the full |
141 | 8132 | path to pkg-config. | 8132 | path to pkg-config. |
142 | 8133 | 8133 | ||
143 | 8134 | _PKG_TEXT | 8134 | _PKG_TEXT |
144 | 8135 | 8135 | ||
147 | 8136 | To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], | 8136 | To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl |
148 | 8137 | [$4]) | 8137 | ]) |
149 | 8138 | else | 8138 | else |
150 | 8139 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS | 8139 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
151 | 8140 | $1[]_LIBS=$pkg_cv_[]$1[]_LIBS | 8140 | $1[]_LIBS=$pkg_cv_[]$1[]_LIBS |
152 | 8141 | AC_MSG_RESULT([yes]) | 8141 | AC_MSG_RESULT([yes]) |
154 | 8142 | ifelse([$3], , :, [$3]) | 8142 | $3 |
155 | 8143 | fi[]dnl | 8143 | fi[]dnl |
156 | 8144 | ])# PKG_CHECK_MODULES | 8144 | ])# PKG_CHECK_MODULES |
157 | 8145 | 8145 | ||
158 | 8146 | 8146 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
164 | 2 | # Attempt to guess a canonical system name. | 2 | # Attempt to guess a canonical system name. |
165 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
167 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
168 | 5 | # Free Software Foundation, Inc. | 5 | # Free Software Foundation, Inc. |
169 | 6 | 6 | ||
171 | 7 | timestamp='2009-06-10' | 7 | timestamp='2009-12-30' |
172 | 8 | 8 | ||
173 | 9 | # This file is free software; you can redistribute it and/or modify it | 9 | # This file is free software; you can redistribute it and/or modify it |
174 | 10 | # under the terms of the GNU General Public License as published by | 10 | # under the terms of the GNU General Public License as published by |
175 | @@ -27,16 +27,16 @@ | |||
176 | 27 | # the same distribution terms that you use for the rest of that program. | 27 | # the same distribution terms that you use for the rest of that program. |
177 | 28 | 28 | ||
178 | 29 | 29 | ||
182 | 30 | # Originally written by Per Bothner <per@bothner.com>. | 30 | # Originally written by Per Bothner. Please send patches (context |
183 | 31 | # Please send patches to <config-patches@gnu.org>. Submit a context | 31 | # diff format) to <config-patches@gnu.org> and include a ChangeLog |
184 | 32 | # diff and a properly formatted ChangeLog entry. | 32 | # entry. |
185 | 33 | # | 33 | # |
186 | 34 | # This script attempts to guess a canonical system name similar to | 34 | # This script attempts to guess a canonical system name similar to |
187 | 35 | # config.sub. If it succeeds, it prints the system name on stdout, and | 35 | # config.sub. If it succeeds, it prints the system name on stdout, and |
188 | 36 | # exits with 0. Otherwise, it exits with 1. | 36 | # exits with 0. Otherwise, it exits with 1. |
189 | 37 | # | 37 | # |
192 | 38 | # The plan is that this can be called by configure scripts if you | 38 | # You can get the latest version of this script from: |
193 | 39 | # don't specify an explicit build system type. | 39 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
194 | 40 | 40 | ||
195 | 41 | me=`echo "$0" | sed -e 's,.*/,,'` | 41 | me=`echo "$0" | sed -e 's,.*/,,'` |
196 | 42 | 42 | ||
197 | @@ -56,8 +56,9 @@ | |||
198 | 56 | GNU config.guess ($timestamp) | 56 | GNU config.guess ($timestamp) |
199 | 57 | 57 | ||
200 | 58 | Originally written by Per Bothner. | 58 | Originally written by Per Bothner. |
203 | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, | 59 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
204 | 60 | 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 60 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
205 | 61 | Software Foundation, Inc. | ||
206 | 61 | 62 | ||
207 | 62 | This is free software; see the source for copying conditions. There is NO | 63 | This is free software; see the source for copying conditions. There is NO |
208 | 63 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 64 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
209 | @@ -333,6 +334,9 @@ | |||
210 | 333 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) | 334 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
211 | 334 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 335 | echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
212 | 335 | exit ;; | 336 | exit ;; |
213 | 337 | i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) | ||
214 | 338 | echo i386-pc-auroraux${UNAME_RELEASE} | ||
215 | 339 | exit ;; | ||
216 | 336 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) | 340 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
217 | 337 | eval $set_cc_for_build | 341 | eval $set_cc_for_build |
218 | 338 | SUN_ARCH="i386" | 342 | SUN_ARCH="i386" |
219 | @@ -807,12 +811,12 @@ | |||
220 | 807 | i*:PW*:*) | 811 | i*:PW*:*) |
221 | 808 | echo ${UNAME_MACHINE}-pc-pw32 | 812 | echo ${UNAME_MACHINE}-pc-pw32 |
222 | 809 | exit ;; | 813 | exit ;; |
224 | 810 | *:Interix*:[3456]*) | 814 | *:Interix*:*) |
225 | 811 | case ${UNAME_MACHINE} in | 815 | case ${UNAME_MACHINE} in |
226 | 812 | x86) | 816 | x86) |
227 | 813 | echo i586-pc-interix${UNAME_RELEASE} | 817 | echo i586-pc-interix${UNAME_RELEASE} |
228 | 814 | exit ;; | 818 | exit ;; |
230 | 815 | EM64T | authenticamd | genuineintel) | 819 | authenticamd | genuineintel | EM64T) |
231 | 816 | echo x86_64-unknown-interix${UNAME_RELEASE} | 820 | echo x86_64-unknown-interix${UNAME_RELEASE} |
232 | 817 | exit ;; | 821 | exit ;; |
233 | 818 | IA64) | 822 | IA64) |
234 | @@ -854,6 +858,20 @@ | |||
235 | 854 | i*86:Minix:*:*) | 858 | i*86:Minix:*:*) |
236 | 855 | echo ${UNAME_MACHINE}-pc-minix | 859 | echo ${UNAME_MACHINE}-pc-minix |
237 | 856 | exit ;; | 860 | exit ;; |
238 | 861 | alpha:Linux:*:*) | ||
239 | 862 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | ||
240 | 863 | EV5) UNAME_MACHINE=alphaev5 ;; | ||
241 | 864 | EV56) UNAME_MACHINE=alphaev56 ;; | ||
242 | 865 | PCA56) UNAME_MACHINE=alphapca56 ;; | ||
243 | 866 | PCA57) UNAME_MACHINE=alphapca56 ;; | ||
244 | 867 | EV6) UNAME_MACHINE=alphaev6 ;; | ||
245 | 868 | EV67) UNAME_MACHINE=alphaev67 ;; | ||
246 | 869 | EV68*) UNAME_MACHINE=alphaev68 ;; | ||
247 | 870 | esac | ||
248 | 871 | objdump --private-headers /bin/sh | grep -q ld.so.1 | ||
249 | 872 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | ||
250 | 873 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | ||
251 | 874 | exit ;; | ||
252 | 857 | arm*:Linux:*:*) | 875 | arm*:Linux:*:*) |
253 | 858 | eval $set_cc_for_build | 876 | eval $set_cc_for_build |
254 | 859 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 877 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
255 | @@ -876,6 +894,17 @@ | |||
256 | 876 | frv:Linux:*:*) | 894 | frv:Linux:*:*) |
257 | 877 | echo frv-unknown-linux-gnu | 895 | echo frv-unknown-linux-gnu |
258 | 878 | exit ;; | 896 | exit ;; |
259 | 897 | i*86:Linux:*:*) | ||
260 | 898 | LIBC=gnu | ||
261 | 899 | eval $set_cc_for_build | ||
262 | 900 | sed 's/^ //' << EOF >$dummy.c | ||
263 | 901 | #ifdef __dietlibc__ | ||
264 | 902 | LIBC=dietlibc | ||
265 | 903 | #endif | ||
266 | 904 | EOF | ||
267 | 905 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` | ||
268 | 906 | echo "${UNAME_MACHINE}-pc-linux-${LIBC}" | ||
269 | 907 | exit ;; | ||
270 | 879 | ia64:Linux:*:*) | 908 | ia64:Linux:*:*) |
271 | 880 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 909 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
272 | 881 | exit ;; | 910 | exit ;; |
273 | @@ -901,39 +930,18 @@ | |||
274 | 901 | #endif | 930 | #endif |
275 | 902 | #endif | 931 | #endif |
276 | 903 | EOF | 932 | EOF |
282 | 904 | eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' | 933 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
278 | 905 | /^CPU/{ | ||
279 | 906 | s: ::g | ||
280 | 907 | p | ||
281 | 908 | }'`" | ||
283 | 909 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } | 934 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
284 | 910 | ;; | 935 | ;; |
285 | 911 | or32:Linux:*:*) | 936 | or32:Linux:*:*) |
286 | 912 | echo or32-unknown-linux-gnu | 937 | echo or32-unknown-linux-gnu |
287 | 913 | exit ;; | 938 | exit ;; |
288 | 914 | ppc:Linux:*:*) | ||
289 | 915 | echo powerpc-unknown-linux-gnu | ||
290 | 916 | exit ;; | ||
291 | 917 | ppc64:Linux:*:*) | ||
292 | 918 | echo powerpc64-unknown-linux-gnu | ||
293 | 919 | exit ;; | ||
294 | 920 | alpha:Linux:*:*) | ||
295 | 921 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | ||
296 | 922 | EV5) UNAME_MACHINE=alphaev5 ;; | ||
297 | 923 | EV56) UNAME_MACHINE=alphaev56 ;; | ||
298 | 924 | PCA56) UNAME_MACHINE=alphapca56 ;; | ||
299 | 925 | PCA57) UNAME_MACHINE=alphapca56 ;; | ||
300 | 926 | EV6) UNAME_MACHINE=alphaev6 ;; | ||
301 | 927 | EV67) UNAME_MACHINE=alphaev67 ;; | ||
302 | 928 | EV68*) UNAME_MACHINE=alphaev68 ;; | ||
303 | 929 | esac | ||
304 | 930 | objdump --private-headers /bin/sh | grep -q ld.so.1 | ||
305 | 931 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | ||
306 | 932 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | ||
307 | 933 | exit ;; | ||
308 | 934 | padre:Linux:*:*) | 939 | padre:Linux:*:*) |
309 | 935 | echo sparc-unknown-linux-gnu | 940 | echo sparc-unknown-linux-gnu |
310 | 936 | exit ;; | 941 | exit ;; |
311 | 942 | parisc64:Linux:*:* | hppa64:Linux:*:*) | ||
312 | 943 | echo hppa64-unknown-linux-gnu | ||
313 | 944 | exit ;; | ||
314 | 937 | parisc:Linux:*:* | hppa:Linux:*:*) | 945 | parisc:Linux:*:* | hppa:Linux:*:*) |
315 | 938 | # Look for CPU level | 946 | # Look for CPU level |
316 | 939 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in | 947 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
317 | @@ -942,8 +950,11 @@ | |||
318 | 942 | *) echo hppa-unknown-linux-gnu ;; | 950 | *) echo hppa-unknown-linux-gnu ;; |
319 | 943 | esac | 951 | esac |
320 | 944 | exit ;; | 952 | exit ;; |
323 | 945 | parisc64:Linux:*:* | hppa64:Linux:*:*) | 953 | ppc64:Linux:*:*) |
324 | 946 | echo hppa64-unknown-linux-gnu | 954 | echo powerpc64-unknown-linux-gnu |
325 | 955 | exit ;; | ||
326 | 956 | ppc:Linux:*:*) | ||
327 | 957 | echo powerpc-unknown-linux-gnu | ||
328 | 947 | exit ;; | 958 | exit ;; |
329 | 948 | s390:Linux:*:* | s390x:Linux:*:*) | 959 | s390:Linux:*:* | s390x:Linux:*:*) |
330 | 949 | echo ${UNAME_MACHINE}-ibm-linux | 960 | echo ${UNAME_MACHINE}-ibm-linux |
331 | @@ -966,58 +977,6 @@ | |||
332 | 966 | xtensa*:Linux:*:*) | 977 | xtensa*:Linux:*:*) |
333 | 967 | echo ${UNAME_MACHINE}-unknown-linux-gnu | 978 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
334 | 968 | exit ;; | 979 | exit ;; |
335 | 969 | i*86:Linux:*:*) | ||
336 | 970 | # The BFD linker knows what the default object file format is, so | ||
337 | 971 | # first see if it will tell us. cd to the root directory to prevent | ||
338 | 972 | # problems with other programs or directories called `ld' in the path. | ||
339 | 973 | # Set LC_ALL=C to ensure ld outputs messages in English. | ||
340 | 974 | ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | ||
341 | 975 | | sed -ne '/supported targets:/!d | ||
342 | 976 | s/[ ][ ]*/ /g | ||
343 | 977 | s/.*supported targets: *// | ||
344 | 978 | s/ .*// | ||
345 | 979 | p'` | ||
346 | 980 | case "$ld_supported_targets" in | ||
347 | 981 | elf32-i386) | ||
348 | 982 | TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" | ||
349 | 983 | ;; | ||
350 | 984 | esac | ||
351 | 985 | # Determine whether the default compiler is a.out or elf | ||
352 | 986 | eval $set_cc_for_build | ||
353 | 987 | sed 's/^ //' << EOF >$dummy.c | ||
354 | 988 | #include <features.h> | ||
355 | 989 | #ifdef __ELF__ | ||
356 | 990 | # ifdef __GLIBC__ | ||
357 | 991 | # if __GLIBC__ >= 2 | ||
358 | 992 | LIBC=gnu | ||
359 | 993 | # else | ||
360 | 994 | LIBC=gnulibc1 | ||
361 | 995 | # endif | ||
362 | 996 | # else | ||
363 | 997 | LIBC=gnulibc1 | ||
364 | 998 | # endif | ||
365 | 999 | #else | ||
366 | 1000 | #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) | ||
367 | 1001 | LIBC=gnu | ||
368 | 1002 | #else | ||
369 | 1003 | LIBC=gnuaout | ||
370 | 1004 | #endif | ||
371 | 1005 | #endif | ||
372 | 1006 | #ifdef __dietlibc__ | ||
373 | 1007 | LIBC=dietlibc | ||
374 | 1008 | #endif | ||
375 | 1009 | EOF | ||
376 | 1010 | eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' | ||
377 | 1011 | /^LIBC/{ | ||
378 | 1012 | s: ::g | ||
379 | 1013 | p | ||
380 | 1014 | }'`" | ||
381 | 1015 | test x"${LIBC}" != x && { | ||
382 | 1016 | echo "${UNAME_MACHINE}-pc-linux-${LIBC}" | ||
383 | 1017 | exit | ||
384 | 1018 | } | ||
385 | 1019 | test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } | ||
386 | 1020 | ;; | ||
387 | 1021 | i*86:DYNIX/ptx:4*:*) | 980 | i*86:DYNIX/ptx:4*:*) |
388 | 1022 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. | 981 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
389 | 1023 | # earlier versions are messed up and put the nodename in both | 982 | # earlier versions are messed up and put the nodename in both |
390 | @@ -1247,6 +1206,16 @@ | |||
391 | 1247 | *:Darwin:*:*) | 1206 | *:Darwin:*:*) |
392 | 1248 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown | 1207 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
393 | 1249 | case $UNAME_PROCESSOR in | 1208 | case $UNAME_PROCESSOR in |
394 | 1209 | i386) | ||
395 | 1210 | eval $set_cc_for_build | ||
396 | 1211 | if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then | ||
397 | 1212 | if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ | ||
398 | 1213 | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ | ||
399 | 1214 | grep IS_64BIT_ARCH >/dev/null | ||
400 | 1215 | then | ||
401 | 1216 | UNAME_PROCESSOR="x86_64" | ||
402 | 1217 | fi | ||
403 | 1218 | fi ;; | ||
404 | 1250 | unknown) UNAME_PROCESSOR=powerpc ;; | 1219 | unknown) UNAME_PROCESSOR=powerpc ;; |
405 | 1251 | esac | 1220 | esac |
406 | 1252 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} | 1221 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
407 | 1253 | 1222 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
413 | 2 | # Configuration validation subroutine script. | 2 | # Configuration validation subroutine script. |
414 | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 3 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
416 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 | 4 | # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
417 | 5 | # Free Software Foundation, Inc. | 5 | # Free Software Foundation, Inc. |
418 | 6 | 6 | ||
420 | 7 | timestamp='2009-06-11' | 7 | timestamp='2010-01-22' |
421 | 8 | 8 | ||
422 | 9 | # This file is (in principle) common to ALL GNU software. | 9 | # This file is (in principle) common to ALL GNU software. |
423 | 10 | # The presence of a machine in this file suggests that SOME GNU software | 10 | # The presence of a machine in this file suggests that SOME GNU software |
424 | @@ -32,13 +32,16 @@ | |||
425 | 32 | 32 | ||
426 | 33 | 33 | ||
427 | 34 | # Please send patches to <config-patches@gnu.org>. Submit a context | 34 | # Please send patches to <config-patches@gnu.org>. Submit a context |
429 | 35 | # diff and a properly formatted ChangeLog entry. | 35 | # diff and a properly formatted GNU ChangeLog entry. |
430 | 36 | # | 36 | # |
431 | 37 | # Configuration subroutine to validate and canonicalize a configuration type. | 37 | # Configuration subroutine to validate and canonicalize a configuration type. |
432 | 38 | # Supply the specified configuration type as an argument. | 38 | # Supply the specified configuration type as an argument. |
433 | 39 | # If it is invalid, we print an error message on stderr and exit with code 1. | 39 | # If it is invalid, we print an error message on stderr and exit with code 1. |
434 | 40 | # Otherwise, we print the canonical config type on stdout and succeed. | 40 | # Otherwise, we print the canonical config type on stdout and succeed. |
435 | 41 | 41 | ||
436 | 42 | # You can get the latest version of this script from: | ||
437 | 43 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD | ||
438 | 44 | |||
439 | 42 | # This file is supposed to be the same for all GNU packages | 45 | # This file is supposed to be the same for all GNU packages |
440 | 43 | # and recognize all the CPU types, system types and aliases | 46 | # and recognize all the CPU types, system types and aliases |
441 | 44 | # that are meaningful with *any* GNU software. | 47 | # that are meaningful with *any* GNU software. |
442 | @@ -72,8 +75,9 @@ | |||
443 | 72 | version="\ | 75 | version="\ |
444 | 73 | GNU config.sub ($timestamp) | 76 | GNU config.sub ($timestamp) |
445 | 74 | 77 | ||
448 | 75 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, | 78 | Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
449 | 76 | 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | 79 | 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
450 | 80 | Software Foundation, Inc. | ||
451 | 77 | 81 | ||
452 | 78 | This is free software; see the source for copying conditions. There is NO | 82 | This is free software; see the source for copying conditions. There is NO |
453 | 79 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 83 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
454 | @@ -149,7 +153,7 @@ | |||
455 | 149 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ | 153 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
456 | 150 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ | 154 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
457 | 151 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ | 155 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
459 | 152 | -apple | -axis | -knuth | -cray) | 156 | -apple | -axis | -knuth | -cray | -microblaze) |
460 | 153 | os= | 157 | os= |
461 | 154 | basic_machine=$1 | 158 | basic_machine=$1 |
462 | 155 | ;; | 159 | ;; |
463 | @@ -284,6 +288,7 @@ | |||
464 | 284 | | pdp10 | pdp11 | pj | pjl \ | 288 | | pdp10 | pdp11 | pj | pjl \ |
465 | 285 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | 289 | | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
466 | 286 | | pyramid \ | 290 | | pyramid \ |
467 | 291 | | rx \ | ||
468 | 287 | | score \ | 292 | | score \ |
469 | 288 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | 293 | | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
470 | 289 | | sh64 | sh64le \ | 294 | | sh64 | sh64le \ |
471 | @@ -291,13 +296,14 @@ | |||
472 | 291 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | 296 | | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
473 | 292 | | spu | strongarm \ | 297 | | spu | strongarm \ |
474 | 293 | | tahoe | thumb | tic4x | tic80 | tron \ | 298 | | tahoe | thumb | tic4x | tic80 | tron \ |
475 | 299 | | ubicom32 \ | ||
476 | 294 | | v850 | v850e \ | 300 | | v850 | v850e \ |
477 | 295 | | we32k \ | 301 | | we32k \ |
478 | 296 | | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | 302 | | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
479 | 297 | | z8k | z80) | 303 | | z8k | z80) |
480 | 298 | basic_machine=$basic_machine-unknown | 304 | basic_machine=$basic_machine-unknown |
481 | 299 | ;; | 305 | ;; |
483 | 300 | m6811 | m68hc11 | m6812 | m68hc12) | 306 | m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
484 | 301 | # Motorola 68HC11/12. | 307 | # Motorola 68HC11/12. |
485 | 302 | basic_machine=$basic_machine-unknown | 308 | basic_machine=$basic_machine-unknown |
486 | 303 | os=-none | 309 | os=-none |
487 | @@ -340,7 +346,7 @@ | |||
488 | 340 | | lm32-* \ | 346 | | lm32-* \ |
489 | 341 | | m32c-* | m32r-* | m32rle-* \ | 347 | | m32c-* | m32r-* | m32rle-* \ |
490 | 342 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | 348 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
492 | 343 | | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | 349 | | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ |
493 | 344 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | 350 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
494 | 345 | | mips16-* \ | 351 | | mips16-* \ |
495 | 346 | | mips64-* | mips64el-* \ | 352 | | mips64-* | mips64el-* \ |
496 | @@ -368,15 +374,17 @@ | |||
497 | 368 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | 374 | | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
498 | 369 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | 375 | | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
499 | 370 | | pyramid-* \ | 376 | | pyramid-* \ |
501 | 371 | | romp-* | rs6000-* \ | 377 | | romp-* | rs6000-* | rx-* \ |
502 | 372 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | 378 | | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
503 | 373 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | 379 | | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
504 | 374 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | 380 | | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
505 | 375 | | sparclite-* \ | 381 | | sparclite-* \ |
506 | 376 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | 382 | | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
507 | 377 | | tahoe-* | thumb-* \ | 383 | | tahoe-* | thumb-* \ |
509 | 378 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | 384 | | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
510 | 385 | | tile-* | tilegx-* \ | ||
511 | 379 | | tron-* \ | 386 | | tron-* \ |
512 | 387 | | ubicom32-* \ | ||
513 | 380 | | v850-* | v850e-* | vax-* \ | 388 | | v850-* | v850e-* | vax-* \ |
514 | 381 | | we32k-* \ | 389 | | we32k-* \ |
515 | 382 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | 390 | | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
516 | @@ -726,6 +734,9 @@ | |||
517 | 726 | basic_machine=ns32k-utek | 734 | basic_machine=ns32k-utek |
518 | 727 | os=-sysv | 735 | os=-sysv |
519 | 728 | ;; | 736 | ;; |
520 | 737 | microblaze) | ||
521 | 738 | basic_machine=microblaze-xilinx | ||
522 | 739 | ;; | ||
523 | 729 | mingw32) | 740 | mingw32) |
524 | 730 | basic_machine=i386-pc | 741 | basic_machine=i386-pc |
525 | 731 | os=-mingw32 | 742 | os=-mingw32 |
526 | @@ -1076,6 +1087,11 @@ | |||
527 | 1076 | basic_machine=tic6x-unknown | 1087 | basic_machine=tic6x-unknown |
528 | 1077 | os=-coff | 1088 | os=-coff |
529 | 1078 | ;; | 1089 | ;; |
530 | 1090 | # This must be matched before tile*. | ||
531 | 1091 | tilegx*) | ||
532 | 1092 | basic_machine=tilegx-unknown | ||
533 | 1093 | os=-linux-gnu | ||
534 | 1094 | ;; | ||
535 | 1079 | tile*) | 1095 | tile*) |
536 | 1080 | basic_machine=tile-unknown | 1096 | basic_machine=tile-unknown |
537 | 1081 | os=-linux-gnu | 1097 | os=-linux-gnu |
538 | @@ -1247,6 +1263,9 @@ | |||
539 | 1247 | # First match some system type aliases | 1263 | # First match some system type aliases |
540 | 1248 | # that might get confused with valid system types. | 1264 | # that might get confused with valid system types. |
541 | 1249 | # -solaris* is a basic system type, with this one exception. | 1265 | # -solaris* is a basic system type, with this one exception. |
542 | 1266 | -auroraux) | ||
543 | 1267 | os=-auroraux | ||
544 | 1268 | ;; | ||
545 | 1250 | -solaris1 | -solaris1.*) | 1269 | -solaris1 | -solaris1.*) |
546 | 1251 | os=`echo $os | sed -e 's|solaris1|sunos4|'` | 1270 | os=`echo $os | sed -e 's|solaris1|sunos4|'` |
547 | 1252 | ;; | 1271 | ;; |
548 | @@ -1268,8 +1287,8 @@ | |||
549 | 1268 | # -sysv* is not here because it comes later, after sysvr4. | 1287 | # -sysv* is not here because it comes later, after sysvr4. |
550 | 1269 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | 1288 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
551 | 1270 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | 1289 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
554 | 1271 | | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | 1290 | | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
555 | 1272 | | -kopensolaris* \ | 1291 | | -sym* | -kopensolaris* \ |
556 | 1273 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | 1292 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
557 | 1274 | | -aos* | -aros* \ | 1293 | | -aos* | -aros* \ |
558 | 1275 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | 1294 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
559 | @@ -1290,7 +1309,7 @@ | |||
560 | 1290 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | 1309 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
561 | 1291 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | 1310 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
562 | 1292 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | 1311 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
564 | 1293 | | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) | 1312 | | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
565 | 1294 | # Remember, each alternative MUST END IN *, to match a version number. | 1313 | # Remember, each alternative MUST END IN *, to match a version number. |
566 | 1295 | ;; | 1314 | ;; |
567 | 1296 | -qnx*) | 1315 | -qnx*) |
568 | @@ -1423,6 +1442,8 @@ | |||
569 | 1423 | -dicos*) | 1442 | -dicos*) |
570 | 1424 | os=-dicos | 1443 | os=-dicos |
571 | 1425 | ;; | 1444 | ;; |
572 | 1445 | -nacl*) | ||
573 | 1446 | ;; | ||
574 | 1426 | -none) | 1447 | -none) |
575 | 1427 | ;; | 1448 | ;; |
576 | 1428 | *) | 1449 | *) |
577 | 1429 | 1450 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
583 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
585 | 3 | # Generated by GNU Autoconf 2.65 for libindicator 0.3.10. | 3 | # Generated by GNU Autoconf 2.67 for libindicator 0.3.11. |
586 | 4 | # | 4 | # |
587 | 5 | # Report bugs to <ted@canonical.com>. | 5 | # Report bugs to <ted@canonical.com>. |
588 | 6 | # | 6 | # |
589 | 7 | # | 7 | # |
590 | 8 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | 8 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
593 | 9 | # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, | 9 | # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
594 | 10 | # Inc. | 10 | # Foundation, Inc. |
595 | 11 | # | 11 | # |
596 | 12 | # | 12 | # |
597 | 13 | # This configure script is free software; the Free Software Foundation | 13 | # This configure script is free software; the Free Software Foundation |
598 | @@ -319,7 +319,7 @@ | |||
599 | 319 | test -d "$as_dir" && break | 319 | test -d "$as_dir" && break |
600 | 320 | done | 320 | done |
601 | 321 | test -z "$as_dirs" || eval "mkdir $as_dirs" | 321 | test -z "$as_dirs" || eval "mkdir $as_dirs" |
603 | 322 | } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" | 322 | } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
604 | 323 | 323 | ||
605 | 324 | 324 | ||
606 | 325 | } # as_fn_mkdir_p | 325 | } # as_fn_mkdir_p |
607 | @@ -359,19 +359,19 @@ | |||
608 | 359 | fi # as_fn_arith | 359 | fi # as_fn_arith |
609 | 360 | 360 | ||
610 | 361 | 361 | ||
613 | 362 | # as_fn_error ERROR [LINENO LOG_FD] | 362 | # as_fn_error STATUS ERROR [LINENO LOG_FD] |
614 | 363 | # --------------------------------- | 363 | # ---------------------------------------- |
615 | 364 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are | 364 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
616 | 365 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the | 365 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
618 | 366 | # script with status $?, using 1 if that was 0. | 366 | # script with STATUS, using 1 if that was 0. |
619 | 367 | as_fn_error () | 367 | as_fn_error () |
620 | 368 | { | 368 | { |
625 | 369 | as_status=$?; test $as_status -eq 0 && as_status=1 | 369 | as_status=$1; test $as_status -eq 0 && as_status=1 |
626 | 370 | if test "$3"; then | 370 | if test "$4"; then |
627 | 371 | as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 371 | as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
628 | 372 | $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 | 372 | $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
629 | 373 | fi | 373 | fi |
631 | 374 | $as_echo "$as_me: error: $1" >&2 | 374 | $as_echo "$as_me: error: $2" >&2 |
632 | 375 | as_fn_exit $as_status | 375 | as_fn_exit $as_status |
633 | 376 | } # as_fn_error | 376 | } # as_fn_error |
634 | 377 | 377 | ||
635 | @@ -682,7 +682,7 @@ | |||
636 | 682 | exec 6>&1 | 682 | exec 6>&1 |
637 | 683 | 683 | ||
638 | 684 | # Name of the host. | 684 | # Name of the host. |
640 | 685 | # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, | 685 | # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, |
641 | 686 | # so uname gets run too. | 686 | # so uname gets run too. |
642 | 687 | ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` | 687 | ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` |
643 | 688 | 688 | ||
644 | @@ -701,8 +701,8 @@ | |||
645 | 701 | # Identity of this package. | 701 | # Identity of this package. |
646 | 702 | PACKAGE_NAME='libindicator' | 702 | PACKAGE_NAME='libindicator' |
647 | 703 | PACKAGE_TARNAME='libindicator' | 703 | PACKAGE_TARNAME='libindicator' |
650 | 704 | PACKAGE_VERSION='0.3.10' | 704 | PACKAGE_VERSION='0.3.11' |
651 | 705 | PACKAGE_STRING='libindicator 0.3.10' | 705 | PACKAGE_STRING='libindicator 0.3.11' |
652 | 706 | PACKAGE_BUGREPORT='ted@canonical.com' | 706 | PACKAGE_BUGREPORT='ted@canonical.com' |
653 | 707 | PACKAGE_URL='' | 707 | PACKAGE_URL='' |
654 | 708 | 708 | ||
655 | @@ -752,6 +752,8 @@ | |||
656 | 752 | EXPANDED_SYSCONFDIR | 752 | EXPANDED_SYSCONFDIR |
657 | 753 | LIBINDICATOR_LIBS | 753 | LIBINDICATOR_LIBS |
658 | 754 | LIBINDICATOR_CFLAGS | 754 | LIBINDICATOR_CFLAGS |
659 | 755 | PKG_CONFIG_LIBDIR | ||
660 | 756 | PKG_CONFIG_PATH | ||
661 | 755 | PKG_CONFIG | 757 | PKG_CONFIG |
662 | 756 | GLIB_GENMARSHAL | 758 | GLIB_GENMARSHAL |
663 | 757 | GLIB_MKENUMS | 759 | GLIB_MKENUMS |
664 | @@ -888,6 +890,8 @@ | |||
665 | 888 | CPPFLAGS | 890 | CPPFLAGS |
666 | 889 | CPP | 891 | CPP |
667 | 890 | PKG_CONFIG | 892 | PKG_CONFIG |
668 | 893 | PKG_CONFIG_PATH | ||
669 | 894 | PKG_CONFIG_LIBDIR | ||
670 | 891 | LIBINDICATOR_CFLAGS | 895 | LIBINDICATOR_CFLAGS |
671 | 892 | LIBINDICATOR_LIBS' | 896 | LIBINDICATOR_LIBS' |
672 | 893 | 897 | ||
673 | @@ -952,8 +956,9 @@ | |||
674 | 952 | fi | 956 | fi |
675 | 953 | 957 | ||
676 | 954 | case $ac_option in | 958 | case $ac_option in |
679 | 955 | *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; | 959 | *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
680 | 956 | *) ac_optarg=yes ;; | 960 | *=) ac_optarg= ;; |
681 | 961 | *) ac_optarg=yes ;; | ||
682 | 957 | esac | 962 | esac |
683 | 958 | 963 | ||
684 | 959 | # Accept the important Cygnus configure options, so we can diagnose typos. | 964 | # Accept the important Cygnus configure options, so we can diagnose typos. |
685 | @@ -998,7 +1003,7 @@ | |||
686 | 998 | ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` | 1003 | ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
687 | 999 | # Reject names that are not valid shell variable names. | 1004 | # Reject names that are not valid shell variable names. |
688 | 1000 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | 1005 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
690 | 1001 | as_fn_error "invalid feature name: $ac_useropt" | 1006 | as_fn_error $? "invalid feature name: $ac_useropt" |
691 | 1002 | ac_useropt_orig=$ac_useropt | 1007 | ac_useropt_orig=$ac_useropt |
692 | 1003 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | 1008 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
693 | 1004 | case $ac_user_opts in | 1009 | case $ac_user_opts in |
694 | @@ -1024,7 +1029,7 @@ | |||
695 | 1024 | ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` | 1029 | ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
696 | 1025 | # Reject names that are not valid shell variable names. | 1030 | # Reject names that are not valid shell variable names. |
697 | 1026 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | 1031 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
699 | 1027 | as_fn_error "invalid feature name: $ac_useropt" | 1032 | as_fn_error $? "invalid feature name: $ac_useropt" |
700 | 1028 | ac_useropt_orig=$ac_useropt | 1033 | ac_useropt_orig=$ac_useropt |
701 | 1029 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | 1034 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
702 | 1030 | case $ac_user_opts in | 1035 | case $ac_user_opts in |
703 | @@ -1228,7 +1233,7 @@ | |||
704 | 1228 | ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` | 1233 | ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
705 | 1229 | # Reject names that are not valid shell variable names. | 1234 | # Reject names that are not valid shell variable names. |
706 | 1230 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | 1235 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
708 | 1231 | as_fn_error "invalid package name: $ac_useropt" | 1236 | as_fn_error $? "invalid package name: $ac_useropt" |
709 | 1232 | ac_useropt_orig=$ac_useropt | 1237 | ac_useropt_orig=$ac_useropt |
710 | 1233 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | 1238 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
711 | 1234 | case $ac_user_opts in | 1239 | case $ac_user_opts in |
712 | @@ -1244,7 +1249,7 @@ | |||
713 | 1244 | ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` | 1249 | ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
714 | 1245 | # Reject names that are not valid shell variable names. | 1250 | # Reject names that are not valid shell variable names. |
715 | 1246 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && | 1251 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
717 | 1247 | as_fn_error "invalid package name: $ac_useropt" | 1252 | as_fn_error $? "invalid package name: $ac_useropt" |
718 | 1248 | ac_useropt_orig=$ac_useropt | 1253 | ac_useropt_orig=$ac_useropt |
719 | 1249 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` | 1254 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
720 | 1250 | case $ac_user_opts in | 1255 | case $ac_user_opts in |
721 | @@ -1274,8 +1279,8 @@ | |||
722 | 1274 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) | 1279 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) |
723 | 1275 | x_libraries=$ac_optarg ;; | 1280 | x_libraries=$ac_optarg ;; |
724 | 1276 | 1281 | ||
727 | 1277 | -*) as_fn_error "unrecognized option: \`$ac_option' | 1282 | -*) as_fn_error $? "unrecognized option: \`$ac_option' |
728 | 1278 | Try \`$0 --help' for more information." | 1283 | Try \`$0 --help' for more information" |
729 | 1279 | ;; | 1284 | ;; |
730 | 1280 | 1285 | ||
731 | 1281 | *=*) | 1286 | *=*) |
732 | @@ -1283,7 +1288,7 @@ | |||
733 | 1283 | # Reject names that are not valid shell variable names. | 1288 | # Reject names that are not valid shell variable names. |
734 | 1284 | case $ac_envvar in #( | 1289 | case $ac_envvar in #( |
735 | 1285 | '' | [0-9]* | *[!_$as_cr_alnum]* ) | 1290 | '' | [0-9]* | *[!_$as_cr_alnum]* ) |
737 | 1286 | as_fn_error "invalid variable name: \`$ac_envvar'" ;; | 1291 | as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; |
738 | 1287 | esac | 1292 | esac |
739 | 1288 | eval $ac_envvar=\$ac_optarg | 1293 | eval $ac_envvar=\$ac_optarg |
740 | 1289 | export $ac_envvar ;; | 1294 | export $ac_envvar ;; |
741 | @@ -1301,13 +1306,13 @@ | |||
742 | 1301 | 1306 | ||
743 | 1302 | if test -n "$ac_prev"; then | 1307 | if test -n "$ac_prev"; then |
744 | 1303 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` | 1308 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` |
746 | 1304 | as_fn_error "missing argument to $ac_option" | 1309 | as_fn_error $? "missing argument to $ac_option" |
747 | 1305 | fi | 1310 | fi |
748 | 1306 | 1311 | ||
749 | 1307 | if test -n "$ac_unrecognized_opts"; then | 1312 | if test -n "$ac_unrecognized_opts"; then |
750 | 1308 | case $enable_option_checking in | 1313 | case $enable_option_checking in |
751 | 1309 | no) ;; | 1314 | no) ;; |
753 | 1310 | fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; | 1315 | fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; |
754 | 1311 | *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; | 1316 | *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; |
755 | 1312 | esac | 1317 | esac |
756 | 1313 | fi | 1318 | fi |
757 | @@ -1330,7 +1335,7 @@ | |||
758 | 1330 | [\\/$]* | ?:[\\/]* ) continue;; | 1335 | [\\/$]* | ?:[\\/]* ) continue;; |
759 | 1331 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; | 1336 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; |
760 | 1332 | esac | 1337 | esac |
762 | 1333 | as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" | 1338 | as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" |
763 | 1334 | done | 1339 | done |
764 | 1335 | 1340 | ||
765 | 1336 | # There might be people who depend on the old broken behavior: `$host' | 1341 | # There might be people who depend on the old broken behavior: `$host' |
766 | @@ -1344,8 +1349,8 @@ | |||
767 | 1344 | if test "x$host_alias" != x; then | 1349 | if test "x$host_alias" != x; then |
768 | 1345 | if test "x$build_alias" = x; then | 1350 | if test "x$build_alias" = x; then |
769 | 1346 | cross_compiling=maybe | 1351 | cross_compiling=maybe |
772 | 1347 | $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. | 1352 | $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
773 | 1348 | If a cross compiler is detected then cross compile mode will be used." >&2 | 1353 | If a cross compiler is detected then cross compile mode will be used" >&2 |
774 | 1349 | elif test "x$build_alias" != "x$host_alias"; then | 1354 | elif test "x$build_alias" != "x$host_alias"; then |
775 | 1350 | cross_compiling=yes | 1355 | cross_compiling=yes |
776 | 1351 | fi | 1356 | fi |
777 | @@ -1360,9 +1365,9 @@ | |||
778 | 1360 | ac_pwd=`pwd` && test -n "$ac_pwd" && | 1365 | ac_pwd=`pwd` && test -n "$ac_pwd" && |
779 | 1361 | ac_ls_di=`ls -di .` && | 1366 | ac_ls_di=`ls -di .` && |
780 | 1362 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || | 1367 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || |
782 | 1363 | as_fn_error "working directory cannot be determined" | 1368 | as_fn_error $? "working directory cannot be determined" |
783 | 1364 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || | 1369 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
785 | 1365 | as_fn_error "pwd does not report name of working directory" | 1370 | as_fn_error $? "pwd does not report name of working directory" |
786 | 1366 | 1371 | ||
787 | 1367 | 1372 | ||
788 | 1368 | # Find the source files, if location was not specified. | 1373 | # Find the source files, if location was not specified. |
789 | @@ -1401,11 +1406,11 @@ | |||
790 | 1401 | fi | 1406 | fi |
791 | 1402 | if test ! -r "$srcdir/$ac_unique_file"; then | 1407 | if test ! -r "$srcdir/$ac_unique_file"; then |
792 | 1403 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." | 1408 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." |
794 | 1404 | as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" | 1409 | as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" |
795 | 1405 | fi | 1410 | fi |
796 | 1406 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" | 1411 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" |
797 | 1407 | ac_abs_confdir=`( | 1412 | ac_abs_confdir=`( |
799 | 1408 | cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" | 1413 | cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" |
800 | 1409 | pwd)` | 1414 | pwd)` |
801 | 1410 | # When building in place, set srcdir=. | 1415 | # When building in place, set srcdir=. |
802 | 1411 | if test "$ac_abs_confdir" = "$ac_pwd"; then | 1416 | if test "$ac_abs_confdir" = "$ac_pwd"; then |
803 | @@ -1431,7 +1436,7 @@ | |||
804 | 1431 | # Omit some internal or obsolete options to make the list less imposing. | 1436 | # Omit some internal or obsolete options to make the list less imposing. |
805 | 1432 | # This message is too long to be a string in the A/UX 3.1 sh. | 1437 | # This message is too long to be a string in the A/UX 3.1 sh. |
806 | 1433 | cat <<_ACEOF | 1438 | cat <<_ACEOF |
808 | 1434 | \`configure' configures libindicator 0.3.10 to adapt to many kinds of systems. | 1439 | \`configure' configures libindicator 0.3.11 to adapt to many kinds of systems. |
809 | 1435 | 1440 | ||
810 | 1436 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1441 | Usage: $0 [OPTION]... [VAR=VALUE]... |
811 | 1437 | 1442 | ||
812 | @@ -1445,7 +1450,7 @@ | |||
813 | 1445 | --help=short display options specific to this package | 1450 | --help=short display options specific to this package |
814 | 1446 | --help=recursive display the short help of all the included packages | 1451 | --help=recursive display the short help of all the included packages |
815 | 1447 | -V, --version display version information and exit | 1452 | -V, --version display version information and exit |
817 | 1448 | -q, --quiet, --silent do not print \`checking...' messages | 1453 | -q, --quiet, --silent do not print \`checking ...' messages |
818 | 1449 | --cache-file=FILE cache test results in FILE [disabled] | 1454 | --cache-file=FILE cache test results in FILE [disabled] |
819 | 1450 | -C, --config-cache alias for \`--cache-file=config.cache' | 1455 | -C, --config-cache alias for \`--cache-file=config.cache' |
820 | 1451 | -n, --no-create do not create output files | 1456 | -n, --no-create do not create output files |
821 | @@ -1501,7 +1506,7 @@ | |||
822 | 1501 | 1506 | ||
823 | 1502 | if test -n "$ac_init_help"; then | 1507 | if test -n "$ac_init_help"; then |
824 | 1503 | case $ac_init_help in | 1508 | case $ac_init_help in |
826 | 1504 | short | recursive ) echo "Configuration of libindicator 0.3.10:";; | 1509 | short | recursive ) echo "Configuration of libindicator 0.3.11:";; |
827 | 1505 | esac | 1510 | esac |
828 | 1506 | cat <<\_ACEOF | 1511 | cat <<\_ACEOF |
829 | 1507 | 1512 | ||
830 | @@ -1538,6 +1543,10 @@ | |||
831 | 1538 | you have headers in a nonstandard directory <include dir> | 1543 | you have headers in a nonstandard directory <include dir> |
832 | 1539 | CPP C preprocessor | 1544 | CPP C preprocessor |
833 | 1540 | PKG_CONFIG path to pkg-config utility | 1545 | PKG_CONFIG path to pkg-config utility |
834 | 1546 | PKG_CONFIG_PATH | ||
835 | 1547 | directories to add to pkg-config's search path | ||
836 | 1548 | PKG_CONFIG_LIBDIR | ||
837 | 1549 | path overriding pkg-config's built-in search path | ||
838 | 1541 | LIBINDICATOR_CFLAGS | 1550 | LIBINDICATOR_CFLAGS |
839 | 1542 | C compiler flags for LIBINDICATOR, overriding pkg-config | 1551 | C compiler flags for LIBINDICATOR, overriding pkg-config |
840 | 1543 | LIBINDICATOR_LIBS | 1552 | LIBINDICATOR_LIBS |
841 | @@ -1609,10 +1618,10 @@ | |||
842 | 1609 | test -n "$ac_init_help" && exit $ac_status | 1618 | test -n "$ac_init_help" && exit $ac_status |
843 | 1610 | if $ac_init_version; then | 1619 | if $ac_init_version; then |
844 | 1611 | cat <<\_ACEOF | 1620 | cat <<\_ACEOF |
847 | 1612 | libindicator configure 0.3.10 | 1621 | libindicator configure 0.3.11 |
848 | 1613 | generated by GNU Autoconf 2.65 | 1622 | generated by GNU Autoconf 2.67 |
849 | 1614 | 1623 | ||
851 | 1615 | Copyright (C) 2009 Free Software Foundation, Inc. | 1624 | Copyright (C) 2010 Free Software Foundation, Inc. |
852 | 1616 | This configure script is free software; the Free Software Foundation | 1625 | This configure script is free software; the Free Software Foundation |
853 | 1617 | gives unlimited permission to copy, distribute and modify it. | 1626 | gives unlimited permission to copy, distribute and modify it. |
854 | 1618 | _ACEOF | 1627 | _ACEOF |
855 | @@ -1728,7 +1737,7 @@ | |||
856 | 1728 | mv -f conftest.er1 conftest.err | 1737 | mv -f conftest.er1 conftest.err |
857 | 1729 | fi | 1738 | fi |
858 | 1730 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | 1739 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
860 | 1731 | test $ac_status = 0; } >/dev/null && { | 1740 | test $ac_status = 0; } > conftest.i && { |
861 | 1732 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || | 1741 | test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || |
862 | 1733 | test ! -s conftest.err | 1742 | test ! -s conftest.err |
863 | 1734 | }; then : | 1743 | }; then : |
864 | @@ -1795,7 +1804,7 @@ | |||
865 | 1795 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 1804 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
866 | 1796 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | 1805 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
867 | 1797 | $as_echo_n "checking for $2... " >&6; } | 1806 | $as_echo_n "checking for $2... " >&6; } |
869 | 1798 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | 1807 | if eval "test \"\${$3+set}\"" = set; then : |
870 | 1799 | $as_echo_n "(cached) " >&6 | 1808 | $as_echo_n "(cached) " >&6 |
871 | 1800 | else | 1809 | else |
872 | 1801 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 1810 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
873 | @@ -1825,7 +1834,7 @@ | |||
874 | 1825 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 1834 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
875 | 1826 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 | 1835 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
876 | 1827 | $as_echo_n "checking for $2... " >&6; } | 1836 | $as_echo_n "checking for $2... " >&6; } |
878 | 1828 | if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : | 1837 | if eval "test \"\${$3+set}\"" = set; then : |
879 | 1829 | $as_echo_n "(cached) " >&6 | 1838 | $as_echo_n "(cached) " >&6 |
880 | 1830 | else | 1839 | else |
881 | 1831 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 1840 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
882 | @@ -1887,8 +1896,8 @@ | |||
883 | 1887 | This file contains any messages produced by compilers while | 1896 | This file contains any messages produced by compilers while |
884 | 1888 | running configure, to aid debugging if configure makes a mistake. | 1897 | running configure, to aid debugging if configure makes a mistake. |
885 | 1889 | 1898 | ||
888 | 1890 | It was created by libindicator $as_me 0.3.10, which was | 1899 | It was created by libindicator $as_me 0.3.11, which was |
889 | 1891 | generated by GNU Autoconf 2.65. Invocation command line was | 1900 | generated by GNU Autoconf 2.67. Invocation command line was |
890 | 1892 | 1901 | ||
891 | 1893 | $ $0 $@ | 1902 | $ $0 $@ |
892 | 1894 | 1903 | ||
893 | @@ -1998,11 +2007,9 @@ | |||
894 | 1998 | { | 2007 | { |
895 | 1999 | echo | 2008 | echo |
896 | 2000 | 2009 | ||
899 | 2001 | cat <<\_ASBOX | 2010 | $as_echo "## ---------------- ## |
898 | 2002 | ## ---------------- ## | ||
900 | 2003 | ## Cache variables. ## | 2011 | ## Cache variables. ## |
903 | 2004 | ## ---------------- ## | 2012 | ## ---------------- ##" |
902 | 2005 | _ASBOX | ||
904 | 2006 | echo | 2013 | echo |
905 | 2007 | # The following way of writing the cache mishandles newlines in values, | 2014 | # The following way of writing the cache mishandles newlines in values, |
906 | 2008 | ( | 2015 | ( |
907 | @@ -2036,11 +2043,9 @@ | |||
908 | 2036 | ) | 2043 | ) |
909 | 2037 | echo | 2044 | echo |
910 | 2038 | 2045 | ||
913 | 2039 | cat <<\_ASBOX | 2046 | $as_echo "## ----------------- ## |
912 | 2040 | ## ----------------- ## | ||
914 | 2041 | ## Output variables. ## | 2047 | ## Output variables. ## |
917 | 2042 | ## ----------------- ## | 2048 | ## ----------------- ##" |
916 | 2043 | _ASBOX | ||
918 | 2044 | echo | 2049 | echo |
919 | 2045 | for ac_var in $ac_subst_vars | 2050 | for ac_var in $ac_subst_vars |
920 | 2046 | do | 2051 | do |
921 | @@ -2053,11 +2058,9 @@ | |||
922 | 2053 | echo | 2058 | echo |
923 | 2054 | 2059 | ||
924 | 2055 | if test -n "$ac_subst_files"; then | 2060 | if test -n "$ac_subst_files"; then |
927 | 2056 | cat <<\_ASBOX | 2061 | $as_echo "## ------------------- ## |
926 | 2057 | ## ------------------- ## | ||
928 | 2058 | ## File substitutions. ## | 2062 | ## File substitutions. ## |
931 | 2059 | ## ------------------- ## | 2063 | ## ------------------- ##" |
930 | 2060 | _ASBOX | ||
932 | 2061 | echo | 2064 | echo |
933 | 2062 | for ac_var in $ac_subst_files | 2065 | for ac_var in $ac_subst_files |
934 | 2063 | do | 2066 | do |
935 | @@ -2071,11 +2074,9 @@ | |||
936 | 2071 | fi | 2074 | fi |
937 | 2072 | 2075 | ||
938 | 2073 | if test -s confdefs.h; then | 2076 | if test -s confdefs.h; then |
941 | 2074 | cat <<\_ASBOX | 2077 | $as_echo "## ----------- ## |
940 | 2075 | ## ----------- ## | ||
942 | 2076 | ## confdefs.h. ## | 2078 | ## confdefs.h. ## |
945 | 2077 | ## ----------- ## | 2079 | ## ----------- ##" |
944 | 2078 | _ASBOX | ||
946 | 2079 | echo | 2080 | echo |
947 | 2080 | cat confdefs.h | 2081 | cat confdefs.h |
948 | 2081 | echo | 2082 | echo |
949 | @@ -2130,7 +2131,12 @@ | |||
950 | 2130 | ac_site_file1=NONE | 2131 | ac_site_file1=NONE |
951 | 2131 | ac_site_file2=NONE | 2132 | ac_site_file2=NONE |
952 | 2132 | if test -n "$CONFIG_SITE"; then | 2133 | if test -n "$CONFIG_SITE"; then |
954 | 2133 | ac_site_file1=$CONFIG_SITE | 2134 | # We do not want a PATH search for config.site. |
955 | 2135 | case $CONFIG_SITE in #(( | ||
956 | 2136 | -*) ac_site_file1=./$CONFIG_SITE;; | ||
957 | 2137 | */*) ac_site_file1=$CONFIG_SITE;; | ||
958 | 2138 | *) ac_site_file1=./$CONFIG_SITE;; | ||
959 | 2139 | esac | ||
960 | 2134 | elif test "x$prefix" != xNONE; then | 2140 | elif test "x$prefix" != xNONE; then |
961 | 2135 | ac_site_file1=$prefix/share/config.site | 2141 | ac_site_file1=$prefix/share/config.site |
962 | 2136 | ac_site_file2=$prefix/etc/config.site | 2142 | ac_site_file2=$prefix/etc/config.site |
963 | @@ -2145,7 +2151,11 @@ | |||
964 | 2145 | { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 | 2151 | { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 |
965 | 2146 | $as_echo "$as_me: loading site script $ac_site_file" >&6;} | 2152 | $as_echo "$as_me: loading site script $ac_site_file" >&6;} |
966 | 2147 | sed 's/^/| /' "$ac_site_file" >&5 | 2153 | sed 's/^/| /' "$ac_site_file" >&5 |
968 | 2148 | . "$ac_site_file" | 2154 | . "$ac_site_file" \ |
969 | 2155 | || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
970 | 2156 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
971 | 2157 | as_fn_error $? "failed to load site script $ac_site_file | ||
972 | 2158 | See \`config.log' for more details" "$LINENO" 5 ; } | ||
973 | 2149 | fi | 2159 | fi |
974 | 2150 | done | 2160 | done |
975 | 2151 | 2161 | ||
976 | @@ -2221,7 +2231,7 @@ | |||
977 | 2221 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 2231 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
978 | 2222 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 | 2232 | { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 |
979 | 2223 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} | 2233 | $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} |
981 | 2224 | as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 | 2234 | as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 |
982 | 2225 | fi | 2235 | fi |
983 | 2226 | ## -------------------- ## | 2236 | ## -------------------- ## |
984 | 2227 | ## Main body of script. ## | 2237 | ## Main body of script. ## |
985 | @@ -2243,16 +2253,22 @@ | |||
986 | 2243 | 2253 | ||
987 | 2244 | ac_aux_dir= | 2254 | ac_aux_dir= |
988 | 2245 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do | 2255 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do |
996 | 2246 | for ac_t in install-sh install.sh shtool; do | 2256 | if test -f "$ac_dir/install-sh"; then |
997 | 2247 | if test -f "$ac_dir/$ac_t"; then | 2257 | ac_aux_dir=$ac_dir |
998 | 2248 | ac_aux_dir=$ac_dir | 2258 | ac_install_sh="$ac_aux_dir/install-sh -c" |
999 | 2249 | ac_install_sh="$ac_aux_dir/$ac_t -c" | 2259 | break |
1000 | 2250 | break 2 | 2260 | elif test -f "$ac_dir/install.sh"; then |
1001 | 2251 | fi | 2261 | ac_aux_dir=$ac_dir |
1002 | 2252 | done | 2262 | ac_install_sh="$ac_aux_dir/install.sh -c" |
1003 | 2263 | break | ||
1004 | 2264 | elif test -f "$ac_dir/shtool"; then | ||
1005 | 2265 | ac_aux_dir=$ac_dir | ||
1006 | 2266 | ac_install_sh="$ac_aux_dir/shtool install -c" | ||
1007 | 2267 | break | ||
1008 | 2268 | fi | ||
1009 | 2253 | done | 2269 | done |
1010 | 2254 | if test -z "$ac_aux_dir"; then | 2270 | if test -z "$ac_aux_dir"; then |
1012 | 2255 | as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 | 2271 | as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 |
1013 | 2256 | fi | 2272 | fi |
1014 | 2257 | 2273 | ||
1015 | 2258 | # These three variables are undocumented and unsupported, | 2274 | # These three variables are undocumented and unsupported, |
1016 | @@ -2368,11 +2384,11 @@ | |||
1017 | 2368 | ' | 2384 | ' |
1018 | 2369 | case `pwd` in | 2385 | case `pwd` in |
1019 | 2370 | *[\\\"\#\$\&\'\`$am_lf]*) | 2386 | *[\\\"\#\$\&\'\`$am_lf]*) |
1021 | 2371 | as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; | 2387 | as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; |
1022 | 2372 | esac | 2388 | esac |
1023 | 2373 | case $srcdir in | 2389 | case $srcdir in |
1024 | 2374 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) | 2390 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) |
1026 | 2375 | as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; | 2391 | as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; |
1027 | 2376 | esac | 2392 | esac |
1028 | 2377 | 2393 | ||
1029 | 2378 | # Do `set' in a subshell so we don't clobber the current shell's | 2394 | # Do `set' in a subshell so we don't clobber the current shell's |
1030 | @@ -2394,7 +2410,7 @@ | |||
1031 | 2394 | # if, for instance, CONFIG_SHELL is bash and it inherits a | 2410 | # if, for instance, CONFIG_SHELL is bash and it inherits a |
1032 | 2395 | # broken ls alias from the environment. This has actually | 2411 | # broken ls alias from the environment. This has actually |
1033 | 2396 | # happened. Such a system could not be considered "sane". | 2412 | # happened. Such a system could not be considered "sane". |
1035 | 2397 | as_fn_error "ls -t appears to fail. Make sure there is not a broken | 2413 | as_fn_error $? "ls -t appears to fail. Make sure there is not a broken |
1036 | 2398 | alias in your environment" "$LINENO" 5 | 2414 | alias in your environment" "$LINENO" 5 |
1037 | 2399 | fi | 2415 | fi |
1038 | 2400 | 2416 | ||
1039 | @@ -2404,7 +2420,7 @@ | |||
1040 | 2404 | # Ok. | 2420 | # Ok. |
1041 | 2405 | : | 2421 | : |
1042 | 2406 | else | 2422 | else |
1044 | 2407 | as_fn_error "newly created file is older than distributed files! | 2423 | as_fn_error $? "newly created file is older than distributed files! |
1045 | 2408 | Check your system clock" "$LINENO" 5 | 2424 | Check your system clock" "$LINENO" 5 |
1046 | 2409 | fi | 2425 | fi |
1047 | 2410 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 2426 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1048 | @@ -2642,7 +2658,7 @@ | |||
1049 | 2642 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } | 2658 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
1050 | 2643 | set x ${MAKE-make} | 2659 | set x ${MAKE-make} |
1051 | 2644 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` | 2660 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
1053 | 2645 | if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : | 2661 | if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : |
1054 | 2646 | $as_echo_n "(cached) " >&6 | 2662 | $as_echo_n "(cached) " >&6 |
1055 | 2647 | else | 2663 | else |
1056 | 2648 | cat >conftest.make <<\_ACEOF | 2664 | cat >conftest.make <<\_ACEOF |
1057 | @@ -2650,7 +2666,7 @@ | |||
1058 | 2650 | all: | 2666 | all: |
1059 | 2651 | @echo '@@@%%%=$(MAKE)=@@@%%%' | 2667 | @echo '@@@%%%=$(MAKE)=@@@%%%' |
1060 | 2652 | _ACEOF | 2668 | _ACEOF |
1062 | 2653 | # GNU make sometimes prints "make[1]: Entering...", which would confuse us. | 2669 | # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. |
1063 | 2654 | case `${MAKE-make} -f conftest.make 2>/dev/null` in | 2670 | case `${MAKE-make} -f conftest.make 2>/dev/null` in |
1064 | 2655 | *@@@%%%=?*=@@@%%%*) | 2671 | *@@@%%%=?*=@@@%%%*) |
1065 | 2656 | eval ac_cv_prog_make_${ac_make}_set=yes;; | 2672 | eval ac_cv_prog_make_${ac_make}_set=yes;; |
1066 | @@ -2684,7 +2700,7 @@ | |||
1067 | 2684 | am__isrc=' -I$(srcdir)' | 2700 | am__isrc=' -I$(srcdir)' |
1068 | 2685 | # test to see if srcdir already configured | 2701 | # test to see if srcdir already configured |
1069 | 2686 | if test -f $srcdir/config.status; then | 2702 | if test -f $srcdir/config.status; then |
1071 | 2687 | as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 | 2703 | as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 |
1072 | 2688 | fi | 2704 | fi |
1073 | 2689 | fi | 2705 | fi |
1074 | 2690 | 2706 | ||
1075 | @@ -2700,7 +2716,7 @@ | |||
1076 | 2700 | 2716 | ||
1077 | 2701 | # Define the identity of the package. | 2717 | # Define the identity of the package. |
1078 | 2702 | PACKAGE=libindicator | 2718 | PACKAGE=libindicator |
1080 | 2703 | VERSION=0.3.10 | 2719 | VERSION=0.3.11 |
1081 | 2704 | 2720 | ||
1082 | 2705 | 2721 | ||
1083 | 2706 | cat >>confdefs.h <<_ACEOF | 2722 | cat >>confdefs.h <<_ACEOF |
1084 | @@ -3139,8 +3155,8 @@ | |||
1085 | 3139 | 3155 | ||
1086 | 3140 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 3156 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1087 | 3141 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 3157 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1090 | 3142 | as_fn_error "no acceptable C compiler found in \$PATH | 3158 | as_fn_error $? "no acceptable C compiler found in \$PATH |
1091 | 3143 | See \`config.log' for more details." "$LINENO" 5; } | 3159 | See \`config.log' for more details" "$LINENO" 5 ; } |
1092 | 3144 | 3160 | ||
1093 | 3145 | # Provide some information about the compiler. | 3161 | # Provide some information about the compiler. |
1094 | 3146 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 | 3162 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
1095 | @@ -3254,9 +3270,8 @@ | |||
1096 | 3254 | 3270 | ||
1097 | 3255 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 3271 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1098 | 3256 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 3272 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1102 | 3257 | { as_fn_set_status 77 | 3273 | as_fn_error 77 "C compiler cannot create executables |
1103 | 3258 | as_fn_error "C compiler cannot create executables | 3274 | See \`config.log' for more details" "$LINENO" 5 ; } |
1101 | 3259 | See \`config.log' for more details." "$LINENO" 5; }; } | ||
1104 | 3260 | else | 3275 | else |
1105 | 3261 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 3276 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1106 | 3262 | $as_echo "yes" >&6; } | 3277 | $as_echo "yes" >&6; } |
1107 | @@ -3298,8 +3313,8 @@ | |||
1108 | 3298 | else | 3313 | else |
1109 | 3299 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 3314 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1110 | 3300 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 3315 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1113 | 3301 | as_fn_error "cannot compute suffix of executables: cannot compile and link | 3316 | as_fn_error $? "cannot compute suffix of executables: cannot compile and link |
1114 | 3302 | See \`config.log' for more details." "$LINENO" 5; } | 3317 | See \`config.log' for more details" "$LINENO" 5 ; } |
1115 | 3303 | fi | 3318 | fi |
1116 | 3304 | rm -f conftest conftest$ac_cv_exeext | 3319 | rm -f conftest conftest$ac_cv_exeext |
1117 | 3305 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 | 3320 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
1118 | @@ -3356,9 +3371,9 @@ | |||
1119 | 3356 | else | 3371 | else |
1120 | 3357 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 3372 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1121 | 3358 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 3373 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1123 | 3359 | as_fn_error "cannot run C compiled programs. | 3374 | as_fn_error $? "cannot run C compiled programs. |
1124 | 3360 | If you meant to cross compile, use \`--host'. | 3375 | If you meant to cross compile, use \`--host'. |
1126 | 3361 | See \`config.log' for more details." "$LINENO" 5; } | 3376 | See \`config.log' for more details" "$LINENO" 5 ; } |
1127 | 3362 | fi | 3377 | fi |
1128 | 3363 | fi | 3378 | fi |
1129 | 3364 | fi | 3379 | fi |
1130 | @@ -3409,8 +3424,8 @@ | |||
1131 | 3409 | 3424 | ||
1132 | 3410 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 3425 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1133 | 3411 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 3426 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1136 | 3412 | as_fn_error "cannot compute suffix of object files: cannot compile | 3427 | as_fn_error $? "cannot compute suffix of object files: cannot compile |
1137 | 3413 | See \`config.log' for more details." "$LINENO" 5; } | 3428 | See \`config.log' for more details" "$LINENO" 5 ; } |
1138 | 3414 | fi | 3429 | fi |
1139 | 3415 | rm -f conftest.$ac_cv_objext conftest.$ac_ext | 3430 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
1140 | 3416 | fi | 3431 | fi |
1141 | @@ -4114,8 +4129,8 @@ | |||
1142 | 4114 | 4129 | ||
1143 | 4115 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 4130 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1144 | 4116 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 4131 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1147 | 4117 | as_fn_error "no acceptable C compiler found in \$PATH | 4132 | as_fn_error $? "no acceptable C compiler found in \$PATH |
1148 | 4118 | See \`config.log' for more details." "$LINENO" 5; } | 4133 | See \`config.log' for more details" "$LINENO" 5 ; } |
1149 | 4119 | 4134 | ||
1150 | 4120 | # Provide some information about the compiler. | 4135 | # Provide some information about the compiler. |
1151 | 4121 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 | 4136 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
1152 | @@ -4490,7 +4505,7 @@ | |||
1153 | 4490 | fi | 4505 | fi |
1154 | 4491 | set dummy $CC; ac_cc=`$as_echo "$2" | | 4506 | set dummy $CC; ac_cc=`$as_echo "$2" | |
1155 | 4492 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` | 4507 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
1157 | 4493 | if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : | 4508 | if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : |
1158 | 4494 | $as_echo_n "(cached) " >&6 | 4509 | $as_echo_n "(cached) " >&6 |
1159 | 4495 | else | 4510 | else |
1160 | 4496 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | 4511 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1161 | @@ -4649,7 +4664,7 @@ | |||
1162 | 4649 | # Broken: fails on valid input. | 4664 | # Broken: fails on valid input. |
1163 | 4650 | continue | 4665 | continue |
1164 | 4651 | fi | 4666 | fi |
1166 | 4652 | rm -f conftest.err conftest.$ac_ext | 4667 | rm -f conftest.err conftest.i conftest.$ac_ext |
1167 | 4653 | 4668 | ||
1168 | 4654 | # OK, works on sane cases. Now check whether nonexistent headers | 4669 | # OK, works on sane cases. Now check whether nonexistent headers |
1169 | 4655 | # can be detected and how. | 4670 | # can be detected and how. |
1170 | @@ -4665,11 +4680,11 @@ | |||
1171 | 4665 | ac_preproc_ok=: | 4680 | ac_preproc_ok=: |
1172 | 4666 | break | 4681 | break |
1173 | 4667 | fi | 4682 | fi |
1175 | 4668 | rm -f conftest.err conftest.$ac_ext | 4683 | rm -f conftest.err conftest.i conftest.$ac_ext |
1176 | 4669 | 4684 | ||
1177 | 4670 | done | 4685 | done |
1178 | 4671 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. | 4686 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
1180 | 4672 | rm -f conftest.err conftest.$ac_ext | 4687 | rm -f conftest.i conftest.err conftest.$ac_ext |
1181 | 4673 | if $ac_preproc_ok; then : | 4688 | if $ac_preproc_ok; then : |
1182 | 4674 | break | 4689 | break |
1183 | 4675 | fi | 4690 | fi |
1184 | @@ -4708,7 +4723,7 @@ | |||
1185 | 4708 | # Broken: fails on valid input. | 4723 | # Broken: fails on valid input. |
1186 | 4709 | continue | 4724 | continue |
1187 | 4710 | fi | 4725 | fi |
1189 | 4711 | rm -f conftest.err conftest.$ac_ext | 4726 | rm -f conftest.err conftest.i conftest.$ac_ext |
1190 | 4712 | 4727 | ||
1191 | 4713 | # OK, works on sane cases. Now check whether nonexistent headers | 4728 | # OK, works on sane cases. Now check whether nonexistent headers |
1192 | 4714 | # can be detected and how. | 4729 | # can be detected and how. |
1193 | @@ -4724,18 +4739,18 @@ | |||
1194 | 4724 | ac_preproc_ok=: | 4739 | ac_preproc_ok=: |
1195 | 4725 | break | 4740 | break |
1196 | 4726 | fi | 4741 | fi |
1198 | 4727 | rm -f conftest.err conftest.$ac_ext | 4742 | rm -f conftest.err conftest.i conftest.$ac_ext |
1199 | 4728 | 4743 | ||
1200 | 4729 | done | 4744 | done |
1201 | 4730 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. | 4745 | # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. |
1203 | 4731 | rm -f conftest.err conftest.$ac_ext | 4746 | rm -f conftest.i conftest.err conftest.$ac_ext |
1204 | 4732 | if $ac_preproc_ok; then : | 4747 | if $ac_preproc_ok; then : |
1205 | 4733 | 4748 | ||
1206 | 4734 | else | 4749 | else |
1207 | 4735 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 4750 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1208 | 4736 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 4751 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1211 | 4737 | as_fn_error "C preprocessor \"$CPP\" fails sanity check | 4752 | as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
1212 | 4738 | See \`config.log' for more details." "$LINENO" 5; } | 4753 | See \`config.log' for more details" "$LINENO" 5 ; } |
1213 | 4739 | fi | 4754 | fi |
1214 | 4740 | 4755 | ||
1215 | 4741 | ac_ext=c | 4756 | ac_ext=c |
1216 | @@ -4796,7 +4811,7 @@ | |||
1217 | 4796 | done | 4811 | done |
1218 | 4797 | IFS=$as_save_IFS | 4812 | IFS=$as_save_IFS |
1219 | 4798 | if test -z "$ac_cv_path_GREP"; then | 4813 | if test -z "$ac_cv_path_GREP"; then |
1221 | 4799 | as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 | 4814 | as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
1222 | 4800 | fi | 4815 | fi |
1223 | 4801 | else | 4816 | else |
1224 | 4802 | ac_cv_path_GREP=$GREP | 4817 | ac_cv_path_GREP=$GREP |
1225 | @@ -4862,7 +4877,7 @@ | |||
1226 | 4862 | done | 4877 | done |
1227 | 4863 | IFS=$as_save_IFS | 4878 | IFS=$as_save_IFS |
1228 | 4864 | if test -z "$ac_cv_path_EGREP"; then | 4879 | if test -z "$ac_cv_path_EGREP"; then |
1230 | 4865 | as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 | 4880 | as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
1231 | 4866 | fi | 4881 | fi |
1232 | 4867 | else | 4882 | else |
1233 | 4868 | ac_cv_path_EGREP=$EGREP | 4883 | ac_cv_path_EGREP=$EGREP |
1234 | @@ -5014,7 +5029,7 @@ | |||
1235 | 5014 | 5029 | ||
1236 | 5015 | # Make sure we can run config.sub. | 5030 | # Make sure we can run config.sub. |
1237 | 5016 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || | 5031 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
1239 | 5017 | as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 | 5032 | as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
1240 | 5018 | 5033 | ||
1241 | 5019 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 | 5034 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 |
1242 | 5020 | $as_echo_n "checking build system type... " >&6; } | 5035 | $as_echo_n "checking build system type... " >&6; } |
1243 | @@ -5025,16 +5040,16 @@ | |||
1244 | 5025 | test "x$ac_build_alias" = x && | 5040 | test "x$ac_build_alias" = x && |
1245 | 5026 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` | 5041 | ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` |
1246 | 5027 | test "x$ac_build_alias" = x && | 5042 | test "x$ac_build_alias" = x && |
1248 | 5028 | as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 | 5043 | as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 |
1249 | 5029 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || | 5044 | ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || |
1251 | 5030 | as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 | 5045 | as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 |
1252 | 5031 | 5046 | ||
1253 | 5032 | fi | 5047 | fi |
1254 | 5033 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 | 5048 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 |
1255 | 5034 | $as_echo "$ac_cv_build" >&6; } | 5049 | $as_echo "$ac_cv_build" >&6; } |
1256 | 5035 | case $ac_cv_build in | 5050 | case $ac_cv_build in |
1257 | 5036 | *-*-*) ;; | 5051 | *-*-*) ;; |
1259 | 5037 | *) as_fn_error "invalid value of canonical build" "$LINENO" 5;; | 5052 | *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; |
1260 | 5038 | esac | 5053 | esac |
1261 | 5039 | build=$ac_cv_build | 5054 | build=$ac_cv_build |
1262 | 5040 | ac_save_IFS=$IFS; IFS='-' | 5055 | ac_save_IFS=$IFS; IFS='-' |
1263 | @@ -5059,7 +5074,7 @@ | |||
1264 | 5059 | ac_cv_host=$ac_cv_build | 5074 | ac_cv_host=$ac_cv_build |
1265 | 5060 | else | 5075 | else |
1266 | 5061 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || | 5076 | ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || |
1268 | 5062 | as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 | 5077 | as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 |
1269 | 5063 | fi | 5078 | fi |
1270 | 5064 | 5079 | ||
1271 | 5065 | fi | 5080 | fi |
1272 | @@ -5067,7 +5082,7 @@ | |||
1273 | 5067 | $as_echo "$ac_cv_host" >&6; } | 5082 | $as_echo "$ac_cv_host" >&6; } |
1274 | 5068 | case $ac_cv_host in | 5083 | case $ac_cv_host in |
1275 | 5069 | *-*-*) ;; | 5084 | *-*-*) ;; |
1277 | 5070 | *) as_fn_error "invalid value of canonical host" "$LINENO" 5;; | 5085 | *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; |
1278 | 5071 | esac | 5086 | esac |
1279 | 5072 | host=$ac_cv_host | 5087 | host=$ac_cv_host |
1280 | 5073 | ac_save_IFS=$IFS; IFS='-' | 5088 | ac_save_IFS=$IFS; IFS='-' |
1281 | @@ -5140,7 +5155,7 @@ | |||
1282 | 5140 | done | 5155 | done |
1283 | 5141 | IFS=$as_save_IFS | 5156 | IFS=$as_save_IFS |
1284 | 5142 | if test -z "$ac_cv_path_SED"; then | 5157 | if test -z "$ac_cv_path_SED"; then |
1286 | 5143 | as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 | 5158 | as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 |
1287 | 5144 | fi | 5159 | fi |
1288 | 5145 | else | 5160 | else |
1289 | 5146 | ac_cv_path_SED=$SED | 5161 | ac_cv_path_SED=$SED |
1290 | @@ -5219,7 +5234,7 @@ | |||
1291 | 5219 | done | 5234 | done |
1292 | 5220 | IFS=$as_save_IFS | 5235 | IFS=$as_save_IFS |
1293 | 5221 | if test -z "$ac_cv_path_FGREP"; then | 5236 | if test -z "$ac_cv_path_FGREP"; then |
1295 | 5222 | as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 | 5237 | as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 |
1296 | 5223 | fi | 5238 | fi |
1297 | 5224 | else | 5239 | else |
1298 | 5225 | ac_cv_path_FGREP=$FGREP | 5240 | ac_cv_path_FGREP=$FGREP |
1299 | @@ -5335,7 +5350,7 @@ | |||
1300 | 5335 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | 5350 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1301 | 5336 | $as_echo "no" >&6; } | 5351 | $as_echo "no" >&6; } |
1302 | 5337 | fi | 5352 | fi |
1304 | 5338 | test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 | 5353 | test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 |
1305 | 5339 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 | 5354 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 |
1306 | 5340 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } | 5355 | $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } |
1307 | 5341 | if test "${lt_cv_prog_gnu_ld+set}" = set; then : | 5356 | if test "${lt_cv_prog_gnu_ld+set}" = set; then : |
1308 | @@ -5537,13 +5552,13 @@ | |||
1309 | 5537 | else | 5552 | else |
1310 | 5538 | lt_cv_nm_interface="BSD nm" | 5553 | lt_cv_nm_interface="BSD nm" |
1311 | 5539 | echo "int some_variable = 0;" > conftest.$ac_ext | 5554 | echo "int some_variable = 0;" > conftest.$ac_ext |
1313 | 5540 | (eval echo "\"\$as_me:5540: $ac_compile\"" >&5) | 5555 | (eval echo "\"\$as_me:5555: $ac_compile\"" >&5) |
1314 | 5541 | (eval "$ac_compile" 2>conftest.err) | 5556 | (eval "$ac_compile" 2>conftest.err) |
1315 | 5542 | cat conftest.err >&5 | 5557 | cat conftest.err >&5 |
1317 | 5543 | (eval echo "\"\$as_me:5543: $NM \\\"conftest.$ac_objext\\\"\"" >&5) | 5558 | (eval echo "\"\$as_me:5558: $NM \\\"conftest.$ac_objext\\\"\"" >&5) |
1318 | 5544 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) | 5559 | (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) |
1319 | 5545 | cat conftest.err >&5 | 5560 | cat conftest.err >&5 |
1321 | 5546 | (eval echo "\"\$as_me:5546: output\"" >&5) | 5561 | (eval echo "\"\$as_me:5561: output\"" >&5) |
1322 | 5547 | cat conftest.out >&5 | 5562 | cat conftest.out >&5 |
1323 | 5548 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then | 5563 | if $GREP 'External.*some_variable' conftest.out > /dev/null; then |
1324 | 5549 | lt_cv_nm_interface="MS dumpbin" | 5564 | lt_cv_nm_interface="MS dumpbin" |
1325 | @@ -6748,7 +6763,7 @@ | |||
1326 | 6748 | ;; | 6763 | ;; |
1327 | 6749 | *-*-irix6*) | 6764 | *-*-irix6*) |
1328 | 6750 | # Find out which ABI we are using. | 6765 | # Find out which ABI we are using. |
1330 | 6751 | echo '#line 6751 "configure"' > conftest.$ac_ext | 6766 | echo '#line 6766 "configure"' > conftest.$ac_ext |
1331 | 6752 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 | 6767 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
1332 | 6753 | (eval $ac_compile) 2>&5 | 6768 | (eval $ac_compile) 2>&5 |
1333 | 6754 | ac_status=$? | 6769 | ac_status=$? |
1334 | @@ -7502,8 +7517,7 @@ | |||
1335 | 7502 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` | 7517 | as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
1336 | 7503 | ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default | 7518 | ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default |
1337 | 7504 | " | 7519 | " |
1340 | 7505 | eval as_val=\$$as_ac_Header | 7520 | if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : |
1339 | 7506 | if test "x$as_val" = x""yes; then : | ||
1341 | 7507 | cat >>confdefs.h <<_ACEOF | 7521 | cat >>confdefs.h <<_ACEOF |
1342 | 7508 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 | 7522 | #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 |
1343 | 7509 | _ACEOF | 7523 | _ACEOF |
1344 | @@ -8024,11 +8038,11 @@ | |||
1345 | 8024 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 8038 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1346 | 8025 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 8039 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1347 | 8026 | -e 's:$: $lt_compiler_flag:'` | 8040 | -e 's:$: $lt_compiler_flag:'` |
1349 | 8027 | (eval echo "\"\$as_me:8027: $lt_compile\"" >&5) | 8041 | (eval echo "\"\$as_me:8041: $lt_compile\"" >&5) |
1350 | 8028 | (eval "$lt_compile" 2>conftest.err) | 8042 | (eval "$lt_compile" 2>conftest.err) |
1351 | 8029 | ac_status=$? | 8043 | ac_status=$? |
1352 | 8030 | cat conftest.err >&5 | 8044 | cat conftest.err >&5 |
1354 | 8031 | echo "$as_me:8031: \$? = $ac_status" >&5 | 8045 | echo "$as_me:8045: \$? = $ac_status" >&5 |
1355 | 8032 | if (exit $ac_status) && test -s "$ac_outfile"; then | 8046 | if (exit $ac_status) && test -s "$ac_outfile"; then |
1356 | 8033 | # The compiler can only warn and ignore the option if not recognized | 8047 | # The compiler can only warn and ignore the option if not recognized |
1357 | 8034 | # So say no if there are warnings other than the usual output. | 8048 | # So say no if there are warnings other than the usual output. |
1358 | @@ -8363,11 +8377,11 @@ | |||
1359 | 8363 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 8377 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1360 | 8364 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 8378 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1361 | 8365 | -e 's:$: $lt_compiler_flag:'` | 8379 | -e 's:$: $lt_compiler_flag:'` |
1363 | 8366 | (eval echo "\"\$as_me:8366: $lt_compile\"" >&5) | 8380 | (eval echo "\"\$as_me:8380: $lt_compile\"" >&5) |
1364 | 8367 | (eval "$lt_compile" 2>conftest.err) | 8381 | (eval "$lt_compile" 2>conftest.err) |
1365 | 8368 | ac_status=$? | 8382 | ac_status=$? |
1366 | 8369 | cat conftest.err >&5 | 8383 | cat conftest.err >&5 |
1368 | 8370 | echo "$as_me:8370: \$? = $ac_status" >&5 | 8384 | echo "$as_me:8384: \$? = $ac_status" >&5 |
1369 | 8371 | if (exit $ac_status) && test -s "$ac_outfile"; then | 8385 | if (exit $ac_status) && test -s "$ac_outfile"; then |
1370 | 8372 | # The compiler can only warn and ignore the option if not recognized | 8386 | # The compiler can only warn and ignore the option if not recognized |
1371 | 8373 | # So say no if there are warnings other than the usual output. | 8387 | # So say no if there are warnings other than the usual output. |
1372 | @@ -8468,11 +8482,11 @@ | |||
1373 | 8468 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 8482 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1374 | 8469 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 8483 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1375 | 8470 | -e 's:$: $lt_compiler_flag:'` | 8484 | -e 's:$: $lt_compiler_flag:'` |
1377 | 8471 | (eval echo "\"\$as_me:8471: $lt_compile\"" >&5) | 8485 | (eval echo "\"\$as_me:8485: $lt_compile\"" >&5) |
1378 | 8472 | (eval "$lt_compile" 2>out/conftest.err) | 8486 | (eval "$lt_compile" 2>out/conftest.err) |
1379 | 8473 | ac_status=$? | 8487 | ac_status=$? |
1380 | 8474 | cat out/conftest.err >&5 | 8488 | cat out/conftest.err >&5 |
1382 | 8475 | echo "$as_me:8475: \$? = $ac_status" >&5 | 8489 | echo "$as_me:8489: \$? = $ac_status" >&5 |
1383 | 8476 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 8490 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1384 | 8477 | then | 8491 | then |
1385 | 8478 | # The compiler can only warn and ignore the option if not recognized | 8492 | # The compiler can only warn and ignore the option if not recognized |
1386 | @@ -8523,11 +8537,11 @@ | |||
1387 | 8523 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ | 8537 | -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
1388 | 8524 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ | 8538 | -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
1389 | 8525 | -e 's:$: $lt_compiler_flag:'` | 8539 | -e 's:$: $lt_compiler_flag:'` |
1391 | 8526 | (eval echo "\"\$as_me:8526: $lt_compile\"" >&5) | 8540 | (eval echo "\"\$as_me:8540: $lt_compile\"" >&5) |
1392 | 8527 | (eval "$lt_compile" 2>out/conftest.err) | 8541 | (eval "$lt_compile" 2>out/conftest.err) |
1393 | 8528 | ac_status=$? | 8542 | ac_status=$? |
1394 | 8529 | cat out/conftest.err >&5 | 8543 | cat out/conftest.err >&5 |
1396 | 8530 | echo "$as_me:8530: \$? = $ac_status" >&5 | 8544 | echo "$as_me:8544: \$? = $ac_status" >&5 |
1397 | 8531 | if (exit $ac_status) && test -s out/conftest2.$ac_objext | 8545 | if (exit $ac_status) && test -s out/conftest2.$ac_objext |
1398 | 8532 | then | 8546 | then |
1399 | 8533 | # The compiler can only warn and ignore the option if not recognized | 8547 | # The compiler can only warn and ignore the option if not recognized |
1400 | @@ -10907,7 +10921,7 @@ | |||
1401 | 10907 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 10921 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
1402 | 10908 | lt_status=$lt_dlunknown | 10922 | lt_status=$lt_dlunknown |
1403 | 10909 | cat > conftest.$ac_ext <<_LT_EOF | 10923 | cat > conftest.$ac_ext <<_LT_EOF |
1405 | 10910 | #line 10910 "configure" | 10924 | #line 10924 "configure" |
1406 | 10911 | #include "confdefs.h" | 10925 | #include "confdefs.h" |
1407 | 10912 | 10926 | ||
1408 | 10913 | #if HAVE_DLFCN_H | 10927 | #if HAVE_DLFCN_H |
1409 | @@ -11003,7 +11017,7 @@ | |||
1410 | 11003 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 | 11017 | lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
1411 | 11004 | lt_status=$lt_dlunknown | 11018 | lt_status=$lt_dlunknown |
1412 | 11005 | cat > conftest.$ac_ext <<_LT_EOF | 11019 | cat > conftest.$ac_ext <<_LT_EOF |
1414 | 11006 | #line 11006 "configure" | 11020 | #line 11020 "configure" |
1415 | 11007 | #include "confdefs.h" | 11021 | #include "confdefs.h" |
1416 | 11008 | 11022 | ||
1417 | 11009 | #if HAVE_DLFCN_H | 11023 | #if HAVE_DLFCN_H |
1418 | @@ -11339,6 +11353,10 @@ | |||
1419 | 11339 | 11353 | ||
1420 | 11340 | 11354 | ||
1421 | 11341 | 11355 | ||
1422 | 11356 | |||
1423 | 11357 | |||
1424 | 11358 | |||
1425 | 11359 | |||
1426 | 11342 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | 11360 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
1427 | 11343 | if test -n "$ac_tool_prefix"; then | 11361 | if test -n "$ac_tool_prefix"; then |
1428 | 11344 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | 11362 | # 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 | 11451 | $as_echo "no" >&6; } | 11469 | $as_echo "no" >&6; } |
1431 | 11452 | PKG_CONFIG="" | 11470 | PKG_CONFIG="" |
1432 | 11453 | fi | 11471 | fi |
1433 | 11454 | |||
1434 | 11455 | fi | 11472 | fi |
1435 | 11456 | 11473 | ||
1436 | 11457 | pkg_failed=no | 11474 | pkg_failed=no |
1437 | 11458 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBINDICATOR" >&5 | 11475 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBINDICATOR" >&5 |
1438 | 11459 | $as_echo_n "checking for LIBINDICATOR... " >&6; } | 11476 | $as_echo_n "checking for LIBINDICATOR... " >&6; } |
1439 | 11460 | 11477 | ||
1445 | 11461 | if test -n "$PKG_CONFIG"; then | 11478 | if test -n "$LIBINDICATOR_CFLAGS"; then |
1446 | 11462 | if test -n "$LIBINDICATOR_CFLAGS"; then | 11479 | pkg_cv_LIBINDICATOR_CFLAGS="$LIBINDICATOR_CFLAGS" |
1447 | 11463 | pkg_cv_LIBINDICATOR_CFLAGS="$LIBINDICATOR_CFLAGS" | 11480 | elif test -n "$PKG_CONFIG"; then |
1448 | 11464 | else | 11481 | if test -n "$PKG_CONFIG" && \ |
1444 | 11465 | if test -n "$PKG_CONFIG" && \ | ||
1449 | 11466 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION | 11482 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION |
1450 | 11467 | gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION | 11483 | gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION |
1451 | 11468 | dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5 | 11484 | dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5 |
1452 | @@ -11478,15 +11494,13 @@ | |||
1453 | 11478 | else | 11494 | else |
1454 | 11479 | pkg_failed=yes | 11495 | pkg_failed=yes |
1455 | 11480 | fi | 11496 | fi |
1459 | 11481 | fi | 11497 | else |
1460 | 11482 | else | 11498 | pkg_failed=untried |
1458 | 11483 | pkg_failed=untried | ||
1461 | 11484 | fi | 11499 | fi |
1467 | 11485 | if test -n "$PKG_CONFIG"; then | 11500 | if test -n "$LIBINDICATOR_LIBS"; then |
1468 | 11486 | if test -n "$LIBINDICATOR_LIBS"; then | 11501 | pkg_cv_LIBINDICATOR_LIBS="$LIBINDICATOR_LIBS" |
1469 | 11487 | pkg_cv_LIBINDICATOR_LIBS="$LIBINDICATOR_LIBS" | 11502 | elif test -n "$PKG_CONFIG"; then |
1470 | 11488 | else | 11503 | if test -n "$PKG_CONFIG" && \ |
1466 | 11489 | if test -n "$PKG_CONFIG" && \ | ||
1471 | 11490 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION | 11504 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION |
1472 | 11491 | gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION | 11505 | gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION |
1473 | 11492 | dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5 | 11506 | dbus-glib-1 >= \$DBUS_REQUIRED_VERSION\""; } >&5 |
1474 | @@ -11502,14 +11516,15 @@ | |||
1475 | 11502 | else | 11516 | else |
1476 | 11503 | pkg_failed=yes | 11517 | pkg_failed=yes |
1477 | 11504 | fi | 11518 | fi |
1481 | 11505 | fi | 11519 | else |
1482 | 11506 | else | 11520 | pkg_failed=untried |
1480 | 11507 | pkg_failed=untried | ||
1483 | 11508 | fi | 11521 | fi |
1484 | 11509 | 11522 | ||
1485 | 11510 | 11523 | ||
1486 | 11511 | 11524 | ||
1487 | 11512 | if test $pkg_failed = yes; then | 11525 | if test $pkg_failed = yes; then |
1488 | 11526 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1489 | 11527 | $as_echo "no" >&6; } | ||
1490 | 11513 | 11528 | ||
1491 | 11514 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | 11529 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then |
1492 | 11515 | _pkg_short_errors_supported=yes | 11530 | _pkg_short_errors_supported=yes |
1493 | @@ -11517,18 +11532,18 @@ | |||
1494 | 11517 | _pkg_short_errors_supported=no | 11532 | _pkg_short_errors_supported=no |
1495 | 11518 | fi | 11533 | fi |
1496 | 11519 | if test $_pkg_short_errors_supported = yes; then | 11534 | if test $_pkg_short_errors_supported = yes; then |
1498 | 11520 | LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION | 11535 | LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION |
1499 | 11521 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION | 11536 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION |
1501 | 11522 | dbus-glib-1 >= $DBUS_REQUIRED_VERSION"` | 11537 | dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1` |
1502 | 11523 | else | 11538 | else |
1504 | 11524 | LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION | 11539 | LIBINDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION |
1505 | 11525 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION | 11540 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION |
1507 | 11526 | dbus-glib-1 >= $DBUS_REQUIRED_VERSION"` | 11541 | dbus-glib-1 >= $DBUS_REQUIRED_VERSION" 2>&1` |
1508 | 11527 | fi | 11542 | fi |
1509 | 11528 | # Put the nasty error message in config.log where it belongs | 11543 | # Put the nasty error message in config.log where it belongs |
1510 | 11529 | echo "$LIBINDICATOR_PKG_ERRORS" >&5 | 11544 | echo "$LIBINDICATOR_PKG_ERRORS" >&5 |
1511 | 11530 | 11545 | ||
1513 | 11531 | as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION | 11546 | as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION |
1514 | 11532 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION | 11547 | gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION |
1515 | 11533 | dbus-glib-1 >= $DBUS_REQUIRED_VERSION) were not met: | 11548 | dbus-glib-1 >= $DBUS_REQUIRED_VERSION) were not met: |
1516 | 11534 | 11549 | ||
1517 | @@ -11539,12 +11554,13 @@ | |||
1518 | 11539 | 11554 | ||
1519 | 11540 | Alternatively, you may set the environment variables LIBINDICATOR_CFLAGS | 11555 | Alternatively, you may set the environment variables LIBINDICATOR_CFLAGS |
1520 | 11541 | and LIBINDICATOR_LIBS to avoid the need to call pkg-config. | 11556 | and LIBINDICATOR_LIBS to avoid the need to call pkg-config. |
1523 | 11542 | See the pkg-config man page for more details. | 11557 | See the pkg-config man page for more details." "$LINENO" 5 |
1522 | 11543 | " "$LINENO" 5 | ||
1524 | 11544 | elif test $pkg_failed = untried; then | 11558 | elif test $pkg_failed = untried; then |
1525 | 11559 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
1526 | 11560 | $as_echo "no" >&6; } | ||
1527 | 11545 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | 11561 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1528 | 11546 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | 11562 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1530 | 11547 | as_fn_error "The pkg-config script could not be found or is too old. Make sure it | 11563 | as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it |
1531 | 11548 | is in your PATH or set the PKG_CONFIG environment variable to the full | 11564 | is in your PATH or set the PKG_CONFIG environment variable to the full |
1532 | 11549 | path to pkg-config. | 11565 | path to pkg-config. |
1533 | 11550 | 11566 | ||
1534 | @@ -11553,13 +11569,13 @@ | |||
1535 | 11553 | See the pkg-config man page for more details. | 11569 | See the pkg-config man page for more details. |
1536 | 11554 | 11570 | ||
1537 | 11555 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | 11571 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. |
1539 | 11556 | See \`config.log' for more details." "$LINENO" 5; } | 11572 | See \`config.log' for more details" "$LINENO" 5 ; } |
1540 | 11557 | else | 11573 | else |
1541 | 11558 | LIBINDICATOR_CFLAGS=$pkg_cv_LIBINDICATOR_CFLAGS | 11574 | LIBINDICATOR_CFLAGS=$pkg_cv_LIBINDICATOR_CFLAGS |
1542 | 11559 | LIBINDICATOR_LIBS=$pkg_cv_LIBINDICATOR_LIBS | 11575 | LIBINDICATOR_LIBS=$pkg_cv_LIBINDICATOR_LIBS |
1543 | 11560 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 11576 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1544 | 11561 | $as_echo "yes" >&6; } | 11577 | $as_echo "yes" >&6; } |
1546 | 11562 | : | 11578 | |
1547 | 11563 | fi | 11579 | fi |
1548 | 11564 | 11580 | ||
1549 | 11565 | 11581 | ||
1550 | @@ -11724,6 +11740,7 @@ | |||
1551 | 11724 | 11740 | ||
1552 | 11725 | ac_libobjs= | 11741 | ac_libobjs= |
1553 | 11726 | ac_ltlibobjs= | 11742 | ac_ltlibobjs= |
1554 | 11743 | U= | ||
1555 | 11727 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue | 11744 | for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue |
1556 | 11728 | # 1. Remove the extension, and $U if already installed. | 11745 | # 1. Remove the extension, and $U if already installed. |
1557 | 11729 | ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' | 11746 | ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' |
1558 | @@ -11747,19 +11764,19 @@ | |||
1559 | 11747 | fi | 11764 | fi |
1560 | 11748 | 11765 | ||
1561 | 11749 | if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then | 11766 | if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then |
1563 | 11750 | as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. | 11767 | as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. |
1564 | 11751 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 11768 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
1565 | 11752 | fi | 11769 | fi |
1566 | 11753 | if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then | 11770 | if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then |
1576 | 11754 | as_fn_error "conditional \"AMDEP\" was never defined. | 11771 | as_fn_error $? "conditional \"AMDEP\" was never defined. |
1577 | 11755 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 11772 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
1578 | 11756 | fi | 11773 | fi |
1579 | 11757 | if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then | 11774 | if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then |
1580 | 11758 | as_fn_error "conditional \"am__fastdepCC\" was never defined. | 11775 | as_fn_error $? "conditional \"am__fastdepCC\" was never defined. |
1581 | 11759 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 11776 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
1582 | 11760 | fi | 11777 | fi |
1583 | 11761 | if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then | 11778 | if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then |
1584 | 11762 | as_fn_error "conditional \"am__fastdepCC\" was never defined. | 11779 | as_fn_error $? "conditional \"am__fastdepCC\" was never defined. |
1585 | 11763 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 11780 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
1586 | 11764 | fi | 11781 | fi |
1587 | 11765 | 11782 | ||
1588 | @@ -11909,19 +11926,19 @@ | |||
1589 | 11909 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH | 11926 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
1590 | 11910 | 11927 | ||
1591 | 11911 | 11928 | ||
1594 | 11912 | # as_fn_error ERROR [LINENO LOG_FD] | 11929 | # as_fn_error STATUS ERROR [LINENO LOG_FD] |
1595 | 11913 | # --------------------------------- | 11930 | # ---------------------------------------- |
1596 | 11914 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are | 11931 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
1597 | 11915 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the | 11932 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
1599 | 11916 | # script with status $?, using 1 if that was 0. | 11933 | # script with STATUS, using 1 if that was 0. |
1600 | 11917 | as_fn_error () | 11934 | as_fn_error () |
1601 | 11918 | { | 11935 | { |
1606 | 11919 | as_status=$?; test $as_status -eq 0 && as_status=1 | 11936 | as_status=$1; test $as_status -eq 0 && as_status=1 |
1607 | 11920 | if test "$3"; then | 11937 | if test "$4"; then |
1608 | 11921 | as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack | 11938 | as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1609 | 11922 | $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 | 11939 | $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
1610 | 11923 | fi | 11940 | fi |
1612 | 11924 | $as_echo "$as_me: error: $1" >&2 | 11941 | $as_echo "$as_me: error: $2" >&2 |
1613 | 11925 | as_fn_exit $as_status | 11942 | as_fn_exit $as_status |
1614 | 11926 | } # as_fn_error | 11943 | } # as_fn_error |
1615 | 11927 | 11944 | ||
1616 | @@ -12117,7 +12134,7 @@ | |||
1617 | 12117 | test -d "$as_dir" && break | 12134 | test -d "$as_dir" && break |
1618 | 12118 | done | 12135 | done |
1619 | 12119 | test -z "$as_dirs" || eval "mkdir $as_dirs" | 12136 | test -z "$as_dirs" || eval "mkdir $as_dirs" |
1621 | 12120 | } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" | 12137 | } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
1622 | 12121 | 12138 | ||
1623 | 12122 | 12139 | ||
1624 | 12123 | } # as_fn_mkdir_p | 12140 | } # as_fn_mkdir_p |
1625 | @@ -12170,8 +12187,8 @@ | |||
1626 | 12170 | # report actual input values of CONFIG_FILES etc. instead of their | 12187 | # report actual input values of CONFIG_FILES etc. instead of their |
1627 | 12171 | # values after options handling. | 12188 | # values after options handling. |
1628 | 12172 | ac_log=" | 12189 | ac_log=" |
1631 | 12173 | This file was extended by libindicator $as_me 0.3.10, which was | 12190 | This file was extended by libindicator $as_me 0.3.11, which was |
1632 | 12174 | generated by GNU Autoconf 2.65. Invocation command line was | 12191 | generated by GNU Autoconf 2.67. Invocation command line was |
1633 | 12175 | 12192 | ||
1634 | 12176 | CONFIG_FILES = $CONFIG_FILES | 12193 | CONFIG_FILES = $CONFIG_FILES |
1635 | 12177 | CONFIG_HEADERS = $CONFIG_HEADERS | 12194 | CONFIG_HEADERS = $CONFIG_HEADERS |
1636 | @@ -12236,11 +12253,11 @@ | |||
1637 | 12236 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 12253 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
1638 | 12237 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 12254 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
1639 | 12238 | ac_cs_version="\\ | 12255 | ac_cs_version="\\ |
1642 | 12239 | libindicator config.status 0.3.10 | 12256 | libindicator config.status 0.3.11 |
1643 | 12240 | configured by $0, generated by GNU Autoconf 2.65, | 12257 | configured by $0, generated by GNU Autoconf 2.67, |
1644 | 12241 | with options \\"\$ac_cs_config\\" | 12258 | with options \\"\$ac_cs_config\\" |
1645 | 12242 | 12259 | ||
1647 | 12243 | Copyright (C) 2009 Free Software Foundation, Inc. | 12260 | Copyright (C) 2010 Free Software Foundation, Inc. |
1648 | 12244 | This config.status script is free software; the Free Software Foundation | 12261 | This config.status script is free software; the Free Software Foundation |
1649 | 12245 | gives unlimited permission to copy, distribute and modify it." | 12262 | gives unlimited permission to copy, distribute and modify it." |
1650 | 12246 | 12263 | ||
1651 | @@ -12258,11 +12275,16 @@ | |||
1652 | 12258 | while test $# != 0 | 12275 | while test $# != 0 |
1653 | 12259 | do | 12276 | do |
1654 | 12260 | case $1 in | 12277 | case $1 in |
1656 | 12261 | --*=*) | 12278 | --*=?*) |
1657 | 12262 | ac_option=`expr "X$1" : 'X\([^=]*\)='` | 12279 | ac_option=`expr "X$1" : 'X\([^=]*\)='` |
1658 | 12263 | ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` | 12280 | ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` |
1659 | 12264 | ac_shift=: | 12281 | ac_shift=: |
1660 | 12265 | ;; | 12282 | ;; |
1661 | 12283 | --*=) | ||
1662 | 12284 | ac_option=`expr "X$1" : 'X\([^=]*\)='` | ||
1663 | 12285 | ac_optarg= | ||
1664 | 12286 | ac_shift=: | ||
1665 | 12287 | ;; | ||
1666 | 12266 | *) | 12288 | *) |
1667 | 12267 | ac_option=$1 | 12289 | ac_option=$1 |
1668 | 12268 | ac_optarg=$2 | 12290 | ac_optarg=$2 |
1669 | @@ -12284,6 +12306,7 @@ | |||
1670 | 12284 | $ac_shift | 12306 | $ac_shift |
1671 | 12285 | case $ac_optarg in | 12307 | case $ac_optarg in |
1672 | 12286 | *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; | 12308 | *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; |
1673 | 12309 | '') as_fn_error $? "missing file argument" ;; | ||
1674 | 12287 | esac | 12310 | esac |
1675 | 12288 | as_fn_append CONFIG_FILES " '$ac_optarg'" | 12311 | as_fn_append CONFIG_FILES " '$ac_optarg'" |
1676 | 12289 | ac_need_defaults=false;; | 12312 | ac_need_defaults=false;; |
1677 | @@ -12296,7 +12319,7 @@ | |||
1678 | 12296 | ac_need_defaults=false;; | 12319 | ac_need_defaults=false;; |
1679 | 12297 | --he | --h) | 12320 | --he | --h) |
1680 | 12298 | # Conflict between --help and --header | 12321 | # Conflict between --help and --header |
1682 | 12299 | as_fn_error "ambiguous option: \`$1' | 12322 | as_fn_error $? "ambiguous option: \`$1' |
1683 | 12300 | Try \`$0 --help' for more information.";; | 12323 | Try \`$0 --help' for more information.";; |
1684 | 12301 | --help | --hel | -h ) | 12324 | --help | --hel | -h ) |
1685 | 12302 | $as_echo "$ac_cs_usage"; exit ;; | 12325 | $as_echo "$ac_cs_usage"; exit ;; |
1686 | @@ -12305,7 +12328,7 @@ | |||
1687 | 12305 | ac_cs_silent=: ;; | 12328 | ac_cs_silent=: ;; |
1688 | 12306 | 12329 | ||
1689 | 12307 | # This is an error. | 12330 | # This is an error. |
1691 | 12308 | -*) as_fn_error "unrecognized option: \`$1' | 12331 | -*) as_fn_error $? "unrecognized option: \`$1' |
1692 | 12309 | Try \`$0 --help' for more information." ;; | 12332 | Try \`$0 --help' for more information." ;; |
1693 | 12310 | 12333 | ||
1694 | 12311 | *) as_fn_append ac_config_targets " $1" | 12334 | *) as_fn_append ac_config_targets " $1" |
1695 | @@ -12623,7 +12646,7 @@ | |||
1696 | 12623 | "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; | 12646 | "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; |
1697 | 12624 | "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; | 12647 | "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; |
1698 | 12625 | 12648 | ||
1700 | 12626 | *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; | 12649 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; |
1701 | 12627 | esac | 12650 | esac |
1702 | 12628 | done | 12651 | done |
1703 | 12629 | 12652 | ||
1704 | @@ -12661,7 +12684,7 @@ | |||
1705 | 12661 | { | 12684 | { |
1706 | 12662 | tmp=./conf$$-$RANDOM | 12685 | tmp=./conf$$-$RANDOM |
1707 | 12663 | (umask 077 && mkdir "$tmp") | 12686 | (umask 077 && mkdir "$tmp") |
1709 | 12664 | } || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 | 12687 | } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 |
1710 | 12665 | 12688 | ||
1711 | 12666 | # Set up the scripts for CONFIG_FILES section. | 12689 | # Set up the scripts for CONFIG_FILES section. |
1712 | 12667 | # No need to generate them if there are no CONFIG_FILES. | 12690 | # No need to generate them if there are no CONFIG_FILES. |
1713 | @@ -12678,7 +12701,7 @@ | |||
1714 | 12678 | fi | 12701 | fi |
1715 | 12679 | ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` | 12702 | ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` |
1716 | 12680 | if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then | 12703 | if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then |
1718 | 12681 | ac_cs_awk_cr='\r' | 12704 | ac_cs_awk_cr='\\r' |
1719 | 12682 | else | 12705 | else |
1720 | 12683 | ac_cs_awk_cr=$ac_cr | 12706 | ac_cs_awk_cr=$ac_cr |
1721 | 12684 | fi | 12707 | fi |
1722 | @@ -12692,18 +12715,18 @@ | |||
1723 | 12692 | echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && | 12715 | echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && |
1724 | 12693 | echo "_ACEOF" | 12716 | echo "_ACEOF" |
1725 | 12694 | } >conf$$subs.sh || | 12717 | } >conf$$subs.sh || |
1728 | 12695 | as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 | 12718 | as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
1729 | 12696 | ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` | 12719 | ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` |
1730 | 12697 | ac_delim='%!_!# ' | 12720 | ac_delim='%!_!# ' |
1731 | 12698 | for ac_last_try in false false false false false :; do | 12721 | for ac_last_try in false false false false false :; do |
1732 | 12699 | . ./conf$$subs.sh || | 12722 | . ./conf$$subs.sh || |
1734 | 12700 | as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 | 12723 | as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
1735 | 12701 | 12724 | ||
1736 | 12702 | ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` | 12725 | ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` |
1737 | 12703 | if test $ac_delim_n = $ac_delim_num; then | 12726 | if test $ac_delim_n = $ac_delim_num; then |
1738 | 12704 | break | 12727 | break |
1739 | 12705 | elif $ac_last_try; then | 12728 | elif $ac_last_try; then |
1741 | 12706 | as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 | 12729 | as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 |
1742 | 12707 | else | 12730 | else |
1743 | 12708 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | 12731 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
1744 | 12709 | fi | 12732 | fi |
1745 | @@ -12792,20 +12815,28 @@ | |||
1746 | 12792 | else | 12815 | else |
1747 | 12793 | cat | 12816 | cat |
1748 | 12794 | fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ | 12817 | fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ |
1750 | 12795 | || as_fn_error "could not setup config files machinery" "$LINENO" 5 | 12818 | || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 |
1751 | 12796 | _ACEOF | 12819 | _ACEOF |
1752 | 12797 | 12820 | ||
1755 | 12798 | # VPATH may cause trouble with some makes, so we remove $(srcdir), | 12821 | # VPATH may cause trouble with some makes, so we remove sole $(srcdir), |
1756 | 12799 | # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and | 12822 | # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and |
1757 | 12800 | # trailing colons and then remove the whole line if VPATH becomes empty | 12823 | # trailing colons and then remove the whole line if VPATH becomes empty |
1758 | 12801 | # (actually we leave an empty line to preserve line numbers). | 12824 | # (actually we leave an empty line to preserve line numbers). |
1759 | 12802 | if test "x$srcdir" = x.; then | 12825 | if test "x$srcdir" = x.; then |
1765 | 12803 | ac_vpsub='/^[ ]*VPATH[ ]*=/{ | 12826 | ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ |
1766 | 12804 | s/:*\$(srcdir):*/:/ | 12827 | h |
1767 | 12805 | s/:*\${srcdir}:*/:/ | 12828 | s/// |
1768 | 12806 | s/:*@srcdir@:*/:/ | 12829 | s/^/:/ |
1769 | 12807 | s/^\([^=]*=[ ]*\):*/\1/ | 12830 | s/[ ]*$/:/ |
1770 | 12831 | s/:\$(srcdir):/:/g | ||
1771 | 12832 | s/:\${srcdir}:/:/g | ||
1772 | 12833 | s/:@srcdir@:/:/g | ||
1773 | 12834 | s/^:*// | ||
1774 | 12808 | s/:*$// | 12835 | s/:*$// |
1775 | 12836 | x | ||
1776 | 12837 | s/\(=[ ]*\).*/\1/ | ||
1777 | 12838 | G | ||
1778 | 12839 | s/\n// | ||
1779 | 12809 | s/^[^=]*=[ ]*$// | 12840 | s/^[^=]*=[ ]*$// |
1780 | 12810 | }' | 12841 | }' |
1781 | 12811 | fi | 12842 | fi |
1782 | @@ -12833,7 +12864,7 @@ | |||
1783 | 12833 | if test -z "$ac_t"; then | 12864 | if test -z "$ac_t"; then |
1784 | 12834 | break | 12865 | break |
1785 | 12835 | elif $ac_last_try; then | 12866 | elif $ac_last_try; then |
1787 | 12836 | as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 | 12867 | as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 |
1788 | 12837 | else | 12868 | else |
1789 | 12838 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " | 12869 | ac_delim="$ac_delim!$ac_delim _$ac_delim!! " |
1790 | 12839 | fi | 12870 | fi |
1791 | @@ -12918,7 +12949,7 @@ | |||
1792 | 12918 | _ACAWK | 12949 | _ACAWK |
1793 | 12919 | _ACEOF | 12950 | _ACEOF |
1794 | 12920 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | 12951 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
1796 | 12921 | as_fn_error "could not setup config headers machinery" "$LINENO" 5 | 12952 | as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 |
1797 | 12922 | fi # test -n "$CONFIG_HEADERS" | 12953 | fi # test -n "$CONFIG_HEADERS" |
1798 | 12923 | 12954 | ||
1799 | 12924 | 12955 | ||
1800 | @@ -12931,7 +12962,7 @@ | |||
1801 | 12931 | esac | 12962 | esac |
1802 | 12932 | case $ac_mode$ac_tag in | 12963 | case $ac_mode$ac_tag in |
1803 | 12933 | :[FHL]*:*);; | 12964 | :[FHL]*:*);; |
1805 | 12934 | :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; | 12965 | :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; |
1806 | 12935 | :[FH]-) ac_tag=-:-;; | 12966 | :[FH]-) ac_tag=-:-;; |
1807 | 12936 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; | 12967 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; |
1808 | 12937 | esac | 12968 | esac |
1809 | @@ -12959,7 +12990,7 @@ | |||
1810 | 12959 | [\\/$]*) false;; | 12990 | [\\/$]*) false;; |
1811 | 12960 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; | 12991 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; |
1812 | 12961 | esac || | 12992 | esac || |
1814 | 12962 | as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; | 12993 | as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; |
1815 | 12963 | esac | 12994 | esac |
1816 | 12964 | case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac | 12995 | case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac |
1817 | 12965 | as_fn_append ac_file_inputs " '$ac_f'" | 12996 | as_fn_append ac_file_inputs " '$ac_f'" |
1818 | @@ -12986,7 +13017,7 @@ | |||
1819 | 12986 | 13017 | ||
1820 | 12987 | case $ac_tag in | 13018 | case $ac_tag in |
1821 | 12988 | *:-:* | *:-) cat >"$tmp/stdin" \ | 13019 | *:-:* | *:-) cat >"$tmp/stdin" \ |
1823 | 12989 | || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; | 13020 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; |
1824 | 12990 | esac | 13021 | esac |
1825 | 12991 | ;; | 13022 | ;; |
1826 | 12992 | esac | 13023 | esac |
1827 | @@ -13123,22 +13154,22 @@ | |||
1828 | 13123 | $ac_datarootdir_hack | 13154 | $ac_datarootdir_hack |
1829 | 13124 | " | 13155 | " |
1830 | 13125 | eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ | 13156 | eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ |
1832 | 13126 | || as_fn_error "could not create $ac_file" "$LINENO" 5 | 13157 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
1833 | 13127 | 13158 | ||
1834 | 13128 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && | 13159 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && |
1835 | 13129 | { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && | 13160 | { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && |
1836 | 13130 | { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && | 13161 | { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && |
1837 | 13131 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' | 13162 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
1839 | 13132 | which seems to be undefined. Please make sure it is defined." >&5 | 13163 | which seems to be undefined. Please make sure it is defined" >&5 |
1840 | 13133 | $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' | 13164 | $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
1842 | 13134 | which seems to be undefined. Please make sure it is defined." >&2;} | 13165 | which seems to be undefined. Please make sure it is defined" >&2;} |
1843 | 13135 | 13166 | ||
1844 | 13136 | rm -f "$tmp/stdin" | 13167 | rm -f "$tmp/stdin" |
1845 | 13137 | case $ac_file in | 13168 | case $ac_file in |
1846 | 13138 | -) cat "$tmp/out" && rm -f "$tmp/out";; | 13169 | -) cat "$tmp/out" && rm -f "$tmp/out";; |
1847 | 13139 | *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; | 13170 | *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; |
1848 | 13140 | esac \ | 13171 | esac \ |
1850 | 13141 | || as_fn_error "could not create $ac_file" "$LINENO" 5 | 13172 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
1851 | 13142 | ;; | 13173 | ;; |
1852 | 13143 | :H) | 13174 | :H) |
1853 | 13144 | # | 13175 | # |
1854 | @@ -13149,19 +13180,19 @@ | |||
1855 | 13149 | $as_echo "/* $configure_input */" \ | 13180 | $as_echo "/* $configure_input */" \ |
1856 | 13150 | && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" | 13181 | && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" |
1857 | 13151 | } >"$tmp/config.h" \ | 13182 | } >"$tmp/config.h" \ |
1859 | 13152 | || as_fn_error "could not create $ac_file" "$LINENO" 5 | 13183 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
1860 | 13153 | if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then | 13184 | if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then |
1861 | 13154 | { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 | 13185 | { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 |
1862 | 13155 | $as_echo "$as_me: $ac_file is unchanged" >&6;} | 13186 | $as_echo "$as_me: $ac_file is unchanged" >&6;} |
1863 | 13156 | else | 13187 | else |
1864 | 13157 | rm -f "$ac_file" | 13188 | rm -f "$ac_file" |
1865 | 13158 | mv "$tmp/config.h" "$ac_file" \ | 13189 | mv "$tmp/config.h" "$ac_file" \ |
1867 | 13159 | || as_fn_error "could not create $ac_file" "$LINENO" 5 | 13190 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
1868 | 13160 | fi | 13191 | fi |
1869 | 13161 | else | 13192 | else |
1870 | 13162 | $as_echo "/* $configure_input */" \ | 13193 | $as_echo "/* $configure_input */" \ |
1871 | 13163 | && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ | 13194 | && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ |
1873 | 13164 | || as_fn_error "could not create -" "$LINENO" 5 | 13195 | || as_fn_error $? "could not create -" "$LINENO" 5 |
1874 | 13165 | fi | 13196 | fi |
1875 | 13166 | # Compute "$ac_file"'s index in $config_headers. | 13197 | # Compute "$ac_file"'s index in $config_headers. |
1876 | 13167 | _am_arg="$ac_file" | 13198 | _am_arg="$ac_file" |
1877 | @@ -13946,7 +13977,7 @@ | |||
1878 | 13946 | ac_clean_files=$ac_clean_files_save | 13977 | ac_clean_files=$ac_clean_files_save |
1879 | 13947 | 13978 | ||
1880 | 13948 | test $ac_write_fail = 0 || | 13979 | test $ac_write_fail = 0 || |
1882 | 13949 | as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 | 13980 | as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 |
1883 | 13950 | 13981 | ||
1884 | 13951 | 13982 | ||
1885 | 13952 | # configure is writing to config.log, and then calls config.status. | 13983 | # configure is writing to config.log, and then calls config.status. |
1886 | @@ -13967,7 +13998,7 @@ | |||
1887 | 13967 | exec 5>>config.log | 13998 | exec 5>>config.log |
1888 | 13968 | # Use ||, not &&, to avoid exiting from the if with $? = 1, which | 13999 | # Use ||, not &&, to avoid exiting from the if with $? = 1, which |
1889 | 13969 | # would make configure fail if this is the last instruction. | 14000 | # would make configure fail if this is the last instruction. |
1891 | 13970 | $ac_cs_success || as_fn_exit $? | 14001 | $ac_cs_success || as_fn_exit 1 |
1892 | 13971 | fi | 14002 | fi |
1893 | 13972 | if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then | 14003 | if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then |
1894 | 13973 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 | 14004 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 |
1895 | 13974 | 14005 | ||
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 | 1 | 1 | ||
1902 | 2 | AC_INIT(libindicator, 0.3.10, ted@canonical.com) | 2 | AC_INIT(libindicator, 0.3.11, ted@canonical.com) |
1903 | 3 | 3 | ||
1904 | 4 | AC_PREREQ(2.53) | 4 | AC_PREREQ(2.53) |
1905 | 5 | 5 | ||
1906 | 6 | AM_CONFIG_HEADER(config.h) | 6 | AM_CONFIG_HEADER(config.h) |
1908 | 7 | AM_INIT_AUTOMAKE(libindicator, 0.3.10) | 7 | AM_INIT_AUTOMAKE(libindicator, 0.3.11) |
1909 | 8 | 8 | ||
1910 | 9 | AM_MAINTAINER_MODE | 9 | AM_MAINTAINER_MODE |
1911 | 10 | m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) | 10 | m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) |
1912 | 11 | 11 | ||
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 | 1 | libindicator (0.3.11-0ubuntu1~ppa1) maverick; urgency=low | ||
1918 | 2 | |||
1919 | 3 | * New upstream release. | ||
1920 | 4 | * Allowing absolute paths in the image name (LP: #564034) | ||
1921 | 5 | |||
1922 | 6 | -- Ted Gould <ted@ubuntu.com> Thu, 12 Aug 2010 14:42:46 -0500 | ||
1923 | 7 | |||
1924 | 1 | libindicator (0.3.10-0ubuntu1) maverick; urgency=low | 8 | libindicator (0.3.10-0ubuntu1) maverick; urgency=low |
1925 | 2 | 9 | ||
1926 | 3 | * New upstream release. | 10 | * New upstream release. |
1927 | @@ -6,6 +13,14 @@ | |||
1928 | 6 | 13 | ||
1929 | 7 | -- Ted Gould <ted@ubuntu.com> Thu, 15 Jul 2010 10:02:56 -0500 | 14 | -- Ted Gould <ted@ubuntu.com> Thu, 15 Jul 2010 10:02:56 -0500 |
1930 | 8 | 15 | ||
1931 | 16 | libindicator (0.3.9-1) unstable; urgency=low | ||
1932 | 17 | |||
1933 | 18 | * Merging new upstream release and some changes from Ubuntu. | ||
1934 | 19 | * Don't drop debian/source/* | ||
1935 | 20 | * Standards-Version: 3.9.0 | ||
1936 | 21 | |||
1937 | 22 | -- Evgeni Golov <evgeni@debian.org> Wed, 14 Jul 2010 10:07:36 +0200 | ||
1938 | 23 | |||
1939 | 9 | libindicator (0.3.9-0ubuntu2) maverick; urgency=low | 24 | libindicator (0.3.9-0ubuntu2) maverick; urgency=low |
1940 | 10 | 25 | ||
1941 | 11 | * Merged in fix for (LP: #603489) | 26 | * Merged in fix for (LP: #603489) |
1942 | @@ -24,7 +39,7 @@ | |||
1943 | 24 | 39 | ||
1944 | 25 | -- Ted Gould <ted@ubuntu.com> Thu, 08 Jul 2010 15:19:08 -0500 | 40 | -- Ted Gould <ted@ubuntu.com> Thu, 08 Jul 2010 15:19:08 -0500 |
1945 | 26 | 41 | ||
1947 | 27 | libindicator (0.3.8-2) unstable; urgency=low | 42 | libindicator (0.3.8-2) UNRELEASED; urgency=low |
1948 | 28 | 43 | ||
1949 | 29 | * Revert cdbs drop, as requested by the Ubuntu maintainers. | 44 | * Revert cdbs drop, as requested by the Ubuntu maintainers. |
1950 | 30 | * Update Maintainer and Vcs-* fields for pkg-ayatana. | 45 | * Update Maintainer and Vcs-* fields for pkg-ayatana. |
1951 | 31 | 46 | ||
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 | 1 | 3.0 (quilt) | ||
1958 | 0 | 2 | ||
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 | 202 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 202 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
1964 | 203 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 203 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
1965 | 204 | PKG_CONFIG = @PKG_CONFIG@ | 204 | PKG_CONFIG = @PKG_CONFIG@ |
1966 | 205 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
1967 | 206 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
1968 | 205 | PREFIX = @PREFIX@ | 207 | PREFIX = @PREFIX@ |
1969 | 206 | RANLIB = @RANLIB@ | 208 | RANLIB = @RANLIB@ |
1970 | 207 | SED = @SED@ | 209 | SED = @SED@ |
1971 | 208 | 210 | ||
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 | 30 | refresh_image (GtkImage * image) | 30 | refresh_image (GtkImage * image) |
1977 | 31 | { | 31 | { |
1978 | 32 | g_return_if_fail(GTK_IS_IMAGE(image)); | 32 | g_return_if_fail(GTK_IS_IMAGE(image)); |
1979 | 33 | const gchar * icon_filename = NULL; | ||
1980 | 34 | GtkIconInfo * icon_info = NULL; | ||
1981 | 35 | gint icon_size = 22; | ||
1982 | 33 | 36 | ||
1983 | 34 | GIcon * icon_names = (GIcon *)g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA); | 37 | GIcon * icon_names = (GIcon *)g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA); |
1984 | 35 | g_return_if_fail(icon_names != NULL); | 38 | g_return_if_fail(icon_names != NULL); |
1985 | @@ -38,23 +41,30 @@ | |||
1986 | 38 | GtkIconTheme * default_theme = gtk_icon_theme_get_default(); | 41 | GtkIconTheme * default_theme = gtk_icon_theme_get_default(); |
1987 | 39 | g_return_if_fail(default_theme != NULL); | 42 | g_return_if_fail(default_theme != NULL); |
1988 | 40 | 43 | ||
1989 | 41 | gint icon_size = 22; | ||
1990 | 42 | |||
1991 | 43 | /* Look through the themes for that icon */ | 44 | /* Look through the themes for that icon */ |
1993 | 44 | GtkIconInfo * icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, icon_size, 0); | 45 | icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, icon_size, 0); |
1994 | 45 | if (icon_info == NULL) { | 46 | if (icon_info == NULL) { |
1997 | 46 | g_warning("Unable to find icon in theme."); | 47 | /* Try using the second item in the names, which should be the original filename supplied */ |
1998 | 47 | return; | 48 | const gchar * const * names = g_themed_icon_get_names(G_THEMED_ICON( icon_names )); |
1999 | 49 | if (names) { | ||
2000 | 50 | icon_filename = names[1]; | ||
2001 | 51 | } else { | ||
2002 | 52 | g_warning("Unable to find icon\n"); | ||
2003 | 53 | return; | ||
2004 | 54 | } | ||
2005 | 55 | } else { | ||
2006 | 56 | /* Grab the filename */ | ||
2007 | 57 | icon_filename = gtk_icon_info_get_filename(icon_info); | ||
2008 | 48 | } | 58 | } |
2013 | 49 | 59 | g_return_if_fail(icon_filename != NULL); /* An error because we don't have a filename */ | |
2010 | 50 | /* Grab the filename */ | ||
2011 | 51 | const gchar * icon_filename = gtk_icon_info_get_filename(icon_info); | ||
2012 | 52 | g_return_if_fail(icon_filename != NULL); /* An error because we shouldn't get info without a filename */ | ||
2014 | 53 | 60 | ||
2015 | 54 | /* Build a pixbuf */ | 61 | /* Build a pixbuf */ |
2016 | 55 | GError * error = NULL; | 62 | GError * error = NULL; |
2017 | 56 | GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file(icon_filename, &error); | 63 | GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file(icon_filename, &error); |
2019 | 57 | gtk_icon_info_free(icon_info); | 64 | |
2020 | 65 | if (icon_info != NULL) { | ||
2021 | 66 | gtk_icon_info_free(icon_info); | ||
2022 | 67 | } | ||
2023 | 58 | 68 | ||
2024 | 59 | if (pixbuf == NULL) { | 69 | if (pixbuf == NULL) { |
2025 | 60 | g_error("Unable to load icon from file '%s' because: %s", icon_filename, error == NULL ? "I don't know" : error->message); | 70 | 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 | 126 | g_return_if_fail(name != NULL); | 136 | g_return_if_fail(name != NULL); |
2028 | 127 | g_return_if_fail(name[0] != '\0'); | 137 | g_return_if_fail(name[0] != '\0'); |
2029 | 128 | g_return_if_fail(image != NULL); | 138 | g_return_if_fail(image != NULL); |
2030 | 139 | gboolean seen_previously = FALSE; | ||
2031 | 129 | 140 | ||
2032 | 130 | /* Build us a GIcon */ | 141 | /* Build us a GIcon */ |
2033 | 131 | GIcon * icon_names = g_themed_icon_new_with_default_fallbacks(name); | 142 | GIcon * icon_names = g_themed_icon_new_with_default_fallbacks(name); |
2034 | 143 | g_warn_if_fail(icon_names != NULL); | ||
2035 | 132 | g_return_if_fail(icon_names != NULL); | 144 | g_return_if_fail(icon_names != NULL); |
2036 | 133 | 145 | ||
2038 | 134 | gboolean seen_previously = (g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA) != NULL); | 146 | seen_previously = (g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA) != NULL); |
2039 | 135 | 147 | ||
2040 | 136 | /* Attach our names to the image */ | 148 | /* Attach our names to the image */ |
2041 | 137 | g_object_set_data_full(G_OBJECT(image), INDICATOR_NAMES_DATA, icon_names, g_object_unref); | 149 | g_object_set_data_full(G_OBJECT(image), INDICATOR_NAMES_DATA, icon_names, g_object_unref); |
2042 | 138 | 150 | ||
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 | 363 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 363 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
2048 | 364 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 364 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
2049 | 365 | PKG_CONFIG = @PKG_CONFIG@ | 365 | PKG_CONFIG = @PKG_CONFIG@ |
2050 | 366 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
2051 | 367 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
2052 | 366 | PREFIX = @PREFIX@ | 368 | PREFIX = @PREFIX@ |
2053 | 367 | RANLIB = @RANLIB@ | 369 | RANLIB = @RANLIB@ |
2054 | 368 | SED = @SED@ | 370 | SED = @SED@ |
2055 | 369 | 371 | ||
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 | 152 | PACKAGE_VERSION = @PACKAGE_VERSION@ | 152 | PACKAGE_VERSION = @PACKAGE_VERSION@ |
2061 | 153 | PATH_SEPARATOR = @PATH_SEPARATOR@ | 153 | PATH_SEPARATOR = @PATH_SEPARATOR@ |
2062 | 154 | PKG_CONFIG = @PKG_CONFIG@ | 154 | PKG_CONFIG = @PKG_CONFIG@ |
2063 | 155 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
2064 | 156 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
2065 | 155 | PREFIX = @PREFIX@ | 157 | PREFIX = @PREFIX@ |
2066 | 156 | RANLIB = @RANLIB@ | 158 | RANLIB = @RANLIB@ |
2067 | 157 | SED = @SED@ | 159 | 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?