Merge lp:~ubuntu-geoip-team/ubuntu-geoip/ubuntu into lp:~ubuntu-desktop/ubuntu-geoip/ubuntu
- ubuntu
- Merge into ubuntu
Proposed by
Ted Gould
Status: | Merged |
---|---|
Merged at revision: | 31 |
Proposed branch: | lp:~ubuntu-geoip-team/ubuntu-geoip/ubuntu |
Merge into: | lp:~ubuntu-desktop/ubuntu-geoip/ubuntu |
Diff against target: |
3806 lines (+1111/-537) 19 files modified
AUTHORS (+2/-0) ChangeLog (+131/-0) Makefile.in (+79/-32) aclocal.m4 (+149/-82) configure (+368/-283) configure.ac (+4/-4) data/Makefile.am (+12/-0) data/Makefile.in (+72/-19) data/com.ubuntu.geoip.gschema.xml.in (+9/-0) data/ubuntu-geoip.provider (+1/-1) debian/changelog (+13/-0) debian/patches/NM_0_9_api.patch (+0/-33) debian/patches/debian-changes-0.0.2-0ubuntu5 (+0/-38) debian/patches/series (+0/-2) debian/rules (+1/-0) debian/source/format (+0/-1) po/POTFILES.in (+3/-0) src/Makefile.in (+63/-31) src/ubuntu-geoip-provider.c (+204/-11) |
To merge this branch: | bzr merge lp:~ubuntu-geoip-team/ubuntu-geoip/ubuntu |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Approve | ||
Review via email: mp+124215@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'AUTHORS' |
2 | --- AUTHORS 2010-10-06 17:53:33 +0000 |
3 | +++ AUTHORS 2012-09-13 14:46:32 +0000 |
4 | @@ -1,3 +1,5 @@ |
5 | # Generated by Makefile. Do not edit. |
6 | |
7 | + Andrew Glen-Young |
8 | + Mathieu Trudel-Lapierre |
9 | Ted Gould |
10 | |
11 | === modified file 'ChangeLog' |
12 | --- ChangeLog 2010-10-21 21:21:37 +0000 |
13 | +++ ChangeLog 2012-09-13 14:46:32 +0000 |
14 | @@ -1,5 +1,136 @@ |
15 | # Generated by Makefile. Do not edit. |
16 | |
17 | +2012-09-13 Ted Gould <ted@gould.cx> |
18 | + |
19 | + 1.0.0 |
20 | + |
21 | +2012-08-09 Ted Gould <ted@gould.cx> |
22 | + |
23 | + Clearing our cached data when we loose networking so we re-emit it when we get it back |
24 | + |
25 | +2012-08-09 Ted Gould <ted@gould.cx> |
26 | + |
27 | + Fixing a connecting bug |
28 | + |
29 | +2012-08-09 Ted Gould <ted@gould.cx> |
30 | + |
31 | + Making it so that we're not immediately cacheable as the GeoClue master seems to not handle that well |
32 | + |
33 | +2012-08-09 Ted Gould <ted@gould.cx> |
34 | + |
35 | + Better usage of NM States |
36 | + |
37 | +2012-08-09 Ted Gould <ted@gould.cx> |
38 | + |
39 | + Make more sophesticated use of the NM states |
40 | + |
41 | +2012-08-09 Ted Gould <ted@gould.cx> |
42 | + |
43 | + Using new global status value |
44 | + |
45 | +2012-08-09 Ted Gould <ted@gould.cx> |
46 | + |
47 | + Emit new status after updating entries |
48 | + |
49 | +2012-08-09 Ted Gould <ted@gould.cx> |
50 | + |
51 | + 0.0.3 |
52 | + |
53 | +2012-08-09 Ted Gould <ted@gould.cx> |
54 | + |
55 | + Making a setting for the URL of the GeoIP server |
56 | + |
57 | +2012-08-09 Ted Gould <ted@gould.cx> |
58 | + |
59 | + Showing the URL |
60 | + |
61 | +2012-08-09 Ted Gould <ted@gould.cx> |
62 | + |
63 | + Checking to ensure the schema exists before setting it up |
64 | + |
65 | +2012-05-04 Ted Gould <ted@gould.cx> |
66 | + |
67 | + Sync to trunk |
68 | + |
69 | +2011-10-23 Ted Gould <ted@gould.cx> |
70 | + |
71 | + Making the default path in the Ubuntu namespace |
72 | + |
73 | +2011-10-23 Ted Gould <ted@gould.cx> |
74 | + |
75 | + Getting the source URL from gsettings |
76 | + |
77 | +2011-10-23 Ted Gould <ted@gould.cx> |
78 | + |
79 | + Fill out the URL changing function to cause a refresh if we're connected |
80 | + |
81 | +2011-10-23 Ted Gould <ted@gould.cx> |
82 | + |
83 | + Add in a settings object and setup a callback for values changing |
84 | + |
85 | +2011-10-23 Ted Gould <ted@gould.cx> |
86 | + |
87 | + Ignoring built files |
88 | + |
89 | +2011-10-23 Ted Gould <ted@gould.cx> |
90 | + |
91 | + Making sure the C and H files are parsed as well |
92 | + |
93 | +2011-10-23 Ted Gould <ted@gould.cx> |
94 | + |
95 | + Adding the settings file to the translated strings |
96 | + |
97 | +2011-10-23 Ted Gould <ted@gould.cx> |
98 | + |
99 | + Adding settings for the URL |
100 | + |
101 | +2012-08-09 Ted Gould <ted@gould.cx> |
102 | + |
103 | + Ensure the networking and markup parser are more robust |
104 | + |
105 | +2012-05-07 Ted Gould <ted@gould.cx> |
106 | + |
107 | + If we get an error we'll rebuild the parser |
108 | + |
109 | +2012-05-07 Ted Gould <ted@gould.cx> |
110 | + |
111 | + New message when a message gets queued |
112 | + |
113 | +2012-05-03 Ted Gould <ted@gould.cx> |
114 | + |
115 | + Adding in a handler to look for socket errors |
116 | + |
117 | +2012-05-03 Andrew Glen-Young <aglenyoung@launchpad.net> |
118 | + |
119 | + Make HTTP command request uppercase |
120 | + |
121 | +2012-05-03 Ted Gould <ted@gould.cx> |
122 | + |
123 | + Update to NM 0.9 API |
124 | + |
125 | +2011-06-03 Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> |
126 | + |
127 | + Bump libnm-glib requirement to 0.8.998 to get the NM 0.9 API. |
128 | + |
129 | +2011-06-03 Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> |
130 | + |
131 | + Review connected states to match with NM 0.9 API. |
132 | + |
133 | + There's almost nothing to do, given the current logic; just add |
134 | + NM_STATE_ASLEEP and NM_STATE_DISCONNECTING as states that mean we're not |
135 | + connected. NM_STATE_UNKNOWN left as meaning "connected", to not block |
136 | + stuff if NM is unavailable for some reason. |
137 | + |
138 | + Other connected states: |
139 | + NM_STATE_CONNECTED_LOCAL |
140 | + NM_STATE_CONNECTED_SITE |
141 | + NM_STATE_CONNECTED_GLOBAL |
142 | + NM_STATE_UNKNOWN |
143 | + |
144 | +2010-10-21 Ted Gould <ted@gould.cx> |
145 | + |
146 | + 0.0.2 |
147 | + |
148 | 2010-10-21 Ted Gould <ted@gould.cx> |
149 | |
150 | If we don't get a valid response, let's try again. |
151 | |
152 | === modified file 'Makefile.in' |
153 | --- Makefile.in 2010-10-21 21:21:37 +0000 |
154 | +++ Makefile.in 2012-09-13 14:46:32 +0000 |
155 | @@ -1,9 +1,9 @@ |
156 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
157 | +# Makefile.in generated by automake 1.11.5 from Makefile.am. |
158 | # @configure_input@ |
159 | |
160 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
161 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
162 | -# Inc. |
163 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
164 | +# Foundation, Inc. |
165 | # This Makefile.in is free software; the Free Software Foundation |
166 | # gives unlimited permission to copy and/or distribute it, |
167 | # with or without modifications, as long as this notice is preserved. |
168 | @@ -15,6 +15,23 @@ |
169 | |
170 | @SET_MAKE@ |
171 | VPATH = @srcdir@ |
172 | +am__make_dryrun = \ |
173 | + { \ |
174 | + am__dry=no; \ |
175 | + case $$MAKEFLAGS in \ |
176 | + *\\[\ \ ]*) \ |
177 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
178 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
179 | + *) \ |
180 | + for am__flg in $$MAKEFLAGS; do \ |
181 | + case $$am__flg in \ |
182 | + *=*|--*) ;; \ |
183 | + *n*) am__dry=yes; break;; \ |
184 | + esac; \ |
185 | + done;; \ |
186 | + esac; \ |
187 | + test $$am__dry = yes; \ |
188 | + } |
189 | pkgdatadir = $(datadir)/@PACKAGE@ |
190 | pkgincludedir = $(includedir)/@PACKAGE@ |
191 | pkglibdir = $(libdir)/@PACKAGE@ |
192 | @@ -46,11 +63,11 @@ |
193 | CONFIG_HEADER = config.h |
194 | CONFIG_CLEAN_FILES = |
195 | CONFIG_CLEAN_VPATH_FILES = |
196 | -AM_V_GEN = $(am__v_GEN_$(V)) |
197 | -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) |
198 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
199 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
200 | am__v_GEN_0 = @echo " GEN " $@; |
201 | -AM_V_at = $(am__v_at_$(V)) |
202 | -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) |
203 | +AM_V_at = $(am__v_at_@AM_V@) |
204 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
205 | am__v_at_0 = @ |
206 | SOURCES = |
207 | DIST_SOURCES = |
208 | @@ -61,6 +78,11 @@ |
209 | install-pdf-recursive install-ps-recursive install-recursive \ |
210 | installcheck-recursive installdirs-recursive pdf-recursive \ |
211 | ps-recursive uninstall-recursive |
212 | +am__can_run_installinfo = \ |
213 | + case $$AM_UPDATE_INFO_DIR in \ |
214 | + n|no|NO) false;; \ |
215 | + *) (install-info --version) >/dev/null 2>&1;; \ |
216 | + esac |
217 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
218 | distclean-recursive maintainer-clean-recursive |
219 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
220 | @@ -73,9 +95,11 @@ |
221 | distdir = $(PACKAGE)-$(VERSION) |
222 | top_distdir = $(distdir) |
223 | am__remove_distdir = \ |
224 | - { test ! -d "$(distdir)" \ |
225 | - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
226 | - && rm -fr "$(distdir)"; }; } |
227 | + if test -d "$(distdir)"; then \ |
228 | + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ |
229 | + && rm -rf "$(distdir)" \ |
230 | + || { sleep 5 && rm -rf "$(distdir)"; }; \ |
231 | + else :; fi |
232 | am__relativize = \ |
233 | dir0=`pwd`; \ |
234 | sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
235 | @@ -104,6 +128,8 @@ |
236 | DIST_ARCHIVES = $(distdir).tar.gz |
237 | GZIP_ENV = --best |
238 | distuninstallcheck_listfiles = find . -type f -print |
239 | +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
240 | + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
241 | distcleancheck_listfiles = find . -type f -print |
242 | ACLOCAL = @ACLOCAL@ |
243 | ALL_LINGUAS = @ALL_LINGUAS@ |
244 | @@ -148,6 +174,10 @@ |
245 | INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
246 | INTLTOOL_PERL = @INTLTOOL_PERL@ |
247 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
248 | +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ |
249 | +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
250 | +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
251 | +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
252 | LDFLAGS = @LDFLAGS@ |
253 | LIBOBJS = @LIBOBJS@ |
254 | LIBS = @LIBS@ |
255 | @@ -207,6 +237,8 @@ |
256 | includedir = @includedir@ |
257 | infodir = @infodir@ |
258 | install_sh = @install_sh@ |
259 | +intltool__v_merge_options_ = @intltool__v_merge_options_@ |
260 | +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ |
261 | libdir = @libdir@ |
262 | libexecdir = @libexecdir@ |
263 | localedir = @localedir@ |
264 | @@ -236,7 +268,7 @@ |
265 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
266 | |
267 | .SUFFIXES: |
268 | -am--refresh: |
269 | +am--refresh: Makefile |
270 | @: |
271 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
272 | @for dep in $?; do \ |
273 | @@ -272,10 +304,8 @@ |
274 | $(am__aclocal_m4_deps): |
275 | |
276 | config.h: stamp-h1 |
277 | - @if test ! -f $@; then \ |
278 | - rm -f stamp-h1; \ |
279 | - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ |
280 | - else :; fi |
281 | + @if test ! -f $@; then rm -f stamp-h1; else :; fi |
282 | + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
283 | |
284 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
285 | @rm -f stamp-h1 |
286 | @@ -457,13 +487,10 @@ |
287 | done |
288 | @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
289 | if test "$$subdir" = .; then :; else \ |
290 | - test -d "$(distdir)/$$subdir" \ |
291 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
292 | - || exit 1; \ |
293 | - fi; \ |
294 | - done |
295 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
296 | - if test "$$subdir" = .; then :; else \ |
297 | + $(am__make_dryrun) \ |
298 | + || test -d "$(distdir)/$$subdir" \ |
299 | + || $(MKDIR_P) "$(distdir)/$$subdir" \ |
300 | + || exit 1; \ |
301 | dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
302 | $(am__relativize); \ |
303 | new_distdir=$$reldir; \ |
304 | @@ -498,7 +525,11 @@ |
305 | $(am__remove_distdir) |
306 | |
307 | dist-bzip2: distdir |
308 | - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 |
309 | + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 |
310 | + $(am__remove_distdir) |
311 | + |
312 | +dist-lzip: distdir |
313 | + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz |
314 | $(am__remove_distdir) |
315 | |
316 | dist-lzma: distdir |
317 | @@ -506,7 +537,7 @@ |
318 | $(am__remove_distdir) |
319 | |
320 | dist-xz: distdir |
321 | - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz |
322 | + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz |
323 | $(am__remove_distdir) |
324 | |
325 | dist-tarZ: distdir |
326 | @@ -537,6 +568,8 @@ |
327 | bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ |
328 | *.tar.lzma*) \ |
329 | lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ |
330 | + *.tar.lz*) \ |
331 | + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ |
332 | *.tar.xz*) \ |
333 | xz -dc $(distdir).tar.xz | $(am__untar) ;;\ |
334 | *.tar.Z*) \ |
335 | @@ -556,6 +589,7 @@ |
336 | && am__cwd=`pwd` \ |
337 | && $(am__cd) $(distdir)/_build \ |
338 | && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
339 | + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
340 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
341 | && $(MAKE) $(AM_MAKEFLAGS) \ |
342 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
343 | @@ -584,8 +618,16 @@ |
344 | list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ |
345 | sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' |
346 | distuninstallcheck: |
347 | - @$(am__cd) '$(distuninstallcheck_dir)' \ |
348 | - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ |
349 | + @test -n '$(distuninstallcheck_dir)' || { \ |
350 | + echo 'ERROR: trying to run $@ with an empty' \ |
351 | + '$$(distuninstallcheck_dir)' >&2; \ |
352 | + exit 1; \ |
353 | + }; \ |
354 | + $(am__cd) '$(distuninstallcheck_dir)' || { \ |
355 | + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ |
356 | + exit 1; \ |
357 | + }; \ |
358 | + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ |
359 | || { echo "ERROR: files left after uninstall:" ; \ |
360 | if test -n "$(DESTDIR)"; then \ |
361 | echo " (check DESTDIR support)"; \ |
362 | @@ -616,10 +658,15 @@ |
363 | |
364 | installcheck: installcheck-recursive |
365 | install-strip: |
366 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
367 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
368 | - `test -z '$(STRIP)' || \ |
369 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
370 | + if test -z '$(STRIP)'; then \ |
371 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
372 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
373 | + install; \ |
374 | + else \ |
375 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
376 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
377 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
378 | + fi |
379 | mostlyclean-generic: |
380 | |
381 | clean-generic: |
382 | @@ -706,8 +753,8 @@ |
383 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
384 | all all-am am--refresh check check-am clean clean-generic \ |
385 | ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ |
386 | - dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ |
387 | - distcheck distclean distclean-generic distclean-hdr \ |
388 | + dist-hook dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ |
389 | + dist-zip distcheck distclean distclean-generic distclean-hdr \ |
390 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
391 | dvi-am html html-am info info-am install install-am \ |
392 | install-data install-data-am install-dvi install-dvi-am \ |
393 | |
394 | === modified file 'aclocal.m4' |
395 | --- aclocal.m4 2010-10-21 21:21:37 +0000 |
396 | +++ aclocal.m4 2012-09-13 14:46:32 +0000 |
397 | @@ -1,7 +1,8 @@ |
398 | -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- |
399 | +# generated automatically by aclocal 1.11.5 -*- Autoconf -*- |
400 | |
401 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
402 | -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
403 | +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, |
404 | +# Inc. |
405 | # This file is free software; the Free Software Foundation |
406 | # gives unlimited permission to copy and/or distribute it, |
407 | # with or without modifications, as long as this notice is preserved. |
408 | @@ -13,8 +14,8 @@ |
409 | |
410 | m4_ifndef([AC_AUTOCONF_VERSION], |
411 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
412 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, |
413 | -[m4_warning([this file was generated for autoconf 2.67. |
414 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
415 | +[m4_warning([this file was generated for autoconf 2.69. |
416 | You have another version of autoconf. It may work, but is not guaranteed to. |
417 | If you have problems, you may need to regenerate the build system entirely. |
418 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
419 | @@ -260,6 +261,10 @@ |
420 | [CATOBJEXT=.mo |
421 | DATADIRNAME=lib]) |
422 | ;; |
423 | + *-*-openbsd*) |
424 | + CATOBJEXT=.mo |
425 | + DATADIRNAME=share |
426 | + ;; |
427 | *) |
428 | CATOBJEXT=.mo |
429 | DATADIRNAME=lib |
430 | @@ -461,7 +466,7 @@ |
431 | [ |
432 | m4_pattern_allow([AM_V_GEN]) |
433 | AC_ARG_ENABLE(schemas-compile, |
434 | - AC_HELP_STRING([--disable-schemas-compile], |
435 | + AS_HELP_STRING([--disable-schemas-compile], |
436 | [Disable regeneration of gschemas.compiled on install]), |
437 | [case ${enableval} in |
438 | yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; |
439 | @@ -491,7 +496,7 @@ |
440 | gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) |
441 | |
442 | %.gschema.valid: %.gschema.xml $(gsettings__enum_file) |
443 | - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ |
444 | + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ |
445 | |
446 | all-am: $(gsettings_SCHEMAS:.xml=.valid) |
447 | uninstall-am: uninstall-gsettings-schemas |
448 | @@ -499,23 +504,13 @@ |
449 | |
450 | .SECONDARY: $(gsettings_SCHEMAS) |
451 | |
452 | -gsettings__base_list = \ |
453 | - sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ |
454 | - sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" |
455 | - |
456 | -install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) |
457 | +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) |
458 | @$(NORMAL_INSTALL) |
459 | - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)" |
460 | - @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \ |
461 | - for p in $$list; do \ |
462 | - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
463 | - echo "$$d$$p"; \ |
464 | - done | $(gsettings__base_list) | \ |
465 | - while read files; do \ |
466 | - echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \ |
467 | - $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \ |
468 | - done |
469 | - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) |
470 | + if test -n "$^"; then \ |
471 | + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ |
472 | + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ |
473 | + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ |
474 | + fi |
475 | |
476 | uninstall-gsettings-schemas: |
477 | @$(NORMAL_UNINSTALL) |
478 | @@ -531,7 +526,7 @@ |
479 | |
480 | ifdef gsettings_ENUM_NAMESPACE |
481 | $(gsettings__enum_file): $(gsettings_ENUM_FILES) |
482 | - $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" $(gsettings_ENUM_FILES) > [$]@.tmp && mv [$]@.tmp [$]@ |
483 | + $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ |
484 | endif |
485 | ' |
486 | _GSETTINGS_SUBST(GSETTINGS_RULES) |
487 | @@ -548,7 +543,7 @@ |
488 | |
489 | |
490 | dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) |
491 | -# serial 40 IT_PROG_INTLTOOL |
492 | +# serial 42 IT_PROG_INTLTOOL |
493 | AC_DEFUN([IT_PROG_INTLTOOL], [ |
494 | AC_PREREQ([2.50])dnl |
495 | AC_REQUIRE([AM_NLS])dnl |
496 | @@ -561,13 +556,11 @@ |
497 | ;; |
498 | esac |
499 | |
500 | +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
501 | +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` |
502 | +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
503 | if test -n "$1"; then |
504 | AC_MSG_CHECKING([for intltool >= $1]) |
505 | - |
506 | - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
507 | - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` |
508 | - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
509 | - ] |
510 | AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) |
511 | test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || |
512 | AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) |
513 | @@ -580,25 +573,48 @@ |
514 | AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) |
515 | fi |
516 | |
517 | - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
518 | -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
519 | - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
520 | - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
521 | - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' |
522 | - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
523 | - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
524 | - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
525 | -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
526 | - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
527 | - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
528 | - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' |
529 | - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
530 | - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
531 | - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
532 | - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
533 | - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
534 | - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
535 | - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
536 | +if test -z "$AM_DEFAULT_VERBOSITY"; then |
537 | + AM_DEFAULT_VERBOSITY=1 |
538 | +fi |
539 | +AC_SUBST([AM_DEFAULT_VERBOSITY]) |
540 | + |
541 | +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' |
542 | +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' |
543 | +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' |
544 | +AC_SUBST(INTLTOOL_V_MERGE) |
545 | +AC_SUBST(INTLTOOL__v_MERGE_) |
546 | +AC_SUBST(INTLTOOL__v_MERGE_0) |
547 | + |
548 | +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' |
549 | +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' |
550 | +intltool__v_merge_options_0='-q' |
551 | +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) |
552 | +AC_SUBST(intltool__v_merge_options_) |
553 | +AC_SUBST(intltool__v_merge_options_0) |
554 | + |
555 | + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
556 | +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
557 | + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
558 | + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
559 | + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' |
560 | + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
561 | + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
562 | + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
563 | +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
564 | + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
565 | + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
566 | +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then |
567 | + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' |
568 | +else |
569 | + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' |
570 | +fi |
571 | + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
572 | + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
573 | + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
574 | + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
575 | + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
576 | + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
577 | + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' |
578 | |
579 | _IT_SUBST(INTLTOOL_DESKTOP_RULE) |
580 | _IT_SUBST(INTLTOOL_DIRECTORY_RULE) |
581 | @@ -644,7 +660,7 @@ |
582 | if test $? -ne 0; then |
583 | AC_MSG_ERROR([perl 5.8.1 is required for intltool]) |
584 | else |
585 | - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" |
586 | + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` |
587 | AC_MSG_RESULT([$IT_PERL_VERSION]) |
588 | fi |
589 | if test "x$2" != "xno-xml"; then |
590 | @@ -801,7 +817,8 @@ |
591 | # ---------------------------------- |
592 | AC_DEFUN([PKG_PROG_PKG_CONFIG], |
593 | [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) |
594 | -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) |
595 | +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) |
596 | +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) |
597 | AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) |
598 | AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) |
599 | AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) |
600 | @@ -847,7 +864,8 @@ |
601 | pkg_cv_[]$1="$$1" |
602 | elif test -n "$PKG_CONFIG"; then |
603 | PKG_CHECK_EXISTS([$3], |
604 | - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], |
605 | + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` |
606 | + test "x$?" != "x0" && pkg_failed=yes ], |
607 | [pkg_failed=yes]) |
608 | else |
609 | pkg_failed=untried |
610 | @@ -895,9 +913,9 @@ |
611 | AC_MSG_RESULT([no]) |
612 | _PKG_SHORT_ERRORS_SUPPORTED |
613 | if test $_pkg_short_errors_supported = yes; then |
614 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` |
615 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` |
616 | else |
617 | - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` |
618 | + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` |
619 | fi |
620 | # Put the nasty error message in config.log where it belongs |
621 | echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD |
622 | @@ -910,7 +928,7 @@ |
623 | Consider adjusting the PKG_CONFIG_PATH environment variable if you |
624 | installed software in a non-standard prefix. |
625 | |
626 | -_PKG_TEXT])dnl |
627 | +_PKG_TEXT])[]dnl |
628 | ]) |
629 | elif test $pkg_failed = untried; then |
630 | AC_MSG_RESULT([no]) |
631 | @@ -921,7 +939,7 @@ |
632 | |
633 | _PKG_TEXT |
634 | |
635 | -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl |
636 | +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl |
637 | ]) |
638 | else |
639 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
640 | @@ -931,12 +949,15 @@ |
641 | fi[]dnl |
642 | ])# PKG_CHECK_MODULES |
643 | |
644 | -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
645 | +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software |
646 | +# Foundation, Inc. |
647 | # |
648 | # This file is free software; the Free Software Foundation |
649 | # gives unlimited permission to copy and/or distribute it, |
650 | # with or without modifications, as long as this notice is preserved. |
651 | |
652 | +# serial 1 |
653 | + |
654 | # AM_AUTOMAKE_VERSION(VERSION) |
655 | # ---------------------------- |
656 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
657 | @@ -946,7 +967,7 @@ |
658 | [am__api_version='1.11' |
659 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
660 | dnl require some minimum version. Point them to the right macro. |
661 | -m4_if([$1], [1.11.1], [], |
662 | +m4_if([$1], [1.11.5], [], |
663 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
664 | ]) |
665 | |
666 | @@ -962,19 +983,21 @@ |
667 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
668 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
669 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
670 | -[AM_AUTOMAKE_VERSION([1.11.1])dnl |
671 | +[AM_AUTOMAKE_VERSION([1.11.5])dnl |
672 | m4_ifndef([AC_AUTOCONF_VERSION], |
673 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
674 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
675 | |
676 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
677 | |
678 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
679 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
680 | # |
681 | # This file is free software; the Free Software Foundation |
682 | # gives unlimited permission to copy and/or distribute it, |
683 | # with or without modifications, as long as this notice is preserved. |
684 | |
685 | +# serial 1 |
686 | + |
687 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
688 | # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to |
689 | # `$srcdir', `$srcdir/..', or `$srcdir/../..'. |
690 | @@ -1056,14 +1079,14 @@ |
691 | Usually this means the macro was only invoked conditionally.]]) |
692 | fi])]) |
693 | |
694 | -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 |
695 | -# Free Software Foundation, Inc. |
696 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
697 | +# 2010, 2011 Free Software Foundation, Inc. |
698 | # |
699 | # This file is free software; the Free Software Foundation |
700 | # gives unlimited permission to copy and/or distribute it, |
701 | # with or without modifications, as long as this notice is preserved. |
702 | |
703 | -# serial 10 |
704 | +# serial 12 |
705 | |
706 | # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
707 | # written in clear, in which case automake, when reading aclocal.m4, |
708 | @@ -1103,6 +1126,7 @@ |
709 | # instance it was reported that on HP-UX the gcc test will end up |
710 | # making a dummy file named `D' -- because `-MD' means `put the output |
711 | # in D'. |
712 | + rm -rf conftest.dir |
713 | mkdir conftest.dir |
714 | # Copy depcomp to subdir because otherwise we won't find it if we're |
715 | # using a relative directory. |
716 | @@ -1167,7 +1191,7 @@ |
717 | break |
718 | fi |
719 | ;; |
720 | - msvisualcpp | msvcmsys) |
721 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
722 | # This compiler won't grok `-c -o', but also, the minuso test has |
723 | # not run yet. These depmodes are late enough in the game, and |
724 | # so weak that their functioning should not be impacted. |
725 | @@ -1232,10 +1256,13 @@ |
726 | if test "x$enable_dependency_tracking" != xno; then |
727 | am_depcomp="$ac_aux_dir/depcomp" |
728 | AMDEPBACKSLASH='\' |
729 | + am__nodep='_no' |
730 | fi |
731 | AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
732 | AC_SUBST([AMDEPBACKSLASH])dnl |
733 | _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
734 | +AC_SUBST([am__nodep])dnl |
735 | +_AM_SUBST_NOTMAKE([am__nodep])dnl |
736 | ]) |
737 | |
738 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
739 | @@ -1469,12 +1496,15 @@ |
740 | done |
741 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
742 | |
743 | -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. |
744 | +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, |
745 | +# Inc. |
746 | # |
747 | # This file is free software; the Free Software Foundation |
748 | # gives unlimited permission to copy and/or distribute it, |
749 | # with or without modifications, as long as this notice is preserved. |
750 | |
751 | +# serial 1 |
752 | + |
753 | # AM_PROG_INSTALL_SH |
754 | # ------------------ |
755 | # Define $install_sh. |
756 | @@ -1514,8 +1544,8 @@ |
757 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
758 | # From Jim Meyering |
759 | |
760 | -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
761 | -# Free Software Foundation, Inc. |
762 | +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, |
763 | +# 2011 Free Software Foundation, Inc. |
764 | # |
765 | # This file is free software; the Free Software Foundation |
766 | # gives unlimited permission to copy and/or distribute it, |
767 | @@ -1535,7 +1565,7 @@ |
768 | [disable], [m4_define([am_maintainer_other], [enable])], |
769 | [m4_define([am_maintainer_other], [enable]) |
770 | m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) |
771 | -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) |
772 | +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
773 | dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
774 | AC_ARG_ENABLE([maintainer-mode], |
775 | [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful |
776 | @@ -1646,12 +1676,15 @@ |
777 | fi |
778 | ]) |
779 | |
780 | -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
781 | +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, |
782 | +# Inc. |
783 | # |
784 | # This file is free software; the Free Software Foundation |
785 | # gives unlimited permission to copy and/or distribute it, |
786 | # with or without modifications, as long as this notice is preserved. |
787 | |
788 | +# serial 1 |
789 | + |
790 | # AM_PROG_MKDIR_P |
791 | # --------------- |
792 | # Check for `mkdir -p'. |
793 | @@ -1674,13 +1707,14 @@ |
794 | |
795 | # Helper functions for option handling. -*- Autoconf -*- |
796 | |
797 | -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. |
798 | +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software |
799 | +# Foundation, Inc. |
800 | # |
801 | # This file is free software; the Free Software Foundation |
802 | # gives unlimited permission to copy and/or distribute it, |
803 | # with or without modifications, as long as this notice is preserved. |
804 | |
805 | -# serial 4 |
806 | +# serial 5 |
807 | |
808 | # _AM_MANGLE_OPTION(NAME) |
809 | # ----------------------- |
810 | @@ -1688,13 +1722,13 @@ |
811 | [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) |
812 | |
813 | # _AM_SET_OPTION(NAME) |
814 | -# ------------------------------ |
815 | +# -------------------- |
816 | # Set option NAME. Presently that only means defining a flag for this option. |
817 | AC_DEFUN([_AM_SET_OPTION], |
818 | [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) |
819 | |
820 | # _AM_SET_OPTIONS(OPTIONS) |
821 | -# ---------------------------------- |
822 | +# ------------------------ |
823 | # OPTIONS is a space-separated list of Automake options. |
824 | AC_DEFUN([_AM_SET_OPTIONS], |
825 | [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) |
826 | @@ -1770,13 +1804,13 @@ |
827 | fi |
828 | AC_MSG_RESULT(yes)]) |
829 | |
830 | -# Copyright (C) 2009 Free Software Foundation, Inc. |
831 | +# Copyright (C) 2009, 2011 Free Software Foundation, Inc. |
832 | # |
833 | # This file is free software; the Free Software Foundation |
834 | # gives unlimited permission to copy and/or distribute it, |
835 | # with or without modifications, as long as this notice is preserved. |
836 | |
837 | -# serial 1 |
838 | +# serial 2 |
839 | |
840 | # AM_SILENT_RULES([DEFAULT]) |
841 | # -------------------------- |
842 | @@ -1791,18 +1825,50 @@ |
843 | no) AM_DEFAULT_VERBOSITY=1;; |
844 | *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; |
845 | esac |
846 | +dnl |
847 | +dnl A few `make' implementations (e.g., NonStop OS and NextStep) |
848 | +dnl do not support nested variable expansions. |
849 | +dnl See automake bug#9928 and bug#10237. |
850 | +am_make=${MAKE-make} |
851 | +AC_CACHE_CHECK([whether $am_make supports nested variables], |
852 | + [am_cv_make_support_nested_variables], |
853 | + [if AS_ECHO([['TRUE=$(BAR$(V)) |
854 | +BAR0=false |
855 | +BAR1=true |
856 | +V=1 |
857 | +am__doit: |
858 | + @$(TRUE) |
859 | +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then |
860 | + am_cv_make_support_nested_variables=yes |
861 | +else |
862 | + am_cv_make_support_nested_variables=no |
863 | +fi]) |
864 | +if test $am_cv_make_support_nested_variables = yes; then |
865 | + dnl Using `$V' instead of `$(V)' breaks IRIX make. |
866 | + AM_V='$(V)' |
867 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
868 | +else |
869 | + AM_V=$AM_DEFAULT_VERBOSITY |
870 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
871 | +fi |
872 | +AC_SUBST([AM_V])dnl |
873 | +AM_SUBST_NOTMAKE([AM_V])dnl |
874 | +AC_SUBST([AM_DEFAULT_V])dnl |
875 | +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl |
876 | AC_SUBST([AM_DEFAULT_VERBOSITY])dnl |
877 | AM_BACKSLASH='\' |
878 | AC_SUBST([AM_BACKSLASH])dnl |
879 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
880 | ]) |
881 | |
882 | -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. |
883 | +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. |
884 | # |
885 | # This file is free software; the Free Software Foundation |
886 | # gives unlimited permission to copy and/or distribute it, |
887 | # with or without modifications, as long as this notice is preserved. |
888 | |
889 | +# serial 1 |
890 | + |
891 | # AM_PROG_INSTALL_STRIP |
892 | # --------------------- |
893 | # One issue with vendor `install' (even GNU) is that you can't |
894 | @@ -1825,13 +1891,13 @@ |
895 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
896 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
897 | |
898 | -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. |
899 | +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. |
900 | # |
901 | # This file is free software; the Free Software Foundation |
902 | # gives unlimited permission to copy and/or distribute it, |
903 | # with or without modifications, as long as this notice is preserved. |
904 | |
905 | -# serial 2 |
906 | +# serial 3 |
907 | |
908 | # _AM_SUBST_NOTMAKE(VARIABLE) |
909 | # --------------------------- |
910 | @@ -1840,13 +1906,13 @@ |
911 | AC_DEFUN([_AM_SUBST_NOTMAKE]) |
912 | |
913 | # AM_SUBST_NOTMAKE(VARIABLE) |
914 | -# --------------------------- |
915 | +# -------------------------- |
916 | # Public sister of _AM_SUBST_NOTMAKE. |
917 | AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
918 | |
919 | # Check how to create a tarball. -*- Autoconf -*- |
920 | |
921 | -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. |
922 | +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. |
923 | # |
924 | # This file is free software; the Free Software Foundation |
925 | # gives unlimited permission to copy and/or distribute it, |
926 | @@ -1868,10 +1934,11 @@ |
927 | # a tarball read from stdin. |
928 | # $(am__untar) < result.tar |
929 | AC_DEFUN([_AM_PROG_TAR], |
930 | -[# Always define AMTAR for backward compatibility. |
931 | -AM_MISSING_PROG([AMTAR], [tar]) |
932 | +[# Always define AMTAR for backward compatibility. Yes, it's still used |
933 | +# in the wild :-( We should find a proper way to deprecate it ... |
934 | +AC_SUBST([AMTAR], ['$${TAR-tar}']) |
935 | m4_if([$1], [v7], |
936 | - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], |
937 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
938 | [m4_case([$1], [ustar],, [pax],, |
939 | [m4_fatal([Unknown tar format])]) |
940 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
941 | |
942 | === modified file 'configure' |
943 | --- configure 2010-10-21 21:22:52 +0000 |
944 | +++ configure 2012-09-13 14:46:32 +0000 |
945 | @@ -1,19 +1,17 @@ |
946 | #! /bin/sh |
947 | # Guess values for system-dependent variables and create Makefiles. |
948 | -# Generated by GNU Autoconf 2.67 for ubuntu-geoip 0.0.2. |
949 | +# Generated by GNU Autoconf 2.69 for ubuntu-geoip 1.0.0. |
950 | # |
951 | # Report bugs to <ted@canonical.com>. |
952 | # |
953 | # |
954 | -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
955 | -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
956 | -# Foundation, Inc. |
957 | +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
958 | # |
959 | # |
960 | # This configure script is free software; the Free Software Foundation |
961 | # gives unlimited permission to copy, distribute and modify it. |
962 | # |
963 | -# Copyright 2010 Canonical |
964 | +# Copyright 2010-2012 Canonical |
965 | ## -------------------- ## |
966 | ## M4sh Initialization. ## |
967 | ## -------------------- ## |
968 | @@ -93,6 +91,7 @@ |
969 | IFS=" "" $as_nl" |
970 | |
971 | # Find who we are. Look in the path if we contain no directory separator. |
972 | +as_myself= |
973 | case $0 in #(( |
974 | *[\\/]* ) as_myself=$0 ;; |
975 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
976 | @@ -137,6 +136,31 @@ |
977 | # CDPATH. |
978 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
979 | |
980 | +# Use a proper internal environment variable to ensure we don't fall |
981 | + # into an infinite loop, continuously re-executing ourselves. |
982 | + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then |
983 | + _as_can_reexec=no; export _as_can_reexec; |
984 | + # We cannot yet assume a decent shell, so we have to provide a |
985 | +# neutralization value for shells without unset; and this also |
986 | +# works around shells that cannot unset nonexistent variables. |
987 | +# Preserve -v and -x to the replacement shell. |
988 | +BASH_ENV=/dev/null |
989 | +ENV=/dev/null |
990 | +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
991 | +case $- in # (((( |
992 | + *v*x* | *x*v* ) as_opts=-vx ;; |
993 | + *v* ) as_opts=-v ;; |
994 | + *x* ) as_opts=-x ;; |
995 | + * ) as_opts= ;; |
996 | +esac |
997 | +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
998 | +# Admittedly, this is quite paranoid, since all the known shells bail |
999 | +# out after a failed `exec'. |
1000 | +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
1001 | +as_fn_exit 255 |
1002 | + fi |
1003 | + # We don't want this to propagate to other subprocesses. |
1004 | + { _as_can_reexec=; unset _as_can_reexec;} |
1005 | if test "x$CONFIG_SHELL" = x; then |
1006 | as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : |
1007 | emulate sh |
1008 | @@ -170,7 +194,8 @@ |
1009 | else |
1010 | exitcode=1; echo positional parameters were not saved. |
1011 | fi |
1012 | -test x\$exitcode = x0 || exit 1" |
1013 | +test x\$exitcode = x0 || exit 1 |
1014 | +test -x / || exit 1" |
1015 | as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO |
1016 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
1017 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
1018 | @@ -215,14 +240,25 @@ |
1019 | |
1020 | |
1021 | if test "x$CONFIG_SHELL" != x; then : |
1022 | - # We cannot yet assume a decent shell, so we have to provide a |
1023 | - # neutralization value for shells without unset; and this also |
1024 | - # works around shells that cannot unset nonexistent variables. |
1025 | - BASH_ENV=/dev/null |
1026 | - ENV=/dev/null |
1027 | - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
1028 | - export CONFIG_SHELL |
1029 | - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} |
1030 | + export CONFIG_SHELL |
1031 | + # We cannot yet assume a decent shell, so we have to provide a |
1032 | +# neutralization value for shells without unset; and this also |
1033 | +# works around shells that cannot unset nonexistent variables. |
1034 | +# Preserve -v and -x to the replacement shell. |
1035 | +BASH_ENV=/dev/null |
1036 | +ENV=/dev/null |
1037 | +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV |
1038 | +case $- in # (((( |
1039 | + *v*x* | *x*v* ) as_opts=-vx ;; |
1040 | + *v* ) as_opts=-v ;; |
1041 | + *x* ) as_opts=-x ;; |
1042 | + * ) as_opts= ;; |
1043 | +esac |
1044 | +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} |
1045 | +# Admittedly, this is quite paranoid, since all the known shells bail |
1046 | +# out after a failed `exec'. |
1047 | +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 |
1048 | +exit 255 |
1049 | fi |
1050 | |
1051 | if test x$as_have_required = xno; then : |
1052 | @@ -325,6 +361,14 @@ |
1053 | |
1054 | |
1055 | } # as_fn_mkdir_p |
1056 | + |
1057 | +# as_fn_executable_p FILE |
1058 | +# ----------------------- |
1059 | +# Test if FILE is an executable regular file. |
1060 | +as_fn_executable_p () |
1061 | +{ |
1062 | + test -f "$1" && test -x "$1" |
1063 | +} # as_fn_executable_p |
1064 | # as_fn_append VAR VALUE |
1065 | # ---------------------- |
1066 | # Append the text in VALUE to the end of the definition contained in VAR. Take |
1067 | @@ -446,6 +490,10 @@ |
1068 | chmod +x "$as_me.lineno" || |
1069 | { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } |
1070 | |
1071 | + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have |
1072 | + # already done that, so ensure we don't try to do so again and fall |
1073 | + # in an infinite loop. This has already happened in practice. |
1074 | + _as_can_reexec=no; export _as_can_reexec |
1075 | # Don't try to exec as it changes $[0], causing all sort of problems |
1076 | # (the dirname of $[0] is not the place where we might find the |
1077 | # original and so on. Autoconf is especially sensitive to this). |
1078 | @@ -480,16 +528,16 @@ |
1079 | # ... but there are two gotchas: |
1080 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
1081 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
1082 | - # In both cases, we have to default to `cp -p'. |
1083 | + # In both cases, we have to default to `cp -pR'. |
1084 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
1085 | - as_ln_s='cp -p' |
1086 | + as_ln_s='cp -pR' |
1087 | elif ln conf$$.file conf$$ 2>/dev/null; then |
1088 | as_ln_s=ln |
1089 | else |
1090 | - as_ln_s='cp -p' |
1091 | + as_ln_s='cp -pR' |
1092 | fi |
1093 | else |
1094 | - as_ln_s='cp -p' |
1095 | + as_ln_s='cp -pR' |
1096 | fi |
1097 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
1098 | rmdir conf$$.dir 2>/dev/null |
1099 | @@ -501,28 +549,8 @@ |
1100 | as_mkdir_p=false |
1101 | fi |
1102 | |
1103 | -if test -x / >/dev/null 2>&1; then |
1104 | - as_test_x='test -x' |
1105 | -else |
1106 | - if ls -dL / >/dev/null 2>&1; then |
1107 | - as_ls_L_option=L |
1108 | - else |
1109 | - as_ls_L_option= |
1110 | - fi |
1111 | - as_test_x=' |
1112 | - eval sh -c '\'' |
1113 | - if test -d "$1"; then |
1114 | - test -d "$1/."; |
1115 | - else |
1116 | - case $1 in #( |
1117 | - -*)set "./$1";; |
1118 | - esac; |
1119 | - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
1120 | - ???[sx]*):;;*)false;;esac;fi |
1121 | - '\'' sh |
1122 | - ' |
1123 | -fi |
1124 | -as_executable_p=$as_test_x |
1125 | +as_test_x='test -x' |
1126 | +as_executable_p=as_fn_executable_p |
1127 | |
1128 | # Sed expression to map a string onto a valid CPP name. |
1129 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
1130 | @@ -554,8 +582,8 @@ |
1131 | # Identity of this package. |
1132 | PACKAGE_NAME='ubuntu-geoip' |
1133 | PACKAGE_TARNAME='ubuntu-geoip' |
1134 | -PACKAGE_VERSION='0.0.2' |
1135 | -PACKAGE_STRING='ubuntu-geoip 0.0.2' |
1136 | +PACKAGE_VERSION='1.0.0' |
1137 | +PACKAGE_STRING='ubuntu-geoip 1.0.0' |
1138 | PACKAGE_BUGREPORT='ted@canonical.com' |
1139 | PACKAGE_URL='' |
1140 | |
1141 | @@ -626,11 +654,13 @@ |
1142 | PKG_CONFIG_PATH |
1143 | PKG_CONFIG |
1144 | AM_BACKSLASH |
1145 | -AM_DEFAULT_VERBOSITY |
1146 | +AM_DEFAULT_V |
1147 | +AM_V |
1148 | DATADIRNAME |
1149 | am__fastdepCC_FALSE |
1150 | am__fastdepCC_TRUE |
1151 | CCDEPMODE |
1152 | +am__nodep |
1153 | AMDEPBACKSLASH |
1154 | AMDEP_FALSE |
1155 | AMDEP_TRUE |
1156 | @@ -669,6 +699,13 @@ |
1157 | INTLTOOL_KEYS_RULE |
1158 | INTLTOOL_DIRECTORY_RULE |
1159 | INTLTOOL_DESKTOP_RULE |
1160 | +intltool__v_merge_options_0 |
1161 | +intltool__v_merge_options_ |
1162 | +INTLTOOL_V_MERGE_OPTIONS |
1163 | +INTLTOOL__v_MERGE_0 |
1164 | +INTLTOOL__v_MERGE_ |
1165 | +INTLTOOL_V_MERGE |
1166 | +AM_DEFAULT_VERBOSITY |
1167 | INTLTOOL_EXTRACT |
1168 | INTLTOOL_MERGE |
1169 | INTLTOOL_UPDATE |
1170 | @@ -1165,7 +1202,7 @@ |
1171 | $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 |
1172 | expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && |
1173 | $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 |
1174 | - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} |
1175 | + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" |
1176 | ;; |
1177 | |
1178 | esac |
1179 | @@ -1216,8 +1253,6 @@ |
1180 | if test "x$host_alias" != x; then |
1181 | if test "x$build_alias" = x; then |
1182 | cross_compiling=maybe |
1183 | - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
1184 | - If a cross compiler is detected then cross compile mode will be used" >&2 |
1185 | elif test "x$build_alias" != "x$host_alias"; then |
1186 | cross_compiling=yes |
1187 | fi |
1188 | @@ -1303,7 +1338,7 @@ |
1189 | # Omit some internal or obsolete options to make the list less imposing. |
1190 | # This message is too long to be a string in the A/UX 3.1 sh. |
1191 | cat <<_ACEOF |
1192 | -\`configure' configures ubuntu-geoip 0.0.2 to adapt to many kinds of systems. |
1193 | +\`configure' configures ubuntu-geoip 1.0.0 to adapt to many kinds of systems. |
1194 | |
1195 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1196 | |
1197 | @@ -1369,7 +1404,7 @@ |
1198 | |
1199 | if test -n "$ac_init_help"; then |
1200 | case $ac_init_help in |
1201 | - short | recursive ) echo "Configuration of ubuntu-geoip 0.0.2:";; |
1202 | + short | recursive ) echo "Configuration of ubuntu-geoip 1.0.0:";; |
1203 | esac |
1204 | cat <<\_ACEOF |
1205 | |
1206 | @@ -1474,14 +1509,14 @@ |
1207 | test -n "$ac_init_help" && exit $ac_status |
1208 | if $ac_init_version; then |
1209 | cat <<\_ACEOF |
1210 | -ubuntu-geoip configure 0.0.2 |
1211 | -generated by GNU Autoconf 2.67 |
1212 | +ubuntu-geoip configure 1.0.0 |
1213 | +generated by GNU Autoconf 2.69 |
1214 | |
1215 | -Copyright (C) 2010 Free Software Foundation, Inc. |
1216 | +Copyright (C) 2012 Free Software Foundation, Inc. |
1217 | This configure script is free software; the Free Software Foundation |
1218 | gives unlimited permission to copy, distribute and modify it. |
1219 | |
1220 | -Copyright 2010 Canonical |
1221 | +Copyright 2010-2012 Canonical |
1222 | _ACEOF |
1223 | exit |
1224 | fi |
1225 | @@ -1523,7 +1558,7 @@ |
1226 | |
1227 | ac_retval=1 |
1228 | fi |
1229 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1230 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1231 | as_fn_set_status $ac_retval |
1232 | |
1233 | } # ac_fn_c_try_compile |
1234 | @@ -1555,7 +1590,7 @@ |
1235 | test ! -s conftest.err |
1236 | } && test -s conftest$ac_exeext && { |
1237 | test "$cross_compiling" = yes || |
1238 | - $as_test_x conftest$ac_exeext |
1239 | + test -x conftest$ac_exeext |
1240 | }; then : |
1241 | ac_retval=0 |
1242 | else |
1243 | @@ -1569,7 +1604,7 @@ |
1244 | # interfere with the next link command; also delete a directory that is |
1245 | # left behind by Apple's compiler. We do this before executing the actions. |
1246 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
1247 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1248 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1249 | as_fn_set_status $ac_retval |
1250 | |
1251 | } # ac_fn_c_try_link |
1252 | @@ -1582,7 +1617,7 @@ |
1253 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1254 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1255 | $as_echo_n "checking for $2... " >&6; } |
1256 | -if eval "test \"\${$3+set}\"" = set; then : |
1257 | +if eval \${$3+:} false; then : |
1258 | $as_echo_n "(cached) " >&6 |
1259 | else |
1260 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1261 | @@ -1637,7 +1672,7 @@ |
1262 | eval ac_res=\$$3 |
1263 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1264 | $as_echo "$ac_res" >&6; } |
1265 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1266 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1267 | |
1268 | } # ac_fn_c_check_func |
1269 | |
1270 | @@ -1673,7 +1708,7 @@ |
1271 | |
1272 | ac_retval=1 |
1273 | fi |
1274 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1275 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1276 | as_fn_set_status $ac_retval |
1277 | |
1278 | } # ac_fn_c_try_cpp |
1279 | @@ -1715,7 +1750,7 @@ |
1280 | ac_retval=$ac_status |
1281 | fi |
1282 | rm -rf conftest.dSYM conftest_ipa8_conftest.oo |
1283 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1284 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1285 | as_fn_set_status $ac_retval |
1286 | |
1287 | } # ac_fn_c_try_run |
1288 | @@ -1728,10 +1763,10 @@ |
1289 | ac_fn_c_check_header_mongrel () |
1290 | { |
1291 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1292 | - if eval "test \"\${$3+set}\"" = set; then : |
1293 | + if eval \${$3+:} false; then : |
1294 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1295 | $as_echo_n "checking for $2... " >&6; } |
1296 | -if eval "test \"\${$3+set}\"" = set; then : |
1297 | +if eval \${$3+:} false; then : |
1298 | $as_echo_n "(cached) " >&6 |
1299 | fi |
1300 | eval ac_res=\$$3 |
1301 | @@ -1798,7 +1833,7 @@ |
1302 | esac |
1303 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1304 | $as_echo_n "checking for $2... " >&6; } |
1305 | -if eval "test \"\${$3+set}\"" = set; then : |
1306 | +if eval \${$3+:} false; then : |
1307 | $as_echo_n "(cached) " >&6 |
1308 | else |
1309 | eval "$3=\$ac_header_compiler" |
1310 | @@ -1807,7 +1842,7 @@ |
1311 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1312 | $as_echo "$ac_res" >&6; } |
1313 | fi |
1314 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1315 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1316 | |
1317 | } # ac_fn_c_check_header_mongrel |
1318 | |
1319 | @@ -1820,7 +1855,7 @@ |
1320 | as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1321 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
1322 | $as_echo_n "checking for $2... " >&6; } |
1323 | -if eval "test \"\${$3+set}\"" = set; then : |
1324 | +if eval \${$3+:} false; then : |
1325 | $as_echo_n "(cached) " >&6 |
1326 | else |
1327 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1328 | @@ -1838,15 +1873,15 @@ |
1329 | eval ac_res=\$$3 |
1330 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
1331 | $as_echo "$ac_res" >&6; } |
1332 | - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} |
1333 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1334 | |
1335 | } # ac_fn_c_check_header_compile |
1336 | cat >config.log <<_ACEOF |
1337 | This file contains any messages produced by compilers while |
1338 | running configure, to aid debugging if configure makes a mistake. |
1339 | |
1340 | -It was created by ubuntu-geoip $as_me 0.0.2, which was |
1341 | -generated by GNU Autoconf 2.67. Invocation command line was |
1342 | +It was created by ubuntu-geoip $as_me 1.0.0, which was |
1343 | +generated by GNU Autoconf 2.69. Invocation command line was |
1344 | |
1345 | $ $0 $@ |
1346 | |
1347 | @@ -2104,7 +2139,7 @@ |
1348 | || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1349 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1350 | as_fn_error $? "failed to load site script $ac_site_file |
1351 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1352 | +See \`config.log' for more details" "$LINENO" 5; } |
1353 | fi |
1354 | done |
1355 | |
1356 | @@ -2247,7 +2282,7 @@ |
1357 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 |
1358 | $as_echo_n "checking for a BSD-compatible install... " >&6; } |
1359 | if test -z "$INSTALL"; then |
1360 | -if test "${ac_cv_path_install+set}" = set; then : |
1361 | +if ${ac_cv_path_install+:} false; then : |
1362 | $as_echo_n "(cached) " >&6 |
1363 | else |
1364 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1365 | @@ -2267,7 +2302,7 @@ |
1366 | # by default. |
1367 | for ac_prog in ginstall scoinst install; do |
1368 | for ac_exec_ext in '' $ac_executable_extensions; do |
1369 | - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then |
1370 | + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then |
1371 | if test $ac_prog = install && |
1372 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
1373 | # AIX install. It has an incompatible calling convention. |
1374 | @@ -2334,11 +2369,11 @@ |
1375 | ' |
1376 | case `pwd` in |
1377 | *[\\\"\#\$\&\'\`$am_lf]*) |
1378 | - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; |
1379 | + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; |
1380 | esac |
1381 | case $srcdir in |
1382 | *[\\\"\#\$\&\'\`$am_lf\ \ ]*) |
1383 | - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; |
1384 | + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; |
1385 | esac |
1386 | |
1387 | # Do `set' in a subshell so we don't clobber the current shell's |
1388 | @@ -2424,7 +2459,7 @@ |
1389 | set dummy ${ac_tool_prefix}strip; ac_word=$2 |
1390 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1391 | $as_echo_n "checking for $ac_word... " >&6; } |
1392 | -if test "${ac_cv_prog_STRIP+set}" = set; then : |
1393 | +if ${ac_cv_prog_STRIP+:} false; then : |
1394 | $as_echo_n "(cached) " >&6 |
1395 | else |
1396 | if test -n "$STRIP"; then |
1397 | @@ -2436,7 +2471,7 @@ |
1398 | IFS=$as_save_IFS |
1399 | test -z "$as_dir" && as_dir=. |
1400 | for ac_exec_ext in '' $ac_executable_extensions; do |
1401 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1402 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1403 | ac_cv_prog_STRIP="${ac_tool_prefix}strip" |
1404 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1405 | break 2 |
1406 | @@ -2464,7 +2499,7 @@ |
1407 | set dummy strip; ac_word=$2 |
1408 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1409 | $as_echo_n "checking for $ac_word... " >&6; } |
1410 | -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : |
1411 | +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : |
1412 | $as_echo_n "(cached) " >&6 |
1413 | else |
1414 | if test -n "$ac_ct_STRIP"; then |
1415 | @@ -2476,7 +2511,7 @@ |
1416 | IFS=$as_save_IFS |
1417 | test -z "$as_dir" && as_dir=. |
1418 | for ac_exec_ext in '' $ac_executable_extensions; do |
1419 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1420 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1421 | ac_cv_prog_ac_ct_STRIP="strip" |
1422 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1423 | break 2 |
1424 | @@ -2517,7 +2552,7 @@ |
1425 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 |
1426 | $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } |
1427 | if test -z "$MKDIR_P"; then |
1428 | - if test "${ac_cv_path_mkdir+set}" = set; then : |
1429 | + if ${ac_cv_path_mkdir+:} false; then : |
1430 | $as_echo_n "(cached) " >&6 |
1431 | else |
1432 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1433 | @@ -2527,7 +2562,7 @@ |
1434 | test -z "$as_dir" && as_dir=. |
1435 | for ac_prog in mkdir gmkdir; do |
1436 | for ac_exec_ext in '' $ac_executable_extensions; do |
1437 | - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue |
1438 | + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue |
1439 | case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( |
1440 | 'mkdir (GNU coreutils) '* | \ |
1441 | 'mkdir (coreutils) '* | \ |
1442 | @@ -2568,7 +2603,7 @@ |
1443 | set dummy $ac_prog; ac_word=$2 |
1444 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1445 | $as_echo_n "checking for $ac_word... " >&6; } |
1446 | -if test "${ac_cv_prog_AWK+set}" = set; then : |
1447 | +if ${ac_cv_prog_AWK+:} false; then : |
1448 | $as_echo_n "(cached) " >&6 |
1449 | else |
1450 | if test -n "$AWK"; then |
1451 | @@ -2580,7 +2615,7 @@ |
1452 | IFS=$as_save_IFS |
1453 | test -z "$as_dir" && as_dir=. |
1454 | for ac_exec_ext in '' $ac_executable_extensions; do |
1455 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1456 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1457 | ac_cv_prog_AWK="$ac_prog" |
1458 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1459 | break 2 |
1460 | @@ -2608,7 +2643,7 @@ |
1461 | $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } |
1462 | set x ${MAKE-make} |
1463 | ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` |
1464 | -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : |
1465 | +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : |
1466 | $as_echo_n "(cached) " >&6 |
1467 | else |
1468 | cat >conftest.make <<\_ACEOF |
1469 | @@ -2666,7 +2701,7 @@ |
1470 | |
1471 | # Define the identity of the package. |
1472 | PACKAGE=ubuntu-geoip |
1473 | - VERSION=0.0.2 |
1474 | + VERSION=1.0.0 |
1475 | |
1476 | |
1477 | cat >>confdefs.h <<_ACEOF |
1478 | @@ -2696,11 +2731,11 @@ |
1479 | |
1480 | # We need awk for the "check" target. The system "awk" is bad on |
1481 | # some platforms. |
1482 | -# Always define AMTAR for backward compatibility. |
1483 | - |
1484 | -AMTAR=${AMTAR-"${am_missing_run}tar"} |
1485 | - |
1486 | -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' |
1487 | +# Always define AMTAR for backward compatibility. Yes, it's still used |
1488 | +# in the wild :-( We should find a proper way to deprecate it ... |
1489 | +AMTAR='$${TAR-tar}' |
1490 | + |
1491 | +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' |
1492 | |
1493 | |
1494 | |
1495 | @@ -2797,6 +2832,7 @@ |
1496 | if test "x$enable_dependency_tracking" != xno; then |
1497 | am_depcomp="$ac_aux_dir/depcomp" |
1498 | AMDEPBACKSLASH='\' |
1499 | + am__nodep='_no' |
1500 | fi |
1501 | if test "x$enable_dependency_tracking" != xno; then |
1502 | AMDEP_TRUE= |
1503 | @@ -2817,7 +2853,7 @@ |
1504 | set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
1505 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1506 | $as_echo_n "checking for $ac_word... " >&6; } |
1507 | -if test "${ac_cv_prog_CC+set}" = set; then : |
1508 | +if ${ac_cv_prog_CC+:} false; then : |
1509 | $as_echo_n "(cached) " >&6 |
1510 | else |
1511 | if test -n "$CC"; then |
1512 | @@ -2829,7 +2865,7 @@ |
1513 | IFS=$as_save_IFS |
1514 | test -z "$as_dir" && as_dir=. |
1515 | for ac_exec_ext in '' $ac_executable_extensions; do |
1516 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1517 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1518 | ac_cv_prog_CC="${ac_tool_prefix}gcc" |
1519 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1520 | break 2 |
1521 | @@ -2857,7 +2893,7 @@ |
1522 | set dummy gcc; ac_word=$2 |
1523 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1524 | $as_echo_n "checking for $ac_word... " >&6; } |
1525 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
1526 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
1527 | $as_echo_n "(cached) " >&6 |
1528 | else |
1529 | if test -n "$ac_ct_CC"; then |
1530 | @@ -2869,7 +2905,7 @@ |
1531 | IFS=$as_save_IFS |
1532 | test -z "$as_dir" && as_dir=. |
1533 | for ac_exec_ext in '' $ac_executable_extensions; do |
1534 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1535 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1536 | ac_cv_prog_ac_ct_CC="gcc" |
1537 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1538 | break 2 |
1539 | @@ -2910,7 +2946,7 @@ |
1540 | set dummy ${ac_tool_prefix}cc; ac_word=$2 |
1541 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1542 | $as_echo_n "checking for $ac_word... " >&6; } |
1543 | -if test "${ac_cv_prog_CC+set}" = set; then : |
1544 | +if ${ac_cv_prog_CC+:} false; then : |
1545 | $as_echo_n "(cached) " >&6 |
1546 | else |
1547 | if test -n "$CC"; then |
1548 | @@ -2922,7 +2958,7 @@ |
1549 | IFS=$as_save_IFS |
1550 | test -z "$as_dir" && as_dir=. |
1551 | for ac_exec_ext in '' $ac_executable_extensions; do |
1552 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1553 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1554 | ac_cv_prog_CC="${ac_tool_prefix}cc" |
1555 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1556 | break 2 |
1557 | @@ -2950,7 +2986,7 @@ |
1558 | set dummy cc; ac_word=$2 |
1559 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1560 | $as_echo_n "checking for $ac_word... " >&6; } |
1561 | -if test "${ac_cv_prog_CC+set}" = set; then : |
1562 | +if ${ac_cv_prog_CC+:} false; then : |
1563 | $as_echo_n "(cached) " >&6 |
1564 | else |
1565 | if test -n "$CC"; then |
1566 | @@ -2963,7 +2999,7 @@ |
1567 | IFS=$as_save_IFS |
1568 | test -z "$as_dir" && as_dir=. |
1569 | for ac_exec_ext in '' $ac_executable_extensions; do |
1570 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1571 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1572 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
1573 | ac_prog_rejected=yes |
1574 | continue |
1575 | @@ -3009,7 +3045,7 @@ |
1576 | set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
1577 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1578 | $as_echo_n "checking for $ac_word... " >&6; } |
1579 | -if test "${ac_cv_prog_CC+set}" = set; then : |
1580 | +if ${ac_cv_prog_CC+:} false; then : |
1581 | $as_echo_n "(cached) " >&6 |
1582 | else |
1583 | if test -n "$CC"; then |
1584 | @@ -3021,7 +3057,7 @@ |
1585 | IFS=$as_save_IFS |
1586 | test -z "$as_dir" && as_dir=. |
1587 | for ac_exec_ext in '' $ac_executable_extensions; do |
1588 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1589 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1590 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
1591 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1592 | break 2 |
1593 | @@ -3053,7 +3089,7 @@ |
1594 | set dummy $ac_prog; ac_word=$2 |
1595 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1596 | $as_echo_n "checking for $ac_word... " >&6; } |
1597 | -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : |
1598 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
1599 | $as_echo_n "(cached) " >&6 |
1600 | else |
1601 | if test -n "$ac_ct_CC"; then |
1602 | @@ -3065,7 +3101,7 @@ |
1603 | IFS=$as_save_IFS |
1604 | test -z "$as_dir" && as_dir=. |
1605 | for ac_exec_ext in '' $ac_executable_extensions; do |
1606 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1607 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1608 | ac_cv_prog_ac_ct_CC="$ac_prog" |
1609 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1610 | break 2 |
1611 | @@ -3108,7 +3144,7 @@ |
1612 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1613 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1614 | as_fn_error $? "no acceptable C compiler found in \$PATH |
1615 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1616 | +See \`config.log' for more details" "$LINENO" 5; } |
1617 | |
1618 | # Provide some information about the compiler. |
1619 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
1620 | @@ -3223,7 +3259,7 @@ |
1621 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1622 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1623 | as_fn_error 77 "C compiler cannot create executables |
1624 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1625 | +See \`config.log' for more details" "$LINENO" 5; } |
1626 | else |
1627 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
1628 | $as_echo "yes" >&6; } |
1629 | @@ -3266,7 +3302,7 @@ |
1630 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1631 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1632 | as_fn_error $? "cannot compute suffix of executables: cannot compile and link |
1633 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1634 | +See \`config.log' for more details" "$LINENO" 5; } |
1635 | fi |
1636 | rm -f conftest conftest$ac_cv_exeext |
1637 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
1638 | @@ -3325,7 +3361,7 @@ |
1639 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1640 | as_fn_error $? "cannot run C compiled programs. |
1641 | If you meant to cross compile, use \`--host'. |
1642 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1643 | +See \`config.log' for more details" "$LINENO" 5; } |
1644 | fi |
1645 | fi |
1646 | fi |
1647 | @@ -3336,7 +3372,7 @@ |
1648 | ac_clean_files=$ac_clean_files_save |
1649 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 |
1650 | $as_echo_n "checking for suffix of object files... " >&6; } |
1651 | -if test "${ac_cv_objext+set}" = set; then : |
1652 | +if ${ac_cv_objext+:} false; then : |
1653 | $as_echo_n "(cached) " >&6 |
1654 | else |
1655 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1656 | @@ -3377,7 +3413,7 @@ |
1657 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1658 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1659 | as_fn_error $? "cannot compute suffix of object files: cannot compile |
1660 | -See \`config.log' for more details" "$LINENO" 5 ; } |
1661 | +See \`config.log' for more details" "$LINENO" 5; } |
1662 | fi |
1663 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
1664 | fi |
1665 | @@ -3387,7 +3423,7 @@ |
1666 | ac_objext=$OBJEXT |
1667 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
1668 | $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
1669 | -if test "${ac_cv_c_compiler_gnu+set}" = set; then : |
1670 | +if ${ac_cv_c_compiler_gnu+:} false; then : |
1671 | $as_echo_n "(cached) " >&6 |
1672 | else |
1673 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1674 | @@ -3424,7 +3460,7 @@ |
1675 | ac_save_CFLAGS=$CFLAGS |
1676 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
1677 | $as_echo_n "checking whether $CC accepts -g... " >&6; } |
1678 | -if test "${ac_cv_prog_cc_g+set}" = set; then : |
1679 | +if ${ac_cv_prog_cc_g+:} false; then : |
1680 | $as_echo_n "(cached) " >&6 |
1681 | else |
1682 | ac_save_c_werror_flag=$ac_c_werror_flag |
1683 | @@ -3502,7 +3538,7 @@ |
1684 | fi |
1685 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
1686 | $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
1687 | -if test "${ac_cv_prog_cc_c89+set}" = set; then : |
1688 | +if ${ac_cv_prog_cc_c89+:} false; then : |
1689 | $as_echo_n "(cached) " >&6 |
1690 | else |
1691 | ac_cv_prog_cc_c89=no |
1692 | @@ -3511,8 +3547,7 @@ |
1693 | /* end confdefs.h. */ |
1694 | #include <stdarg.h> |
1695 | #include <stdio.h> |
1696 | -#include <sys/types.h> |
1697 | -#include <sys/stat.h> |
1698 | +struct stat; |
1699 | /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ |
1700 | struct buf { int x; }; |
1701 | FILE * (*rcsopen) (struct buf *, struct stat *, int); |
1702 | @@ -3601,7 +3636,7 @@ |
1703 | |
1704 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
1705 | $as_echo_n "checking dependency style of $depcc... " >&6; } |
1706 | -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : |
1707 | +if ${am_cv_CC_dependencies_compiler_type+:} false; then : |
1708 | $as_echo_n "(cached) " >&6 |
1709 | else |
1710 | if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
1711 | @@ -3610,6 +3645,7 @@ |
1712 | # instance it was reported that on HP-UX the gcc test will end up |
1713 | # making a dummy file named `D' -- because `-MD' means `put the output |
1714 | # in D'. |
1715 | + rm -rf conftest.dir |
1716 | mkdir conftest.dir |
1717 | # Copy depcomp to subdir because otherwise we won't find it if we're |
1718 | # using a relative directory. |
1719 | @@ -3669,7 +3705,7 @@ |
1720 | break |
1721 | fi |
1722 | ;; |
1723 | - msvisualcpp | msvcmsys) |
1724 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
1725 | # This compiler won't grok `-c -o', but also, the minuso test has |
1726 | # not run yet. These depmodes are late enough in the game, and |
1727 | # so weak that their functioning should not be impacted. |
1728 | @@ -3735,14 +3771,12 @@ |
1729 | ;; |
1730 | esac |
1731 | |
1732 | +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
1733 | +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` |
1734 | +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
1735 | if test -n "0.35.0"; then |
1736 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 |
1737 | $as_echo_n "checking for intltool >= 0.35.0... " >&6; } |
1738 | - |
1739 | - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
1740 | - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` |
1741 | - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
1742 | - |
1743 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 |
1744 | $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } |
1745 | test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || |
1746 | @@ -3753,7 +3787,7 @@ |
1747 | set dummy intltool-update; ac_word=$2 |
1748 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1749 | $as_echo_n "checking for $ac_word... " >&6; } |
1750 | -if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : |
1751 | +if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : |
1752 | $as_echo_n "(cached) " >&6 |
1753 | else |
1754 | case $INTLTOOL_UPDATE in |
1755 | @@ -3767,7 +3801,7 @@ |
1756 | IFS=$as_save_IFS |
1757 | test -z "$as_dir" && as_dir=. |
1758 | for ac_exec_ext in '' $ac_executable_extensions; do |
1759 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1760 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1761 | ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" |
1762 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1763 | break 2 |
1764 | @@ -3793,7 +3827,7 @@ |
1765 | set dummy intltool-merge; ac_word=$2 |
1766 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1767 | $as_echo_n "checking for $ac_word... " >&6; } |
1768 | -if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : |
1769 | +if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : |
1770 | $as_echo_n "(cached) " >&6 |
1771 | else |
1772 | case $INTLTOOL_MERGE in |
1773 | @@ -3807,7 +3841,7 @@ |
1774 | IFS=$as_save_IFS |
1775 | test -z "$as_dir" && as_dir=. |
1776 | for ac_exec_ext in '' $ac_executable_extensions; do |
1777 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1778 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1779 | ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" |
1780 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1781 | break 2 |
1782 | @@ -3833,7 +3867,7 @@ |
1783 | set dummy intltool-extract; ac_word=$2 |
1784 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1785 | $as_echo_n "checking for $ac_word... " >&6; } |
1786 | -if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : |
1787 | +if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : |
1788 | $as_echo_n "(cached) " >&6 |
1789 | else |
1790 | case $INTLTOOL_EXTRACT in |
1791 | @@ -3847,7 +3881,7 @@ |
1792 | IFS=$as_save_IFS |
1793 | test -z "$as_dir" && as_dir=. |
1794 | for ac_exec_ext in '' $ac_executable_extensions; do |
1795 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1796 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1797 | ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" |
1798 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1799 | break 2 |
1800 | @@ -3873,25 +3907,48 @@ |
1801 | as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 |
1802 | fi |
1803 | |
1804 | - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1805 | -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1806 | - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1807 | - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1808 | - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' |
1809 | - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1810 | - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1811 | - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1812 | -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1813 | - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1814 | - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1815 | - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' |
1816 | - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1817 | - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1818 | - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1819 | - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1820 | - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1821 | - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1822 | - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1823 | +if test -z "$AM_DEFAULT_VERBOSITY"; then |
1824 | + AM_DEFAULT_VERBOSITY=1 |
1825 | +fi |
1826 | + |
1827 | + |
1828 | +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' |
1829 | +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' |
1830 | +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' |
1831 | + |
1832 | + |
1833 | + |
1834 | + |
1835 | +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' |
1836 | +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' |
1837 | +intltool__v_merge_options_0='-q' |
1838 | + |
1839 | + |
1840 | + |
1841 | + |
1842 | + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1843 | +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1844 | + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1845 | + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1846 | + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' |
1847 | + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1848 | + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1849 | + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1850 | +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1851 | + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1852 | + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1853 | +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then |
1854 | + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' |
1855 | +else |
1856 | + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' |
1857 | +fi |
1858 | + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1859 | + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1860 | + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1861 | + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1862 | + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1863 | + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1864 | + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
1865 | |
1866 | |
1867 | |
1868 | @@ -3994,7 +4051,7 @@ |
1869 | set dummy xgettext; ac_word=$2 |
1870 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1871 | $as_echo_n "checking for $ac_word... " >&6; } |
1872 | -if test "${ac_cv_path_XGETTEXT+set}" = set; then : |
1873 | +if ${ac_cv_path_XGETTEXT+:} false; then : |
1874 | $as_echo_n "(cached) " >&6 |
1875 | else |
1876 | case $XGETTEXT in |
1877 | @@ -4008,7 +4065,7 @@ |
1878 | IFS=$as_save_IFS |
1879 | test -z "$as_dir" && as_dir=. |
1880 | for ac_exec_ext in '' $ac_executable_extensions; do |
1881 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1882 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1883 | ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" |
1884 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1885 | break 2 |
1886 | @@ -4034,7 +4091,7 @@ |
1887 | set dummy msgmerge; ac_word=$2 |
1888 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1889 | $as_echo_n "checking for $ac_word... " >&6; } |
1890 | -if test "${ac_cv_path_MSGMERGE+set}" = set; then : |
1891 | +if ${ac_cv_path_MSGMERGE+:} false; then : |
1892 | $as_echo_n "(cached) " >&6 |
1893 | else |
1894 | case $MSGMERGE in |
1895 | @@ -4048,7 +4105,7 @@ |
1896 | IFS=$as_save_IFS |
1897 | test -z "$as_dir" && as_dir=. |
1898 | for ac_exec_ext in '' $ac_executable_extensions; do |
1899 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1900 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1901 | ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" |
1902 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1903 | break 2 |
1904 | @@ -4074,7 +4131,7 @@ |
1905 | set dummy msgfmt; ac_word=$2 |
1906 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1907 | $as_echo_n "checking for $ac_word... " >&6; } |
1908 | -if test "${ac_cv_path_MSGFMT+set}" = set; then : |
1909 | +if ${ac_cv_path_MSGFMT+:} false; then : |
1910 | $as_echo_n "(cached) " >&6 |
1911 | else |
1912 | case $MSGFMT in |
1913 | @@ -4088,7 +4145,7 @@ |
1914 | IFS=$as_save_IFS |
1915 | test -z "$as_dir" && as_dir=. |
1916 | for ac_exec_ext in '' $ac_executable_extensions; do |
1917 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1918 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1919 | ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" |
1920 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1921 | break 2 |
1922 | @@ -4114,7 +4171,7 @@ |
1923 | set dummy gmsgfmt; ac_word=$2 |
1924 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1925 | $as_echo_n "checking for $ac_word... " >&6; } |
1926 | -if test "${ac_cv_path_GMSGFMT+set}" = set; then : |
1927 | +if ${ac_cv_path_GMSGFMT+:} false; then : |
1928 | $as_echo_n "(cached) " >&6 |
1929 | else |
1930 | case $GMSGFMT in |
1931 | @@ -4128,7 +4185,7 @@ |
1932 | IFS=$as_save_IFS |
1933 | test -z "$as_dir" && as_dir=. |
1934 | for ac_exec_ext in '' $ac_executable_extensions; do |
1935 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1936 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1937 | ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" |
1938 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1939 | break 2 |
1940 | @@ -4165,7 +4222,7 @@ |
1941 | set dummy perl; ac_word=$2 |
1942 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1943 | $as_echo_n "checking for $ac_word... " >&6; } |
1944 | -if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : |
1945 | +if ${ac_cv_path_INTLTOOL_PERL+:} false; then : |
1946 | $as_echo_n "(cached) " >&6 |
1947 | else |
1948 | case $INTLTOOL_PERL in |
1949 | @@ -4179,7 +4236,7 @@ |
1950 | IFS=$as_save_IFS |
1951 | test -z "$as_dir" && as_dir=. |
1952 | for ac_exec_ext in '' $ac_executable_extensions; do |
1953 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
1954 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1955 | ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" |
1956 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1957 | break 2 |
1958 | @@ -4210,7 +4267,7 @@ |
1959 | if test $? -ne 0; then |
1960 | as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 |
1961 | else |
1962 | - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" |
1963 | + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` |
1964 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 |
1965 | $as_echo "$IT_PERL_VERSION" >&6; } |
1966 | fi |
1967 | @@ -4249,7 +4306,7 @@ |
1968 | case $host in |
1969 | *-*-solaris*) |
1970 | ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" |
1971 | -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : |
1972 | +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : |
1973 | DATADIRNAME=share |
1974 | else |
1975 | DATADIRNAME=lib |
1976 | @@ -4272,7 +4329,7 @@ |
1977 | |
1978 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 |
1979 | $as_echo_n "checking for library containing strerror... " >&6; } |
1980 | -if test "${ac_cv_search_strerror+set}" = set; then : |
1981 | +if ${ac_cv_search_strerror+:} false; then : |
1982 | $as_echo_n "(cached) " >&6 |
1983 | else |
1984 | ac_func_search_save_LIBS=$LIBS |
1985 | @@ -4306,11 +4363,11 @@ |
1986 | fi |
1987 | rm -f core conftest.err conftest.$ac_objext \ |
1988 | conftest$ac_exeext |
1989 | - if test "${ac_cv_search_strerror+set}" = set; then : |
1990 | + if ${ac_cv_search_strerror+:} false; then : |
1991 | break |
1992 | fi |
1993 | done |
1994 | -if test "${ac_cv_search_strerror+set}" = set; then : |
1995 | +if ${ac_cv_search_strerror+:} false; then : |
1996 | |
1997 | else |
1998 | ac_cv_search_strerror=no |
1999 | @@ -4340,6 +4397,33 @@ |
2000 | no) AM_DEFAULT_VERBOSITY=1;; |
2001 | *) AM_DEFAULT_VERBOSITY=0;; |
2002 | esac |
2003 | +am_make=${MAKE-make} |
2004 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 |
2005 | +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } |
2006 | +if ${am_cv_make_support_nested_variables+:} false; then : |
2007 | + $as_echo_n "(cached) " >&6 |
2008 | +else |
2009 | + if $as_echo 'TRUE=$(BAR$(V)) |
2010 | +BAR0=false |
2011 | +BAR1=true |
2012 | +V=1 |
2013 | +am__doit: |
2014 | + @$(TRUE) |
2015 | +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then |
2016 | + am_cv_make_support_nested_variables=yes |
2017 | +else |
2018 | + am_cv_make_support_nested_variables=no |
2019 | +fi |
2020 | +fi |
2021 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 |
2022 | +$as_echo "$am_cv_make_support_nested_variables" >&6; } |
2023 | +if test $am_cv_make_support_nested_variables = yes; then |
2024 | + AM_V='$(V)' |
2025 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
2026 | +else |
2027 | + AM_V=$AM_DEFAULT_VERBOSITY |
2028 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
2029 | +fi |
2030 | AM_BACKSLASH='\' |
2031 | |
2032 | |
2033 | @@ -4349,13 +4433,14 @@ |
2034 | |
2035 | |
2036 | |
2037 | + |
2038 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
2039 | if test -n "$ac_tool_prefix"; then |
2040 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
2041 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
2042 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2043 | $as_echo_n "checking for $ac_word... " >&6; } |
2044 | -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
2045 | +if ${ac_cv_path_PKG_CONFIG+:} false; then : |
2046 | $as_echo_n "(cached) " >&6 |
2047 | else |
2048 | case $PKG_CONFIG in |
2049 | @@ -4369,7 +4454,7 @@ |
2050 | IFS=$as_save_IFS |
2051 | test -z "$as_dir" && as_dir=. |
2052 | for ac_exec_ext in '' $ac_executable_extensions; do |
2053 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2054 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2055 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2056 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2057 | break 2 |
2058 | @@ -4398,7 +4483,7 @@ |
2059 | set dummy pkg-config; ac_word=$2 |
2060 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2061 | $as_echo_n "checking for $ac_word... " >&6; } |
2062 | -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : |
2063 | +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
2064 | $as_echo_n "(cached) " >&6 |
2065 | else |
2066 | case $ac_pt_PKG_CONFIG in |
2067 | @@ -4412,7 +4497,7 @@ |
2068 | IFS=$as_save_IFS |
2069 | test -z "$as_dir" && as_dir=. |
2070 | for ac_exec_ext in '' $ac_executable_extensions; do |
2071 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2072 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2073 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2074 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2075 | break 2 |
2076 | @@ -4470,7 +4555,7 @@ |
2077 | GEOCLUE_REQUIRED_VERSION=0.12.0 |
2078 | GLIB_REQUIRED_VERSION=2.26.0 |
2079 | SOUP_REQUIRED_VERSION=2.31.0 |
2080 | -NM_REQUIRED_VERSION=0.8.0 |
2081 | +NM_REQUIRED_VERSION=0.8.998 |
2082 | |
2083 | |
2084 | pkg_failed=no |
2085 | @@ -4496,6 +4581,7 @@ |
2086 | geoclue >= GEOCLUE_REQUIRED_VERSION |
2087 | libsoup-2.4 >= SOUP_REQUIRED_VERSION |
2088 | libnm-glib >= NM_REQUIRED_VERSION" 2>/dev/null` |
2089 | + test "x$?" != "x0" && pkg_failed=yes |
2090 | else |
2091 | pkg_failed=yes |
2092 | fi |
2093 | @@ -4521,6 +4607,7 @@ |
2094 | geoclue >= GEOCLUE_REQUIRED_VERSION |
2095 | libsoup-2.4 >= SOUP_REQUIRED_VERSION |
2096 | libnm-glib >= NM_REQUIRED_VERSION" 2>/dev/null` |
2097 | + test "x$?" != "x0" && pkg_failed=yes |
2098 | else |
2099 | pkg_failed=yes |
2100 | fi |
2101 | @@ -4540,12 +4627,12 @@ |
2102 | _pkg_short_errors_supported=no |
2103 | fi |
2104 | if test $_pkg_short_errors_supported = yes; then |
2105 | - PROVIDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION |
2106 | + PROVIDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED_VERSION |
2107 | geoclue >= GEOCLUE_REQUIRED_VERSION |
2108 | libsoup-2.4 >= SOUP_REQUIRED_VERSION |
2109 | libnm-glib >= NM_REQUIRED_VERSION" 2>&1` |
2110 | else |
2111 | - PROVIDER_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION |
2112 | + PROVIDER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED_VERSION |
2113 | geoclue >= GEOCLUE_REQUIRED_VERSION |
2114 | libsoup-2.4 >= SOUP_REQUIRED_VERSION |
2115 | libnm-glib >= NM_REQUIRED_VERSION" 2>&1` |
2116 | @@ -4580,7 +4667,7 @@ |
2117 | See the pkg-config man page for more details. |
2118 | |
2119 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. |
2120 | -See \`config.log' for more details" "$LINENO" 5 ; } |
2121 | +See \`config.log' for more details" "$LINENO" 5; } |
2122 | else |
2123 | PROVIDER_CFLAGS=$pkg_cv_PROVIDER_CFLAGS |
2124 | PROVIDER_LIBS=$pkg_cv_PROVIDER_LIBS |
2125 | @@ -4603,7 +4690,7 @@ |
2126 | enableval=$enable_schemas_compile; case ${enableval} in |
2127 | yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; |
2128 | no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; |
2129 | - *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;; |
2130 | + *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;; |
2131 | esac |
2132 | fi |
2133 | |
2134 | @@ -4614,13 +4701,14 @@ |
2135 | |
2136 | |
2137 | |
2138 | + |
2139 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then |
2140 | if test -n "$ac_tool_prefix"; then |
2141 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. |
2142 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 |
2143 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2144 | $as_echo_n "checking for $ac_word... " >&6; } |
2145 | -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : |
2146 | +if ${ac_cv_path_PKG_CONFIG+:} false; then : |
2147 | $as_echo_n "(cached) " >&6 |
2148 | else |
2149 | case $PKG_CONFIG in |
2150 | @@ -4634,7 +4722,7 @@ |
2151 | IFS=$as_save_IFS |
2152 | test -z "$as_dir" && as_dir=. |
2153 | for ac_exec_ext in '' $ac_executable_extensions; do |
2154 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2155 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2156 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2157 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2158 | break 2 |
2159 | @@ -4663,7 +4751,7 @@ |
2160 | set dummy pkg-config; ac_word=$2 |
2161 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2162 | $as_echo_n "checking for $ac_word... " >&6; } |
2163 | -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : |
2164 | +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : |
2165 | $as_echo_n "(cached) " >&6 |
2166 | else |
2167 | case $ac_pt_PKG_CONFIG in |
2168 | @@ -4677,7 +4765,7 @@ |
2169 | IFS=$as_save_IFS |
2170 | test -z "$as_dir" && as_dir=. |
2171 | for ac_exec_ext in '' $ac_executable_extensions; do |
2172 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2173 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2174 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
2175 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2176 | break 2 |
2177 | @@ -4736,7 +4824,7 @@ |
2178 | set dummy glib-compile-schemas; ac_word=$2 |
2179 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2180 | $as_echo_n "checking for $ac_word... " >&6; } |
2181 | -if test "${ac_cv_path_GLIB_COMPILE_SCHEMAS+set}" = set; then : |
2182 | +if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then : |
2183 | $as_echo_n "(cached) " >&6 |
2184 | else |
2185 | case $GLIB_COMPILE_SCHEMAS in |
2186 | @@ -4750,7 +4838,7 @@ |
2187 | IFS=$as_save_IFS |
2188 | test -z "$as_dir" && as_dir=. |
2189 | for ac_exec_ext in '' $ac_executable_extensions; do |
2190 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2191 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2192 | ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext" |
2193 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2194 | break 2 |
2195 | @@ -4788,7 +4876,7 @@ |
2196 | gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) |
2197 | |
2198 | %.gschema.valid: %.gschema.xml $(gsettings__enum_file) |
2199 | - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@ |
2200 | + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@ |
2201 | |
2202 | all-am: $(gsettings_SCHEMAS:.xml=.valid) |
2203 | uninstall-am: uninstall-gsettings-schemas |
2204 | @@ -4796,23 +4884,13 @@ |
2205 | |
2206 | .SECONDARY: $(gsettings_SCHEMAS) |
2207 | |
2208 | -gsettings__base_list = \ |
2209 | - sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ |
2210 | - sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" |
2211 | - |
2212 | -install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) |
2213 | +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) |
2214 | @$(NORMAL_INSTALL) |
2215 | - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)" |
2216 | - @list='\''$(gsettings__enum_file) $(gsettings_SCHEMAS)'\''; test -n "$(gsettingsschemadir)" || list=; \ |
2217 | - for p in $$list; do \ |
2218 | - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
2219 | - echo "$$d$$p"; \ |
2220 | - done | $(gsettings__base_list) | \ |
2221 | - while read files; do \ |
2222 | - echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \ |
2223 | - $(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \ |
2224 | - done |
2225 | - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) |
2226 | + if test -n "$^"; then \ |
2227 | + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ |
2228 | + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ |
2229 | + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ |
2230 | + fi |
2231 | |
2232 | uninstall-gsettings-schemas: |
2233 | @$(NORMAL_UNINSTALL) |
2234 | @@ -4828,7 +4906,7 @@ |
2235 | |
2236 | ifdef gsettings_ENUM_NAMESPACE |
2237 | $(gsettings__enum_file): $(gsettings_ENUM_FILES) |
2238 | - $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" $(gsettings_ENUM_FILES) > $@.tmp && mv $@.tmp $@ |
2239 | + $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" $^ > $@.tmp && mv $@.tmp $@ |
2240 | endif |
2241 | ' |
2242 | |
2243 | @@ -4905,7 +4983,7 @@ |
2244 | CPP= |
2245 | fi |
2246 | if test -z "$CPP"; then |
2247 | - if test "${ac_cv_prog_CPP+set}" = set; then : |
2248 | + if ${ac_cv_prog_CPP+:} false; then : |
2249 | $as_echo_n "(cached) " >&6 |
2250 | else |
2251 | # Double quotes because CPP needs to be expanded |
2252 | @@ -5021,7 +5099,7 @@ |
2253 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2254 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2255 | as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
2256 | -See \`config.log' for more details" "$LINENO" 5 ; } |
2257 | +See \`config.log' for more details" "$LINENO" 5; } |
2258 | fi |
2259 | |
2260 | ac_ext=c |
2261 | @@ -5033,7 +5111,7 @@ |
2262 | |
2263 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 |
2264 | $as_echo_n "checking for grep that handles long lines and -e... " >&6; } |
2265 | -if test "${ac_cv_path_GREP+set}" = set; then : |
2266 | +if ${ac_cv_path_GREP+:} false; then : |
2267 | $as_echo_n "(cached) " >&6 |
2268 | else |
2269 | if test -z "$GREP"; then |
2270 | @@ -5047,7 +5125,7 @@ |
2271 | for ac_prog in grep ggrep; do |
2272 | for ac_exec_ext in '' $ac_executable_extensions; do |
2273 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
2274 | - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue |
2275 | + as_fn_executable_p "$ac_path_GREP" || continue |
2276 | # Check for GNU ac_path_GREP and select it if it is found. |
2277 | # Check for GNU $ac_path_GREP |
2278 | case `"$ac_path_GREP" --version 2>&1` in |
2279 | @@ -5096,7 +5174,7 @@ |
2280 | |
2281 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 |
2282 | $as_echo_n "checking for egrep... " >&6; } |
2283 | -if test "${ac_cv_path_EGREP+set}" = set; then : |
2284 | +if ${ac_cv_path_EGREP+:} false; then : |
2285 | $as_echo_n "(cached) " >&6 |
2286 | else |
2287 | if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 |
2288 | @@ -5113,7 +5191,7 @@ |
2289 | for ac_prog in egrep; do |
2290 | for ac_exec_ext in '' $ac_executable_extensions; do |
2291 | ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
2292 | - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue |
2293 | + as_fn_executable_p "$ac_path_EGREP" || continue |
2294 | # Check for GNU ac_path_EGREP and select it if it is found. |
2295 | # Check for GNU $ac_path_EGREP |
2296 | case `"$ac_path_EGREP" --version 2>&1` in |
2297 | @@ -5163,7 +5241,7 @@ |
2298 | |
2299 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 |
2300 | $as_echo_n "checking for ANSI C header files... " >&6; } |
2301 | -if test "${ac_cv_header_stdc+set}" = set; then : |
2302 | +if ${ac_cv_header_stdc+:} false; then : |
2303 | $as_echo_n "(cached) " >&6 |
2304 | else |
2305 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2306 | @@ -5294,7 +5372,7 @@ |
2307 | for ac_header in locale.h |
2308 | do : |
2309 | ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" |
2310 | -if test "x$ac_cv_header_locale_h" = x""yes; then : |
2311 | +if test "x$ac_cv_header_locale_h" = xyes; then : |
2312 | cat >>confdefs.h <<_ACEOF |
2313 | #define HAVE_LOCALE_H 1 |
2314 | _ACEOF |
2315 | @@ -5306,7 +5384,7 @@ |
2316 | if test $ac_cv_header_locale_h = yes; then |
2317 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 |
2318 | $as_echo_n "checking for LC_MESSAGES... " >&6; } |
2319 | -if test "${am_cv_val_LC_MESSAGES+set}" = set; then : |
2320 | +if ${am_cv_val_LC_MESSAGES+:} false; then : |
2321 | $as_echo_n "(cached) " >&6 |
2322 | else |
2323 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2324 | @@ -5346,7 +5424,7 @@ |
2325 | INTLLIBS= |
2326 | |
2327 | ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" |
2328 | -if test "x$ac_cv_header_libintl_h" = x""yes; then : |
2329 | +if test "x$ac_cv_header_libintl_h" = xyes; then : |
2330 | gt_cv_func_dgettext_libintl="no" |
2331 | libintl_extra_libs="" |
2332 | |
2333 | @@ -5355,7 +5433,7 @@ |
2334 | # |
2335 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 |
2336 | $as_echo_n "checking for ngettext in libc... " >&6; } |
2337 | -if test "${gt_cv_func_ngettext_libc+set}" = set; then : |
2338 | +if ${gt_cv_func_ngettext_libc+:} false; then : |
2339 | $as_echo_n "(cached) " >&6 |
2340 | else |
2341 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2342 | @@ -5386,7 +5464,7 @@ |
2343 | if test "$gt_cv_func_ngettext_libc" = "yes" ; then |
2344 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 |
2345 | $as_echo_n "checking for dgettext in libc... " >&6; } |
2346 | -if test "${gt_cv_func_dgettext_libc+set}" = set; then : |
2347 | +if ${gt_cv_func_dgettext_libc+:} false; then : |
2348 | $as_echo_n "(cached) " >&6 |
2349 | else |
2350 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2351 | @@ -5419,7 +5497,7 @@ |
2352 | for ac_func in bind_textdomain_codeset |
2353 | do : |
2354 | ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" |
2355 | -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : |
2356 | +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : |
2357 | cat >>confdefs.h <<_ACEOF |
2358 | #define HAVE_BIND_TEXTDOMAIN_CODESET 1 |
2359 | _ACEOF |
2360 | @@ -5438,7 +5516,7 @@ |
2361 | |
2362 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 |
2363 | $as_echo_n "checking for bindtextdomain in -lintl... " >&6; } |
2364 | -if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : |
2365 | +if ${ac_cv_lib_intl_bindtextdomain+:} false; then : |
2366 | $as_echo_n "(cached) " >&6 |
2367 | else |
2368 | ac_check_lib_save_LIBS=$LIBS |
2369 | @@ -5472,10 +5550,10 @@ |
2370 | fi |
2371 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 |
2372 | $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } |
2373 | -if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : |
2374 | +if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then : |
2375 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 |
2376 | $as_echo_n "checking for ngettext in -lintl... " >&6; } |
2377 | -if test "${ac_cv_lib_intl_ngettext+set}" = set; then : |
2378 | +if ${ac_cv_lib_intl_ngettext+:} false; then : |
2379 | $as_echo_n "(cached) " >&6 |
2380 | else |
2381 | ac_check_lib_save_LIBS=$LIBS |
2382 | @@ -5509,10 +5587,10 @@ |
2383 | fi |
2384 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 |
2385 | $as_echo "$ac_cv_lib_intl_ngettext" >&6; } |
2386 | -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : |
2387 | +if test "x$ac_cv_lib_intl_ngettext" = xyes; then : |
2388 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 |
2389 | $as_echo_n "checking for dgettext in -lintl... " >&6; } |
2390 | -if test "${ac_cv_lib_intl_dgettext+set}" = set; then : |
2391 | +if ${ac_cv_lib_intl_dgettext+:} false; then : |
2392 | $as_echo_n "(cached) " >&6 |
2393 | else |
2394 | ac_check_lib_save_LIBS=$LIBS |
2395 | @@ -5546,7 +5624,7 @@ |
2396 | fi |
2397 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 |
2398 | $as_echo "$ac_cv_lib_intl_dgettext" >&6; } |
2399 | -if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : |
2400 | +if test "x$ac_cv_lib_intl_dgettext" = xyes; then : |
2401 | gt_cv_func_dgettext_libintl=yes |
2402 | fi |
2403 | |
2404 | @@ -5562,7 +5640,7 @@ |
2405 | $as_echo "" >&6; } |
2406 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 |
2407 | $as_echo_n "checking for ngettext in -lintl... " >&6; } |
2408 | -if test "${ac_cv_lib_intl_ngettext+set}" = set; then : |
2409 | +if ${ac_cv_lib_intl_ngettext+:} false; then : |
2410 | $as_echo_n "(cached) " >&6 |
2411 | else |
2412 | ac_check_lib_save_LIBS=$LIBS |
2413 | @@ -5596,10 +5674,10 @@ |
2414 | fi |
2415 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 |
2416 | $as_echo "$ac_cv_lib_intl_ngettext" >&6; } |
2417 | -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : |
2418 | +if test "x$ac_cv_lib_intl_ngettext" = xyes; then : |
2419 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 |
2420 | $as_echo_n "checking for dcgettext in -lintl... " >&6; } |
2421 | -if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : |
2422 | +if ${ac_cv_lib_intl_dcgettext+:} false; then : |
2423 | $as_echo_n "(cached) " >&6 |
2424 | else |
2425 | ac_check_lib_save_LIBS=$LIBS |
2426 | @@ -5633,7 +5711,7 @@ |
2427 | fi |
2428 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 |
2429 | $as_echo "$ac_cv_lib_intl_dcgettext" >&6; } |
2430 | -if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : |
2431 | +if test "x$ac_cv_lib_intl_dcgettext" = xyes; then : |
2432 | gt_cv_func_dgettext_libintl=yes |
2433 | libintl_extra_libs=-liconv |
2434 | else |
2435 | @@ -5658,7 +5736,7 @@ |
2436 | for ac_func in bind_textdomain_codeset |
2437 | do : |
2438 | ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" |
2439 | -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : |
2440 | +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : |
2441 | cat >>confdefs.h <<_ACEOF |
2442 | #define HAVE_BIND_TEXTDOMAIN_CODESET 1 |
2443 | _ACEOF |
2444 | @@ -5696,7 +5774,7 @@ |
2445 | set dummy msgfmt; ac_word=$2 |
2446 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2447 | $as_echo_n "checking for $ac_word... " >&6; } |
2448 | -if test "${ac_cv_path_MSGFMT+set}" = set; then : |
2449 | +if ${ac_cv_path_MSGFMT+:} false; then : |
2450 | $as_echo_n "(cached) " >&6 |
2451 | else |
2452 | case "$MSGFMT" in |
2453 | @@ -5733,7 +5811,7 @@ |
2454 | for ac_func in dcgettext |
2455 | do : |
2456 | ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" |
2457 | -if test "x$ac_cv_func_dcgettext" = x""yes; then : |
2458 | +if test "x$ac_cv_func_dcgettext" = xyes; then : |
2459 | cat >>confdefs.h <<_ACEOF |
2460 | #define HAVE_DCGETTEXT 1 |
2461 | _ACEOF |
2462 | @@ -5774,7 +5852,7 @@ |
2463 | set dummy gmsgfmt; ac_word=$2 |
2464 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2465 | $as_echo_n "checking for $ac_word... " >&6; } |
2466 | -if test "${ac_cv_path_GMSGFMT+set}" = set; then : |
2467 | +if ${ac_cv_path_GMSGFMT+:} false; then : |
2468 | $as_echo_n "(cached) " >&6 |
2469 | else |
2470 | case $GMSGFMT in |
2471 | @@ -5788,7 +5866,7 @@ |
2472 | IFS=$as_save_IFS |
2473 | test -z "$as_dir" && as_dir=. |
2474 | for ac_exec_ext in '' $ac_executable_extensions; do |
2475 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2476 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
2477 | ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" |
2478 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2479 | break 2 |
2480 | @@ -5815,7 +5893,7 @@ |
2481 | set dummy xgettext; ac_word=$2 |
2482 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2483 | $as_echo_n "checking for $ac_word... " >&6; } |
2484 | -if test "${ac_cv_path_XGETTEXT+set}" = set; then : |
2485 | +if ${ac_cv_path_XGETTEXT+:} false; then : |
2486 | $as_echo_n "(cached) " >&6 |
2487 | else |
2488 | case "$XGETTEXT" in |
2489 | @@ -5866,7 +5944,7 @@ |
2490 | case $host in |
2491 | *-*-solaris*) |
2492 | ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" |
2493 | -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : |
2494 | +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : |
2495 | CATOBJEXT=.gmo |
2496 | DATADIRNAME=share |
2497 | else |
2498 | @@ -5875,6 +5953,10 @@ |
2499 | fi |
2500 | |
2501 | ;; |
2502 | + *-*-openbsd*) |
2503 | + CATOBJEXT=.mo |
2504 | + DATADIRNAME=share |
2505 | + ;; |
2506 | *) |
2507 | CATOBJEXT=.mo |
2508 | DATADIRNAME=lib |
2509 | @@ -6065,10 +6147,21 @@ |
2510 | :end' >>confcache |
2511 | if diff "$cache_file" confcache >/dev/null 2>&1; then :; else |
2512 | if test -w "$cache_file"; then |
2513 | - test "x$cache_file" != "x/dev/null" && |
2514 | + if test "x$cache_file" != "x/dev/null"; then |
2515 | { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 |
2516 | $as_echo "$as_me: updating cache $cache_file" >&6;} |
2517 | - cat confcache >$cache_file |
2518 | + if test ! -f "$cache_file" || test -h "$cache_file"; then |
2519 | + cat confcache >"$cache_file" |
2520 | + else |
2521 | + case $cache_file in #( |
2522 | + */* | ?:*) |
2523 | + mv -f confcache "$cache_file"$$ && |
2524 | + mv -f "$cache_file"$$ "$cache_file" ;; #( |
2525 | + *) |
2526 | + mv -f confcache "$cache_file" ;; |
2527 | + esac |
2528 | + fi |
2529 | + fi |
2530 | else |
2531 | { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 |
2532 | $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} |
2533 | @@ -6124,7 +6217,7 @@ |
2534 | |
2535 | |
2536 | |
2537 | -: ${CONFIG_STATUS=./config.status} |
2538 | +: "${CONFIG_STATUS=./config.status}" |
2539 | ac_write_fail=0 |
2540 | ac_clean_files_save=$ac_clean_files |
2541 | ac_clean_files="$ac_clean_files $CONFIG_STATUS" |
2542 | @@ -6225,6 +6318,7 @@ |
2543 | IFS=" "" $as_nl" |
2544 | |
2545 | # Find who we are. Look in the path if we contain no directory separator. |
2546 | +as_myself= |
2547 | case $0 in #(( |
2548 | *[\\/]* ) as_myself=$0 ;; |
2549 | *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2550 | @@ -6420,16 +6514,16 @@ |
2551 | # ... but there are two gotchas: |
2552 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
2553 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
2554 | - # In both cases, we have to default to `cp -p'. |
2555 | + # In both cases, we have to default to `cp -pR'. |
2556 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
2557 | - as_ln_s='cp -p' |
2558 | + as_ln_s='cp -pR' |
2559 | elif ln conf$$.file conf$$ 2>/dev/null; then |
2560 | as_ln_s=ln |
2561 | else |
2562 | - as_ln_s='cp -p' |
2563 | + as_ln_s='cp -pR' |
2564 | fi |
2565 | else |
2566 | - as_ln_s='cp -p' |
2567 | + as_ln_s='cp -pR' |
2568 | fi |
2569 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
2570 | rmdir conf$$.dir 2>/dev/null |
2571 | @@ -6489,28 +6583,16 @@ |
2572 | as_mkdir_p=false |
2573 | fi |
2574 | |
2575 | -if test -x / >/dev/null 2>&1; then |
2576 | - as_test_x='test -x' |
2577 | -else |
2578 | - if ls -dL / >/dev/null 2>&1; then |
2579 | - as_ls_L_option=L |
2580 | - else |
2581 | - as_ls_L_option= |
2582 | - fi |
2583 | - as_test_x=' |
2584 | - eval sh -c '\'' |
2585 | - if test -d "$1"; then |
2586 | - test -d "$1/."; |
2587 | - else |
2588 | - case $1 in #( |
2589 | - -*)set "./$1";; |
2590 | - esac; |
2591 | - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( |
2592 | - ???[sx]*):;;*)false;;esac;fi |
2593 | - '\'' sh |
2594 | - ' |
2595 | -fi |
2596 | -as_executable_p=$as_test_x |
2597 | + |
2598 | +# as_fn_executable_p FILE |
2599 | +# ----------------------- |
2600 | +# Test if FILE is an executable regular file. |
2601 | +as_fn_executable_p () |
2602 | +{ |
2603 | + test -f "$1" && test -x "$1" |
2604 | +} # as_fn_executable_p |
2605 | +as_test_x='test -x' |
2606 | +as_executable_p=as_fn_executable_p |
2607 | |
2608 | # Sed expression to map a string onto a valid CPP name. |
2609 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
2610 | @@ -6531,8 +6613,8 @@ |
2611 | # report actual input values of CONFIG_FILES etc. instead of their |
2612 | # values after options handling. |
2613 | ac_log=" |
2614 | -This file was extended by ubuntu-geoip $as_me 0.0.2, which was |
2615 | -generated by GNU Autoconf 2.67. Invocation command line was |
2616 | +This file was extended by ubuntu-geoip $as_me 1.0.0, which was |
2617 | +generated by GNU Autoconf 2.69. Invocation command line was |
2618 | |
2619 | CONFIG_FILES = $CONFIG_FILES |
2620 | CONFIG_HEADERS = $CONFIG_HEADERS |
2621 | @@ -6597,11 +6679,11 @@ |
2622 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2623 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
2624 | ac_cs_version="\\ |
2625 | -ubuntu-geoip config.status 0.0.2 |
2626 | -configured by $0, generated by GNU Autoconf 2.67, |
2627 | +ubuntu-geoip config.status 1.0.0 |
2628 | +configured by $0, generated by GNU Autoconf 2.69, |
2629 | with options \\"\$ac_cs_config\\" |
2630 | |
2631 | -Copyright (C) 2010 Free Software Foundation, Inc. |
2632 | +Copyright (C) 2012 Free Software Foundation, Inc. |
2633 | This config.status script is free software; the Free Software Foundation |
2634 | gives unlimited permission to copy, distribute and modify it." |
2635 | |
2636 | @@ -6692,7 +6774,7 @@ |
2637 | _ACEOF |
2638 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2639 | if \$ac_cs_recheck; then |
2640 | - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
2641 | + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion |
2642 | shift |
2643 | \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 |
2644 | CONFIG_SHELL='$SHELL' |
2645 | @@ -6736,7 +6818,7 @@ |
2646 | "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; |
2647 | "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; |
2648 | |
2649 | - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; |
2650 | + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
2651 | esac |
2652 | done |
2653 | |
2654 | @@ -6759,9 +6841,10 @@ |
2655 | # after its creation but before its name has been assigned to `$tmp'. |
2656 | $debug || |
2657 | { |
2658 | - tmp= |
2659 | + tmp= ac_tmp= |
2660 | trap 'exit_status=$? |
2661 | - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status |
2662 | + : "${ac_tmp:=$tmp}" |
2663 | + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status |
2664 | ' 0 |
2665 | trap 'as_fn_exit 1' 1 2 13 15 |
2666 | } |
2667 | @@ -6769,12 +6852,13 @@ |
2668 | |
2669 | { |
2670 | tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && |
2671 | - test -n "$tmp" && test -d "$tmp" |
2672 | + test -d "$tmp" |
2673 | } || |
2674 | { |
2675 | tmp=./conf$$-$RANDOM |
2676 | (umask 077 && mkdir "$tmp") |
2677 | } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 |
2678 | +ac_tmp=$tmp |
2679 | |
2680 | # Set up the scripts for CONFIG_FILES section. |
2681 | # No need to generate them if there are no CONFIG_FILES. |
2682 | @@ -6796,7 +6880,7 @@ |
2683 | ac_cs_awk_cr=$ac_cr |
2684 | fi |
2685 | |
2686 | -echo 'BEGIN {' >"$tmp/subs1.awk" && |
2687 | +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && |
2688 | _ACEOF |
2689 | |
2690 | |
2691 | @@ -6824,7 +6908,7 @@ |
2692 | rm -f conf$$subs.sh |
2693 | |
2694 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2695 | -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && |
2696 | +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && |
2697 | _ACEOF |
2698 | sed -n ' |
2699 | h |
2700 | @@ -6872,7 +6956,7 @@ |
2701 | rm -f conf$$subs.awk |
2702 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2703 | _ACAWK |
2704 | -cat >>"\$tmp/subs1.awk" <<_ACAWK && |
2705 | +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && |
2706 | for (key in S) S_is_set[key] = 1 |
2707 | FS = "" |
2708 | |
2709 | @@ -6904,7 +6988,7 @@ |
2710 | sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" |
2711 | else |
2712 | cat |
2713 | -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ |
2714 | +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ |
2715 | || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 |
2716 | _ACEOF |
2717 | |
2718 | @@ -6938,7 +7022,7 @@ |
2719 | # No need to generate them if there are no CONFIG_HEADERS. |
2720 | # This happens for instance with `./config.status Makefile'. |
2721 | if test -n "$CONFIG_HEADERS"; then |
2722 | -cat >"$tmp/defines.awk" <<\_ACAWK || |
2723 | +cat >"$ac_tmp/defines.awk" <<\_ACAWK || |
2724 | BEGIN { |
2725 | _ACEOF |
2726 | |
2727 | @@ -6950,8 +7034,8 @@ |
2728 | # handling of long lines. |
2729 | ac_delim='%!_!# ' |
2730 | for ac_last_try in false false :; do |
2731 | - ac_t=`sed -n "/$ac_delim/p" confdefs.h` |
2732 | - if test -z "$ac_t"; then |
2733 | + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` |
2734 | + if test -z "$ac_tt"; then |
2735 | break |
2736 | elif $ac_last_try; then |
2737 | as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 |
2738 | @@ -7052,7 +7136,7 @@ |
2739 | esac |
2740 | case $ac_mode$ac_tag in |
2741 | :[FHL]*:*);; |
2742 | - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; |
2743 | + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; |
2744 | :[FH]-) ac_tag=-:-;; |
2745 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; |
2746 | esac |
2747 | @@ -7071,7 +7155,7 @@ |
2748 | for ac_f |
2749 | do |
2750 | case $ac_f in |
2751 | - -) ac_f="$tmp/stdin";; |
2752 | + -) ac_f="$ac_tmp/stdin";; |
2753 | *) # Look for the file first in the build tree, then in the source tree |
2754 | # (if the path is not absolute). The absolute path cannot be DOS-style, |
2755 | # because $ac_f cannot contain `:'. |
2756 | @@ -7080,7 +7164,7 @@ |
2757 | [\\/$]*) false;; |
2758 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; |
2759 | esac || |
2760 | - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; |
2761 | + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; |
2762 | esac |
2763 | case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac |
2764 | as_fn_append ac_file_inputs " '$ac_f'" |
2765 | @@ -7106,8 +7190,8 @@ |
2766 | esac |
2767 | |
2768 | case $ac_tag in |
2769 | - *:-:* | *:-) cat >"$tmp/stdin" \ |
2770 | - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; |
2771 | + *:-:* | *:-) cat >"$ac_tmp/stdin" \ |
2772 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; |
2773 | esac |
2774 | ;; |
2775 | esac |
2776 | @@ -7243,21 +7327,22 @@ |
2777 | s&@MKDIR_P@&$ac_MKDIR_P&;t t |
2778 | $ac_datarootdir_hack |
2779 | " |
2780 | -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ |
2781 | - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
2782 | +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ |
2783 | + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
2784 | |
2785 | test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && |
2786 | - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && |
2787 | - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && |
2788 | + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && |
2789 | + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ |
2790 | + "$ac_tmp/out"`; test -z "$ac_out"; } && |
2791 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
2792 | which seems to be undefined. Please make sure it is defined" >&5 |
2793 | $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' |
2794 | which seems to be undefined. Please make sure it is defined" >&2;} |
2795 | |
2796 | - rm -f "$tmp/stdin" |
2797 | + rm -f "$ac_tmp/stdin" |
2798 | case $ac_file in |
2799 | - -) cat "$tmp/out" && rm -f "$tmp/out";; |
2800 | - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; |
2801 | + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; |
2802 | + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; |
2803 | esac \ |
2804 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
2805 | ;; |
2806 | @@ -7268,20 +7353,20 @@ |
2807 | if test x"$ac_file" != x-; then |
2808 | { |
2809 | $as_echo "/* $configure_input */" \ |
2810 | - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" |
2811 | - } >"$tmp/config.h" \ |
2812 | + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" |
2813 | + } >"$ac_tmp/config.h" \ |
2814 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
2815 | - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then |
2816 | + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then |
2817 | { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 |
2818 | $as_echo "$as_me: $ac_file is unchanged" >&6;} |
2819 | else |
2820 | rm -f "$ac_file" |
2821 | - mv "$tmp/config.h" "$ac_file" \ |
2822 | + mv "$ac_tmp/config.h" "$ac_file" \ |
2823 | || as_fn_error $? "could not create $ac_file" "$LINENO" 5 |
2824 | fi |
2825 | else |
2826 | $as_echo "/* $configure_input */" \ |
2827 | - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ |
2828 | + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ |
2829 | || as_fn_error $? "could not create -" "$LINENO" 5 |
2830 | fi |
2831 | # Compute "$ac_file"'s index in $config_headers. |
2832 | |
2833 | === modified file 'configure.ac' |
2834 | --- configure.ac 2010-10-21 21:18:53 +0000 |
2835 | +++ configure.ac 2012-09-13 14:46:32 +0000 |
2836 | @@ -1,11 +1,11 @@ |
2837 | |
2838 | -AC_INIT(ubuntu-geoip, 0.0.2, ted@canonical.com) |
2839 | -AC_COPYRIGHT([Copyright 2010 Canonical]) |
2840 | +AC_INIT(ubuntu-geoip, 1.0.0, ted@canonical.com) |
2841 | +AC_COPYRIGHT([Copyright 2010-2012 Canonical]) |
2842 | |
2843 | AC_PREREQ(2.53) |
2844 | |
2845 | AM_CONFIG_HEADER(config.h) |
2846 | -AM_INIT_AUTOMAKE(ubuntu-geoip, 0.0.2) |
2847 | +AM_INIT_AUTOMAKE(ubuntu-geoip, 1.0.0) |
2848 | |
2849 | AM_MAINTAINER_MODE |
2850 | |
2851 | @@ -27,7 +27,7 @@ |
2852 | GEOCLUE_REQUIRED_VERSION=0.12.0 |
2853 | GLIB_REQUIRED_VERSION=2.26.0 |
2854 | SOUP_REQUIRED_VERSION=2.31.0 |
2855 | -NM_REQUIRED_VERSION=0.8.0 |
2856 | +NM_REQUIRED_VERSION=0.8.998 |
2857 | |
2858 | PKG_CHECK_MODULES(PROVIDER, glib-2.0 >= $GLIB_REQUIRED_VERSION |
2859 | geoclue >= GEOCLUE_REQUIRED_VERSION |
2860 | |
2861 | === modified file 'data/Makefile.am' |
2862 | --- data/Makefile.am 2010-10-05 21:25:40 +0000 |
2863 | +++ data/Makefile.am 2012-09-13 14:46:32 +0000 |
2864 | @@ -8,6 +8,16 @@ |
2865 | ubuntu-geoip.provider |
2866 | |
2867 | ############################ |
2868 | +# GSettings Stuff |
2869 | +############################ |
2870 | + |
2871 | +@INTLTOOL_SCHEMAS_RULE@ |
2872 | +@INTLTOOL_XML_NOMERGE_RULE@ |
2873 | + |
2874 | +@GSETTINGS_RULES@ |
2875 | +gsettings_SCHEMAS = com.ubuntu.geoip.gschema.xml |
2876 | + |
2877 | +############################ |
2878 | # DBus Service |
2879 | ############################ |
2880 | |
2881 | @@ -24,7 +34,9 @@ |
2882 | |
2883 | EXTRA_DIST = \ |
2884 | $(geoclue_provider_DATA) \ |
2885 | + $(gsettings_SCHEMAS:.xml=.xml.in) \ |
2886 | org.freedesktop.Geoclue.Providers.UbuntuGeoIP.service.in |
2887 | |
2888 | CLEANFILES = \ |
2889 | + $(gsettings_SCHEMAS) \ |
2890 | org.freedesktop.Geoclue.Providers.UbuntuGeoIP.service |
2891 | |
2892 | === modified file 'data/Makefile.in' |
2893 | --- data/Makefile.in 2010-10-21 21:21:37 +0000 |
2894 | +++ data/Makefile.in 2012-09-13 14:46:32 +0000 |
2895 | @@ -1,9 +1,9 @@ |
2896 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
2897 | +# Makefile.in generated by automake 1.11.5 from Makefile.am. |
2898 | # @configure_input@ |
2899 | |
2900 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
2901 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
2902 | -# Inc. |
2903 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
2904 | +# Foundation, Inc. |
2905 | # This Makefile.in is free software; the Free Software Foundation |
2906 | # gives unlimited permission to copy and/or distribute it, |
2907 | # with or without modifications, as long as this notice is preserved. |
2908 | @@ -20,6 +20,23 @@ |
2909 | ############################ |
2910 | |
2911 | VPATH = @srcdir@ |
2912 | +am__make_dryrun = \ |
2913 | + { \ |
2914 | + am__dry=no; \ |
2915 | + case $$MAKEFLAGS in \ |
2916 | + *\\[\ \ ]*) \ |
2917 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
2918 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
2919 | + *) \ |
2920 | + for am__flg in $$MAKEFLAGS; do \ |
2921 | + case $$am__flg in \ |
2922 | + *=*|--*) ;; \ |
2923 | + *n*) am__dry=yes; break;; \ |
2924 | + esac; \ |
2925 | + done;; \ |
2926 | + esac; \ |
2927 | + test $$am__dry = yes; \ |
2928 | + } |
2929 | pkgdatadir = $(datadir)/@PACKAGE@ |
2930 | pkgincludedir = $(includedir)/@PACKAGE@ |
2931 | pkglibdir = $(libdir)/@PACKAGE@ |
2932 | @@ -46,14 +63,19 @@ |
2933 | CONFIG_HEADER = $(top_builddir)/config.h |
2934 | CONFIG_CLEAN_FILES = |
2935 | CONFIG_CLEAN_VPATH_FILES = |
2936 | -AM_V_GEN = $(am__v_GEN_$(V)) |
2937 | -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) |
2938 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
2939 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
2940 | am__v_GEN_0 = @echo " GEN " $@; |
2941 | -AM_V_at = $(am__v_at_$(V)) |
2942 | -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) |
2943 | +AM_V_at = $(am__v_at_@AM_V@) |
2944 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
2945 | am__v_at_0 = @ |
2946 | SOURCES = |
2947 | DIST_SOURCES = |
2948 | +am__can_run_installinfo = \ |
2949 | + case $$AM_UPDATE_INFO_DIR in \ |
2950 | + n|no|NO) false;; \ |
2951 | + *) (install-info --version) >/dev/null 2>&1;; \ |
2952 | + esac |
2953 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
2954 | am__vpath_adj = case $$p in \ |
2955 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
2956 | @@ -75,6 +97,12 @@ |
2957 | am__base_list = \ |
2958 | sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ |
2959 | sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' |
2960 | +am__uninstall_files_from_dir = { \ |
2961 | + test -z "$$files" \ |
2962 | + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ |
2963 | + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
2964 | + $(am__cd) "$$dir" && rm -f $$files; }; \ |
2965 | + } |
2966 | am__installdirs = "$(DESTDIR)$(dbus_servicesdir)" \ |
2967 | "$(DESTDIR)$(geoclue_providerdir)" |
2968 | DATA = $(dbus_services_DATA) $(geoclue_provider_DATA) |
2969 | @@ -122,6 +150,10 @@ |
2970 | INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
2971 | INTLTOOL_PERL = @INTLTOOL_PERL@ |
2972 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
2973 | +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ |
2974 | +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
2975 | +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
2976 | +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
2977 | LDFLAGS = @LDFLAGS@ |
2978 | LIBOBJS = @LIBOBJS@ |
2979 | LIBS = @LIBS@ |
2980 | @@ -181,6 +213,8 @@ |
2981 | includedir = @includedir@ |
2982 | infodir = @infodir@ |
2983 | install_sh = @install_sh@ |
2984 | +intltool__v_merge_options_ = @intltool__v_merge_options_@ |
2985 | +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ |
2986 | libdir = @libdir@ |
2987 | libexecdir = @libexecdir@ |
2988 | localedir = @localedir@ |
2989 | @@ -204,6 +238,7 @@ |
2990 | geoclue_provider_DATA = \ |
2991 | ubuntu-geoip.provider |
2992 | |
2993 | +gsettings_SCHEMAS = com.ubuntu.geoip.gschema.xml |
2994 | |
2995 | ############################ |
2996 | # DBus Service |
2997 | @@ -218,9 +253,11 @@ |
2998 | ############################ |
2999 | EXTRA_DIST = \ |
3000 | $(geoclue_provider_DATA) \ |
3001 | + $(gsettings_SCHEMAS:.xml=.xml.in) \ |
3002 | org.freedesktop.Geoclue.Providers.UbuntuGeoIP.service.in |
3003 | |
3004 | CLEANFILES = \ |
3005 | + $(gsettings_SCHEMAS) \ |
3006 | org.freedesktop.Geoclue.Providers.UbuntuGeoIP.service |
3007 | |
3008 | all: all-am |
3009 | @@ -258,8 +295,11 @@ |
3010 | $(am__aclocal_m4_deps): |
3011 | install-dbus_servicesDATA: $(dbus_services_DATA) |
3012 | @$(NORMAL_INSTALL) |
3013 | - test -z "$(dbus_servicesdir)" || $(MKDIR_P) "$(DESTDIR)$(dbus_servicesdir)" |
3014 | @list='$(dbus_services_DATA)'; test -n "$(dbus_servicesdir)" || list=; \ |
3015 | + if test -n "$$list"; then \ |
3016 | + echo " $(MKDIR_P) '$(DESTDIR)$(dbus_servicesdir)'"; \ |
3017 | + $(MKDIR_P) "$(DESTDIR)$(dbus_servicesdir)" || exit 1; \ |
3018 | + fi; \ |
3019 | for p in $$list; do \ |
3020 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
3021 | echo "$$d$$p"; \ |
3022 | @@ -273,13 +313,14 @@ |
3023 | @$(NORMAL_UNINSTALL) |
3024 | @list='$(dbus_services_DATA)'; test -n "$(dbus_servicesdir)" || list=; \ |
3025 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
3026 | - test -n "$$files" || exit 0; \ |
3027 | - echo " ( cd '$(DESTDIR)$(dbus_servicesdir)' && rm -f" $$files ")"; \ |
3028 | - cd "$(DESTDIR)$(dbus_servicesdir)" && rm -f $$files |
3029 | + dir='$(DESTDIR)$(dbus_servicesdir)'; $(am__uninstall_files_from_dir) |
3030 | install-geoclue_providerDATA: $(geoclue_provider_DATA) |
3031 | @$(NORMAL_INSTALL) |
3032 | - test -z "$(geoclue_providerdir)" || $(MKDIR_P) "$(DESTDIR)$(geoclue_providerdir)" |
3033 | @list='$(geoclue_provider_DATA)'; test -n "$(geoclue_providerdir)" || list=; \ |
3034 | + if test -n "$$list"; then \ |
3035 | + echo " $(MKDIR_P) '$(DESTDIR)$(geoclue_providerdir)'"; \ |
3036 | + $(MKDIR_P) "$(DESTDIR)$(geoclue_providerdir)" || exit 1; \ |
3037 | + fi; \ |
3038 | for p in $$list; do \ |
3039 | if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
3040 | echo "$$d$$p"; \ |
3041 | @@ -293,9 +334,7 @@ |
3042 | @$(NORMAL_UNINSTALL) |
3043 | @list='$(geoclue_provider_DATA)'; test -n "$(geoclue_providerdir)" || list=; \ |
3044 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
3045 | - test -n "$$files" || exit 0; \ |
3046 | - echo " ( cd '$(DESTDIR)$(geoclue_providerdir)' && rm -f" $$files ")"; \ |
3047 | - cd "$(DESTDIR)$(geoclue_providerdir)" && rm -f $$files |
3048 | + dir='$(DESTDIR)$(geoclue_providerdir)'; $(am__uninstall_files_from_dir) |
3049 | tags: TAGS |
3050 | TAGS: |
3051 | |
3052 | @@ -350,10 +389,15 @@ |
3053 | |
3054 | installcheck: installcheck-am |
3055 | install-strip: |
3056 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3057 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3058 | - `test -z '$(STRIP)' || \ |
3059 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
3060 | + if test -z '$(STRIP)'; then \ |
3061 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3062 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3063 | + install; \ |
3064 | + else \ |
3065 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3066 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3067 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
3068 | + fi |
3069 | mostlyclean-generic: |
3070 | |
3071 | clean-generic: |
3072 | @@ -450,6 +494,15 @@ |
3073 | uninstall-geoclue_providerDATA |
3074 | |
3075 | |
3076 | +############################ |
3077 | +# GSettings Stuff |
3078 | +############################ |
3079 | + |
3080 | +@INTLTOOL_SCHEMAS_RULE@ |
3081 | +@INTLTOOL_XML_NOMERGE_RULE@ |
3082 | + |
3083 | +@GSETTINGS_RULES@ |
3084 | + |
3085 | %.service: %.service.in |
3086 | sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ |
3087 | |
3088 | |
3089 | === added file 'data/com.ubuntu.geoip.gschema.xml.in' |
3090 | --- data/com.ubuntu.geoip.gschema.xml.in 1970-01-01 00:00:00 +0000 |
3091 | +++ data/com.ubuntu.geoip.gschema.xml.in 2012-09-13 14:46:32 +0000 |
3092 | @@ -0,0 +1,9 @@ |
3093 | +<schemalist> |
3094 | + <schema id="com.ubuntu.geoip" path="/com/ubuntu/geoip/"> |
3095 | + <key name="geoip-url" type="s"> |
3096 | + <default>"http://geoip.ubuntu.com/lookup"</default> |
3097 | + <_summary>URL used to get information about the IP</_summary> |
3098 | + <_description>URL of a service that can be contacted and returns an XML file containing location information about the requestors IP address.</_description> |
3099 | + </key> |
3100 | + </schema> |
3101 | +</schemalist> |
3102 | |
3103 | === modified file 'data/ubuntu-geoip.provider' |
3104 | --- data/ubuntu-geoip.provider 2010-10-06 20:26:52 +0000 |
3105 | +++ data/ubuntu-geoip.provider 2012-09-13 14:46:32 +0000 |
3106 | @@ -3,6 +3,6 @@ |
3107 | Service=org.freedesktop.Geoclue.Providers.UbuntuGeoIP |
3108 | Path=/org/freedesktop/Geoclue/Providers/UbuntuGeoIP |
3109 | Interfaces=org.freedesktop.Geoclue.Position;org.freedesktop.Geoclue.Address |
3110 | -Provides=ProvidesCacheableOnConnection |
3111 | +Provides=ProvidesUpdates |
3112 | Accuracy=Locality |
3113 | Requires=RequiresNetwork |
3114 | |
3115 | === modified file 'debian/changelog' |
3116 | --- debian/changelog 2011-06-29 13:57:16 +0000 |
3117 | +++ debian/changelog 2012-09-13 14:46:32 +0000 |
3118 | @@ -1,3 +1,16 @@ |
3119 | +ubuntu-geoip (1.0.0-0ubuntu1~ppa1) quantal; urgency=low |
3120 | + |
3121 | + * New upstream release. |
3122 | + * Clearing cached data when we loose networking |
3123 | + * Fixing a bug with NM status |
3124 | + * Providing updates instead of cacheable for better Master work |
3125 | + * NM Status updates |
3126 | + * Adding a setting for the URL |
3127 | + * debian/rules: Autoreconf love |
3128 | + * debian/patches: Dropping as moved upstream |
3129 | + |
3130 | + -- Ted Gould <ted@ubuntu.com> Thu, 13 Sep 2012 09:42:07 -0500 |
3131 | + |
3132 | ubuntu-geoip (0.0.2-0ubuntu6) oneiric; urgency=low |
3133 | |
3134 | * debian/patches/NM_0_9_api.patch: update to support the new NM 0.9 API. |
3135 | |
3136 | === removed directory 'debian/patches' |
3137 | === removed file 'debian/patches/NM_0_9_api.patch' |
3138 | --- debian/patches/NM_0_9_api.patch 2011-06-29 13:52:31 +0000 |
3139 | +++ debian/patches/NM_0_9_api.patch 1970-01-01 00:00:00 +0000 |
3140 | @@ -1,33 +0,0 @@ |
3141 | -From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> |
3142 | -Subject: Update to support the new NM API introduced in 0.9. |
3143 | -Last-Update: 2011-06-29 |
3144 | - |
3145 | -Index: ubuntu-geoip/configure.ac |
3146 | -=================================================================== |
3147 | ---- ubuntu-geoip.orig/configure.ac 2011-06-29 07:28:22.325358469 -0400 |
3148 | -+++ ubuntu-geoip/configure.ac 2011-06-29 09:47:55.086307195 -0400 |
3149 | -@@ -27,7 +27,7 @@ |
3150 | - GEOCLUE_REQUIRED_VERSION=0.12.0 |
3151 | - GLIB_REQUIRED_VERSION=2.26.0 |
3152 | - SOUP_REQUIRED_VERSION=2.31.0 |
3153 | --NM_REQUIRED_VERSION=0.8.0 |
3154 | -+NM_REQUIRED_VERSION=0.8.998 |
3155 | - |
3156 | - PKG_CHECK_MODULES(PROVIDER, glib-2.0 >= $GLIB_REQUIRED_VERSION |
3157 | - geoclue >= GEOCLUE_REQUIRED_VERSION |
3158 | -Index: ubuntu-geoip/src/ubuntu-geoip-provider.c |
3159 | -=================================================================== |
3160 | ---- ubuntu-geoip.orig/src/ubuntu-geoip-provider.c 2011-06-29 09:47:53.696307193 -0400 |
3161 | -+++ ubuntu-geoip/src/ubuntu-geoip-provider.c 2011-06-29 09:47:55.086307195 -0400 |
3162 | -@@ -565,7 +565,10 @@ |
3163 | - g_return_if_fail(provider != NULL); |
3164 | - |
3165 | - NMState state = nm_client_get_state (provider->priv->client); |
3166 | -- gboolean connected = !(state == NM_STATE_CONNECTING || state == NM_STATE_DISCONNECTED); |
3167 | -+ gboolean connected = !(state == NM_STATE_CONNECTING || |
3168 | -+ state == NM_STATE_DISCONNECTING || |
3169 | -+ state == NM_STATE_DISCONNECTED || |
3170 | -+ state == NM_STATE_ASLEEP); |
3171 | - |
3172 | - if (provider->priv->connected != connected) { |
3173 | - /* Either way we want to refresh */ |
3174 | |
3175 | === removed file 'debian/patches/debian-changes-0.0.2-0ubuntu5' |
3176 | --- debian/patches/debian-changes-0.0.2-0ubuntu5 2011-06-29 13:41:31 +0000 |
3177 | +++ debian/patches/debian-changes-0.0.2-0ubuntu5 1970-01-01 00:00:00 +0000 |
3178 | @@ -1,38 +0,0 @@ |
3179 | -Description: Upstream changes introduced in version 0.0.2-0ubuntu5 |
3180 | - This patch has been created by dpkg-source during the package build. |
3181 | - Here's the last changelog entry, hopefully it gives details on why |
3182 | - those changes were made: |
3183 | - . |
3184 | - ubuntu-geoip (0.0.2-0ubuntu5) natty; urgency=low |
3185 | - . |
3186 | - * Per RFC 2616 use upper case for GET request thanks to Andrew Glen-Young |
3187 | - for the patch (LP: #719324) |
3188 | - . |
3189 | - The person named in the Author field signed this changelog entry. |
3190 | -Author: Brian Murray <brian@ubuntu.com> |
3191 | -Bug-Ubuntu: https://bugs.launchpad.net/bugs/719324 |
3192 | - |
3193 | ---- |
3194 | -The information above should follow the Patch Tagging Guidelines, please |
3195 | -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here |
3196 | -are templates for supplementary fields that you might want to add: |
3197 | - |
3198 | -Origin: <vendor|upstream|other>, <url of original patch> |
3199 | -Bug: <url in upstream bugtracker> |
3200 | -Bug-Debian: http://bugs.debian.org/<bugnumber> |
3201 | -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> |
3202 | -Forwarded: <no|not-needed|url proving that it has been forwarded> |
3203 | -Reviewed-By: <name and email of someone who approved the patch> |
3204 | -Last-Update: <YYYY-MM-DD> |
3205 | - |
3206 | ---- ubuntu-geoip-0.0.2.orig/src/ubuntu-geoip-provider.c |
3207 | -+++ ubuntu-geoip-0.0.2/src/ubuntu-geoip-provider.c |
3208 | -@@ -517,7 +517,7 @@ send_message (UbuntuGeoipProvider *provi |
3209 | - provider->priv->requeue_source = 0; |
3210 | - } |
3211 | - |
3212 | -- SoupMessage * message = soup_message_new("get", "http://geoip.ubuntu.com/lookup"); |
3213 | -+ SoupMessage * message = soup_message_new("GET", "http://geoip.ubuntu.com/lookup"); |
3214 | - g_signal_connect(G_OBJECT(message), "finished", G_CALLBACK(message_finished), provider); |
3215 | - |
3216 | - soup_session_queue_message(provider->priv->soup, message, |
3217 | |
3218 | === removed file 'debian/patches/series' |
3219 | --- debian/patches/series 2011-06-29 13:52:31 +0000 |
3220 | +++ debian/patches/series 1970-01-01 00:00:00 +0000 |
3221 | @@ -1,2 +0,0 @@ |
3222 | -debian-changes-0.0.2-0ubuntu5 |
3223 | -NM_0_9_api.patch |
3224 | |
3225 | === modified file 'debian/rules' |
3226 | --- debian/rules 2010-10-05 20:31:44 +0000 |
3227 | +++ debian/rules 2012-09-13 14:46:32 +0000 |
3228 | @@ -4,4 +4,5 @@ |
3229 | include /usr/share/cdbs/1/class/autotools.mk |
3230 | include /usr/share/cdbs/1/class/gnome.mk |
3231 | include /usr/share/cdbs/1/rules/utils.mk |
3232 | +include /usr/share/cdbs/1/rules/autoreconf.mk |
3233 | |
3234 | |
3235 | === removed directory 'debian/source' |
3236 | === removed file 'debian/source/format' |
3237 | --- debian/source/format 2010-11-15 14:05:13 +0000 |
3238 | +++ debian/source/format 1970-01-01 00:00:00 +0000 |
3239 | @@ -1,1 +0,0 @@ |
3240 | -3.0 (quilt) |
3241 | |
3242 | === modified file 'po/POTFILES.in' |
3243 | --- po/POTFILES.in 2010-10-05 20:08:29 +0000 |
3244 | +++ po/POTFILES.in 2012-09-13 14:46:32 +0000 |
3245 | @@ -0,0 +1,3 @@ |
3246 | +data/com.ubuntu.geoip.gschema.xml.in |
3247 | +src/ubuntu-geoip-provider.h |
3248 | +src/ubuntu-geoip-provider.c |
3249 | |
3250 | === modified file 'src/Makefile.in' |
3251 | --- src/Makefile.in 2010-10-21 21:21:37 +0000 |
3252 | +++ src/Makefile.in 2012-09-13 14:46:32 +0000 |
3253 | @@ -1,9 +1,9 @@ |
3254 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
3255 | +# Makefile.in generated by automake 1.11.5 from Makefile.am. |
3256 | # @configure_input@ |
3257 | |
3258 | # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
3259 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
3260 | -# Inc. |
3261 | +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3262 | +# Foundation, Inc. |
3263 | # This Makefile.in is free software; the Free Software Foundation |
3264 | # gives unlimited permission to copy and/or distribute it, |
3265 | # with or without modifications, as long as this notice is preserved. |
3266 | @@ -16,6 +16,23 @@ |
3267 | @SET_MAKE@ |
3268 | |
3269 | VPATH = @srcdir@ |
3270 | +am__make_dryrun = \ |
3271 | + { \ |
3272 | + am__dry=no; \ |
3273 | + case $$MAKEFLAGS in \ |
3274 | + *\\[\ \ ]*) \ |
3275 | + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
3276 | + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
3277 | + *) \ |
3278 | + for am__flg in $$MAKEFLAGS; do \ |
3279 | + case $$am__flg in \ |
3280 | + *=*|--*) ;; \ |
3281 | + *n*) am__dry=yes; break;; \ |
3282 | + esac; \ |
3283 | + done;; \ |
3284 | + esac; \ |
3285 | + test $$am__dry = yes; \ |
3286 | + } |
3287 | pkgdatadir = $(datadir)/@PACKAGE@ |
3288 | pkgincludedir = $(includedir)/@PACKAGE@ |
3289 | pkglibdir = $(libdir)/@PACKAGE@ |
3290 | @@ -56,27 +73,32 @@ |
3291 | depcomp = $(SHELL) $(top_srcdir)/depcomp |
3292 | am__depfiles_maybe = depfiles |
3293 | am__mv = mv -f |
3294 | -AM_V_lt = $(am__v_lt_$(V)) |
3295 | -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) |
3296 | +AM_V_lt = $(am__v_lt_@AM_V@) |
3297 | +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) |
3298 | am__v_lt_0 = --silent |
3299 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
3300 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
3301 | -AM_V_CC = $(am__v_CC_$(V)) |
3302 | -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) |
3303 | +AM_V_CC = $(am__v_CC_@AM_V@) |
3304 | +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) |
3305 | am__v_CC_0 = @echo " CC " $@; |
3306 | -AM_V_at = $(am__v_at_$(V)) |
3307 | -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) |
3308 | +AM_V_at = $(am__v_at_@AM_V@) |
3309 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
3310 | am__v_at_0 = @ |
3311 | CCLD = $(CC) |
3312 | LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
3313 | -AM_V_CCLD = $(am__v_CCLD_$(V)) |
3314 | -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) |
3315 | +AM_V_CCLD = $(am__v_CCLD_@AM_V@) |
3316 | +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) |
3317 | am__v_CCLD_0 = @echo " CCLD " $@; |
3318 | -AM_V_GEN = $(am__v_GEN_$(V)) |
3319 | -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) |
3320 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
3321 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
3322 | am__v_GEN_0 = @echo " GEN " $@; |
3323 | SOURCES = $(ubuntu_geoip_provider_SOURCES) |
3324 | DIST_SOURCES = $(ubuntu_geoip_provider_SOURCES) |
3325 | +am__can_run_installinfo = \ |
3326 | + case $$AM_UPDATE_INFO_DIR in \ |
3327 | + n|no|NO) false;; \ |
3328 | + *) (install-info --version) >/dev/null 2>&1;; \ |
3329 | + esac |
3330 | ETAGS = etags |
3331 | CTAGS = ctags |
3332 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
3333 | @@ -123,6 +145,10 @@ |
3334 | INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
3335 | INTLTOOL_PERL = @INTLTOOL_PERL@ |
3336 | INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
3337 | +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ |
3338 | +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
3339 | +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
3340 | +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
3341 | LDFLAGS = @LDFLAGS@ |
3342 | LIBOBJS = @LIBOBJS@ |
3343 | LIBS = @LIBS@ |
3344 | @@ -182,6 +208,8 @@ |
3345 | includedir = @includedir@ |
3346 | infodir = @infodir@ |
3347 | install_sh = @install_sh@ |
3348 | +intltool__v_merge_options_ = @intltool__v_merge_options_@ |
3349 | +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ |
3350 | libdir = @libdir@ |
3351 | libexecdir = @libexecdir@ |
3352 | localedir = @localedir@ |
3353 | @@ -248,8 +276,11 @@ |
3354 | $(am__aclocal_m4_deps): |
3355 | install-libexecPROGRAMS: $(libexec_PROGRAMS) |
3356 | @$(NORMAL_INSTALL) |
3357 | - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" |
3358 | @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ |
3359 | + if test -n "$$list"; then \ |
3360 | + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ |
3361 | + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ |
3362 | + fi; \ |
3363 | for p in $$list; do echo "$$p $$p"; done | \ |
3364 | sed 's/$(EXEEXT)$$//' | \ |
3365 | while read p p1; do if test -f $$p; \ |
3366 | @@ -283,7 +314,7 @@ |
3367 | |
3368 | clean-libexecPROGRAMS: |
3369 | -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS) |
3370 | -ubuntu-geoip-provider$(EXEEXT): $(ubuntu_geoip_provider_OBJECTS) $(ubuntu_geoip_provider_DEPENDENCIES) |
3371 | +ubuntu-geoip-provider$(EXEEXT): $(ubuntu_geoip_provider_OBJECTS) $(ubuntu_geoip_provider_DEPENDENCIES) $(EXTRA_ubuntu_geoip_provider_DEPENDENCIES) |
3372 | @rm -f ubuntu-geoip-provider$(EXEEXT) |
3373 | $(AM_V_CCLD)$(ubuntu_geoip_provider_LINK) $(ubuntu_geoip_provider_OBJECTS) $(ubuntu_geoip_provider_LDADD) $(LIBS) |
3374 | |
3375 | @@ -298,34 +329,30 @@ |
3376 | .c.o: |
3377 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
3378 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
3379 | -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
3380 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
3381 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
3382 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
3383 | -@am__fastdepCC_FALSE@ $(COMPILE) -c $< |
3384 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< |
3385 | |
3386 | .c.obj: |
3387 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
3388 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
3389 | -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
3390 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
3391 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
3392 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
3393 | -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` |
3394 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` |
3395 | |
3396 | ubuntu_geoip_provider-ubuntu-geoip-provider.o: ubuntu-geoip-provider.c |
3397 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ubuntu_geoip_provider_CFLAGS) $(CFLAGS) -MT ubuntu_geoip_provider-ubuntu-geoip-provider.o -MD -MP -MF $(DEPDIR)/ubuntu_geoip_provider-ubuntu-geoip-provider.Tpo -c -o ubuntu_geoip_provider-ubuntu-geoip-provider.o `test -f 'ubuntu-geoip-provider.c' || echo '$(srcdir)/'`ubuntu-geoip-provider.c |
3398 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ubuntu_geoip_provider-ubuntu-geoip-provider.Tpo $(DEPDIR)/ubuntu_geoip_provider-ubuntu-geoip-provider.Po |
3399 | -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
3400 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ubuntu-geoip-provider.c' object='ubuntu_geoip_provider-ubuntu-geoip-provider.o' libtool=no @AMDEPBACKSLASH@ |
3401 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ubuntu-geoip-provider.c' object='ubuntu_geoip_provider-ubuntu-geoip-provider.o' libtool=no @AMDEPBACKSLASH@ |
3402 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
3403 | -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ubuntu_geoip_provider_CFLAGS) $(CFLAGS) -c -o ubuntu_geoip_provider-ubuntu-geoip-provider.o `test -f 'ubuntu-geoip-provider.c' || echo '$(srcdir)/'`ubuntu-geoip-provider.c |
3404 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ubuntu_geoip_provider_CFLAGS) $(CFLAGS) -c -o ubuntu_geoip_provider-ubuntu-geoip-provider.o `test -f 'ubuntu-geoip-provider.c' || echo '$(srcdir)/'`ubuntu-geoip-provider.c |
3405 | |
3406 | ubuntu_geoip_provider-ubuntu-geoip-provider.obj: ubuntu-geoip-provider.c |
3407 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ubuntu_geoip_provider_CFLAGS) $(CFLAGS) -MT ubuntu_geoip_provider-ubuntu-geoip-provider.obj -MD -MP -MF $(DEPDIR)/ubuntu_geoip_provider-ubuntu-geoip-provider.Tpo -c -o ubuntu_geoip_provider-ubuntu-geoip-provider.obj `if test -f 'ubuntu-geoip-provider.c'; then $(CYGPATH_W) 'ubuntu-geoip-provider.c'; else $(CYGPATH_W) '$(srcdir)/ubuntu-geoip-provider.c'; fi` |
3408 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ubuntu_geoip_provider-ubuntu-geoip-provider.Tpo $(DEPDIR)/ubuntu_geoip_provider-ubuntu-geoip-provider.Po |
3409 | -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
3410 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ubuntu-geoip-provider.c' object='ubuntu_geoip_provider-ubuntu-geoip-provider.obj' libtool=no @AMDEPBACKSLASH@ |
3411 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ubuntu-geoip-provider.c' object='ubuntu_geoip_provider-ubuntu-geoip-provider.obj' libtool=no @AMDEPBACKSLASH@ |
3412 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
3413 | -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ubuntu_geoip_provider_CFLAGS) $(CFLAGS) -c -o ubuntu_geoip_provider-ubuntu-geoip-provider.obj `if test -f 'ubuntu-geoip-provider.c'; then $(CYGPATH_W) 'ubuntu-geoip-provider.c'; else $(CYGPATH_W) '$(srcdir)/ubuntu-geoip-provider.c'; fi` |
3414 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ubuntu_geoip_provider_CFLAGS) $(CFLAGS) -c -o ubuntu_geoip_provider-ubuntu-geoip-provider.obj `if test -f 'ubuntu-geoip-provider.c'; then $(CYGPATH_W) 'ubuntu-geoip-provider.c'; else $(CYGPATH_W) '$(srcdir)/ubuntu-geoip-provider.c'; fi` |
3415 | |
3416 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
3417 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
3418 | @@ -426,10 +453,15 @@ |
3419 | |
3420 | installcheck: installcheck-am |
3421 | install-strip: |
3422 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3423 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3424 | - `test -z '$(STRIP)' || \ |
3425 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
3426 | + if test -z '$(STRIP)'; then \ |
3427 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3428 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3429 | + install; \ |
3430 | + else \ |
3431 | + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
3432 | + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
3433 | + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ |
3434 | + fi |
3435 | mostlyclean-generic: |
3436 | |
3437 | clean-generic: |
3438 | |
3439 | === modified file 'src/ubuntu-geoip-provider.c' |
3440 | --- src/ubuntu-geoip-provider.c 2010-10-21 20:37:40 +0000 |
3441 | +++ src/ubuntu-geoip-provider.c 2012-09-13 14:46:32 +0000 |
3442 | @@ -42,6 +42,8 @@ |
3443 | #define REQUEUE_MAX_SEC (60 * 60) |
3444 | #define REQUEUE_SCALE 2 |
3445 | |
3446 | +#define GEOIP_URL "geoip-url" |
3447 | + |
3448 | typedef enum _MarkupField MarkupField; |
3449 | enum _MarkupField { |
3450 | /* Address */ |
3451 | @@ -73,6 +75,7 @@ |
3452 | { |
3453 | SoupSession * soup; |
3454 | NMClient * client; |
3455 | + GSettings * settings; |
3456 | |
3457 | /* Markup thingies */ |
3458 | GMarkupParseContext * context; |
3459 | @@ -91,7 +94,7 @@ |
3460 | gchar * timezone; |
3461 | |
3462 | /* State variables */ |
3463 | - gboolean connected; |
3464 | + NMState network_state; |
3465 | gboolean gotdata; |
3466 | |
3467 | /* Requeue variables */ |
3468 | @@ -149,6 +152,9 @@ |
3469 | gsize text_len, |
3470 | gpointer user_data, |
3471 | GError ** error); |
3472 | +static void url_changed (GSettings * settings, |
3473 | + char * key, |
3474 | + gpointer user_data); |
3475 | |
3476 | static GMarkupParser parser_struct = { |
3477 | start_element: markup_start, |
3478 | @@ -182,6 +188,22 @@ |
3479 | return; |
3480 | } |
3481 | |
3482 | +/* Check to see if a schema exists */ |
3483 | +static gboolean |
3484 | +settings_schema_exists (const gchar * schema) |
3485 | +{ |
3486 | + const gchar * const * schemas = g_settings_list_schemas(); |
3487 | + int i; |
3488 | + |
3489 | + for (i = 0; schemas[i] != NULL; i++) { |
3490 | + if (g_strcmp0(schemas[i], schema) == 0) { |
3491 | + return TRUE; |
3492 | + } |
3493 | + } |
3494 | + |
3495 | + return FALSE; |
3496 | +} |
3497 | + |
3498 | /* Make everything consistent */ |
3499 | static void |
3500 | ubuntu_geoip_provider_init (UbuntuGeoipProvider *self) |
3501 | @@ -191,10 +213,11 @@ |
3502 | /* Init */ |
3503 | self->priv->soup = NULL; |
3504 | self->priv->client = NULL; |
3505 | + self->priv->settings = NULL; |
3506 | |
3507 | self->priv->latitude = 0.0; |
3508 | self->priv->longitude = 0.0; |
3509 | - self->priv->connected = FALSE; |
3510 | + self->priv->network_state = NM_STATE_UNKNOWN; |
3511 | self->priv->gotdata = FALSE; |
3512 | |
3513 | self->priv->country_code = NULL; |
3514 | @@ -214,6 +237,12 @@ |
3515 | /* Build Parser */ |
3516 | self->priv->context = g_markup_parse_context_new(&parser_struct, 0, &self->priv->markup_data, NULL); |
3517 | |
3518 | + /* Set up settings */ |
3519 | + if (settings_schema_exists("com.ubuntu.geoip")) { |
3520 | + self->priv->settings = g_settings_new("com.ubuntu.geoip"); |
3521 | + g_signal_connect(G_OBJECT(self->priv->settings), "changed::" GEOIP_URL, G_CALLBACK(url_changed), self); |
3522 | + } |
3523 | + |
3524 | /* Allocate */ |
3525 | self->priv->soup = soup_session_async_new(); |
3526 | self->priv->client = nm_client_new(); |
3527 | @@ -257,6 +286,11 @@ |
3528 | provider->priv->context = NULL; |
3529 | } |
3530 | |
3531 | + if (provider->priv->settings != NULL) { |
3532 | + g_object_unref(provider->priv->settings); |
3533 | + provider->priv->settings = NULL; |
3534 | + } |
3535 | + |
3536 | G_OBJECT_CLASS (ubuntu_geoip_provider_parent_class)->dispose (object); |
3537 | return; |
3538 | } |
3539 | @@ -302,6 +336,25 @@ |
3540 | return; |
3541 | } |
3542 | |
3543 | +/* Something could change our URL settings, if so we need to respond |
3544 | + and start getting the new data */ |
3545 | +static void |
3546 | +url_changed (GSettings * settings, char * key, gpointer user_data) |
3547 | +{ |
3548 | + UbuntuGeoipProvider *provider = UBUNTU_GEOIP_PROVIDER(user_data); |
3549 | + g_return_if_fail(provider != NULL); |
3550 | + |
3551 | + /* If we've got a network connection we care, otherwise we don't |
3552 | + have a reason to use the new URL */ |
3553 | + if (provider->priv->network_state == NM_STATE_CONNECTED_GLOBAL) { |
3554 | + provider->priv->gotdata = FALSE; |
3555 | + gc_iface_geoclue_emit_status_changed(GC_IFACE_GEOCLUE(provider), GEOCLUE_STATUS_ACQUIRING); |
3556 | + send_message(provider); |
3557 | + } |
3558 | + |
3559 | + return; |
3560 | +} |
3561 | + |
3562 | /* Respond to a request to shutdown from the GeoClue provider |
3563 | interface. */ |
3564 | static void |
3565 | @@ -319,13 +372,17 @@ |
3566 | UbuntuGeoipProvider *provider = UBUNTU_GEOIP_PROVIDER(geoclue); |
3567 | g_return_val_if_fail(provider != NULL, FALSE); |
3568 | |
3569 | - if (provider->priv->connected == FALSE) { |
3570 | + if (provider->priv->network_state != NM_STATE_CONNECTED_GLOBAL && |
3571 | + provider->priv->network_state != NM_STATE_CONNECTING) { |
3572 | *status = GEOCLUE_STATUS_UNAVAILABLE; |
3573 | + } else if (provider->priv->network_state == NM_STATE_CONNECTING) { |
3574 | + *status = GEOCLUE_STATUS_ACQUIRING; |
3575 | } else if (provider->priv->gotdata == FALSE) { |
3576 | *status = GEOCLUE_STATUS_ACQUIRING; |
3577 | } else { |
3578 | *status = GEOCLUE_STATUS_AVAILABLE; |
3579 | } |
3580 | + |
3581 | return TRUE; |
3582 | } |
3583 | |
3584 | @@ -442,6 +499,10 @@ |
3585 | |
3586 | if (g_markup_parse_context_parse(provider->priv->context, message->response_body->data, message->response_body->length, NULL) == FALSE) { |
3587 | g_warning("Unable to parse the data from the geoip provider"); |
3588 | + |
3589 | + g_clear_object(&provider->priv->context); |
3590 | + provider->priv->context = g_markup_parse_context_new(&parser_struct, 0, &provider->priv->markup_data, NULL); |
3591 | + |
3592 | queue_message(provider); |
3593 | return; |
3594 | } |
3595 | @@ -454,8 +515,9 @@ |
3596 | |
3597 | provider->priv->requeue_time = REQUEUE_MIN_SEC; |
3598 | |
3599 | + gboolean emit = FALSE; |
3600 | if (provider->priv->gotdata == FALSE) { |
3601 | - gc_iface_geoclue_emit_status_changed(GC_IFACE_GEOCLUE(provider), GEOCLUE_STATUS_AVAILABLE); |
3602 | + emit = TRUE; |
3603 | } |
3604 | provider->priv->gotdata = TRUE; |
3605 | |
3606 | @@ -491,6 +553,11 @@ |
3607 | geoclue_accuracy_free(accuracy); |
3608 | } |
3609 | |
3610 | + if (emit) { |
3611 | + g_debug("Emitting Available"); |
3612 | + gc_iface_geoclue_emit_status_changed(GC_IFACE_GEOCLUE(provider), GEOCLUE_STATUS_AVAILABLE); |
3613 | + } |
3614 | + |
3615 | return; |
3616 | } |
3617 | |
3618 | @@ -505,6 +572,22 @@ |
3619 | return; |
3620 | } |
3621 | |
3622 | +/* Handle events that can be errors */ |
3623 | +static void |
3624 | +message_network_event (SoupMessage * message, GSocketClientEvent event, GIOStream * connection, gpointer user_data) |
3625 | +{ |
3626 | + UbuntuGeoipProvider *provider = UBUNTU_GEOIP_PROVIDER(user_data); |
3627 | + g_return_if_fail(provider != NULL); |
3628 | + |
3629 | + if (event == G_SOCKET_CLIENT_COMPLETE && connection == NULL) { |
3630 | + /* This is the error condition */ |
3631 | + g_warning("Network connection error"); |
3632 | + queue_message(provider); |
3633 | + } |
3634 | + |
3635 | + return; |
3636 | +} |
3637 | + |
3638 | /* Sends the message to the GeoIP service and sets up some |
3639 | callbacks for fun */ |
3640 | static void |
3641 | @@ -512,14 +595,30 @@ |
3642 | { |
3643 | g_return_if_fail(provider->priv->soup != NULL); |
3644 | |
3645 | + /* Insure that we reset our timeout as we're fulfilling it */ |
3646 | if (provider->priv->requeue_source != 0) { |
3647 | g_source_remove(provider->priv->requeue_source); |
3648 | provider->priv->requeue_source = 0; |
3649 | } |
3650 | |
3651 | - SoupMessage * message = soup_message_new("get", "http://geoip.ubuntu.com/lookup"); |
3652 | + /* Grab the URL from the settings if we have it */ |
3653 | + gchar * url = NULL; |
3654 | + if (provider->priv->settings != NULL) { |
3655 | + url = g_settings_get_string(provider->priv->settings, GEOIP_URL); |
3656 | + } else { |
3657 | + url = g_strdup("http://geoip.ubuntu.com/lookup"); |
3658 | + } |
3659 | + g_debug("Using GeoIP URL: %s", url); |
3660 | + |
3661 | + /* Build the message to send */ |
3662 | + SoupMessage * message = soup_message_new("GET", url); |
3663 | g_signal_connect(G_OBJECT(message), "finished", G_CALLBACK(message_finished), provider); |
3664 | - |
3665 | + g_signal_connect(G_OBJECT(message), "network-event", G_CALLBACK(message_network_event), provider); |
3666 | + |
3667 | + g_free(url); |
3668 | + url = NULL; |
3669 | + |
3670 | + /* Ask SOUP to hit the interwebs for us */ |
3671 | soup_session_queue_message(provider->priv->soup, message, |
3672 | message_complete, provider); |
3673 | |
3674 | @@ -547,6 +646,7 @@ |
3675 | return; |
3676 | } |
3677 | |
3678 | + g_debug("Queuing up new message"); |
3679 | provider->priv->requeue_time *= REQUEUE_SCALE; |
3680 | if (provider->priv->requeue_time > REQUEUE_MAX_SEC) { |
3681 | provider->priv->requeue_time = REQUEUE_MAX_SEC; |
3682 | @@ -557,6 +657,94 @@ |
3683 | return; |
3684 | } |
3685 | |
3686 | +/* Change the position to be zero and emit it if it changed */ |
3687 | +static void |
3688 | +clear_position (UbuntuGeoipProvider * provider) |
3689 | +{ |
3690 | + if (provider->priv->latitude == 0.0 && provider->priv->longitude == 0.0) { |
3691 | + /* We didn't have any data */ |
3692 | + return; |
3693 | + } |
3694 | + |
3695 | + provider->priv->latitude = 0.0; |
3696 | + provider->priv->longitude = 0.0; |
3697 | + |
3698 | + g_debug("Position Cleared"); |
3699 | + |
3700 | + GeoclueAccuracy * accuracy = geoclue_accuracy_new (GEOCLUE_ACCURACY_LEVEL_NONE, 0.0, 0.0); |
3701 | + gc_iface_position_emit_position_changed(GC_IFACE_POSITION(provider), |
3702 | + time(NULL), |
3703 | + GEOCLUE_POSITION_FIELDS_NONE, |
3704 | + provider->priv->latitude, |
3705 | + provider->priv->longitude, |
3706 | + 0, /* Altitude */ |
3707 | + accuracy); |
3708 | + |
3709 | + geoclue_accuracy_free(accuracy); |
3710 | + |
3711 | + return; |
3712 | +} |
3713 | + |
3714 | +/* Change the address to be clear and emit it if it changed */ |
3715 | +static void |
3716 | +clear_address (UbuntuGeoipProvider * provider) |
3717 | +{ |
3718 | + if (provider->priv->country_code == NULL && |
3719 | + provider->priv->country_name == NULL && |
3720 | + provider->priv->region_name == NULL && |
3721 | + provider->priv->city == NULL && |
3722 | + provider->priv->postal_code == NULL && |
3723 | + provider->priv->timezone == NULL) { |
3724 | + /* We don't have any data to clear */ |
3725 | + return; |
3726 | + } |
3727 | + |
3728 | + if (provider->priv->country_code != NULL) { |
3729 | + g_free(provider->priv->country_code); |
3730 | + provider->priv->country_code = NULL; |
3731 | + } |
3732 | + |
3733 | + if (provider->priv->country_name != NULL) { |
3734 | + g_free(provider->priv->country_name); |
3735 | + provider->priv->country_name = NULL; |
3736 | + } |
3737 | + |
3738 | + if (provider->priv->region_name != NULL) { |
3739 | + g_free(provider->priv->region_name); |
3740 | + provider->priv->region_name = NULL; |
3741 | + } |
3742 | + |
3743 | + if (provider->priv->city != NULL) { |
3744 | + g_free(provider->priv->city); |
3745 | + provider->priv->city = NULL; |
3746 | + } |
3747 | + |
3748 | + if (provider->priv->postal_code != NULL) { |
3749 | + g_free(provider->priv->postal_code); |
3750 | + provider->priv->postal_code = NULL; |
3751 | + } |
3752 | + |
3753 | + if (provider->priv->timezone != NULL) { |
3754 | + g_free(provider->priv->timezone); |
3755 | + provider->priv->timezone = NULL; |
3756 | + } |
3757 | + |
3758 | + g_debug("Address Cleared"); |
3759 | + |
3760 | + GHashTable * address = geoclue_address_details_new(); |
3761 | + GeoclueAccuracy * accuracy = geoclue_accuracy_new (GEOCLUE_ACCURACY_LEVEL_NONE, 0.0, 0.0); |
3762 | + |
3763 | + gc_iface_address_emit_address_changed(GC_IFACE_ADDRESS(provider), |
3764 | + time(NULL), |
3765 | + address, |
3766 | + accuracy); |
3767 | + |
3768 | + geoclue_accuracy_free(accuracy); |
3769 | + g_hash_table_unref(address); |
3770 | + |
3771 | + return; |
3772 | +} |
3773 | + |
3774 | /* Callback for when the Network Manger state changes */ |
3775 | static void |
3776 | nm_state_change (NMClient *client, const GParamSpec *pspec, gpointer user_data) |
3777 | @@ -565,20 +753,25 @@ |
3778 | g_return_if_fail(provider != NULL); |
3779 | |
3780 | NMState state = nm_client_get_state (provider->priv->client); |
3781 | - gboolean connected = !(state == NM_STATE_CONNECTING || state == NM_STATE_DISCONNECTED); |
3782 | |
3783 | - if (provider->priv->connected != connected) { |
3784 | + if (provider->priv->network_state != state) { |
3785 | /* Either way we want to refresh */ |
3786 | provider->priv->gotdata = FALSE; |
3787 | - if (connected) { |
3788 | + provider->priv->network_state = state; |
3789 | + |
3790 | + clear_position(provider); |
3791 | + clear_address(provider); |
3792 | + |
3793 | + if (state == NM_STATE_CONNECTED_GLOBAL) { |
3794 | g_debug("Network connected"); |
3795 | gc_iface_geoclue_emit_status_changed(GC_IFACE_GEOCLUE(provider), GEOCLUE_STATUS_ACQUIRING); |
3796 | - provider->priv->connected = TRUE; |
3797 | send_message(provider); |
3798 | + } else if (state == NM_STATE_CONNECTING) { |
3799 | + g_debug("Network connecting"); |
3800 | + gc_iface_geoclue_emit_status_changed(GC_IFACE_GEOCLUE(provider), GEOCLUE_STATUS_ACQUIRING); |
3801 | } else { |
3802 | g_debug("Network lost"); |
3803 | gc_iface_geoclue_emit_status_changed(GC_IFACE_GEOCLUE(provider), GEOCLUE_STATUS_UNAVAILABLE); |
3804 | - provider->priv->connected = FALSE; |
3805 | } |
3806 | } |
3807 |