Merge lp:~indicator-applet-developers/ubuntu/precise/appmenu-gtk/upstream into lp:~ubuntu-desktop/appmenu-gtk/ubuntu
- Precise (12.04)
- upstream
- Merge into ubuntu
Proposed by
Ted Gould
Status: | Merged | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 80 | ||||||||||||
Proposed branch: | lp:~indicator-applet-developers/ubuntu/precise/appmenu-gtk/upstream | ||||||||||||
Merge into: | lp:~ubuntu-desktop/appmenu-gtk/ubuntu | ||||||||||||
Diff against target: |
3660 lines (+522/-1662) 25 files modified
Makefile.am (+0/-5) Makefile.in (+0/-12) aclocal.m4 (+0/-1) build/Makefile.am (+0/-1) build/Makefile.in (+0/-582) build/autotools/Makefile.am (+0/-3) build/autotools/Makefile.in (+0/-387) build/autotools/gtk-doc.m4 (+0/-39) build/autotools/introspection.m4 (+0/-88) build/autotools/libtool.m4 (+207/-57) build/autotools/ltoptions.m4 (+17/-2) build/autotools/ltversion.m4 (+5/-5) build/autotools/shave-libtool.in (+0/-73) build/autotools/shave.in (+0/-79) build/autotools/shave.m4 (+0/-77) config.h.in (+3/-0) configure (+157/-182) configure.ac (+8/-12) debian/changelog (+17/-0) debian/compat (+1/-0) debian/control (+3/-2) debian/rules (+1/-1) ltmain.sh (+57/-38) src/Makefile.in (+0/-10) src/bridge.c (+46/-6) |
||||||||||||
To merge this branch: | bzr merge lp:~indicator-applet-developers/ubuntu/precise/appmenu-gtk/upstream | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Pending | ||
Review via email: mp+92070@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile.am' |
2 | --- Makefile.am 2011-05-08 22:44:19 +0000 |
3 | +++ Makefile.am 2012-02-08 16:47:26 +0000 |
4 | @@ -1,11 +1,6 @@ |
5 | ACLOCAL_AMFLAGS = -I build/autotools |
6 | |
7 | -V = @ |
8 | -Q = $(V:1=) |
9 | -QUIET_GEN = $(Q:@=@echo ' GEN '$@;) |
10 | - |
11 | SUBDIRS = \ |
12 | - build \ |
13 | src |
14 | |
15 | $(sessionfile): 80appmenu.in |
16 | |
17 | === modified file 'Makefile.in' |
18 | --- Makefile.in 2011-09-29 14:48:54 +0000 |
19 | +++ Makefile.in 2012-02-08 16:47:26 +0000 |
20 | @@ -46,7 +46,6 @@ |
21 | $(top_srcdir)/build/autotools/ltsugar.m4 \ |
22 | $(top_srcdir)/build/autotools/ltversion.m4 \ |
23 | $(top_srcdir)/build/autotools/lt~obsolete.m4 \ |
24 | - $(top_srcdir)/build/autotools/shave.m4 \ |
25 | $(top_srcdir)/configure.ac |
26 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
27 | $(ACLOCAL_M4) |
28 | @@ -141,7 +140,6 @@ |
29 | ACLOCAL = @ACLOCAL@ |
30 | AMTAR = @AMTAR@ |
31 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
32 | -AM_MAKEFLAGS = @AM_MAKEFLAGS@ |
33 | APPMENU_CFLAGS = @APPMENU_CFLAGS@ |
34 | APPMENU_LIBS = @APPMENU_LIBS@ |
35 | AR = @AR@ |
36 | @@ -154,7 +152,6 @@ |
37 | CFLAGS = @CFLAGS@ |
38 | CPP = @CPP@ |
39 | CPPFLAGS = @CPPFLAGS@ |
40 | -CXX = @CXX@ |
41 | CYGPATH_W = @CYGPATH_W@ |
42 | DEFS = @DEFS@ |
43 | DEPDIR = @DEPDIR@ |
44 | @@ -166,8 +163,6 @@ |
45 | ECHO_T = @ECHO_T@ |
46 | EGREP = @EGREP@ |
47 | EXEEXT = @EXEEXT@ |
48 | -F77 = @F77@ |
49 | -FC = @FC@ |
50 | FGREP = @FGREP@ |
51 | GREP = @GREP@ |
52 | INSTALL = @INSTALL@ |
53 | @@ -184,13 +179,11 @@ |
54 | LN_S = @LN_S@ |
55 | LTLIBOBJS = @LTLIBOBJS@ |
56 | MAINT = @MAINT@ |
57 | -MAKEFLAGS = @MAKEFLAGS@ |
58 | MAKEINFO = @MAKEINFO@ |
59 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
60 | MKDIR_P = @MKDIR_P@ |
61 | NM = @NM@ |
62 | NMEDIT = @NMEDIT@ |
63 | -OBJC = @OBJC@ |
64 | OBJDUMP = @OBJDUMP@ |
65 | OBJEXT = @OBJEXT@ |
66 | OTOOL = @OTOOL@ |
67 | @@ -206,13 +199,11 @@ |
68 | PKG_CONFIG = @PKG_CONFIG@ |
69 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
70 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
71 | -Q = $(V:1=) |
72 | RANLIB = @RANLIB@ |
73 | SED = @SED@ |
74 | SET_MAKE = @SET_MAKE@ |
75 | SHELL = @SHELL@ |
76 | STRIP = @STRIP@ |
77 | -V = @ |
78 | VERSION = @VERSION@ |
79 | abs_builddir = @abs_builddir@ |
80 | abs_srcdir = @abs_srcdir@ |
81 | @@ -262,7 +253,6 @@ |
82 | sbindir = @sbindir@ |
83 | sessionfile = @sessionfile@ |
84 | sharedstatedir = @sharedstatedir@ |
85 | -shavedir = @shavedir@ |
86 | srcdir = @srcdir@ |
87 | sysconfdir = @sysconfdir@ |
88 | target_alias = @target_alias@ |
89 | @@ -270,9 +260,7 @@ |
90 | top_builddir = @top_builddir@ |
91 | top_srcdir = @top_srcdir@ |
92 | ACLOCAL_AMFLAGS = -I build/autotools |
93 | -QUIET_GEN = $(Q:@=@echo ' GEN '$@;) |
94 | SUBDIRS = \ |
95 | - build \ |
96 | src |
97 | |
98 | xsessiondir = $(sysconfdir)/X11/Xsession.d |
99 | |
100 | === modified file 'aclocal.m4' |
101 | --- aclocal.m4 2011-09-29 14:48:54 +0000 |
102 | +++ aclocal.m4 2012-02-08 16:47:26 +0000 |
103 | @@ -1228,4 +1228,3 @@ |
104 | m4_include([build/autotools/ltsugar.m4]) |
105 | m4_include([build/autotools/ltversion.m4]) |
106 | m4_include([build/autotools/lt~obsolete.m4]) |
107 | -m4_include([build/autotools/shave.m4]) |
108 | |
109 | === removed file 'build/Makefile.am' |
110 | --- build/Makefile.am 2010-05-27 20:02:28 +0000 |
111 | +++ build/Makefile.am 1970-01-01 00:00:00 +0000 |
112 | @@ -1,1 +0,0 @@ |
113 | -SUBDIRS = autotools |
114 | |
115 | === removed file 'build/Makefile.in' |
116 | --- build/Makefile.in 2011-09-29 14:48:54 +0000 |
117 | +++ build/Makefile.in 1970-01-01 00:00:00 +0000 |
118 | @@ -1,582 +0,0 @@ |
119 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
120 | -# @configure_input@ |
121 | - |
122 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
123 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
124 | -# Inc. |
125 | -# This Makefile.in is free software; the Free Software Foundation |
126 | -# gives unlimited permission to copy and/or distribute it, |
127 | -# with or without modifications, as long as this notice is preserved. |
128 | - |
129 | -# This program is distributed in the hope that it will be useful, |
130 | -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
131 | -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
132 | -# PARTICULAR PURPOSE. |
133 | - |
134 | -@SET_MAKE@ |
135 | -VPATH = @srcdir@ |
136 | -pkgdatadir = $(datadir)/@PACKAGE@ |
137 | -pkgincludedir = $(includedir)/@PACKAGE@ |
138 | -pkglibdir = $(libdir)/@PACKAGE@ |
139 | -pkglibexecdir = $(libexecdir)/@PACKAGE@ |
140 | -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
141 | -install_sh_DATA = $(install_sh) -c -m 644 |
142 | -install_sh_PROGRAM = $(install_sh) -c |
143 | -install_sh_SCRIPT = $(install_sh) -c |
144 | -INSTALL_HEADER = $(INSTALL_DATA) |
145 | -transform = $(program_transform_name) |
146 | -NORMAL_INSTALL = : |
147 | -PRE_INSTALL = : |
148 | -POST_INSTALL = : |
149 | -NORMAL_UNINSTALL = : |
150 | -PRE_UNINSTALL = : |
151 | -POST_UNINSTALL = : |
152 | -build_triplet = @build@ |
153 | -host_triplet = @host@ |
154 | -subdir = build |
155 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
156 | -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
157 | -am__aclocal_m4_deps = $(top_srcdir)/build/autotools/libtool.m4 \ |
158 | - $(top_srcdir)/build/autotools/ltoptions.m4 \ |
159 | - $(top_srcdir)/build/autotools/ltsugar.m4 \ |
160 | - $(top_srcdir)/build/autotools/ltversion.m4 \ |
161 | - $(top_srcdir)/build/autotools/lt~obsolete.m4 \ |
162 | - $(top_srcdir)/build/autotools/shave.m4 \ |
163 | - $(top_srcdir)/configure.ac |
164 | -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
165 | - $(ACLOCAL_M4) |
166 | -mkinstalldirs = $(install_sh) -d |
167 | -CONFIG_HEADER = $(top_builddir)/config.h |
168 | -CONFIG_CLEAN_FILES = |
169 | -CONFIG_CLEAN_VPATH_FILES = |
170 | -AM_V_GEN = $(am__v_GEN_$(V)) |
171 | -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) |
172 | -am__v_GEN_0 = @echo " GEN " $@; |
173 | -AM_V_at = $(am__v_at_$(V)) |
174 | -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) |
175 | -am__v_at_0 = @ |
176 | -SOURCES = |
177 | -DIST_SOURCES = |
178 | -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
179 | - html-recursive info-recursive install-data-recursive \ |
180 | - install-dvi-recursive install-exec-recursive \ |
181 | - install-html-recursive install-info-recursive \ |
182 | - install-pdf-recursive install-ps-recursive install-recursive \ |
183 | - installcheck-recursive installdirs-recursive pdf-recursive \ |
184 | - ps-recursive uninstall-recursive |
185 | -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
186 | - distclean-recursive maintainer-clean-recursive |
187 | -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
188 | - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
189 | - distdir |
190 | -ETAGS = etags |
191 | -CTAGS = ctags |
192 | -DIST_SUBDIRS = $(SUBDIRS) |
193 | -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
194 | -am__relativize = \ |
195 | - dir0=`pwd`; \ |
196 | - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ |
197 | - sed_rest='s,^[^/]*/*,,'; \ |
198 | - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ |
199 | - sed_butlast='s,/*[^/]*$$,,'; \ |
200 | - while test -n "$$dir1"; do \ |
201 | - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ |
202 | - if test "$$first" != "."; then \ |
203 | - if test "$$first" = ".."; then \ |
204 | - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ |
205 | - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ |
206 | - else \ |
207 | - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ |
208 | - if test "$$first2" = "$$first"; then \ |
209 | - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ |
210 | - else \ |
211 | - dir2="../$$dir2"; \ |
212 | - fi; \ |
213 | - dir0="$$dir0"/"$$first"; \ |
214 | - fi; \ |
215 | - fi; \ |
216 | - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ |
217 | - done; \ |
218 | - reldir="$$dir2" |
219 | -ACLOCAL = @ACLOCAL@ |
220 | -AMTAR = @AMTAR@ |
221 | -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
222 | -AM_MAKEFLAGS = @AM_MAKEFLAGS@ |
223 | -APPMENU_CFLAGS = @APPMENU_CFLAGS@ |
224 | -APPMENU_LIBS = @APPMENU_LIBS@ |
225 | -AR = @AR@ |
226 | -AUTOCONF = @AUTOCONF@ |
227 | -AUTOHEADER = @AUTOHEADER@ |
228 | -AUTOMAKE = @AUTOMAKE@ |
229 | -AWK = @AWK@ |
230 | -CC = @CC@ |
231 | -CCDEPMODE = @CCDEPMODE@ |
232 | -CFLAGS = @CFLAGS@ |
233 | -CPP = @CPP@ |
234 | -CPPFLAGS = @CPPFLAGS@ |
235 | -CXX = @CXX@ |
236 | -CYGPATH_W = @CYGPATH_W@ |
237 | -DEFS = @DEFS@ |
238 | -DEPDIR = @DEPDIR@ |
239 | -DLLTOOL = @DLLTOOL@ |
240 | -DSYMUTIL = @DSYMUTIL@ |
241 | -DUMPBIN = @DUMPBIN@ |
242 | -ECHO_C = @ECHO_C@ |
243 | -ECHO_N = @ECHO_N@ |
244 | -ECHO_T = @ECHO_T@ |
245 | -EGREP = @EGREP@ |
246 | -EXEEXT = @EXEEXT@ |
247 | -F77 = @F77@ |
248 | -FC = @FC@ |
249 | -FGREP = @FGREP@ |
250 | -GREP = @GREP@ |
251 | -INSTALL = @INSTALL@ |
252 | -INSTALL_DATA = @INSTALL_DATA@ |
253 | -INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
254 | -INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
255 | -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
256 | -LD = @LD@ |
257 | -LDFLAGS = @LDFLAGS@ |
258 | -LIBOBJS = @LIBOBJS@ |
259 | -LIBS = @LIBS@ |
260 | -LIBTOOL = @LIBTOOL@ |
261 | -LIPO = @LIPO@ |
262 | -LN_S = @LN_S@ |
263 | -LTLIBOBJS = @LTLIBOBJS@ |
264 | -MAINT = @MAINT@ |
265 | -MAKEFLAGS = @MAKEFLAGS@ |
266 | -MAKEINFO = @MAKEINFO@ |
267 | -MANIFEST_TOOL = @MANIFEST_TOOL@ |
268 | -MKDIR_P = @MKDIR_P@ |
269 | -NM = @NM@ |
270 | -NMEDIT = @NMEDIT@ |
271 | -OBJC = @OBJC@ |
272 | -OBJDUMP = @OBJDUMP@ |
273 | -OBJEXT = @OBJEXT@ |
274 | -OTOOL = @OTOOL@ |
275 | -OTOOL64 = @OTOOL64@ |
276 | -PACKAGE = @PACKAGE@ |
277 | -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ |
278 | -PACKAGE_NAME = @PACKAGE_NAME@ |
279 | -PACKAGE_STRING = @PACKAGE_STRING@ |
280 | -PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
281 | -PACKAGE_URL = @PACKAGE_URL@ |
282 | -PACKAGE_VERSION = @PACKAGE_VERSION@ |
283 | -PATH_SEPARATOR = @PATH_SEPARATOR@ |
284 | -PKG_CONFIG = @PKG_CONFIG@ |
285 | -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
286 | -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
287 | -Q = @Q@ |
288 | -RANLIB = @RANLIB@ |
289 | -SED = @SED@ |
290 | -SET_MAKE = @SET_MAKE@ |
291 | -SHELL = @SHELL@ |
292 | -STRIP = @STRIP@ |
293 | -V = @V@ |
294 | -VERSION = @VERSION@ |
295 | -abs_builddir = @abs_builddir@ |
296 | -abs_srcdir = @abs_srcdir@ |
297 | -abs_top_builddir = @abs_top_builddir@ |
298 | -abs_top_srcdir = @abs_top_srcdir@ |
299 | -ac_ct_AR = @ac_ct_AR@ |
300 | -ac_ct_CC = @ac_ct_CC@ |
301 | -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
302 | -am__include = @am__include@ |
303 | -am__leading_dot = @am__leading_dot@ |
304 | -am__quote = @am__quote@ |
305 | -am__tar = @am__tar@ |
306 | -am__untar = @am__untar@ |
307 | -bindir = @bindir@ |
308 | -build = @build@ |
309 | -build_alias = @build_alias@ |
310 | -build_cpu = @build_cpu@ |
311 | -build_os = @build_os@ |
312 | -build_vendor = @build_vendor@ |
313 | -builddir = @builddir@ |
314 | -datadir = @datadir@ |
315 | -datarootdir = @datarootdir@ |
316 | -docdir = @docdir@ |
317 | -dvidir = @dvidir@ |
318 | -exec_prefix = @exec_prefix@ |
319 | -host = @host@ |
320 | -host_alias = @host_alias@ |
321 | -host_cpu = @host_cpu@ |
322 | -host_os = @host_os@ |
323 | -host_vendor = @host_vendor@ |
324 | -htmldir = @htmldir@ |
325 | -includedir = @includedir@ |
326 | -infodir = @infodir@ |
327 | -install_sh = @install_sh@ |
328 | -libdir = @libdir@ |
329 | -libexecdir = @libexecdir@ |
330 | -localedir = @localedir@ |
331 | -localstatedir = @localstatedir@ |
332 | -mandir = @mandir@ |
333 | -mkdir_p = @mkdir_p@ |
334 | -moduledir = @moduledir@ |
335 | -oldincludedir = @oldincludedir@ |
336 | -pdfdir = @pdfdir@ |
337 | -prefix = @prefix@ |
338 | -program_transform_name = @program_transform_name@ |
339 | -psdir = @psdir@ |
340 | -sbindir = @sbindir@ |
341 | -sessionfile = @sessionfile@ |
342 | -sharedstatedir = @sharedstatedir@ |
343 | -shavedir = @shavedir@ |
344 | -srcdir = @srcdir@ |
345 | -sysconfdir = @sysconfdir@ |
346 | -target_alias = @target_alias@ |
347 | -top_build_prefix = @top_build_prefix@ |
348 | -top_builddir = @top_builddir@ |
349 | -top_srcdir = @top_srcdir@ |
350 | -SUBDIRS = autotools |
351 | -all: all-recursive |
352 | - |
353 | -.SUFFIXES: |
354 | -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
355 | - @for dep in $?; do \ |
356 | - case '$(am__configure_deps)' in \ |
357 | - *$$dep*) \ |
358 | - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ |
359 | - && { if test -f $@; then exit 0; else break; fi; }; \ |
360 | - exit 1;; \ |
361 | - esac; \ |
362 | - done; \ |
363 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/Makefile'; \ |
364 | - $(am__cd) $(top_srcdir) && \ |
365 | - $(AUTOMAKE) --gnu build/Makefile |
366 | -.PRECIOUS: Makefile |
367 | -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
368 | - @case '$?' in \ |
369 | - *config.status*) \ |
370 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ |
371 | - *) \ |
372 | - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ |
373 | - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ |
374 | - esac; |
375 | - |
376 | -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
377 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
378 | - |
379 | -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
380 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
381 | -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
382 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
383 | -$(am__aclocal_m4_deps): |
384 | - |
385 | -mostlyclean-libtool: |
386 | - -rm -f *.lo |
387 | - |
388 | -clean-libtool: |
389 | - -rm -rf .libs _libs |
390 | - |
391 | -# This directory's subdirectories are mostly independent; you can cd |
392 | -# into them and run `make' without going through this Makefile. |
393 | -# To change the values of `make' variables: instead of editing Makefiles, |
394 | -# (1) if the variable is set in `config.status', edit `config.status' |
395 | -# (which will cause the Makefiles to be regenerated when you run `make'); |
396 | -# (2) otherwise, pass the desired values on the `make' command line. |
397 | -$(RECURSIVE_TARGETS): |
398 | - @fail= failcom='exit 1'; \ |
399 | - for f in x $$MAKEFLAGS; do \ |
400 | - case $$f in \ |
401 | - *=* | --[!k]*);; \ |
402 | - *k*) failcom='fail=yes';; \ |
403 | - esac; \ |
404 | - done; \ |
405 | - dot_seen=no; \ |
406 | - target=`echo $@ | sed s/-recursive//`; \ |
407 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
408 | - echo "Making $$target in $$subdir"; \ |
409 | - if test "$$subdir" = "."; then \ |
410 | - dot_seen=yes; \ |
411 | - local_target="$$target-am"; \ |
412 | - else \ |
413 | - local_target="$$target"; \ |
414 | - fi; \ |
415 | - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
416 | - || eval $$failcom; \ |
417 | - done; \ |
418 | - if test "$$dot_seen" = "no"; then \ |
419 | - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
420 | - fi; test -z "$$fail" |
421 | - |
422 | -$(RECURSIVE_CLEAN_TARGETS): |
423 | - @fail= failcom='exit 1'; \ |
424 | - for f in x $$MAKEFLAGS; do \ |
425 | - case $$f in \ |
426 | - *=* | --[!k]*);; \ |
427 | - *k*) failcom='fail=yes';; \ |
428 | - esac; \ |
429 | - done; \ |
430 | - dot_seen=no; \ |
431 | - case "$@" in \ |
432 | - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ |
433 | - *) list='$(SUBDIRS)' ;; \ |
434 | - esac; \ |
435 | - rev=''; for subdir in $$list; do \ |
436 | - if test "$$subdir" = "."; then :; else \ |
437 | - rev="$$subdir $$rev"; \ |
438 | - fi; \ |
439 | - done; \ |
440 | - rev="$$rev ."; \ |
441 | - target=`echo $@ | sed s/-recursive//`; \ |
442 | - for subdir in $$rev; do \ |
443 | - echo "Making $$target in $$subdir"; \ |
444 | - if test "$$subdir" = "."; then \ |
445 | - local_target="$$target-am"; \ |
446 | - else \ |
447 | - local_target="$$target"; \ |
448 | - fi; \ |
449 | - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ |
450 | - || eval $$failcom; \ |
451 | - done && test -z "$$fail" |
452 | -tags-recursive: |
453 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
454 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
455 | - done |
456 | -ctags-recursive: |
457 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
458 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
459 | - done |
460 | - |
461 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
462 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
463 | - unique=`for i in $$list; do \ |
464 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
465 | - done | \ |
466 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
467 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
468 | - mkid -fID $$unique |
469 | -tags: TAGS |
470 | - |
471 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
472 | - $(TAGS_FILES) $(LISP) |
473 | - set x; \ |
474 | - here=`pwd`; \ |
475 | - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
476 | - include_option=--etags-include; \ |
477 | - empty_fix=.; \ |
478 | - else \ |
479 | - include_option=--include; \ |
480 | - empty_fix=; \ |
481 | - fi; \ |
482 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
483 | - if test "$$subdir" = .; then :; else \ |
484 | - test ! -f $$subdir/TAGS || \ |
485 | - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
486 | - fi; \ |
487 | - done; \ |
488 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
489 | - unique=`for i in $$list; do \ |
490 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
491 | - done | \ |
492 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
493 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
494 | - shift; \ |
495 | - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
496 | - test -n "$$unique" || unique=$$empty_fix; \ |
497 | - if test $$# -gt 0; then \ |
498 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
499 | - "$$@" $$unique; \ |
500 | - else \ |
501 | - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
502 | - $$unique; \ |
503 | - fi; \ |
504 | - fi |
505 | -ctags: CTAGS |
506 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
507 | - $(TAGS_FILES) $(LISP) |
508 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
509 | - unique=`for i in $$list; do \ |
510 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
511 | - done | \ |
512 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
513 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
514 | - test -z "$(CTAGS_ARGS)$$unique" \ |
515 | - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
516 | - $$unique |
517 | - |
518 | -GTAGS: |
519 | - here=`$(am__cd) $(top_builddir) && pwd` \ |
520 | - && $(am__cd) $(top_srcdir) \ |
521 | - && gtags -i $(GTAGS_ARGS) "$$here" |
522 | - |
523 | -distclean-tags: |
524 | - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
525 | - |
526 | -distdir: $(DISTFILES) |
527 | - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
528 | - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
529 | - list='$(DISTFILES)'; \ |
530 | - dist_files=`for file in $$list; do echo $$file; done | \ |
531 | - sed -e "s|^$$srcdirstrip/||;t" \ |
532 | - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ |
533 | - case $$dist_files in \ |
534 | - */*) $(MKDIR_P) `echo "$$dist_files" | \ |
535 | - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ |
536 | - sort -u` ;; \ |
537 | - esac; \ |
538 | - for file in $$dist_files; do \ |
539 | - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
540 | - if test -d $$d/$$file; then \ |
541 | - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ |
542 | - if test -d "$(distdir)/$$file"; then \ |
543 | - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
544 | - fi; \ |
545 | - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ |
546 | - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ |
547 | - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
548 | - fi; \ |
549 | - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ |
550 | - else \ |
551 | - test -f "$(distdir)/$$file" \ |
552 | - || cp -p $$d/$$file "$(distdir)/$$file" \ |
553 | - || exit 1; \ |
554 | - fi; \ |
555 | - done |
556 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
557 | - if test "$$subdir" = .; then :; else \ |
558 | - test -d "$(distdir)/$$subdir" \ |
559 | - || $(MKDIR_P) "$(distdir)/$$subdir" \ |
560 | - || exit 1; \ |
561 | - fi; \ |
562 | - done |
563 | - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ |
564 | - if test "$$subdir" = .; then :; else \ |
565 | - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ |
566 | - $(am__relativize); \ |
567 | - new_distdir=$$reldir; \ |
568 | - dir1=$$subdir; dir2="$(top_distdir)"; \ |
569 | - $(am__relativize); \ |
570 | - new_top_distdir=$$reldir; \ |
571 | - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ |
572 | - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ |
573 | - ($(am__cd) $$subdir && \ |
574 | - $(MAKE) $(AM_MAKEFLAGS) \ |
575 | - top_distdir="$$new_top_distdir" \ |
576 | - distdir="$$new_distdir" \ |
577 | - am__remove_distdir=: \ |
578 | - am__skip_length_check=: \ |
579 | - am__skip_mode_fix=: \ |
580 | - distdir) \ |
581 | - || exit 1; \ |
582 | - fi; \ |
583 | - done |
584 | -check-am: all-am |
585 | -check: check-recursive |
586 | -all-am: Makefile |
587 | -installdirs: installdirs-recursive |
588 | -installdirs-am: |
589 | -install: install-recursive |
590 | -install-exec: install-exec-recursive |
591 | -install-data: install-data-recursive |
592 | -uninstall: uninstall-recursive |
593 | - |
594 | -install-am: all-am |
595 | - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am |
596 | - |
597 | -installcheck: installcheck-recursive |
598 | -install-strip: |
599 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
600 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
601 | - `test -z '$(STRIP)' || \ |
602 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
603 | -mostlyclean-generic: |
604 | - |
605 | -clean-generic: |
606 | - |
607 | -distclean-generic: |
608 | - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
609 | - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
610 | - |
611 | -maintainer-clean-generic: |
612 | - @echo "This command is intended for maintainers to use" |
613 | - @echo "it deletes files that may require special tools to rebuild." |
614 | -clean: clean-recursive |
615 | - |
616 | -clean-am: clean-generic clean-libtool mostlyclean-am |
617 | - |
618 | -distclean: distclean-recursive |
619 | - -rm -f Makefile |
620 | -distclean-am: clean-am distclean-generic distclean-tags |
621 | - |
622 | -dvi: dvi-recursive |
623 | - |
624 | -dvi-am: |
625 | - |
626 | -html: html-recursive |
627 | - |
628 | -html-am: |
629 | - |
630 | -info: info-recursive |
631 | - |
632 | -info-am: |
633 | - |
634 | -install-data-am: |
635 | - |
636 | -install-dvi: install-dvi-recursive |
637 | - |
638 | -install-dvi-am: |
639 | - |
640 | -install-exec-am: |
641 | - |
642 | -install-html: install-html-recursive |
643 | - |
644 | -install-html-am: |
645 | - |
646 | -install-info: install-info-recursive |
647 | - |
648 | -install-info-am: |
649 | - |
650 | -install-man: |
651 | - |
652 | -install-pdf: install-pdf-recursive |
653 | - |
654 | -install-pdf-am: |
655 | - |
656 | -install-ps: install-ps-recursive |
657 | - |
658 | -install-ps-am: |
659 | - |
660 | -installcheck-am: |
661 | - |
662 | -maintainer-clean: maintainer-clean-recursive |
663 | - -rm -f Makefile |
664 | -maintainer-clean-am: distclean-am maintainer-clean-generic |
665 | - |
666 | -mostlyclean: mostlyclean-recursive |
667 | - |
668 | -mostlyclean-am: mostlyclean-generic mostlyclean-libtool |
669 | - |
670 | -pdf: pdf-recursive |
671 | - |
672 | -pdf-am: |
673 | - |
674 | -ps: ps-recursive |
675 | - |
676 | -ps-am: |
677 | - |
678 | -uninstall-am: |
679 | - |
680 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ |
681 | - install-am install-strip tags-recursive |
682 | - |
683 | -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
684 | - all all-am check check-am clean clean-generic clean-libtool \ |
685 | - ctags ctags-recursive distclean distclean-generic \ |
686 | - distclean-libtool distclean-tags distdir dvi dvi-am html \ |
687 | - html-am info info-am install install-am install-data \ |
688 | - install-data-am install-dvi install-dvi-am install-exec \ |
689 | - install-exec-am install-html install-html-am install-info \ |
690 | - install-info-am install-man install-pdf install-pdf-am \ |
691 | - install-ps install-ps-am install-strip installcheck \ |
692 | - installcheck-am installdirs installdirs-am maintainer-clean \ |
693 | - maintainer-clean-generic mostlyclean mostlyclean-generic \ |
694 | - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
695 | - uninstall uninstall-am |
696 | - |
697 | - |
698 | -# Tell versions [3.59,3.63) of GNU make to not export all variables. |
699 | -# Otherwise a system limit (for SysV at least) may be exceeded. |
700 | -.NOEXPORT: |
701 | |
702 | === removed file 'build/autotools/Makefile.am' |
703 | --- build/autotools/Makefile.am 2010-05-27 20:12:14 +0000 |
704 | +++ build/autotools/Makefile.am 1970-01-01 00:00:00 +0000 |
705 | @@ -1,3 +0,0 @@ |
706 | -EXTRA_DIST = shave-libtool.in shave.in shave.m4 introspection.m4 gtk-doc.m4 |
707 | - |
708 | -DISTCLEANFILES = shave-libtool shave |
709 | |
710 | === removed file 'build/autotools/Makefile.in' |
711 | --- build/autotools/Makefile.in 2011-09-29 14:48:54 +0000 |
712 | +++ build/autotools/Makefile.in 1970-01-01 00:00:00 +0000 |
713 | @@ -1,387 +0,0 @@ |
714 | -# Makefile.in generated by automake 1.11.1 from Makefile.am. |
715 | -# @configure_input@ |
716 | - |
717 | -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
718 | -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
719 | -# Inc. |
720 | -# This Makefile.in is free software; the Free Software Foundation |
721 | -# gives unlimited permission to copy and/or distribute it, |
722 | -# with or without modifications, as long as this notice is preserved. |
723 | - |
724 | -# This program is distributed in the hope that it will be useful, |
725 | -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
726 | -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
727 | -# PARTICULAR PURPOSE. |
728 | - |
729 | -@SET_MAKE@ |
730 | -VPATH = @srcdir@ |
731 | -pkgdatadir = $(datadir)/@PACKAGE@ |
732 | -pkgincludedir = $(includedir)/@PACKAGE@ |
733 | -pkglibdir = $(libdir)/@PACKAGE@ |
734 | -pkglibexecdir = $(libexecdir)/@PACKAGE@ |
735 | -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
736 | -install_sh_DATA = $(install_sh) -c -m 644 |
737 | -install_sh_PROGRAM = $(install_sh) -c |
738 | -install_sh_SCRIPT = $(install_sh) -c |
739 | -INSTALL_HEADER = $(INSTALL_DATA) |
740 | -transform = $(program_transform_name) |
741 | -NORMAL_INSTALL = : |
742 | -PRE_INSTALL = : |
743 | -POST_INSTALL = : |
744 | -NORMAL_UNINSTALL = : |
745 | -PRE_UNINSTALL = : |
746 | -POST_UNINSTALL = : |
747 | -build_triplet = @build@ |
748 | -host_triplet = @host@ |
749 | -subdir = build/autotools |
750 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ |
751 | - $(srcdir)/shave-libtool.in $(srcdir)/shave.in |
752 | -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
753 | -am__aclocal_m4_deps = $(top_srcdir)/build/autotools/libtool.m4 \ |
754 | - $(top_srcdir)/build/autotools/ltoptions.m4 \ |
755 | - $(top_srcdir)/build/autotools/ltsugar.m4 \ |
756 | - $(top_srcdir)/build/autotools/ltversion.m4 \ |
757 | - $(top_srcdir)/build/autotools/lt~obsolete.m4 \ |
758 | - $(top_srcdir)/build/autotools/shave.m4 \ |
759 | - $(top_srcdir)/configure.ac |
760 | -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
761 | - $(ACLOCAL_M4) |
762 | -mkinstalldirs = $(install_sh) -d |
763 | -CONFIG_HEADER = $(top_builddir)/config.h |
764 | -CONFIG_CLEAN_FILES = shave-libtool shave |
765 | -CONFIG_CLEAN_VPATH_FILES = |
766 | -AM_V_GEN = $(am__v_GEN_$(V)) |
767 | -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) |
768 | -am__v_GEN_0 = @echo " GEN " $@; |
769 | -AM_V_at = $(am__v_at_$(V)) |
770 | -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) |
771 | -am__v_at_0 = @ |
772 | -SOURCES = |
773 | -DIST_SOURCES = |
774 | -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
775 | -ACLOCAL = @ACLOCAL@ |
776 | -AMTAR = @AMTAR@ |
777 | -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
778 | -AM_MAKEFLAGS = @AM_MAKEFLAGS@ |
779 | -APPMENU_CFLAGS = @APPMENU_CFLAGS@ |
780 | -APPMENU_LIBS = @APPMENU_LIBS@ |
781 | -AR = @AR@ |
782 | -AUTOCONF = @AUTOCONF@ |
783 | -AUTOHEADER = @AUTOHEADER@ |
784 | -AUTOMAKE = @AUTOMAKE@ |
785 | -AWK = @AWK@ |
786 | -CC = @CC@ |
787 | -CCDEPMODE = @CCDEPMODE@ |
788 | -CFLAGS = @CFLAGS@ |
789 | -CPP = @CPP@ |
790 | -CPPFLAGS = @CPPFLAGS@ |
791 | -CXX = @CXX@ |
792 | -CYGPATH_W = @CYGPATH_W@ |
793 | -DEFS = @DEFS@ |
794 | -DEPDIR = @DEPDIR@ |
795 | -DLLTOOL = @DLLTOOL@ |
796 | -DSYMUTIL = @DSYMUTIL@ |
797 | -DUMPBIN = @DUMPBIN@ |
798 | -ECHO_C = @ECHO_C@ |
799 | -ECHO_N = @ECHO_N@ |
800 | -ECHO_T = @ECHO_T@ |
801 | -EGREP = @EGREP@ |
802 | -EXEEXT = @EXEEXT@ |
803 | -F77 = @F77@ |
804 | -FC = @FC@ |
805 | -FGREP = @FGREP@ |
806 | -GREP = @GREP@ |
807 | -INSTALL = @INSTALL@ |
808 | -INSTALL_DATA = @INSTALL_DATA@ |
809 | -INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
810 | -INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
811 | -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
812 | -LD = @LD@ |
813 | -LDFLAGS = @LDFLAGS@ |
814 | -LIBOBJS = @LIBOBJS@ |
815 | -LIBS = @LIBS@ |
816 | -LIBTOOL = @LIBTOOL@ |
817 | -LIPO = @LIPO@ |
818 | -LN_S = @LN_S@ |
819 | -LTLIBOBJS = @LTLIBOBJS@ |
820 | -MAINT = @MAINT@ |
821 | -MAKEFLAGS = @MAKEFLAGS@ |
822 | -MAKEINFO = @MAKEINFO@ |
823 | -MANIFEST_TOOL = @MANIFEST_TOOL@ |
824 | -MKDIR_P = @MKDIR_P@ |
825 | -NM = @NM@ |
826 | -NMEDIT = @NMEDIT@ |
827 | -OBJC = @OBJC@ |
828 | -OBJDUMP = @OBJDUMP@ |
829 | -OBJEXT = @OBJEXT@ |
830 | -OTOOL = @OTOOL@ |
831 | -OTOOL64 = @OTOOL64@ |
832 | -PACKAGE = @PACKAGE@ |
833 | -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ |
834 | -PACKAGE_NAME = @PACKAGE_NAME@ |
835 | -PACKAGE_STRING = @PACKAGE_STRING@ |
836 | -PACKAGE_TARNAME = @PACKAGE_TARNAME@ |
837 | -PACKAGE_URL = @PACKAGE_URL@ |
838 | -PACKAGE_VERSION = @PACKAGE_VERSION@ |
839 | -PATH_SEPARATOR = @PATH_SEPARATOR@ |
840 | -PKG_CONFIG = @PKG_CONFIG@ |
841 | -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
842 | -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
843 | -Q = @Q@ |
844 | -RANLIB = @RANLIB@ |
845 | -SED = @SED@ |
846 | -SET_MAKE = @SET_MAKE@ |
847 | -SHELL = @SHELL@ |
848 | -STRIP = @STRIP@ |
849 | -V = @V@ |
850 | -VERSION = @VERSION@ |
851 | -abs_builddir = @abs_builddir@ |
852 | -abs_srcdir = @abs_srcdir@ |
853 | -abs_top_builddir = @abs_top_builddir@ |
854 | -abs_top_srcdir = @abs_top_srcdir@ |
855 | -ac_ct_AR = @ac_ct_AR@ |
856 | -ac_ct_CC = @ac_ct_CC@ |
857 | -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ |
858 | -am__include = @am__include@ |
859 | -am__leading_dot = @am__leading_dot@ |
860 | -am__quote = @am__quote@ |
861 | -am__tar = @am__tar@ |
862 | -am__untar = @am__untar@ |
863 | -bindir = @bindir@ |
864 | -build = @build@ |
865 | -build_alias = @build_alias@ |
866 | -build_cpu = @build_cpu@ |
867 | -build_os = @build_os@ |
868 | -build_vendor = @build_vendor@ |
869 | -builddir = @builddir@ |
870 | -datadir = @datadir@ |
871 | -datarootdir = @datarootdir@ |
872 | -docdir = @docdir@ |
873 | -dvidir = @dvidir@ |
874 | -exec_prefix = @exec_prefix@ |
875 | -host = @host@ |
876 | -host_alias = @host_alias@ |
877 | -host_cpu = @host_cpu@ |
878 | -host_os = @host_os@ |
879 | -host_vendor = @host_vendor@ |
880 | -htmldir = @htmldir@ |
881 | -includedir = @includedir@ |
882 | -infodir = @infodir@ |
883 | -install_sh = @install_sh@ |
884 | -libdir = @libdir@ |
885 | -libexecdir = @libexecdir@ |
886 | -localedir = @localedir@ |
887 | -localstatedir = @localstatedir@ |
888 | -mandir = @mandir@ |
889 | -mkdir_p = @mkdir_p@ |
890 | -moduledir = @moduledir@ |
891 | -oldincludedir = @oldincludedir@ |
892 | -pdfdir = @pdfdir@ |
893 | -prefix = @prefix@ |
894 | -program_transform_name = @program_transform_name@ |
895 | -psdir = @psdir@ |
896 | -sbindir = @sbindir@ |
897 | -sessionfile = @sessionfile@ |
898 | -sharedstatedir = @sharedstatedir@ |
899 | -shavedir = @shavedir@ |
900 | -srcdir = @srcdir@ |
901 | -sysconfdir = @sysconfdir@ |
902 | -target_alias = @target_alias@ |
903 | -top_build_prefix = @top_build_prefix@ |
904 | -top_builddir = @top_builddir@ |
905 | -top_srcdir = @top_srcdir@ |
906 | -EXTRA_DIST = shave-libtool.in shave.in shave.m4 introspection.m4 gtk-doc.m4 |
907 | -DISTCLEANFILES = shave-libtool shave |
908 | -all: all-am |
909 | - |
910 | -.SUFFIXES: |
911 | -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
912 | - @for dep in $?; do \ |
913 | - case '$(am__configure_deps)' in \ |
914 | - *$$dep*) \ |
915 | - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ |
916 | - && { if test -f $@; then exit 0; else break; fi; }; \ |
917 | - exit 1;; \ |
918 | - esac; \ |
919 | - done; \ |
920 | - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/autotools/Makefile'; \ |
921 | - $(am__cd) $(top_srcdir) && \ |
922 | - $(AUTOMAKE) --gnu build/autotools/Makefile |
923 | -.PRECIOUS: Makefile |
924 | -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
925 | - @case '$?' in \ |
926 | - *config.status*) \ |
927 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ |
928 | - *) \ |
929 | - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ |
930 | - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ |
931 | - esac; |
932 | - |
933 | -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
934 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
935 | - |
936 | -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
937 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
938 | -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
939 | - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
940 | -$(am__aclocal_m4_deps): |
941 | -shave-libtool: $(top_builddir)/config.status $(srcdir)/shave-libtool.in |
942 | - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ |
943 | -shave: $(top_builddir)/config.status $(srcdir)/shave.in |
944 | - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ |
945 | - |
946 | -mostlyclean-libtool: |
947 | - -rm -f *.lo |
948 | - |
949 | -clean-libtool: |
950 | - -rm -rf .libs _libs |
951 | -tags: TAGS |
952 | -TAGS: |
953 | - |
954 | -ctags: CTAGS |
955 | -CTAGS: |
956 | - |
957 | - |
958 | -distdir: $(DISTFILES) |
959 | - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
960 | - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
961 | - list='$(DISTFILES)'; \ |
962 | - dist_files=`for file in $$list; do echo $$file; done | \ |
963 | - sed -e "s|^$$srcdirstrip/||;t" \ |
964 | - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ |
965 | - case $$dist_files in \ |
966 | - */*) $(MKDIR_P) `echo "$$dist_files" | \ |
967 | - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ |
968 | - sort -u` ;; \ |
969 | - esac; \ |
970 | - for file in $$dist_files; do \ |
971 | - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ |
972 | - if test -d $$d/$$file; then \ |
973 | - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ |
974 | - if test -d "$(distdir)/$$file"; then \ |
975 | - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
976 | - fi; \ |
977 | - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ |
978 | - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ |
979 | - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ |
980 | - fi; \ |
981 | - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ |
982 | - else \ |
983 | - test -f "$(distdir)/$$file" \ |
984 | - || cp -p $$d/$$file "$(distdir)/$$file" \ |
985 | - || exit 1; \ |
986 | - fi; \ |
987 | - done |
988 | -check-am: all-am |
989 | -check: check-am |
990 | -all-am: Makefile |
991 | -installdirs: |
992 | -install: install-am |
993 | -install-exec: install-exec-am |
994 | -install-data: install-data-am |
995 | -uninstall: uninstall-am |
996 | - |
997 | -install-am: all-am |
998 | - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am |
999 | - |
1000 | -installcheck: installcheck-am |
1001 | -install-strip: |
1002 | - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ |
1003 | - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ |
1004 | - `test -z '$(STRIP)' || \ |
1005 | - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install |
1006 | -mostlyclean-generic: |
1007 | - |
1008 | -clean-generic: |
1009 | - |
1010 | -distclean-generic: |
1011 | - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) |
1012 | - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) |
1013 | - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) |
1014 | - |
1015 | -maintainer-clean-generic: |
1016 | - @echo "This command is intended for maintainers to use" |
1017 | - @echo "it deletes files that may require special tools to rebuild." |
1018 | -clean: clean-am |
1019 | - |
1020 | -clean-am: clean-generic clean-libtool mostlyclean-am |
1021 | - |
1022 | -distclean: distclean-am |
1023 | - -rm -f Makefile |
1024 | -distclean-am: clean-am distclean-generic |
1025 | - |
1026 | -dvi: dvi-am |
1027 | - |
1028 | -dvi-am: |
1029 | - |
1030 | -html: html-am |
1031 | - |
1032 | -html-am: |
1033 | - |
1034 | -info: info-am |
1035 | - |
1036 | -info-am: |
1037 | - |
1038 | -install-data-am: |
1039 | - |
1040 | -install-dvi: install-dvi-am |
1041 | - |
1042 | -install-dvi-am: |
1043 | - |
1044 | -install-exec-am: |
1045 | - |
1046 | -install-html: install-html-am |
1047 | - |
1048 | -install-html-am: |
1049 | - |
1050 | -install-info: install-info-am |
1051 | - |
1052 | -install-info-am: |
1053 | - |
1054 | -install-man: |
1055 | - |
1056 | -install-pdf: install-pdf-am |
1057 | - |
1058 | -install-pdf-am: |
1059 | - |
1060 | -install-ps: install-ps-am |
1061 | - |
1062 | -install-ps-am: |
1063 | - |
1064 | -installcheck-am: |
1065 | - |
1066 | -maintainer-clean: maintainer-clean-am |
1067 | - -rm -f Makefile |
1068 | -maintainer-clean-am: distclean-am maintainer-clean-generic |
1069 | - |
1070 | -mostlyclean: mostlyclean-am |
1071 | - |
1072 | -mostlyclean-am: mostlyclean-generic mostlyclean-libtool |
1073 | - |
1074 | -pdf: pdf-am |
1075 | - |
1076 | -pdf-am: |
1077 | - |
1078 | -ps: ps-am |
1079 | - |
1080 | -ps-am: |
1081 | - |
1082 | -uninstall-am: |
1083 | - |
1084 | -.MAKE: install-am install-strip |
1085 | - |
1086 | -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ |
1087 | - distclean distclean-generic distclean-libtool distdir dvi \ |
1088 | - dvi-am html html-am info info-am install install-am \ |
1089 | - install-data install-data-am install-dvi install-dvi-am \ |
1090 | - install-exec install-exec-am install-html install-html-am \ |
1091 | - install-info install-info-am install-man install-pdf \ |
1092 | - install-pdf-am install-ps install-ps-am install-strip \ |
1093 | - installcheck installcheck-am installdirs maintainer-clean \ |
1094 | - maintainer-clean-generic mostlyclean mostlyclean-generic \ |
1095 | - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am |
1096 | - |
1097 | - |
1098 | -# Tell versions [3.59,3.63) of GNU make to not export all variables. |
1099 | -# Otherwise a system limit (for SysV at least) may be exceeded. |
1100 | -.NOEXPORT: |
1101 | |
1102 | === removed file 'build/autotools/gtk-doc.m4' |
1103 | --- build/autotools/gtk-doc.m4 2010-05-27 20:02:28 +0000 |
1104 | +++ build/autotools/gtk-doc.m4 1970-01-01 00:00:00 +0000 |
1105 | @@ -1,39 +0,0 @@ |
1106 | -dnl -*- mode: autoconf -*- |
1107 | - |
1108 | -# serial 1 |
1109 | - |
1110 | -dnl Usage: |
1111 | -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) |
1112 | -AC_DEFUN([GTK_DOC_CHECK], |
1113 | -[ |
1114 | - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
1115 | - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
1116 | - dnl for overriding the documentation installation directory |
1117 | - AC_ARG_WITH([html-dir], |
1118 | - AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, |
1119 | - [with_html_dir='${datadir}/gtk-doc/html']) |
1120 | - HTML_DIR="$with_html_dir" |
1121 | - AC_SUBST([HTML_DIR]) |
1122 | - |
1123 | - dnl enable/disable documentation building |
1124 | - AC_ARG_ENABLE([gtk-doc], |
1125 | - AS_HELP_STRING([--enable-gtk-doc], |
1126 | - [use gtk-doc to build documentation [[default=no]]]),, |
1127 | - [enable_gtk_doc=no]) |
1128 | - |
1129 | - if test x$enable_gtk_doc = xyes; then |
1130 | - ifelse([$1],[], |
1131 | - [PKG_CHECK_EXISTS([gtk-doc],, |
1132 | - AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], |
1133 | - [PKG_CHECK_EXISTS([gtk-doc >= $1],, |
1134 | - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) |
1135 | - fi |
1136 | - |
1137 | - AC_MSG_CHECKING([whether to build gtk-doc documentation]) |
1138 | - AC_MSG_RESULT($enable_gtk_doc) |
1139 | - |
1140 | - AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) |
1141 | - |
1142 | - AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) |
1143 | - AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) |
1144 | -]) |
1145 | |
1146 | === removed file 'build/autotools/introspection.m4' |
1147 | --- build/autotools/introspection.m4 2010-05-27 20:02:28 +0000 |
1148 | +++ build/autotools/introspection.m4 1970-01-01 00:00:00 +0000 |
1149 | @@ -1,88 +0,0 @@ |
1150 | -dnl -*- mode: autoconf -*- |
1151 | -dnl Copyright 2009 Johan Dahlin |
1152 | -dnl |
1153 | -dnl This file is free software; the author(s) gives unlimited |
1154 | -dnl permission to copy and/or distribute it, with or without |
1155 | -dnl modifications, as long as this notice is preserved. |
1156 | -dnl |
1157 | - |
1158 | -# serial 1 |
1159 | - |
1160 | -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], |
1161 | -[ |
1162 | - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
1163 | - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
1164 | - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first |
1165 | - |
1166 | - dnl enable/disable introspection |
1167 | - m4_if([$2], [require], |
1168 | - [dnl |
1169 | - enable_introspection=yes |
1170 | - ],[dnl |
1171 | - AC_ARG_ENABLE(introspection, |
1172 | - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], |
1173 | - [Enable introspection for this build]),, |
1174 | - [enable_introspection=auto]) |
1175 | - ])dnl |
1176 | - |
1177 | - AC_MSG_CHECKING([for gobject-introspection]) |
1178 | - |
1179 | - dnl presence/version checking |
1180 | - AS_CASE([$enable_introspection], |
1181 | - [no], [dnl |
1182 | - found_introspection="no (disabled, use --enable-introspection to enable)" |
1183 | - ],dnl |
1184 | - [yes],[dnl |
1185 | - PKG_CHECK_EXISTS([gobject-introspection-1.0],, |
1186 | - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) |
1187 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], |
1188 | - found_introspection=yes, |
1189 | - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) |
1190 | - ],dnl |
1191 | - [auto],[dnl |
1192 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) |
1193 | - ],dnl |
1194 | - [dnl |
1195 | - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) |
1196 | - ])dnl |
1197 | - |
1198 | - AC_MSG_RESULT([$found_introspection]) |
1199 | - |
1200 | - INTROSPECTION_SCANNER= |
1201 | - INTROSPECTION_COMPILER= |
1202 | - INTROSPECTION_GENERATE= |
1203 | - INTROSPECTION_GIRDIR= |
1204 | - INTROSPECTION_TYPELIBDIR= |
1205 | - if test "x$found_introspection" = "xyes"; then |
1206 | - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
1207 | - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
1208 | - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
1209 | - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` |
1210 | - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" |
1211 | - fi |
1212 | - AC_SUBST(INTROSPECTION_SCANNER) |
1213 | - AC_SUBST(INTROSPECTION_COMPILER) |
1214 | - AC_SUBST(INTROSPECTION_GENERATE) |
1215 | - AC_SUBST(INTROSPECTION_GIRDIR) |
1216 | - AC_SUBST(INTROSPECTION_TYPELIBDIR) |
1217 | - |
1218 | - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") |
1219 | -]) |
1220 | - |
1221 | - |
1222 | -dnl Usage: |
1223 | -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) |
1224 | - |
1225 | -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], |
1226 | -[ |
1227 | - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) |
1228 | -]) |
1229 | - |
1230 | -dnl Usage: |
1231 | -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) |
1232 | - |
1233 | - |
1234 | -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], |
1235 | -[ |
1236 | - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) |
1237 | -]) |
1238 | |
1239 | === modified file 'build/autotools/libtool.m4' |
1240 | --- build/autotools/libtool.m4 2011-09-29 14:48:54 +0000 |
1241 | +++ build/autotools/libtool.m4 2012-02-08 16:47:26 +0000 |
1242 | @@ -1,8 +1,8 @@ |
1243 | # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- |
1244 | # |
1245 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1246 | -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
1247 | -# Inc. |
1248 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1249 | +# Foundation, Inc. |
1250 | # Written by Gordon Matzigkeit, 1996 |
1251 | # |
1252 | # This file is free software; the Free Software Foundation gives |
1253 | @@ -11,8 +11,8 @@ |
1254 | |
1255 | m4_define([_LT_COPYING], [dnl |
1256 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
1257 | -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
1258 | -# Inc. |
1259 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
1260 | +# Foundation, Inc. |
1261 | # Written by Gordon Matzigkeit, 1996 |
1262 | # |
1263 | # This file is part of GNU Libtool. |
1264 | @@ -146,6 +146,8 @@ |
1265 | AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl |
1266 | AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl |
1267 | |
1268 | +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl |
1269 | +dnl |
1270 | _LT_DECL([], [host_alias], [0], [The host system])dnl |
1271 | _LT_DECL([], [host], [0])dnl |
1272 | _LT_DECL([], [host_os], [0])dnl |
1273 | @@ -637,7 +639,7 @@ |
1274 | m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) |
1275 | configured by $[0], generated by m4_PACKAGE_STRING. |
1276 | |
1277 | -Copyright (C) 2010 Free Software Foundation, Inc. |
1278 | +Copyright (C) 2011 Free Software Foundation, Inc. |
1279 | This config.lt script is free software; the Free Software Foundation |
1280 | gives unlimited permision to copy, distribute and modify it." |
1281 | |
1282 | @@ -801,6 +803,7 @@ |
1283 | m4_case([$1], |
1284 | [C], [_LT_LANG(C)], |
1285 | [C++], [_LT_LANG(CXX)], |
1286 | + [Go], [_LT_LANG(GO)], |
1287 | [Java], [_LT_LANG(GCJ)], |
1288 | [Fortran 77], [_LT_LANG(F77)], |
1289 | [Fortran], [_LT_LANG(FC)], |
1290 | @@ -822,6 +825,31 @@ |
1291 | ])# _LT_LANG |
1292 | |
1293 | |
1294 | +m4_ifndef([AC_PROG_GO], [ |
1295 | +############################################################ |
1296 | +# NOTE: This macro has been submitted for inclusion into # |
1297 | +# GNU Autoconf as AC_PROG_GO. When it is available in # |
1298 | +# a released version of Autoconf we should remove this # |
1299 | +# macro and use it instead. # |
1300 | +############################################################ |
1301 | +m4_defun([AC_PROG_GO], |
1302 | +[AC_LANG_PUSH(Go)dnl |
1303 | +AC_ARG_VAR([GOC], [Go compiler command])dnl |
1304 | +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl |
1305 | +_AC_ARG_VAR_LDFLAGS()dnl |
1306 | +AC_CHECK_TOOL(GOC, gccgo) |
1307 | +if test -z "$GOC"; then |
1308 | + if test -n "$ac_tool_prefix"; then |
1309 | + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) |
1310 | + fi |
1311 | +fi |
1312 | +if test -z "$GOC"; then |
1313 | + AC_CHECK_PROG(GOC, gccgo, gccgo, false) |
1314 | +fi |
1315 | +])#m4_defun |
1316 | +])#m4_ifndef |
1317 | + |
1318 | + |
1319 | # _LT_LANG_DEFAULT_CONFIG |
1320 | # ----------------------- |
1321 | m4_defun([_LT_LANG_DEFAULT_CONFIG], |
1322 | @@ -852,6 +880,10 @@ |
1323 | m4_ifdef([LT_PROG_GCJ], |
1324 | [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) |
1325 | |
1326 | +AC_PROVIDE_IFELSE([AC_PROG_GO], |
1327 | + [LT_LANG(GO)], |
1328 | + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) |
1329 | + |
1330 | AC_PROVIDE_IFELSE([LT_PROG_RC], |
1331 | [LT_LANG(RC)], |
1332 | [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) |
1333 | @@ -954,7 +986,13 @@ |
1334 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
1335 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
1336 | _lt_result=$? |
1337 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
1338 | + # If there is a non-empty error log, and "single_module" |
1339 | + # appears in it, assume the flag caused a linker warning |
1340 | + if test -s conftest.err && $GREP single_module conftest.err; then |
1341 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
1342 | + # Otherwise, if the output was created with a 0 exit code from |
1343 | + # the compiler, it worked. |
1344 | + elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
1345 | lt_cv_apple_cc_single_mod=yes |
1346 | else |
1347 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1348 | @@ -962,6 +1000,7 @@ |
1349 | rm -rf libconftest.dylib* |
1350 | rm -f conftest.* |
1351 | fi]) |
1352 | + |
1353 | AC_CACHE_CHECK([for -exported_symbols_list linker flag], |
1354 | [lt_cv_ld_exported_symbols_list], |
1355 | [lt_cv_ld_exported_symbols_list=no |
1356 | @@ -973,6 +1012,7 @@ |
1357 | [lt_cv_ld_exported_symbols_list=no]) |
1358 | LDFLAGS="$save_LDFLAGS" |
1359 | ]) |
1360 | + |
1361 | AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], |
1362 | [lt_cv_ld_force_load=no |
1363 | cat > conftest.c << _LT_EOF |
1364 | @@ -990,7 +1030,9 @@ |
1365 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD |
1366 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
1367 | _lt_result=$? |
1368 | - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
1369 | + if test -s conftest.err && $GREP force_load conftest.err; then |
1370 | + cat conftest.err >&AS_MESSAGE_LOG_FD |
1371 | + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
1372 | lt_cv_ld_force_load=yes |
1373 | else |
1374 | cat conftest.err >&AS_MESSAGE_LOG_FD |
1375 | @@ -1035,8 +1077,8 @@ |
1376 | ]) |
1377 | |
1378 | |
1379 | -# _LT_DARWIN_LINKER_FEATURES |
1380 | -# -------------------------- |
1381 | +# _LT_DARWIN_LINKER_FEATURES([TAG]) |
1382 | +# --------------------------------- |
1383 | # Checks for linker and compiler features on darwin |
1384 | m4_defun([_LT_DARWIN_LINKER_FEATURES], |
1385 | [ |
1386 | @@ -1047,6 +1089,8 @@ |
1387 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
1388 | if test "$lt_cv_ld_force_load" = "yes"; then |
1389 | _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
1390 | + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], |
1391 | + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) |
1392 | else |
1393 | _LT_TAGVAR(whole_archive_flag_spec, $1)='' |
1394 | fi |
1395 | @@ -1330,14 +1374,27 @@ |
1396 | CFLAGS="$SAVE_CFLAGS" |
1397 | fi |
1398 | ;; |
1399 | -sparc*-*solaris*) |
1400 | +*-*solaris*) |
1401 | # Find out which ABI we are using. |
1402 | echo 'int i;' > conftest.$ac_ext |
1403 | if AC_TRY_EVAL(ac_compile); then |
1404 | case `/usr/bin/file conftest.o` in |
1405 | *64-bit*) |
1406 | case $lt_cv_prog_gnu_ld in |
1407 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
1408 | + yes*) |
1409 | + case $host in |
1410 | + i?86-*-solaris*) |
1411 | + LD="${LD-ld} -m elf_x86_64" |
1412 | + ;; |
1413 | + sparc*-*-solaris*) |
1414 | + LD="${LD-ld} -m elf64_sparc" |
1415 | + ;; |
1416 | + esac |
1417 | + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
1418 | + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
1419 | + LD="${LD-ld}_sol2" |
1420 | + fi |
1421 | + ;; |
1422 | *) |
1423 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
1424 | LD="${LD-ld} -64" |
1425 | @@ -1414,13 +1471,13 @@ |
1426 | if test -n "$RANLIB"; then |
1427 | case $host_os in |
1428 | openbsd*) |
1429 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
1430 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
1431 | ;; |
1432 | *) |
1433 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
1434 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
1435 | ;; |
1436 | esac |
1437 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
1438 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
1439 | fi |
1440 | |
1441 | case $host_os in |
1442 | @@ -1600,6 +1657,11 @@ |
1443 | lt_cv_sys_max_cmd_len=196608 |
1444 | ;; |
1445 | |
1446 | + os2*) |
1447 | + # The test takes a long time on OS/2. |
1448 | + lt_cv_sys_max_cmd_len=8192 |
1449 | + ;; |
1450 | + |
1451 | osf*) |
1452 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
1453 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
1454 | @@ -1639,7 +1701,7 @@ |
1455 | # If test is not a shell built-in, we'll probably end up computing a |
1456 | # maximum length that is only half of the actual maximum length, but |
1457 | # we can't tell. |
1458 | - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
1459 | + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
1460 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
1461 | test $i != 17 # 1/2 MB should be enough |
1462 | do |
1463 | @@ -2185,7 +2247,7 @@ |
1464 | |
1465 | case $host_os in |
1466 | aix3*) |
1467 | - version_type=linux |
1468 | + version_type=linux # correct to gnu/linux during the next big refactor |
1469 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
1470 | shlibpath_var=LIBPATH |
1471 | |
1472 | @@ -2194,7 +2256,7 @@ |
1473 | ;; |
1474 | |
1475 | aix[[4-9]]*) |
1476 | - version_type=linux |
1477 | + version_type=linux # correct to gnu/linux during the next big refactor |
1478 | need_lib_prefix=no |
1479 | need_version=no |
1480 | hardcode_into_libs=yes |
1481 | @@ -2259,7 +2321,7 @@ |
1482 | ;; |
1483 | |
1484 | bsdi[[45]]*) |
1485 | - version_type=linux |
1486 | + version_type=linux # correct to gnu/linux during the next big refactor |
1487 | need_version=no |
1488 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1489 | soname_spec='${libname}${release}${shared_ext}$major' |
1490 | @@ -2398,7 +2460,7 @@ |
1491 | ;; |
1492 | |
1493 | dgux*) |
1494 | - version_type=linux |
1495 | + version_type=linux # correct to gnu/linux during the next big refactor |
1496 | need_lib_prefix=no |
1497 | need_version=no |
1498 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
1499 | @@ -2406,10 +2468,6 @@ |
1500 | shlibpath_var=LD_LIBRARY_PATH |
1501 | ;; |
1502 | |
1503 | -freebsd1*) |
1504 | - dynamic_linker=no |
1505 | - ;; |
1506 | - |
1507 | freebsd* | dragonfly*) |
1508 | # DragonFly does not have aout. When/if they implement a new |
1509 | # versioning mechanism, adjust this. |
1510 | @@ -2417,7 +2475,7 @@ |
1511 | objformat=`/usr/bin/objformat` |
1512 | else |
1513 | case $host_os in |
1514 | - freebsd[[123]]*) objformat=aout ;; |
1515 | + freebsd[[23]].*) objformat=aout ;; |
1516 | *) objformat=elf ;; |
1517 | esac |
1518 | fi |
1519 | @@ -2435,7 +2493,7 @@ |
1520 | esac |
1521 | shlibpath_var=LD_LIBRARY_PATH |
1522 | case $host_os in |
1523 | - freebsd2*) |
1524 | + freebsd2.*) |
1525 | shlibpath_overrides_runpath=yes |
1526 | ;; |
1527 | freebsd3.[[01]]* | freebsdelf3.[[01]]*) |
1528 | @@ -2455,7 +2513,7 @@ |
1529 | ;; |
1530 | |
1531 | gnu*) |
1532 | - version_type=linux |
1533 | + version_type=linux # correct to gnu/linux during the next big refactor |
1534 | need_lib_prefix=no |
1535 | need_version=no |
1536 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
1537 | @@ -2466,7 +2524,7 @@ |
1538 | ;; |
1539 | |
1540 | haiku*) |
1541 | - version_type=linux |
1542 | + version_type=linux # correct to gnu/linux during the next big refactor |
1543 | need_lib_prefix=no |
1544 | need_version=no |
1545 | dynamic_linker="$host_os runtime_loader" |
1546 | @@ -2527,7 +2585,7 @@ |
1547 | ;; |
1548 | |
1549 | interix[[3-9]]*) |
1550 | - version_type=linux |
1551 | + version_type=linux # correct to gnu/linux during the next big refactor |
1552 | need_lib_prefix=no |
1553 | need_version=no |
1554 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
1555 | @@ -2543,7 +2601,7 @@ |
1556 | nonstopux*) version_type=nonstopux ;; |
1557 | *) |
1558 | if test "$lt_cv_prog_gnu_ld" = yes; then |
1559 | - version_type=linux |
1560 | + version_type=linux # correct to gnu/linux during the next big refactor |
1561 | else |
1562 | version_type=irix |
1563 | fi ;; |
1564 | @@ -2580,9 +2638,9 @@ |
1565 | dynamic_linker=no |
1566 | ;; |
1567 | |
1568 | -# This must be Linux ELF. |
1569 | +# This must be glibc/ELF. |
1570 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
1571 | - version_type=linux |
1572 | + version_type=linux # correct to gnu/linux during the next big refactor |
1573 | need_lib_prefix=no |
1574 | need_version=no |
1575 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1576 | @@ -2657,7 +2715,7 @@ |
1577 | ;; |
1578 | |
1579 | newsos6) |
1580 | - version_type=linux |
1581 | + version_type=linux # correct to gnu/linux during the next big refactor |
1582 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1583 | shlibpath_var=LD_LIBRARY_PATH |
1584 | shlibpath_overrides_runpath=yes |
1585 | @@ -2726,7 +2784,7 @@ |
1586 | ;; |
1587 | |
1588 | solaris*) |
1589 | - version_type=linux |
1590 | + version_type=linux # correct to gnu/linux during the next big refactor |
1591 | need_lib_prefix=no |
1592 | need_version=no |
1593 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1594 | @@ -2751,7 +2809,7 @@ |
1595 | ;; |
1596 | |
1597 | sysv4 | sysv4.3*) |
1598 | - version_type=linux |
1599 | + version_type=linux # correct to gnu/linux during the next big refactor |
1600 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1601 | soname_spec='${libname}${release}${shared_ext}$major' |
1602 | shlibpath_var=LD_LIBRARY_PATH |
1603 | @@ -2775,7 +2833,7 @@ |
1604 | |
1605 | sysv4*MP*) |
1606 | if test -d /usr/nec ;then |
1607 | - version_type=linux |
1608 | + version_type=linux # correct to gnu/linux during the next big refactor |
1609 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
1610 | soname_spec='$libname${shared_ext}.$major' |
1611 | shlibpath_var=LD_LIBRARY_PATH |
1612 | @@ -2806,7 +2864,7 @@ |
1613 | |
1614 | tpf*) |
1615 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
1616 | - version_type=linux |
1617 | + version_type=linux # correct to gnu/linux during the next big refactor |
1618 | need_lib_prefix=no |
1619 | need_version=no |
1620 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1621 | @@ -2816,7 +2874,7 @@ |
1622 | ;; |
1623 | |
1624 | uts4*) |
1625 | - version_type=linux |
1626 | + version_type=linux # correct to gnu/linux during the next big refactor |
1627 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
1628 | soname_spec='${libname}${release}${shared_ext}$major' |
1629 | shlibpath_var=LD_LIBRARY_PATH |
1630 | @@ -3238,7 +3296,7 @@ |
1631 | lt_cv_deplibs_check_method=pass_all |
1632 | ;; |
1633 | |
1634 | -# This must be Linux ELF. |
1635 | +# This must be glibc/ELF. |
1636 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
1637 | lt_cv_deplibs_check_method=pass_all |
1638 | ;; |
1639 | @@ -3658,6 +3716,7 @@ |
1640 | # which start with @ or ?. |
1641 | lt_cv_sys_global_symbol_pipe="$AWK ['"\ |
1642 | " {last_section=section; section=\$ 3};"\ |
1643 | +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
1644 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
1645 | " \$ 0!~/External *\|/{next};"\ |
1646 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
1647 | @@ -4242,7 +4301,9 @@ |
1648 | case $cc_basename in |
1649 | nvcc*) # Cuda Compiler Driver 2.2 |
1650 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' |
1651 | - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' |
1652 | + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then |
1653 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" |
1654 | + fi |
1655 | ;; |
1656 | esac |
1657 | else |
1658 | @@ -4334,18 +4395,33 @@ |
1659 | ;; |
1660 | *) |
1661 | case `$CC -V 2>&1 | sed 5q` in |
1662 | - *Sun\ F* | *Sun*Fortran*) |
1663 | + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) |
1664 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
1665 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1666 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1667 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='' |
1668 | ;; |
1669 | + *Sun\ F* | *Sun*Fortran*) |
1670 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1671 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1672 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' |
1673 | + ;; |
1674 | *Sun\ C*) |
1675 | # Sun C 5.9 |
1676 | _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' |
1677 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1678 | _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1679 | ;; |
1680 | + *Intel*\ [[CF]]*Compiler*) |
1681 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1682 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' |
1683 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' |
1684 | + ;; |
1685 | + *Portland\ Group*) |
1686 | + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' |
1687 | + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' |
1688 | + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' |
1689 | + ;; |
1690 | esac |
1691 | ;; |
1692 | esac |
1693 | @@ -4505,7 +4581,9 @@ |
1694 | ;; |
1695 | cygwin* | mingw* | cegcc*) |
1696 | case $cc_basename in |
1697 | - cl*) ;; |
1698 | + cl*) |
1699 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
1700 | + ;; |
1701 | *) |
1702 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' |
1703 | _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] |
1704 | @@ -4533,7 +4611,6 @@ |
1705 | _LT_TAGVAR(hardcode_direct, $1)=no |
1706 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
1707 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
1708 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
1709 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
1710 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
1711 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
1712 | @@ -4787,8 +4864,7 @@ |
1713 | xlf* | bgf* | bgxlf* | mpixlf*) |
1714 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
1715 | _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' |
1716 | - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
1717 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' |
1718 | + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' |
1719 | _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
1720 | if test "x$supports_anon_versioning" = xyes; then |
1721 | _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ |
1722 | @@ -5084,6 +5160,7 @@ |
1723 | # The linker will not automatically build a static lib if we build a DLL. |
1724 | # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' |
1725 | _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes |
1726 | + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
1727 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' |
1728 | # Don't use ranlib |
1729 | _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' |
1730 | @@ -5130,10 +5207,6 @@ |
1731 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=no |
1732 | ;; |
1733 | |
1734 | - freebsd1*) |
1735 | - _LT_TAGVAR(ld_shlibs, $1)=no |
1736 | - ;; |
1737 | - |
1738 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
1739 | # support. Future versions do this automatically, but an explicit c++rt0.o |
1740 | # does not break anything, and helps significantly (at the cost of a little |
1741 | @@ -5146,7 +5219,7 @@ |
1742 | ;; |
1743 | |
1744 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
1745 | - freebsd2*) |
1746 | + freebsd2.*) |
1747 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
1748 | _LT_TAGVAR(hardcode_direct, $1)=yes |
1749 | _LT_TAGVAR(hardcode_minus_L, $1)=yes |
1750 | @@ -5185,7 +5258,6 @@ |
1751 | fi |
1752 | if test "$with_gnu_ld" = no; then |
1753 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' |
1754 | - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' |
1755 | _LT_TAGVAR(hardcode_libdir_separator, $1)=: |
1756 | _LT_TAGVAR(hardcode_direct, $1)=yes |
1757 | _LT_TAGVAR(hardcode_direct_absolute, $1)=yes |
1758 | @@ -5627,9 +5699,6 @@ |
1759 | _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], |
1760 | [Flag to hardcode $libdir into a binary during linking. |
1761 | This must work even if $libdir does not exist]) |
1762 | -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], |
1763 | - [[If ld is used when linking, flag to hardcode $libdir into a binary |
1764 | - during linking. This must work even if $libdir does not exist]]) |
1765 | _LT_TAGDECL([], [hardcode_libdir_separator], [1], |
1766 | [Whether we need a single "-rpath" flag with a separated argument]) |
1767 | _LT_TAGDECL([], [hardcode_direct], [0], |
1768 | @@ -5787,7 +5856,6 @@ |
1769 | _LT_TAGVAR(hardcode_direct, $1)=no |
1770 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
1771 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
1772 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
1773 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
1774 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
1775 | _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported |
1776 | @@ -6157,7 +6225,7 @@ |
1777 | esac |
1778 | ;; |
1779 | |
1780 | - freebsd[[12]]*) |
1781 | + freebsd2.*) |
1782 | # C++ shared libraries reported to be fairly broken before |
1783 | # switch to ELF |
1784 | _LT_TAGVAR(ld_shlibs, $1)=no |
1785 | @@ -6918,12 +6986,18 @@ |
1786 | } |
1787 | }; |
1788 | _LT_EOF |
1789 | +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF |
1790 | +package foo |
1791 | +func foo() { |
1792 | +} |
1793 | +_LT_EOF |
1794 | ]) |
1795 | |
1796 | _lt_libdeps_save_CFLAGS=$CFLAGS |
1797 | case "$CC $CFLAGS " in #( |
1798 | *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; |
1799 | *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; |
1800 | +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; |
1801 | esac |
1802 | |
1803 | dnl Parse the compiler output and extract the necessary |
1804 | @@ -7120,7 +7194,6 @@ |
1805 | _LT_TAGVAR(hardcode_direct, $1)=no |
1806 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
1807 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
1808 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
1809 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
1810 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
1811 | _LT_TAGVAR(hardcode_automatic, $1)=no |
1812 | @@ -7253,7 +7326,6 @@ |
1813 | _LT_TAGVAR(hardcode_direct, $1)=no |
1814 | _LT_TAGVAR(hardcode_direct_absolute, $1)=no |
1815 | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= |
1816 | -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= |
1817 | _LT_TAGVAR(hardcode_libdir_separator, $1)= |
1818 | _LT_TAGVAR(hardcode_minus_L, $1)=no |
1819 | _LT_TAGVAR(hardcode_automatic, $1)=no |
1820 | @@ -7440,6 +7512,77 @@ |
1821 | ])# _LT_LANG_GCJ_CONFIG |
1822 | |
1823 | |
1824 | +# _LT_LANG_GO_CONFIG([TAG]) |
1825 | +# -------------------------- |
1826 | +# Ensure that the configuration variables for the GNU Go compiler |
1827 | +# are suitably defined. These variables are subsequently used by _LT_CONFIG |
1828 | +# to write the compiler configuration to `libtool'. |
1829 | +m4_defun([_LT_LANG_GO_CONFIG], |
1830 | +[AC_REQUIRE([LT_PROG_GO])dnl |
1831 | +AC_LANG_SAVE |
1832 | + |
1833 | +# Source file extension for Go test sources. |
1834 | +ac_ext=go |
1835 | + |
1836 | +# Object file extension for compiled Go test sources. |
1837 | +objext=o |
1838 | +_LT_TAGVAR(objext, $1)=$objext |
1839 | + |
1840 | +# Code to be used in simple compile tests |
1841 | +lt_simple_compile_test_code="package main; func main() { }" |
1842 | + |
1843 | +# Code to be used in simple link tests |
1844 | +lt_simple_link_test_code='package main; func main() { }' |
1845 | + |
1846 | +# ltmain only uses $CC for tagged configurations so make sure $CC is set. |
1847 | +_LT_TAG_COMPILER |
1848 | + |
1849 | +# save warnings/boilerplate of simple test code |
1850 | +_LT_COMPILER_BOILERPLATE |
1851 | +_LT_LINKER_BOILERPLATE |
1852 | + |
1853 | +# Allow CC to be a program name with arguments. |
1854 | +lt_save_CC=$CC |
1855 | +lt_save_CFLAGS=$CFLAGS |
1856 | +lt_save_GCC=$GCC |
1857 | +GCC=yes |
1858 | +CC=${GOC-"gccgo"} |
1859 | +CFLAGS=$GOFLAGS |
1860 | +compiler=$CC |
1861 | +_LT_TAGVAR(compiler, $1)=$CC |
1862 | +_LT_TAGVAR(LD, $1)="$LD" |
1863 | +_LT_CC_BASENAME([$compiler]) |
1864 | + |
1865 | +# Go did not exist at the time GCC didn't implicitly link libc in. |
1866 | +_LT_TAGVAR(archive_cmds_need_lc, $1)=no |
1867 | + |
1868 | +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds |
1869 | +_LT_TAGVAR(reload_flag, $1)=$reload_flag |
1870 | +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds |
1871 | + |
1872 | +## CAVEAT EMPTOR: |
1873 | +## There is no encapsulation within the following macros, do not change |
1874 | +## the running order or otherwise move them around unless you know exactly |
1875 | +## what you are doing... |
1876 | +if test -n "$compiler"; then |
1877 | + _LT_COMPILER_NO_RTTI($1) |
1878 | + _LT_COMPILER_PIC($1) |
1879 | + _LT_COMPILER_C_O($1) |
1880 | + _LT_COMPILER_FILE_LOCKS($1) |
1881 | + _LT_LINKER_SHLIBS($1) |
1882 | + _LT_LINKER_HARDCODE_LIBPATH($1) |
1883 | + |
1884 | + _LT_CONFIG($1) |
1885 | +fi |
1886 | + |
1887 | +AC_LANG_RESTORE |
1888 | + |
1889 | +GCC=$lt_save_GCC |
1890 | +CC=$lt_save_CC |
1891 | +CFLAGS=$lt_save_CFLAGS |
1892 | +])# _LT_LANG_GO_CONFIG |
1893 | + |
1894 | + |
1895 | # _LT_LANG_RC_CONFIG([TAG]) |
1896 | # ------------------------- |
1897 | # Ensure that the configuration variables for the Windows resource compiler |
1898 | @@ -7509,6 +7652,13 @@ |
1899 | dnl AC_DEFUN([LT_AC_PROG_GCJ], []) |
1900 | |
1901 | |
1902 | +# LT_PROG_GO |
1903 | +# ---------- |
1904 | +AC_DEFUN([LT_PROG_GO], |
1905 | +[AC_CHECK_TOOL(GOC, gccgo,) |
1906 | +]) |
1907 | + |
1908 | + |
1909 | # LT_PROG_RC |
1910 | # ---------- |
1911 | AC_DEFUN([LT_PROG_RC], |
1912 | |
1913 | === modified file 'build/autotools/ltoptions.m4' |
1914 | --- build/autotools/ltoptions.m4 2011-09-29 14:48:54 +0000 |
1915 | +++ build/autotools/ltoptions.m4 2012-02-08 16:47:26 +0000 |
1916 | @@ -326,9 +326,24 @@ |
1917 | # MODE is either `yes' or `no'. If omitted, it defaults to `both'. |
1918 | m4_define([_LT_WITH_PIC], |
1919 | [AC_ARG_WITH([pic], |
1920 | - [AS_HELP_STRING([--with-pic], |
1921 | + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], |
1922 | [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], |
1923 | - [pic_mode="$withval"], |
1924 | + [lt_p=${PACKAGE-default} |
1925 | + case $withval in |
1926 | + yes|no) pic_mode=$withval ;; |
1927 | + *) |
1928 | + pic_mode=default |
1929 | + # Look at the argument we got. We use all the common list separators. |
1930 | + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
1931 | + for lt_pkg in $withval; do |
1932 | + IFS="$lt_save_ifs" |
1933 | + if test "X$lt_pkg" = "X$lt_p"; then |
1934 | + pic_mode=yes |
1935 | + fi |
1936 | + done |
1937 | + IFS="$lt_save_ifs" |
1938 | + ;; |
1939 | + esac], |
1940 | [pic_mode=default]) |
1941 | |
1942 | test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) |
1943 | |
1944 | === modified file 'build/autotools/ltversion.m4' |
1945 | --- build/autotools/ltversion.m4 2011-09-29 14:48:54 +0000 |
1946 | +++ build/autotools/ltversion.m4 2012-02-08 16:47:26 +0000 |
1947 | @@ -9,15 +9,15 @@ |
1948 | |
1949 | # @configure_input@ |
1950 | |
1951 | -# serial 3293 ltversion.m4 |
1952 | +# serial 3337 ltversion.m4 |
1953 | # This file is part of GNU Libtool |
1954 | |
1955 | -m4_define([LT_PACKAGE_VERSION], [2.4]) |
1956 | -m4_define([LT_PACKAGE_REVISION], [1.3293]) |
1957 | +m4_define([LT_PACKAGE_VERSION], [2.4.2]) |
1958 | +m4_define([LT_PACKAGE_REVISION], [1.3337]) |
1959 | |
1960 | AC_DEFUN([LTVERSION_VERSION], |
1961 | -[macro_version='2.4' |
1962 | -macro_revision='1.3293' |
1963 | +[macro_version='2.4.2' |
1964 | +macro_revision='1.3337' |
1965 | _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) |
1966 | _LT_DECL(, macro_revision, 0) |
1967 | ]) |
1968 | |
1969 | === removed file 'build/autotools/shave-libtool.in' |
1970 | --- build/autotools/shave-libtool.in 2010-05-27 20:02:28 +0000 |
1971 | +++ build/autotools/shave-libtool.in 1970-01-01 00:00:00 +0000 |
1972 | @@ -1,73 +0,0 @@ |
1973 | -#!/bin/sh |
1974 | - |
1975 | -# we need sed |
1976 | -SED=@SED@ |
1977 | -if test -z "$SED" ; then |
1978 | -SED=sed |
1979 | -fi |
1980 | - |
1981 | -lt_unmangle () |
1982 | -{ |
1983 | - last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` |
1984 | -} |
1985 | - |
1986 | -tempval=`echo $1 | sed s/\'//g` |
1987 | -if test "x$tempval" = "x$SHELL"; then |
1988 | - shift |
1989 | -fi |
1990 | -tempval=`echo $1 | sed s/\'//g` |
1991 | -LIBTOOL="$tempval" |
1992 | -shift |
1993 | - |
1994 | -# if 1, don't print anything, the underlaying wrapper will do it |
1995 | -pass_though=0 |
1996 | - |
1997 | -# scan the arguments, keep the right ones for libtool, and discover the mode |
1998 | -preserved_args= |
1999 | -while test "$#" -gt 0; do |
2000 | - opt="$1" |
2001 | - shift |
2002 | - |
2003 | - case $opt in |
2004 | - --mode=*) |
2005 | - mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` |
2006 | - preserved_args="$preserved_args $opt" |
2007 | - ;; |
2008 | - -o) |
2009 | - lt_output="$1" |
2010 | - preserved_args="$preserved_args $opt" |
2011 | - ;; |
2012 | - *) |
2013 | - preserved_args="$preserved_args $opt" |
2014 | - ;; |
2015 | - esac |
2016 | -done |
2017 | - |
2018 | -case "$mode" in |
2019 | -compile) |
2020 | - # shave will be called and print the actual CC/CXX/LINK line |
2021 | - preserved_args="$preserved_args --shave-mode=$mode" |
2022 | - pass_though=1 |
2023 | - ;; |
2024 | -link) |
2025 | - preserved_args="$preserved_args --shave-mode=$mode" |
2026 | - Q=" LINK " |
2027 | - ;; |
2028 | -*) |
2029 | - # let's u |
2030 | - # echo "*** libtool: Unimplemented mode: $mode, fill a bug report" |
2031 | - ;; |
2032 | -esac |
2033 | - |
2034 | -lt_unmangle "$lt_output" |
2035 | -output=$last_result |
2036 | - |
2037 | -if test -z $V; then |
2038 | - if test $pass_though -eq 0; then |
2039 | - echo "$Q$output" |
2040 | - fi |
2041 | - $LIBTOOL --silent $preserved_args |
2042 | -else |
2043 | - echo $LIBTOOL $preserved_args |
2044 | - $LIBTOOL $preserved_args |
2045 | -fi |
2046 | |
2047 | === removed file 'build/autotools/shave.in' |
2048 | --- build/autotools/shave.in 2010-05-27 20:02:28 +0000 |
2049 | +++ build/autotools/shave.in 1970-01-01 00:00:00 +0000 |
2050 | @@ -1,79 +0,0 @@ |
2051 | -#!/bin/sh |
2052 | - |
2053 | -# we need sed |
2054 | -SED=@SED@ |
2055 | -if test -z "$SED" ; then |
2056 | -SED=sed |
2057 | -fi |
2058 | - |
2059 | -lt_unmangle () |
2060 | -{ |
2061 | - last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` |
2062 | -} |
2063 | - |
2064 | -# the tool to wrap (cc, cxx, ar, ranlib, ..) |
2065 | -tool="$1" |
2066 | -shift |
2067 | - |
2068 | -# the reel tool (to call) |
2069 | -REEL_TOOL="$1" |
2070 | -shift |
2071 | - |
2072 | -pass_through=0 |
2073 | -preserved_args= |
2074 | -while test "$#" -gt 0; do |
2075 | - opt="$1" |
2076 | - shift |
2077 | - |
2078 | - case $opt in |
2079 | - --shave-mode=*) |
2080 | - mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` |
2081 | - ;; |
2082 | - -o) |
2083 | - lt_output="$1" |
2084 | - preserved_args="$preserved_args $opt" |
2085 | - ;; |
2086 | - *) |
2087 | - preserved_args="$preserved_args $opt" |
2088 | - ;; |
2089 | - esac |
2090 | -done |
2091 | - |
2092 | -# mode=link is handled in the libtool wrapper |
2093 | -case "$mode,$tool" in |
2094 | -link,*) |
2095 | - pass_through=1 |
2096 | - ;; |
2097 | -*,cxx) |
2098 | - Q=" CXX " |
2099 | - ;; |
2100 | -*,cc) |
2101 | - Q=" CC " |
2102 | - ;; |
2103 | -*,fc) |
2104 | - Q=" FC " |
2105 | - ;; |
2106 | -*,f77) |
2107 | - Q=" F77 " |
2108 | - ;; |
2109 | -*,objc) |
2110 | - Q=" OBJC " |
2111 | - ;; |
2112 | -*,*) |
2113 | - # should not happen |
2114 | - Q=" CC " |
2115 | - ;; |
2116 | -esac |
2117 | - |
2118 | -lt_unmangle "$lt_output" |
2119 | -output=$last_result |
2120 | - |
2121 | -if test -z $V; then |
2122 | - if test $pass_through -eq 0; then |
2123 | - echo "$Q$output" |
2124 | - fi |
2125 | - $REEL_TOOL $preserved_args |
2126 | -else |
2127 | - echo $REEL_TOOL $preserved_args |
2128 | - $REEL_TOOL $preserved_args |
2129 | -fi |
2130 | |
2131 | === removed file 'build/autotools/shave.m4' |
2132 | --- build/autotools/shave.m4 2010-05-27 20:02:28 +0000 |
2133 | +++ build/autotools/shave.m4 1970-01-01 00:00:00 +0000 |
2134 | @@ -1,77 +0,0 @@ |
2135 | -dnl Make automake/libtool output more friendly to humans |
2136 | -dnl Damien Lespiau <damien.lespiau@gmail.com> |
2137 | -dnl |
2138 | -dnl SHAVE_INIT([shavedir],[default_mode]) |
2139 | -dnl |
2140 | -dnl shavedir: the directory where the shave scripts are, it defaults to |
2141 | -dnl $(top_builddir) |
2142 | -dnl default_mode: (enable|disable) default shave mode. This parameter |
2143 | -dnl controls shave's behaviour when no option has been |
2144 | -dnl given to configure. It defaults to disable. |
2145 | -dnl |
2146 | -dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just |
2147 | -dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and |
2148 | -dnl LIBTOOL, you don't want the configure tests to have these variables |
2149 | -dnl re-defined. |
2150 | -dnl * This macro requires GNU make's -s option. |
2151 | - |
2152 | -AC_DEFUN([_SHAVE_ARG_ENABLE], |
2153 | -[ |
2154 | - AC_ARG_ENABLE([shave], |
2155 | - AS_HELP_STRING( |
2156 | - [--enable-shave], |
2157 | - [use shave to make the build pretty [[default=$1]]]),, |
2158 | - [enable_shave=$1] |
2159 | - ) |
2160 | -]) |
2161 | - |
2162 | -AC_DEFUN([SHAVE_INIT], |
2163 | -[ |
2164 | - dnl you can tweak the default value of enable_shave |
2165 | - m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) |
2166 | - |
2167 | - if test x"$enable_shave" = xyes; then |
2168 | - dnl where can we find the shave scripts? |
2169 | - m4_if([$1],, |
2170 | - [shavedir="$ac_pwd"], |
2171 | - [shavedir="$ac_pwd/$1"]) |
2172 | - AC_SUBST(shavedir) |
2173 | - |
2174 | - dnl make is now quiet |
2175 | - AC_SUBST([MAKEFLAGS], [-s]) |
2176 | - AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) |
2177 | - |
2178 | - dnl we need sed |
2179 | - AC_CHECK_PROG(SED,sed,sed,false) |
2180 | - |
2181 | - dnl substitute libtool |
2182 | - SHAVE_SAVED_LIBTOOL=$LIBTOOL |
2183 | - LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" |
2184 | - AC_SUBST(LIBTOOL) |
2185 | - |
2186 | - dnl substitute cc/cxx |
2187 | - SHAVE_SAVED_CC=$CC |
2188 | - SHAVE_SAVED_CXX=$CXX |
2189 | - SHAVE_SAVED_FC=$FC |
2190 | - SHAVE_SAVED_F77=$F77 |
2191 | - SHAVE_SAVED_OBJC=$OBJC |
2192 | - CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" |
2193 | - CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" |
2194 | - FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" |
2195 | - F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" |
2196 | - OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}" |
2197 | - AC_SUBST(CC) |
2198 | - AC_SUBST(CXX) |
2199 | - AC_SUBST(FC) |
2200 | - AC_SUBST(F77) |
2201 | - AC_SUBST(OBJC) |
2202 | - |
2203 | - V=@ |
2204 | - else |
2205 | - V=1 |
2206 | - fi |
2207 | - Q='$(V:1=)' |
2208 | - AC_SUBST(V) |
2209 | - AC_SUBST(Q) |
2210 | -]) |
2211 | - |
2212 | |
2213 | === modified file 'config.h.in' |
2214 | --- config.h.in 2011-01-14 17:40:20 +0000 |
2215 | +++ config.h.in 2012-02-08 16:47:26 +0000 |
2216 | @@ -3,6 +3,9 @@ |
2217 | /* Define to 1 if you have the <dlfcn.h> header file. */ |
2218 | #undef HAVE_DLFCN_H |
2219 | |
2220 | +/* whether gtk3 is available */ |
2221 | +#undef HAVE_GTK3 |
2222 | + |
2223 | /* Define to 1 if you have the <inttypes.h> header file. */ |
2224 | #undef HAVE_INTTYPES_H |
2225 | |
2226 | |
2227 | === modified file 'configure' |
2228 | --- configure 2011-09-29 14:50:10 +0000 |
2229 | +++ configure 2012-02-08 16:47:26 +0000 |
2230 | @@ -1,6 +1,6 @@ |
2231 | #! /bin/sh |
2232 | # Guess values for system-dependent variables and create Makefiles. |
2233 | -# Generated by GNU Autoconf 2.68 for appmenu-gtk 0.3.0. |
2234 | +# Generated by GNU Autoconf 2.68 for appmenu-gtk 0.3.90. |
2235 | # |
2236 | # Report bugs to <crussell@canonical.com>. |
2237 | # |
2238 | @@ -572,8 +572,8 @@ |
2239 | # Identity of this package. |
2240 | PACKAGE_NAME='appmenu-gtk' |
2241 | PACKAGE_TARNAME='appmenu-gtk' |
2242 | -PACKAGE_VERSION='0.3.0' |
2243 | -PACKAGE_STRING='appmenu-gtk 0.3.0' |
2244 | +PACKAGE_VERSION='0.3.90' |
2245 | +PACKAGE_STRING='appmenu-gtk 0.3.90' |
2246 | PACKAGE_BUGREPORT='crussell@canonical.com' |
2247 | PACKAGE_URL='' |
2248 | |
2249 | @@ -618,17 +618,10 @@ |
2250 | am__EXEEXT_TRUE |
2251 | LTLIBOBJS |
2252 | LIBOBJS |
2253 | -Q |
2254 | -V |
2255 | -OBJC |
2256 | -F77 |
2257 | -FC |
2258 | -CXX |
2259 | -AM_MAKEFLAGS |
2260 | -MAKEFLAGS |
2261 | -shavedir |
2262 | sessionfile |
2263 | moduledir |
2264 | +USE_GTK3_FALSE |
2265 | +USE_GTK3_TRUE |
2266 | APPMENU_LIBS |
2267 | APPMENU_CFLAGS |
2268 | AM_BACKSLASH |
2269 | @@ -760,7 +753,6 @@ |
2270 | enable_libtool_lock |
2271 | enable_silent_rules |
2272 | with_gtk2 |
2273 | -enable_shave |
2274 | ' |
2275 | ac_precious_vars='build_alias |
2276 | host_alias |
2277 | @@ -1318,7 +1310,7 @@ |
2278 | # Omit some internal or obsolete options to make the list less imposing. |
2279 | # This message is too long to be a string in the A/UX 3.1 sh. |
2280 | cat <<_ACEOF |
2281 | -\`configure' configures appmenu-gtk 0.3.0 to adapt to many kinds of systems. |
2282 | +\`configure' configures appmenu-gtk 0.3.90 to adapt to many kinds of systems. |
2283 | |
2284 | Usage: $0 [OPTION]... [VAR=VALUE]... |
2285 | |
2286 | @@ -1388,7 +1380,7 @@ |
2287 | |
2288 | if test -n "$ac_init_help"; then |
2289 | case $ac_init_help in |
2290 | - short | recursive ) echo "Configuration of appmenu-gtk 0.3.0:";; |
2291 | + short | recursive ) echo "Configuration of appmenu-gtk 0.3.90:";; |
2292 | esac |
2293 | cat <<\_ACEOF |
2294 | |
2295 | @@ -1407,12 +1399,11 @@ |
2296 | --disable-libtool-lock avoid locking (might break parallel builds) |
2297 | --enable-silent-rules less verbose build output (undo: `make V=1') |
2298 | --disable-silent-rules verbose build output (undo: `make V=0') |
2299 | - --enable-shave use shave to make the build pretty [[default=yes]] |
2300 | |
2301 | Optional Packages: |
2302 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
2303 | --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) |
2304 | - --with-pic try to use only PIC/non-PIC objects [default=use |
2305 | + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use |
2306 | both] |
2307 | --with-gnu-ld assume the C compiler uses GNU ld [default=no] |
2308 | --with-sysroot=DIR Search for dependent libraries within DIR |
2309 | @@ -1504,7 +1495,7 @@ |
2310 | test -n "$ac_init_help" && exit $ac_status |
2311 | if $ac_init_version; then |
2312 | cat <<\_ACEOF |
2313 | -appmenu-gtk configure 0.3.0 |
2314 | +appmenu-gtk configure 0.3.90 |
2315 | generated by GNU Autoconf 2.68 |
2316 | |
2317 | Copyright (C) 2010 Free Software Foundation, Inc. |
2318 | @@ -1784,7 +1775,7 @@ |
2319 | This file contains any messages produced by compilers while |
2320 | running configure, to aid debugging if configure makes a mistake. |
2321 | |
2322 | -It was created by appmenu-gtk $as_me 0.3.0, which was |
2323 | +It was created by appmenu-gtk $as_me 0.3.90, which was |
2324 | generated by GNU Autoconf 2.68. Invocation command line was |
2325 | |
2326 | $ $0 $@ |
2327 | @@ -2605,7 +2596,7 @@ |
2328 | |
2329 | # Define the identity of the package. |
2330 | PACKAGE='appmenu-gtk' |
2331 | - VERSION='0.3.0' |
2332 | + VERSION='0.3.90' |
2333 | |
2334 | |
2335 | cat >>confdefs.h <<_ACEOF |
2336 | @@ -4887,8 +4878,8 @@ |
2337 | |
2338 | |
2339 | |
2340 | -macro_version='2.4' |
2341 | -macro_revision='1.3293' |
2342 | +macro_version='2.4.2' |
2343 | +macro_revision='1.3337' |
2344 | |
2345 | |
2346 | |
2347 | @@ -5603,6 +5594,11 @@ |
2348 | lt_cv_sys_max_cmd_len=196608 |
2349 | ;; |
2350 | |
2351 | + os2*) |
2352 | + # The test takes a long time on OS/2. |
2353 | + lt_cv_sys_max_cmd_len=8192 |
2354 | + ;; |
2355 | + |
2356 | osf*) |
2357 | # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure |
2358 | # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not |
2359 | @@ -5642,7 +5638,7 @@ |
2360 | # If test is not a shell built-in, we'll probably end up computing a |
2361 | # maximum length that is only half of the actual maximum length, but |
2362 | # we can't tell. |
2363 | - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ |
2364 | + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ |
2365 | = "X$teststring$teststring"; } >/dev/null 2>&1 && |
2366 | test $i != 17 # 1/2 MB should be enough |
2367 | do |
2368 | @@ -6071,7 +6067,7 @@ |
2369 | lt_cv_deplibs_check_method=pass_all |
2370 | ;; |
2371 | |
2372 | -# This must be Linux ELF. |
2373 | +# This must be glibc/ELF. |
2374 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2375 | lt_cv_deplibs_check_method=pass_all |
2376 | ;; |
2377 | @@ -6711,13 +6707,13 @@ |
2378 | if test -n "$RANLIB"; then |
2379 | case $host_os in |
2380 | openbsd*) |
2381 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" |
2382 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" |
2383 | ;; |
2384 | *) |
2385 | - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" |
2386 | + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" |
2387 | ;; |
2388 | esac |
2389 | - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" |
2390 | + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" |
2391 | fi |
2392 | |
2393 | case $host_os in |
2394 | @@ -6864,6 +6860,7 @@ |
2395 | # which start with @ or ?. |
2396 | lt_cv_sys_global_symbol_pipe="$AWK '"\ |
2397 | " {last_section=section; section=\$ 3};"\ |
2398 | +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ |
2399 | " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ |
2400 | " \$ 0!~/External *\|/{next};"\ |
2401 | " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ |
2402 | @@ -7252,7 +7249,7 @@ |
2403 | CFLAGS="$SAVE_CFLAGS" |
2404 | fi |
2405 | ;; |
2406 | -sparc*-*solaris*) |
2407 | +*-*solaris*) |
2408 | # Find out which ABI we are using. |
2409 | echo 'int i;' > conftest.$ac_ext |
2410 | if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 |
2411 | @@ -7263,7 +7260,20 @@ |
2412 | case `/usr/bin/file conftest.o` in |
2413 | *64-bit*) |
2414 | case $lt_cv_prog_gnu_ld in |
2415 | - yes*) LD="${LD-ld} -m elf64_sparc" ;; |
2416 | + yes*) |
2417 | + case $host in |
2418 | + i?86-*-solaris*) |
2419 | + LD="${LD-ld} -m elf_x86_64" |
2420 | + ;; |
2421 | + sparc*-*-solaris*) |
2422 | + LD="${LD-ld} -m elf64_sparc" |
2423 | + ;; |
2424 | + esac |
2425 | + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. |
2426 | + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then |
2427 | + LD="${LD-ld}_sol2" |
2428 | + fi |
2429 | + ;; |
2430 | *) |
2431 | if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then |
2432 | LD="${LD-ld} -64" |
2433 | @@ -7903,7 +7913,13 @@ |
2434 | $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ |
2435 | -dynamiclib -Wl,-single_module conftest.c 2>conftest.err |
2436 | _lt_result=$? |
2437 | - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then |
2438 | + # If there is a non-empty error log, and "single_module" |
2439 | + # appears in it, assume the flag caused a linker warning |
2440 | + if test -s conftest.err && $GREP single_module conftest.err; then |
2441 | + cat conftest.err >&5 |
2442 | + # Otherwise, if the output was created with a 0 exit code from |
2443 | + # the compiler, it worked. |
2444 | + elif test -f libconftest.dylib && test $_lt_result -eq 0; then |
2445 | lt_cv_apple_cc_single_mod=yes |
2446 | else |
2447 | cat conftest.err >&5 |
2448 | @@ -7914,6 +7930,7 @@ |
2449 | fi |
2450 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 |
2451 | $as_echo "$lt_cv_apple_cc_single_mod" >&6; } |
2452 | + |
2453 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 |
2454 | $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } |
2455 | if ${lt_cv_ld_exported_symbols_list+:} false; then : |
2456 | @@ -7946,6 +7963,7 @@ |
2457 | fi |
2458 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 |
2459 | $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } |
2460 | + |
2461 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 |
2462 | $as_echo_n "checking for -force_load linker flag... " >&6; } |
2463 | if ${lt_cv_ld_force_load+:} false; then : |
2464 | @@ -7967,7 +7985,9 @@ |
2465 | echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 |
2466 | $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err |
2467 | _lt_result=$? |
2468 | - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then |
2469 | + if test -s conftest.err && $GREP force_load conftest.err; then |
2470 | + cat conftest.err >&5 |
2471 | + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then |
2472 | lt_cv_ld_force_load=yes |
2473 | else |
2474 | cat conftest.err >&5 |
2475 | @@ -8122,7 +8142,22 @@ |
2476 | |
2477 | # Check whether --with-pic was given. |
2478 | if test "${with_pic+set}" = set; then : |
2479 | - withval=$with_pic; pic_mode="$withval" |
2480 | + withval=$with_pic; lt_p=${PACKAGE-default} |
2481 | + case $withval in |
2482 | + yes|no) pic_mode=$withval ;; |
2483 | + *) |
2484 | + pic_mode=default |
2485 | + # Look at the argument we got. We use all the common list separators. |
2486 | + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," |
2487 | + for lt_pkg in $withval; do |
2488 | + IFS="$lt_save_ifs" |
2489 | + if test "X$lt_pkg" = "X$lt_p"; then |
2490 | + pic_mode=yes |
2491 | + fi |
2492 | + done |
2493 | + IFS="$lt_save_ifs" |
2494 | + ;; |
2495 | + esac |
2496 | else |
2497 | pic_mode=default |
2498 | fi |
2499 | @@ -8200,6 +8235,10 @@ |
2500 | |
2501 | |
2502 | |
2503 | + |
2504 | + |
2505 | + |
2506 | + |
2507 | test -z "$LN_S" && LN_S="ln -s" |
2508 | |
2509 | |
2510 | @@ -8659,7 +8698,9 @@ |
2511 | case $cc_basename in |
2512 | nvcc*) # Cuda Compiler Driver 2.2 |
2513 | lt_prog_compiler_wl='-Xlinker ' |
2514 | - lt_prog_compiler_pic='-Xcompiler -fPIC' |
2515 | + if test -n "$lt_prog_compiler_pic"; then |
2516 | + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" |
2517 | + fi |
2518 | ;; |
2519 | esac |
2520 | else |
2521 | @@ -8750,18 +8791,33 @@ |
2522 | ;; |
2523 | *) |
2524 | case `$CC -V 2>&1 | sed 5q` in |
2525 | - *Sun\ F* | *Sun*Fortran*) |
2526 | + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) |
2527 | # Sun Fortran 8.3 passes all unrecognized flags to the linker |
2528 | lt_prog_compiler_pic='-KPIC' |
2529 | lt_prog_compiler_static='-Bstatic' |
2530 | lt_prog_compiler_wl='' |
2531 | ;; |
2532 | + *Sun\ F* | *Sun*Fortran*) |
2533 | + lt_prog_compiler_pic='-KPIC' |
2534 | + lt_prog_compiler_static='-Bstatic' |
2535 | + lt_prog_compiler_wl='-Qoption ld ' |
2536 | + ;; |
2537 | *Sun\ C*) |
2538 | # Sun C 5.9 |
2539 | lt_prog_compiler_pic='-KPIC' |
2540 | lt_prog_compiler_static='-Bstatic' |
2541 | lt_prog_compiler_wl='-Wl,' |
2542 | ;; |
2543 | + *Intel*\ [CF]*Compiler*) |
2544 | + lt_prog_compiler_wl='-Wl,' |
2545 | + lt_prog_compiler_pic='-fPIC' |
2546 | + lt_prog_compiler_static='-static' |
2547 | + ;; |
2548 | + *Portland\ Group*) |
2549 | + lt_prog_compiler_wl='-Wl,' |
2550 | + lt_prog_compiler_pic='-fpic' |
2551 | + lt_prog_compiler_static='-Bstatic' |
2552 | + ;; |
2553 | esac |
2554 | ;; |
2555 | esac |
2556 | @@ -9123,7 +9179,6 @@ |
2557 | hardcode_direct=no |
2558 | hardcode_direct_absolute=no |
2559 | hardcode_libdir_flag_spec= |
2560 | - hardcode_libdir_flag_spec_ld= |
2561 | hardcode_libdir_separator= |
2562 | hardcode_minus_L=no |
2563 | hardcode_shlibpath_var=unsupported |
2564 | @@ -9376,8 +9431,7 @@ |
2565 | xlf* | bgf* | bgxlf* | mpixlf*) |
2566 | # IBM XL Fortran 10.1 on PPC cannot create shared libs itself |
2567 | whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' |
2568 | - hardcode_libdir_flag_spec= |
2569 | - hardcode_libdir_flag_spec_ld='-rpath $libdir' |
2570 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
2571 | archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' |
2572 | if test "x$supports_anon_versioning" = xyes; then |
2573 | archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ |
2574 | @@ -9757,6 +9811,7 @@ |
2575 | # The linker will not automatically build a static lib if we build a DLL. |
2576 | # _LT_TAGVAR(old_archive_from_new_cmds, )='true' |
2577 | enable_shared_with_static_runtimes=yes |
2578 | + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' |
2579 | export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' |
2580 | # Don't use ranlib |
2581 | old_postinstall_cmds='chmod 644 $oldlib' |
2582 | @@ -9802,6 +9857,7 @@ |
2583 | hardcode_shlibpath_var=unsupported |
2584 | if test "$lt_cv_ld_force_load" = "yes"; then |
2585 | whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' |
2586 | + |
2587 | else |
2588 | whole_archive_flag_spec='' |
2589 | fi |
2590 | @@ -9830,10 +9886,6 @@ |
2591 | hardcode_shlibpath_var=no |
2592 | ;; |
2593 | |
2594 | - freebsd1*) |
2595 | - ld_shlibs=no |
2596 | - ;; |
2597 | - |
2598 | # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor |
2599 | # support. Future versions do this automatically, but an explicit c++rt0.o |
2600 | # does not break anything, and helps significantly (at the cost of a little |
2601 | @@ -9846,7 +9898,7 @@ |
2602 | ;; |
2603 | |
2604 | # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
2605 | - freebsd2*) |
2606 | + freebsd2.*) |
2607 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
2608 | hardcode_direct=yes |
2609 | hardcode_minus_L=yes |
2610 | @@ -9885,7 +9937,6 @@ |
2611 | fi |
2612 | if test "$with_gnu_ld" = no; then |
2613 | hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
2614 | - hardcode_libdir_flag_spec_ld='+b $libdir' |
2615 | hardcode_libdir_separator=: |
2616 | hardcode_direct=yes |
2617 | hardcode_direct_absolute=yes |
2618 | @@ -10509,11 +10560,6 @@ |
2619 | |
2620 | |
2621 | |
2622 | - |
2623 | - |
2624 | - |
2625 | - |
2626 | - |
2627 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 |
2628 | $as_echo_n "checking dynamic linker characteristics... " >&6; } |
2629 | |
2630 | @@ -10603,7 +10649,7 @@ |
2631 | |
2632 | case $host_os in |
2633 | aix3*) |
2634 | - version_type=linux |
2635 | + version_type=linux # correct to gnu/linux during the next big refactor |
2636 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' |
2637 | shlibpath_var=LIBPATH |
2638 | |
2639 | @@ -10612,7 +10658,7 @@ |
2640 | ;; |
2641 | |
2642 | aix[4-9]*) |
2643 | - version_type=linux |
2644 | + version_type=linux # correct to gnu/linux during the next big refactor |
2645 | need_lib_prefix=no |
2646 | need_version=no |
2647 | hardcode_into_libs=yes |
2648 | @@ -10677,7 +10723,7 @@ |
2649 | ;; |
2650 | |
2651 | bsdi[45]*) |
2652 | - version_type=linux |
2653 | + version_type=linux # correct to gnu/linux during the next big refactor |
2654 | need_version=no |
2655 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2656 | soname_spec='${libname}${release}${shared_ext}$major' |
2657 | @@ -10816,7 +10862,7 @@ |
2658 | ;; |
2659 | |
2660 | dgux*) |
2661 | - version_type=linux |
2662 | + version_type=linux # correct to gnu/linux during the next big refactor |
2663 | need_lib_prefix=no |
2664 | need_version=no |
2665 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' |
2666 | @@ -10824,10 +10870,6 @@ |
2667 | shlibpath_var=LD_LIBRARY_PATH |
2668 | ;; |
2669 | |
2670 | -freebsd1*) |
2671 | - dynamic_linker=no |
2672 | - ;; |
2673 | - |
2674 | freebsd* | dragonfly*) |
2675 | # DragonFly does not have aout. When/if they implement a new |
2676 | # versioning mechanism, adjust this. |
2677 | @@ -10835,7 +10877,7 @@ |
2678 | objformat=`/usr/bin/objformat` |
2679 | else |
2680 | case $host_os in |
2681 | - freebsd[123]*) objformat=aout ;; |
2682 | + freebsd[23].*) objformat=aout ;; |
2683 | *) objformat=elf ;; |
2684 | esac |
2685 | fi |
2686 | @@ -10853,7 +10895,7 @@ |
2687 | esac |
2688 | shlibpath_var=LD_LIBRARY_PATH |
2689 | case $host_os in |
2690 | - freebsd2*) |
2691 | + freebsd2.*) |
2692 | shlibpath_overrides_runpath=yes |
2693 | ;; |
2694 | freebsd3.[01]* | freebsdelf3.[01]*) |
2695 | @@ -10873,7 +10915,7 @@ |
2696 | ;; |
2697 | |
2698 | gnu*) |
2699 | - version_type=linux |
2700 | + version_type=linux # correct to gnu/linux during the next big refactor |
2701 | need_lib_prefix=no |
2702 | need_version=no |
2703 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
2704 | @@ -10884,7 +10926,7 @@ |
2705 | ;; |
2706 | |
2707 | haiku*) |
2708 | - version_type=linux |
2709 | + version_type=linux # correct to gnu/linux during the next big refactor |
2710 | need_lib_prefix=no |
2711 | need_version=no |
2712 | dynamic_linker="$host_os runtime_loader" |
2713 | @@ -10945,7 +10987,7 @@ |
2714 | ;; |
2715 | |
2716 | interix[3-9]*) |
2717 | - version_type=linux |
2718 | + version_type=linux # correct to gnu/linux during the next big refactor |
2719 | need_lib_prefix=no |
2720 | need_version=no |
2721 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2722 | @@ -10961,7 +11003,7 @@ |
2723 | nonstopux*) version_type=nonstopux ;; |
2724 | *) |
2725 | if test "$lt_cv_prog_gnu_ld" = yes; then |
2726 | - version_type=linux |
2727 | + version_type=linux # correct to gnu/linux during the next big refactor |
2728 | else |
2729 | version_type=irix |
2730 | fi ;; |
2731 | @@ -10998,9 +11040,9 @@ |
2732 | dynamic_linker=no |
2733 | ;; |
2734 | |
2735 | -# This must be Linux ELF. |
2736 | +# This must be glibc/ELF. |
2737 | linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2738 | - version_type=linux |
2739 | + version_type=linux # correct to gnu/linux during the next big refactor |
2740 | need_lib_prefix=no |
2741 | need_version=no |
2742 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2743 | @@ -11094,7 +11136,7 @@ |
2744 | ;; |
2745 | |
2746 | newsos6) |
2747 | - version_type=linux |
2748 | + version_type=linux # correct to gnu/linux during the next big refactor |
2749 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2750 | shlibpath_var=LD_LIBRARY_PATH |
2751 | shlibpath_overrides_runpath=yes |
2752 | @@ -11163,7 +11205,7 @@ |
2753 | ;; |
2754 | |
2755 | solaris*) |
2756 | - version_type=linux |
2757 | + version_type=linux # correct to gnu/linux during the next big refactor |
2758 | need_lib_prefix=no |
2759 | need_version=no |
2760 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2761 | @@ -11188,7 +11230,7 @@ |
2762 | ;; |
2763 | |
2764 | sysv4 | sysv4.3*) |
2765 | - version_type=linux |
2766 | + version_type=linux # correct to gnu/linux during the next big refactor |
2767 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2768 | soname_spec='${libname}${release}${shared_ext}$major' |
2769 | shlibpath_var=LD_LIBRARY_PATH |
2770 | @@ -11212,7 +11254,7 @@ |
2771 | |
2772 | sysv4*MP*) |
2773 | if test -d /usr/nec ;then |
2774 | - version_type=linux |
2775 | + version_type=linux # correct to gnu/linux during the next big refactor |
2776 | library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' |
2777 | soname_spec='$libname${shared_ext}.$major' |
2778 | shlibpath_var=LD_LIBRARY_PATH |
2779 | @@ -11243,7 +11285,7 @@ |
2780 | |
2781 | tpf*) |
2782 | # TPF is a cross-target only. Preferred cross-host = GNU/Linux. |
2783 | - version_type=linux |
2784 | + version_type=linux # correct to gnu/linux during the next big refactor |
2785 | need_lib_prefix=no |
2786 | need_version=no |
2787 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2788 | @@ -11253,7 +11295,7 @@ |
2789 | ;; |
2790 | |
2791 | uts4*) |
2792 | - version_type=linux |
2793 | + version_type=linux # correct to gnu/linux during the next big refactor |
2794 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
2795 | soname_spec='${libname}${release}${shared_ext}$major' |
2796 | shlibpath_var=LD_LIBRARY_PATH |
2797 | @@ -12035,6 +12077,8 @@ |
2798 | |
2799 | |
2800 | |
2801 | + |
2802 | + |
2803 | ac_config_commands="$ac_config_commands libtool" |
2804 | |
2805 | |
2806 | @@ -12187,7 +12231,7 @@ |
2807 | |
2808 | GTK2_REQUIRED_VERSION=2.18 |
2809 | GTK3_REQUIRED_VERSION=3.0 |
2810 | -DBUSMENU_REQUIRED_VERSION=0.3.101 |
2811 | +DBUSMENU_REQUIRED_VERSION=0.5.90 |
2812 | |
2813 | |
2814 | # Check whether --with-gtk2 was given. |
2815 | @@ -12207,13 +12251,16 @@ |
2816 | elif test -n "$PKG_CONFIG"; then |
2817 | if test -n "$PKG_CONFIG" && \ |
2818 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK2_REQUIRED_VERSION |
2819 | + x11 |
2820 | dbusmenu-gtk-0.4 >= \$DBUSMENU_REQUIRED_VERSION\""; } >&5 |
2821 | ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK2_REQUIRED_VERSION |
2822 | + x11 |
2823 | dbusmenu-gtk-0.4 >= $DBUSMENU_REQUIRED_VERSION") 2>&5 |
2824 | ac_status=$? |
2825 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2826 | test $ac_status = 0; }; then |
2827 | pkg_cv_APPMENU_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK2_REQUIRED_VERSION |
2828 | + x11 |
2829 | dbusmenu-gtk-0.4 >= $DBUSMENU_REQUIRED_VERSION" 2>/dev/null` |
2830 | test "x$?" != "x0" && pkg_failed=yes |
2831 | else |
2832 | @@ -12227,13 +12274,16 @@ |
2833 | elif test -n "$PKG_CONFIG"; then |
2834 | if test -n "$PKG_CONFIG" && \ |
2835 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK2_REQUIRED_VERSION |
2836 | + x11 |
2837 | dbusmenu-gtk-0.4 >= \$DBUSMENU_REQUIRED_VERSION\""; } >&5 |
2838 | ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK2_REQUIRED_VERSION |
2839 | + x11 |
2840 | dbusmenu-gtk-0.4 >= $DBUSMENU_REQUIRED_VERSION") 2>&5 |
2841 | ac_status=$? |
2842 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2843 | test $ac_status = 0; }; then |
2844 | pkg_cv_APPMENU_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK2_REQUIRED_VERSION |
2845 | + x11 |
2846 | dbusmenu-gtk-0.4 >= $DBUSMENU_REQUIRED_VERSION" 2>/dev/null` |
2847 | test "x$?" != "x0" && pkg_failed=yes |
2848 | else |
2849 | @@ -12256,15 +12306,18 @@ |
2850 | fi |
2851 | if test $_pkg_short_errors_supported = yes; then |
2852 | APPMENU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= $GTK2_REQUIRED_VERSION |
2853 | + x11 |
2854 | dbusmenu-gtk-0.4 >= $DBUSMENU_REQUIRED_VERSION" 2>&1` |
2855 | else |
2856 | APPMENU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= $GTK2_REQUIRED_VERSION |
2857 | + x11 |
2858 | dbusmenu-gtk-0.4 >= $DBUSMENU_REQUIRED_VERSION" 2>&1` |
2859 | fi |
2860 | # Put the nasty error message in config.log where it belongs |
2861 | echo "$APPMENU_PKG_ERRORS" >&5 |
2862 | |
2863 | as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK2_REQUIRED_VERSION |
2864 | + x11 |
2865 | dbusmenu-gtk-0.4 >= $DBUSMENU_REQUIRED_VERSION) were not met: |
2866 | |
2867 | $APPMENU_PKG_ERRORS |
2868 | @@ -12409,103 +12462,26 @@ |
2869 | |
2870 | |
2871 | |
2872 | - |
2873 | - |
2874 | - |
2875 | -########################### |
2876 | -# Files |
2877 | -########################### |
2878 | - |
2879 | - |
2880 | - |
2881 | - # Check whether --enable-shave was given. |
2882 | -if test "${enable_shave+set}" = set; then : |
2883 | - enableval=$enable_shave; |
2884 | -else |
2885 | - enable_shave=yes |
2886 | - |
2887 | -fi |
2888 | - |
2889 | - |
2890 | - |
2891 | - if test x"$enable_shave" = xyes; then |
2892 | - shavedir="$ac_pwd/build/autotools" |
2893 | - |
2894 | - |
2895 | - MAKEFLAGS=-s |
2896 | - |
2897 | - AM_MAKEFLAGS='`test -z $V && echo -s`' |
2898 | - |
2899 | - |
2900 | - # Extract the first word of "sed", so it can be a program name with args. |
2901 | -set dummy sed; ac_word=$2 |
2902 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
2903 | -$as_echo_n "checking for $ac_word... " >&6; } |
2904 | -if ${ac_cv_prog_SED+:} false; then : |
2905 | - $as_echo_n "(cached) " >&6 |
2906 | -else |
2907 | - if test -n "$SED"; then |
2908 | - ac_cv_prog_SED="$SED" # Let the user override the test. |
2909 | -else |
2910 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
2911 | -for as_dir in $PATH |
2912 | -do |
2913 | - IFS=$as_save_IFS |
2914 | - test -z "$as_dir" && as_dir=. |
2915 | - for ac_exec_ext in '' $ac_executable_extensions; do |
2916 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then |
2917 | - ac_cv_prog_SED="sed" |
2918 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2919 | - break 2 |
2920 | - fi |
2921 | -done |
2922 | - done |
2923 | -IFS=$as_save_IFS |
2924 | - |
2925 | - test -z "$ac_cv_prog_SED" && ac_cv_prog_SED="false" |
2926 | -fi |
2927 | -fi |
2928 | -SED=$ac_cv_prog_SED |
2929 | -if test -n "$SED"; then |
2930 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 |
2931 | -$as_echo "$SED" >&6; } |
2932 | -else |
2933 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2934 | -$as_echo "no" >&6; } |
2935 | -fi |
2936 | - |
2937 | - |
2938 | - |
2939 | - SHAVE_SAVED_LIBTOOL=$LIBTOOL |
2940 | - LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" |
2941 | - |
2942 | - |
2943 | - SHAVE_SAVED_CC=$CC |
2944 | - SHAVE_SAVED_CXX=$CXX |
2945 | - SHAVE_SAVED_FC=$FC |
2946 | - SHAVE_SAVED_F77=$F77 |
2947 | - SHAVE_SAVED_OBJC=$OBJC |
2948 | - CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" |
2949 | - CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" |
2950 | - FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" |
2951 | - F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" |
2952 | - OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}" |
2953 | - |
2954 | - |
2955 | - |
2956 | - |
2957 | - |
2958 | - |
2959 | - V=@ |
2960 | - else |
2961 | - V=1 |
2962 | - fi |
2963 | - Q='$(V:1=)' |
2964 | - |
2965 | - |
2966 | - |
2967 | - |
2968 | -ac_config_files="$ac_config_files Makefile build/Makefile build/autotools/Makefile build/autotools/shave-libtool build/autotools/shave src/Makefile" |
2969 | + if test "x$gtk_api" = "x3.0"; then |
2970 | + USE_GTK3_TRUE= |
2971 | + USE_GTK3_FALSE='#' |
2972 | +else |
2973 | + USE_GTK3_TRUE='#' |
2974 | + USE_GTK3_FALSE= |
2975 | +fi |
2976 | + |
2977 | +if test "x$gtk_api" = x3.0; then : |
2978 | + |
2979 | + |
2980 | +$as_echo "#define HAVE_GTK3 1" >>confdefs.h |
2981 | + |
2982 | + |
2983 | +fi |
2984 | + |
2985 | + |
2986 | + |
2987 | + |
2988 | +ac_config_files="$ac_config_files Makefile src/Makefile" |
2989 | |
2990 | |
2991 | cat >confcache <<\_ACEOF |
2992 | @@ -12641,6 +12617,10 @@ |
2993 | as_fn_error $? "conditional \"am__fastdepCC\" was never defined. |
2994 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
2995 | fi |
2996 | +if test -z "${USE_GTK3_TRUE}" && test -z "${USE_GTK3_FALSE}"; then |
2997 | + as_fn_error $? "conditional \"USE_GTK3\" was never defined. |
2998 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
2999 | +fi |
3000 | |
3001 | : "${CONFIG_STATUS=./config.status}" |
3002 | ac_write_fail=0 |
3003 | @@ -13050,7 +13030,7 @@ |
3004 | # report actual input values of CONFIG_FILES etc. instead of their |
3005 | # values after options handling. |
3006 | ac_log=" |
3007 | -This file was extended by appmenu-gtk $as_me 0.3.0, which was |
3008 | +This file was extended by appmenu-gtk $as_me 0.3.90, which was |
3009 | generated by GNU Autoconf 2.68. Invocation command line was |
3010 | |
3011 | CONFIG_FILES = $CONFIG_FILES |
3012 | @@ -13116,7 +13096,7 @@ |
3013 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
3014 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
3015 | ac_cs_version="\\ |
3016 | -appmenu-gtk config.status 0.3.0 |
3017 | +appmenu-gtk config.status 0.3.90 |
3018 | configured by $0, generated by GNU Autoconf 2.68, |
3019 | with options \\"\$ac_cs_config\\" |
3020 | |
3021 | @@ -13253,6 +13233,7 @@ |
3022 | enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' |
3023 | SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' |
3024 | ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' |
3025 | +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' |
3026 | host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' |
3027 | host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' |
3028 | host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' |
3029 | @@ -13335,7 +13316,6 @@ |
3030 | allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' |
3031 | no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' |
3032 | hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' |
3033 | -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' |
3034 | hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' |
3035 | hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' |
3036 | hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' |
3037 | @@ -13391,6 +13371,7 @@ |
3038 | # Quote evaled strings. |
3039 | for var in SHELL \ |
3040 | ECHO \ |
3041 | +PATH_SEPARATOR \ |
3042 | SED \ |
3043 | GREP \ |
3044 | EGREP \ |
3045 | @@ -13441,7 +13422,6 @@ |
3046 | allow_undefined_flag \ |
3047 | no_undefined_flag \ |
3048 | hardcode_libdir_flag_spec \ |
3049 | -hardcode_libdir_flag_spec_ld \ |
3050 | hardcode_libdir_separator \ |
3051 | exclude_expsyms \ |
3052 | include_expsyms \ |
3053 | @@ -13526,10 +13506,6 @@ |
3054 | "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; |
3055 | "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; |
3056 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
3057 | - "build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;; |
3058 | - "build/autotools/Makefile") CONFIG_FILES="$CONFIG_FILES build/autotools/Makefile" ;; |
3059 | - "build/autotools/shave-libtool") CONFIG_FILES="$CONFIG_FILES build/autotools/shave-libtool" ;; |
3060 | - "build/autotools/shave") CONFIG_FILES="$CONFIG_FILES build/autotools/shave" ;; |
3061 | "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; |
3062 | |
3063 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
3064 | @@ -14242,8 +14218,8 @@ |
3065 | # NOTE: Changes made to this file will be lost: look at ltmain.sh. |
3066 | # |
3067 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, |
3068 | -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, |
3069 | -# Inc. |
3070 | +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software |
3071 | +# Foundation, Inc. |
3072 | # Written by Gordon Matzigkeit, 1996 |
3073 | # |
3074 | # This file is part of GNU Libtool. |
3075 | @@ -14297,6 +14273,9 @@ |
3076 | # An echo program that protects backslashes. |
3077 | ECHO=$lt_ECHO |
3078 | |
3079 | +# The PATH separator for the build system. |
3080 | +PATH_SEPARATOR=$lt_PATH_SEPARATOR |
3081 | + |
3082 | # The host system. |
3083 | host_alias=$host_alias |
3084 | host=$host |
3085 | @@ -14598,10 +14577,6 @@ |
3086 | # This must work even if \$libdir does not exist |
3087 | hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec |
3088 | |
3089 | -# If ld is used when linking, flag to hardcode \$libdir into a binary |
3090 | -# during linking. This must work even if \$libdir does not exist. |
3091 | -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld |
3092 | - |
3093 | # Whether we need a single "-rpath" flag with a separated argument. |
3094 | hardcode_libdir_separator=$lt_hardcode_libdir_separator |
3095 | |
3096 | |
3097 | === modified file 'configure.ac' |
3098 | --- configure.ac 2011-09-29 14:50:10 +0000 |
3099 | +++ configure.ac 2012-02-08 16:47:26 +0000 |
3100 | @@ -1,6 +1,6 @@ |
3101 | AC_PREREQ(2.59) |
3102 | |
3103 | -AC_INIT([appmenu-gtk], [0.3.0], [crussell@canonical.com]) |
3104 | +AC_INIT([appmenu-gtk], [0.3.90], [crussell@canonical.com]) |
3105 | AC_COPYRIGHT([Copyright 2010 Canonical]) |
3106 | AC_CONFIG_SRCDIR([src/bridge.c]) |
3107 | AC_CONFIG_MACRO_DIR([build/autotools]) |
3108 | @@ -29,12 +29,13 @@ |
3109 | |
3110 | GTK2_REQUIRED_VERSION=2.18 |
3111 | GTK3_REQUIRED_VERSION=3.0 |
3112 | -DBUSMENU_REQUIRED_VERSION=0.3.101 |
3113 | +DBUSMENU_REQUIRED_VERSION=0.5.90 |
3114 | |
3115 | AC_ARG_WITH(gtk2, [AS_HELP_STRING([--with-gtk2],[use 2.0 API of GTK+])],[gtk_api=2.0]) |
3116 | |
3117 | if test x$gtk_api = x2.0; then |
3118 | PKG_CHECK_MODULES(APPMENU, gtk+-2.0 >= $GTK2_REQUIRED_VERSION |
3119 | + x11 |
3120 | dbusmenu-gtk-0.4 >= $DBUSMENU_REQUIRED_VERSION) |
3121 | moduledir='$(libdir)/gtk-2.0/2.10.0/menuproxies' |
3122 | sessionfile=80appmenu |
3123 | @@ -50,21 +51,16 @@ |
3124 | AC_SUBST(APPMENU_CFLAGS) |
3125 | AC_SUBST(APPMENU_LIBS) |
3126 | |
3127 | +AM_CONDITIONAL([USE_GTK3], [test "x$gtk_api" = "x3.0"]) |
3128 | +AS_IF([test "x$gtk_api" = x3.0], [ |
3129 | + AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) |
3130 | + ]) |
3131 | + |
3132 | AC_SUBST(moduledir) |
3133 | AC_SUBST(sessionfile) |
3134 | |
3135 | -########################### |
3136 | -# Files |
3137 | -########################### |
3138 | - |
3139 | -SHAVE_INIT([build/autotools], [enable]) |
3140 | - |
3141 | AC_CONFIG_FILES([ |
3142 | Makefile |
3143 | -build/Makefile |
3144 | -build/autotools/Makefile |
3145 | -build/autotools/shave-libtool |
3146 | -build/autotools/shave |
3147 | src/Makefile |
3148 | ]) |
3149 | |
3150 | |
3151 | === modified file 'debian/changelog' |
3152 | --- debian/changelog 2011-09-29 15:37:07 +0000 |
3153 | +++ debian/changelog 2012-02-08 16:47:26 +0000 |
3154 | @@ -1,3 +1,20 @@ |
3155 | +appmenu-gtk (0.3.90-0ubuntu1~ppa1) precise; urgency=low |
3156 | + |
3157 | + [ Ted Gould ] |
3158 | + * New upstream release. |
3159 | + * Making it so that we remove a parent if there is one |
3160 | + * Adding XAtoms to the window |
3161 | + |
3162 | + [ Ken VanDine ] |
3163 | + * debian/rules |
3164 | + * include autoreconf.mk and drop patchsys-quilt.mk |
3165 | + * +debian/compat |
3166 | + * debian/control |
3167 | + * added build dep on dh-autoreconf and dropped quilt build dep |
3168 | + * bump standards to 3.9.2 |
3169 | + |
3170 | + -- Ted Gould <ted@ubuntu.com> Wed, 08 Feb 2012 10:14:03 -0600 |
3171 | + |
3172 | appmenu-gtk (0.3.0-0ubuntu1) oneiric; urgency=low |
3173 | |
3174 | * New upstream release. |
3175 | |
3176 | === added file 'debian/compat' |
3177 | --- debian/compat 1970-01-01 00:00:00 +0000 |
3178 | +++ debian/compat 2012-02-08 16:47:26 +0000 |
3179 | @@ -0,0 +1,1 @@ |
3180 | +5 |
3181 | |
3182 | === modified file 'debian/control' |
3183 | --- debian/control 2011-07-25 17:21:06 +0000 |
3184 | +++ debian/control 2012-02-08 16:47:26 +0000 |
3185 | @@ -4,14 +4,15 @@ |
3186 | Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> |
3187 | Build-Depends: debhelper (>= 5.0), |
3188 | cdbs (>= 0.4.41), |
3189 | - quilt, |
3190 | libgtk2.0-dev (>= 2.21.2-0ubuntu6), |
3191 | libgtk-3-dev (>= 3.0.8-0ubuntu1), |
3192 | + libx11-dev, |
3193 | libdbusmenu-glib-dev (>= 0.4.3-0ubuntu3), |
3194 | libdbusmenu-gtk-dev (>= 0.4.3-0ubuntu3), |
3195 | libdbusmenu-gtk3-dev (>= 0.4.3-0ubuntu3), |
3196 | + dh-autoreconf, |
3197 | libtool |
3198 | -Standards-Version: 3.9.1 |
3199 | +Standards-Version: 3.9.2 |
3200 | Homepage: https://launchpad.net/appmenu-gtk |
3201 | Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/appmenu-gtk/ubuntu |
3202 | Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/appmenu-gtk/ubuntu |
3203 | |
3204 | === modified file 'debian/rules' |
3205 | --- debian/rules 2011-07-25 17:21:06 +0000 |
3206 | +++ debian/rules 2012-02-08 16:47:26 +0000 |
3207 | @@ -3,9 +3,9 @@ |
3208 | DEB_BUILDDIR = build |
3209 | DEB_MAKE_FLAVORS = gtk2 gtk3 |
3210 | |
3211 | +include /usr/share/cdbs/1/rules/autoreconf.mk |
3212 | include /usr/share/cdbs/1/rules/debhelper.mk |
3213 | include /usr/share/cdbs/1/class/gnome.mk |
3214 | -include /usr/share/cdbs/1/rules/patchsys-quilt.mk |
3215 | |
3216 | DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ |
3217 | DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ |
3218 | |
3219 | === modified file 'ltmain.sh' (properties changed: +x to -x) |
3220 | --- ltmain.sh 2011-09-29 14:48:54 +0000 |
3221 | +++ ltmain.sh 2012-02-08 16:47:26 +0000 |
3222 | @@ -1,9 +1,9 @@ |
3223 | |
3224 | -# libtool (GNU libtool) 2.4 |
3225 | +# libtool (GNU libtool) 2.4.2 |
3226 | # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
3227 | |
3228 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, |
3229 | -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
3230 | +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
3231 | # This is free software; see the source for copying conditions. There is NO |
3232 | # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
3233 | |
3234 | @@ -41,6 +41,7 @@ |
3235 | # --quiet, --silent don't print informational messages |
3236 | # --no-quiet, --no-silent |
3237 | # print informational messages (default) |
3238 | +# --no-warn don't display warning messages |
3239 | # --tag=TAG use configuration variables from tag TAG |
3240 | # -v, --verbose print more informational messages than default |
3241 | # --no-verbose don't print the extra informational messages |
3242 | @@ -69,7 +70,7 @@ |
3243 | # compiler: $LTCC |
3244 | # compiler flags: $LTCFLAGS |
3245 | # linker: $LD (gnu? $with_gnu_ld) |
3246 | -# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1 |
3247 | +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 |
3248 | # automake: $automake_version |
3249 | # autoconf: $autoconf_version |
3250 | # |
3251 | @@ -79,9 +80,9 @@ |
3252 | |
3253 | PROGRAM=libtool |
3254 | PACKAGE=libtool |
3255 | -VERSION="2.4 Debian-2.4-2ubuntu1" |
3256 | +VERSION="2.4.2 Debian-2.4.2-1ubuntu1" |
3257 | TIMESTAMP="" |
3258 | -package_revision=1.3293 |
3259 | +package_revision=1.3337 |
3260 | |
3261 | # Be Bourne compatible |
3262 | if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then |
3263 | @@ -136,15 +137,10 @@ |
3264 | |
3265 | : ${CP="cp -f"} |
3266 | test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} |
3267 | -: ${EGREP="/bin/grep -E"} |
3268 | -: ${FGREP="/bin/grep -F"} |
3269 | -: ${GREP="/bin/grep"} |
3270 | -: ${LN_S="ln -s"} |
3271 | : ${MAKE="make"} |
3272 | : ${MKDIR="mkdir"} |
3273 | : ${MV="mv -f"} |
3274 | : ${RM="rm -f"} |
3275 | -: ${SED="/bin/sed"} |
3276 | : ${SHELL="${CONFIG_SHELL-/bin/sh}"} |
3277 | : ${Xsed="$SED -e 1s/^X//"} |
3278 | |
3279 | @@ -387,7 +383,7 @@ |
3280 | ;; |
3281 | *) |
3282 | save_IFS="$IFS" |
3283 | - IFS=: |
3284 | + IFS=${PATH_SEPARATOR-:} |
3285 | for progdir in $PATH; do |
3286 | IFS="$save_IFS" |
3287 | test -x "$progdir/$progname" && break |
3288 | @@ -771,8 +767,8 @@ |
3289 | s*\$LTCFLAGS*'"$LTCFLAGS"'* |
3290 | s*\$LD*'"$LD"'* |
3291 | s/\$with_gnu_ld/'"$with_gnu_ld"'/ |
3292 | - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ |
3293 | - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ |
3294 | + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ |
3295 | + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ |
3296 | p |
3297 | d |
3298 | } |
3299 | @@ -1052,6 +1048,7 @@ |
3300 | opt_help=false |
3301 | opt_help_all=false |
3302 | opt_silent=: |
3303 | +opt_warning=: |
3304 | opt_verbose=: |
3305 | opt_silent=false |
3306 | opt_verbose=false |
3307 | @@ -1120,6 +1117,10 @@ |
3308 | opt_silent=false |
3309 | func_append preserve_args " $opt" |
3310 | ;; |
3311 | + --no-warning|--no-warn) |
3312 | + opt_warning=false |
3313 | +func_append preserve_args " $opt" |
3314 | + ;; |
3315 | --no-verbose) |
3316 | opt_verbose=false |
3317 | func_append preserve_args " $opt" |
3318 | @@ -2059,7 +2060,7 @@ |
3319 | *.[cCFSifmso] | \ |
3320 | *.ada | *.adb | *.ads | *.asm | \ |
3321 | *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ |
3322 | - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) |
3323 | + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) |
3324 | func_xform "$libobj" |
3325 | libobj=$func_xform_result |
3326 | ;; |
3327 | @@ -3201,11 +3202,13 @@ |
3328 | |
3329 | # Set up the ranlib parameters. |
3330 | oldlib="$destdir/$name" |
3331 | + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 |
3332 | + tool_oldlib=$func_to_tool_file_result |
3333 | |
3334 | func_show_eval "$install_prog \$file \$oldlib" 'exit $?' |
3335 | |
3336 | if test -n "$stripme" && test -n "$old_striplib"; then |
3337 | - func_show_eval "$old_striplib $oldlib" 'exit $?' |
3338 | + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' |
3339 | fi |
3340 | |
3341 | # Do each command in the postinstall commands. |
3342 | @@ -3470,7 +3473,7 @@ |
3343 | # linked before any other PIC object. But we must not use |
3344 | # pic_flag when linking with -static. The problem exists in |
3345 | # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. |
3346 | - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) |
3347 | + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) |
3348 | pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; |
3349 | *-*-hpux*) |
3350 | pic_flag_for_symtable=" $pic_flag" ;; |
3351 | @@ -3982,14 +3985,17 @@ |
3352 | # launches target application with the remaining arguments. |
3353 | func_exec_program () |
3354 | { |
3355 | - for lt_wr_arg |
3356 | - do |
3357 | - case \$lt_wr_arg in |
3358 | - --lt-*) ;; |
3359 | - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; |
3360 | - esac |
3361 | - shift |
3362 | - done |
3363 | + case \" \$* \" in |
3364 | + *\\ --lt-*) |
3365 | + for lt_wr_arg |
3366 | + do |
3367 | + case \$lt_wr_arg in |
3368 | + --lt-*) ;; |
3369 | + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; |
3370 | + esac |
3371 | + shift |
3372 | + done ;; |
3373 | + esac |
3374 | func_exec_program_core \${1+\"\$@\"} |
3375 | } |
3376 | |
3377 | @@ -5057,9 +5063,15 @@ |
3378 | { |
3379 | EOF |
3380 | func_emit_wrapper yes | |
3381 | - $SED -e 's/\([\\"]\)/\\\1/g' \ |
3382 | - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' |
3383 | - |
3384 | + $SED -n -e ' |
3385 | +s/^\(.\{79\}\)\(..*\)/\1\ |
3386 | +\2/ |
3387 | +h |
3388 | +s/\([\\"]\)/\\\1/g |
3389 | +s/$/\\n/ |
3390 | +s/\([^\n]*\).*/ fputs ("\1", f);/p |
3391 | +g |
3392 | +D' |
3393 | cat <<"EOF" |
3394 | } |
3395 | EOF |
3396 | @@ -5643,7 +5655,8 @@ |
3397 | continue |
3398 | ;; |
3399 | |
3400 | - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
3401 | + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
3402 | + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) |
3403 | func_append compiler_flags " $arg" |
3404 | func_append compile_command " $arg" |
3405 | func_append finalize_command " $arg" |
3406 | @@ -6150,7 +6163,8 @@ |
3407 | lib= |
3408 | found=no |
3409 | case $deplib in |
3410 | - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) |
3411 | + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |
3412 | + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) |
3413 | if test "$linkmode,$pass" = "prog,link"; then |
3414 | compile_deplibs="$deplib $compile_deplibs" |
3415 | finalize_deplibs="$deplib $finalize_deplibs" |
3416 | @@ -6834,7 +6848,7 @@ |
3417 | test "$hardcode_direct_absolute" = no; then |
3418 | add="$dir/$linklib" |
3419 | elif test "$hardcode_minus_L" = yes; then |
3420 | - add_dir="-L$dir" |
3421 | + add_dir="-L$absdir" |
3422 | # Try looking first in the location we're being installed to. |
3423 | if test -n "$inst_prefix_dir"; then |
3424 | case $libdir in |
3425 | @@ -7319,6 +7333,7 @@ |
3426 | # which has an extra 1 added just for fun |
3427 | # |
3428 | case $version_type in |
3429 | + # correct linux to gnu/linux during the next big refactor |
3430 | darwin|linux|osf|windows|none) |
3431 | func_arith $number_major + $number_minor |
3432 | current=$func_arith_result |
3433 | @@ -7438,7 +7453,7 @@ |
3434 | versuffix="$major.$revision" |
3435 | ;; |
3436 | |
3437 | - linux) |
3438 | + linux) # correct to gnu/linux during the next big refactor |
3439 | func_arith $current - $age |
3440 | major=.$func_arith_result |
3441 | versuffix="$major.$age.$revision" |
3442 | @@ -8026,6 +8041,11 @@ |
3443 | |
3444 | # Test again, we may have decided not to build it any more |
3445 | if test "$build_libtool_libs" = yes; then |
3446 | + # Remove ${wl} instances when linking with ld. |
3447 | + # FIXME: should test the right _cmds variable. |
3448 | + case $archive_cmds in |
3449 | + *\$LD\ *) wl= ;; |
3450 | + esac |
3451 | if test "$hardcode_into_libs" = yes; then |
3452 | # Hardcode the library paths |
3453 | hardcode_libdirs= |
3454 | @@ -8056,7 +8076,7 @@ |
3455 | elif test -n "$runpath_var"; then |
3456 | case "$perm_rpath " in |
3457 | *" $libdir "*) ;; |
3458 | - *) func_apped perm_rpath " $libdir" ;; |
3459 | + *) func_append perm_rpath " $libdir" ;; |
3460 | esac |
3461 | fi |
3462 | done |
3463 | @@ -8064,11 +8084,7 @@ |
3464 | if test -n "$hardcode_libdir_separator" && |
3465 | test -n "$hardcode_libdirs"; then |
3466 | libdir="$hardcode_libdirs" |
3467 | - if test -n "$hardcode_libdir_flag_spec_ld"; then |
3468 | - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" |
3469 | - else |
3470 | - eval dep_rpath=\"$hardcode_libdir_flag_spec\" |
3471 | - fi |
3472 | + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" |
3473 | fi |
3474 | if test -n "$runpath_var" && test -n "$perm_rpath"; then |
3475 | # We should set the runpath_var. |
3476 | @@ -9158,6 +9174,8 @@ |
3477 | esac |
3478 | done |
3479 | fi |
3480 | + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 |
3481 | + tool_oldlib=$func_to_tool_file_result |
3482 | eval cmds=\"$old_archive_cmds\" |
3483 | |
3484 | func_len " $cmds" |
3485 | @@ -9267,7 +9285,8 @@ |
3486 | *.la) |
3487 | func_basename "$deplib" |
3488 | name="$func_basename_result" |
3489 | - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` |
3490 | + func_resolve_sysroot "$deplib" |
3491 | + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` |
3492 | test -z "$libdir" && \ |
3493 | func_fatal_error "\`$deplib' is not a valid libtool archive" |
3494 | func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" |
3495 | |
3496 | === modified file 'src/Makefile.in' |
3497 | --- src/Makefile.in 2011-09-29 14:48:54 +0000 |
3498 | +++ src/Makefile.in 2012-02-08 16:47:26 +0000 |
3499 | @@ -42,7 +42,6 @@ |
3500 | $(top_srcdir)/build/autotools/ltsugar.m4 \ |
3501 | $(top_srcdir)/build/autotools/ltversion.m4 \ |
3502 | $(top_srcdir)/build/autotools/lt~obsolete.m4 \ |
3503 | - $(top_srcdir)/build/autotools/shave.m4 \ |
3504 | $(top_srcdir)/configure.ac |
3505 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
3506 | $(ACLOCAL_M4) |
3507 | @@ -118,7 +117,6 @@ |
3508 | ACLOCAL = @ACLOCAL@ |
3509 | AMTAR = @AMTAR@ |
3510 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
3511 | -AM_MAKEFLAGS = @AM_MAKEFLAGS@ |
3512 | APPMENU_CFLAGS = @APPMENU_CFLAGS@ |
3513 | APPMENU_LIBS = @APPMENU_LIBS@ |
3514 | AR = @AR@ |
3515 | @@ -131,7 +129,6 @@ |
3516 | CFLAGS = @CFLAGS@ |
3517 | CPP = @CPP@ |
3518 | CPPFLAGS = @CPPFLAGS@ |
3519 | -CXX = @CXX@ |
3520 | CYGPATH_W = @CYGPATH_W@ |
3521 | DEFS = @DEFS@ |
3522 | DEPDIR = @DEPDIR@ |
3523 | @@ -143,8 +140,6 @@ |
3524 | ECHO_T = @ECHO_T@ |
3525 | EGREP = @EGREP@ |
3526 | EXEEXT = @EXEEXT@ |
3527 | -F77 = @F77@ |
3528 | -FC = @FC@ |
3529 | FGREP = @FGREP@ |
3530 | GREP = @GREP@ |
3531 | INSTALL = @INSTALL@ |
3532 | @@ -161,13 +156,11 @@ |
3533 | LN_S = @LN_S@ |
3534 | LTLIBOBJS = @LTLIBOBJS@ |
3535 | MAINT = @MAINT@ |
3536 | -MAKEFLAGS = @MAKEFLAGS@ |
3537 | MAKEINFO = @MAKEINFO@ |
3538 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
3539 | MKDIR_P = @MKDIR_P@ |
3540 | NM = @NM@ |
3541 | NMEDIT = @NMEDIT@ |
3542 | -OBJC = @OBJC@ |
3543 | OBJDUMP = @OBJDUMP@ |
3544 | OBJEXT = @OBJEXT@ |
3545 | OTOOL = @OTOOL@ |
3546 | @@ -183,13 +176,11 @@ |
3547 | PKG_CONFIG = @PKG_CONFIG@ |
3548 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
3549 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
3550 | -Q = @Q@ |
3551 | RANLIB = @RANLIB@ |
3552 | SED = @SED@ |
3553 | SET_MAKE = @SET_MAKE@ |
3554 | SHELL = @SHELL@ |
3555 | STRIP = @STRIP@ |
3556 | -V = @V@ |
3557 | VERSION = @VERSION@ |
3558 | abs_builddir = @abs_builddir@ |
3559 | abs_srcdir = @abs_srcdir@ |
3560 | @@ -239,7 +230,6 @@ |
3561 | sbindir = @sbindir@ |
3562 | sessionfile = @sessionfile@ |
3563 | sharedstatedir = @sharedstatedir@ |
3564 | -shavedir = @shavedir@ |
3565 | srcdir = @srcdir@ |
3566 | sysconfdir = @sysconfdir@ |
3567 | target_alias = @target_alias@ |
3568 | |
3569 | === modified file 'src/bridge.c' |
3570 | --- src/bridge.c 2011-09-29 14:50:10 +0000 |
3571 | +++ src/bridge.c 2012-02-08 16:47:26 +0000 |
3572 | @@ -27,13 +27,8 @@ |
3573 | #include <gdk/gdkx.h> |
3574 | #include <gio/gio.h> |
3575 | |
3576 | -#if GTK_CHECK_VERSION(3, 0, 0) |
3577 | -#include <libdbusmenu-gtk3/menuitem.h> |
3578 | -#include <libdbusmenu-gtk3/parser.h> |
3579 | -#else |
3580 | #include <libdbusmenu-gtk/menuitem.h> |
3581 | #include <libdbusmenu-gtk/parser.h> |
3582 | -#endif |
3583 | |
3584 | #include <libdbusmenu-glib/menuitem.h> |
3585 | #include <libdbusmenu-glib/server.h> |
3586 | @@ -108,6 +103,35 @@ |
3587 | static GDBusNodeInfo * registrar_node_info = NULL; |
3588 | static GDBusInterfaceInfo * registrar_interface_info = NULL; |
3589 | |
3590 | +#if HAVE_GTK3 == 0 |
3591 | + |
3592 | +#include <X11/Xlib.h> |
3593 | + |
3594 | +/* This function is copied from GTK 3.4 and is not Copyright Canonical */ |
3595 | +static void |
3596 | +gdk_x11_window_set_utf8_property (GdkWindow *window, |
3597 | + const gchar *name, |
3598 | + const gchar *value) |
3599 | +{ |
3600 | + GdkDisplay *display; |
3601 | + |
3602 | + display = gdk_window_get_display (window); |
3603 | + |
3604 | + if (value != NULL) { |
3605 | + XChangeProperty (GDK_DISPLAY_XDISPLAY (display), |
3606 | + GDK_WINDOW_XID (window), |
3607 | + gdk_x11_get_xatom_by_name_for_display (display, name), |
3608 | + gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING"), 8, |
3609 | + PropModeReplace, (guchar *)value, strlen (value)); |
3610 | + } else { |
3611 | + XDeleteProperty (GDK_DISPLAY_XDISPLAY (display), |
3612 | + GDK_WINDOW_XID (window), |
3613 | + gdk_x11_get_xatom_by_name_for_display (display, name)); |
3614 | + } |
3615 | +} |
3616 | + |
3617 | +#endif |
3618 | + |
3619 | static void |
3620 | activate_menu (AppMenuBridge *bridge, |
3621 | GtkWidget *widget, |
3622 | @@ -376,6 +400,15 @@ |
3623 | context->cancel, |
3624 | register_application_window_cb, |
3625 | context); |
3626 | + |
3627 | + GdkWindow * gdkwindow = gtk_widget_get_window(widget); |
3628 | + if (gdkwindow != NULL) |
3629 | + { |
3630 | + GDBusConnection * conn = g_dbus_proxy_get_connection(bridge->priv->appmenuproxy); |
3631 | + |
3632 | + gdk_x11_window_set_utf8_property(gdkwindow, "_UBUNTU_APPMENU_UNIQUE_NAME", g_dbus_connection_get_unique_name(conn)); |
3633 | + gdk_x11_window_set_utf8_property(gdkwindow, "_UBUNTU_APPMENU_OBJECT_PATH", context->path); |
3634 | + } |
3635 | } |
3636 | } |
3637 | } |
3638 | @@ -855,6 +888,12 @@ |
3639 | if (mi != NULL) |
3640 | { |
3641 | DbusmenuMenuitem *child_dmi = dbusmenu_gtk_parse_menu_structure (child); |
3642 | + DbusmenuMenuitem *child_parent = dbusmenu_menuitem_get_parent (child_dmi); |
3643 | + |
3644 | + if (child_parent != NULL) |
3645 | + { |
3646 | + dbusmenu_menuitem_child_delete (child_parent, child_dmi); |
3647 | + } |
3648 | |
3649 | g_object_set_data (G_OBJECT (child_dmi), "dbusmenu-parent", mi); |
3650 | dbusmenu_menuitem_child_add_position (mi, |
3651 | @@ -912,7 +951,8 @@ |
3652 | || (g_strcmp0 (prg, "emacs") == 0) |
3653 | || (g_strcmp0 (prg, "emacs23") == 0) |
3654 | || (g_strcmp0 (prg, "emacs23-lucid") == 0) |
3655 | - || (g_strcmp0 (prg, "gnome-panel") == 0)) |
3656 | + || (g_strcmp0 (prg, "gnome-panel") == 0) |
3657 | + || (g_strcmp0 (prg, "Lotus Notes") == 0)) |
3658 | { |
3659 | return TRUE; |
3660 | } |