Merge lp:~remote-login-service-team/lightdm-remote-session-uccsconfigure/ubuntu into lp:~ubuntu-desktop/lightdm-remote-session-uccsconfigure/ubuntu
- ubuntu
- Merge into ubuntu
Proposed by
Ted Gould
Status: | Merged |
---|---|
Merged at revision: | 10 |
Proposed branch: | lp:~remote-login-service-team/lightdm-remote-session-uccsconfigure/ubuntu |
Merge into: | lp:~ubuntu-desktop/lightdm-remote-session-uccsconfigure/ubuntu |
Diff against target: |
4009 lines (+3397/-75) 19 files modified
AUTHORS (+2/-1) ChangeLog (+100/-0) Makefile.am (+44/-3) Makefile.in (+310/-44) aclocal.m4 (+389/-0) compile (+343/-0) configure (+1328/-16) configure.ac (+5/-1) debian/changelog (+28/-0) debian/control (+4/-1) debian/rules (+5/-1) debian/source/format (+0/-1) depcomp (+708/-0) firefox-uccsconfigure.desktop.in (+2/-1) firefox-uccsconfigure.sh (+4/-0) lightdm-remote-session-uccsconfigure.in (+71/-0) uccsconfigure-session-wrapper.c (+32/-0) uccsconfigure-session.in (+20/-4) uccsconfigure.desktop.in (+2/-2) |
To merge this branch: | bzr merge lp:~remote-login-service-team/lightdm-remote-session-uccsconfigure/ubuntu |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Terry | Pending | ||
Review via email: mp+125310@code.launchpad.net |
Commit message
Description of the change
1.0, now serving you with protection
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 'AUTHORS' |
2 | --- AUTHORS 2012-08-22 03:25:27 +0000 |
3 | +++ AUTHORS 2012-09-19 20:21:18 +0000 |
4 | @@ -1,3 +1,4 @@ |
5 | # Generated by Makefile. Do not edit. |
6 | |
7 | - Ted Gould |
8 | + Tarmac |
9 | + Ted Gould <ted@canonical.com> |
10 | |
11 | === modified file 'ChangeLog' |
12 | --- ChangeLog 2012-08-22 14:13:08 +0000 |
13 | +++ ChangeLog 2012-09-19 20:21:18 +0000 |
14 | @@ -1,5 +1,105 @@ |
15 | # Generated by Makefile. Do not edit. |
16 | |
17 | +2012-09-19 Ted Gould <ted@gould.cx> |
18 | + |
19 | + 1.1 |
20 | + |
21 | +2012-09-19 Ted Gould <ted@gould.cx> |
22 | + |
23 | + Make sure we can substitute datadir as well |
24 | + |
25 | +2012-09-18 Ted Gould <ted@gould.cx> |
26 | + |
27 | + 1.0 |
28 | + |
29 | +2012-09-17 Ted Gould <ted@gould.cx> |
30 | + |
31 | + Adding an apparmor profile for the session. Fixes: https://bugs.launchpad.net/bugs/1049849. Approved by Albert Astals Cid, jenkins. |
32 | + |
33 | +2012-09-14 Ted Gould <ted@gould.cx> |
34 | + |
35 | + Making the desktop file find the wrapper |
36 | + |
37 | +2012-09-14 Ted Gould <ted@gould.cx> |
38 | + |
39 | + 0.3+apparmor |
40 | + |
41 | +2012-09-14 Ted Gould <ted@gould.cx> |
42 | + |
43 | + Copyright header |
44 | + |
45 | +2012-09-14 Ted Gould <ted@gould.cx> |
46 | + |
47 | + Fleshing out the wrapper |
48 | + |
49 | +2012-09-14 Ted Gould <ted@gould.cx> |
50 | + |
51 | + Make apparmor work on the wrapper |
52 | + |
53 | +2012-09-14 Ted Gould <ted@gould.cx> |
54 | + |
55 | + Add a small binary to be the wrapper |
56 | + |
57 | +2012-09-14 Ted Gould <ted@gould.cx> |
58 | + |
59 | + Adding a C compiler |
60 | + |
61 | +2012-09-14 Ted Gould <ted@gould.cx> |
62 | + |
63 | + Attaching bug |
64 | + |
65 | +2012-09-14 Ted Gould <ted@gould.cx> |
66 | + |
67 | + Add build system for the apparmor profile |
68 | + |
69 | +2012-09-14 Ted Gould <ted@gould.cx> |
70 | + |
71 | + Adding a apparmor profile for the session |
72 | + |
73 | +2012-08-28 Ted Gould <ted@gould.cx> |
74 | + |
75 | + If Firefox closes log out of the session.. Approved by Albert Astals Cid, jenkins. |
76 | + |
77 | +2012-08-27 Ted Gould <ted@gould.cx> |
78 | + |
79 | + Adding the firefox script to the dist |
80 | + |
81 | +2012-08-23 Ted Gould <ted@gould.cx> |
82 | + |
83 | + No dialog, just logout |
84 | + |
85 | +2012-08-23 Ted Gould <ted@gould.cx> |
86 | + |
87 | + Changing the desktop fiel to call our little script |
88 | + |
89 | +2012-08-23 Ted Gould <ted@gould.cx> |
90 | + |
91 | + Writing a script so that we can quit if Firefox is closed |
92 | + |
93 | +2012-08-27 Ted Gould <ted@gould.cx> |
94 | + |
95 | + Configure Unity to hide the Launcher and maximize applications.. Approved by Albert Astals Cid, jenkins. |
96 | + |
97 | +2012-08-23 Ted Gould <ted@gould.cx> |
98 | + |
99 | + Setting a couple of settings for Unity |
100 | + |
101 | +2012-08-27 Ted Gould <ted@gould.cx> |
102 | + |
103 | + Drop non-compiz environment settings. Approved by Albert Astals Cid, jenkins. |
104 | + |
105 | +2012-08-23 Ted Gould <ted@gould.cx> |
106 | + |
107 | + Seems this is the only value not set by gnome-session. Dropping the others. |
108 | + |
109 | +2012-08-22 Ted Gould <ted@gould.cx> |
110 | + |
111 | + Add e-mail addresses to the AUTHORS |
112 | + |
113 | +2012-08-22 Ted Gould <ted@gould.cx> |
114 | + |
115 | + Adding Canonical copyright to the script |
116 | + |
117 | 2012-08-22 Ted Gould <ted@gould.cx> |
118 | |
119 | 0.3 |
120 | |
121 | === modified file 'Makefile.am' |
122 | --- Makefile.am 2012-08-22 14:09:46 +0000 |
123 | +++ Makefile.am 2012-09-19 20:21:18 +0000 |
124 | @@ -10,7 +10,10 @@ |
125 | uccsconfigure.desktop |
126 | |
127 | %.desktop: %.desktop.in |
128 | - @sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|" $< > $@ |
129 | + @sed \ |
130 | + -e "s|\@pkgdatadir\@|$(pkgdatadir)|" \ |
131 | + -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" \ |
132 | + $< > $@ |
133 | |
134 | EXTRA_DIST += uccsconfigure.desktop.in |
135 | CLEANFILES += uccsconfigure.desktop |
136 | @@ -41,6 +44,33 @@ |
137 | CLEANFILES += uccsconfigure-session |
138 | |
139 | ############################### |
140 | +# The session wrapper |
141 | +############################### |
142 | + |
143 | +pkglibexec_PROGRAMS = \ |
144 | + uccsconfigure-session-wrapper |
145 | + |
146 | +uccsconfigure_session_wrapper_SOURCES = \ |
147 | + uccsconfigure-session-wrapper.c |
148 | +uccsconfigure_session_wrapper_CFLAGS = \ |
149 | + -DPKGDATADIR="\"$(pkgdatadir)\"" \ |
150 | + -Wall -Werror |
151 | + |
152 | +############################### |
153 | +# Apparmor for session wrapper |
154 | +############################### |
155 | + |
156 | +apparmordir = $(sysconfdir)/apparmor.d/ |
157 | +apparmor_DATA = \ |
158 | + lightdm-remote-session-uccsconfigure |
159 | + |
160 | +lightdm-remote-session-uccsconfigure: lightdm-remote-session-uccsconfigure.in |
161 | + @sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ |
162 | + |
163 | +EXTRA_DIST += lightdm-remote-session-uccsconfigure.in |
164 | +CLEANFILES += lightdm-remote-session-uccsconfigure |
165 | + |
166 | +############################### |
167 | # Autostart Firefox |
168 | ############################### |
169 | |
170 | @@ -48,7 +78,18 @@ |
171 | autostart_file_DATA = \ |
172 | firefox-uccsconfigure.desktop |
173 | |
174 | -EXTRA_DIST += firefox-uccsconfigure.desktop |
175 | +EXTRA_DIST += firefox-uccsconfigure.desktop.in |
176 | +CLEANFILES += firefox-uccsconfigure.desktop |
177 | + |
178 | +############################### |
179 | +# Firefox Start Script |
180 | +############################### |
181 | + |
182 | +firefox_startdir = $(pkgdatadir) |
183 | +firefox_start_SCRIPTS = \ |
184 | + firefox-uccsconfigure.sh |
185 | + |
186 | +EXTRA_DIST += firefox-uccsconfigure.sh |
187 | |
188 | ############################### |
189 | # Dist check stuff |
190 | @@ -74,7 +115,7 @@ |
191 | echo Creating AUTHORS && \ |
192 | ( cd "$(top_srcdir)" && \ |
193 | echo '# Generated by Makefile. Do not edit.'; echo; \ |
194 | - $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ |
195 | + $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | sed -r -f AUTHOR-glue | sort -u) > AUTHORS.tmp \ |
196 | && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ |
197 | || (rm -f AUTHORS.tmp; \ |
198 | echo Failed to generate AUTHORS >&2 ); \ |
199 | |
200 | === modified file 'Makefile.in' |
201 | --- Makefile.in 2012-08-22 14:13:08 +0000 |
202 | +++ Makefile.in 2012-09-19 20:21:18 +0000 |
203 | @@ -16,6 +16,7 @@ |
204 | @SET_MAKE@ |
205 | |
206 | |
207 | + |
208 | VPATH = @srcdir@ |
209 | am__make_dryrun = \ |
210 | { \ |
211 | @@ -50,10 +51,11 @@ |
212 | NORMAL_UNINSTALL = : |
213 | PRE_UNINSTALL = : |
214 | POST_UNINSTALL = : |
215 | +pkglibexec_PROGRAMS = uccsconfigure-session-wrapper$(EXEEXT) |
216 | subdir = . |
217 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
218 | $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ |
219 | - ChangeLog INSTALL NEWS install-sh missing |
220 | + ChangeLog INSTALL NEWS compile depcomp install-sh missing |
221 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
222 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
223 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
224 | @@ -63,6 +65,20 @@ |
225 | mkinstalldirs = $(install_sh) -d |
226 | CONFIG_CLEAN_FILES = |
227 | CONFIG_CLEAN_VPATH_FILES = |
228 | +am__installdirs = "$(DESTDIR)$(pkglibexecdir)" \ |
229 | + "$(DESTDIR)$(firefox_startdir)" \ |
230 | + "$(DESTDIR)$(session_startdir)" "$(DESTDIR)$(apparmordir)" \ |
231 | + "$(DESTDIR)$(autostart_filedir)" \ |
232 | + "$(DESTDIR)$(lightdm_sessiondir)" \ |
233 | + "$(DESTDIR)$(pam_sessiondir)" |
234 | +PROGRAMS = $(pkglibexec_PROGRAMS) |
235 | +am_uccsconfigure_session_wrapper_OBJECTS = uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.$(OBJEXT) |
236 | +uccsconfigure_session_wrapper_OBJECTS = \ |
237 | + $(am_uccsconfigure_session_wrapper_OBJECTS) |
238 | +uccsconfigure_session_wrapper_LDADD = $(LDADD) |
239 | +uccsconfigure_session_wrapper_LINK = $(CCLD) \ |
240 | + $(uccsconfigure_session_wrapper_CFLAGS) $(CFLAGS) \ |
241 | + $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
242 | am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; |
243 | am__vpath_adj = case $$p in \ |
244 | $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |
245 | @@ -90,26 +106,41 @@ |
246 | || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ |
247 | $(am__cd) "$$dir" && rm -f $$files; }; \ |
248 | } |
249 | -am__installdirs = "$(DESTDIR)$(session_startdir)" \ |
250 | - "$(DESTDIR)$(autostart_filedir)" \ |
251 | - "$(DESTDIR)$(lightdm_sessiondir)" \ |
252 | - "$(DESTDIR)$(pam_sessiondir)" |
253 | -SCRIPTS = $(session_start_SCRIPTS) |
254 | +SCRIPTS = $(firefox_start_SCRIPTS) $(session_start_SCRIPTS) |
255 | +DEFAULT_INCLUDES = -I.@am__isrc@ |
256 | +depcomp = $(SHELL) $(top_srcdir)/depcomp |
257 | +am__depfiles_maybe = depfiles |
258 | +am__mv = mv -f |
259 | +AM_V_lt = $(am__v_lt_@AM_V@) |
260 | +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) |
261 | +am__v_lt_0 = --silent |
262 | +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
263 | + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
264 | +AM_V_CC = $(am__v_CC_@AM_V@) |
265 | +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) |
266 | +am__v_CC_0 = @echo " CC " $@; |
267 | +AM_V_at = $(am__v_at_@AM_V@) |
268 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
269 | +am__v_at_0 = @ |
270 | +CCLD = $(CC) |
271 | +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
272 | +AM_V_CCLD = $(am__v_CCLD_@AM_V@) |
273 | +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) |
274 | +am__v_CCLD_0 = @echo " CCLD " $@; |
275 | AM_V_GEN = $(am__v_GEN_@AM_V@) |
276 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
277 | am__v_GEN_0 = @echo " GEN " $@; |
278 | -AM_V_at = $(am__v_at_@AM_V@) |
279 | -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
280 | -am__v_at_0 = @ |
281 | -SOURCES = |
282 | -DIST_SOURCES = |
283 | +SOURCES = $(uccsconfigure_session_wrapper_SOURCES) |
284 | +DIST_SOURCES = $(uccsconfigure_session_wrapper_SOURCES) |
285 | am__can_run_installinfo = \ |
286 | case $$AM_UPDATE_INFO_DIR in \ |
287 | n|no|NO) false;; \ |
288 | *) (install-info --version) >/dev/null 2>&1;; \ |
289 | esac |
290 | -DATA = $(autostart_file_DATA) $(lightdm_session_DATA) \ |
291 | +DATA = $(apparmor_DATA) $(autostart_file_DATA) $(lightdm_session_DATA) \ |
292 | $(pam_session_DATA) |
293 | +ETAGS = etags |
294 | +CTAGS = ctags |
295 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
296 | distdir = $(PACKAGE)-$(VERSION) |
297 | top_distdir = $(distdir) |
298 | @@ -132,21 +163,29 @@ |
299 | AUTOHEADER = @AUTOHEADER@ |
300 | AUTOMAKE = @AUTOMAKE@ |
301 | AWK = @AWK@ |
302 | +CC = @CC@ |
303 | +CCDEPMODE = @CCDEPMODE@ |
304 | +CFLAGS = @CFLAGS@ |
305 | +CPPFLAGS = @CPPFLAGS@ |
306 | CYGPATH_W = @CYGPATH_W@ |
307 | DEFS = @DEFS@ |
308 | +DEPDIR = @DEPDIR@ |
309 | ECHO_C = @ECHO_C@ |
310 | ECHO_N = @ECHO_N@ |
311 | ECHO_T = @ECHO_T@ |
312 | +EXEEXT = @EXEEXT@ |
313 | INSTALL = @INSTALL@ |
314 | INSTALL_DATA = @INSTALL_DATA@ |
315 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
316 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
317 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
318 | +LDFLAGS = @LDFLAGS@ |
319 | LIBOBJS = @LIBOBJS@ |
320 | LIBS = @LIBS@ |
321 | LTLIBOBJS = @LTLIBOBJS@ |
322 | MAKEINFO = @MAKEINFO@ |
323 | MKDIR_P = @MKDIR_P@ |
324 | +OBJEXT = @OBJEXT@ |
325 | PACKAGE = @PACKAGE@ |
326 | PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ |
327 | PACKAGE_NAME = @PACKAGE_NAME@ |
328 | @@ -163,7 +202,10 @@ |
329 | abs_srcdir = @abs_srcdir@ |
330 | abs_top_builddir = @abs_top_builddir@ |
331 | abs_top_srcdir = @abs_top_srcdir@ |
332 | +ac_ct_CC = @ac_ct_CC@ |
333 | +am__include = @am__include@ |
334 | am__leading_dot = @am__leading_dot@ |
335 | +am__quote = @am__quote@ |
336 | am__tar = @am__tar@ |
337 | am__untar = @am__untar@ |
338 | bindir = @bindir@ |
339 | @@ -199,8 +241,12 @@ |
340 | top_builddir = @top_builddir@ |
341 | top_srcdir = @top_srcdir@ |
342 | EXTRA_DIST = uccsconfigure.desktop.in lightdm-remote-uccsconfigure \ |
343 | - uccsconfigure-session.in firefox-uccsconfigure.desktop |
344 | -CLEANFILES = uccsconfigure.desktop uccsconfigure-session |
345 | + uccsconfigure-session.in \ |
346 | + lightdm-remote-session-uccsconfigure.in \ |
347 | + firefox-uccsconfigure.desktop.in firefox-uccsconfigure.sh |
348 | +CLEANFILES = uccsconfigure.desktop uccsconfigure-session \ |
349 | + lightdm-remote-session-uccsconfigure \ |
350 | + firefox-uccsconfigure.desktop |
351 | |
352 | ############################### |
353 | # The session configuration |
354 | @@ -225,6 +271,21 @@ |
355 | session_start_SCRIPTS = \ |
356 | uccsconfigure-session |
357 | |
358 | +uccsconfigure_session_wrapper_SOURCES = \ |
359 | + uccsconfigure-session-wrapper.c |
360 | + |
361 | +uccsconfigure_session_wrapper_CFLAGS = \ |
362 | + -DPKGDATADIR="\"$(pkgdatadir)\"" \ |
363 | + -Wall -Werror |
364 | + |
365 | + |
366 | +############################### |
367 | +# Apparmor for session wrapper |
368 | +############################### |
369 | +apparmordir = $(sysconfdir)/apparmor.d/ |
370 | +apparmor_DATA = \ |
371 | + lightdm-remote-session-uccsconfigure |
372 | + |
373 | |
374 | ############################### |
375 | # Autostart Firefox |
376 | @@ -235,12 +296,21 @@ |
377 | |
378 | |
379 | ############################### |
380 | +# Firefox Start Script |
381 | +############################### |
382 | +firefox_startdir = $(pkgdatadir) |
383 | +firefox_start_SCRIPTS = \ |
384 | + firefox-uccsconfigure.sh |
385 | + |
386 | + |
387 | +############################### |
388 | # Dist check stuff |
389 | ############################### |
390 | DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall |
391 | all: all-am |
392 | |
393 | .SUFFIXES: |
394 | +.SUFFIXES: .c .o .obj |
395 | am--refresh: Makefile |
396 | @: |
397 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
398 | @@ -275,6 +345,84 @@ |
399 | $(ACLOCAL_M4): $(am__aclocal_m4_deps) |
400 | $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
401 | $(am__aclocal_m4_deps): |
402 | +install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS) |
403 | + @$(NORMAL_INSTALL) |
404 | + @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ |
405 | + if test -n "$$list"; then \ |
406 | + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibexecdir)'"; \ |
407 | + $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" || exit 1; \ |
408 | + fi; \ |
409 | + for p in $$list; do echo "$$p $$p"; done | \ |
410 | + sed 's/$(EXEEXT)$$//' | \ |
411 | + while read p p1; do if test -f $$p; \ |
412 | + then echo "$$p"; echo "$$p"; else :; fi; \ |
413 | + done | \ |
414 | + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ |
415 | + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ |
416 | + sed 'N;N;N;s,\n, ,g' | \ |
417 | + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ |
418 | + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ |
419 | + if ($$2 == $$4) files[d] = files[d] " " $$1; \ |
420 | + else { print "f", $$3 "/" $$4, $$1; } } \ |
421 | + END { for (d in files) print "f", d, files[d] }' | \ |
422 | + while read type dir files; do \ |
423 | + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
424 | + test -z "$$files" || { \ |
425 | + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkglibexecdir)$$dir'"; \ |
426 | + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \ |
427 | + } \ |
428 | + ; done |
429 | + |
430 | +uninstall-pkglibexecPROGRAMS: |
431 | + @$(NORMAL_UNINSTALL) |
432 | + @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ |
433 | + files=`for p in $$list; do echo "$$p"; done | \ |
434 | + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ |
435 | + -e 's/$$/$(EXEEXT)/' `; \ |
436 | + test -n "$$list" || exit 0; \ |
437 | + echo " ( cd '$(DESTDIR)$(pkglibexecdir)' && rm -f" $$files ")"; \ |
438 | + cd "$(DESTDIR)$(pkglibexecdir)" && rm -f $$files |
439 | + |
440 | +clean-pkglibexecPROGRAMS: |
441 | + -test -z "$(pkglibexec_PROGRAMS)" || rm -f $(pkglibexec_PROGRAMS) |
442 | +uccsconfigure-session-wrapper$(EXEEXT): $(uccsconfigure_session_wrapper_OBJECTS) $(uccsconfigure_session_wrapper_DEPENDENCIES) $(EXTRA_uccsconfigure_session_wrapper_DEPENDENCIES) |
443 | + @rm -f uccsconfigure-session-wrapper$(EXEEXT) |
444 | + $(AM_V_CCLD)$(uccsconfigure_session_wrapper_LINK) $(uccsconfigure_session_wrapper_OBJECTS) $(uccsconfigure_session_wrapper_LDADD) $(LIBS) |
445 | +install-firefox_startSCRIPTS: $(firefox_start_SCRIPTS) |
446 | + @$(NORMAL_INSTALL) |
447 | + @list='$(firefox_start_SCRIPTS)'; test -n "$(firefox_startdir)" || list=; \ |
448 | + if test -n "$$list"; then \ |
449 | + echo " $(MKDIR_P) '$(DESTDIR)$(firefox_startdir)'"; \ |
450 | + $(MKDIR_P) "$(DESTDIR)$(firefox_startdir)" || exit 1; \ |
451 | + fi; \ |
452 | + for p in $$list; do \ |
453 | + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
454 | + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ |
455 | + done | \ |
456 | + sed -e 'p;s,.*/,,;n' \ |
457 | + -e 'h;s|.*|.|' \ |
458 | + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ |
459 | + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ |
460 | + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ |
461 | + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ |
462 | + if (++n[d] == $(am__install_max)) { \ |
463 | + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ |
464 | + else { print "f", d "/" $$4, $$1 } } \ |
465 | + END { for (d in files) print "f", d, files[d] }' | \ |
466 | + while read type dir files; do \ |
467 | + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ |
468 | + test -z "$$files" || { \ |
469 | + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(firefox_startdir)$$dir'"; \ |
470 | + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(firefox_startdir)$$dir" || exit $$?; \ |
471 | + } \ |
472 | + ; done |
473 | + |
474 | +uninstall-firefox_startSCRIPTS: |
475 | + @$(NORMAL_UNINSTALL) |
476 | + @list='$(firefox_start_SCRIPTS)'; test -n "$(firefox_startdir)" || exit 0; \ |
477 | + files=`for p in $$list; do echo "$$p"; done | \ |
478 | + sed -e 's,.*/,,;$(transform)'`; \ |
479 | + dir='$(DESTDIR)$(firefox_startdir)'; $(am__uninstall_files_from_dir) |
480 | install-session_startSCRIPTS: $(session_start_SCRIPTS) |
481 | @$(NORMAL_INSTALL) |
482 | @list='$(session_start_SCRIPTS)'; test -n "$(session_startdir)" || list=; \ |
483 | @@ -310,6 +458,63 @@ |
484 | files=`for p in $$list; do echo "$$p"; done | \ |
485 | sed -e 's,.*/,,;$(transform)'`; \ |
486 | dir='$(DESTDIR)$(session_startdir)'; $(am__uninstall_files_from_dir) |
487 | + |
488 | +mostlyclean-compile: |
489 | + -rm -f *.$(OBJEXT) |
490 | + |
491 | +distclean-compile: |
492 | + -rm -f *.tab.c |
493 | + |
494 | +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.Po@am__quote@ |
495 | + |
496 | +.c.o: |
497 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
498 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
499 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
500 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
501 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< |
502 | + |
503 | +.c.obj: |
504 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
505 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
506 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
507 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
508 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` |
509 | + |
510 | +uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.o: uccsconfigure-session-wrapper.c |
511 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uccsconfigure_session_wrapper_CFLAGS) $(CFLAGS) -MT uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.o -MD -MP -MF $(DEPDIR)/uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.Tpo -c -o uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.o `test -f 'uccsconfigure-session-wrapper.c' || echo '$(srcdir)/'`uccsconfigure-session-wrapper.c |
512 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.Tpo $(DEPDIR)/uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.Po |
513 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uccsconfigure-session-wrapper.c' object='uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.o' libtool=no @AMDEPBACKSLASH@ |
514 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
515 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uccsconfigure_session_wrapper_CFLAGS) $(CFLAGS) -c -o uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.o `test -f 'uccsconfigure-session-wrapper.c' || echo '$(srcdir)/'`uccsconfigure-session-wrapper.c |
516 | + |
517 | +uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.obj: uccsconfigure-session-wrapper.c |
518 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uccsconfigure_session_wrapper_CFLAGS) $(CFLAGS) -MT uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.obj -MD -MP -MF $(DEPDIR)/uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.Tpo -c -o uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.obj `if test -f 'uccsconfigure-session-wrapper.c'; then $(CYGPATH_W) 'uccsconfigure-session-wrapper.c'; else $(CYGPATH_W) '$(srcdir)/uccsconfigure-session-wrapper.c'; fi` |
519 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.Tpo $(DEPDIR)/uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.Po |
520 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uccsconfigure-session-wrapper.c' object='uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.obj' libtool=no @AMDEPBACKSLASH@ |
521 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
522 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uccsconfigure_session_wrapper_CFLAGS) $(CFLAGS) -c -o uccsconfigure_session_wrapper-uccsconfigure-session-wrapper.obj `if test -f 'uccsconfigure-session-wrapper.c'; then $(CYGPATH_W) 'uccsconfigure-session-wrapper.c'; else $(CYGPATH_W) '$(srcdir)/uccsconfigure-session-wrapper.c'; fi` |
523 | +install-apparmorDATA: $(apparmor_DATA) |
524 | + @$(NORMAL_INSTALL) |
525 | + @list='$(apparmor_DATA)'; test -n "$(apparmordir)" || list=; \ |
526 | + if test -n "$$list"; then \ |
527 | + echo " $(MKDIR_P) '$(DESTDIR)$(apparmordir)'"; \ |
528 | + $(MKDIR_P) "$(DESTDIR)$(apparmordir)" || exit 1; \ |
529 | + fi; \ |
530 | + for p in $$list; do \ |
531 | + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
532 | + echo "$$d$$p"; \ |
533 | + done | $(am__base_list) | \ |
534 | + while read files; do \ |
535 | + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(apparmordir)'"; \ |
536 | + $(INSTALL_DATA) $$files "$(DESTDIR)$(apparmordir)" || exit $$?; \ |
537 | + done |
538 | + |
539 | +uninstall-apparmorDATA: |
540 | + @$(NORMAL_UNINSTALL) |
541 | + @list='$(apparmor_DATA)'; test -n "$(apparmordir)" || list=; \ |
542 | + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
543 | + dir='$(DESTDIR)$(apparmordir)'; $(am__uninstall_files_from_dir) |
544 | install-autostart_fileDATA: $(autostart_file_DATA) |
545 | @$(NORMAL_INSTALL) |
546 | @list='$(autostart_file_DATA)'; test -n "$(autostart_filedir)" || list=; \ |
547 | @@ -373,12 +578,58 @@ |
548 | @list='$(pam_session_DATA)'; test -n "$(pam_sessiondir)" || list=; \ |
549 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
550 | dir='$(DESTDIR)$(pam_sessiondir)'; $(am__uninstall_files_from_dir) |
551 | + |
552 | +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
553 | + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
554 | + unique=`for i in $$list; do \ |
555 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
556 | + done | \ |
557 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
558 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
559 | + mkid -fID $$unique |
560 | tags: TAGS |
561 | -TAGS: |
562 | |
563 | +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
564 | + $(TAGS_FILES) $(LISP) |
565 | + set x; \ |
566 | + here=`pwd`; \ |
567 | + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
568 | + unique=`for i in $$list; do \ |
569 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
570 | + done | \ |
571 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
572 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
573 | + shift; \ |
574 | + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
575 | + test -n "$$unique" || unique=$$empty_fix; \ |
576 | + if test $$# -gt 0; then \ |
577 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
578 | + "$$@" $$unique; \ |
579 | + else \ |
580 | + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ |
581 | + $$unique; \ |
582 | + fi; \ |
583 | + fi |
584 | ctags: CTAGS |
585 | -CTAGS: |
586 | - |
587 | +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
588 | + $(TAGS_FILES) $(LISP) |
589 | + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
590 | + unique=`for i in $$list; do \ |
591 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
592 | + done | \ |
593 | + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
594 | + END { if (nonempty) { for (i in files) print i; }; }'`; \ |
595 | + test -z "$(CTAGS_ARGS)$$unique" \ |
596 | + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
597 | + $$unique |
598 | + |
599 | +GTAGS: |
600 | + here=`$(am__cd) $(top_builddir) && pwd` \ |
601 | + && $(am__cd) $(top_srcdir) \ |
602 | + && gtags -i $(GTAGS_ARGS) "$$here" |
603 | + |
604 | +distclean-tags: |
605 | + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
606 | |
607 | distdir: $(DISTFILES) |
608 | $(am__remove_distdir) |
609 | @@ -547,9 +798,9 @@ |
610 | exit 1; } >&2 |
611 | check-am: all-am |
612 | check: check-am |
613 | -all-am: Makefile $(SCRIPTS) $(DATA) |
614 | +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) |
615 | installdirs: |
616 | - for dir in "$(DESTDIR)$(session_startdir)" "$(DESTDIR)$(autostart_filedir)" "$(DESTDIR)$(lightdm_sessiondir)" "$(DESTDIR)$(pam_sessiondir)"; do \ |
617 | + for dir in "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(firefox_startdir)" "$(DESTDIR)$(session_startdir)" "$(DESTDIR)$(apparmordir)" "$(DESTDIR)$(autostart_filedir)" "$(DESTDIR)$(lightdm_sessiondir)" "$(DESTDIR)$(pam_sessiondir)"; do \ |
618 | test -z "$$dir" || $(MKDIR_P) "$$dir"; \ |
619 | done |
620 | install: install-am |
621 | @@ -585,12 +836,14 @@ |
622 | @echo "it deletes files that may require special tools to rebuild." |
623 | clean: clean-am |
624 | |
625 | -clean-am: clean-generic mostlyclean-am |
626 | +clean-am: clean-generic clean-pkglibexecPROGRAMS mostlyclean-am |
627 | |
628 | distclean: distclean-am |
629 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
630 | + -rm -rf ./$(DEPDIR) |
631 | -rm -f Makefile |
632 | -distclean-am: clean-am distclean-generic |
633 | +distclean-am: clean-am distclean-compile distclean-generic \ |
634 | + distclean-tags |
635 | |
636 | dvi: dvi-am |
637 | |
638 | @@ -604,15 +857,15 @@ |
639 | |
640 | info-am: |
641 | |
642 | -install-data-am: install-autostart_fileDATA \ |
643 | - install-lightdm_sessionDATA install-pam_sessionDATA \ |
644 | - install-session_startSCRIPTS |
645 | +install-data-am: install-apparmorDATA install-autostart_fileDATA \ |
646 | + install-firefox_startSCRIPTS install-lightdm_sessionDATA \ |
647 | + install-pam_sessionDATA install-session_startSCRIPTS |
648 | |
649 | install-dvi: install-dvi-am |
650 | |
651 | install-dvi-am: |
652 | |
653 | -install-exec-am: |
654 | +install-exec-am: install-pkglibexecPROGRAMS |
655 | |
656 | install-html: install-html-am |
657 | |
658 | @@ -637,12 +890,13 @@ |
659 | maintainer-clean: maintainer-clean-am |
660 | -rm -f $(am__CONFIG_DISTCLEAN_FILES) |
661 | -rm -rf $(top_srcdir)/autom4te.cache |
662 | + -rm -rf ./$(DEPDIR) |
663 | -rm -f Makefile |
664 | maintainer-clean-am: distclean-am maintainer-clean-generic |
665 | |
666 | mostlyclean: mostlyclean-am |
667 | |
668 | -mostlyclean-am: mostlyclean-generic |
669 | +mostlyclean-am: mostlyclean-compile mostlyclean-generic |
670 | |
671 | pdf: pdf-am |
672 | |
673 | @@ -652,37 +906,49 @@ |
674 | |
675 | ps-am: |
676 | |
677 | -uninstall-am: uninstall-autostart_fileDATA \ |
678 | - uninstall-lightdm_sessionDATA uninstall-pam_sessionDATA \ |
679 | +uninstall-am: uninstall-apparmorDATA uninstall-autostart_fileDATA \ |
680 | + uninstall-firefox_startSCRIPTS uninstall-lightdm_sessionDATA \ |
681 | + uninstall-pam_sessionDATA uninstall-pkglibexecPROGRAMS \ |
682 | uninstall-session_startSCRIPTS |
683 | |
684 | .MAKE: install-am install-strip |
685 | |
686 | -.PHONY: all all-am am--refresh check check-am clean clean-generic dist \ |
687 | - dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma \ |
688 | - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ |
689 | - distclean-generic distcleancheck distdir distuninstallcheck \ |
690 | - dvi dvi-am html html-am info info-am install install-am \ |
691 | +.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ |
692 | + clean-generic clean-pkglibexecPROGRAMS ctags dist dist-all \ |
693 | + dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma dist-shar \ |
694 | + dist-tarZ dist-xz dist-zip distcheck distclean \ |
695 | + distclean-compile distclean-generic distclean-tags \ |
696 | + distcleancheck distdir distuninstallcheck dvi dvi-am html \ |
697 | + html-am info info-am install install-am install-apparmorDATA \ |
698 | install-autostart_fileDATA install-data install-data-am \ |
699 | install-dvi install-dvi-am install-exec install-exec-am \ |
700 | - install-html install-html-am install-info install-info-am \ |
701 | - install-lightdm_sessionDATA install-man \ |
702 | - install-pam_sessionDATA install-pdf install-pdf-am install-ps \ |
703 | - install-ps-am install-session_startSCRIPTS install-strip \ |
704 | - installcheck installcheck-am installdirs maintainer-clean \ |
705 | - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ |
706 | - pdf-am ps ps-am uninstall uninstall-am \ |
707 | - uninstall-autostart_fileDATA uninstall-lightdm_sessionDATA \ |
708 | - uninstall-pam_sessionDATA uninstall-session_startSCRIPTS |
709 | + install-firefox_startSCRIPTS install-html install-html-am \ |
710 | + install-info install-info-am install-lightdm_sessionDATA \ |
711 | + install-man install-pam_sessionDATA install-pdf install-pdf-am \ |
712 | + install-pkglibexecPROGRAMS install-ps install-ps-am \ |
713 | + install-session_startSCRIPTS install-strip installcheck \ |
714 | + installcheck-am installdirs maintainer-clean \ |
715 | + maintainer-clean-generic mostlyclean mostlyclean-compile \ |
716 | + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ |
717 | + uninstall-am uninstall-apparmorDATA \ |
718 | + uninstall-autostart_fileDATA uninstall-firefox_startSCRIPTS \ |
719 | + uninstall-lightdm_sessionDATA uninstall-pam_sessionDATA \ |
720 | + uninstall-pkglibexecPROGRAMS uninstall-session_startSCRIPTS |
721 | |
722 | |
723 | %.desktop: %.desktop.in |
724 | - @sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|" $< > $@ |
725 | + @sed \ |
726 | + -e "s|\@pkgdatadir\@|$(pkgdatadir)|" \ |
727 | + -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" \ |
728 | + $< > $@ |
729 | |
730 | uccsconfigure-session: uccsconfigure-session.in |
731 | @sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|" $< > $@ |
732 | @chmod +x $@ |
733 | |
734 | +lightdm-remote-session-uccsconfigure: lightdm-remote-session-uccsconfigure.in |
735 | + @sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ |
736 | + |
737 | dist-hook: |
738 | @if test -d "$(top_srcdir)/.bzr"; \ |
739 | then \ |
740 | @@ -701,7 +967,7 @@ |
741 | echo Creating AUTHORS && \ |
742 | ( cd "$(top_srcdir)" && \ |
743 | echo '# Generated by Makefile. Do not edit.'; echo; \ |
744 | - $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \ |
745 | + $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | sed -r -f AUTHOR-glue | sort -u) > AUTHORS.tmp \ |
746 | && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \ |
747 | || (rm -f AUTHORS.tmp; \ |
748 | echo Failed to generate AUTHORS >&2 ); \ |
749 | |
750 | === modified file 'aclocal.m4' |
751 | --- aclocal.m4 2012-08-22 03:25:27 +0000 |
752 | +++ aclocal.m4 2012-09-19 20:21:18 +0000 |
753 | @@ -114,6 +114,308 @@ |
754 | am_aux_dir=`cd $ac_aux_dir && pwd` |
755 | ]) |
756 | |
757 | +# AM_CONDITIONAL -*- Autoconf -*- |
758 | + |
759 | +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 |
760 | +# Free Software Foundation, Inc. |
761 | +# |
762 | +# This file is free software; the Free Software Foundation |
763 | +# gives unlimited permission to copy and/or distribute it, |
764 | +# with or without modifications, as long as this notice is preserved. |
765 | + |
766 | +# serial 9 |
767 | + |
768 | +# AM_CONDITIONAL(NAME, SHELL-CONDITION) |
769 | +# ------------------------------------- |
770 | +# Define a conditional. |
771 | +AC_DEFUN([AM_CONDITIONAL], |
772 | +[AC_PREREQ(2.52)dnl |
773 | + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], |
774 | + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl |
775 | +AC_SUBST([$1_TRUE])dnl |
776 | +AC_SUBST([$1_FALSE])dnl |
777 | +_AM_SUBST_NOTMAKE([$1_TRUE])dnl |
778 | +_AM_SUBST_NOTMAKE([$1_FALSE])dnl |
779 | +m4_define([_AM_COND_VALUE_$1], [$2])dnl |
780 | +if $2; then |
781 | + $1_TRUE= |
782 | + $1_FALSE='#' |
783 | +else |
784 | + $1_TRUE='#' |
785 | + $1_FALSE= |
786 | +fi |
787 | +AC_CONFIG_COMMANDS_PRE( |
788 | +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then |
789 | + AC_MSG_ERROR([[conditional "$1" was never defined. |
790 | +Usually this means the macro was only invoked conditionally.]]) |
791 | +fi])]) |
792 | + |
793 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, |
794 | +# 2010, 2011 Free Software Foundation, Inc. |
795 | +# |
796 | +# This file is free software; the Free Software Foundation |
797 | +# gives unlimited permission to copy and/or distribute it, |
798 | +# with or without modifications, as long as this notice is preserved. |
799 | + |
800 | +# serial 12 |
801 | + |
802 | +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be |
803 | +# written in clear, in which case automake, when reading aclocal.m4, |
804 | +# will think it sees a *use*, and therefore will trigger all it's |
805 | +# C support machinery. Also note that it means that autoscan, seeing |
806 | +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... |
807 | + |
808 | + |
809 | +# _AM_DEPENDENCIES(NAME) |
810 | +# ---------------------- |
811 | +# See how the compiler implements dependency checking. |
812 | +# NAME is "CC", "CXX", "GCJ", or "OBJC". |
813 | +# We try a few techniques and use that to set a single cache variable. |
814 | +# |
815 | +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was |
816 | +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular |
817 | +# dependency, and given that the user is not expected to run this macro, |
818 | +# just rely on AC_PROG_CC. |
819 | +AC_DEFUN([_AM_DEPENDENCIES], |
820 | +[AC_REQUIRE([AM_SET_DEPDIR])dnl |
821 | +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl |
822 | +AC_REQUIRE([AM_MAKE_INCLUDE])dnl |
823 | +AC_REQUIRE([AM_DEP_TRACK])dnl |
824 | + |
825 | +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], |
826 | + [$1], CXX, [depcc="$CXX" am_compiler_list=], |
827 | + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], |
828 | + [$1], UPC, [depcc="$UPC" am_compiler_list=], |
829 | + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], |
830 | + [depcc="$$1" am_compiler_list=]) |
831 | + |
832 | +AC_CACHE_CHECK([dependency style of $depcc], |
833 | + [am_cv_$1_dependencies_compiler_type], |
834 | +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
835 | + # We make a subdir and do the tests there. Otherwise we can end up |
836 | + # making bogus files that we don't know about and never remove. For |
837 | + # instance it was reported that on HP-UX the gcc test will end up |
838 | + # making a dummy file named `D' -- because `-MD' means `put the output |
839 | + # in D'. |
840 | + rm -rf conftest.dir |
841 | + mkdir conftest.dir |
842 | + # Copy depcomp to subdir because otherwise we won't find it if we're |
843 | + # using a relative directory. |
844 | + cp "$am_depcomp" conftest.dir |
845 | + cd conftest.dir |
846 | + # We will build objects and dependencies in a subdirectory because |
847 | + # it helps to detect inapplicable dependency modes. For instance |
848 | + # both Tru64's cc and ICC support -MD to output dependencies as a |
849 | + # side effect of compilation, but ICC will put the dependencies in |
850 | + # the current directory while Tru64 will put them in the object |
851 | + # directory. |
852 | + mkdir sub |
853 | + |
854 | + am_cv_$1_dependencies_compiler_type=none |
855 | + if test "$am_compiler_list" = ""; then |
856 | + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` |
857 | + fi |
858 | + am__universal=false |
859 | + m4_case([$1], [CC], |
860 | + [case " $depcc " in #( |
861 | + *\ -arch\ *\ -arch\ *) am__universal=true ;; |
862 | + esac], |
863 | + [CXX], |
864 | + [case " $depcc " in #( |
865 | + *\ -arch\ *\ -arch\ *) am__universal=true ;; |
866 | + esac]) |
867 | + |
868 | + for depmode in $am_compiler_list; do |
869 | + # Setup a source with many dependencies, because some compilers |
870 | + # like to wrap large dependency lists on column 80 (with \), and |
871 | + # we should not choose a depcomp mode which is confused by this. |
872 | + # |
873 | + # We need to recreate these files for each test, as the compiler may |
874 | + # overwrite some of them when testing with obscure command lines. |
875 | + # This happens at least with the AIX C compiler. |
876 | + : > sub/conftest.c |
877 | + for i in 1 2 3 4 5 6; do |
878 | + echo '#include "conftst'$i'.h"' >> sub/conftest.c |
879 | + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
880 | + # Solaris 8's {/usr,}/bin/sh. |
881 | + touch sub/conftst$i.h |
882 | + done |
883 | + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
884 | + |
885 | + # We check with `-c' and `-o' for the sake of the "dashmstdout" |
886 | + # mode. It turns out that the SunPro C++ compiler does not properly |
887 | + # handle `-M -o', and we need to detect this. Also, some Intel |
888 | + # versions had trouble with output in subdirs |
889 | + am__obj=sub/conftest.${OBJEXT-o} |
890 | + am__minus_obj="-o $am__obj" |
891 | + case $depmode in |
892 | + gcc) |
893 | + # This depmode causes a compiler race in universal mode. |
894 | + test "$am__universal" = false || continue |
895 | + ;; |
896 | + nosideeffect) |
897 | + # after this tag, mechanisms are not by side-effect, so they'll |
898 | + # only be used when explicitly requested |
899 | + if test "x$enable_dependency_tracking" = xyes; then |
900 | + continue |
901 | + else |
902 | + break |
903 | + fi |
904 | + ;; |
905 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
906 | + # This compiler won't grok `-c -o', but also, the minuso test has |
907 | + # not run yet. These depmodes are late enough in the game, and |
908 | + # so weak that their functioning should not be impacted. |
909 | + am__obj=conftest.${OBJEXT-o} |
910 | + am__minus_obj= |
911 | + ;; |
912 | + none) break ;; |
913 | + esac |
914 | + if depmode=$depmode \ |
915 | + source=sub/conftest.c object=$am__obj \ |
916 | + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ |
917 | + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ |
918 | + >/dev/null 2>conftest.err && |
919 | + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && |
920 | + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && |
921 | + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && |
922 | + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then |
923 | + # icc doesn't choke on unknown options, it will just issue warnings |
924 | + # or remarks (even with -Werror). So we grep stderr for any message |
925 | + # that says an option was ignored or not supported. |
926 | + # When given -MP, icc 7.0 and 7.1 complain thusly: |
927 | + # icc: Command line warning: ignoring option '-M'; no argument required |
928 | + # The diagnosis changed in icc 8.0: |
929 | + # icc: Command line remark: option '-MP' not supported |
930 | + if (grep 'ignoring option' conftest.err || |
931 | + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else |
932 | + am_cv_$1_dependencies_compiler_type=$depmode |
933 | + break |
934 | + fi |
935 | + fi |
936 | + done |
937 | + |
938 | + cd .. |
939 | + rm -rf conftest.dir |
940 | +else |
941 | + am_cv_$1_dependencies_compiler_type=none |
942 | +fi |
943 | +]) |
944 | +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) |
945 | +AM_CONDITIONAL([am__fastdep$1], [ |
946 | + test "x$enable_dependency_tracking" != xno \ |
947 | + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) |
948 | +]) |
949 | + |
950 | + |
951 | +# AM_SET_DEPDIR |
952 | +# ------------- |
953 | +# Choose a directory name for dependency files. |
954 | +# This macro is AC_REQUIREd in _AM_DEPENDENCIES |
955 | +AC_DEFUN([AM_SET_DEPDIR], |
956 | +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl |
957 | +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl |
958 | +]) |
959 | + |
960 | + |
961 | +# AM_DEP_TRACK |
962 | +# ------------ |
963 | +AC_DEFUN([AM_DEP_TRACK], |
964 | +[AC_ARG_ENABLE(dependency-tracking, |
965 | +[ --disable-dependency-tracking speeds up one-time build |
966 | + --enable-dependency-tracking do not reject slow dependency extractors]) |
967 | +if test "x$enable_dependency_tracking" != xno; then |
968 | + am_depcomp="$ac_aux_dir/depcomp" |
969 | + AMDEPBACKSLASH='\' |
970 | + am__nodep='_no' |
971 | +fi |
972 | +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) |
973 | +AC_SUBST([AMDEPBACKSLASH])dnl |
974 | +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl |
975 | +AC_SUBST([am__nodep])dnl |
976 | +_AM_SUBST_NOTMAKE([am__nodep])dnl |
977 | +]) |
978 | + |
979 | +# Generate code to set up dependency tracking. -*- Autoconf -*- |
980 | + |
981 | +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 |
982 | +# Free Software Foundation, Inc. |
983 | +# |
984 | +# This file is free software; the Free Software Foundation |
985 | +# gives unlimited permission to copy and/or distribute it, |
986 | +# with or without modifications, as long as this notice is preserved. |
987 | + |
988 | +#serial 5 |
989 | + |
990 | +# _AM_OUTPUT_DEPENDENCY_COMMANDS |
991 | +# ------------------------------ |
992 | +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
993 | +[{ |
994 | + # Autoconf 2.62 quotes --file arguments for eval, but not when files |
995 | + # are listed without --file. Let's play safe and only enable the eval |
996 | + # if we detect the quoting. |
997 | + case $CONFIG_FILES in |
998 | + *\'*) eval set x "$CONFIG_FILES" ;; |
999 | + *) set x $CONFIG_FILES ;; |
1000 | + esac |
1001 | + shift |
1002 | + for mf |
1003 | + do |
1004 | + # Strip MF so we end up with the name of the file. |
1005 | + mf=`echo "$mf" | sed -e 's/:.*$//'` |
1006 | + # Check whether this is an Automake generated Makefile or not. |
1007 | + # We used to match only the files named `Makefile.in', but |
1008 | + # some people rename them; so instead we look at the file content. |
1009 | + # Grep'ing the first line is not enough: some people post-process |
1010 | + # each Makefile.in and add a new line on top of each file to say so. |
1011 | + # Grep'ing the whole file is not good either: AIX grep has a line |
1012 | + # limit of 2048, but all sed's we know have understand at least 4000. |
1013 | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
1014 | + dirpart=`AS_DIRNAME("$mf")` |
1015 | + else |
1016 | + continue |
1017 | + fi |
1018 | + # Extract the definition of DEPDIR, am__include, and am__quote |
1019 | + # from the Makefile without running `make'. |
1020 | + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
1021 | + test -z "$DEPDIR" && continue |
1022 | + am__include=`sed -n 's/^am__include = //p' < "$mf"` |
1023 | + test -z "am__include" && continue |
1024 | + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
1025 | + # When using ansi2knr, U may be empty or an underscore; expand it |
1026 | + U=`sed -n 's/^U = //p' < "$mf"` |
1027 | + # Find all dependency output files, they are included files with |
1028 | + # $(DEPDIR) in their names. We invoke sed twice because it is the |
1029 | + # simplest approach to changing $(DEPDIR) to its actual value in the |
1030 | + # expansion. |
1031 | + for file in `sed -n " |
1032 | + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
1033 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
1034 | + # Make sure the directory exists. |
1035 | + test -f "$dirpart/$file" && continue |
1036 | + fdir=`AS_DIRNAME(["$file"])` |
1037 | + AS_MKDIR_P([$dirpart/$fdir]) |
1038 | + # echo "creating $dirpart/$file" |
1039 | + echo '# dummy' > "$dirpart/$file" |
1040 | + done |
1041 | + done |
1042 | +} |
1043 | +])# _AM_OUTPUT_DEPENDENCY_COMMANDS |
1044 | + |
1045 | + |
1046 | +# AM_OUTPUT_DEPENDENCY_COMMANDS |
1047 | +# ----------------------------- |
1048 | +# This macro should only be invoked once -- use via AC_REQUIRE. |
1049 | +# |
1050 | +# This code is only required when automatic dependency tracking |
1051 | +# is enabled. FIXME. This creates each `.P' file that we will |
1052 | +# need in order to bootstrap the dependency handling code. |
1053 | +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
1054 | +[AC_CONFIG_COMMANDS([depfiles], |
1055 | + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], |
1056 | + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) |
1057 | +]) |
1058 | + |
1059 | # Do all the work for Automake. -*- Autoconf -*- |
1060 | |
1061 | # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
1062 | @@ -298,6 +600,93 @@ |
1063 | rmdir .tst 2>/dev/null |
1064 | AC_SUBST([am__leading_dot])]) |
1065 | |
1066 | +# Check to see how 'make' treats includes. -*- Autoconf -*- |
1067 | + |
1068 | +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. |
1069 | +# |
1070 | +# This file is free software; the Free Software Foundation |
1071 | +# gives unlimited permission to copy and/or distribute it, |
1072 | +# with or without modifications, as long as this notice is preserved. |
1073 | + |
1074 | +# serial 4 |
1075 | + |
1076 | +# AM_MAKE_INCLUDE() |
1077 | +# ----------------- |
1078 | +# Check to see how make treats includes. |
1079 | +AC_DEFUN([AM_MAKE_INCLUDE], |
1080 | +[am_make=${MAKE-make} |
1081 | +cat > confinc << 'END' |
1082 | +am__doit: |
1083 | + @echo this is the am__doit target |
1084 | +.PHONY: am__doit |
1085 | +END |
1086 | +# If we don't find an include directive, just comment out the code. |
1087 | +AC_MSG_CHECKING([for style of include used by $am_make]) |
1088 | +am__include="#" |
1089 | +am__quote= |
1090 | +_am_result=none |
1091 | +# First try GNU make style include. |
1092 | +echo "include confinc" > confmf |
1093 | +# Ignore all kinds of additional output from `make'. |
1094 | +case `$am_make -s -f confmf 2> /dev/null` in #( |
1095 | +*the\ am__doit\ target*) |
1096 | + am__include=include |
1097 | + am__quote= |
1098 | + _am_result=GNU |
1099 | + ;; |
1100 | +esac |
1101 | +# Now try BSD make style include. |
1102 | +if test "$am__include" = "#"; then |
1103 | + echo '.include "confinc"' > confmf |
1104 | + case `$am_make -s -f confmf 2> /dev/null` in #( |
1105 | + *the\ am__doit\ target*) |
1106 | + am__include=.include |
1107 | + am__quote="\"" |
1108 | + _am_result=BSD |
1109 | + ;; |
1110 | + esac |
1111 | +fi |
1112 | +AC_SUBST([am__include]) |
1113 | +AC_SUBST([am__quote]) |
1114 | +AC_MSG_RESULT([$_am_result]) |
1115 | +rm -f confinc confmf |
1116 | +]) |
1117 | + |
1118 | +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 |
1119 | +# Free Software Foundation, Inc. |
1120 | +# |
1121 | +# This file is free software; the Free Software Foundation |
1122 | +# gives unlimited permission to copy and/or distribute it, |
1123 | +# with or without modifications, as long as this notice is preserved. |
1124 | + |
1125 | +# serial 6 |
1126 | + |
1127 | +# AM_PROG_CC_C_O |
1128 | +# -------------- |
1129 | +# Like AC_PROG_CC_C_O, but changed for automake. |
1130 | +AC_DEFUN([AM_PROG_CC_C_O], |
1131 | +[AC_REQUIRE([AC_PROG_CC_C_O])dnl |
1132 | +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
1133 | +AC_REQUIRE_AUX_FILE([compile])dnl |
1134 | +# FIXME: we rely on the cache variable name because |
1135 | +# there is no other way. |
1136 | +set dummy $CC |
1137 | +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` |
1138 | +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o |
1139 | +if test "$am_t" != yes; then |
1140 | + # Losing compiler, so override with the script. |
1141 | + # FIXME: It is wrong to rewrite CC. |
1142 | + # But if we don't then we get into trouble of one sort or another. |
1143 | + # A longer-term fix would be to have automake use am__CC in this case, |
1144 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
1145 | + CC="$am_aux_dir/compile $CC" |
1146 | +fi |
1147 | +dnl Make sure AC_PROG_CC is never called again, or it will override our |
1148 | +dnl setting of CC. |
1149 | +m4_define([AC_PROG_CC], |
1150 | + [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) |
1151 | +]) |
1152 | + |
1153 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
1154 | |
1155 | # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 |
1156 | |
1157 | === added file 'compile' |
1158 | --- compile 1970-01-01 00:00:00 +0000 |
1159 | +++ compile 2012-09-19 20:21:18 +0000 |
1160 | @@ -0,0 +1,343 @@ |
1161 | +#! /bin/sh |
1162 | +# Wrapper for compilers which do not understand '-c -o'. |
1163 | + |
1164 | +scriptversion=2012-03-05.13; # UTC |
1165 | + |
1166 | +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free |
1167 | +# Software Foundation, Inc. |
1168 | +# Written by Tom Tromey <tromey@cygnus.com>. |
1169 | +# |
1170 | +# This program is free software; you can redistribute it and/or modify |
1171 | +# it under the terms of the GNU General Public License as published by |
1172 | +# the Free Software Foundation; either version 2, or (at your option) |
1173 | +# any later version. |
1174 | +# |
1175 | +# This program is distributed in the hope that it will be useful, |
1176 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1177 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1178 | +# GNU General Public License for more details. |
1179 | +# |
1180 | +# You should have received a copy of the GNU General Public License |
1181 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1182 | + |
1183 | +# As a special exception to the GNU General Public License, if you |
1184 | +# distribute this file as part of a program that contains a |
1185 | +# configuration script generated by Autoconf, you may include it under |
1186 | +# the same distribution terms that you use for the rest of that program. |
1187 | + |
1188 | +# This file is maintained in Automake, please report |
1189 | +# bugs to <bug-automake@gnu.org> or send patches to |
1190 | +# <automake-patches@gnu.org>. |
1191 | + |
1192 | +nl=' |
1193 | +' |
1194 | + |
1195 | +# We need space, tab and new line, in precisely that order. Quoting is |
1196 | +# there to prevent tools from complaining about whitespace usage. |
1197 | +IFS=" "" $nl" |
1198 | + |
1199 | +file_conv= |
1200 | + |
1201 | +# func_file_conv build_file lazy |
1202 | +# Convert a $build file to $host form and store it in $file |
1203 | +# Currently only supports Windows hosts. If the determined conversion |
1204 | +# type is listed in (the comma separated) LAZY, no conversion will |
1205 | +# take place. |
1206 | +func_file_conv () |
1207 | +{ |
1208 | + file=$1 |
1209 | + case $file in |
1210 | + / | /[!/]*) # absolute file, and not a UNC file |
1211 | + if test -z "$file_conv"; then |
1212 | + # lazily determine how to convert abs files |
1213 | + case `uname -s` in |
1214 | + MINGW*) |
1215 | + file_conv=mingw |
1216 | + ;; |
1217 | + CYGWIN*) |
1218 | + file_conv=cygwin |
1219 | + ;; |
1220 | + *) |
1221 | + file_conv=wine |
1222 | + ;; |
1223 | + esac |
1224 | + fi |
1225 | + case $file_conv/,$2, in |
1226 | + *,$file_conv,*) |
1227 | + ;; |
1228 | + mingw/*) |
1229 | + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` |
1230 | + ;; |
1231 | + cygwin/*) |
1232 | + file=`cygpath -m "$file" || echo "$file"` |
1233 | + ;; |
1234 | + wine/*) |
1235 | + file=`winepath -w "$file" || echo "$file"` |
1236 | + ;; |
1237 | + esac |
1238 | + ;; |
1239 | + esac |
1240 | +} |
1241 | + |
1242 | +# func_cl_dashL linkdir |
1243 | +# Make cl look for libraries in LINKDIR |
1244 | +func_cl_dashL () |
1245 | +{ |
1246 | + func_file_conv "$1" |
1247 | + if test -z "$lib_path"; then |
1248 | + lib_path=$file |
1249 | + else |
1250 | + lib_path="$lib_path;$file" |
1251 | + fi |
1252 | + linker_opts="$linker_opts -LIBPATH:$file" |
1253 | +} |
1254 | + |
1255 | +# func_cl_dashl library |
1256 | +# Do a library search-path lookup for cl |
1257 | +func_cl_dashl () |
1258 | +{ |
1259 | + lib=$1 |
1260 | + found=no |
1261 | + save_IFS=$IFS |
1262 | + IFS=';' |
1263 | + for dir in $lib_path $LIB |
1264 | + do |
1265 | + IFS=$save_IFS |
1266 | + if $shared && test -f "$dir/$lib.dll.lib"; then |
1267 | + found=yes |
1268 | + lib=$dir/$lib.dll.lib |
1269 | + break |
1270 | + fi |
1271 | + if test -f "$dir/$lib.lib"; then |
1272 | + found=yes |
1273 | + lib=$dir/$lib.lib |
1274 | + break |
1275 | + fi |
1276 | + done |
1277 | + IFS=$save_IFS |
1278 | + |
1279 | + if test "$found" != yes; then |
1280 | + lib=$lib.lib |
1281 | + fi |
1282 | +} |
1283 | + |
1284 | +# func_cl_wrapper cl arg... |
1285 | +# Adjust compile command to suit cl |
1286 | +func_cl_wrapper () |
1287 | +{ |
1288 | + # Assume a capable shell |
1289 | + lib_path= |
1290 | + shared=: |
1291 | + linker_opts= |
1292 | + for arg |
1293 | + do |
1294 | + if test -n "$eat"; then |
1295 | + eat= |
1296 | + else |
1297 | + case $1 in |
1298 | + -o) |
1299 | + # configure might choose to run compile as 'compile cc -o foo foo.c'. |
1300 | + eat=1 |
1301 | + case $2 in |
1302 | + *.o | *.[oO][bB][jJ]) |
1303 | + func_file_conv "$2" |
1304 | + set x "$@" -Fo"$file" |
1305 | + shift |
1306 | + ;; |
1307 | + *) |
1308 | + func_file_conv "$2" |
1309 | + set x "$@" -Fe"$file" |
1310 | + shift |
1311 | + ;; |
1312 | + esac |
1313 | + ;; |
1314 | + -I) |
1315 | + eat=1 |
1316 | + func_file_conv "$2" mingw |
1317 | + set x "$@" -I"$file" |
1318 | + shift |
1319 | + ;; |
1320 | + -I*) |
1321 | + func_file_conv "${1#-I}" mingw |
1322 | + set x "$@" -I"$file" |
1323 | + shift |
1324 | + ;; |
1325 | + -l) |
1326 | + eat=1 |
1327 | + func_cl_dashl "$2" |
1328 | + set x "$@" "$lib" |
1329 | + shift |
1330 | + ;; |
1331 | + -l*) |
1332 | + func_cl_dashl "${1#-l}" |
1333 | + set x "$@" "$lib" |
1334 | + shift |
1335 | + ;; |
1336 | + -L) |
1337 | + eat=1 |
1338 | + func_cl_dashL "$2" |
1339 | + ;; |
1340 | + -L*) |
1341 | + func_cl_dashL "${1#-L}" |
1342 | + ;; |
1343 | + -static) |
1344 | + shared=false |
1345 | + ;; |
1346 | + -Wl,*) |
1347 | + arg=${1#-Wl,} |
1348 | + save_ifs="$IFS"; IFS=',' |
1349 | + for flag in $arg; do |
1350 | + IFS="$save_ifs" |
1351 | + linker_opts="$linker_opts $flag" |
1352 | + done |
1353 | + IFS="$save_ifs" |
1354 | + ;; |
1355 | + -Xlinker) |
1356 | + eat=1 |
1357 | + linker_opts="$linker_opts $2" |
1358 | + ;; |
1359 | + -*) |
1360 | + set x "$@" "$1" |
1361 | + shift |
1362 | + ;; |
1363 | + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) |
1364 | + func_file_conv "$1" |
1365 | + set x "$@" -Tp"$file" |
1366 | + shift |
1367 | + ;; |
1368 | + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) |
1369 | + func_file_conv "$1" mingw |
1370 | + set x "$@" "$file" |
1371 | + shift |
1372 | + ;; |
1373 | + *) |
1374 | + set x "$@" "$1" |
1375 | + shift |
1376 | + ;; |
1377 | + esac |
1378 | + fi |
1379 | + shift |
1380 | + done |
1381 | + if test -n "$linker_opts"; then |
1382 | + linker_opts="-link$linker_opts" |
1383 | + fi |
1384 | + exec "$@" $linker_opts |
1385 | + exit 1 |
1386 | +} |
1387 | + |
1388 | +eat= |
1389 | + |
1390 | +case $1 in |
1391 | + '') |
1392 | + echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
1393 | + exit 1; |
1394 | + ;; |
1395 | + -h | --h*) |
1396 | + cat <<\EOF |
1397 | +Usage: compile [--help] [--version] PROGRAM [ARGS] |
1398 | + |
1399 | +Wrapper for compilers which do not understand '-c -o'. |
1400 | +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining |
1401 | +arguments, and rename the output as expected. |
1402 | + |
1403 | +If you are trying to build a whole package this is not the |
1404 | +right script to run: please start by reading the file 'INSTALL'. |
1405 | + |
1406 | +Report bugs to <bug-automake@gnu.org>. |
1407 | +EOF |
1408 | + exit $? |
1409 | + ;; |
1410 | + -v | --v*) |
1411 | + echo "compile $scriptversion" |
1412 | + exit $? |
1413 | + ;; |
1414 | + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) |
1415 | + func_cl_wrapper "$@" # Doesn't return... |
1416 | + ;; |
1417 | +esac |
1418 | + |
1419 | +ofile= |
1420 | +cfile= |
1421 | + |
1422 | +for arg |
1423 | +do |
1424 | + if test -n "$eat"; then |
1425 | + eat= |
1426 | + else |
1427 | + case $1 in |
1428 | + -o) |
1429 | + # configure might choose to run compile as 'compile cc -o foo foo.c'. |
1430 | + # So we strip '-o arg' only if arg is an object. |
1431 | + eat=1 |
1432 | + case $2 in |
1433 | + *.o | *.obj) |
1434 | + ofile=$2 |
1435 | + ;; |
1436 | + *) |
1437 | + set x "$@" -o "$2" |
1438 | + shift |
1439 | + ;; |
1440 | + esac |
1441 | + ;; |
1442 | + *.c) |
1443 | + cfile=$1 |
1444 | + set x "$@" "$1" |
1445 | + shift |
1446 | + ;; |
1447 | + *) |
1448 | + set x "$@" "$1" |
1449 | + shift |
1450 | + ;; |
1451 | + esac |
1452 | + fi |
1453 | + shift |
1454 | +done |
1455 | + |
1456 | +if test -z "$ofile" || test -z "$cfile"; then |
1457 | + # If no '-o' option was seen then we might have been invoked from a |
1458 | + # pattern rule where we don't need one. That is ok -- this is a |
1459 | + # normal compilation that the losing compiler can handle. If no |
1460 | + # '.c' file was seen then we are probably linking. That is also |
1461 | + # ok. |
1462 | + exec "$@" |
1463 | +fi |
1464 | + |
1465 | +# Name of file we expect compiler to create. |
1466 | +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` |
1467 | + |
1468 | +# Create the lock directory. |
1469 | +# Note: use '[/\\:.-]' here to ensure that we don't use the same name |
1470 | +# that we are using for the .o file. Also, base the name on the expected |
1471 | +# object file name, since that is what matters with a parallel build. |
1472 | +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d |
1473 | +while true; do |
1474 | + if mkdir "$lockdir" >/dev/null 2>&1; then |
1475 | + break |
1476 | + fi |
1477 | + sleep 1 |
1478 | +done |
1479 | +# FIXME: race condition here if user kills between mkdir and trap. |
1480 | +trap "rmdir '$lockdir'; exit 1" 1 2 15 |
1481 | + |
1482 | +# Run the compile. |
1483 | +"$@" |
1484 | +ret=$? |
1485 | + |
1486 | +if test -f "$cofile"; then |
1487 | + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" |
1488 | +elif test -f "${cofile}bj"; then |
1489 | + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" |
1490 | +fi |
1491 | + |
1492 | +rmdir "$lockdir" |
1493 | +exit $ret |
1494 | + |
1495 | +# Local Variables: |
1496 | +# mode: shell-script |
1497 | +# sh-indentation: 2 |
1498 | +# eval: (add-hook 'write-file-hooks 'time-stamp) |
1499 | +# time-stamp-start: "scriptversion=" |
1500 | +# time-stamp-format: "%:y-%02m-%02d.%02H" |
1501 | +# time-stamp-time-zone: "UTC" |
1502 | +# time-stamp-end: "; # UTC" |
1503 | +# End: |
1504 | |
1505 | === modified file 'configure' |
1506 | --- configure 2012-08-22 14:13:08 +0000 |
1507 | +++ configure 2012-09-19 20:21:18 +0000 |
1508 | @@ -1,6 +1,6 @@ |
1509 | #! /bin/sh |
1510 | # Guess values for system-dependent variables and create Makefiles. |
1511 | -# Generated by GNU Autoconf 2.69 for lightdm-remote-session-uccsconfigure 0.3. |
1512 | +# Generated by GNU Autoconf 2.69 for lightdm-remote-session-uccsconfigure 1.1. |
1513 | # |
1514 | # |
1515 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
1516 | @@ -576,13 +576,32 @@ |
1517 | # Identity of this package. |
1518 | PACKAGE_NAME='lightdm-remote-session-uccsconfigure' |
1519 | PACKAGE_TARNAME='lightdm-remote-session-uccsconfigure' |
1520 | -PACKAGE_VERSION='0.3' |
1521 | -PACKAGE_STRING='lightdm-remote-session-uccsconfigure 0.3' |
1522 | +PACKAGE_VERSION='1.1' |
1523 | +PACKAGE_STRING='lightdm-remote-session-uccsconfigure 1.1' |
1524 | PACKAGE_BUGREPORT='' |
1525 | PACKAGE_URL='' |
1526 | |
1527 | -ac_subst_vars='LTLIBOBJS |
1528 | +ac_subst_vars='am__EXEEXT_FALSE |
1529 | +am__EXEEXT_TRUE |
1530 | +LTLIBOBJS |
1531 | LIBOBJS |
1532 | +am__fastdepCC_FALSE |
1533 | +am__fastdepCC_TRUE |
1534 | +CCDEPMODE |
1535 | +am__nodep |
1536 | +AMDEPBACKSLASH |
1537 | +AMDEP_FALSE |
1538 | +AMDEP_TRUE |
1539 | +am__quote |
1540 | +am__include |
1541 | +DEPDIR |
1542 | +OBJEXT |
1543 | +EXEEXT |
1544 | +ac_ct_CC |
1545 | +CPPFLAGS |
1546 | +LDFLAGS |
1547 | +CFLAGS |
1548 | +CC |
1549 | AM_BACKSLASH |
1550 | AM_DEFAULT_VERBOSITY |
1551 | AM_DEFAULT_V |
1552 | @@ -652,11 +671,17 @@ |
1553 | ac_user_opts=' |
1554 | enable_option_checking |
1555 | enable_silent_rules |
1556 | +enable_dependency_tracking |
1557 | enable_localinstall |
1558 | ' |
1559 | ac_precious_vars='build_alias |
1560 | host_alias |
1561 | -target_alias' |
1562 | +target_alias |
1563 | +CC |
1564 | +CFLAGS |
1565 | +LDFLAGS |
1566 | +LIBS |
1567 | +CPPFLAGS' |
1568 | |
1569 | |
1570 | # Initialize some variables set by options. |
1571 | @@ -1197,7 +1222,7 @@ |
1572 | # Omit some internal or obsolete options to make the list less imposing. |
1573 | # This message is too long to be a string in the A/UX 3.1 sh. |
1574 | cat <<_ACEOF |
1575 | -\`configure' configures lightdm-remote-session-uccsconfigure 0.3 to adapt to many kinds of systems. |
1576 | +\`configure' configures lightdm-remote-session-uccsconfigure 1.1 to adapt to many kinds of systems. |
1577 | |
1578 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1579 | |
1580 | @@ -1264,7 +1289,7 @@ |
1581 | |
1582 | if test -n "$ac_init_help"; then |
1583 | case $ac_init_help in |
1584 | - short | recursive ) echo "Configuration of lightdm-remote-session-uccsconfigure 0.3:";; |
1585 | + short | recursive ) echo "Configuration of lightdm-remote-session-uccsconfigure 1.1:";; |
1586 | esac |
1587 | cat <<\_ACEOF |
1588 | |
1589 | @@ -1274,8 +1299,22 @@ |
1590 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
1591 | --enable-silent-rules less verbose build output (undo: `make V=1') |
1592 | --disable-silent-rules verbose build output (undo: `make V=0') |
1593 | + --disable-dependency-tracking speeds up one-time build |
1594 | + --enable-dependency-tracking do not reject slow dependency extractors |
1595 | --enable-localinstall install all files locally (for distcheck) |
1596 | |
1597 | +Some influential environment variables: |
1598 | + CC C compiler command |
1599 | + CFLAGS C compiler flags |
1600 | + LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a |
1601 | + nonstandard directory <lib dir> |
1602 | + LIBS libraries to pass to the linker, e.g. -l<library> |
1603 | + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if |
1604 | + you have headers in a nonstandard directory <include dir> |
1605 | + |
1606 | +Use these variables to override the choices made by `configure' or to help |
1607 | +it to find libraries and programs with nonstandard names/locations. |
1608 | + |
1609 | Report bugs to the package provider. |
1610 | _ACEOF |
1611 | ac_status=$? |
1612 | @@ -1339,7 +1378,7 @@ |
1613 | test -n "$ac_init_help" && exit $ac_status |
1614 | if $ac_init_version; then |
1615 | cat <<\_ACEOF |
1616 | -lightdm-remote-session-uccsconfigure configure 0.3 |
1617 | +lightdm-remote-session-uccsconfigure configure 1.1 |
1618 | generated by GNU Autoconf 2.69 |
1619 | |
1620 | Copyright (C) 2012 Free Software Foundation, Inc. |
1621 | @@ -1352,11 +1391,49 @@ |
1622 | ## ------------------------ ## |
1623 | ## Autoconf initialization. ## |
1624 | ## ------------------------ ## |
1625 | + |
1626 | +# ac_fn_c_try_compile LINENO |
1627 | +# -------------------------- |
1628 | +# Try to compile conftest.$ac_ext, and return whether this succeeded. |
1629 | +ac_fn_c_try_compile () |
1630 | +{ |
1631 | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
1632 | + rm -f conftest.$ac_objext |
1633 | + if { { ac_try="$ac_compile" |
1634 | +case "(($ac_try" in |
1635 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
1636 | + *) ac_try_echo=$ac_try;; |
1637 | +esac |
1638 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
1639 | +$as_echo "$ac_try_echo"; } >&5 |
1640 | + (eval "$ac_compile") 2>conftest.err |
1641 | + ac_status=$? |
1642 | + if test -s conftest.err; then |
1643 | + grep -v '^ *+' conftest.err >conftest.er1 |
1644 | + cat conftest.er1 >&5 |
1645 | + mv -f conftest.er1 conftest.err |
1646 | + fi |
1647 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
1648 | + test $ac_status = 0; } && { |
1649 | + test -z "$ac_c_werror_flag" || |
1650 | + test ! -s conftest.err |
1651 | + } && test -s conftest.$ac_objext; then : |
1652 | + ac_retval=0 |
1653 | +else |
1654 | + $as_echo "$as_me: failed program was:" >&5 |
1655 | +sed 's/^/| /' conftest.$ac_ext >&5 |
1656 | + |
1657 | + ac_retval=1 |
1658 | +fi |
1659 | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
1660 | + as_fn_set_status $ac_retval |
1661 | + |
1662 | +} # ac_fn_c_try_compile |
1663 | cat >config.log <<_ACEOF |
1664 | This file contains any messages produced by compilers while |
1665 | running configure, to aid debugging if configure makes a mistake. |
1666 | |
1667 | -It was created by lightdm-remote-session-uccsconfigure $as_me 0.3, which was |
1668 | +It was created by lightdm-remote-session-uccsconfigure $as_me 1.1, which was |
1669 | generated by GNU Autoconf 2.69. Invocation command line was |
1670 | |
1671 | $ $0 $@ |
1672 | @@ -2172,7 +2249,7 @@ |
1673 | |
1674 | # Define the identity of the package. |
1675 | PACKAGE='lightdm-remote-session-uccsconfigure' |
1676 | - VERSION='0.3' |
1677 | + VERSION='1.1' |
1678 | |
1679 | |
1680 | cat >>confdefs.h <<_ACEOF |
1681 | @@ -2252,6 +2329,1114 @@ |
1682 | AM_BACKSLASH='\' |
1683 | |
1684 | |
1685 | +ac_ext=c |
1686 | +ac_cpp='$CPP $CPPFLAGS' |
1687 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1688 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1689 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1690 | +if test -n "$ac_tool_prefix"; then |
1691 | + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. |
1692 | +set dummy ${ac_tool_prefix}gcc; ac_word=$2 |
1693 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1694 | +$as_echo_n "checking for $ac_word... " >&6; } |
1695 | +if ${ac_cv_prog_CC+:} false; then : |
1696 | + $as_echo_n "(cached) " >&6 |
1697 | +else |
1698 | + if test -n "$CC"; then |
1699 | + ac_cv_prog_CC="$CC" # Let the user override the test. |
1700 | +else |
1701 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1702 | +for as_dir in $PATH |
1703 | +do |
1704 | + IFS=$as_save_IFS |
1705 | + test -z "$as_dir" && as_dir=. |
1706 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1707 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1708 | + ac_cv_prog_CC="${ac_tool_prefix}gcc" |
1709 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1710 | + break 2 |
1711 | + fi |
1712 | +done |
1713 | + done |
1714 | +IFS=$as_save_IFS |
1715 | + |
1716 | +fi |
1717 | +fi |
1718 | +CC=$ac_cv_prog_CC |
1719 | +if test -n "$CC"; then |
1720 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
1721 | +$as_echo "$CC" >&6; } |
1722 | +else |
1723 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1724 | +$as_echo "no" >&6; } |
1725 | +fi |
1726 | + |
1727 | + |
1728 | +fi |
1729 | +if test -z "$ac_cv_prog_CC"; then |
1730 | + ac_ct_CC=$CC |
1731 | + # Extract the first word of "gcc", so it can be a program name with args. |
1732 | +set dummy gcc; ac_word=$2 |
1733 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1734 | +$as_echo_n "checking for $ac_word... " >&6; } |
1735 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
1736 | + $as_echo_n "(cached) " >&6 |
1737 | +else |
1738 | + if test -n "$ac_ct_CC"; then |
1739 | + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
1740 | +else |
1741 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1742 | +for as_dir in $PATH |
1743 | +do |
1744 | + IFS=$as_save_IFS |
1745 | + test -z "$as_dir" && as_dir=. |
1746 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1747 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1748 | + ac_cv_prog_ac_ct_CC="gcc" |
1749 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1750 | + break 2 |
1751 | + fi |
1752 | +done |
1753 | + done |
1754 | +IFS=$as_save_IFS |
1755 | + |
1756 | +fi |
1757 | +fi |
1758 | +ac_ct_CC=$ac_cv_prog_ac_ct_CC |
1759 | +if test -n "$ac_ct_CC"; then |
1760 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 |
1761 | +$as_echo "$ac_ct_CC" >&6; } |
1762 | +else |
1763 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1764 | +$as_echo "no" >&6; } |
1765 | +fi |
1766 | + |
1767 | + if test "x$ac_ct_CC" = x; then |
1768 | + CC="" |
1769 | + else |
1770 | + case $cross_compiling:$ac_tool_warned in |
1771 | +yes:) |
1772 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
1773 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
1774 | +ac_tool_warned=yes ;; |
1775 | +esac |
1776 | + CC=$ac_ct_CC |
1777 | + fi |
1778 | +else |
1779 | + CC="$ac_cv_prog_CC" |
1780 | +fi |
1781 | + |
1782 | +if test -z "$CC"; then |
1783 | + if test -n "$ac_tool_prefix"; then |
1784 | + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. |
1785 | +set dummy ${ac_tool_prefix}cc; ac_word=$2 |
1786 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1787 | +$as_echo_n "checking for $ac_word... " >&6; } |
1788 | +if ${ac_cv_prog_CC+:} false; then : |
1789 | + $as_echo_n "(cached) " >&6 |
1790 | +else |
1791 | + if test -n "$CC"; then |
1792 | + ac_cv_prog_CC="$CC" # Let the user override the test. |
1793 | +else |
1794 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1795 | +for as_dir in $PATH |
1796 | +do |
1797 | + IFS=$as_save_IFS |
1798 | + test -z "$as_dir" && as_dir=. |
1799 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1800 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1801 | + ac_cv_prog_CC="${ac_tool_prefix}cc" |
1802 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1803 | + break 2 |
1804 | + fi |
1805 | +done |
1806 | + done |
1807 | +IFS=$as_save_IFS |
1808 | + |
1809 | +fi |
1810 | +fi |
1811 | +CC=$ac_cv_prog_CC |
1812 | +if test -n "$CC"; then |
1813 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
1814 | +$as_echo "$CC" >&6; } |
1815 | +else |
1816 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1817 | +$as_echo "no" >&6; } |
1818 | +fi |
1819 | + |
1820 | + |
1821 | + fi |
1822 | +fi |
1823 | +if test -z "$CC"; then |
1824 | + # Extract the first word of "cc", so it can be a program name with args. |
1825 | +set dummy cc; ac_word=$2 |
1826 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1827 | +$as_echo_n "checking for $ac_word... " >&6; } |
1828 | +if ${ac_cv_prog_CC+:} false; then : |
1829 | + $as_echo_n "(cached) " >&6 |
1830 | +else |
1831 | + if test -n "$CC"; then |
1832 | + ac_cv_prog_CC="$CC" # Let the user override the test. |
1833 | +else |
1834 | + ac_prog_rejected=no |
1835 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1836 | +for as_dir in $PATH |
1837 | +do |
1838 | + IFS=$as_save_IFS |
1839 | + test -z "$as_dir" && as_dir=. |
1840 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1841 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1842 | + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
1843 | + ac_prog_rejected=yes |
1844 | + continue |
1845 | + fi |
1846 | + ac_cv_prog_CC="cc" |
1847 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1848 | + break 2 |
1849 | + fi |
1850 | +done |
1851 | + done |
1852 | +IFS=$as_save_IFS |
1853 | + |
1854 | +if test $ac_prog_rejected = yes; then |
1855 | + # We found a bogon in the path, so make sure we never use it. |
1856 | + set dummy $ac_cv_prog_CC |
1857 | + shift |
1858 | + if test $# != 0; then |
1859 | + # We chose a different compiler from the bogus one. |
1860 | + # However, it has the same basename, so the bogon will be chosen |
1861 | + # first if we set CC to just the basename; use the full file name. |
1862 | + shift |
1863 | + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" |
1864 | + fi |
1865 | +fi |
1866 | +fi |
1867 | +fi |
1868 | +CC=$ac_cv_prog_CC |
1869 | +if test -n "$CC"; then |
1870 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
1871 | +$as_echo "$CC" >&6; } |
1872 | +else |
1873 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1874 | +$as_echo "no" >&6; } |
1875 | +fi |
1876 | + |
1877 | + |
1878 | +fi |
1879 | +if test -z "$CC"; then |
1880 | + if test -n "$ac_tool_prefix"; then |
1881 | + for ac_prog in cl.exe |
1882 | + do |
1883 | + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. |
1884 | +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 |
1885 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1886 | +$as_echo_n "checking for $ac_word... " >&6; } |
1887 | +if ${ac_cv_prog_CC+:} false; then : |
1888 | + $as_echo_n "(cached) " >&6 |
1889 | +else |
1890 | + if test -n "$CC"; then |
1891 | + ac_cv_prog_CC="$CC" # Let the user override the test. |
1892 | +else |
1893 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1894 | +for as_dir in $PATH |
1895 | +do |
1896 | + IFS=$as_save_IFS |
1897 | + test -z "$as_dir" && as_dir=. |
1898 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1899 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1900 | + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
1901 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1902 | + break 2 |
1903 | + fi |
1904 | +done |
1905 | + done |
1906 | +IFS=$as_save_IFS |
1907 | + |
1908 | +fi |
1909 | +fi |
1910 | +CC=$ac_cv_prog_CC |
1911 | +if test -n "$CC"; then |
1912 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 |
1913 | +$as_echo "$CC" >&6; } |
1914 | +else |
1915 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1916 | +$as_echo "no" >&6; } |
1917 | +fi |
1918 | + |
1919 | + |
1920 | + test -n "$CC" && break |
1921 | + done |
1922 | +fi |
1923 | +if test -z "$CC"; then |
1924 | + ac_ct_CC=$CC |
1925 | + for ac_prog in cl.exe |
1926 | +do |
1927 | + # Extract the first word of "$ac_prog", so it can be a program name with args. |
1928 | +set dummy $ac_prog; ac_word=$2 |
1929 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
1930 | +$as_echo_n "checking for $ac_word... " >&6; } |
1931 | +if ${ac_cv_prog_ac_ct_CC+:} false; then : |
1932 | + $as_echo_n "(cached) " >&6 |
1933 | +else |
1934 | + if test -n "$ac_ct_CC"; then |
1935 | + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. |
1936 | +else |
1937 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
1938 | +for as_dir in $PATH |
1939 | +do |
1940 | + IFS=$as_save_IFS |
1941 | + test -z "$as_dir" && as_dir=. |
1942 | + for ac_exec_ext in '' $ac_executable_extensions; do |
1943 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
1944 | + ac_cv_prog_ac_ct_CC="$ac_prog" |
1945 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
1946 | + break 2 |
1947 | + fi |
1948 | +done |
1949 | + done |
1950 | +IFS=$as_save_IFS |
1951 | + |
1952 | +fi |
1953 | +fi |
1954 | +ac_ct_CC=$ac_cv_prog_ac_ct_CC |
1955 | +if test -n "$ac_ct_CC"; then |
1956 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 |
1957 | +$as_echo "$ac_ct_CC" >&6; } |
1958 | +else |
1959 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
1960 | +$as_echo "no" >&6; } |
1961 | +fi |
1962 | + |
1963 | + |
1964 | + test -n "$ac_ct_CC" && break |
1965 | +done |
1966 | + |
1967 | + if test "x$ac_ct_CC" = x; then |
1968 | + CC="" |
1969 | + else |
1970 | + case $cross_compiling:$ac_tool_warned in |
1971 | +yes:) |
1972 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
1973 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
1974 | +ac_tool_warned=yes ;; |
1975 | +esac |
1976 | + CC=$ac_ct_CC |
1977 | + fi |
1978 | +fi |
1979 | + |
1980 | +fi |
1981 | + |
1982 | + |
1983 | +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1984 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1985 | +as_fn_error $? "no acceptable C compiler found in \$PATH |
1986 | +See \`config.log' for more details" "$LINENO" 5; } |
1987 | + |
1988 | +# Provide some information about the compiler. |
1989 | +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
1990 | +set X $ac_compile |
1991 | +ac_compiler=$2 |
1992 | +for ac_option in --version -v -V -qversion; do |
1993 | + { { ac_try="$ac_compiler $ac_option >&5" |
1994 | +case "(($ac_try" in |
1995 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
1996 | + *) ac_try_echo=$ac_try;; |
1997 | +esac |
1998 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
1999 | +$as_echo "$ac_try_echo"; } >&5 |
2000 | + (eval "$ac_compiler $ac_option >&5") 2>conftest.err |
2001 | + ac_status=$? |
2002 | + if test -s conftest.err; then |
2003 | + sed '10a\ |
2004 | +... rest of stderr output deleted ... |
2005 | + 10q' conftest.err >conftest.er1 |
2006 | + cat conftest.er1 >&5 |
2007 | + fi |
2008 | + rm -f conftest.er1 conftest.err |
2009 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2010 | + test $ac_status = 0; } |
2011 | +done |
2012 | + |
2013 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2014 | +/* end confdefs.h. */ |
2015 | + |
2016 | +int |
2017 | +main () |
2018 | +{ |
2019 | + |
2020 | + ; |
2021 | + return 0; |
2022 | +} |
2023 | +_ACEOF |
2024 | +ac_clean_files_save=$ac_clean_files |
2025 | +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" |
2026 | +# Try to create an executable without -o first, disregard a.out. |
2027 | +# It will help us diagnose broken compilers, and finding out an intuition |
2028 | +# of exeext. |
2029 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 |
2030 | +$as_echo_n "checking whether the C compiler works... " >&6; } |
2031 | +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` |
2032 | + |
2033 | +# The possible output files: |
2034 | +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" |
2035 | + |
2036 | +ac_rmfiles= |
2037 | +for ac_file in $ac_files |
2038 | +do |
2039 | + case $ac_file in |
2040 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; |
2041 | + * ) ac_rmfiles="$ac_rmfiles $ac_file";; |
2042 | + esac |
2043 | +done |
2044 | +rm -f $ac_rmfiles |
2045 | + |
2046 | +if { { ac_try="$ac_link_default" |
2047 | +case "(($ac_try" in |
2048 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2049 | + *) ac_try_echo=$ac_try;; |
2050 | +esac |
2051 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2052 | +$as_echo "$ac_try_echo"; } >&5 |
2053 | + (eval "$ac_link_default") 2>&5 |
2054 | + ac_status=$? |
2055 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2056 | + test $ac_status = 0; }; then : |
2057 | + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. |
2058 | +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' |
2059 | +# in a Makefile. We should not override ac_cv_exeext if it was cached, |
2060 | +# so that the user can short-circuit this test for compilers unknown to |
2061 | +# Autoconf. |
2062 | +for ac_file in $ac_files '' |
2063 | +do |
2064 | + test -f "$ac_file" || continue |
2065 | + case $ac_file in |
2066 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) |
2067 | + ;; |
2068 | + [ab].out ) |
2069 | + # We found the default executable, but exeext='' is most |
2070 | + # certainly right. |
2071 | + break;; |
2072 | + *.* ) |
2073 | + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; |
2074 | + then :; else |
2075 | + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` |
2076 | + fi |
2077 | + # We set ac_cv_exeext here because the later test for it is not |
2078 | + # safe: cross compilers may not add the suffix if given an `-o' |
2079 | + # argument, so we may need to know it at that point already. |
2080 | + # Even if this section looks crufty: it has the advantage of |
2081 | + # actually working. |
2082 | + break;; |
2083 | + * ) |
2084 | + break;; |
2085 | + esac |
2086 | +done |
2087 | +test "$ac_cv_exeext" = no && ac_cv_exeext= |
2088 | + |
2089 | +else |
2090 | + ac_file='' |
2091 | +fi |
2092 | +if test -z "$ac_file"; then : |
2093 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2094 | +$as_echo "no" >&6; } |
2095 | +$as_echo "$as_me: failed program was:" >&5 |
2096 | +sed 's/^/| /' conftest.$ac_ext >&5 |
2097 | + |
2098 | +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2099 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2100 | +as_fn_error 77 "C compiler cannot create executables |
2101 | +See \`config.log' for more details" "$LINENO" 5; } |
2102 | +else |
2103 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2104 | +$as_echo "yes" >&6; } |
2105 | +fi |
2106 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 |
2107 | +$as_echo_n "checking for C compiler default output file name... " >&6; } |
2108 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 |
2109 | +$as_echo "$ac_file" >&6; } |
2110 | +ac_exeext=$ac_cv_exeext |
2111 | + |
2112 | +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out |
2113 | +ac_clean_files=$ac_clean_files_save |
2114 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 |
2115 | +$as_echo_n "checking for suffix of executables... " >&6; } |
2116 | +if { { ac_try="$ac_link" |
2117 | +case "(($ac_try" in |
2118 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2119 | + *) ac_try_echo=$ac_try;; |
2120 | +esac |
2121 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2122 | +$as_echo "$ac_try_echo"; } >&5 |
2123 | + (eval "$ac_link") 2>&5 |
2124 | + ac_status=$? |
2125 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2126 | + test $ac_status = 0; }; then : |
2127 | + # If both `conftest.exe' and `conftest' are `present' (well, observable) |
2128 | +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will |
2129 | +# work properly (i.e., refer to `conftest.exe'), while it won't with |
2130 | +# `rm'. |
2131 | +for ac_file in conftest.exe conftest conftest.*; do |
2132 | + test -f "$ac_file" || continue |
2133 | + case $ac_file in |
2134 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; |
2135 | + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` |
2136 | + break;; |
2137 | + * ) break;; |
2138 | + esac |
2139 | +done |
2140 | +else |
2141 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2142 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2143 | +as_fn_error $? "cannot compute suffix of executables: cannot compile and link |
2144 | +See \`config.log' for more details" "$LINENO" 5; } |
2145 | +fi |
2146 | +rm -f conftest conftest$ac_cv_exeext |
2147 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
2148 | +$as_echo "$ac_cv_exeext" >&6; } |
2149 | + |
2150 | +rm -f conftest.$ac_ext |
2151 | +EXEEXT=$ac_cv_exeext |
2152 | +ac_exeext=$EXEEXT |
2153 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2154 | +/* end confdefs.h. */ |
2155 | +#include <stdio.h> |
2156 | +int |
2157 | +main () |
2158 | +{ |
2159 | +FILE *f = fopen ("conftest.out", "w"); |
2160 | + return ferror (f) || fclose (f) != 0; |
2161 | + |
2162 | + ; |
2163 | + return 0; |
2164 | +} |
2165 | +_ACEOF |
2166 | +ac_clean_files="$ac_clean_files conftest.out" |
2167 | +# Check that the compiler produces executables we can run. If not, either |
2168 | +# the compiler is broken, or we cross compile. |
2169 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 |
2170 | +$as_echo_n "checking whether we are cross compiling... " >&6; } |
2171 | +if test "$cross_compiling" != yes; then |
2172 | + { { ac_try="$ac_link" |
2173 | +case "(($ac_try" in |
2174 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2175 | + *) ac_try_echo=$ac_try;; |
2176 | +esac |
2177 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2178 | +$as_echo "$ac_try_echo"; } >&5 |
2179 | + (eval "$ac_link") 2>&5 |
2180 | + ac_status=$? |
2181 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2182 | + test $ac_status = 0; } |
2183 | + if { ac_try='./conftest$ac_cv_exeext' |
2184 | + { { case "(($ac_try" in |
2185 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2186 | + *) ac_try_echo=$ac_try;; |
2187 | +esac |
2188 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2189 | +$as_echo "$ac_try_echo"; } >&5 |
2190 | + (eval "$ac_try") 2>&5 |
2191 | + ac_status=$? |
2192 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2193 | + test $ac_status = 0; }; }; then |
2194 | + cross_compiling=no |
2195 | + else |
2196 | + if test "$cross_compiling" = maybe; then |
2197 | + cross_compiling=yes |
2198 | + else |
2199 | + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2200 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2201 | +as_fn_error $? "cannot run C compiled programs. |
2202 | +If you meant to cross compile, use \`--host'. |
2203 | +See \`config.log' for more details" "$LINENO" 5; } |
2204 | + fi |
2205 | + fi |
2206 | +fi |
2207 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 |
2208 | +$as_echo "$cross_compiling" >&6; } |
2209 | + |
2210 | +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out |
2211 | +ac_clean_files=$ac_clean_files_save |
2212 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 |
2213 | +$as_echo_n "checking for suffix of object files... " >&6; } |
2214 | +if ${ac_cv_objext+:} false; then : |
2215 | + $as_echo_n "(cached) " >&6 |
2216 | +else |
2217 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2218 | +/* end confdefs.h. */ |
2219 | + |
2220 | +int |
2221 | +main () |
2222 | +{ |
2223 | + |
2224 | + ; |
2225 | + return 0; |
2226 | +} |
2227 | +_ACEOF |
2228 | +rm -f conftest.o conftest.obj |
2229 | +if { { ac_try="$ac_compile" |
2230 | +case "(($ac_try" in |
2231 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2232 | + *) ac_try_echo=$ac_try;; |
2233 | +esac |
2234 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2235 | +$as_echo "$ac_try_echo"; } >&5 |
2236 | + (eval "$ac_compile") 2>&5 |
2237 | + ac_status=$? |
2238 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2239 | + test $ac_status = 0; }; then : |
2240 | + for ac_file in conftest.o conftest.obj conftest.*; do |
2241 | + test -f "$ac_file" || continue; |
2242 | + case $ac_file in |
2243 | + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; |
2244 | + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` |
2245 | + break;; |
2246 | + esac |
2247 | +done |
2248 | +else |
2249 | + $as_echo "$as_me: failed program was:" >&5 |
2250 | +sed 's/^/| /' conftest.$ac_ext >&5 |
2251 | + |
2252 | +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2253 | +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2254 | +as_fn_error $? "cannot compute suffix of object files: cannot compile |
2255 | +See \`config.log' for more details" "$LINENO" 5; } |
2256 | +fi |
2257 | +rm -f conftest.$ac_cv_objext conftest.$ac_ext |
2258 | +fi |
2259 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 |
2260 | +$as_echo "$ac_cv_objext" >&6; } |
2261 | +OBJEXT=$ac_cv_objext |
2262 | +ac_objext=$OBJEXT |
2263 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 |
2264 | +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } |
2265 | +if ${ac_cv_c_compiler_gnu+:} false; then : |
2266 | + $as_echo_n "(cached) " >&6 |
2267 | +else |
2268 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2269 | +/* end confdefs.h. */ |
2270 | + |
2271 | +int |
2272 | +main () |
2273 | +{ |
2274 | +#ifndef __GNUC__ |
2275 | + choke me |
2276 | +#endif |
2277 | + |
2278 | + ; |
2279 | + return 0; |
2280 | +} |
2281 | +_ACEOF |
2282 | +if ac_fn_c_try_compile "$LINENO"; then : |
2283 | + ac_compiler_gnu=yes |
2284 | +else |
2285 | + ac_compiler_gnu=no |
2286 | +fi |
2287 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
2288 | +ac_cv_c_compiler_gnu=$ac_compiler_gnu |
2289 | + |
2290 | +fi |
2291 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 |
2292 | +$as_echo "$ac_cv_c_compiler_gnu" >&6; } |
2293 | +if test $ac_compiler_gnu = yes; then |
2294 | + GCC=yes |
2295 | +else |
2296 | + GCC= |
2297 | +fi |
2298 | +ac_test_CFLAGS=${CFLAGS+set} |
2299 | +ac_save_CFLAGS=$CFLAGS |
2300 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 |
2301 | +$as_echo_n "checking whether $CC accepts -g... " >&6; } |
2302 | +if ${ac_cv_prog_cc_g+:} false; then : |
2303 | + $as_echo_n "(cached) " >&6 |
2304 | +else |
2305 | + ac_save_c_werror_flag=$ac_c_werror_flag |
2306 | + ac_c_werror_flag=yes |
2307 | + ac_cv_prog_cc_g=no |
2308 | + CFLAGS="-g" |
2309 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2310 | +/* end confdefs.h. */ |
2311 | + |
2312 | +int |
2313 | +main () |
2314 | +{ |
2315 | + |
2316 | + ; |
2317 | + return 0; |
2318 | +} |
2319 | +_ACEOF |
2320 | +if ac_fn_c_try_compile "$LINENO"; then : |
2321 | + ac_cv_prog_cc_g=yes |
2322 | +else |
2323 | + CFLAGS="" |
2324 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2325 | +/* end confdefs.h. */ |
2326 | + |
2327 | +int |
2328 | +main () |
2329 | +{ |
2330 | + |
2331 | + ; |
2332 | + return 0; |
2333 | +} |
2334 | +_ACEOF |
2335 | +if ac_fn_c_try_compile "$LINENO"; then : |
2336 | + |
2337 | +else |
2338 | + ac_c_werror_flag=$ac_save_c_werror_flag |
2339 | + CFLAGS="-g" |
2340 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2341 | +/* end confdefs.h. */ |
2342 | + |
2343 | +int |
2344 | +main () |
2345 | +{ |
2346 | + |
2347 | + ; |
2348 | + return 0; |
2349 | +} |
2350 | +_ACEOF |
2351 | +if ac_fn_c_try_compile "$LINENO"; then : |
2352 | + ac_cv_prog_cc_g=yes |
2353 | +fi |
2354 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
2355 | +fi |
2356 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
2357 | +fi |
2358 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext |
2359 | + ac_c_werror_flag=$ac_save_c_werror_flag |
2360 | +fi |
2361 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 |
2362 | +$as_echo "$ac_cv_prog_cc_g" >&6; } |
2363 | +if test "$ac_test_CFLAGS" = set; then |
2364 | + CFLAGS=$ac_save_CFLAGS |
2365 | +elif test $ac_cv_prog_cc_g = yes; then |
2366 | + if test "$GCC" = yes; then |
2367 | + CFLAGS="-g -O2" |
2368 | + else |
2369 | + CFLAGS="-g" |
2370 | + fi |
2371 | +else |
2372 | + if test "$GCC" = yes; then |
2373 | + CFLAGS="-O2" |
2374 | + else |
2375 | + CFLAGS= |
2376 | + fi |
2377 | +fi |
2378 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 |
2379 | +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } |
2380 | +if ${ac_cv_prog_cc_c89+:} false; then : |
2381 | + $as_echo_n "(cached) " >&6 |
2382 | +else |
2383 | + ac_cv_prog_cc_c89=no |
2384 | +ac_save_CC=$CC |
2385 | +cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2386 | +/* end confdefs.h. */ |
2387 | +#include <stdarg.h> |
2388 | +#include <stdio.h> |
2389 | +struct stat; |
2390 | +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ |
2391 | +struct buf { int x; }; |
2392 | +FILE * (*rcsopen) (struct buf *, struct stat *, int); |
2393 | +static char *e (p, i) |
2394 | + char **p; |
2395 | + int i; |
2396 | +{ |
2397 | + return p[i]; |
2398 | +} |
2399 | +static char *f (char * (*g) (char **, int), char **p, ...) |
2400 | +{ |
2401 | + char *s; |
2402 | + va_list v; |
2403 | + va_start (v,p); |
2404 | + s = g (p, va_arg (v,int)); |
2405 | + va_end (v); |
2406 | + return s; |
2407 | +} |
2408 | + |
2409 | +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has |
2410 | + function prototypes and stuff, but not '\xHH' hex character constants. |
2411 | + These don't provoke an error unfortunately, instead are silently treated |
2412 | + as 'x'. The following induces an error, until -std is added to get |
2413 | + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an |
2414 | + array size at least. It's necessary to write '\x00'==0 to get something |
2415 | + that's true only with -std. */ |
2416 | +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; |
2417 | + |
2418 | +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters |
2419 | + inside strings and character constants. */ |
2420 | +#define FOO(x) 'x' |
2421 | +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; |
2422 | + |
2423 | +int test (int i, double x); |
2424 | +struct s1 {int (*f) (int a);}; |
2425 | +struct s2 {int (*f) (double a);}; |
2426 | +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); |
2427 | +int argc; |
2428 | +char **argv; |
2429 | +int |
2430 | +main () |
2431 | +{ |
2432 | +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; |
2433 | + ; |
2434 | + return 0; |
2435 | +} |
2436 | +_ACEOF |
2437 | +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ |
2438 | + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" |
2439 | +do |
2440 | + CC="$ac_save_CC $ac_arg" |
2441 | + if ac_fn_c_try_compile "$LINENO"; then : |
2442 | + ac_cv_prog_cc_c89=$ac_arg |
2443 | +fi |
2444 | +rm -f core conftest.err conftest.$ac_objext |
2445 | + test "x$ac_cv_prog_cc_c89" != "xno" && break |
2446 | +done |
2447 | +rm -f conftest.$ac_ext |
2448 | +CC=$ac_save_CC |
2449 | + |
2450 | +fi |
2451 | +# AC_CACHE_VAL |
2452 | +case "x$ac_cv_prog_cc_c89" in |
2453 | + x) |
2454 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 |
2455 | +$as_echo "none needed" >&6; } ;; |
2456 | + xno) |
2457 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 |
2458 | +$as_echo "unsupported" >&6; } ;; |
2459 | + *) |
2460 | + CC="$CC $ac_cv_prog_cc_c89" |
2461 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 |
2462 | +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; |
2463 | +esac |
2464 | +if test "x$ac_cv_prog_cc_c89" != xno; then : |
2465 | + |
2466 | +fi |
2467 | + |
2468 | +ac_ext=c |
2469 | +ac_cpp='$CPP $CPPFLAGS' |
2470 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
2471 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
2472 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu |
2473 | +DEPDIR="${am__leading_dot}deps" |
2474 | + |
2475 | +ac_config_commands="$ac_config_commands depfiles" |
2476 | + |
2477 | + |
2478 | +am_make=${MAKE-make} |
2479 | +cat > confinc << 'END' |
2480 | +am__doit: |
2481 | + @echo this is the am__doit target |
2482 | +.PHONY: am__doit |
2483 | +END |
2484 | +# If we don't find an include directive, just comment out the code. |
2485 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 |
2486 | +$as_echo_n "checking for style of include used by $am_make... " >&6; } |
2487 | +am__include="#" |
2488 | +am__quote= |
2489 | +_am_result=none |
2490 | +# First try GNU make style include. |
2491 | +echo "include confinc" > confmf |
2492 | +# Ignore all kinds of additional output from `make'. |
2493 | +case `$am_make -s -f confmf 2> /dev/null` in #( |
2494 | +*the\ am__doit\ target*) |
2495 | + am__include=include |
2496 | + am__quote= |
2497 | + _am_result=GNU |
2498 | + ;; |
2499 | +esac |
2500 | +# Now try BSD make style include. |
2501 | +if test "$am__include" = "#"; then |
2502 | + echo '.include "confinc"' > confmf |
2503 | + case `$am_make -s -f confmf 2> /dev/null` in #( |
2504 | + *the\ am__doit\ target*) |
2505 | + am__include=.include |
2506 | + am__quote="\"" |
2507 | + _am_result=BSD |
2508 | + ;; |
2509 | + esac |
2510 | +fi |
2511 | + |
2512 | + |
2513 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 |
2514 | +$as_echo "$_am_result" >&6; } |
2515 | +rm -f confinc confmf |
2516 | + |
2517 | +# Check whether --enable-dependency-tracking was given. |
2518 | +if test "${enable_dependency_tracking+set}" = set; then : |
2519 | + enableval=$enable_dependency_tracking; |
2520 | +fi |
2521 | + |
2522 | +if test "x$enable_dependency_tracking" != xno; then |
2523 | + am_depcomp="$ac_aux_dir/depcomp" |
2524 | + AMDEPBACKSLASH='\' |
2525 | + am__nodep='_no' |
2526 | +fi |
2527 | + if test "x$enable_dependency_tracking" != xno; then |
2528 | + AMDEP_TRUE= |
2529 | + AMDEP_FALSE='#' |
2530 | +else |
2531 | + AMDEP_TRUE='#' |
2532 | + AMDEP_FALSE= |
2533 | +fi |
2534 | + |
2535 | + |
2536 | + |
2537 | +depcc="$CC" am_compiler_list= |
2538 | + |
2539 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
2540 | +$as_echo_n "checking dependency style of $depcc... " >&6; } |
2541 | +if ${am_cv_CC_dependencies_compiler_type+:} false; then : |
2542 | + $as_echo_n "(cached) " >&6 |
2543 | +else |
2544 | + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then |
2545 | + # We make a subdir and do the tests there. Otherwise we can end up |
2546 | + # making bogus files that we don't know about and never remove. For |
2547 | + # instance it was reported that on HP-UX the gcc test will end up |
2548 | + # making a dummy file named `D' -- because `-MD' means `put the output |
2549 | + # in D'. |
2550 | + rm -rf conftest.dir |
2551 | + mkdir conftest.dir |
2552 | + # Copy depcomp to subdir because otherwise we won't find it if we're |
2553 | + # using a relative directory. |
2554 | + cp "$am_depcomp" conftest.dir |
2555 | + cd conftest.dir |
2556 | + # We will build objects and dependencies in a subdirectory because |
2557 | + # it helps to detect inapplicable dependency modes. For instance |
2558 | + # both Tru64's cc and ICC support -MD to output dependencies as a |
2559 | + # side effect of compilation, but ICC will put the dependencies in |
2560 | + # the current directory while Tru64 will put them in the object |
2561 | + # directory. |
2562 | + mkdir sub |
2563 | + |
2564 | + am_cv_CC_dependencies_compiler_type=none |
2565 | + if test "$am_compiler_list" = ""; then |
2566 | + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` |
2567 | + fi |
2568 | + am__universal=false |
2569 | + case " $depcc " in #( |
2570 | + *\ -arch\ *\ -arch\ *) am__universal=true ;; |
2571 | + esac |
2572 | + |
2573 | + for depmode in $am_compiler_list; do |
2574 | + # Setup a source with many dependencies, because some compilers |
2575 | + # like to wrap large dependency lists on column 80 (with \), and |
2576 | + # we should not choose a depcomp mode which is confused by this. |
2577 | + # |
2578 | + # We need to recreate these files for each test, as the compiler may |
2579 | + # overwrite some of them when testing with obscure command lines. |
2580 | + # This happens at least with the AIX C compiler. |
2581 | + : > sub/conftest.c |
2582 | + for i in 1 2 3 4 5 6; do |
2583 | + echo '#include "conftst'$i'.h"' >> sub/conftest.c |
2584 | + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with |
2585 | + # Solaris 8's {/usr,}/bin/sh. |
2586 | + touch sub/conftst$i.h |
2587 | + done |
2588 | + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf |
2589 | + |
2590 | + # We check with `-c' and `-o' for the sake of the "dashmstdout" |
2591 | + # mode. It turns out that the SunPro C++ compiler does not properly |
2592 | + # handle `-M -o', and we need to detect this. Also, some Intel |
2593 | + # versions had trouble with output in subdirs |
2594 | + am__obj=sub/conftest.${OBJEXT-o} |
2595 | + am__minus_obj="-o $am__obj" |
2596 | + case $depmode in |
2597 | + gcc) |
2598 | + # This depmode causes a compiler race in universal mode. |
2599 | + test "$am__universal" = false || continue |
2600 | + ;; |
2601 | + nosideeffect) |
2602 | + # after this tag, mechanisms are not by side-effect, so they'll |
2603 | + # only be used when explicitly requested |
2604 | + if test "x$enable_dependency_tracking" = xyes; then |
2605 | + continue |
2606 | + else |
2607 | + break |
2608 | + fi |
2609 | + ;; |
2610 | + msvc7 | msvc7msys | msvisualcpp | msvcmsys) |
2611 | + # This compiler won't grok `-c -o', but also, the minuso test has |
2612 | + # not run yet. These depmodes are late enough in the game, and |
2613 | + # so weak that their functioning should not be impacted. |
2614 | + am__obj=conftest.${OBJEXT-o} |
2615 | + am__minus_obj= |
2616 | + ;; |
2617 | + none) break ;; |
2618 | + esac |
2619 | + if depmode=$depmode \ |
2620 | + source=sub/conftest.c object=$am__obj \ |
2621 | + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ |
2622 | + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ |
2623 | + >/dev/null 2>conftest.err && |
2624 | + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && |
2625 | + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && |
2626 | + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && |
2627 | + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then |
2628 | + # icc doesn't choke on unknown options, it will just issue warnings |
2629 | + # or remarks (even with -Werror). So we grep stderr for any message |
2630 | + # that says an option was ignored or not supported. |
2631 | + # When given -MP, icc 7.0 and 7.1 complain thusly: |
2632 | + # icc: Command line warning: ignoring option '-M'; no argument required |
2633 | + # The diagnosis changed in icc 8.0: |
2634 | + # icc: Command line remark: option '-MP' not supported |
2635 | + if (grep 'ignoring option' conftest.err || |
2636 | + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else |
2637 | + am_cv_CC_dependencies_compiler_type=$depmode |
2638 | + break |
2639 | + fi |
2640 | + fi |
2641 | + done |
2642 | + |
2643 | + cd .. |
2644 | + rm -rf conftest.dir |
2645 | +else |
2646 | + am_cv_CC_dependencies_compiler_type=none |
2647 | +fi |
2648 | + |
2649 | +fi |
2650 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 |
2651 | +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } |
2652 | +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type |
2653 | + |
2654 | + if |
2655 | + test "x$enable_dependency_tracking" != xno \ |
2656 | + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then |
2657 | + am__fastdepCC_TRUE= |
2658 | + am__fastdepCC_FALSE='#' |
2659 | +else |
2660 | + am__fastdepCC_TRUE='#' |
2661 | + am__fastdepCC_FALSE= |
2662 | +fi |
2663 | + |
2664 | + |
2665 | + |
2666 | +if test "x$CC" != xcc; then |
2667 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 |
2668 | +$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } |
2669 | +else |
2670 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 |
2671 | +$as_echo_n "checking whether cc understands -c and -o together... " >&6; } |
2672 | +fi |
2673 | +set dummy $CC; ac_cc=`$as_echo "$2" | |
2674 | + sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
2675 | +if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : |
2676 | + $as_echo_n "(cached) " >&6 |
2677 | +else |
2678 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2679 | +/* end confdefs.h. */ |
2680 | + |
2681 | +int |
2682 | +main () |
2683 | +{ |
2684 | + |
2685 | + ; |
2686 | + return 0; |
2687 | +} |
2688 | +_ACEOF |
2689 | +# Make sure it works both with $CC and with simple cc. |
2690 | +# We do the test twice because some compilers refuse to overwrite an |
2691 | +# existing .o file with -o, though they will create one. |
2692 | +ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' |
2693 | +rm -f conftest2.* |
2694 | +if { { case "(($ac_try" in |
2695 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2696 | + *) ac_try_echo=$ac_try;; |
2697 | +esac |
2698 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2699 | +$as_echo "$ac_try_echo"; } >&5 |
2700 | + (eval "$ac_try") 2>&5 |
2701 | + ac_status=$? |
2702 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2703 | + test $ac_status = 0; } && |
2704 | + test -f conftest2.$ac_objext && { { case "(($ac_try" in |
2705 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2706 | + *) ac_try_echo=$ac_try;; |
2707 | +esac |
2708 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2709 | +$as_echo "$ac_try_echo"; } >&5 |
2710 | + (eval "$ac_try") 2>&5 |
2711 | + ac_status=$? |
2712 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2713 | + test $ac_status = 0; }; |
2714 | +then |
2715 | + eval ac_cv_prog_cc_${ac_cc}_c_o=yes |
2716 | + if test "x$CC" != xcc; then |
2717 | + # Test first that cc exists at all. |
2718 | + if { ac_try='cc -c conftest.$ac_ext >&5' |
2719 | + { { case "(($ac_try" in |
2720 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2721 | + *) ac_try_echo=$ac_try;; |
2722 | +esac |
2723 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2724 | +$as_echo "$ac_try_echo"; } >&5 |
2725 | + (eval "$ac_try") 2>&5 |
2726 | + ac_status=$? |
2727 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2728 | + test $ac_status = 0; }; }; then |
2729 | + ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' |
2730 | + rm -f conftest2.* |
2731 | + if { { case "(($ac_try" in |
2732 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2733 | + *) ac_try_echo=$ac_try;; |
2734 | +esac |
2735 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2736 | +$as_echo "$ac_try_echo"; } >&5 |
2737 | + (eval "$ac_try") 2>&5 |
2738 | + ac_status=$? |
2739 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2740 | + test $ac_status = 0; } && |
2741 | + test -f conftest2.$ac_objext && { { case "(($ac_try" in |
2742 | + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2743 | + *) ac_try_echo=$ac_try;; |
2744 | +esac |
2745 | +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2746 | +$as_echo "$ac_try_echo"; } >&5 |
2747 | + (eval "$ac_try") 2>&5 |
2748 | + ac_status=$? |
2749 | + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2750 | + test $ac_status = 0; }; |
2751 | + then |
2752 | + # cc works too. |
2753 | + : |
2754 | + else |
2755 | + # cc exists but doesn't like -o. |
2756 | + eval ac_cv_prog_cc_${ac_cc}_c_o=no |
2757 | + fi |
2758 | + fi |
2759 | + fi |
2760 | +else |
2761 | + eval ac_cv_prog_cc_${ac_cc}_c_o=no |
2762 | +fi |
2763 | +rm -f core conftest* |
2764 | + |
2765 | +fi |
2766 | +if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then |
2767 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2768 | +$as_echo "yes" >&6; } |
2769 | +else |
2770 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2771 | +$as_echo "no" >&6; } |
2772 | + |
2773 | +$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h |
2774 | + |
2775 | +fi |
2776 | + |
2777 | +# FIXME: we rely on the cache variable name because |
2778 | +# there is no other way. |
2779 | +set dummy $CC |
2780 | +am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
2781 | +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o |
2782 | +if test "$am_t" != yes; then |
2783 | + # Losing compiler, so override with the script. |
2784 | + # FIXME: It is wrong to rewrite CC. |
2785 | + # But if we don't then we get into trouble of one sort or another. |
2786 | + # A longer-term fix would be to have automake use am__CC in this case, |
2787 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
2788 | + CC="$am_aux_dir/compile $CC" |
2789 | +fi |
2790 | + |
2791 | + |
2792 | + |
2793 | ########################### |
2794 | # Local Install |
2795 | ########################### |
2796 | @@ -2412,7 +3597,22 @@ |
2797 | LTLIBOBJS=$ac_ltlibobjs |
2798 | |
2799 | |
2800 | + if test -n "$EXEEXT"; then |
2801 | + am__EXEEXT_TRUE= |
2802 | + am__EXEEXT_FALSE='#' |
2803 | +else |
2804 | + am__EXEEXT_TRUE='#' |
2805 | + am__EXEEXT_FALSE= |
2806 | +fi |
2807 | |
2808 | +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then |
2809 | + as_fn_error $? "conditional \"AMDEP\" was never defined. |
2810 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
2811 | +fi |
2812 | +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then |
2813 | + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. |
2814 | +Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
2815 | +fi |
2816 | |
2817 | : "${CONFIG_STATUS=./config.status}" |
2818 | ac_write_fail=0 |
2819 | @@ -2810,7 +4010,7 @@ |
2820 | # report actual input values of CONFIG_FILES etc. instead of their |
2821 | # values after options handling. |
2822 | ac_log=" |
2823 | -This file was extended by lightdm-remote-session-uccsconfigure $as_me 0.3, which was |
2824 | +This file was extended by lightdm-remote-session-uccsconfigure $as_me 1.1, which was |
2825 | generated by GNU Autoconf 2.69. Invocation command line was |
2826 | |
2827 | CONFIG_FILES = $CONFIG_FILES |
2828 | @@ -2833,6 +4033,7 @@ |
2829 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2830 | # Files that config.status was made for. |
2831 | config_files="$ac_config_files" |
2832 | +config_commands="$ac_config_commands" |
2833 | |
2834 | _ACEOF |
2835 | |
2836 | @@ -2857,13 +4058,16 @@ |
2837 | Configuration files: |
2838 | $config_files |
2839 | |
2840 | +Configuration commands: |
2841 | +$config_commands |
2842 | + |
2843 | Report bugs to the package provider." |
2844 | |
2845 | _ACEOF |
2846 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2847 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
2848 | ac_cs_version="\\ |
2849 | -lightdm-remote-session-uccsconfigure config.status 0.3 |
2850 | +lightdm-remote-session-uccsconfigure config.status 1.1 |
2851 | configured by $0, generated by GNU Autoconf 2.69, |
2852 | with options \\"\$ac_cs_config\\" |
2853 | |
2854 | @@ -2968,6 +4172,11 @@ |
2855 | |
2856 | _ACEOF |
2857 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2858 | +# |
2859 | +# INIT-COMMANDS |
2860 | +# |
2861 | +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" |
2862 | + |
2863 | _ACEOF |
2864 | |
2865 | cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
2866 | @@ -2976,6 +4185,7 @@ |
2867 | for ac_config_target in $ac_config_targets |
2868 | do |
2869 | case $ac_config_target in |
2870 | + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; |
2871 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
2872 | |
2873 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
2874 | @@ -2989,6 +4199,7 @@ |
2875 | # bizarre bug on SunOS 4.1.3. |
2876 | if $ac_need_defaults; then |
2877 | test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files |
2878 | + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands |
2879 | fi |
2880 | |
2881 | # Have a temporary directory for convenience. Make it in the build tree |
2882 | @@ -3177,7 +4388,7 @@ |
2883 | fi # test -n "$CONFIG_FILES" |
2884 | |
2885 | |
2886 | -eval set X " :F $CONFIG_FILES " |
2887 | +eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS" |
2888 | shift |
2889 | for ac_tag |
2890 | do |
2891 | @@ -3398,9 +4609,110 @@ |
2892 | ;; |
2893 | |
2894 | |
2895 | - |
2896 | - esac |
2897 | - |
2898 | + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 |
2899 | +$as_echo "$as_me: executing $ac_file commands" >&6;} |
2900 | + ;; |
2901 | + esac |
2902 | + |
2903 | + |
2904 | + case $ac_file$ac_mode in |
2905 | + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { |
2906 | + # Autoconf 2.62 quotes --file arguments for eval, but not when files |
2907 | + # are listed without --file. Let's play safe and only enable the eval |
2908 | + # if we detect the quoting. |
2909 | + case $CONFIG_FILES in |
2910 | + *\'*) eval set x "$CONFIG_FILES" ;; |
2911 | + *) set x $CONFIG_FILES ;; |
2912 | + esac |
2913 | + shift |
2914 | + for mf |
2915 | + do |
2916 | + # Strip MF so we end up with the name of the file. |
2917 | + mf=`echo "$mf" | sed -e 's/:.*$//'` |
2918 | + # Check whether this is an Automake generated Makefile or not. |
2919 | + # We used to match only the files named `Makefile.in', but |
2920 | + # some people rename them; so instead we look at the file content. |
2921 | + # Grep'ing the first line is not enough: some people post-process |
2922 | + # each Makefile.in and add a new line on top of each file to say so. |
2923 | + # Grep'ing the whole file is not good either: AIX grep has a line |
2924 | + # limit of 2048, but all sed's we know have understand at least 4000. |
2925 | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
2926 | + dirpart=`$as_dirname -- "$mf" || |
2927 | +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
2928 | + X"$mf" : 'X\(//\)[^/]' \| \ |
2929 | + X"$mf" : 'X\(//\)$' \| \ |
2930 | + X"$mf" : 'X\(/\)' \| . 2>/dev/null || |
2931 | +$as_echo X"$mf" | |
2932 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
2933 | + s//\1/ |
2934 | + q |
2935 | + } |
2936 | + /^X\(\/\/\)[^/].*/{ |
2937 | + s//\1/ |
2938 | + q |
2939 | + } |
2940 | + /^X\(\/\/\)$/{ |
2941 | + s//\1/ |
2942 | + q |
2943 | + } |
2944 | + /^X\(\/\).*/{ |
2945 | + s//\1/ |
2946 | + q |
2947 | + } |
2948 | + s/.*/./; q'` |
2949 | + else |
2950 | + continue |
2951 | + fi |
2952 | + # Extract the definition of DEPDIR, am__include, and am__quote |
2953 | + # from the Makefile without running `make'. |
2954 | + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
2955 | + test -z "$DEPDIR" && continue |
2956 | + am__include=`sed -n 's/^am__include = //p' < "$mf"` |
2957 | + test -z "am__include" && continue |
2958 | + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
2959 | + # When using ansi2knr, U may be empty or an underscore; expand it |
2960 | + U=`sed -n 's/^U = //p' < "$mf"` |
2961 | + # Find all dependency output files, they are included files with |
2962 | + # $(DEPDIR) in their names. We invoke sed twice because it is the |
2963 | + # simplest approach to changing $(DEPDIR) to its actual value in the |
2964 | + # expansion. |
2965 | + for file in `sed -n " |
2966 | + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
2967 | + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do |
2968 | + # Make sure the directory exists. |
2969 | + test -f "$dirpart/$file" && continue |
2970 | + fdir=`$as_dirname -- "$file" || |
2971 | +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ |
2972 | + X"$file" : 'X\(//\)[^/]' \| \ |
2973 | + X"$file" : 'X\(//\)$' \| \ |
2974 | + X"$file" : 'X\(/\)' \| . 2>/dev/null || |
2975 | +$as_echo X"$file" | |
2976 | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ |
2977 | + s//\1/ |
2978 | + q |
2979 | + } |
2980 | + /^X\(\/\/\)[^/].*/{ |
2981 | + s//\1/ |
2982 | + q |
2983 | + } |
2984 | + /^X\(\/\/\)$/{ |
2985 | + s//\1/ |
2986 | + q |
2987 | + } |
2988 | + /^X\(\/\).*/{ |
2989 | + s//\1/ |
2990 | + q |
2991 | + } |
2992 | + s/.*/./; q'` |
2993 | + as_dir=$dirpart/$fdir; as_fn_mkdir_p |
2994 | + # echo "creating $dirpart/$file" |
2995 | + echo '# dummy' > "$dirpart/$file" |
2996 | + done |
2997 | + done |
2998 | +} |
2999 | + ;; |
3000 | + |
3001 | + esac |
3002 | done # for ac_tag |
3003 | |
3004 | |
3005 | |
3006 | === modified file 'configure.ac' |
3007 | --- configure.ac 2012-08-22 14:10:56 +0000 |
3008 | +++ configure.ac 2012-09-19 20:21:18 +0000 |
3009 | @@ -1,8 +1,12 @@ |
3010 | -AC_INIT([lightdm-remote-session-uccsconfigure], [0.3]) |
3011 | +AC_INIT([lightdm-remote-session-uccsconfigure], [1.1]) |
3012 | |
3013 | AM_INIT_AUTOMAKE([1.11 -Wno-portability]) |
3014 | AM_SILENT_RULES([yes]) |
3015 | |
3016 | +AC_PROG_CC |
3017 | +AC_PROG_INSTALL |
3018 | +AM_PROG_CC_C_O |
3019 | + |
3020 | ########################### |
3021 | # Local Install |
3022 | ########################### |
3023 | |
3024 | === modified file 'debian/changelog' |
3025 | --- debian/changelog 2012-08-22 14:47:10 +0000 |
3026 | +++ debian/changelog 2012-09-19 20:21:18 +0000 |
3027 | @@ -1,3 +1,31 @@ |
3028 | +lightdm-remote-session-uccsconfigure (1.1-0ubuntu1~ppa1) quantal; urgency=low |
3029 | + |
3030 | + * New upstream release. |
3031 | + * Fixing desktop file |
3032 | + |
3033 | + -- Ted Gould <ted@ubuntu.com> Wed, 19 Sep 2012 15:18:37 -0500 |
3034 | + |
3035 | +lightdm-remote-session-uccsconfigure (1.0-0ubuntu1~ppa1) quantal; urgency=low |
3036 | + |
3037 | + * New upstream release. |
3038 | + * Adding apparmor wrappers (LP: #1049849) |
3039 | + * debian/control: |
3040 | + * Going to arch any as we have a binary now |
3041 | + * Adding dh_apparmor and suggests apparmor |
3042 | + * debian/rules: |
3043 | + * Adding apparmor build rules |
3044 | + * Adding reconf rules |
3045 | + |
3046 | + -- Ted Gould <ted@ubuntu.com> Wed, 19 Sep 2012 13:53:16 -0500 |
3047 | + |
3048 | +lightdm-remote-session-uccsconfigure (0.3+apparmor-0ubuntu1~ppa1) quantal; urgency=low |
3049 | + |
3050 | + * New upstream release. |
3051 | + * Adding apparmore support |
3052 | + * debian/source*: No quilt |
3053 | + |
3054 | + -- Ted Gould <ted@ubuntu.com> Fri, 14 Sep 2012 14:43:09 -0500 |
3055 | + |
3056 | lightdm-remote-session-uccsconfigure (0.3-0ubuntu1) quantal; urgency=low |
3057 | |
3058 | * Initial release for Ubuntu (LP: #1040092) |
3059 | |
3060 | === modified file 'debian/control' |
3061 | --- debian/control 2012-08-22 14:47:10 +0000 |
3062 | +++ debian/control 2012-09-19 20:21:18 +0000 |
3063 | @@ -3,17 +3,20 @@ |
3064 | Priority: extra |
3065 | Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
3066 | Build-Depends: debhelper (>= 9), |
3067 | + dh-apparmor, |
3068 | + dh-autoreconf, |
3069 | Standards-Version: 3.9.3 |
3070 | Homepage: http://launchpad.net/lightdm-remote-session-uccsconfigure/ |
3071 | Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/lightdm-remote-session-uccsconfigure/ubuntu |
3072 | |
3073 | Package: lightdm-remote-session-uccsconfigure |
3074 | -Architecture: all |
3075 | +Architecture: any |
3076 | Depends: ${misc:Depends}, |
3077 | ${shlibs:Depends}, |
3078 | firefox, |
3079 | lightdm, |
3080 | unity, |
3081 | +Suggests: apparmor, |
3082 | Description: Session and configuration to login to configure UCCS |
3083 | The configuration files needed and scripts required to login |
3084 | to a browser to configure and setup a UCCS account. |
3085 | |
3086 | === modified file 'debian/rules' |
3087 | --- debian/rules 2012-08-22 03:24:16 +0000 |
3088 | +++ debian/rules 2012-09-19 20:21:18 +0000 |
3089 | @@ -1,5 +1,9 @@ |
3090 | #!/usr/bin/make -f |
3091 | |
3092 | %: |
3093 | - dh $@ |
3094 | + dh $@ --with autoreconf |
3095 | + |
3096 | +override_dh_installdeb: |
3097 | + dh_apparmor --profile-name=lightdm-remote-session-uccsconfigure -plightdm-remote-session-uccsconfigure |
3098 | + dh_installdeb |
3099 | |
3100 | |
3101 | === removed directory 'debian/source' |
3102 | === removed file 'debian/source/format' |
3103 | --- debian/source/format 2012-08-22 14:47:10 +0000 |
3104 | +++ debian/source/format 1970-01-01 00:00:00 +0000 |
3105 | @@ -1,1 +0,0 @@ |
3106 | -3.0 (quilt) |
3107 | |
3108 | === added file 'depcomp' |
3109 | --- depcomp 1970-01-01 00:00:00 +0000 |
3110 | +++ depcomp 2012-09-19 20:21:18 +0000 |
3111 | @@ -0,0 +1,708 @@ |
3112 | +#! /bin/sh |
3113 | +# depcomp - compile a program generating dependencies as side-effects |
3114 | + |
3115 | +scriptversion=2012-03-27.16; # UTC |
3116 | + |
3117 | +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, |
3118 | +# 2011, 2012 Free Software Foundation, Inc. |
3119 | + |
3120 | +# This program is free software; you can redistribute it and/or modify |
3121 | +# it under the terms of the GNU General Public License as published by |
3122 | +# the Free Software Foundation; either version 2, or (at your option) |
3123 | +# any later version. |
3124 | + |
3125 | +# This program is distributed in the hope that it will be useful, |
3126 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
3127 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3128 | +# GNU General Public License for more details. |
3129 | + |
3130 | +# You should have received a copy of the GNU General Public License |
3131 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
3132 | + |
3133 | +# As a special exception to the GNU General Public License, if you |
3134 | +# distribute this file as part of a program that contains a |
3135 | +# configuration script generated by Autoconf, you may include it under |
3136 | +# the same distribution terms that you use for the rest of that program. |
3137 | + |
3138 | +# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>. |
3139 | + |
3140 | +case $1 in |
3141 | + '') |
3142 | + echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
3143 | + exit 1; |
3144 | + ;; |
3145 | + -h | --h*) |
3146 | + cat <<\EOF |
3147 | +Usage: depcomp [--help] [--version] PROGRAM [ARGS] |
3148 | + |
3149 | +Run PROGRAMS ARGS to compile a file, generating dependencies |
3150 | +as side-effects. |
3151 | + |
3152 | +Environment variables: |
3153 | + depmode Dependency tracking mode. |
3154 | + source Source file read by 'PROGRAMS ARGS'. |
3155 | + object Object file output by 'PROGRAMS ARGS'. |
3156 | + DEPDIR directory where to store dependencies. |
3157 | + depfile Dependency file to output. |
3158 | + tmpdepfile Temporary file to use when outputting dependencies. |
3159 | + libtool Whether libtool is used (yes/no). |
3160 | + |
3161 | +Report bugs to <bug-automake@gnu.org>. |
3162 | +EOF |
3163 | + exit $? |
3164 | + ;; |
3165 | + -v | --v*) |
3166 | + echo "depcomp $scriptversion" |
3167 | + exit $? |
3168 | + ;; |
3169 | +esac |
3170 | + |
3171 | +# A tabulation character. |
3172 | +tab=' ' |
3173 | +# A newline character. |
3174 | +nl=' |
3175 | +' |
3176 | + |
3177 | +if test -z "$depmode" || test -z "$source" || test -z "$object"; then |
3178 | + echo "depcomp: Variables source, object and depmode must be set" 1>&2 |
3179 | + exit 1 |
3180 | +fi |
3181 | + |
3182 | +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. |
3183 | +depfile=${depfile-`echo "$object" | |
3184 | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} |
3185 | +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} |
3186 | + |
3187 | +rm -f "$tmpdepfile" |
3188 | + |
3189 | +# Some modes work just like other modes, but use different flags. We |
3190 | +# parameterize here, but still list the modes in the big case below, |
3191 | +# to make depend.m4 easier to write. Note that we *cannot* use a case |
3192 | +# here, because this file can only contain one case statement. |
3193 | +if test "$depmode" = hp; then |
3194 | + # HP compiler uses -M and no extra arg. |
3195 | + gccflag=-M |
3196 | + depmode=gcc |
3197 | +fi |
3198 | + |
3199 | +if test "$depmode" = dashXmstdout; then |
3200 | + # This is just like dashmstdout with a different argument. |
3201 | + dashmflag=-xM |
3202 | + depmode=dashmstdout |
3203 | +fi |
3204 | + |
3205 | +cygpath_u="cygpath -u -f -" |
3206 | +if test "$depmode" = msvcmsys; then |
3207 | + # This is just like msvisualcpp but w/o cygpath translation. |
3208 | + # Just convert the backslash-escaped backslashes to single forward |
3209 | + # slashes to satisfy depend.m4 |
3210 | + cygpath_u='sed s,\\\\,/,g' |
3211 | + depmode=msvisualcpp |
3212 | +fi |
3213 | + |
3214 | +if test "$depmode" = msvc7msys; then |
3215 | + # This is just like msvc7 but w/o cygpath translation. |
3216 | + # Just convert the backslash-escaped backslashes to single forward |
3217 | + # slashes to satisfy depend.m4 |
3218 | + cygpath_u='sed s,\\\\,/,g' |
3219 | + depmode=msvc7 |
3220 | +fi |
3221 | + |
3222 | +if test "$depmode" = xlc; then |
3223 | + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. |
3224 | + gccflag=-qmakedep=gcc,-MF |
3225 | + depmode=gcc |
3226 | +fi |
3227 | + |
3228 | +case "$depmode" in |
3229 | +gcc3) |
3230 | +## gcc 3 implements dependency tracking that does exactly what |
3231 | +## we want. Yay! Note: for some reason libtool 1.4 doesn't like |
3232 | +## it if -MD -MP comes after the -MF stuff. Hmm. |
3233 | +## Unfortunately, FreeBSD c89 acceptance of flags depends upon |
3234 | +## the command line argument order; so add the flags where they |
3235 | +## appear in depend2.am. Note that the slowdown incurred here |
3236 | +## affects only configure: in makefiles, %FASTDEP% shortcuts this. |
3237 | + for arg |
3238 | + do |
3239 | + case $arg in |
3240 | + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; |
3241 | + *) set fnord "$@" "$arg" ;; |
3242 | + esac |
3243 | + shift # fnord |
3244 | + shift # $arg |
3245 | + done |
3246 | + "$@" |
3247 | + stat=$? |
3248 | + if test $stat -eq 0; then : |
3249 | + else |
3250 | + rm -f "$tmpdepfile" |
3251 | + exit $stat |
3252 | + fi |
3253 | + mv "$tmpdepfile" "$depfile" |
3254 | + ;; |
3255 | + |
3256 | +gcc) |
3257 | +## There are various ways to get dependency output from gcc. Here's |
3258 | +## why we pick this rather obscure method: |
3259 | +## - Don't want to use -MD because we'd like the dependencies to end |
3260 | +## up in a subdir. Having to rename by hand is ugly. |
3261 | +## (We might end up doing this anyway to support other compilers.) |
3262 | +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like |
3263 | +## -MM, not -M (despite what the docs say). |
3264 | +## - Using -M directly means running the compiler twice (even worse |
3265 | +## than renaming). |
3266 | + if test -z "$gccflag"; then |
3267 | + gccflag=-MD, |
3268 | + fi |
3269 | + "$@" -Wp,"$gccflag$tmpdepfile" |
3270 | + stat=$? |
3271 | + if test $stat -eq 0; then : |
3272 | + else |
3273 | + rm -f "$tmpdepfile" |
3274 | + exit $stat |
3275 | + fi |
3276 | + rm -f "$depfile" |
3277 | + echo "$object : \\" > "$depfile" |
3278 | + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz |
3279 | +## The second -e expression handles DOS-style file names with drive letters. |
3280 | + sed -e 's/^[^:]*: / /' \ |
3281 | + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" |
3282 | +## This next piece of magic avoids the "deleted header file" problem. |
3283 | +## The problem is that when a header file which appears in a .P file |
3284 | +## is deleted, the dependency causes make to die (because there is |
3285 | +## typically no way to rebuild the header). We avoid this by adding |
3286 | +## dummy dependencies for each header file. Too bad gcc doesn't do |
3287 | +## this for us directly. |
3288 | + tr ' ' "$nl" < "$tmpdepfile" | |
3289 | +## Some versions of gcc put a space before the ':'. On the theory |
3290 | +## that the space means something, we add a space to the output as |
3291 | +## well. hp depmode also adds that space, but also prefixes the VPATH |
3292 | +## to the object. Take care to not repeat it in the output. |
3293 | +## Some versions of the HPUX 10.20 sed can't process this invocation |
3294 | +## correctly. Breaking it into two sed invocations is a workaround. |
3295 | + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ |
3296 | + | sed -e 's/$/ :/' >> "$depfile" |
3297 | + rm -f "$tmpdepfile" |
3298 | + ;; |
3299 | + |
3300 | +hp) |
3301 | + # This case exists only to let depend.m4 do its work. It works by |
3302 | + # looking at the text of this script. This case will never be run, |
3303 | + # since it is checked for above. |
3304 | + exit 1 |
3305 | + ;; |
3306 | + |
3307 | +sgi) |
3308 | + if test "$libtool" = yes; then |
3309 | + "$@" "-Wp,-MDupdate,$tmpdepfile" |
3310 | + else |
3311 | + "$@" -MDupdate "$tmpdepfile" |
3312 | + fi |
3313 | + stat=$? |
3314 | + if test $stat -eq 0; then : |
3315 | + else |
3316 | + rm -f "$tmpdepfile" |
3317 | + exit $stat |
3318 | + fi |
3319 | + rm -f "$depfile" |
3320 | + |
3321 | + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files |
3322 | + echo "$object : \\" > "$depfile" |
3323 | + |
3324 | + # Clip off the initial element (the dependent). Don't try to be |
3325 | + # clever and replace this with sed code, as IRIX sed won't handle |
3326 | + # lines with more than a fixed number of characters (4096 in |
3327 | + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; |
3328 | + # the IRIX cc adds comments like '#:fec' to the end of the |
3329 | + # dependency line. |
3330 | + tr ' ' "$nl" < "$tmpdepfile" \ |
3331 | + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ |
3332 | + tr "$nl" ' ' >> "$depfile" |
3333 | + echo >> "$depfile" |
3334 | + |
3335 | + # The second pass generates a dummy entry for each header file. |
3336 | + tr ' ' "$nl" < "$tmpdepfile" \ |
3337 | + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ |
3338 | + >> "$depfile" |
3339 | + else |
3340 | + # The sourcefile does not contain any dependencies, so just |
3341 | + # store a dummy comment line, to avoid errors with the Makefile |
3342 | + # "include basename.Plo" scheme. |
3343 | + echo "#dummy" > "$depfile" |
3344 | + fi |
3345 | + rm -f "$tmpdepfile" |
3346 | + ;; |
3347 | + |
3348 | +xlc) |
3349 | + # This case exists only to let depend.m4 do its work. It works by |
3350 | + # looking at the text of this script. This case will never be run, |
3351 | + # since it is checked for above. |
3352 | + exit 1 |
3353 | + ;; |
3354 | + |
3355 | +aix) |
3356 | + # The C for AIX Compiler uses -M and outputs the dependencies |
3357 | + # in a .u file. In older versions, this file always lives in the |
3358 | + # current directory. Also, the AIX compiler puts '$object:' at the |
3359 | + # start of each line; $object doesn't have directory information. |
3360 | + # Version 6 uses the directory in both cases. |
3361 | + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
3362 | + test "x$dir" = "x$object" && dir= |
3363 | + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` |
3364 | + if test "$libtool" = yes; then |
3365 | + tmpdepfile1=$dir$base.u |
3366 | + tmpdepfile2=$base.u |
3367 | + tmpdepfile3=$dir.libs/$base.u |
3368 | + "$@" -Wc,-M |
3369 | + else |
3370 | + tmpdepfile1=$dir$base.u |
3371 | + tmpdepfile2=$dir$base.u |
3372 | + tmpdepfile3=$dir$base.u |
3373 | + "$@" -M |
3374 | + fi |
3375 | + stat=$? |
3376 | + |
3377 | + if test $stat -eq 0; then : |
3378 | + else |
3379 | + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" |
3380 | + exit $stat |
3381 | + fi |
3382 | + |
3383 | + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" |
3384 | + do |
3385 | + test -f "$tmpdepfile" && break |
3386 | + done |
3387 | + if test -f "$tmpdepfile"; then |
3388 | + # Each line is of the form 'foo.o: dependent.h'. |
3389 | + # Do two passes, one to just change these to |
3390 | + # '$object: dependent.h' and one to simply 'dependent.h:'. |
3391 | + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" |
3392 | + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
3393 | + else |
3394 | + # The sourcefile does not contain any dependencies, so just |
3395 | + # store a dummy comment line, to avoid errors with the Makefile |
3396 | + # "include basename.Plo" scheme. |
3397 | + echo "#dummy" > "$depfile" |
3398 | + fi |
3399 | + rm -f "$tmpdepfile" |
3400 | + ;; |
3401 | + |
3402 | +icc) |
3403 | + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. |
3404 | + # However on |
3405 | + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c |
3406 | + # ICC 7.0 will fill foo.d with something like |
3407 | + # foo.o: sub/foo.c |
3408 | + # foo.o: sub/foo.h |
3409 | + # which is wrong. We want |
3410 | + # sub/foo.o: sub/foo.c |
3411 | + # sub/foo.o: sub/foo.h |
3412 | + # sub/foo.c: |
3413 | + # sub/foo.h: |
3414 | + # ICC 7.1 will output |
3415 | + # foo.o: sub/foo.c sub/foo.h |
3416 | + # and will wrap long lines using '\': |
3417 | + # foo.o: sub/foo.c ... \ |
3418 | + # sub/foo.h ... \ |
3419 | + # ... |
3420 | + # tcc 0.9.26 (FIXME still under development at the moment of writing) |
3421 | + # will emit a similar output, but also prepend the continuation lines |
3422 | + # with horizontal tabulation characters. |
3423 | + "$@" -MD -MF "$tmpdepfile" |
3424 | + stat=$? |
3425 | + if test $stat -eq 0; then : |
3426 | + else |
3427 | + rm -f "$tmpdepfile" |
3428 | + exit $stat |
3429 | + fi |
3430 | + rm -f "$depfile" |
3431 | + # Each line is of the form 'foo.o: dependent.h', |
3432 | + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. |
3433 | + # Do two passes, one to just change these to |
3434 | + # '$object: dependent.h' and one to simply 'dependent.h:'. |
3435 | + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ |
3436 | + < "$tmpdepfile" > "$depfile" |
3437 | + sed ' |
3438 | + s/[ '"$tab"'][ '"$tab"']*/ /g |
3439 | + s/^ *// |
3440 | + s/ *\\*$// |
3441 | + s/^[^:]*: *// |
3442 | + /^$/d |
3443 | + /:$/d |
3444 | + s/$/ :/ |
3445 | + ' < "$tmpdepfile" >> "$depfile" |
3446 | + rm -f "$tmpdepfile" |
3447 | + ;; |
3448 | + |
3449 | +hp2) |
3450 | + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 |
3451 | + # compilers, which have integrated preprocessors. The correct option |
3452 | + # to use with these is +Maked; it writes dependencies to a file named |
3453 | + # 'foo.d', which lands next to the object file, wherever that |
3454 | + # happens to be. |
3455 | + # Much of this is similar to the tru64 case; see comments there. |
3456 | + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
3457 | + test "x$dir" = "x$object" && dir= |
3458 | + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` |
3459 | + if test "$libtool" = yes; then |
3460 | + tmpdepfile1=$dir$base.d |
3461 | + tmpdepfile2=$dir.libs/$base.d |
3462 | + "$@" -Wc,+Maked |
3463 | + else |
3464 | + tmpdepfile1=$dir$base.d |
3465 | + tmpdepfile2=$dir$base.d |
3466 | + "$@" +Maked |
3467 | + fi |
3468 | + stat=$? |
3469 | + if test $stat -eq 0; then : |
3470 | + else |
3471 | + rm -f "$tmpdepfile1" "$tmpdepfile2" |
3472 | + exit $stat |
3473 | + fi |
3474 | + |
3475 | + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" |
3476 | + do |
3477 | + test -f "$tmpdepfile" && break |
3478 | + done |
3479 | + if test -f "$tmpdepfile"; then |
3480 | + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" |
3481 | + # Add 'dependent.h:' lines. |
3482 | + sed -ne '2,${ |
3483 | + s/^ *// |
3484 | + s/ \\*$// |
3485 | + s/$/:/ |
3486 | + p |
3487 | + }' "$tmpdepfile" >> "$depfile" |
3488 | + else |
3489 | + echo "#dummy" > "$depfile" |
3490 | + fi |
3491 | + rm -f "$tmpdepfile" "$tmpdepfile2" |
3492 | + ;; |
3493 | + |
3494 | +tru64) |
3495 | + # The Tru64 compiler uses -MD to generate dependencies as a side |
3496 | + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. |
3497 | + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put |
3498 | + # dependencies in 'foo.d' instead, so we check for that too. |
3499 | + # Subdirectories are respected. |
3500 | + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
3501 | + test "x$dir" = "x$object" && dir= |
3502 | + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` |
3503 | + |
3504 | + if test "$libtool" = yes; then |
3505 | + # With Tru64 cc, shared objects can also be used to make a |
3506 | + # static library. This mechanism is used in libtool 1.4 series to |
3507 | + # handle both shared and static libraries in a single compilation. |
3508 | + # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. |
3509 | + # |
3510 | + # With libtool 1.5 this exception was removed, and libtool now |
3511 | + # generates 2 separate objects for the 2 libraries. These two |
3512 | + # compilations output dependencies in $dir.libs/$base.o.d and |
3513 | + # in $dir$base.o.d. We have to check for both files, because |
3514 | + # one of the two compilations can be disabled. We should prefer |
3515 | + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is |
3516 | + # automatically cleaned when .libs/ is deleted, while ignoring |
3517 | + # the former would cause a distcleancheck panic. |
3518 | + tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 |
3519 | + tmpdepfile2=$dir$base.o.d # libtool 1.5 |
3520 | + tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 |
3521 | + tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 |
3522 | + "$@" -Wc,-MD |
3523 | + else |
3524 | + tmpdepfile1=$dir$base.o.d |
3525 | + tmpdepfile2=$dir$base.d |
3526 | + tmpdepfile3=$dir$base.d |
3527 | + tmpdepfile4=$dir$base.d |
3528 | + "$@" -MD |
3529 | + fi |
3530 | + |
3531 | + stat=$? |
3532 | + if test $stat -eq 0; then : |
3533 | + else |
3534 | + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" |
3535 | + exit $stat |
3536 | + fi |
3537 | + |
3538 | + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" |
3539 | + do |
3540 | + test -f "$tmpdepfile" && break |
3541 | + done |
3542 | + if test -f "$tmpdepfile"; then |
3543 | + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" |
3544 | + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
3545 | + else |
3546 | + echo "#dummy" > "$depfile" |
3547 | + fi |
3548 | + rm -f "$tmpdepfile" |
3549 | + ;; |
3550 | + |
3551 | +msvc7) |
3552 | + if test "$libtool" = yes; then |
3553 | + showIncludes=-Wc,-showIncludes |
3554 | + else |
3555 | + showIncludes=-showIncludes |
3556 | + fi |
3557 | + "$@" $showIncludes > "$tmpdepfile" |
3558 | + stat=$? |
3559 | + grep -v '^Note: including file: ' "$tmpdepfile" |
3560 | + if test "$stat" = 0; then : |
3561 | + else |
3562 | + rm -f "$tmpdepfile" |
3563 | + exit $stat |
3564 | + fi |
3565 | + rm -f "$depfile" |
3566 | + echo "$object : \\" > "$depfile" |
3567 | + # The first sed program below extracts the file names and escapes |
3568 | + # backslashes for cygpath. The second sed program outputs the file |
3569 | + # name when reading, but also accumulates all include files in the |
3570 | + # hold buffer in order to output them again at the end. This only |
3571 | + # works with sed implementations that can handle large buffers. |
3572 | + sed < "$tmpdepfile" -n ' |
3573 | +/^Note: including file: *\(.*\)/ { |
3574 | + s//\1/ |
3575 | + s/\\/\\\\/g |
3576 | + p |
3577 | +}' | $cygpath_u | sort -u | sed -n ' |
3578 | +s/ /\\ /g |
3579 | +s/\(.*\)/'"$tab"'\1 \\/p |
3580 | +s/.\(.*\) \\/\1:/ |
3581 | +H |
3582 | +$ { |
3583 | + s/.*/'"$tab"'/ |
3584 | + G |
3585 | + p |
3586 | +}' >> "$depfile" |
3587 | + rm -f "$tmpdepfile" |
3588 | + ;; |
3589 | + |
3590 | +msvc7msys) |
3591 | + # This case exists only to let depend.m4 do its work. It works by |
3592 | + # looking at the text of this script. This case will never be run, |
3593 | + # since it is checked for above. |
3594 | + exit 1 |
3595 | + ;; |
3596 | + |
3597 | +#nosideeffect) |
3598 | + # This comment above is used by automake to tell side-effect |
3599 | + # dependency tracking mechanisms from slower ones. |
3600 | + |
3601 | +dashmstdout) |
3602 | + # Important note: in order to support this mode, a compiler *must* |
3603 | + # always write the preprocessed file to stdout, regardless of -o. |
3604 | + "$@" || exit $? |
3605 | + |
3606 | + # Remove the call to Libtool. |
3607 | + if test "$libtool" = yes; then |
3608 | + while test "X$1" != 'X--mode=compile'; do |
3609 | + shift |
3610 | + done |
3611 | + shift |
3612 | + fi |
3613 | + |
3614 | + # Remove '-o $object'. |
3615 | + IFS=" " |
3616 | + for arg |
3617 | + do |
3618 | + case $arg in |
3619 | + -o) |
3620 | + shift |
3621 | + ;; |
3622 | + $object) |
3623 | + shift |
3624 | + ;; |
3625 | + *) |
3626 | + set fnord "$@" "$arg" |
3627 | + shift # fnord |
3628 | + shift # $arg |
3629 | + ;; |
3630 | + esac |
3631 | + done |
3632 | + |
3633 | + test -z "$dashmflag" && dashmflag=-M |
3634 | + # Require at least two characters before searching for ':' |
3635 | + # in the target name. This is to cope with DOS-style filenames: |
3636 | + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. |
3637 | + "$@" $dashmflag | |
3638 | + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" |
3639 | + rm -f "$depfile" |
3640 | + cat < "$tmpdepfile" > "$depfile" |
3641 | + tr ' ' "$nl" < "$tmpdepfile" | \ |
3642 | +## Some versions of the HPUX 10.20 sed can't process this invocation |
3643 | +## correctly. Breaking it into two sed invocations is a workaround. |
3644 | + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
3645 | + rm -f "$tmpdepfile" |
3646 | + ;; |
3647 | + |
3648 | +dashXmstdout) |
3649 | + # This case only exists to satisfy depend.m4. It is never actually |
3650 | + # run, as this mode is specially recognized in the preamble. |
3651 | + exit 1 |
3652 | + ;; |
3653 | + |
3654 | +makedepend) |
3655 | + "$@" || exit $? |
3656 | + # Remove any Libtool call |
3657 | + if test "$libtool" = yes; then |
3658 | + while test "X$1" != 'X--mode=compile'; do |
3659 | + shift |
3660 | + done |
3661 | + shift |
3662 | + fi |
3663 | + # X makedepend |
3664 | + shift |
3665 | + cleared=no eat=no |
3666 | + for arg |
3667 | + do |
3668 | + case $cleared in |
3669 | + no) |
3670 | + set ""; shift |
3671 | + cleared=yes ;; |
3672 | + esac |
3673 | + if test $eat = yes; then |
3674 | + eat=no |
3675 | + continue |
3676 | + fi |
3677 | + case "$arg" in |
3678 | + -D*|-I*) |
3679 | + set fnord "$@" "$arg"; shift ;; |
3680 | + # Strip any option that makedepend may not understand. Remove |
3681 | + # the object too, otherwise makedepend will parse it as a source file. |
3682 | + -arch) |
3683 | + eat=yes ;; |
3684 | + -*|$object) |
3685 | + ;; |
3686 | + *) |
3687 | + set fnord "$@" "$arg"; shift ;; |
3688 | + esac |
3689 | + done |
3690 | + obj_suffix=`echo "$object" | sed 's/^.*\././'` |
3691 | + touch "$tmpdepfile" |
3692 | + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" |
3693 | + rm -f "$depfile" |
3694 | + # makedepend may prepend the VPATH from the source file name to the object. |
3695 | + # No need to regex-escape $object, excess matching of '.' is harmless. |
3696 | + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" |
3697 | + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ |
3698 | +## Some versions of the HPUX 10.20 sed can't process this invocation |
3699 | +## correctly. Breaking it into two sed invocations is a workaround. |
3700 | + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
3701 | + rm -f "$tmpdepfile" "$tmpdepfile".bak |
3702 | + ;; |
3703 | + |
3704 | +cpp) |
3705 | + # Important note: in order to support this mode, a compiler *must* |
3706 | + # always write the preprocessed file to stdout. |
3707 | + "$@" || exit $? |
3708 | + |
3709 | + # Remove the call to Libtool. |
3710 | + if test "$libtool" = yes; then |
3711 | + while test "X$1" != 'X--mode=compile'; do |
3712 | + shift |
3713 | + done |
3714 | + shift |
3715 | + fi |
3716 | + |
3717 | + # Remove '-o $object'. |
3718 | + IFS=" " |
3719 | + for arg |
3720 | + do |
3721 | + case $arg in |
3722 | + -o) |
3723 | + shift |
3724 | + ;; |
3725 | + $object) |
3726 | + shift |
3727 | + ;; |
3728 | + *) |
3729 | + set fnord "$@" "$arg" |
3730 | + shift # fnord |
3731 | + shift # $arg |
3732 | + ;; |
3733 | + esac |
3734 | + done |
3735 | + |
3736 | + "$@" -E | |
3737 | + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ |
3738 | + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | |
3739 | + sed '$ s: \\$::' > "$tmpdepfile" |
3740 | + rm -f "$depfile" |
3741 | + echo "$object : \\" > "$depfile" |
3742 | + cat < "$tmpdepfile" >> "$depfile" |
3743 | + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" |
3744 | + rm -f "$tmpdepfile" |
3745 | + ;; |
3746 | + |
3747 | +msvisualcpp) |
3748 | + # Important note: in order to support this mode, a compiler *must* |
3749 | + # always write the preprocessed file to stdout. |
3750 | + "$@" || exit $? |
3751 | + |
3752 | + # Remove the call to Libtool. |
3753 | + if test "$libtool" = yes; then |
3754 | + while test "X$1" != 'X--mode=compile'; do |
3755 | + shift |
3756 | + done |
3757 | + shift |
3758 | + fi |
3759 | + |
3760 | + IFS=" " |
3761 | + for arg |
3762 | + do |
3763 | + case "$arg" in |
3764 | + -o) |
3765 | + shift |
3766 | + ;; |
3767 | + $object) |
3768 | + shift |
3769 | + ;; |
3770 | + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") |
3771 | + set fnord "$@" |
3772 | + shift |
3773 | + shift |
3774 | + ;; |
3775 | + *) |
3776 | + set fnord "$@" "$arg" |
3777 | + shift |
3778 | + shift |
3779 | + ;; |
3780 | + esac |
3781 | + done |
3782 | + "$@" -E 2>/dev/null | |
3783 | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" |
3784 | + rm -f "$depfile" |
3785 | + echo "$object : \\" > "$depfile" |
3786 | + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" |
3787 | + echo "$tab" >> "$depfile" |
3788 | + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" |
3789 | + rm -f "$tmpdepfile" |
3790 | + ;; |
3791 | + |
3792 | +msvcmsys) |
3793 | + # This case exists only to let depend.m4 do its work. It works by |
3794 | + # looking at the text of this script. This case will never be run, |
3795 | + # since it is checked for above. |
3796 | + exit 1 |
3797 | + ;; |
3798 | + |
3799 | +none) |
3800 | + exec "$@" |
3801 | + ;; |
3802 | + |
3803 | +*) |
3804 | + echo "Unknown depmode $depmode" 1>&2 |
3805 | + exit 1 |
3806 | + ;; |
3807 | +esac |
3808 | + |
3809 | +exit 0 |
3810 | + |
3811 | +# Local Variables: |
3812 | +# mode: shell-script |
3813 | +# sh-indentation: 2 |
3814 | +# eval: (add-hook 'write-file-hooks 'time-stamp) |
3815 | +# time-stamp-start: "scriptversion=" |
3816 | +# time-stamp-format: "%:y-%02m-%02d.%02H" |
3817 | +# time-stamp-time-zone: "UTC" |
3818 | +# time-stamp-end: "; # UTC" |
3819 | +# End: |
3820 | |
3821 | === renamed file 'firefox-uccsconfigure.desktop' => 'firefox-uccsconfigure.desktop.in' |
3822 | --- firefox-uccsconfigure.desktop 2012-08-22 03:10:47 +0000 |
3823 | +++ firefox-uccsconfigure.desktop.in 2012-09-19 20:21:18 +0000 |
3824 | @@ -3,7 +3,8 @@ |
3825 | Name=Configure UCCS |
3826 | Comment=Configure UCCS using the web |
3827 | Keywords=Internet;WWW;Browser;Web;Explorer |
3828 | -Exec=firefox http://uccs.landscape.canonical.com/ |
3829 | +Exec=@pkgdatadir@/firefox-uccsconfigure.sh |
3830 | +TryExec=@pkgdatadir@/firefox-uccsconfigure.sh |
3831 | Terminal=false |
3832 | X-MultipleArgs=false |
3833 | Type=Application |
3834 | |
3835 | === added file 'firefox-uccsconfigure.sh' |
3836 | --- firefox-uccsconfigure.sh 1970-01-01 00:00:00 +0000 |
3837 | +++ firefox-uccsconfigure.sh 2012-09-19 20:21:18 +0000 |
3838 | @@ -0,0 +1,4 @@ |
3839 | +#!/bin/sh |
3840 | + |
3841 | +firefox -no-remote https://uccs.landscape.canonical.com/ |
3842 | +gnome-session-quit --logout --no-prompt |
3843 | |
3844 | === added file 'lightdm-remote-session-uccsconfigure.in' |
3845 | --- lightdm-remote-session-uccsconfigure.in 1970-01-01 00:00:00 +0000 |
3846 | +++ lightdm-remote-session-uccsconfigure.in 2012-09-19 20:21:18 +0000 |
3847 | @@ -0,0 +1,71 @@ |
3848 | +# vim:syntax=apparmor |
3849 | +# Profile for restricting lightdm remote session for UCCS Configuration |
3850 | +# Based on the Guest Account Apparmor script from: |
3851 | +# Author: Martin Pitt <martin.pitt@ubuntu.com> |
3852 | + |
3853 | +#include <tunables/global> |
3854 | + |
3855 | +@pkglibexecdir@/uccsconfigure-session-wrapper { |
3856 | + #include <abstractions/authentication> |
3857 | + #include <abstractions/nameservice> |
3858 | + #include <abstractions/wutmp> |
3859 | + /etc/compizconfig/config rw, # bug in compiz https://launchpad.net/bugs/697678 |
3860 | + |
3861 | + / r, |
3862 | + /bin/ rmix, |
3863 | + /bin/fusermount Px, |
3864 | + /bin/** rmix, |
3865 | + /cdrom/ rmix, |
3866 | + /cdrom/** rmix, |
3867 | + /dev/ r, |
3868 | + /dev/** rmw, # audio devices etc. |
3869 | + owner /dev/shm/** rmw, |
3870 | + /etc/ r, |
3871 | + /etc/** rmk, |
3872 | + /etc/gdm/Xsession ix, |
3873 | + /lib/ r, |
3874 | + /lib/** rmixk, |
3875 | + /lib32/ r, |
3876 | + /lib32/** rmixk, |
3877 | + /lib64/ r, |
3878 | + /lib64/** rmixk, |
3879 | + owner /media/ r, |
3880 | + owner /media/** rmwlixk, # we want access to USB sticks and the like |
3881 | + /opt/ r, |
3882 | + /opt/** rmixk, |
3883 | + @{PROC}/ r, |
3884 | + @{PROC}/* rm, |
3885 | + @{PROC}/asound rm, |
3886 | + @{PROC}/asound/** rm, |
3887 | + @{PROC}/ati rm, |
3888 | + @{PROC}/ati/** rm, |
3889 | + owner @{PROC}/** rm, |
3890 | + # needed for gnome-keyring-daemon |
3891 | + @{PROC}/*/status r, |
3892 | + /sbin/ r, |
3893 | + /sbin/** rmixk, |
3894 | + /sys/ r, |
3895 | + /sys/** rm, |
3896 | + /tmp/ rw, |
3897 | + owner /tmp/** rwlkmix, |
3898 | + /usr/ r, |
3899 | + /usr/** rmixk, |
3900 | + /var/ r, |
3901 | + /var/** rmixk, |
3902 | + /var/guest-data/** rw, # allow to store files permanently |
3903 | + /var/tmp/ rw, |
3904 | + owner /var/tmp/** rwlkm, |
3905 | + /{,var/}run/ r, |
3906 | + # necessary for writing to sockets, etc. |
3907 | + /{,var/}run/** rmkix, |
3908 | + /{,var/}run/shm/** wl, |
3909 | + |
3910 | + capability ipc_lock, |
3911 | + |
3912 | + # silence warnings for stuff that we really don't want to grant |
3913 | + deny capability dac_override, |
3914 | + deny capability dac_read_search, |
3915 | + #deny /etc/** w, # re-enable once LP#697678 is fixed |
3916 | + deny /usr/** w, |
3917 | + deny /var/crash/ w, |
3918 | +} |
3919 | |
3920 | === added file 'uccsconfigure-session-wrapper.c' |
3921 | --- uccsconfigure-session-wrapper.c 1970-01-01 00:00:00 +0000 |
3922 | +++ uccsconfigure-session-wrapper.c 2012-09-19 20:21:18 +0000 |
3923 | @@ -0,0 +1,32 @@ |
3924 | +/* |
3925 | + * Copyright © 2012 Canonical Ltd. |
3926 | + * |
3927 | + * This program is free software: you can redistribute it and/or modify it |
3928 | + * under the terms of the GNU General Public License version 3, as |
3929 | + * published by the Free Software Foundation. |
3930 | + * |
3931 | + * This program is distributed in the hope that it will be useful, but |
3932 | + * WITHOUT ANY WARRANTY; without even the implied warranties of |
3933 | + * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR |
3934 | + * PURPOSE. See the GNU General Public License for more details. |
3935 | + * |
3936 | + * You should have received a copy of the GNU General Public License along |
3937 | + * with this program. If not, see <http://www.gnu.org/licenses/>. |
3938 | + * |
3939 | + * Author: Ted Gould <ted@canonical.com> |
3940 | + */ |
3941 | + |
3942 | +#include <stdlib.h> |
3943 | +#include <unistd.h> |
3944 | + |
3945 | +int |
3946 | +main (int argc, char * argv[]) |
3947 | +{ |
3948 | + char * args[2]; |
3949 | + args[0] = PKGDATADIR "/uccsconfigure-session"; |
3950 | + args[1] = NULL; |
3951 | + |
3952 | + execvp(args[0], args); |
3953 | + |
3954 | + return 0; |
3955 | +} |
3956 | |
3957 | === modified file 'uccsconfigure-session.in' |
3958 | --- uccsconfigure-session.in 2012-08-22 04:04:34 +0000 |
3959 | +++ uccsconfigure-session.in 2012-09-19 20:21:18 +0000 |
3960 | @@ -1,14 +1,30 @@ |
3961 | #!/bin/bash |
3962 | +# Copyright © 2012 Canonical Ltd. |
3963 | +# |
3964 | +# This program is free software: you can redistribute it and/or modify it |
3965 | +# under the terms of the GNU General Public License version 3, as |
3966 | +# published by the Free Software Foundation. |
3967 | +# |
3968 | +# This program is distributed in the hope that it will be useful, but |
3969 | +# WITHOUT ANY WARRANTY; without even the implied warranties of |
3970 | +# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR |
3971 | +# PURPOSE. See the GNU General Public License for more details. |
3972 | +# |
3973 | +# You should have received a copy of the GNU General Public License along |
3974 | +# with this program. If not, see <http://www.gnu.org/licenses/>. |
3975 | +# |
3976 | +# Author: Ted Gould <ted@canonical.com> |
3977 | |
3978 | # Set up a Firefox autostart |
3979 | mkdir -p ~/.config/autostart/ |
3980 | cp @pkgdatadir@/firefox-uccsconfigure.desktop ~/.config/autostart/ |
3981 | |
3982 | -# Set up the Unity environment |
3983 | -export DESKTOP_SESSION="ubuntu" |
3984 | -export GDMSESSION="ubuntu" |
3985 | -export XDG_CURRENT_DESKTOP="Unity" |
3986 | +# Set up the Compiz profile |
3987 | export COMPIZ_CONFIG_PROFILE="ubuntu" |
3988 | |
3989 | +# Unity Configurations |
3990 | +gsettings set org.compiz.unityshell:/org/compiz/profiles/unity/plugins/unityshell/ launcher-hide-mode 1 |
3991 | +gsettings set org.compiz.unityshell:/org/compiz/profiles/unity/plugins/unityshell/ automaximize-value 1 |
3992 | + |
3993 | # Final thing is to run the standard Unity session |
3994 | exec gnome-session --session=ubuntu |
3995 | |
3996 | === modified file 'uccsconfigure.desktop.in' |
3997 | --- uccsconfigure.desktop.in 2012-08-22 14:09:46 +0000 |
3998 | +++ uccsconfigure.desktop.in 2012-09-19 20:21:18 +0000 |
3999 | @@ -1,8 +1,8 @@ |
4000 | [Desktop Entry] |
4001 | Name=UCCS Configure |
4002 | Comment=Setup a UCCS Account |
4003 | -Exec=@pkgdatadir@/uccsconfigure-session |
4004 | -TryExec=@pkgdatadir@/uccsconfigure-session |
4005 | +Exec=@pkglibexecdir@/uccsconfigure-session-wrapper |
4006 | +TryExec=@pkglibexecdir@/uccsconfigure-session-wrapper |
4007 | Icon= |
4008 | Type=Application |
4009 | X-LightDM-PAM-Service=lightdm-remote-uccsconfigure |