Codebase list dillo / upstream/3.0.5_rc1
Imported Upstream version 3.0.5~rc1 Axel Beckert 8 years ago
70 changed file(s) with 3491 addition(s) and 4353 deletion(s). Raw diff Collapse all Expand all
+25
-0
ChangeLog less more
44 Here we list changes that are relatively significant and/or visible to the
55 user. For a history of changes in full detail, see our Mercurial repository
66 at http://hg.dillo.org/dillo
7
8 dillo-3.0.5 [not released yet]
9
10 +- Image buffer/cache improvements.
11 - Fix for segfault when there's no dpid and view source is requested.
12 - Fix view-source dpi to handle null characters correctly.
13 - Made view-source dpi use CSS formatting (it's shorter and cleaner).
14 Patches: Jorge Arellano Cid
15 +- Crosscompile/buildroot-friendly fltk-config test.
16 Patch: Peter Seiderer
17 +- Fix X11 icon name.
18 - In location bar, tend toward showing beginning of URL instead of end.
19 - Handle irix's version of vsnprintf().
20 - INPUT, TEXTAREA placeholder attribute.
21 - Better notification when user's domainrc settings block page redirection.
22 - Fix bug with font_factor preference and CSS font-size:(larger|smaller).
23 - Recognize Menu key in keysrc.
24 - HTTPS: change cipher list to "ALL:!aNULL:!eNULL:!LOW:!EXPORT40:!RC4",
25 disable SSL3, disable TLS compression.
26 Patches: corvid
27 +- Avoid requesting background images if an ancestor has display:none.
28 - Ignore built-in search url if any are specified in dillorc.
29 Patches: Johannes Hofmann
30
31 -----------------------------------------------------------------------------
732
833 dillo-3.0.4.1 [December 24, 2014]
934
+146
-181
Makefile.in less more
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.11.6 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
3 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5 # Foundation, Inc.
56 # This Makefile.in is free software; the Free Software Foundation
67 # gives unlimited permission to copy and/or distribute it,
78 # with or without modifications, as long as this notice is preserved.
1516
1617
1718 VPATH = @srcdir@
18 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
19 am__make_running_with_option = \
20 case $${target_option-} in \
21 ?) ;; \
22 *) echo "am__make_running_with_option: internal error: invalid" \
23 "target option '$${target_option-}' specified" >&2; \
24 exit 1;; \
25 esac; \
26 has_opt=no; \
27 sane_makeflags=$$MAKEFLAGS; \
28 if $(am__is_gnu_make); then \
29 sane_makeflags=$$MFLAGS; \
30 else \
19 am__make_dryrun = \
20 { \
21 am__dry=no; \
3122 case $$MAKEFLAGS in \
3223 *\\[\ \ ]*) \
33 bs=\\; \
34 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
35 | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
24 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
25 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
26 *) \
27 for am__flg in $$MAKEFLAGS; do \
28 case $$am__flg in \
29 *=*|--*) ;; \
30 *n*) am__dry=yes; break;; \
31 esac; \
32 done;; \
3633 esac; \
37 fi; \
38 skip_next=no; \
39 strip_trailopt () \
40 { \
41 flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
42 }; \
43 for flg in $$sane_makeflags; do \
44 test $$skip_next = yes && { skip_next=no; continue; }; \
45 case $$flg in \
46 *=*|--*) continue;; \
47 -*I) strip_trailopt 'I'; skip_next=yes;; \
48 -*I?*) strip_trailopt 'I';; \
49 -*O) strip_trailopt 'O'; skip_next=yes;; \
50 -*O?*) strip_trailopt 'O';; \
51 -*l) strip_trailopt 'l'; skip_next=yes;; \
52 -*l?*) strip_trailopt 'l';; \
53 -[dEDm]) skip_next=yes;; \
54 -[JT]) skip_next=yes;; \
55 esac; \
56 case $$flg in \
57 *$$target_option*) has_opt=yes; break;; \
58 esac; \
59 done; \
60 test $$has_opt = yes
61 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
62 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
34 test $$am__dry = yes; \
35 }
6336 pkgdatadir = $(datadir)/@PACKAGE@
6437 pkgincludedir = $(includedir)/@PACKAGE@
6538 pkglibdir = $(libdir)/@PACKAGE@
8053 host_triplet = @host@
8154 target_triplet = @target@
8255 subdir = .
83 DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
84 $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
85 $(top_srcdir)/configure $(am__configure_deps) \
86 $(srcdir)/config.h.in $(dist_bin_SCRIPTS) COPYING compile \
87 config.guess config.sub depcomp install-sh missing
56 DIST_COMMON = README $(am__configure_deps) $(dist_bin_SCRIPTS) \
57 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
58 $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
59 ChangeLog INSTALL NEWS config.guess config.sub depcomp \
60 install-sh missing
8861 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8962 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
9063 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
12497 }
12598 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sysconfdir)"
12699 SCRIPTS = $(dist_bin_SCRIPTS)
127 AM_V_P = $(am__v_P_@AM_V@)
128 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
129 am__v_P_0 = false
130 am__v_P_1 = :
131 AM_V_GEN = $(am__v_GEN_@AM_V@)
132 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
133 am__v_GEN_0 = @echo " GEN " $@;
134 am__v_GEN_1 =
135 AM_V_at = $(am__v_at_@AM_V@)
136 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
137 am__v_at_0 = @
138 am__v_at_1 =
139100 SOURCES =
140101 DIST_SOURCES =
141 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
142 ctags-recursive dvi-recursive html-recursive info-recursive \
143 install-data-recursive install-dvi-recursive \
144 install-exec-recursive install-html-recursive \
145 install-info-recursive install-pdf-recursive \
146 install-ps-recursive install-recursive installcheck-recursive \
147 installdirs-recursive pdf-recursive ps-recursive \
148 tags-recursive uninstall-recursive
102 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
103 html-recursive info-recursive install-data-recursive \
104 install-dvi-recursive install-exec-recursive \
105 install-html-recursive install-info-recursive \
106 install-pdf-recursive install-ps-recursive install-recursive \
107 installcheck-recursive installdirs-recursive pdf-recursive \
108 ps-recursive uninstall-recursive
149109 am__can_run_installinfo = \
150110 case $$AM_UPDATE_INFO_DIR in \
151111 n|no|NO) false;; \
154114 DATA = $(sysconf_DATA)
155115 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
156116 distclean-recursive maintainer-clean-recursive
157 am__recursive_targets = \
158 $(RECURSIVE_TARGETS) \
159 $(RECURSIVE_CLEAN_TARGETS) \
160 $(am__extra_recursive_targets)
161 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
162 cscope distdir dist dist-all distcheck
163 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
164 $(LISP)config.h.in
165 # Read a list of newline-separated strings from the standard input,
166 # and print each of them once, without duplicates. Input order is
167 # *not* preserved.
168 am__uniquify_input = $(AWK) '\
169 BEGIN { nonempty = 0; } \
170 { items[$$0] = 1; nonempty = 1; } \
171 END { if (nonempty) { for (i in items) print i; }; } \
172 '
173 # Make sure the list of sources is unique. This is necessary because,
174 # e.g., the same source file might be shared among _SOURCES variables
175 # for different programs/libraries.
176 am__define_uniq_tagged_files = \
177 list='$(am__tagged_files)'; \
178 unique=`for i in $$list; do \
179 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
180 done | $(am__uniquify_input)`
117 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
118 $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
119 distdir dist dist-all distcheck
181120 ETAGS = etags
182121 CTAGS = ctags
183 CSCOPE = cscope
184122 DIST_SUBDIRS = $(SUBDIRS)
185123 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
186124 distdir = $(PACKAGE)-$(VERSION)
191129 && rm -rf "$(distdir)" \
192130 || { sleep 5 && rm -rf "$(distdir)"; }; \
193131 else :; fi
194 am__post_remove_distdir = $(am__remove_distdir)
195132 am__relativize = \
196133 dir0=`pwd`; \
197134 sed_first='s,^\([^/]*\)/.*$$,\1,'; \
219156 reldir="$$dir2"
220157 DIST_ARCHIVES = $(distdir).tar.gz
221158 GZIP_ENV = --best
222 DIST_TARGETS = dist-gzip
223159 distuninstallcheck_listfiles = find . -type f -print
224160 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
225161 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
226162 distcleancheck_listfiles = find . -type f -print
227163 ACLOCAL = @ACLOCAL@
228164 AMTAR = @AMTAR@
229 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
230165 AUTOCONF = @AUTOCONF@
231166 AUTOHEADER = @AUTOHEADER@
232167 AUTOMAKE = @AUTOMAKE@
247182 ECHO_T = @ECHO_T@
248183 EGREP = @EGREP@
249184 EXEEXT = @EXEEXT@
185 FLTK_CONFIG = @FLTK_CONFIG@
250186 GREP = @GREP@
251187 INSTALL = @INSTALL@
252188 INSTALL_DATA = @INSTALL_DATA@
386322 $(am__aclocal_m4_deps):
387323
388324 config.h: stamp-h1
389 @test -f $@ || rm -f stamp-h1
390 @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
325 @if test ! -f $@; then rm -f stamp-h1; else :; fi
326 @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
391327
392328 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
393329 @rm -f stamp-h1
457393 dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
458394
459395 # This directory's subdirectories are mostly independent; you can cd
460 # into them and run 'make' without going through this Makefile.
461 # To change the values of 'make' variables: instead of editing Makefiles,
462 # (1) if the variable is set in 'config.status', edit 'config.status'
463 # (which will cause the Makefiles to be regenerated when you run 'make');
464 # (2) otherwise, pass the desired values on the 'make' command line.
465 $(am__recursive_targets):
466 @fail=; \
467 if $(am__make_keepgoing); then \
468 failcom='fail=yes'; \
469 else \
470 failcom='exit 1'; \
471 fi; \
396 # into them and run `make' without going through this Makefile.
397 # To change the values of `make' variables: instead of editing Makefiles,
398 # (1) if the variable is set in `config.status', edit `config.status'
399 # (which will cause the Makefiles to be regenerated when you run `make');
400 # (2) otherwise, pass the desired values on the `make' command line.
401 $(RECURSIVE_TARGETS):
402 @fail= failcom='exit 1'; \
403 for f in x $$MAKEFLAGS; do \
404 case $$f in \
405 *=* | --[!k]*);; \
406 *k*) failcom='fail=yes';; \
407 esac; \
408 done; \
472409 dot_seen=no; \
473410 target=`echo $@ | sed s/-recursive//`; \
474 case "$@" in \
475 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
476 *) list='$(SUBDIRS)' ;; \
477 esac; \
478 for subdir in $$list; do \
411 list='$(SUBDIRS)'; for subdir in $$list; do \
479412 echo "Making $$target in $$subdir"; \
480413 if test "$$subdir" = "."; then \
481414 dot_seen=yes; \
490423 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
491424 fi; test -z "$$fail"
492425
493 ID: $(am__tagged_files)
494 $(am__define_uniq_tagged_files); mkid -fID $$unique
495 tags: tags-recursive
496 TAGS: tags
497
498 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
426 $(RECURSIVE_CLEAN_TARGETS):
427 @fail= failcom='exit 1'; \
428 for f in x $$MAKEFLAGS; do \
429 case $$f in \
430 *=* | --[!k]*);; \
431 *k*) failcom='fail=yes';; \
432 esac; \
433 done; \
434 dot_seen=no; \
435 case "$@" in \
436 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
437 *) list='$(SUBDIRS)' ;; \
438 esac; \
439 rev=''; for subdir in $$list; do \
440 if test "$$subdir" = "."; then :; else \
441 rev="$$subdir $$rev"; \
442 fi; \
443 done; \
444 rev="$$rev ."; \
445 target=`echo $@ | sed s/-recursive//`; \
446 for subdir in $$rev; do \
447 echo "Making $$target in $$subdir"; \
448 if test "$$subdir" = "."; then \
449 local_target="$$target-am"; \
450 else \
451 local_target="$$target"; \
452 fi; \
453 ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
454 || eval $$failcom; \
455 done && test -z "$$fail"
456 tags-recursive:
457 list='$(SUBDIRS)'; for subdir in $$list; do \
458 test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
459 done
460 ctags-recursive:
461 list='$(SUBDIRS)'; for subdir in $$list; do \
462 test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
463 done
464
465 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
466 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
467 unique=`for i in $$list; do \
468 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
469 done | \
470 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
471 END { if (nonempty) { for (i in files) print i; }; }'`; \
472 mkid -fID $$unique
473 tags: TAGS
474
475 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
476 $(TAGS_FILES) $(LISP)
499477 set x; \
500478 here=`pwd`; \
501479 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
511489 set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
512490 fi; \
513491 done; \
514 $(am__define_uniq_tagged_files); \
492 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
493 unique=`for i in $$list; do \
494 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
495 done | \
496 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
497 END { if (nonempty) { for (i in files) print i; }; }'`; \
515498 shift; \
516499 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
517500 test -n "$$unique" || unique=$$empty_fix; \
523506 $$unique; \
524507 fi; \
525508 fi
526 ctags: ctags-recursive
527
528 CTAGS: ctags
529 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
530 $(am__define_uniq_tagged_files); \
509 ctags: CTAGS
510 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
511 $(TAGS_FILES) $(LISP)
512 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
513 unique=`for i in $$list; do \
514 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
515 done | \
516 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
517 END { if (nonempty) { for (i in files) print i; }; }'`; \
531518 test -z "$(CTAGS_ARGS)$$unique" \
532519 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
533520 $$unique
536523 here=`$(am__cd) $(top_builddir) && pwd` \
537524 && $(am__cd) $(top_srcdir) \
538525 && gtags -i $(GTAGS_ARGS) "$$here"
539 cscope: cscope.files
540 test ! -s cscope.files \
541 || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
542 clean-cscope:
543 -rm -f cscope.files
544 cscope.files: clean-cscope cscopelist
545 cscopelist: cscopelist-recursive
546
547 cscopelist-am: $(am__tagged_files)
548 list='$(am__tagged_files)'; \
549 case "$(srcdir)" in \
550 [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
551 *) sdir=$(subdir)/$(srcdir) ;; \
552 esac; \
553 for i in $$list; do \
554 if test -f "$$i"; then \
555 echo "$(subdir)/$$i"; \
556 else \
557 echo "$$sdir/$$i"; \
558 fi; \
559 done >> $(top_builddir)/cscope.files
560526
561527 distclean-tags:
562528 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
563 -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
564529
565530 distdir: $(DISTFILES)
566531 $(am__remove_distdir)
628593 || chmod -R a+r "$(distdir)"
629594 dist-gzip: distdir
630595 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
631 $(am__post_remove_distdir)
596 $(am__remove_distdir)
632597
633598 dist-bzip2: distdir
634599 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
635 $(am__post_remove_distdir)
600 $(am__remove_distdir)
636601
637602 dist-lzip: distdir
638603 tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
639 $(am__post_remove_distdir)
604 $(am__remove_distdir)
605
606 dist-lzma: distdir
607 tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
608 $(am__remove_distdir)
640609
641610 dist-xz: distdir
642611 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
643 $(am__post_remove_distdir)
612 $(am__remove_distdir)
644613
645614 dist-tarZ: distdir
646 @echo WARNING: "Support for shar distribution archives is" \
647 "deprecated." >&2
648 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
649615 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
650 $(am__post_remove_distdir)
616 $(am__remove_distdir)
651617
652618 dist-shar: distdir
653 @echo WARNING: "Support for distribution archives compressed with" \
654 "legacy program 'compress' is deprecated." >&2
655 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
656619 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
657 $(am__post_remove_distdir)
620 $(am__remove_distdir)
658621
659622 dist-zip: distdir
660623 -rm -f $(distdir).zip
661624 zip -rq $(distdir).zip $(distdir)
662 $(am__post_remove_distdir)
663
664 dist dist-all:
665 $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
666 $(am__post_remove_distdir)
625 $(am__remove_distdir)
626
627 dist dist-all: distdir
628 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
629 $(am__remove_distdir)
667630
668631 # This target untars the dist file and tries a VPATH configuration. Then
669632 # it guarantees that the distribution is self-contained by making another
674637 GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
675638 *.tar.bz2*) \
676639 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
640 *.tar.lzma*) \
641 lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
677642 *.tar.lz*) \
678643 lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
679644 *.tar.xz*) \
685650 *.zip*) \
686651 unzip $(distdir).zip ;;\
687652 esac
688 chmod -R a-w $(distdir)
689 chmod u+w $(distdir)
690 mkdir $(distdir)/_build $(distdir)/_inst
653 chmod -R a-w $(distdir); chmod u+w $(distdir)
654 mkdir $(distdir)/_build
655 mkdir $(distdir)/_inst
691656 chmod a-w $(distdir)
692657 test -d $(distdir)/_build || exit 0; \
693658 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
694659 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
695660 && am__cwd=`pwd` \
696661 && $(am__cd) $(distdir)/_build \
697 && ../configure \
662 && ../configure --srcdir=.. --prefix="$$dc_install_base" \
698663 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
699664 $(DISTCHECK_CONFIGURE_FLAGS) \
700 --srcdir=.. --prefix="$$dc_install_base" \
701665 && $(MAKE) $(AM_MAKEFLAGS) \
702666 && $(MAKE) $(AM_MAKEFLAGS) dvi \
703667 && $(MAKE) $(AM_MAKEFLAGS) check \
720684 && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
721685 && cd "$$am__cwd" \
722686 || exit 1
723 $(am__post_remove_distdir)
687 $(am__remove_distdir)
724688 @(echo "$(distdir) archives ready for distribution: "; \
725689 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
726690 sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
857821
858822 uninstall-am: uninstall-dist_binSCRIPTS uninstall-sysconfDATA
859823
860 .MAKE: $(am__recursive_targets) all install-am install-strip
861
862 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
863 am--refresh check check-am clean clean-cscope clean-generic \
864 cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
865 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
824 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
825 ctags-recursive install-am install-strip tags-recursive
826
827 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
828 all all-am am--refresh check check-am clean clean-generic \
829 ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
830 dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
866831 distcheck distclean distclean-generic distclean-hdr \
867832 distclean-tags distcleancheck distdir distuninstallcheck dvi \
868833 dvi-am html html-am info info-am install install-am \
873838 install-ps-am install-strip install-sysconfDATA installcheck \
874839 installcheck-am installdirs installdirs-am maintainer-clean \
875840 maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
876 pdf-am ps ps-am tags tags-am uninstall uninstall-am \
841 pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
877842 uninstall-dist_binSCRIPTS uninstall-sysconfDATA
878843
879844
+4
-0
NEWS less more
4545
4646 dillo-3.0.4, a new release for the new 3.x series is out.
4747
48 Dec 2014
49
50 dillo-3.0.4.1, a new release for the new 3.x series is out.
51
4852
4953 Jorge.-
5054 jcid@dillo.org
+2
-2
README less more
5252 Dillo3
5353 ------
5454
55 tar jxvf dillo-3.0.4.1.tar.bz2
56 cd dillo-3.0.4.1
55 tar jxvf dillo-3.0.5.tar.bz2
56 cd dillo-3.0.5
5757 ./configure; make
5858 sudo make install-strip
5959
+330
-508
aclocal.m4 less more
0 # generated automatically by aclocal 1.14.1 -*- Autoconf -*-
1
2 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
3
0 # generated automatically by aclocal 1.11.6 -*- Autoconf -*-
1
2 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
3 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
4 # Inc.
45 # This file is free software; the Free Software Foundation
56 # gives unlimited permission to copy and/or distribute it,
67 # with or without modifications, as long as this notice is preserved.
1011 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1112 # PARTICULAR PURPOSE.
1213
13 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
1414 m4_ifndef([AC_AUTOCONF_VERSION],
1515 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
1616 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
1717 [m4_warning([this file was generated for autoconf 2.69.
1818 You have another version of autoconf. It may work, but is not guaranteed to.
1919 If you have problems, you may need to regenerate the build system entirely.
20 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
21
22 # Copyright (C) 2002-2013 Free Software Foundation, Inc.
23 #
24 # This file is free software; the Free Software Foundation
25 # gives unlimited permission to copy and/or distribute it,
26 # with or without modifications, as long as this notice is preserved.
20 To do so, use the procedure documented by the package, typically `autoreconf'.])])
21
22 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
23 # Foundation, Inc.
24 #
25 # This file is free software; the Free Software Foundation
26 # gives unlimited permission to copy and/or distribute it,
27 # with or without modifications, as long as this notice is preserved.
28
29 # serial 1
2730
2831 # AM_AUTOMAKE_VERSION(VERSION)
2932 # ----------------------------
3134 # generated from the m4 files accompanying Automake X.Y.
3235 # (This private macro should not be called outside this file.)
3336 AC_DEFUN([AM_AUTOMAKE_VERSION],
34 [am__api_version='1.14'
37 [am__api_version='1.11'
3538 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
3639 dnl require some minimum version. Point them to the right macro.
37 m4_if([$1], [1.14.1], [],
40 m4_if([$1], [1.11.6], [],
3841 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
3942 ])
4043
5053 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
5154 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
5255 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
53 [AM_AUTOMAKE_VERSION([1.14.1])dnl
56 [AM_AUTOMAKE_VERSION([1.11.6])dnl
5457 m4_ifndef([AC_AUTOCONF_VERSION],
5558 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
5659 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
5760
5861 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
5962
60 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
61 #
62 # This file is free software; the Free Software Foundation
63 # gives unlimited permission to copy and/or distribute it,
64 # with or without modifications, as long as this notice is preserved.
63 # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
64 #
65 # This file is free software; the Free Software Foundation
66 # gives unlimited permission to copy and/or distribute it,
67 # with or without modifications, as long as this notice is preserved.
68
69 # serial 1
6570
6671 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
67 # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
68 # '$srcdir', '$srcdir/..', or '$srcdir/../..'.
72 # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
73 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
6974 #
7075 # Of course, Automake must honor this variable whenever it calls a
7176 # tool from the auxiliary directory. The problem is that $srcdir (and
8489 #
8590 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
8691 # are both prefixed by $srcdir. In an in-source build this is usually
87 # harmless because $srcdir is '.', but things will broke when you
92 # harmless because $srcdir is `.', but things will broke when you
8893 # start a VPATH build or use an absolute $srcdir.
8994 #
9095 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
102107 # configured tree to be moved without reconfiguration.
103108
104109 AC_DEFUN([AM_AUX_DIR_EXPAND],
105 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
106 # Expand $ac_aux_dir to an absolute path.
107 am_aux_dir=`cd "$ac_aux_dir" && pwd`
110 [dnl Rely on autoconf to set up CDPATH properly.
111 AC_PREREQ([2.50])dnl
112 # expand $ac_aux_dir to an absolute path
113 am_aux_dir=`cd $ac_aux_dir && pwd`
108114 ])
109115
110116 # AM_CONDITIONAL -*- Autoconf -*-
111117
112 # Copyright (C) 1997-2013 Free Software Foundation, Inc.
113 #
114 # This file is free software; the Free Software Foundation
115 # gives unlimited permission to copy and/or distribute it,
116 # with or without modifications, as long as this notice is preserved.
118 # Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
119 # Free Software Foundation, Inc.
120 #
121 # This file is free software; the Free Software Foundation
122 # gives unlimited permission to copy and/or distribute it,
123 # with or without modifications, as long as this notice is preserved.
124
125 # serial 9
117126
118127 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
119128 # -------------------------------------
120129 # Define a conditional.
121130 AC_DEFUN([AM_CONDITIONAL],
122 [AC_PREREQ([2.52])dnl
123 m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
124 [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
131 [AC_PREREQ(2.52)dnl
132 ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
133 [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
125134 AC_SUBST([$1_TRUE])dnl
126135 AC_SUBST([$1_FALSE])dnl
127136 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
140149 Usually this means the macro was only invoked conditionally.]])
141150 fi])])
142151
143 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
144 #
145 # This file is free software; the Free Software Foundation
146 # gives unlimited permission to copy and/or distribute it,
147 # with or without modifications, as long as this notice is preserved.
148
149
150 # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
152 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
153 # 2010, 2011 Free Software Foundation, Inc.
154 #
155 # This file is free software; the Free Software Foundation
156 # gives unlimited permission to copy and/or distribute it,
157 # with or without modifications, as long as this notice is preserved.
158
159 # serial 12
160
161 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
151162 # written in clear, in which case automake, when reading aclocal.m4,
152163 # will think it sees a *use*, and therefore will trigger all it's
153164 # C support machinery. Also note that it means that autoscan, seeing
157168 # _AM_DEPENDENCIES(NAME)
158169 # ----------------------
159170 # See how the compiler implements dependency checking.
160 # NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
171 # NAME is "CC", "CXX", "GCJ", or "OBJC".
161172 # We try a few techniques and use that to set a single cache variable.
162173 #
163174 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
170181 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
171182 AC_REQUIRE([AM_DEP_TRACK])dnl
172183
173 m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
174 [$1], [CXX], [depcc="$CXX" am_compiler_list=],
175 [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
176 [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
177 [$1], [UPC], [depcc="$UPC" am_compiler_list=],
178 [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
179 [depcc="$$1" am_compiler_list=])
184 ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
185 [$1], CXX, [depcc="$CXX" am_compiler_list=],
186 [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
187 [$1], UPC, [depcc="$UPC" am_compiler_list=],
188 [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
189 [depcc="$$1" am_compiler_list=])
180190
181191 AC_CACHE_CHECK([dependency style of $depcc],
182192 [am_cv_$1_dependencies_compiler_type],
184194 # We make a subdir and do the tests there. Otherwise we can end up
185195 # making bogus files that we don't know about and never remove. For
186196 # instance it was reported that on HP-UX the gcc test will end up
187 # making a dummy file named 'D' -- because '-MD' means "put the output
188 # in D".
197 # making a dummy file named `D' -- because `-MD' means `put the output
198 # in D'.
189199 rm -rf conftest.dir
190200 mkdir conftest.dir
191201 # Copy depcomp to subdir because otherwise we won't find it if we're
225235 : > sub/conftest.c
226236 for i in 1 2 3 4 5 6; do
227237 echo '#include "conftst'$i'.h"' >> sub/conftest.c
228 # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
229 # Solaris 10 /bin/sh.
230 echo '/* dummy */' > sub/conftst$i.h
238 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
239 # Solaris 8's {/usr,}/bin/sh.
240 touch sub/conftst$i.h
231241 done
232242 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
233243
234 # We check with '-c' and '-o' for the sake of the "dashmstdout"
244 # We check with `-c' and `-o' for the sake of the "dashmstdout"
235245 # mode. It turns out that the SunPro C++ compiler does not properly
236 # handle '-M -o', and we need to detect this. Also, some Intel
237 # versions had trouble with output in subdirs.
246 # handle `-M -o', and we need to detect this. Also, some Intel
247 # versions had trouble with output in subdirs
238248 am__obj=sub/conftest.${OBJEXT-o}
239249 am__minus_obj="-o $am__obj"
240250 case $depmode in
243253 test "$am__universal" = false || continue
244254 ;;
245255 nosideeffect)
246 # After this tag, mechanisms are not by side-effect, so they'll
247 # only be used when explicitly requested.
256 # after this tag, mechanisms are not by side-effect, so they'll
257 # only be used when explicitly requested
248258 if test "x$enable_dependency_tracking" = xyes; then
249259 continue
250260 else
252262 fi
253263 ;;
254264 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
255 # This compiler won't grok '-c -o', but also, the minuso test has
265 # This compiler won't grok `-c -o', but also, the minuso test has
256266 # not run yet. These depmodes are late enough in the game, and
257267 # so weak that their functioning should not be impacted.
258268 am__obj=conftest.${OBJEXT-o}
300310 # AM_SET_DEPDIR
301311 # -------------
302312 # Choose a directory name for dependency files.
303 # This macro is AC_REQUIREd in _AM_DEPENDENCIES.
313 # This macro is AC_REQUIREd in _AM_DEPENDENCIES
304314 AC_DEFUN([AM_SET_DEPDIR],
305315 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
306316 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
310320 # AM_DEP_TRACK
311321 # ------------
312322 AC_DEFUN([AM_DEP_TRACK],
313 [AC_ARG_ENABLE([dependency-tracking], [dnl
314 AS_HELP_STRING(
315 [--enable-dependency-tracking],
316 [do not reject slow dependency extractors])
317 AS_HELP_STRING(
318 [--disable-dependency-tracking],
319 [speeds up one-time build])])
323 [AC_ARG_ENABLE(dependency-tracking,
324 [ --disable-dependency-tracking speeds up one-time build
325 --enable-dependency-tracking do not reject slow dependency extractors])
320326 if test "x$enable_dependency_tracking" != xno; then
321327 am_depcomp="$ac_aux_dir/depcomp"
322328 AMDEPBACKSLASH='\'
331337
332338 # Generate code to set up dependency tracking. -*- Autoconf -*-
333339
334 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
335 #
336 # This file is free software; the Free Software Foundation
337 # gives unlimited permission to copy and/or distribute it,
338 # with or without modifications, as long as this notice is preserved.
339
340 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
341 # Free Software Foundation, Inc.
342 #
343 # This file is free software; the Free Software Foundation
344 # gives unlimited permission to copy and/or distribute it,
345 # with or without modifications, as long as this notice is preserved.
346
347 #serial 5
340348
341349 # _AM_OUTPUT_DEPENDENCY_COMMANDS
342350 # ------------------------------
343351 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
344352 [{
345 # Older Autoconf quotes --file arguments for eval, but not when files
353 # Autoconf 2.62 quotes --file arguments for eval, but not when files
346354 # are listed without --file. Let's play safe and only enable the eval
347355 # if we detect the quoting.
348356 case $CONFIG_FILES in
355363 # Strip MF so we end up with the name of the file.
356364 mf=`echo "$mf" | sed -e 's/:.*$//'`
357365 # Check whether this is an Automake generated Makefile or not.
358 # We used to match only the files named 'Makefile.in', but
366 # We used to match only the files named `Makefile.in', but
359367 # some people rename them; so instead we look at the file content.
360368 # Grep'ing the first line is not enough: some people post-process
361369 # each Makefile.in and add a new line on top of each file to say so.
367375 continue
368376 fi
369377 # Extract the definition of DEPDIR, am__include, and am__quote
370 # from the Makefile without running 'make'.
378 # from the Makefile without running `make'.
371379 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
372380 test -z "$DEPDIR" && continue
373381 am__include=`sed -n 's/^am__include = //p' < "$mf"`
374 test -z "$am__include" && continue
382 test -z "am__include" && continue
375383 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
384 # When using ansi2knr, U may be empty or an underscore; expand it
385 U=`sed -n 's/^U = //p' < "$mf"`
376386 # Find all dependency output files, they are included files with
377387 # $(DEPDIR) in their names. We invoke sed twice because it is the
378388 # simplest approach to changing $(DEPDIR) to its actual value in the
379389 # expansion.
380390 for file in `sed -n "
381391 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
382 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
392 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
383393 # Make sure the directory exists.
384394 test -f "$dirpart/$file" && continue
385395 fdir=`AS_DIRNAME(["$file"])`
397407 # This macro should only be invoked once -- use via AC_REQUIRE.
398408 #
399409 # This code is only required when automatic dependency tracking
400 # is enabled. FIXME. This creates each '.P' file that we will
410 # is enabled. FIXME. This creates each `.P' file that we will
401411 # need in order to bootstrap the dependency handling code.
402412 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
403413 [AC_CONFIG_COMMANDS([depfiles],
407417
408418 # Do all the work for Automake. -*- Autoconf -*-
409419
410 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
411 #
412 # This file is free software; the Free Software Foundation
413 # gives unlimited permission to copy and/or distribute it,
414 # with or without modifications, as long as this notice is preserved.
420 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
421 # 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
422 #
423 # This file is free software; the Free Software Foundation
424 # gives unlimited permission to copy and/or distribute it,
425 # with or without modifications, as long as this notice is preserved.
426
427 # serial 16
415428
416429 # This macro actually does too much. Some checks are only needed if
417430 # your package does certain things. But this isn't really a big deal.
418
419 dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
420 m4_define([AC_PROG_CC],
421 m4_defn([AC_PROG_CC])
422 [_AM_PROG_CC_C_O
423 ])
424431
425432 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
426433 # AM_INIT_AUTOMAKE([OPTIONS])
434441 # arguments mandatory, and then we can depend on a new Autoconf
435442 # release and drop the old call support.
436443 AC_DEFUN([AM_INIT_AUTOMAKE],
437 [AC_PREREQ([2.65])dnl
444 [AC_PREREQ([2.62])dnl
438445 dnl Autoconf wants to disallow AM_ names. We explicitly allow
439446 dnl the ones we care about.
440447 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
463470 # Define the identity of the package.
464471 dnl Distinguish between old-style and new-style calls.
465472 m4_ifval([$2],
466 [AC_DIAGNOSE([obsolete],
467 [$0: two- and three-arguments forms are deprecated.])
468 m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
473 [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
469474 AC_SUBST([PACKAGE], [$1])dnl
470475 AC_SUBST([VERSION], [$2])],
471476 [_AM_SET_OPTIONS([$1])dnl
472477 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
473 m4_if(
474 m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
475 [ok:ok],,
478 m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
476479 [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
477480 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
478481 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
479482
480483 _AM_IF_OPTION([no-define],,
481 [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
482 AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
484 [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
485 AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
483486
484487 # Some tools Automake needs.
485488 AC_REQUIRE([AM_SANITY_CHECK])dnl
486489 AC_REQUIRE([AC_ARG_PROGRAM])dnl
487 AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
488 AM_MISSING_PROG([AUTOCONF], [autoconf])
489 AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
490 AM_MISSING_PROG([AUTOHEADER], [autoheader])
491 AM_MISSING_PROG([MAKEINFO], [makeinfo])
490 AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
491 AM_MISSING_PROG(AUTOCONF, autoconf)
492 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
493 AM_MISSING_PROG(AUTOHEADER, autoheader)
494 AM_MISSING_PROG(MAKEINFO, makeinfo)
492495 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
493496 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
494 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
495 # For better backward compatibility. To be removed once Automake 1.9.x
496 # dies out for good. For more background, see:
497 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
498 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
499 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
497 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
500498 # We need awk for the "check" target. The system "awk" is bad on
501499 # some platforms.
502500 AC_REQUIRE([AC_PROG_AWK])dnl
507505 [_AM_PROG_TAR([v7])])])
508506 _AM_IF_OPTION([no-dependencies],,
509507 [AC_PROVIDE_IFELSE([AC_PROG_CC],
510 [_AM_DEPENDENCIES([CC])],
511 [m4_define([AC_PROG_CC],
512 m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
508 [_AM_DEPENDENCIES(CC)],
509 [define([AC_PROG_CC],
510 defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
513511 AC_PROVIDE_IFELSE([AC_PROG_CXX],
514 [_AM_DEPENDENCIES([CXX])],
515 [m4_define([AC_PROG_CXX],
516 m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
512 [_AM_DEPENDENCIES(CXX)],
513 [define([AC_PROG_CXX],
514 defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
517515 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
518 [_AM_DEPENDENCIES([OBJC])],
519 [m4_define([AC_PROG_OBJC],
520 m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
521 AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
522 [_AM_DEPENDENCIES([OBJCXX])],
523 [m4_define([AC_PROG_OBJCXX],
524 m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
525 ])
526 AC_REQUIRE([AM_SILENT_RULES])dnl
527 dnl The testsuite driver may need to know about EXEEXT, so add the
528 dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
529 dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
516 [_AM_DEPENDENCIES(OBJC)],
517 [define([AC_PROG_OBJC],
518 defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
519 ])
520 _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
521 dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
522 dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
523 dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
530524 AC_CONFIG_COMMANDS_PRE(dnl
531525 [m4_provide_if([_AM_COMPILER_EXEEXT],
532526 [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
533
534 # POSIX will say in a future version that running "rm -f" with no argument
535 # is OK; and we want to be able to make that assumption in our Makefile
536 # recipes. So use an aggressive probe to check that the usage we want is
537 # actually supported "in the wild" to an acceptable degree.
538 # See automake bug#10828.
539 # To make any issue more visible, cause the running configure to be aborted
540 # by default if the 'rm' program in use doesn't match our expectations; the
541 # user can still override this though.
542 if rm -f && rm -fr && rm -rf; then : OK; else
543 cat >&2 <<'END'
544 Oops!
545
546 Your 'rm' program seems unable to run without file operands specified
547 on the command line, even when the '-f' option is present. This is contrary
548 to the behaviour of most rm programs out there, and not conforming with
549 the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
550
551 Please tell bug-automake@gnu.org about your system, including the value
552 of your $PATH and any error possibly output before this message. This
553 can help us improve future automake versions.
554
555 END
556 if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
557 echo 'Configuration will proceed anyway, since you have set the' >&2
558 echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
559 echo >&2
560 else
561 cat >&2 <<'END'
562 Aborting the configuration process, to ensure you take notice of the issue.
563
564 You can download and install GNU coreutils to get an 'rm' implementation
565 that behaves properly: <http://www.gnu.org/software/coreutils/>.
566
567 If you want to complete the configuration process using your problematic
568 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
569 to "yes", and re-run configure.
570
571 END
572 AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
573 fi
574 fi
575 ])
576
577 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
527 ])
528
529 dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
578530 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
579531 dnl mangled by Autoconf and run in a shell conditional statement.
580532 m4_define([_AC_COMPILER_EXEEXT],
581533 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
534
582535
583536 # When config.status generates a header, we must update the stamp-h file.
584537 # This file resides in the same directory as the config header
601554 done
602555 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
603556
604 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
605 #
606 # This file is free software; the Free Software Foundation
607 # gives unlimited permission to copy and/or distribute it,
608 # with or without modifications, as long as this notice is preserved.
557 # Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
558 # Inc.
559 #
560 # This file is free software; the Free Software Foundation
561 # gives unlimited permission to copy and/or distribute it,
562 # with or without modifications, as long as this notice is preserved.
563
564 # serial 1
609565
610566 # AM_PROG_INSTALL_SH
611567 # ------------------
620576 install_sh="\${SHELL} $am_aux_dir/install-sh"
621577 esac
622578 fi
623 AC_SUBST([install_sh])])
624
625 # Copyright (C) 2003-2013 Free Software Foundation, Inc.
626 #
627 # This file is free software; the Free Software Foundation
628 # gives unlimited permission to copy and/or distribute it,
629 # with or without modifications, as long as this notice is preserved.
579 AC_SUBST(install_sh)])
580
581 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
582 #
583 # This file is free software; the Free Software Foundation
584 # gives unlimited permission to copy and/or distribute it,
585 # with or without modifications, as long as this notice is preserved.
586
587 # serial 2
630588
631589 # Check whether the underlying file-system supports filenames
632590 # with a leading dot. For instance MS-DOS doesn't.
643601
644602 # Check to see how 'make' treats includes. -*- Autoconf -*-
645603
646 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
647 #
648 # This file is free software; the Free Software Foundation
649 # gives unlimited permission to copy and/or distribute it,
650 # with or without modifications, as long as this notice is preserved.
604 # Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
605 #
606 # This file is free software; the Free Software Foundation
607 # gives unlimited permission to copy and/or distribute it,
608 # with or without modifications, as long as this notice is preserved.
609
610 # serial 4
651611
652612 # AM_MAKE_INCLUDE()
653613 # -----------------
666626 _am_result=none
667627 # First try GNU make style include.
668628 echo "include confinc" > confmf
669 # Ignore all kinds of additional output from 'make'.
629 # Ignore all kinds of additional output from `make'.
670630 case `$am_make -s -f confmf 2> /dev/null` in #(
671631 *the\ am__doit\ target*)
672632 am__include=include
693653
694654 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
695655
696 # Copyright (C) 1997-2013 Free Software Foundation, Inc.
697 #
698 # This file is free software; the Free Software Foundation
699 # gives unlimited permission to copy and/or distribute it,
700 # with or without modifications, as long as this notice is preserved.
656 # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
657 # Free Software Foundation, Inc.
658 #
659 # This file is free software; the Free Software Foundation
660 # gives unlimited permission to copy and/or distribute it,
661 # with or without modifications, as long as this notice is preserved.
662
663 # serial 6
701664
702665 # AM_MISSING_PROG(NAME, PROGRAM)
703666 # ------------------------------
706669 $1=${$1-"${am_missing_run}$2"}
707670 AC_SUBST($1)])
708671
672
709673 # AM_MISSING_HAS_RUN
710674 # ------------------
711 # Define MISSING if not defined so far and test if it is modern enough.
712 # If it is, set am_missing_run to use it, otherwise, to nothing.
675 # Define MISSING if not defined so far and test if it supports --run.
676 # If it does, set am_missing_run to use it, otherwise, to nothing.
713677 AC_DEFUN([AM_MISSING_HAS_RUN],
714678 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
715679 AC_REQUIRE_AUX_FILE([missing])dnl
722686 esac
723687 fi
724688 # Use eval to expand $SHELL
725 if eval "$MISSING --is-lightweight"; then
726 am_missing_run="$MISSING "
689 if eval "$MISSING --run true"; then
690 am_missing_run="$MISSING --run "
727691 else
728692 am_missing_run=
729 AC_MSG_WARN(['missing' script is too old or missing])
730 fi
693 AC_MSG_WARN([`missing' script is too old or missing])
694 fi
695 ])
696
697 # Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
698 # Inc.
699 #
700 # This file is free software; the Free Software Foundation
701 # gives unlimited permission to copy and/or distribute it,
702 # with or without modifications, as long as this notice is preserved.
703
704 # serial 1
705
706 # AM_PROG_MKDIR_P
707 # ---------------
708 # Check for `mkdir -p'.
709 AC_DEFUN([AM_PROG_MKDIR_P],
710 [AC_PREREQ([2.60])dnl
711 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
712 dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
713 dnl while keeping a definition of mkdir_p for backward compatibility.
714 dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
715 dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
716 dnl Makefile.ins that do not define MKDIR_P, so we do our own
717 dnl adjustment using top_builddir (which is defined more often than
718 dnl MKDIR_P).
719 AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
720 case $mkdir_p in
721 [[\\/$]]* | ?:[[\\/]]*) ;;
722 */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
723 esac
731724 ])
732725
733726 # Helper functions for option handling. -*- Autoconf -*-
734727
735 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
736 #
737 # This file is free software; the Free Software Foundation
738 # gives unlimited permission to copy and/or distribute it,
739 # with or without modifications, as long as this notice is preserved.
728 # Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
729 # Foundation, Inc.
730 #
731 # This file is free software; the Free Software Foundation
732 # gives unlimited permission to copy and/or distribute it,
733 # with or without modifications, as long as this notice is preserved.
734
735 # serial 5
740736
741737 # _AM_MANGLE_OPTION(NAME)
742738 # -----------------------
747743 # --------------------
748744 # Set option NAME. Presently that only means defining a flag for this option.
749745 AC_DEFUN([_AM_SET_OPTION],
750 [m4_define(_AM_MANGLE_OPTION([$1]), [1])])
746 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
751747
752748 # _AM_SET_OPTIONS(OPTIONS)
753749 # ------------------------
761757 AC_DEFUN([_AM_IF_OPTION],
762758 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
763759
764 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
765 #
766 # This file is free software; the Free Software Foundation
767 # gives unlimited permission to copy and/or distribute it,
768 # with or without modifications, as long as this notice is preserved.
769
770 # _AM_PROG_CC_C_O
771 # ---------------
772 # Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
773 # to automatically call this.
774 AC_DEFUN([_AM_PROG_CC_C_O],
775 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
776 AC_REQUIRE_AUX_FILE([compile])dnl
777 AC_LANG_PUSH([C])dnl
778 AC_CACHE_CHECK(
779 [whether $CC understands -c and -o together],
780 [am_cv_prog_cc_c_o],
781 [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
782 # Make sure it works both with $CC and with simple cc.
783 # Following AC_PROG_CC_C_O, we do the test twice because some
784 # compilers refuse to overwrite an existing .o file with -o,
785 # though they will create one.
786 am_cv_prog_cc_c_o=yes
787 for am_i in 1 2; do
788 if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
789 && test -f conftest2.$ac_objext; then
790 : OK
791 else
792 am_cv_prog_cc_c_o=no
793 break
794 fi
795 done
796 rm -f core conftest*
797 unset am_i])
798 if test "$am_cv_prog_cc_c_o" != yes; then
799 # Losing compiler, so override with the script.
800 # FIXME: It is wrong to rewrite CC.
801 # But if we don't then we get into trouble of one sort or another.
802 # A longer-term fix would be to have automake use am__CC in this case,
803 # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
804 CC="$am_aux_dir/compile $CC"
805 fi
806 AC_LANG_POP([C])])
807
808 # For backward compatibility.
809 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
810
811 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
812 #
813 # This file is free software; the Free Software Foundation
814 # gives unlimited permission to copy and/or distribute it,
815 # with or without modifications, as long as this notice is preserved.
816
817 # AM_RUN_LOG(COMMAND)
818 # -------------------
819 # Run COMMAND, save the exit status in ac_status, and log it.
820 # (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
821 AC_DEFUN([AM_RUN_LOG],
822 [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
823 ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
824 ac_status=$?
825 echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
826 (exit $ac_status); }])
827
828760 # Check to make sure that the build environment is sane. -*- Autoconf -*-
829761
830 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
831 #
832 # This file is free software; the Free Software Foundation
833 # gives unlimited permission to copy and/or distribute it,
834 # with or without modifications, as long as this notice is preserved.
762 # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
763 # Free Software Foundation, Inc.
764 #
765 # This file is free software; the Free Software Foundation
766 # gives unlimited permission to copy and/or distribute it,
767 # with or without modifications, as long as this notice is preserved.
768
769 # serial 5
835770
836771 # AM_SANITY_CHECK
837772 # ---------------
838773 AC_DEFUN([AM_SANITY_CHECK],
839774 [AC_MSG_CHECKING([whether build environment is sane])
775 # Just in case
776 sleep 1
777 echo timestamp > conftest.file
840778 # Reject unsafe characters in $srcdir or the absolute working directory
841779 # name. Accept space and tab only in the latter.
842780 am_lf='
847785 esac
848786 case $srcdir in
849787 *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
850 AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
788 AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
851789 esac
852790
853 # Do 'set' in a subshell so we don't clobber the current shell's
791 # Do `set' in a subshell so we don't clobber the current shell's
854792 # arguments. Must try -L first in case configure is actually a
855793 # symlink; some systems play weird games with the mod time of symlinks
856794 # (eg FreeBSD returns the mod time of the symlink's containing
857795 # directory).
858796 if (
859 am_has_slept=no
860 for am_try in 1 2; do
861 echo "timestamp, slept: $am_has_slept" > conftest.file
862 set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
863 if test "$[*]" = "X"; then
864 # -L didn't work.
865 set X `ls -t "$srcdir/configure" conftest.file`
866 fi
867 if test "$[*]" != "X $srcdir/configure conftest.file" \
868 && test "$[*]" != "X conftest.file $srcdir/configure"; then
869
870 # If neither matched, then we have a broken ls. This can happen
871 # if, for instance, CONFIG_SHELL is bash and it inherits a
872 # broken ls alias from the environment. This has actually
873 # happened. Such a system could not be considered "sane".
874 AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
875 alias in your environment])
876 fi
877 if test "$[2]" = conftest.file || test $am_try -eq 2; then
878 break
879 fi
880 # Just in case.
881 sleep 1
882 am_has_slept=yes
883 done
797 set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
798 if test "$[*]" = "X"; then
799 # -L didn't work.
800 set X `ls -t "$srcdir/configure" conftest.file`
801 fi
802 rm -f conftest.file
803 if test "$[*]" != "X $srcdir/configure conftest.file" \
804 && test "$[*]" != "X conftest.file $srcdir/configure"; then
805
806 # If neither matched, then we have a broken ls. This can happen
807 # if, for instance, CONFIG_SHELL is bash and it inherits a
808 # broken ls alias from the environment. This has actually
809 # happened. Such a system could not be considered "sane".
810 AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
811 alias in your environment])
812 fi
813
884814 test "$[2]" = conftest.file
885815 )
886816 then
890820 AC_MSG_ERROR([newly created file is older than distributed files!
891821 Check your system clock])
892822 fi
893 AC_MSG_RESULT([yes])
894 # If we didn't sleep, we still need to ensure time stamps of config.status and
895 # generated files are strictly newer.
896 am_sleep_pid=
897 if grep 'slept: no' conftest.file >/dev/null 2>&1; then
898 ( sleep 1 ) &
899 am_sleep_pid=$!
900 fi
901 AC_CONFIG_COMMANDS_PRE(
902 [AC_MSG_CHECKING([that generated files are newer than configure])
903 if test -n "$am_sleep_pid"; then
904 # Hide warnings about reused PIDs.
905 wait $am_sleep_pid 2>/dev/null
906 fi
907 AC_MSG_RESULT([done])])
908 rm -f conftest.file
909 ])
910
911 # Copyright (C) 2009-2013 Free Software Foundation, Inc.
912 #
913 # This file is free software; the Free Software Foundation
914 # gives unlimited permission to copy and/or distribute it,
915 # with or without modifications, as long as this notice is preserved.
916
917 # AM_SILENT_RULES([DEFAULT])
918 # --------------------------
919 # Enable less verbose build rules; with the default set to DEFAULT
920 # ("yes" being less verbose, "no" or empty being verbose).
921 AC_DEFUN([AM_SILENT_RULES],
922 [AC_ARG_ENABLE([silent-rules], [dnl
923 AS_HELP_STRING(
924 [--enable-silent-rules],
925 [less verbose build output (undo: "make V=1")])
926 AS_HELP_STRING(
927 [--disable-silent-rules],
928 [verbose build output (undo: "make V=0")])dnl
929 ])
930 case $enable_silent_rules in @%:@ (((
931 yes) AM_DEFAULT_VERBOSITY=0;;
932 no) AM_DEFAULT_VERBOSITY=1;;
933 *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
934 esac
935 dnl
936 dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
937 dnl do not support nested variable expansions.
938 dnl See automake bug#9928 and bug#10237.
939 am_make=${MAKE-make}
940 AC_CACHE_CHECK([whether $am_make supports nested variables],
941 [am_cv_make_support_nested_variables],
942 [if AS_ECHO([['TRUE=$(BAR$(V))
943 BAR0=false
944 BAR1=true
945 V=1
946 am__doit:
947 @$(TRUE)
948 .PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
949 am_cv_make_support_nested_variables=yes
950 else
951 am_cv_make_support_nested_variables=no
952 fi])
953 if test $am_cv_make_support_nested_variables = yes; then
954 dnl Using '$V' instead of '$(V)' breaks IRIX make.
955 AM_V='$(V)'
956 AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
957 else
958 AM_V=$AM_DEFAULT_VERBOSITY
959 AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
960 fi
961 AC_SUBST([AM_V])dnl
962 AM_SUBST_NOTMAKE([AM_V])dnl
963 AC_SUBST([AM_DEFAULT_V])dnl
964 AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
965 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
966 AM_BACKSLASH='\'
967 AC_SUBST([AM_BACKSLASH])dnl
968 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
969 ])
970
971 # Copyright (C) 2001-2013 Free Software Foundation, Inc.
972 #
973 # This file is free software; the Free Software Foundation
974 # gives unlimited permission to copy and/or distribute it,
975 # with or without modifications, as long as this notice is preserved.
823 AC_MSG_RESULT(yes)])
824
825 # Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
826 #
827 # This file is free software; the Free Software Foundation
828 # gives unlimited permission to copy and/or distribute it,
829 # with or without modifications, as long as this notice is preserved.
830
831 # serial 1
976832
977833 # AM_PROG_INSTALL_STRIP
978834 # ---------------------
979 # One issue with vendor 'install' (even GNU) is that you can't
835 # One issue with vendor `install' (even GNU) is that you can't
980836 # specify the program used to strip binaries. This is especially
981837 # annoying in cross-compiling environments, where the build's strip
982838 # is unlikely to handle the host's binaries.
983839 # Fortunately install-sh will honor a STRIPPROG variable, so we
984 # always use install-sh in "make install-strip", and initialize
840 # always use install-sh in `make install-strip', and initialize
985841 # STRIPPROG with the value of the STRIP variable (set by the user).
986842 AC_DEFUN([AM_PROG_INSTALL_STRIP],
987843 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
988 # Installed binaries are usually stripped using 'strip' when the user
989 # run "make install-strip". However 'strip' might not be the right
844 # Installed binaries are usually stripped using `strip' when the user
845 # run `make install-strip'. However `strip' might not be the right
990846 # tool to use in cross-compilation environments, therefore Automake
991 # will honor the 'STRIP' environment variable to overrule this program.
992 dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
847 # will honor the `STRIP' environment variable to overrule this program.
848 dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
993849 if test "$cross_compiling" != no; then
994850 AC_CHECK_TOOL([STRIP], [strip], :)
995851 fi
996852 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
997853 AC_SUBST([INSTALL_STRIP_PROGRAM])])
998854
999 # Copyright (C) 2006-2013 Free Software Foundation, Inc.
1000 #
1001 # This file is free software; the Free Software Foundation
1002 # gives unlimited permission to copy and/or distribute it,
1003 # with or without modifications, as long as this notice is preserved.
855 # Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
856 #
857 # This file is free software; the Free Software Foundation
858 # gives unlimited permission to copy and/or distribute it,
859 # with or without modifications, as long as this notice is preserved.
860
861 # serial 3
1004862
1005863 # _AM_SUBST_NOTMAKE(VARIABLE)
1006864 # ---------------------------
1015873
1016874 # Check how to create a tarball. -*- Autoconf -*-
1017875
1018 # Copyright (C) 2004-2013 Free Software Foundation, Inc.
1019 #
1020 # This file is free software; the Free Software Foundation
1021 # gives unlimited permission to copy and/or distribute it,
1022 # with or without modifications, as long as this notice is preserved.
876 # Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
877 #
878 # This file is free software; the Free Software Foundation
879 # gives unlimited permission to copy and/or distribute it,
880 # with or without modifications, as long as this notice is preserved.
881
882 # serial 2
1023883
1024884 # _AM_PROG_TAR(FORMAT)
1025885 # --------------------
1026886 # Check how to create a tarball in format FORMAT.
1027 # FORMAT should be one of 'v7', 'ustar', or 'pax'.
887 # FORMAT should be one of `v7', `ustar', or `pax'.
1028888 #
1029889 # Substitute a variable $(am__tar) that is a command
1030890 # writing to stdout a FORMAT-tarball containing the directory
1034894 # Substitute a variable $(am__untar) that extract such
1035895 # a tarball read from stdin.
1036896 # $(am__untar) < result.tar
1037 #
1038897 AC_DEFUN([_AM_PROG_TAR],
1039898 [# Always define AMTAR for backward compatibility. Yes, it's still used
1040899 # in the wild :-( We should find a proper way to deprecate it ...
1041900 AC_SUBST([AMTAR], ['$${TAR-tar}'])
1042
1043 # We'll loop over all known methods to create a tar archive until one works.
901 m4_if([$1], [v7],
902 [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
903 [m4_case([$1], [ustar],, [pax],,
904 [m4_fatal([Unknown tar format])])
905 AC_MSG_CHECKING([how to create a $1 tar archive])
906 # Loop over all known methods to create a tar archive until one works.
1044907 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
1045
1046 m4_if([$1], [v7],
1047 [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
1048
1049 [m4_case([$1],
1050 [ustar],
1051 [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
1052 # There is notably a 21 bits limit for the UID and the GID. In fact,
1053 # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
1054 # and bug#13588).
1055 am_max_uid=2097151 # 2^21 - 1
1056 am_max_gid=$am_max_uid
1057 # The $UID and $GID variables are not portable, so we need to resort
1058 # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
1059 # below are definitely unexpected, so allow the users to see them
1060 # (that is, avoid stderr redirection).
1061 am_uid=`id -u || echo unknown`
1062 am_gid=`id -g || echo unknown`
1063 AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
1064 if test $am_uid -le $am_max_uid; then
1065 AC_MSG_RESULT([yes])
1066 else
1067 AC_MSG_RESULT([no])
1068 _am_tools=none
1069 fi
1070 AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
1071 if test $am_gid -le $am_max_gid; then
1072 AC_MSG_RESULT([yes])
1073 else
1074 AC_MSG_RESULT([no])
1075 _am_tools=none
1076 fi],
1077
1078 [pax],
1079 [],
1080
1081 [m4_fatal([Unknown tar format])])
1082
1083 AC_MSG_CHECKING([how to create a $1 tar archive])
1084
1085 # Go ahead even if we have the value already cached. We do so because we
1086 # need to set the values for the 'am__tar' and 'am__untar' variables.
1087 _am_tools=${am_cv_prog_tar_$1-$_am_tools}
1088
1089 for _am_tool in $_am_tools; do
1090 case $_am_tool in
1091 gnutar)
1092 for _am_tar in tar gnutar gtar; do
1093 AM_RUN_LOG([$_am_tar --version]) && break
1094 done
1095 am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
1096 am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
1097 am__untar="$_am_tar -xf -"
1098 ;;
1099 plaintar)
1100 # Must skip GNU tar: if it does not support --format= it doesn't create
1101 # ustar tarball either.
1102 (tar --version) >/dev/null 2>&1 && continue
1103 am__tar='tar chf - "$$tardir"'
1104 am__tar_='tar chf - "$tardir"'
1105 am__untar='tar xf -'
1106 ;;
1107 pax)
1108 am__tar='pax -L -x $1 -w "$$tardir"'
1109 am__tar_='pax -L -x $1 -w "$tardir"'
1110 am__untar='pax -r'
1111 ;;
1112 cpio)
1113 am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
1114 am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
1115 am__untar='cpio -i -H $1 -d'
1116 ;;
1117 none)
1118 am__tar=false
1119 am__tar_=false
1120 am__untar=false
1121 ;;
1122 esac
1123
1124 # If the value was cached, stop now. We just wanted to have am__tar
1125 # and am__untar set.
1126 test -n "${am_cv_prog_tar_$1}" && break
1127
1128 # tar/untar a dummy directory, and stop if the command works.
1129 rm -rf conftest.dir
1130 mkdir conftest.dir
1131 echo GrepMe > conftest.dir/file
1132 AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
1133 rm -rf conftest.dir
1134 if test -s conftest.tar; then
1135 AM_RUN_LOG([$am__untar <conftest.tar])
1136 AM_RUN_LOG([cat conftest.dir/file])
1137 grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
1138 fi
1139 done
908 _am_tools=${am_cv_prog_tar_$1-$_am_tools}
909 # Do not fold the above two line into one, because Tru64 sh and
910 # Solaris sh will not grok spaces in the rhs of `-'.
911 for _am_tool in $_am_tools
912 do
913 case $_am_tool in
914 gnutar)
915 for _am_tar in tar gnutar gtar;
916 do
917 AM_RUN_LOG([$_am_tar --version]) && break
918 done
919 am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
920 am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
921 am__untar="$_am_tar -xf -"
922 ;;
923 plaintar)
924 # Must skip GNU tar: if it does not support --format= it doesn't create
925 # ustar tarball either.
926 (tar --version) >/dev/null 2>&1 && continue
927 am__tar='tar chf - "$$tardir"'
928 am__tar_='tar chf - "$tardir"'
929 am__untar='tar xf -'
930 ;;
931 pax)
932 am__tar='pax -L -x $1 -w "$$tardir"'
933 am__tar_='pax -L -x $1 -w "$tardir"'
934 am__untar='pax -r'
935 ;;
936 cpio)
937 am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
938 am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
939 am__untar='cpio -i -H $1 -d'
940 ;;
941 none)
942 am__tar=false
943 am__tar_=false
944 am__untar=false
945 ;;
946 esac
947
948 # If the value was cached, stop now. We just wanted to have am__tar
949 # and am__untar set.
950 test -n "${am_cv_prog_tar_$1}" && break
951
952 # tar/untar a dummy directory, and stop if the command works
1140953 rm -rf conftest.dir
1141
1142 AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
1143 AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1144
954 mkdir conftest.dir
955 echo GrepMe > conftest.dir/file
956 AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
957 rm -rf conftest.dir
958 if test -s conftest.tar; then
959 AM_RUN_LOG([$am__untar <conftest.tar])
960 grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
961 fi
962 done
963 rm -rf conftest.dir
964
965 AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
966 AC_MSG_RESULT([$am_cv_prog_tar_$1])])
1145967 AC_SUBST([am__tar])
1146968 AC_SUBST([am__untar])
1147969 ]) # _AM_PROG_TAR
+0
-347
compile less more
0 #! /bin/sh
1 # Wrapper for compilers which do not understand '-c -o'.
2
3 scriptversion=2012-10-14.11; # UTC
4
5 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
6 # Written by Tom Tromey <tromey@cygnus.com>.
7 #
8 # This program is free software; you can redistribute it and/or modify
9 # it under the terms of the GNU General Public License as published by
10 # the Free Software Foundation; either version 2, or (at your option)
11 # any later version.
12 #
13 # This program is distributed in the hope that it will be useful,
14 # but WITHOUT ANY WARRANTY; without even the implied warranty of
15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 # GNU General Public License for more details.
17 #
18 # You should have received a copy of the GNU General Public License
19 # along with this program. If not, see <http://www.gnu.org/licenses/>.
20
21 # As a special exception to the GNU General Public License, if you
22 # distribute this file as part of a program that contains a
23 # configuration script generated by Autoconf, you may include it under
24 # the same distribution terms that you use for the rest of that program.
25
26 # This file is maintained in Automake, please report
27 # bugs to <bug-automake@gnu.org> or send patches to
28 # <automake-patches@gnu.org>.
29
30 nl='
31 '
32
33 # We need space, tab and new line, in precisely that order. Quoting is
34 # there to prevent tools from complaining about whitespace usage.
35 IFS=" "" $nl"
36
37 file_conv=
38
39 # func_file_conv build_file lazy
40 # Convert a $build file to $host form and store it in $file
41 # Currently only supports Windows hosts. If the determined conversion
42 # type is listed in (the comma separated) LAZY, no conversion will
43 # take place.
44 func_file_conv ()
45 {
46 file=$1
47 case $file in
48 / | /[!/]*) # absolute file, and not a UNC file
49 if test -z "$file_conv"; then
50 # lazily determine how to convert abs files
51 case `uname -s` in
52 MINGW*)
53 file_conv=mingw
54 ;;
55 CYGWIN*)
56 file_conv=cygwin
57 ;;
58 *)
59 file_conv=wine
60 ;;
61 esac
62 fi
63 case $file_conv/,$2, in
64 *,$file_conv,*)
65 ;;
66 mingw/*)
67 file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
68 ;;
69 cygwin/*)
70 file=`cygpath -m "$file" || echo "$file"`
71 ;;
72 wine/*)
73 file=`winepath -w "$file" || echo "$file"`
74 ;;
75 esac
76 ;;
77 esac
78 }
79
80 # func_cl_dashL linkdir
81 # Make cl look for libraries in LINKDIR
82 func_cl_dashL ()
83 {
84 func_file_conv "$1"
85 if test -z "$lib_path"; then
86 lib_path=$file
87 else
88 lib_path="$lib_path;$file"
89 fi
90 linker_opts="$linker_opts -LIBPATH:$file"
91 }
92
93 # func_cl_dashl library
94 # Do a library search-path lookup for cl
95 func_cl_dashl ()
96 {
97 lib=$1
98 found=no
99 save_IFS=$IFS
100 IFS=';'
101 for dir in $lib_path $LIB
102 do
103 IFS=$save_IFS
104 if $shared && test -f "$dir/$lib.dll.lib"; then
105 found=yes
106 lib=$dir/$lib.dll.lib
107 break
108 fi
109 if test -f "$dir/$lib.lib"; then
110 found=yes
111 lib=$dir/$lib.lib
112 break
113 fi
114 if test -f "$dir/lib$lib.a"; then
115 found=yes
116 lib=$dir/lib$lib.a
117 break
118 fi
119 done
120 IFS=$save_IFS
121
122 if test "$found" != yes; then
123 lib=$lib.lib
124 fi
125 }
126
127 # func_cl_wrapper cl arg...
128 # Adjust compile command to suit cl
129 func_cl_wrapper ()
130 {
131 # Assume a capable shell
132 lib_path=
133 shared=:
134 linker_opts=
135 for arg
136 do
137 if test -n "$eat"; then
138 eat=
139 else
140 case $1 in
141 -o)
142 # configure might choose to run compile as 'compile cc -o foo foo.c'.
143 eat=1
144 case $2 in
145 *.o | *.[oO][bB][jJ])
146 func_file_conv "$2"
147 set x "$@" -Fo"$file"
148 shift
149 ;;
150 *)
151 func_file_conv "$2"
152 set x "$@" -Fe"$file"
153 shift
154 ;;
155 esac
156 ;;
157 -I)
158 eat=1
159 func_file_conv "$2" mingw
160 set x "$@" -I"$file"
161 shift
162 ;;
163 -I*)
164 func_file_conv "${1#-I}" mingw
165 set x "$@" -I"$file"
166 shift
167 ;;
168 -l)
169 eat=1
170 func_cl_dashl "$2"
171 set x "$@" "$lib"
172 shift
173 ;;
174 -l*)
175 func_cl_dashl "${1#-l}"
176 set x "$@" "$lib"
177 shift
178 ;;
179 -L)
180 eat=1
181 func_cl_dashL "$2"
182 ;;
183 -L*)
184 func_cl_dashL "${1#-L}"
185 ;;
186 -static)
187 shared=false
188 ;;
189 -Wl,*)
190 arg=${1#-Wl,}
191 save_ifs="$IFS"; IFS=','
192 for flag in $arg; do
193 IFS="$save_ifs"
194 linker_opts="$linker_opts $flag"
195 done
196 IFS="$save_ifs"
197 ;;
198 -Xlinker)
199 eat=1
200 linker_opts="$linker_opts $2"
201 ;;
202 -*)
203 set x "$@" "$1"
204 shift
205 ;;
206 *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
207 func_file_conv "$1"
208 set x "$@" -Tp"$file"
209 shift
210 ;;
211 *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
212 func_file_conv "$1" mingw
213 set x "$@" "$file"
214 shift
215 ;;
216 *)
217 set x "$@" "$1"
218 shift
219 ;;
220 esac
221 fi
222 shift
223 done
224 if test -n "$linker_opts"; then
225 linker_opts="-link$linker_opts"
226 fi
227 exec "$@" $linker_opts
228 exit 1
229 }
230
231 eat=
232
233 case $1 in
234 '')
235 echo "$0: No command. Try '$0 --help' for more information." 1>&2
236 exit 1;
237 ;;
238 -h | --h*)
239 cat <<\EOF
240 Usage: compile [--help] [--version] PROGRAM [ARGS]
241
242 Wrapper for compilers which do not understand '-c -o'.
243 Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
244 arguments, and rename the output as expected.
245
246 If you are trying to build a whole package this is not the
247 right script to run: please start by reading the file 'INSTALL'.
248
249 Report bugs to <bug-automake@gnu.org>.
250 EOF
251 exit $?
252 ;;
253 -v | --v*)
254 echo "compile $scriptversion"
255 exit $?
256 ;;
257 cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
258 func_cl_wrapper "$@" # Doesn't return...
259 ;;
260 esac
261
262 ofile=
263 cfile=
264
265 for arg
266 do
267 if test -n "$eat"; then
268 eat=
269 else
270 case $1 in
271 -o)
272 # configure might choose to run compile as 'compile cc -o foo foo.c'.
273 # So we strip '-o arg' only if arg is an object.
274 eat=1
275 case $2 in
276 *.o | *.obj)
277 ofile=$2
278 ;;
279 *)
280 set x "$@" -o "$2"
281 shift
282 ;;
283 esac
284 ;;
285 *.c)
286 cfile=$1
287 set x "$@" "$1"
288 shift
289 ;;
290 *)
291 set x "$@" "$1"
292 shift
293 ;;
294 esac
295 fi
296 shift
297 done
298
299 if test -z "$ofile" || test -z "$cfile"; then
300 # If no '-o' option was seen then we might have been invoked from a
301 # pattern rule where we don't need one. That is ok -- this is a
302 # normal compilation that the losing compiler can handle. If no
303 # '.c' file was seen then we are probably linking. That is also
304 # ok.
305 exec "$@"
306 fi
307
308 # Name of file we expect compiler to create.
309 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
310
311 # Create the lock directory.
312 # Note: use '[/\\:.-]' here to ensure that we don't use the same name
313 # that we are using for the .o file. Also, base the name on the expected
314 # object file name, since that is what matters with a parallel build.
315 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
316 while true; do
317 if mkdir "$lockdir" >/dev/null 2>&1; then
318 break
319 fi
320 sleep 1
321 done
322 # FIXME: race condition here if user kills between mkdir and trap.
323 trap "rmdir '$lockdir'; exit 1" 1 2 15
324
325 # Run the compile.
326 "$@"
327 ret=$?
328
329 if test -f "$cofile"; then
330 test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
331 elif test -f "${cofile}bj"; then
332 test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
333 fi
334
335 rmdir "$lockdir"
336 exit $ret
337
338 # Local Variables:
339 # mode: shell-script
340 # sh-indentation: 2
341 # eval: (add-hook 'write-file-hooks 'time-stamp)
342 # time-stamp-start: "scriptversion="
343 # time-stamp-format: "%:y-%02m-%02d.%02H"
344 # time-stamp-time-zone: "UTC"
345 # time-stamp-end: "; # UTC"
346 # End:
+229
-119
config.guess less more
00 #! /bin/sh
11 # Attempt to guess a canonical system name.
2 # Copyright 1992-2014 Free Software Foundation, Inc.
3
4 timestamp='2014-03-23'
2 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
3 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
4 # 2011, 2012 Free Software Foundation, Inc.
5
6 timestamp='2012-02-10'
57
68 # This file is free software; you can redistribute it and/or modify it
79 # under the terms of the GNU General Public License as published by
8 # the Free Software Foundation; either version 3 of the License, or
10 # the Free Software Foundation; either version 2 of the License, or
911 # (at your option) any later version.
1012 #
1113 # This program is distributed in the hope that it will be useful, but
1921 # As a special exception to the GNU General Public License, if you
2022 # distribute this file as part of a program that contains a
2123 # configuration script generated by Autoconf, you may include it under
22 # the same distribution terms that you use for the rest of that
23 # program. This Exception is an additional permission under section 7
24 # of the GNU General Public License, version 3 ("GPLv3").
24 # the same distribution terms that you use for the rest of that program.
25
26
27 # Originally written by Per Bothner. Please send patches (context
28 # diff format) to <config-patches@gnu.org> and include a ChangeLog
29 # entry.
2530 #
26 # Originally written by Per Bothner.
31 # This script attempts to guess a canonical system name similar to
32 # config.sub. If it succeeds, it prints the system name on stdout, and
33 # exits with 0. Otherwise, it exits with 1.
2734 #
2835 # You can get the latest version of this script from:
2936 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
30 #
31 # Please send patches with a ChangeLog entry to config-patches@gnu.org.
32
3337
3438 me=`echo "$0" | sed -e 's,.*/,,'`
3539
4953 GNU config.guess ($timestamp)
5054
5155 Originally written by Per Bothner.
52 Copyright 1992-2014 Free Software Foundation, Inc.
56 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
57 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
58 Free Software Foundation, Inc.
5359
5460 This is free software; see the source for copying conditions. There is NO
5561 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
130136 UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
131137 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
132138 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
133
134 case "${UNAME_SYSTEM}" in
135 Linux|GNU|GNU/*)
136 # If the system lacks a compiler, then just pick glibc.
137 # We could probably try harder.
138 LIBC=gnu
139
140 eval $set_cc_for_build
141 cat <<-EOF > $dummy.c
142 #include <features.h>
143 #if defined(__UCLIBC__)
144 LIBC=uclibc
145 #elif defined(__dietlibc__)
146 LIBC=dietlibc
147 #else
148 LIBC=gnu
149 #endif
150 EOF
151 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
152 ;;
153 esac
154139
155140 # Note: order is significant - the case branches are not exclusive.
156141
213198 # contains redundant information, the shorter form:
214199 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
215200 echo "${machine}-${os}${release}"
216 exit ;;
217 *:Bitrig:*:*)
218 UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
219 echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
220201 exit ;;
221202 *:OpenBSD:*:*)
222203 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
320301 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
321302 echo arm-acorn-riscix${UNAME_RELEASE}
322303 exit ;;
323 arm*:riscos:*:*|arm*:RISCOS:*:*)
304 arm:riscos:*:*|arm:RISCOS:*:*)
324305 echo arm-unknown-riscos
325306 exit ;;
326307 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
819800 i*:CYGWIN*:*)
820801 echo ${UNAME_MACHINE}-pc-cygwin
821802 exit ;;
822 *:MINGW64*:*)
823 echo ${UNAME_MACHINE}-pc-mingw64
824 exit ;;
825803 *:MINGW*:*)
826804 echo ${UNAME_MACHINE}-pc-mingw32
827805 exit ;;
828 *:MSYS*:*)
806 i*:MSYS*:*)
829807 echo ${UNAME_MACHINE}-pc-msys
830808 exit ;;
831809 i*:windows32*:*)
873851 exit ;;
874852 *:GNU:*:*)
875853 # the GNU system
876 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
854 echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
877855 exit ;;
878856 *:GNU/*:*:*)
879857 # other systems with GNU libc and userland
880 echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
858 echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
881859 exit ;;
882860 i*86:Minix:*:*)
883861 echo ${UNAME_MACHINE}-pc-minix
884862 exit ;;
885863 aarch64:Linux:*:*)
886 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
864 echo ${UNAME_MACHINE}-unknown-linux-gnu
887865 exit ;;
888866 aarch64_be:Linux:*:*)
889867 UNAME_MACHINE=aarch64_be
890 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
868 echo ${UNAME_MACHINE}-unknown-linux-gnu
891869 exit ;;
892870 alpha:Linux:*:*)
893871 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
900878 EV68*) UNAME_MACHINE=alphaev68 ;;
901879 esac
902880 objdump --private-headers /bin/sh | grep -q ld.so.1
903 if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
904 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
905 exit ;;
906 arc:Linux:*:* | arceb:Linux:*:*)
907 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
881 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
882 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
908883 exit ;;
909884 arm*:Linux:*:*)
910885 eval $set_cc_for_build
911886 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
912887 | grep -q __ARM_EABI__
913888 then
914 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
889 echo ${UNAME_MACHINE}-unknown-linux-gnu
915890 else
916891 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
917892 | grep -q __ARM_PCS_VFP
918893 then
919 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
894 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
920895 else
921 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
896 echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
922897 fi
923898 fi
924899 exit ;;
925900 avr32*:Linux:*:*)
926 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
901 echo ${UNAME_MACHINE}-unknown-linux-gnu
927902 exit ;;
928903 cris:Linux:*:*)
929 echo ${UNAME_MACHINE}-axis-linux-${LIBC}
904 echo ${UNAME_MACHINE}-axis-linux-gnu
930905 exit ;;
931906 crisv32:Linux:*:*)
932 echo ${UNAME_MACHINE}-axis-linux-${LIBC}
907 echo ${UNAME_MACHINE}-axis-linux-gnu
933908 exit ;;
934909 frv:Linux:*:*)
935 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
910 echo ${UNAME_MACHINE}-unknown-linux-gnu
936911 exit ;;
937912 hexagon:Linux:*:*)
938 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
913 echo ${UNAME_MACHINE}-unknown-linux-gnu
939914 exit ;;
940915 i*86:Linux:*:*)
941 echo ${UNAME_MACHINE}-pc-linux-${LIBC}
916 LIBC=gnu
917 eval $set_cc_for_build
918 sed 's/^ //' << EOF >$dummy.c
919 #ifdef __dietlibc__
920 LIBC=dietlibc
921 #endif
922 EOF
923 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
924 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
942925 exit ;;
943926 ia64:Linux:*:*)
944 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
927 echo ${UNAME_MACHINE}-unknown-linux-gnu
945928 exit ;;
946929 m32r*:Linux:*:*)
947 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
930 echo ${UNAME_MACHINE}-unknown-linux-gnu
948931 exit ;;
949932 m68*:Linux:*:*)
950 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
933 echo ${UNAME_MACHINE}-unknown-linux-gnu
951934 exit ;;
952935 mips:Linux:*:* | mips64:Linux:*:*)
953936 eval $set_cc_for_build
966949 #endif
967950 EOF
968951 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
969 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
952 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
970953 ;;
971 openrisc*:Linux:*:*)
972 echo or1k-unknown-linux-${LIBC}
973 exit ;;
974 or32:Linux:*:* | or1k*:Linux:*:*)
975 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
954 or32:Linux:*:*)
955 echo ${UNAME_MACHINE}-unknown-linux-gnu
976956 exit ;;
977957 padre:Linux:*:*)
978 echo sparc-unknown-linux-${LIBC}
958 echo sparc-unknown-linux-gnu
979959 exit ;;
980960 parisc64:Linux:*:* | hppa64:Linux:*:*)
981 echo hppa64-unknown-linux-${LIBC}
961 echo hppa64-unknown-linux-gnu
982962 exit ;;
983963 parisc:Linux:*:* | hppa:Linux:*:*)
984964 # Look for CPU level
985965 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
986 PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
987 PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
988 *) echo hppa-unknown-linux-${LIBC} ;;
966 PA7*) echo hppa1.1-unknown-linux-gnu ;;
967 PA8*) echo hppa2.0-unknown-linux-gnu ;;
968 *) echo hppa-unknown-linux-gnu ;;
989969 esac
990970 exit ;;
991971 ppc64:Linux:*:*)
992 echo powerpc64-unknown-linux-${LIBC}
972 echo powerpc64-unknown-linux-gnu
993973 exit ;;
994974 ppc:Linux:*:*)
995 echo powerpc-unknown-linux-${LIBC}
996 exit ;;
997 ppc64le:Linux:*:*)
998 echo powerpc64le-unknown-linux-${LIBC}
999 exit ;;
1000 ppcle:Linux:*:*)
1001 echo powerpcle-unknown-linux-${LIBC}
975 echo powerpc-unknown-linux-gnu
1002976 exit ;;
1003977 s390:Linux:*:* | s390x:Linux:*:*)
1004 echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
978 echo ${UNAME_MACHINE}-ibm-linux
1005979 exit ;;
1006980 sh64*:Linux:*:*)
1007 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
981 echo ${UNAME_MACHINE}-unknown-linux-gnu
1008982 exit ;;
1009983 sh*:Linux:*:*)
1010 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
984 echo ${UNAME_MACHINE}-unknown-linux-gnu
1011985 exit ;;
1012986 sparc:Linux:*:* | sparc64:Linux:*:*)
1013 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
987 echo ${UNAME_MACHINE}-unknown-linux-gnu
1014988 exit ;;
1015989 tile*:Linux:*:*)
1016 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
990 echo ${UNAME_MACHINE}-unknown-linux-gnu
1017991 exit ;;
1018992 vax:Linux:*:*)
1019 echo ${UNAME_MACHINE}-dec-linux-${LIBC}
993 echo ${UNAME_MACHINE}-dec-linux-gnu
1020994 exit ;;
1021995 x86_64:Linux:*:*)
1022 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
996 echo ${UNAME_MACHINE}-unknown-linux-gnu
1023997 exit ;;
1024998 xtensa*:Linux:*:*)
1025 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
999 echo ${UNAME_MACHINE}-unknown-linux-gnu
10261000 exit ;;
10271001 i*86:DYNIX/ptx:4*:*)
10281002 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
12261200 BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
12271201 echo i586-pc-haiku
12281202 exit ;;
1229 x86_64:Haiku:*:*)
1230 echo x86_64-unknown-haiku
1231 exit ;;
12321203 SX-4:SUPER-UX:*:*)
12331204 echo sx4-nec-superux${UNAME_RELEASE}
12341205 exit ;;
12551226 exit ;;
12561227 *:Darwin:*:*)
12571228 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1258 eval $set_cc_for_build
1259 if test "$UNAME_PROCESSOR" = unknown ; then
1260 UNAME_PROCESSOR=powerpc
1261 fi
1262 if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
1263 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1264 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1265 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1266 grep IS_64BIT_ARCH >/dev/null
1267 then
1268 case $UNAME_PROCESSOR in
1269 i386) UNAME_PROCESSOR=x86_64 ;;
1270 powerpc) UNAME_PROCESSOR=powerpc64 ;;
1271 esac
1272 fi
1273 fi
1274 elif test "$UNAME_PROCESSOR" = i386 ; then
1275 # Avoid executing cc on OS X 10.9, as it ships with a stub
1276 # that puts up a graphical alert prompting to install
1277 # developer tools. Any system running Mac OS X 10.7 or
1278 # later (Darwin 11 and later) is required to have a 64-bit
1279 # processor. This is not true of the ARM version of Darwin
1280 # that Apple uses in portable devices.
1281 UNAME_PROCESSOR=x86_64
1282 fi
1229 case $UNAME_PROCESSOR in
1230 i386)
1231 eval $set_cc_for_build
1232 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1233 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1234 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1235 grep IS_64BIT_ARCH >/dev/null
1236 then
1237 UNAME_PROCESSOR="x86_64"
1238 fi
1239 fi ;;
1240 unknown) UNAME_PROCESSOR=powerpc ;;
1241 esac
12831242 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
12841243 exit ;;
12851244 *:procnto*:*:* | *:QNX:[0123456789]*:*)
12961255 NEO-?:NONSTOP_KERNEL:*:*)
12971256 echo neo-tandem-nsk${UNAME_RELEASE}
12981257 exit ;;
1299 NSE-*:NONSTOP_KERNEL:*:*)
1258 NSE-?:NONSTOP_KERNEL:*:*)
13001259 echo nse-tandem-nsk${UNAME_RELEASE}
13011260 exit ;;
13021261 NSR-?:NONSTOP_KERNEL:*:*)
13701329 exit ;;
13711330 esac
13721331
1332 #echo '(No uname command or uname output not recognized.)' 1>&2
1333 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
1334
1335 eval $set_cc_for_build
1336 cat >$dummy.c <<EOF
1337 #ifdef _SEQUENT_
1338 # include <sys/types.h>
1339 # include <sys/utsname.h>
1340 #endif
1341 main ()
1342 {
1343 #if defined (sony)
1344 #if defined (MIPSEB)
1345 /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
1346 I don't know.... */
1347 printf ("mips-sony-bsd\n"); exit (0);
1348 #else
1349 #include <sys/param.h>
1350 printf ("m68k-sony-newsos%s\n",
1351 #ifdef NEWSOS4
1352 "4"
1353 #else
1354 ""
1355 #endif
1356 ); exit (0);
1357 #endif
1358 #endif
1359
1360 #if defined (__arm) && defined (__acorn) && defined (__unix)
1361 printf ("arm-acorn-riscix\n"); exit (0);
1362 #endif
1363
1364 #if defined (hp300) && !defined (hpux)
1365 printf ("m68k-hp-bsd\n"); exit (0);
1366 #endif
1367
1368 #if defined (NeXT)
1369 #if !defined (__ARCHITECTURE__)
1370 #define __ARCHITECTURE__ "m68k"
1371 #endif
1372 int version;
1373 version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
1374 if (version < 4)
1375 printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
1376 else
1377 printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
1378 exit (0);
1379 #endif
1380
1381 #if defined (MULTIMAX) || defined (n16)
1382 #if defined (UMAXV)
1383 printf ("ns32k-encore-sysv\n"); exit (0);
1384 #else
1385 #if defined (CMU)
1386 printf ("ns32k-encore-mach\n"); exit (0);
1387 #else
1388 printf ("ns32k-encore-bsd\n"); exit (0);
1389 #endif
1390 #endif
1391 #endif
1392
1393 #if defined (__386BSD__)
1394 printf ("i386-pc-bsd\n"); exit (0);
1395 #endif
1396
1397 #if defined (sequent)
1398 #if defined (i386)
1399 printf ("i386-sequent-dynix\n"); exit (0);
1400 #endif
1401 #if defined (ns32000)
1402 printf ("ns32k-sequent-dynix\n"); exit (0);
1403 #endif
1404 #endif
1405
1406 #if defined (_SEQUENT_)
1407 struct utsname un;
1408
1409 uname(&un);
1410
1411 if (strncmp(un.version, "V2", 2) == 0) {
1412 printf ("i386-sequent-ptx2\n"); exit (0);
1413 }
1414 if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
1415 printf ("i386-sequent-ptx1\n"); exit (0);
1416 }
1417 printf ("i386-sequent-ptx\n"); exit (0);
1418
1419 #endif
1420
1421 #if defined (vax)
1422 # if !defined (ultrix)
1423 # include <sys/param.h>
1424 # if defined (BSD)
1425 # if BSD == 43
1426 printf ("vax-dec-bsd4.3\n"); exit (0);
1427 # else
1428 # if BSD == 199006
1429 printf ("vax-dec-bsd4.3reno\n"); exit (0);
1430 # else
1431 printf ("vax-dec-bsd\n"); exit (0);
1432 # endif
1433 # endif
1434 # else
1435 printf ("vax-dec-bsd\n"); exit (0);
1436 # endif
1437 # else
1438 printf ("vax-dec-ultrix\n"); exit (0);
1439 # endif
1440 #endif
1441
1442 #if defined (alliant) && defined (i860)
1443 printf ("i860-alliant-bsd\n"); exit (0);
1444 #endif
1445
1446 exit (1);
1447 }
1448 EOF
1449
1450 $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
1451 { echo "$SYSTEM_NAME"; exit; }
1452
1453 # Apollos put the system type in the environment.
1454
1455 test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
1456
1457 # Convex versions that predate uname can use getsysinfo(1)
1458
1459 if [ -x /usr/convex/getsysinfo ]
1460 then
1461 case `getsysinfo -f cpu_type` in
1462 c1*)
1463 echo c1-convex-bsd
1464 exit ;;
1465 c2*)
1466 if getsysinfo -f scalar_acc
1467 then echo c32-convex-bsd
1468 else echo c2-convex-bsd
1469 fi
1470 exit ;;
1471 c34*)
1472 echo c34-convex-bsd
1473 exit ;;
1474 c38*)
1475 echo c38-convex-bsd
1476 exit ;;
1477 c4*)
1478 echo c4-convex-bsd
1479 exit ;;
1480 esac
1481 fi
1482
13731483 cat >&2 <<EOF
13741484 $0: unable to guess system type
13751485
+52
-69
config.sub less more
00 #! /bin/sh
11 # Configuration validation subroutine script.
2 # Copyright 1992-2014 Free Software Foundation, Inc.
3
4 timestamp='2014-09-11'
5
6 # This file is free software; you can redistribute it and/or modify it
7 # under the terms of the GNU General Public License as published by
8 # the Free Software Foundation; either version 3 of the License, or
2 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
3 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
4 # 2011, 2012 Free Software Foundation, Inc.
5
6 timestamp='2012-04-18'
7
8 # This file is (in principle) common to ALL GNU software.
9 # The presence of a machine in this file suggests that SOME GNU software
10 # can handle that machine. It does not imply ALL GNU software can.
11 #
12 # This file is free software; you can redistribute it and/or modify
13 # it under the terms of the GNU General Public License as published by
14 # the Free Software Foundation; either version 2 of the License, or
915 # (at your option) any later version.
1016 #
11 # This program is distributed in the hope that it will be useful, but
12 # WITHOUT ANY WARRANTY; without even the implied warranty of
13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 # General Public License for more details.
17 # This program is distributed in the hope that it will be useful,
18 # but WITHOUT ANY WARRANTY; without even the implied warranty of
19 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 # GNU General Public License for more details.
1521 #
1622 # You should have received a copy of the GNU General Public License
1723 # along with this program; if not, see <http://www.gnu.org/licenses/>.
1925 # As a special exception to the GNU General Public License, if you
2026 # distribute this file as part of a program that contains a
2127 # configuration script generated by Autoconf, you may include it under
22 # the same distribution terms that you use for the rest of that
23 # program. This Exception is an additional permission under section 7
24 # of the GNU General Public License, version 3 ("GPLv3").
25
26
27 # Please send patches with a ChangeLog entry to config-patches@gnu.org.
28 # the same distribution terms that you use for the rest of that program.
29
30
31 # Please send patches to <config-patches@gnu.org>. Submit a context
32 # diff and a properly formatted GNU ChangeLog entry.
2833 #
2934 # Configuration subroutine to validate and canonicalize a configuration type.
3035 # Supply the specified configuration type as an argument.
6772 version="\
6873 GNU config.sub ($timestamp)
6974
70 Copyright 1992-2014 Free Software Foundation, Inc.
75 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
76 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
77 Free Software Foundation, Inc.
7178
7279 This is free software; see the source for copying conditions. There is NO
7380 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
115122 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
116123 case $maybe_os in
117124 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
118 linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
125 linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
119126 knetbsd*-gnu* | netbsd*-gnu* | \
120127 kopensolaris*-gnu* | \
121128 storm-chaos* | os2-emx* | rtmk-nova*)
148155 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
149156 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
150157 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
151 -apple | -axis | -knuth | -cray | -microblaze*)
158 -apple | -axis | -knuth | -cray | -microblaze)
152159 os=
153160 basic_machine=$1
154161 ;;
251258 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
252259 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
253260 | am33_2.0 \
254 | arc | arceb \
255 | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
256 | avr | avr32 \
257 | be32 | be64 \
261 | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
262 | be32 | be64 \
258263 | bfin \
259 | c4x | c8051 | clipper \
264 | c4x | clipper \
260265 | d10v | d30v | dlx | dsp16xx \
261266 | epiphany \
262267 | fido | fr30 | frv \
264269 | hexagon \
265270 | i370 | i860 | i960 | ia64 \
266271 | ip2k | iq2000 \
267 | k1om \
268272 | le32 | le64 \
269273 | lm32 \
270274 | m32c | m32r | m32rle | m68000 | m68k | m88k \
271 | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
275 | maxq | mb | microblaze | mcore | mep | metag \
272276 | mips | mipsbe | mipseb | mipsel | mipsle \
273277 | mips16 \
274278 | mips64 | mips64el \
282286 | mips64vr5900 | mips64vr5900el \
283287 | mipsisa32 | mipsisa32el \
284288 | mipsisa32r2 | mipsisa32r2el \
285 | mipsisa32r6 | mipsisa32r6el \
286289 | mipsisa64 | mipsisa64el \
287290 | mipsisa64r2 | mipsisa64r2el \
288 | mipsisa64r6 | mipsisa64r6el \
289291 | mipsisa64sb1 | mipsisa64sb1el \
290292 | mipsisa64sr71k | mipsisa64sr71kel \
291 | mipsr5900 | mipsr5900el \
292293 | mipstx39 | mipstx39el \
293294 | mn10200 | mn10300 \
294295 | moxie \
295296 | mt \
296297 | msp430 \
297298 | nds32 | nds32le | nds32be \
298 | nios | nios2 | nios2eb | nios2el \
299 | nios | nios2 \
299300 | ns16k | ns32k \
300 | open8 | or1k | or1knd | or32 \
301 | open8 \
302 | or32 \
301303 | pdp10 | pdp11 | pj | pjl \
302304 | powerpc | powerpc64 | powerpc64le | powerpcle \
303305 | pyramid \
304 | riscv32 | riscv64 \
305306 | rl78 | rx \
306307 | score \
307308 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
326327 c6x)
327328 basic_machine=tic6x-unknown
328329 ;;
329 m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
330 m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
330331 basic_machine=$basic_machine-unknown
331332 os=-none
332333 ;;
368369 | aarch64-* | aarch64_be-* \
369370 | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
370371 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
371 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
372 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
372373 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
373374 | avr-* | avr32-* \
374375 | be32-* | be64-* \
375376 | bfin-* | bs2000-* \
376377 | c[123]* | c30-* | [cjt]90-* | c4x-* \
377 | c8051-* | clipper-* | craynv-* | cydra-* \
378 | clipper-* | craynv-* | cydra-* \
378379 | d10v-* | d30v-* | dlx-* \
379380 | elxsi-* \
380381 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
383384 | hexagon-* \
384385 | i*86-* | i860-* | i960-* | ia64-* \
385386 | ip2k-* | iq2000-* \
386 | k1om-* \
387387 | le32-* | le64-* \
388388 | lm32-* \
389389 | m32c-* | m32r-* | m32rle-* \
390390 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
391 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
392 | microblaze-* | microblazeel-* \
391 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
393392 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
394393 | mips16-* \
395394 | mips64-* | mips64el-* \
403402 | mips64vr5900-* | mips64vr5900el-* \
404403 | mipsisa32-* | mipsisa32el-* \
405404 | mipsisa32r2-* | mipsisa32r2el-* \
406 | mipsisa32r6-* | mipsisa32r6el-* \
407405 | mipsisa64-* | mipsisa64el-* \
408406 | mipsisa64r2-* | mipsisa64r2el-* \
409 | mipsisa64r6-* | mipsisa64r6el-* \
410407 | mipsisa64sb1-* | mipsisa64sb1el-* \
411408 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
412 | mipsr5900-* | mipsr5900el-* \
413409 | mipstx39-* | mipstx39el-* \
414410 | mmix-* \
415411 | mt-* \
416412 | msp430-* \
417413 | nds32-* | nds32le-* | nds32be-* \
418 | nios-* | nios2-* | nios2eb-* | nios2el-* \
414 | nios-* | nios2-* \
419415 | none-* | np1-* | ns16k-* | ns32k-* \
420416 | open8-* \
421 | or1k*-* \
422417 | orion-* \
423418 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
424419 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
792787 basic_machine=ns32k-utek
793788 os=-sysv
794789 ;;
795 microblaze*)
790 microblaze)
796791 basic_machine=microblaze-xilinx
797792 ;;
798 mingw64)
799 basic_machine=x86_64-pc
800 os=-mingw64
801 ;;
802793 mingw32)
803 basic_machine=i686-pc
794 basic_machine=i386-pc
804795 os=-mingw32
805796 ;;
806797 mingw32ce)
828819 basic_machine=powerpc-unknown
829820 os=-morphos
830821 ;;
831 moxiebox)
832 basic_machine=moxie-unknown
833 os=-moxiebox
834 ;;
835822 msdos)
836823 basic_machine=i386-pc
837824 os=-msdos
840827 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
841828 ;;
842829 msys)
843 basic_machine=i686-pc
830 basic_machine=i386-pc
844831 os=-msys
845832 ;;
846833 mvs)
10311018 basic_machine=i586-unknown
10321019 os=-pw32
10331020 ;;
1034 rdos | rdos64)
1035 basic_machine=x86_64-pc
1036 os=-rdos
1037 ;;
1038 rdos32)
1021 rdos)
10391022 basic_machine=i386-pc
10401023 os=-rdos
10411024 ;;
13621345 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
13631346 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
13641347 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1365 | -sym* | -kopensolaris* | -plan9* \
1348 | -sym* | -kopensolaris* \
13661349 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
13671350 | -aos* | -aros* \
13681351 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
13691352 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
13701353 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1371 | -bitrig* | -openbsd* | -solidbsd* \
1354 | -openbsd* | -solidbsd* \
13721355 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
13731356 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
13741357 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
13751358 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
13761359 | -chorusos* | -chorusrdb* | -cegcc* \
13771360 | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1378 | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
1379 | -linux-newlib* | -linux-musl* | -linux-uclibc* \
1380 | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
1361 | -mingw32* | -linux-gnu* | -linux-android* \
1362 | -linux-newlib* | -linux-uclibc* \
1363 | -uxpv* | -beos* | -mpeix* | -udk* \
13811364 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
13821365 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
13831366 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
13841367 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
13851368 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
13861369 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1387 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
1370 | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
13881371 # Remember, each alternative MUST END IN *, to match a version number.
13891372 ;;
13901373 -qnx*)
15081491 -aros*)
15091492 os=-aros
15101493 ;;
1494 -kaos*)
1495 os=-kaos
1496 ;;
15111497 -zvmoe)
15121498 os=-zvmoe
15131499 ;;
15551541 ;;
15561542 c4x-* | tic4x-*)
15571543 os=-coff
1558 ;;
1559 c8051-*)
1560 os=-elf
15611544 ;;
15621545 hexagon-*)
15631546 os=-elf
+130
-261
configure less more
00 #! /bin/sh
11 # Guess values for system-dependent variables and create Makefiles.
2 # Generated by GNU Autoconf 2.69 for dillo 3.0.4.1.
2 # Generated by GNU Autoconf 2.69 for dillo 3.0.5-rc1.
33 #
44 #
55 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
576576 # Identity of this package.
577577 PACKAGE_NAME='dillo'
578578 PACKAGE_TARNAME='dillo'
579 PACKAGE_VERSION='3.0.4.1'
580 PACKAGE_STRING='dillo 3.0.4.1'
579 PACKAGE_VERSION='3.0.5-rc1'
580 PACKAGE_STRING='dillo 3.0.5-rc1'
581581 PACKAGE_BUGREPORT=''
582582 PACKAGE_URL=''
583583
636636 LIBJPEG_CPPFLAGS
637637 LIBJPEG_LDFLAGS
638638 LIBJPEG_LIBS
639 FLTK_CONFIG
639640 EGREP
640641 GREP
641642 CPP
663664 LDFLAGS
664665 CFLAGS
665666 CC
666 AM_BACKSLASH
667 AM_DEFAULT_VERBOSITY
668 AM_DEFAULT_V
669 AM_V
670667 am__untar
671668 am__tar
672669 AMTAR
743740 ac_subst_files=''
744741 ac_user_opts='
745742 enable_option_checking
746 enable_silent_rules
747743 with_jpeg_lib
748744 with_jpeg_inc
749745 enable_efence
13111307 # Omit some internal or obsolete options to make the list less imposing.
13121308 # This message is too long to be a string in the A/UX 3.1 sh.
13131309 cat <<_ACEOF
1314 \`configure' configures dillo 3.0.4.1 to adapt to many kinds of systems.
1310 \`configure' configures dillo 3.0.5-rc1 to adapt to many kinds of systems.
13151311
13161312 Usage: $0 [OPTION]... [VAR=VALUE]...
13171313
13821378
13831379 if test -n "$ac_init_help"; then
13841380 case $ac_init_help in
1385 short | recursive ) echo "Configuration of dillo 3.0.4.1:";;
1381 short | recursive ) echo "Configuration of dillo 3.0.5-rc1:";;
13861382 esac
13871383 cat <<\_ACEOF
13881384
13901386 --disable-option-checking ignore unrecognized --enable/--with options
13911387 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
13921388 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1393 --enable-silent-rules less verbose build output (undo: "make V=1")
1394 --disable-silent-rules verbose build output (undo: "make V=0")
13951389 --enable-efence Try to compile and run with Electric Fence
13961390 --enable-gprof Try to compile and run with profiling enabled
13971391 --enable-insure Try to compile and run with Insure++
14031397 --disable-gif Disable support for GIF images
14041398 --disable-threaded-dns Disable the advantage of a reentrant resolver library
14051399 --enable-rtfl Build with rtfl messages (for debugging rendering)
1406 --enable-dependency-tracking
1407 do not reject slow dependency extractors
1408 --disable-dependency-tracking
1409 speeds up one-time build
1400 --disable-dependency-tracking speeds up one-time build
1401 --enable-dependency-tracking do not reject slow dependency extractors
14101402
14111403 Optional Packages:
14121404 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
14921484 test -n "$ac_init_help" && exit $ac_status
14931485 if $ac_init_version; then
14941486 cat <<\_ACEOF
1495 dillo configure 3.0.4.1
1487 dillo configure 3.0.5-rc1
14961488 generated by GNU Autoconf 2.69
14971489
14981490 Copyright (C) 2012 Free Software Foundation, Inc.
22502242 This file contains any messages produced by compilers while
22512243 running configure, to aid debugging if configure makes a mistake.
22522244
2253 It was created by dillo $as_me 3.0.4.1, which was
2245 It was created by dillo $as_me 3.0.5-rc1, which was
22542246 generated by GNU Autoconf 2.69. Invocation command line was
22552247
22562248 $ $0 $@
27392731 NONENONEs,x,x, &&
27402732 program_prefix=${target_alias}-
27412733
2742 am__api_version='1.14'
2734 am__api_version='1.11'
27432735
27442736 # Find a good install program. We prefer a C program (faster),
27452737 # so one script is as good as another. But avoid the broken or
28362828
28372829 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
28382830 $as_echo_n "checking whether build environment is sane... " >&6; }
2831 # Just in case
2832 sleep 1
2833 echo timestamp > conftest.file
28392834 # Reject unsafe characters in $srcdir or the absolute working directory
28402835 # name. Accept space and tab only in the latter.
28412836 am_lf='
28462841 esac
28472842 case $srcdir in
28482843 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
2849 as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
2844 as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
28502845 esac
28512846
2852 # Do 'set' in a subshell so we don't clobber the current shell's
2847 # Do `set' in a subshell so we don't clobber the current shell's
28532848 # arguments. Must try -L first in case configure is actually a
28542849 # symlink; some systems play weird games with the mod time of symlinks
28552850 # (eg FreeBSD returns the mod time of the symlink's containing
28562851 # directory).
28572852 if (
2858 am_has_slept=no
2859 for am_try in 1 2; do
2860 echo "timestamp, slept: $am_has_slept" > conftest.file
2861 set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2862 if test "$*" = "X"; then
2863 # -L didn't work.
2864 set X `ls -t "$srcdir/configure" conftest.file`
2865 fi
2866 if test "$*" != "X $srcdir/configure conftest.file" \
2867 && test "$*" != "X conftest.file $srcdir/configure"; then
2868
2869 # If neither matched, then we have a broken ls. This can happen
2870 # if, for instance, CONFIG_SHELL is bash and it inherits a
2871 # broken ls alias from the environment. This has actually
2872 # happened. Such a system could not be considered "sane".
2873 as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
2874 alias in your environment" "$LINENO" 5
2875 fi
2876 if test "$2" = conftest.file || test $am_try -eq 2; then
2877 break
2878 fi
2879 # Just in case.
2880 sleep 1
2881 am_has_slept=yes
2882 done
2853 set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2854 if test "$*" = "X"; then
2855 # -L didn't work.
2856 set X `ls -t "$srcdir/configure" conftest.file`
2857 fi
2858 rm -f conftest.file
2859 if test "$*" != "X $srcdir/configure conftest.file" \
2860 && test "$*" != "X conftest.file $srcdir/configure"; then
2861
2862 # If neither matched, then we have a broken ls. This can happen
2863 # if, for instance, CONFIG_SHELL is bash and it inherits a
2864 # broken ls alias from the environment. This has actually
2865 # happened. Such a system could not be considered "sane".
2866 as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
2867 alias in your environment" "$LINENO" 5
2868 fi
2869
28832870 test "$2" = conftest.file
28842871 )
28852872 then
28912878 fi
28922879 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
28932880 $as_echo "yes" >&6; }
2894 # If we didn't sleep, we still need to ensure time stamps of config.status and
2895 # generated files are strictly newer.
2896 am_sleep_pid=
2897 if grep 'slept: no' conftest.file >/dev/null 2>&1; then
2898 ( sleep 1 ) &
2899 am_sleep_pid=$!
2900 fi
2901
2902 rm -f conftest.file
2903
29042881 test "$program_prefix" != NONE &&
29052882 program_transform_name="s&^&$program_prefix&;$program_transform_name"
29062883 # Use a double $ so make ignores it.
29112888 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
29122889 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
29132890
2914 # Expand $ac_aux_dir to an absolute path.
2915 am_aux_dir=`cd "$ac_aux_dir" && pwd`
2891 # expand $ac_aux_dir to an absolute path
2892 am_aux_dir=`cd $ac_aux_dir && pwd`
29162893
29172894 if test x"${MISSING+set}" != xset; then
29182895 case $am_aux_dir in
29232900 esac
29242901 fi
29252902 # Use eval to expand $SHELL
2926 if eval "$MISSING --is-lightweight"; then
2927 am_missing_run="$MISSING "
2903 if eval "$MISSING --run true"; then
2904 am_missing_run="$MISSING --run "
29282905 else
29292906 am_missing_run=
2930 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
2931 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
2907 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
2908 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
29322909 fi
29332910
29342911 if test x"${install_sh}" != xset; then
29402917 esac
29412918 fi
29422919
2943 # Installed binaries are usually stripped using 'strip' when the user
2944 # run "make install-strip". However 'strip' might not be the right
2920 # Installed binaries are usually stripped using `strip' when the user
2921 # run `make install-strip'. However `strip' might not be the right
29452922 # tool to use in cross-compilation environments, therefore Automake
2946 # will honor the 'STRIP' environment variable to overrule this program.
2923 # will honor the `STRIP' environment variable to overrule this program.
29472924 if test "$cross_compiling" != no; then
29482925 if test -n "$ac_tool_prefix"; then
29492926 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
30823059 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
30833060 $as_echo "$MKDIR_P" >&6; }
30843061
3062 mkdir_p="$MKDIR_P"
3063 case $mkdir_p in
3064 [\\/$]* | ?:[\\/]*) ;;
3065 */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
3066 esac
3067
30853068 for ac_prog in gawk mawk nawk awk
30863069 do
30873070 # Extract the first word of "$ac_prog", so it can be a program name with args.
31643147 fi
31653148 rmdir .tst 2>/dev/null
31663149
3167 # Check whether --enable-silent-rules was given.
3168 if test "${enable_silent_rules+set}" = set; then :
3169 enableval=$enable_silent_rules;
3170 fi
3171
3172 case $enable_silent_rules in # (((
3173 yes) AM_DEFAULT_VERBOSITY=0;;
3174 no) AM_DEFAULT_VERBOSITY=1;;
3175 *) AM_DEFAULT_VERBOSITY=1;;
3176 esac
3177 am_make=${MAKE-make}
3178 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
3179 $as_echo_n "checking whether $am_make supports nested variables... " >&6; }
3180 if ${am_cv_make_support_nested_variables+:} false; then :
3181 $as_echo_n "(cached) " >&6
3182 else
3183 if $as_echo 'TRUE=$(BAR$(V))
3184 BAR0=false
3185 BAR1=true
3186 V=1
3187 am__doit:
3188 @$(TRUE)
3189 .PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
3190 am_cv_make_support_nested_variables=yes
3191 else
3192 am_cv_make_support_nested_variables=no
3193 fi
3194 fi
3195 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
3196 $as_echo "$am_cv_make_support_nested_variables" >&6; }
3197 if test $am_cv_make_support_nested_variables = yes; then
3198 AM_V='$(V)'
3199 AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
3200 else
3201 AM_V=$AM_DEFAULT_VERBOSITY
3202 AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
3203 fi
3204 AM_BACKSLASH='\'
3205
32063150 if test "`cd $srcdir && pwd`" != "`pwd`"; then
32073151 # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
32083152 # is not polluted with repeated "-I."
32253169
32263170 # Define the identity of the package.
32273171 PACKAGE='dillo'
3228 VERSION='3.0.4.1'
3172 VERSION='3.0.5-rc1'
32293173
32303174
32313175 cat >>confdefs.h <<_ACEOF
32523196
32533197
32543198 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3255
3256 # For better backward compatibility. To be removed once Automake 1.9.x
3257 # dies out for good. For more background, see:
3258 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
3259 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
3260 mkdir_p='$(MKDIR_P)'
32613199
32623200 # We need awk for the "check" target. The system "awk" is bad on
32633201 # some platforms.
32653203 # in the wild :-( We should find a proper way to deprecate it ...
32663204 AMTAR='$${TAR-tar}'
32673205
3268
3269 # We'll loop over all known methods to create a tar archive until one works.
3270 _am_tools='gnutar pax cpio none'
3271
32723206 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
32733207
32743208
32753209
32763210
3277
3278
3279 # POSIX will say in a future version that running "rm -f" with no argument
3280 # is OK; and we want to be able to make that assumption in our Makefile
3281 # recipes. So use an aggressive probe to check that the usage we want is
3282 # actually supported "in the wild" to an acceptable degree.
3283 # See automake bug#10828.
3284 # To make any issue more visible, cause the running configure to be aborted
3285 # by default if the 'rm' program in use doesn't match our expectations; the
3286 # user can still override this though.
3287 if rm -f && rm -fr && rm -rf; then : OK; else
3288 cat >&2 <<'END'
3289 Oops!
3290
3291 Your 'rm' program seems unable to run without file operands specified
3292 on the command line, even when the '-f' option is present. This is contrary
3293 to the behaviour of most rm programs out there, and not conforming with
3294 the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
3295
3296 Please tell bug-automake@gnu.org about your system, including the value
3297 of your $PATH and any error possibly output before this message. This
3298 can help us improve future automake versions.
3299
3300 END
3301 if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
3302 echo 'Configuration will proceed anyway, since you have set the' >&2
3303 echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
3304 echo >&2
3305 else
3306 cat >&2 <<'END'
3307 Aborting the configuration process, to ensure you take notice of the issue.
3308
3309 You can download and install GNU coreutils to get an 'rm' implementation
3310 that behaves properly: <http://www.gnu.org/software/coreutils/>.
3311
3312 If you want to complete the configuration process using your problematic
3313 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
3314 to "yes", and re-run configure.
3315
3316 END
3317 as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
3318 fi
3319 fi
33203211
33213212
33223213 ac_config_headers="$ac_config_headers config.h"
41994090 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
42004091 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
42014092 ac_compiler_gnu=$ac_cv_c_compiler_gnu
4202
4203 ac_ext=c
4204 ac_cpp='$CPP $CPPFLAGS'
4205 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4206 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4207 ac_compiler_gnu=$ac_cv_c_compiler_gnu
4208 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
4209 $as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
4210 if ${am_cv_prog_cc_c_o+:} false; then :
4211 $as_echo_n "(cached) " >&6
4212 else
4213 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4214 /* end confdefs.h. */
4215
4216 int
4217 main ()
4218 {
4219
4220 ;
4221 return 0;
4222 }
4223 _ACEOF
4224 # Make sure it works both with $CC and with simple cc.
4225 # Following AC_PROG_CC_C_O, we do the test twice because some
4226 # compilers refuse to overwrite an existing .o file with -o,
4227 # though they will create one.
4228 am_cv_prog_cc_c_o=yes
4229 for am_i in 1 2; do
4230 if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
4231 ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
4232 ac_status=$?
4233 echo "$as_me:$LINENO: \$? = $ac_status" >&5
4234 (exit $ac_status); } \
4235 && test -f conftest2.$ac_objext; then
4236 : OK
4237 else
4238 am_cv_prog_cc_c_o=no
4239 break
4240 fi
4241 done
4242 rm -f core conftest*
4243 unset am_i
4244 fi
4245 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
4246 $as_echo "$am_cv_prog_cc_c_o" >&6; }
4247 if test "$am_cv_prog_cc_c_o" != yes; then
4248 # Losing compiler, so override with the script.
4249 # FIXME: It is wrong to rewrite CC.
4250 # But if we don't then we get into trouble of one sort or another.
4251 # A longer-term fix would be to have automake use am__CC in this case,
4252 # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
4253 CC="$am_aux_dir/compile $CC"
4254 fi
4255 ac_ext=c
4256 ac_cpp='$CPP $CPPFLAGS'
4257 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4258 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4259 ac_compiler_gnu=$ac_cv_c_compiler_gnu
4260
42614093 DEPDIR="${am__leading_dot}deps"
42624094
42634095 ac_config_commands="$ac_config_commands depfiles"
42774109 _am_result=none
42784110 # First try GNU make style include.
42794111 echo "include confinc" > confmf
4280 # Ignore all kinds of additional output from 'make'.
4112 # Ignore all kinds of additional output from `make'.
42814113 case `$am_make -s -f confmf 2> /dev/null` in #(
42824114 *the\ am__doit\ target*)
42834115 am__include=include
43334165 # We make a subdir and do the tests there. Otherwise we can end up
43344166 # making bogus files that we don't know about and never remove. For
43354167 # instance it was reported that on HP-UX the gcc test will end up
4336 # making a dummy file named 'D' -- because '-MD' means "put the output
4337 # in D".
4168 # making a dummy file named `D' -- because `-MD' means `put the output
4169 # in D'.
43384170 rm -rf conftest.dir
43394171 mkdir conftest.dir
43404172 # Copy depcomp to subdir because otherwise we won't find it if we're
43694201 : > sub/conftest.c
43704202 for i in 1 2 3 4 5 6; do
43714203 echo '#include "conftst'$i'.h"' >> sub/conftest.c
4372 # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
4373 # Solaris 10 /bin/sh.
4374 echo '/* dummy */' > sub/conftst$i.h
4204 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
4205 # Solaris 8's {/usr,}/bin/sh.
4206 touch sub/conftst$i.h
43754207 done
43764208 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
43774209
4378 # We check with '-c' and '-o' for the sake of the "dashmstdout"
4210 # We check with `-c' and `-o' for the sake of the "dashmstdout"
43794211 # mode. It turns out that the SunPro C++ compiler does not properly
4380 # handle '-M -o', and we need to detect this. Also, some Intel
4381 # versions had trouble with output in subdirs.
4212 # handle `-M -o', and we need to detect this. Also, some Intel
4213 # versions had trouble with output in subdirs
43824214 am__obj=sub/conftest.${OBJEXT-o}
43834215 am__minus_obj="-o $am__obj"
43844216 case $depmode in
43874219 test "$am__universal" = false || continue
43884220 ;;
43894221 nosideeffect)
4390 # After this tag, mechanisms are not by side-effect, so they'll
4391 # only be used when explicitly requested.
4222 # after this tag, mechanisms are not by side-effect, so they'll
4223 # only be used when explicitly requested
43924224 if test "x$enable_dependency_tracking" = xyes; then
43934225 continue
43944226 else
43964228 fi
43974229 ;;
43984230 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
4399 # This compiler won't grok '-c -o', but also, the minuso test has
4231 # This compiler won't grok `-c -o', but also, the minuso test has
44004232 # not run yet. These depmodes are late enough in the game, and
44014233 # so weak that their functioning should not be impacted.
44024234 am__obj=conftest.${OBJEXT-o}
47184550 # We make a subdir and do the tests there. Otherwise we can end up
47194551 # making bogus files that we don't know about and never remove. For
47204552 # instance it was reported that on HP-UX the gcc test will end up
4721 # making a dummy file named 'D' -- because '-MD' means "put the output
4722 # in D".
4553 # making a dummy file named `D' -- because `-MD' means `put the output
4554 # in D'.
47234555 rm -rf conftest.dir
47244556 mkdir conftest.dir
47254557 # Copy depcomp to subdir because otherwise we won't find it if we're
47544586 : > sub/conftest.c
47554587 for i in 1 2 3 4 5 6; do
47564588 echo '#include "conftst'$i'.h"' >> sub/conftest.c
4757 # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
4758 # Solaris 10 /bin/sh.
4759 echo '/* dummy */' > sub/conftst$i.h
4589 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
4590 # Solaris 8's {/usr,}/bin/sh.
4591 touch sub/conftst$i.h
47604592 done
47614593 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
47624594
4763 # We check with '-c' and '-o' for the sake of the "dashmstdout"
4595 # We check with `-c' and `-o' for the sake of the "dashmstdout"
47644596 # mode. It turns out that the SunPro C++ compiler does not properly
4765 # handle '-M -o', and we need to detect this. Also, some Intel
4766 # versions had trouble with output in subdirs.
4597 # handle `-M -o', and we need to detect this. Also, some Intel
4598 # versions had trouble with output in subdirs
47674599 am__obj=sub/conftest.${OBJEXT-o}
47684600 am__minus_obj="-o $am__obj"
47694601 case $depmode in
47724604 test "$am__universal" = false || continue
47734605 ;;
47744606 nosideeffect)
4775 # After this tag, mechanisms are not by side-effect, so they'll
4776 # only be used when explicitly requested.
4607 # after this tag, mechanisms are not by side-effect, so they'll
4608 # only be used when explicitly requested
47774609 if test "x$enable_dependency_tracking" = xyes; then
47784610 continue
47794611 else
47814613 fi
47824614 ;;
47834615 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
4784 # This compiler won't grok '-c -o', but also, the minuso test has
4616 # This compiler won't grok `-c -o', but also, the minuso test has
47854617 # not run yet. These depmodes are late enough in the game, and
47864618 # so weak that their functioning should not be impacted.
47874619 am__obj=conftest.${OBJEXT-o}
57705602
57715603 { $as_echo "$as_me:${as_lineno-$LINENO}: checking FLTK 1.3" >&5
57725604 $as_echo_n "checking FLTK 1.3... " >&6; }
5773 fltk_version="`fltk-config --version 2>/dev/null`"
5605 # Extract the first word of "fltk-config", so it can be a program name with args.
5606 set dummy fltk-config; ac_word=$2
5607 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
5608 $as_echo_n "checking for $ac_word... " >&6; }
5609 if ${ac_cv_path_FLTK_CONFIG+:} false; then :
5610 $as_echo_n "(cached) " >&6
5611 else
5612 case $FLTK_CONFIG in
5613 [\\/]* | ?:[\\/]*)
5614 ac_cv_path_FLTK_CONFIG="$FLTK_CONFIG" # Let the user override the test with a path.
5615 ;;
5616 *)
5617 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5618 for as_dir in $PATH
5619 do
5620 IFS=$as_save_IFS
5621 test -z "$as_dir" && as_dir=.
5622 for ac_exec_ext in '' $ac_executable_extensions; do
5623 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5624 ac_cv_path_FLTK_CONFIG="$as_dir/$ac_word$ac_exec_ext"
5625 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5626 break 2
5627 fi
5628 done
5629 done
5630 IFS=$as_save_IFS
5631
5632 ;;
5633 esac
5634 fi
5635 FLTK_CONFIG=$ac_cv_path_FLTK_CONFIG
5636 if test -n "$FLTK_CONFIG"; then
5637 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLTK_CONFIG" >&5
5638 $as_echo "$FLTK_CONFIG" >&6; }
5639 else
5640 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5641 $as_echo "no" >&6; }
5642 fi
5643
5644
5645 fltk_version="`$FLTK_CONFIG --version 2>/dev/null`"
57745646 case $fltk_version in
57755647 1.3.*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
57765648 $as_echo "yes" >&6; }
5777 LIBFLTK_CXXFLAGS=`fltk-config --cxxflags`
5778 LIBFLTK_CFLAGS=`fltk-config --cflags`
5779 LIBFLTK_LIBS=`fltk-config --ldflags`;;
5649 LIBFLTK_CXXFLAGS=`$FLTK_CONFIG --cxxflags`
5650 LIBFLTK_CFLAGS=`$FLTK_CONFIG --cflags`
5651 LIBFLTK_LIBS=`$FLTK_CONFIG --ldflags`;;
57805652 ?*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
57815653 $as_echo "no" >&6; }
57825654 as_fn_error $? "FLTK 1.3 required; version found: $fltk_version" "$LINENO" 5;;
59895861 $as_echo_n "checking for libpng-config... " >&6; }
59905862
59915863 if test -z "$PNG_CONFIG"; then
5992 PNG_CONFIG=`which libpng14-config`
5864 PNG_CONFIG=`which libpng16-config`
5865 if test -z "$PNG_CONFIG"; then
5866 PNG_CONFIG=`which libpng14-config`
5867 fi
59935868 if test -z "$PNG_CONFIG"; then
59945869 PNG_CONFIG=`which libpng12-config`
59955870 fi
60165891 $as_echo_n "checking for libpng version... " >&6; }
60175892 png_version=`$PNG_CONFIG --version`
60185893 case $png_version in
6019 1.[024].*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_version" >&5
5894 1.[0246].*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_version" >&5
60205895 $as_echo "$png_version" >&6; } ;;
60215896 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_version (unrecognised version)" >&5
60225897 $as_echo "$png_version (unrecognised version)" >&6; } ;;
68506725 LTLIBOBJS=$ac_ltlibobjs
68516726
68526727
6853 { $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
6854 $as_echo_n "checking that generated files are newer than configure... " >&6; }
6855 if test -n "$am_sleep_pid"; then
6856 # Hide warnings about reused PIDs.
6857 wait $am_sleep_pid 2>/dev/null
6858 fi
6859 { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
6860 $as_echo "done" >&6; }
68616728 if test -n "$EXEEXT"; then
68626729 am__EXEEXT_TRUE=
68636730 am__EXEEXT_FALSE='#'
72757142 # report actual input values of CONFIG_FILES etc. instead of their
72767143 # values after options handling.
72777144 ac_log="
7278 This file was extended by dillo $as_me 3.0.4.1, which was
7145 This file was extended by dillo $as_me 3.0.5-rc1, which was
72797146 generated by GNU Autoconf 2.69. Invocation command line was
72807147
72817148 CONFIG_FILES = $CONFIG_FILES
73417208 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
73427209 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
73437210 ac_cs_version="\\
7344 dillo config.status 3.0.4.1
7211 dillo config.status 3.0.5-rc1
73457212 configured by $0, generated by GNU Autoconf 2.69,
73467213 with options \\"\$ac_cs_config\\"
73477214
80797946
80807947 case $ac_file$ac_mode in
80817948 "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
8082 # Older Autoconf quotes --file arguments for eval, but not when files
7949 # Autoconf 2.62 quotes --file arguments for eval, but not when files
80837950 # are listed without --file. Let's play safe and only enable the eval
80847951 # if we detect the quoting.
80857952 case $CONFIG_FILES in
80927959 # Strip MF so we end up with the name of the file.
80937960 mf=`echo "$mf" | sed -e 's/:.*$//'`
80947961 # Check whether this is an Automake generated Makefile or not.
8095 # We used to match only the files named 'Makefile.in', but
7962 # We used to match only the files named `Makefile.in', but
80967963 # some people rename them; so instead we look at the file content.
80977964 # Grep'ing the first line is not enough: some people post-process
80987965 # each Makefile.in and add a new line on top of each file to say so.
81267993 continue
81277994 fi
81287995 # Extract the definition of DEPDIR, am__include, and am__quote
8129 # from the Makefile without running 'make'.
7996 # from the Makefile without running `make'.
81307997 DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
81317998 test -z "$DEPDIR" && continue
81327999 am__include=`sed -n 's/^am__include = //p' < "$mf"`
8133 test -z "$am__include" && continue
8000 test -z "am__include" && continue
81348001 am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
8002 # When using ansi2knr, U may be empty or an underscore; expand it
8003 U=`sed -n 's/^U = //p' < "$mf"`
81358004 # Find all dependency output files, they are included files with
81368005 # $(DEPDIR) in their names. We invoke sed twice because it is the
81378006 # simplest approach to changing $(DEPDIR) to its actual value in the
81388007 # expansion.
81398008 for file in `sed -n "
81408009 s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
8141 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
8010 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
81428011 # Make sure the directory exists.
81438012 test -f "$dirpart/$file" && continue
81448013 fdir=`$as_dirname -- "$file" ||
+11
-7
configure.ac less more
00 dnl Process this file with aclocal, autoconf and automake.
11
2 AC_INIT([dillo], [3.0.4.1])
2 AC_INIT([dillo], [3.0.5-rc1])
33
44 dnl Detect the canonical target build environment
55 AC_CANONICAL_TARGET
111111 dnl
112112 dnl For debugging and to be user friendly
113113 AC_MSG_CHECKING([FLTK 1.3])
114 fltk_version="`fltk-config --version 2>/dev/null`"
114 AC_PATH_PROG(FLTK_CONFIG,fltk-config)
115 fltk_version="`$FLTK_CONFIG --version 2>/dev/null`"
115116 case $fltk_version in
116117 1.3.*) AC_MSG_RESULT(yes)
117 LIBFLTK_CXXFLAGS=`fltk-config --cxxflags`
118 LIBFLTK_CFLAGS=`fltk-config --cflags`
119 LIBFLTK_LIBS=`fltk-config --ldflags`;;
118 LIBFLTK_CXXFLAGS=`$FLTK_CONFIG --cxxflags`
119 LIBFLTK_CFLAGS=`$FLTK_CONFIG --cflags`
120 LIBFLTK_LIBS=`$FLTK_CONFIG --ldflags`;;
120121 ?*) AC_MSG_RESULT(no)
121122 AC_MSG_ERROR(FLTK 1.3 required; version found: $fltk_version);;
122123 *) AC_MSG_RESULT(no)
207208
208209 dnl Check if the user hasn't set the variable $PNG_CONFIG
209210 if test -z "$PNG_CONFIG"; then
210 PNG_CONFIG=`which libpng14-config`
211 PNG_CONFIG=`which libpng16-config`
212 if test -z "$PNG_CONFIG"; then
213 PNG_CONFIG=`which libpng14-config`
214 fi
211215 if test -z "$PNG_CONFIG"; then
212216 PNG_CONFIG=`which libpng12-config`
213217 fi
233237 AC_MSG_CHECKING([for libpng version])
234238 png_version=`$PNG_CONFIG --version`
235239 case $png_version in
236 1.[[024]].*) AC_MSG_RESULT([$png_version]) ;;
240 1.[[0246]].*) AC_MSG_RESULT([$png_version]) ;;
237241 *) AC_MSG_RESULT([$png_version (unrecognised version)]) ;;
238242 esac
239243
+190
-273
depcomp less more
00 #! /bin/sh
11 # depcomp - compile a program generating dependencies as side-effects
22
3 scriptversion=2013-05-30.07; # UTC
4
5 # Copyright (C) 1999-2013 Free Software Foundation, Inc.
3 scriptversion=2012-03-27.16; # UTC
4
5 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
6 # 2011, 2012 Free Software Foundation, Inc.
67
78 # This program is free software; you can redistribute it and/or modify
89 # it under the terms of the GNU General Public License as published by
2627
2728 case $1 in
2829 '')
29 echo "$0: No command. Try '$0 --help' for more information." 1>&2
30 exit 1;
31 ;;
30 echo "$0: No command. Try '$0 --help' for more information." 1>&2
31 exit 1;
32 ;;
3233 -h | --h*)
3334 cat <<\EOF
3435 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
5556 ;;
5657 esac
5758
58 # Get the directory component of the given path, and save it in the
59 # global variables '$dir'. Note that this directory component will
60 # be either empty or ending with a '/' character. This is deliberate.
61 set_dir_from ()
62 {
63 case $1 in
64 */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
65 *) dir=;;
66 esac
67 }
68
69 # Get the suffix-stripped basename of the given path, and save it the
70 # global variable '$base'.
71 set_base_from ()
72 {
73 base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
74 }
75
76 # If no dependency file was actually created by the compiler invocation,
77 # we still have to create a dummy depfile, to avoid errors with the
78 # Makefile "include basename.Plo" scheme.
79 make_dummy_depfile ()
80 {
81 echo "#dummy" > "$depfile"
82 }
83
84 # Factor out some common post-processing of the generated depfile.
85 # Requires the auxiliary global variable '$tmpdepfile' to be set.
86 aix_post_process_depfile ()
87 {
88 # If the compiler actually managed to produce a dependency file,
89 # post-process it.
90 if test -f "$tmpdepfile"; then
91 # Each line is of the form 'foo.o: dependency.h'.
92 # Do two passes, one to just change these to
93 # $object: dependency.h
94 # and one to simply output
95 # dependency.h:
96 # which is needed to avoid the deleted-header problem.
97 { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
98 sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
99 } > "$depfile"
100 rm -f "$tmpdepfile"
101 else
102 make_dummy_depfile
103 fi
104 }
105
10659 # A tabulation character.
10760 tab=' '
10861 # A newline character.
10962 nl='
11063 '
111 # Character ranges might be problematic outside the C locale.
112 # These definitions help.
113 upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
114 lower=abcdefghijklmnopqrstuvwxyz
115 digits=0123456789
116 alpha=${upper}${lower}
11764
11865 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
11966 echo "depcomp: Variables source, object and depmode must be set" 1>&2
12673 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
12774
12875 rm -f "$tmpdepfile"
129
130 # Avoid interferences from the environment.
131 gccflag= dashmflag=
13276
13377 # Some modes work just like other modes, but use different flags. We
13478 # parameterize here, but still list the modes in the big case below,
14185 fi
14286
14387 if test "$depmode" = dashXmstdout; then
144 # This is just like dashmstdout with a different argument.
145 dashmflag=-xM
146 depmode=dashmstdout
88 # This is just like dashmstdout with a different argument.
89 dashmflag=-xM
90 depmode=dashmstdout
14791 fi
14892
14993 cygpath_u="cygpath -u -f -"
15094 if test "$depmode" = msvcmsys; then
151 # This is just like msvisualcpp but w/o cygpath translation.
152 # Just convert the backslash-escaped backslashes to single forward
153 # slashes to satisfy depend.m4
154 cygpath_u='sed s,\\\\,/,g'
155 depmode=msvisualcpp
95 # This is just like msvisualcpp but w/o cygpath translation.
96 # Just convert the backslash-escaped backslashes to single forward
97 # slashes to satisfy depend.m4
98 cygpath_u='sed s,\\\\,/,g'
99 depmode=msvisualcpp
156100 fi
157101
158102 if test "$depmode" = msvc7msys; then
159 # This is just like msvc7 but w/o cygpath translation.
160 # Just convert the backslash-escaped backslashes to single forward
161 # slashes to satisfy depend.m4
162 cygpath_u='sed s,\\\\,/,g'
163 depmode=msvc7
103 # This is just like msvc7 but w/o cygpath translation.
104 # Just convert the backslash-escaped backslashes to single forward
105 # slashes to satisfy depend.m4
106 cygpath_u='sed s,\\\\,/,g'
107 depmode=msvc7
164108 fi
165109
166110 if test "$depmode" = xlc; then
167 # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
168 gccflag=-qmakedep=gcc,-MF
169 depmode=gcc
111 # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
112 gccflag=-qmakedep=gcc,-MF
113 depmode=gcc
170114 fi
171115
172116 case "$depmode" in
189133 done
190134 "$@"
191135 stat=$?
192 if test $stat -ne 0; then
136 if test $stat -eq 0; then :
137 else
193138 rm -f "$tmpdepfile"
194139 exit $stat
195140 fi
197142 ;;
198143
199144 gcc)
200 ## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
201 ## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
202 ## (see the conditional assignment to $gccflag above).
203145 ## There are various ways to get dependency output from gcc. Here's
204146 ## why we pick this rather obscure method:
205147 ## - Don't want to use -MD because we'd like the dependencies to end
206148 ## up in a subdir. Having to rename by hand is ugly.
207149 ## (We might end up doing this anyway to support other compilers.)
208150 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
209 ## -MM, not -M (despite what the docs say). Also, it might not be
210 ## supported by the other compilers which use the 'gcc' depmode.
151 ## -MM, not -M (despite what the docs say).
211152 ## - Using -M directly means running the compiler twice (even worse
212153 ## than renaming).
213154 if test -z "$gccflag"; then
215156 fi
216157 "$@" -Wp,"$gccflag$tmpdepfile"
217158 stat=$?
218 if test $stat -ne 0; then
159 if test $stat -eq 0; then :
160 else
219161 rm -f "$tmpdepfile"
220162 exit $stat
221163 fi
222164 rm -f "$depfile"
223165 echo "$object : \\" > "$depfile"
224 # The second -e expression handles DOS-style file names with drive
225 # letters.
166 alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
167 ## The second -e expression handles DOS-style file names with drive letters.
226168 sed -e 's/^[^:]*: / /' \
227169 -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
228170 ## This next piece of magic avoids the "deleted header file" problem.
231173 ## typically no way to rebuild the header). We avoid this by adding
232174 ## dummy dependencies for each header file. Too bad gcc doesn't do
233175 ## this for us directly.
176 tr ' ' "$nl" < "$tmpdepfile" |
234177 ## Some versions of gcc put a space before the ':'. On the theory
235178 ## that the space means something, we add a space to the output as
236179 ## well. hp depmode also adds that space, but also prefixes the VPATH
237180 ## to the object. Take care to not repeat it in the output.
238181 ## Some versions of the HPUX 10.20 sed can't process this invocation
239182 ## correctly. Breaking it into two sed invocations is a workaround.
240 tr ' ' "$nl" < "$tmpdepfile" \
241 | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
242 | sed -e 's/$/ :/' >> "$depfile"
183 sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
184 | sed -e 's/$/ :/' >> "$depfile"
243185 rm -f "$tmpdepfile"
244186 ;;
245187
257199 "$@" -MDupdate "$tmpdepfile"
258200 fi
259201 stat=$?
260 if test $stat -ne 0; then
202 if test $stat -eq 0; then :
203 else
261204 rm -f "$tmpdepfile"
262205 exit $stat
263206 fi
265208
266209 if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
267210 echo "$object : \\" > "$depfile"
211
268212 # Clip off the initial element (the dependent). Don't try to be
269213 # clever and replace this with sed code, as IRIX sed won't handle
270214 # lines with more than a fixed number of characters (4096 in
272216 # the IRIX cc adds comments like '#:fec' to the end of the
273217 # dependency line.
274218 tr ' ' "$nl" < "$tmpdepfile" \
275 | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
276 | tr "$nl" ' ' >> "$depfile"
219 | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
220 tr "$nl" ' ' >> "$depfile"
277221 echo >> "$depfile"
222
278223 # The second pass generates a dummy entry for each header file.
279224 tr ' ' "$nl" < "$tmpdepfile" \
280 | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
281 >> "$depfile"
282 else
283 make_dummy_depfile
225 | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
226 >> "$depfile"
227 else
228 # The sourcefile does not contain any dependencies, so just
229 # store a dummy comment line, to avoid errors with the Makefile
230 # "include basename.Plo" scheme.
231 echo "#dummy" > "$depfile"
284232 fi
285233 rm -f "$tmpdepfile"
286234 ;;
298246 # current directory. Also, the AIX compiler puts '$object:' at the
299247 # start of each line; $object doesn't have directory information.
300248 # Version 6 uses the directory in both cases.
301 set_dir_from "$object"
302 set_base_from "$object"
249 dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
250 test "x$dir" = "x$object" && dir=
251 base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
303252 if test "$libtool" = yes; then
304253 tmpdepfile1=$dir$base.u
305254 tmpdepfile2=$base.u
312261 "$@" -M
313262 fi
314263 stat=$?
315 if test $stat -ne 0; then
264
265 if test $stat -eq 0; then :
266 else
316267 rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
317268 exit $stat
318269 fi
321272 do
322273 test -f "$tmpdepfile" && break
323274 done
324 aix_post_process_depfile
325 ;;
326
327 tcc)
328 # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
329 # FIXME: That version still under development at the moment of writing.
330 # Make that this statement remains true also for stable, released
331 # versions.
332 # It will wrap lines (doesn't matter whether long or short) with a
333 # trailing '\', as in:
334 #
335 # foo.o : \
336 # foo.c \
337 # foo.h \
338 #
339 # It will put a trailing '\' even on the last line, and will use leading
340 # spaces rather than leading tabs (at least since its commit 0394caf7
341 # "Emit spaces for -MD").
342 "$@" -MD -MF "$tmpdepfile"
343 stat=$?
344 if test $stat -ne 0; then
345 rm -f "$tmpdepfile"
346 exit $stat
347 fi
348 rm -f "$depfile"
349 # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
350 # We have to change lines of the first kind to '$object: \'.
351 sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
352 # And for each line of the second kind, we have to emit a 'dep.h:'
353 # dummy dependency, to avoid the deleted-header problem.
354 sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
275 if test -f "$tmpdepfile"; then
276 # Each line is of the form 'foo.o: dependent.h'.
277 # Do two passes, one to just change these to
278 # '$object: dependent.h' and one to simply 'dependent.h:'.
279 sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
280 sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
281 else
282 # The sourcefile does not contain any dependencies, so just
283 # store a dummy comment line, to avoid errors with the Makefile
284 # "include basename.Plo" scheme.
285 echo "#dummy" > "$depfile"
286 fi
355287 rm -f "$tmpdepfile"
356288 ;;
357289
358 ## The order of this option in the case statement is important, since the
359 ## shell code in configure will try each of these formats in the order
360 ## listed in this file. A plain '-MD' option would be understood by many
361 ## compilers, so we must ensure this comes after the gcc and icc options.
362 pgcc)
363 # Portland's C compiler understands '-MD'.
364 # Will always output deps to 'file.d' where file is the root name of the
365 # source file under compilation, even if file resides in a subdirectory.
366 # The object file name does not affect the name of the '.d' file.
367 # pgcc 10.2 will output
290 icc)
291 # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
292 # However on
293 # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
294 # ICC 7.0 will fill foo.d with something like
295 # foo.o: sub/foo.c
296 # foo.o: sub/foo.h
297 # which is wrong. We want
298 # sub/foo.o: sub/foo.c
299 # sub/foo.o: sub/foo.h
300 # sub/foo.c:
301 # sub/foo.h:
302 # ICC 7.1 will output
368303 # foo.o: sub/foo.c sub/foo.h
369 # and will wrap long lines using '\' :
304 # and will wrap long lines using '\':
370305 # foo.o: sub/foo.c ... \
371306 # sub/foo.h ... \
372307 # ...
373 set_dir_from "$object"
374 # Use the source, not the object, to determine the base name, since
375 # that's sadly what pgcc will do too.
376 set_base_from "$source"
377 tmpdepfile=$base.d
378
379 # For projects that build the same source file twice into different object
380 # files, the pgcc approach of using the *source* file root name can cause
381 # problems in parallel builds. Use a locking strategy to avoid stomping on
382 # the same $tmpdepfile.
383 lockdir=$base.d-lock
384 trap "
385 echo '$0: caught signal, cleaning up...' >&2
386 rmdir '$lockdir'
387 exit 1
388 " 1 2 13 15
389 numtries=100
390 i=$numtries
391 while test $i -gt 0; do
392 # mkdir is a portable test-and-set.
393 if mkdir "$lockdir" 2>/dev/null; then
394 # This process acquired the lock.
395 "$@" -MD
396 stat=$?
397 # Release the lock.
398 rmdir "$lockdir"
399 break
400 else
401 # If the lock is being held by a different process, wait
402 # until the winning process is done or we timeout.
403 while test -d "$lockdir" && test $i -gt 0; do
404 sleep 1
405 i=`expr $i - 1`
406 done
407 fi
408 i=`expr $i - 1`
409 done
410 trap - 1 2 13 15
411 if test $i -le 0; then
412 echo "$0: failed to acquire lock after $numtries attempts" >&2
413 echo "$0: check lockdir '$lockdir'" >&2
414 exit 1
415 fi
416
417 if test $stat -ne 0; then
308 # tcc 0.9.26 (FIXME still under development at the moment of writing)
309 # will emit a similar output, but also prepend the continuation lines
310 # with horizontal tabulation characters.
311 "$@" -MD -MF "$tmpdepfile"
312 stat=$?
313 if test $stat -eq 0; then :
314 else
418315 rm -f "$tmpdepfile"
419316 exit $stat
420317 fi
421318 rm -f "$depfile"
422 # Each line is of the form `foo.o: dependent.h',
423 # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
319 # Each line is of the form 'foo.o: dependent.h',
320 # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
424321 # Do two passes, one to just change these to
425 # `$object: dependent.h' and one to simply `dependent.h:'.
426 sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
427 # Some versions of the HPUX 10.20 sed can't process this invocation
428 # correctly. Breaking it into two sed invocations is a workaround.
429 sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
430 | sed -e 's/$/ :/' >> "$depfile"
322 # '$object: dependent.h' and one to simply 'dependent.h:'.
323 sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
324 < "$tmpdepfile" > "$depfile"
325 sed '
326 s/[ '"$tab"'][ '"$tab"']*/ /g
327 s/^ *//
328 s/ *\\*$//
329 s/^[^:]*: *//
330 /^$/d
331 /:$/d
332 s/$/ :/
333 ' < "$tmpdepfile" >> "$depfile"
431334 rm -f "$tmpdepfile"
432335 ;;
433336
438341 # 'foo.d', which lands next to the object file, wherever that
439342 # happens to be.
440343 # Much of this is similar to the tru64 case; see comments there.
441 set_dir_from "$object"
442 set_base_from "$object"
344 dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
345 test "x$dir" = "x$object" && dir=
346 base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
443347 if test "$libtool" = yes; then
444348 tmpdepfile1=$dir$base.d
445349 tmpdepfile2=$dir.libs/$base.d
450354 "$@" +Maked
451355 fi
452356 stat=$?
453 if test $stat -ne 0; then
357 if test $stat -eq 0; then :
358 else
454359 rm -f "$tmpdepfile1" "$tmpdepfile2"
455360 exit $stat
456361 fi
460365 test -f "$tmpdepfile" && break
461366 done
462367 if test -f "$tmpdepfile"; then
463 sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
368 sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
464369 # Add 'dependent.h:' lines.
465370 sed -ne '2,${
466 s/^ *//
467 s/ \\*$//
468 s/$/:/
469 p
470 }' "$tmpdepfile" >> "$depfile"
471 else
472 make_dummy_depfile
371 s/^ *//
372 s/ \\*$//
373 s/$/:/
374 p
375 }' "$tmpdepfile" >> "$depfile"
376 else
377 echo "#dummy" > "$depfile"
473378 fi
474379 rm -f "$tmpdepfile" "$tmpdepfile2"
475380 ;;
476381
477382 tru64)
478 # The Tru64 compiler uses -MD to generate dependencies as a side
479 # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
480 # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
481 # dependencies in 'foo.d' instead, so we check for that too.
482 # Subdirectories are respected.
483 set_dir_from "$object"
484 set_base_from "$object"
485
486 if test "$libtool" = yes; then
487 # Libtool generates 2 separate objects for the 2 libraries. These
488 # two compilations output dependencies in $dir.libs/$base.o.d and
489 # in $dir$base.o.d. We have to check for both files, because
490 # one of the two compilations can be disabled. We should prefer
491 # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
492 # automatically cleaned when .libs/ is deleted, while ignoring
493 # the former would cause a distcleancheck panic.
494 tmpdepfile1=$dir$base.o.d # libtool 1.5
495 tmpdepfile2=$dir.libs/$base.o.d # Likewise.
496 tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504
497 "$@" -Wc,-MD
498 else
499 tmpdepfile1=$dir$base.d
500 tmpdepfile2=$dir$base.d
501 tmpdepfile3=$dir$base.d
502 "$@" -MD
503 fi
504
505 stat=$?
506 if test $stat -ne 0; then
507 rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
508 exit $stat
509 fi
510
511 for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
512 do
513 test -f "$tmpdepfile" && break
514 done
515 # Same post-processing that is required for AIX mode.
516 aix_post_process_depfile
517 ;;
383 # The Tru64 compiler uses -MD to generate dependencies as a side
384 # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
385 # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
386 # dependencies in 'foo.d' instead, so we check for that too.
387 # Subdirectories are respected.
388 dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
389 test "x$dir" = "x$object" && dir=
390 base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
391
392 if test "$libtool" = yes; then
393 # With Tru64 cc, shared objects can also be used to make a
394 # static library. This mechanism is used in libtool 1.4 series to
395 # handle both shared and static libraries in a single compilation.
396 # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
397 #
398 # With libtool 1.5 this exception was removed, and libtool now
399 # generates 2 separate objects for the 2 libraries. These two
400 # compilations output dependencies in $dir.libs/$base.o.d and
401 # in $dir$base.o.d. We have to check for both files, because
402 # one of the two compilations can be disabled. We should prefer
403 # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
404 # automatically cleaned when .libs/ is deleted, while ignoring
405 # the former would cause a distcleancheck panic.
406 tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
407 tmpdepfile2=$dir$base.o.d # libtool 1.5
408 tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
409 tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
410 "$@" -Wc,-MD
411 else
412 tmpdepfile1=$dir$base.o.d
413 tmpdepfile2=$dir$base.d
414 tmpdepfile3=$dir$base.d
415 tmpdepfile4=$dir$base.d
416 "$@" -MD
417 fi
418
419 stat=$?
420 if test $stat -eq 0; then :
421 else
422 rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
423 exit $stat
424 fi
425
426 for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
427 do
428 test -f "$tmpdepfile" && break
429 done
430 if test -f "$tmpdepfile"; then
431 sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
432 sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
433 else
434 echo "#dummy" > "$depfile"
435 fi
436 rm -f "$tmpdepfile"
437 ;;
518438
519439 msvc7)
520440 if test "$libtool" = yes; then
525445 "$@" $showIncludes > "$tmpdepfile"
526446 stat=$?
527447 grep -v '^Note: including file: ' "$tmpdepfile"
528 if test $stat -ne 0; then
448 if test "$stat" = 0; then :
449 else
529450 rm -f "$tmpdepfile"
530451 exit $stat
531452 fi
551472 G
552473 p
553474 }' >> "$depfile"
554 echo >> "$depfile" # make sure the fragment doesn't end with a backslash
555475 rm -f "$tmpdepfile"
556476 ;;
557477
603523 # in the target name. This is to cope with DOS-style filenames:
604524 # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
605525 "$@" $dashmflag |
606 sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
526 sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
607527 rm -f "$depfile"
608528 cat < "$tmpdepfile" > "$depfile"
609 # Some versions of the HPUX 10.20 sed can't process this sed invocation
610 # correctly. Breaking it into two sed invocations is a workaround.
611 tr ' ' "$nl" < "$tmpdepfile" \
612 | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
613 | sed -e 's/$/ :/' >> "$depfile"
529 tr ' ' "$nl" < "$tmpdepfile" | \
530 ## Some versions of the HPUX 10.20 sed can't process this invocation
531 ## correctly. Breaking it into two sed invocations is a workaround.
532 sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
614533 rm -f "$tmpdepfile"
615534 ;;
616535
663582 # makedepend may prepend the VPATH from the source file name to the object.
664583 # No need to regex-escape $object, excess matching of '.' is harmless.
665584 sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
666 # Some versions of the HPUX 10.20 sed can't process the last invocation
667 # correctly. Breaking it into two sed invocations is a workaround.
668 sed '1,2d' "$tmpdepfile" \
669 | tr ' ' "$nl" \
670 | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
671 | sed -e 's/$/ :/' >> "$depfile"
585 sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
586 ## Some versions of the HPUX 10.20 sed can't process this invocation
587 ## correctly. Breaking it into two sed invocations is a workaround.
588 sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
672589 rm -f "$tmpdepfile" "$tmpdepfile".bak
673590 ;;
674591
704621 esac
705622 done
706623
707 "$@" -E \
708 | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
709 -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
710 | sed '$ s: \\$::' > "$tmpdepfile"
624 "$@" -E |
625 sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
626 -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
627 sed '$ s: \\$::' > "$tmpdepfile"
711628 rm -f "$depfile"
712629 echo "$object : \\" > "$depfile"
713630 cat < "$tmpdepfile" >> "$depfile"
739656 shift
740657 ;;
741658 "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
742 set fnord "$@"
743 shift
744 shift
745 ;;
659 set fnord "$@"
660 shift
661 shift
662 ;;
746663 *)
747 set fnord "$@" "$arg"
748 shift
749 shift
750 ;;
664 set fnord "$@" "$arg"
665 shift
666 shift
667 ;;
751668 esac
752669 done
753670 "$@" -E 2>/dev/null |
+4
-4
dillorc less more
2020
2121 # Change this if you want background images to be loaded initially.
2222 # (While browsing, this can be changed from the tools/settings menu.)
23 #load_background_images=FALSE
23 #load_background_images=NO
2424
2525 # Change this if you want to disable loading of CSS stylesheets initially.
2626 # (While browsing, this can be changed from the tools/settings menu.)
7575 # Show tooltip popups for HTML title attributes
7676 #show_tooltip=YES
7777
78 # Set this to YES if you want to limit the word wrap width to the viewport
79 # width (may be useful for iPAQ)
78 # Set this to YES to limit the word wrap width to the viewport width
8079 #limit_text_width=NO
8180
8281
157156 # You can enable multiple search_url strings at once and select from among
158157 # them at runtime, with the first being the default.
159158 # (the prefix serves to search from the Location Bar. e.g. "dd dillo image")
160 search_url="dd DuckDuckGo http://duckduckgo.com/lite/?kp=-1&q=%s"
159 search_url="dd DuckDuckGo (https) https://duckduckgo.com/lite/?kp=-1&q=%s"
161160 search_url="Wikipedia http://www.wikipedia.org/w/index.php?search=%s&go=Go"
162161 search_url="Free Dictionary http://www.thefreedictionary.com/%s"
162 search_url="Startpage (https) https://www.startpage.com/do/search?query=%s"
163163 search_url="Google http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s"
164164
165165 # If set, dillo will ask web servers to send pages in this language.
+69
-139
dlib/Makefile.in less more
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.11.6 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
3 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5 # Foundation, Inc.
56 # This Makefile.in is free software; the Free Software Foundation
67 # gives unlimited permission to copy and/or distribute it,
78 # with or without modifications, as long as this notice is preserved.
1415 @SET_MAKE@
1516
1617 VPATH = @srcdir@
17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18 am__make_running_with_option = \
19 case $${target_option-} in \
20 ?) ;; \
21 *) echo "am__make_running_with_option: internal error: invalid" \
22 "target option '$${target_option-}' specified" >&2; \
23 exit 1;; \
24 esac; \
25 has_opt=no; \
26 sane_makeflags=$$MAKEFLAGS; \
27 if $(am__is_gnu_make); then \
28 sane_makeflags=$$MFLAGS; \
29 else \
18 am__make_dryrun = \
19 { \
20 am__dry=no; \
3021 case $$MAKEFLAGS in \
3122 *\\[\ \ ]*) \
32 bs=\\; \
33 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
34 | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
23 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
24 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
25 *) \
26 for am__flg in $$MAKEFLAGS; do \
27 case $$am__flg in \
28 *=*|--*) ;; \
29 *n*) am__dry=yes; break;; \
30 esac; \
31 done;; \
3532 esac; \
36 fi; \
37 skip_next=no; \
38 strip_trailopt () \
39 { \
40 flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
41 }; \
42 for flg in $$sane_makeflags; do \
43 test $$skip_next = yes && { skip_next=no; continue; }; \
44 case $$flg in \
45 *=*|--*) continue;; \
46 -*I) strip_trailopt 'I'; skip_next=yes;; \
47 -*I?*) strip_trailopt 'I';; \
48 -*O) strip_trailopt 'O'; skip_next=yes;; \
49 -*O?*) strip_trailopt 'O';; \
50 -*l) strip_trailopt 'l'; skip_next=yes;; \
51 -*l?*) strip_trailopt 'l';; \
52 -[dEDm]) skip_next=yes;; \
53 -[JT]) skip_next=yes;; \
54 esac; \
55 case $$flg in \
56 *$$target_option*) has_opt=yes; break;; \
57 esac; \
58 done; \
59 test $$has_opt = yes
60 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
61 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
33 test $$am__dry = yes; \
34 }
6235 pkgdatadir = $(datadir)/@PACKAGE@
6336 pkgincludedir = $(includedir)/@PACKAGE@
6437 pkglibdir = $(libdir)/@PACKAGE@
7952 host_triplet = @host@
8053 target_triplet = @target@
8154 subdir = dlib
82 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
83 $(top_srcdir)/depcomp
55 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
8456 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8557 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
8658 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9264 LIBRARIES = $(noinst_LIBRARIES)
9365 AR = ar
9466 ARFLAGS = cru
95 AM_V_AR = $(am__v_AR_@AM_V@)
96 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
97 am__v_AR_0 = @echo " AR " $@;
98 am__v_AR_1 =
9967 libDlib_a_AR = $(AR) $(ARFLAGS)
10068 libDlib_a_LIBADD =
10169 am_libDlib_a_OBJECTS = dlib.$(OBJEXT)
10270 libDlib_a_OBJECTS = $(am_libDlib_a_OBJECTS)
103 AM_V_P = $(am__v_P_@AM_V@)
104 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
105 am__v_P_0 = false
106 am__v_P_1 = :
107 AM_V_GEN = $(am__v_GEN_@AM_V@)
108 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
109 am__v_GEN_0 = @echo " GEN " $@;
110 am__v_GEN_1 =
111 AM_V_at = $(am__v_at_@AM_V@)
112 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
113 am__v_at_0 = @
114 am__v_at_1 =
11571 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
11672 depcomp = $(SHELL) $(top_srcdir)/depcomp
11773 am__depfiles_maybe = depfiles
11874 am__mv = mv -f
11975 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
12076 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
121 AM_V_CC = $(am__v_CC_@AM_V@)
122 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
123 am__v_CC_0 = @echo " CC " $@;
124 am__v_CC_1 =
12577 CCLD = $(CC)
12678 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
127 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
128 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
129 am__v_CCLD_0 = @echo " CCLD " $@;
130 am__v_CCLD_1 =
13179 SOURCES = $(libDlib_a_SOURCES)
13280 DIST_SOURCES = $(libDlib_a_SOURCES)
13381 am__can_run_installinfo = \
13583 n|no|NO) false;; \
13684 *) (install-info --version) >/dev/null 2>&1;; \
13785 esac
138 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
139 # Read a list of newline-separated strings from the standard input,
140 # and print each of them once, without duplicates. Input order is
141 # *not* preserved.
142 am__uniquify_input = $(AWK) '\
143 BEGIN { nonempty = 0; } \
144 { items[$$0] = 1; nonempty = 1; } \
145 END { if (nonempty) { for (i in items) print i; }; } \
146 '
147 # Make sure the list of sources is unique. This is necessary because,
148 # e.g., the same source file might be shared among _SOURCES variables
149 # for different programs/libraries.
150 am__define_uniq_tagged_files = \
151 list='$(am__tagged_files)'; \
152 unique=`for i in $$list; do \
153 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
154 done | $(am__uniquify_input)`
15586 ETAGS = etags
15687 CTAGS = ctags
15788 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
15889 ACLOCAL = @ACLOCAL@
15990 AMTAR = @AMTAR@
160 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
16191 AUTOCONF = @AUTOCONF@
16292 AUTOHEADER = @AUTOHEADER@
16393 AUTOMAKE = @AUTOMAKE@
178108 ECHO_T = @ECHO_T@
179109 EGREP = @EGREP@
180110 EXEEXT = @EXEEXT@
111 FLTK_CONFIG = @FLTK_CONFIG@
181112 GREP = @GREP@
182113 INSTALL = @INSTALL@
183114 INSTALL_DATA = @INSTALL_DATA@
318249
319250 clean-noinstLIBRARIES:
320251 -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
321
322252 libDlib.a: $(libDlib_a_OBJECTS) $(libDlib_a_DEPENDENCIES) $(EXTRA_libDlib_a_DEPENDENCIES)
323 $(AM_V_at)-rm -f libDlib.a
324 $(AM_V_AR)$(libDlib_a_AR) libDlib.a $(libDlib_a_OBJECTS) $(libDlib_a_LIBADD)
325 $(AM_V_at)$(RANLIB) libDlib.a
253 -rm -f libDlib.a
254 $(libDlib_a_AR) libDlib.a $(libDlib_a_OBJECTS) $(libDlib_a_LIBADD)
255 $(RANLIB) libDlib.a
326256
327257 mostlyclean-compile:
328258 -rm -f *.$(OBJEXT)
333263 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlib.Po@am__quote@
334264
335265 .c.o:
336 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
337 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
338 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
266 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
267 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
268 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
339269 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
340 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
270 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
341271
342272 .c.obj:
343 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
344 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
345 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
273 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
274 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
275 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
346276 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
347 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
348
349 ID: $(am__tagged_files)
350 $(am__define_uniq_tagged_files); mkid -fID $$unique
351 tags: tags-am
352 TAGS: tags
353
354 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
277 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
278
279 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
280 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
281 unique=`for i in $$list; do \
282 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
283 done | \
284 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
285 END { if (nonempty) { for (i in files) print i; }; }'`; \
286 mkid -fID $$unique
287 tags: TAGS
288
289 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
290 $(TAGS_FILES) $(LISP)
355291 set x; \
356292 here=`pwd`; \
357 $(am__define_uniq_tagged_files); \
293 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
294 unique=`for i in $$list; do \
295 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
296 done | \
297 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
298 END { if (nonempty) { for (i in files) print i; }; }'`; \
358299 shift; \
359300 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
360301 test -n "$$unique" || unique=$$empty_fix; \
366307 $$unique; \
367308 fi; \
368309 fi
369 ctags: ctags-am
370
371 CTAGS: ctags
372 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
373 $(am__define_uniq_tagged_files); \
310 ctags: CTAGS
311 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
312 $(TAGS_FILES) $(LISP)
313 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
314 unique=`for i in $$list; do \
315 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
316 done | \
317 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
318 END { if (nonempty) { for (i in files) print i; }; }'`; \
374319 test -z "$(CTAGS_ARGS)$$unique" \
375320 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
376321 $$unique
379324 here=`$(am__cd) $(top_builddir) && pwd` \
380325 && $(am__cd) $(top_srcdir) \
381326 && gtags -i $(GTAGS_ARGS) "$$here"
382 cscopelist: cscopelist-am
383
384 cscopelist-am: $(am__tagged_files)
385 list='$(am__tagged_files)'; \
386 case "$(srcdir)" in \
387 [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
388 *) sdir=$(subdir)/$(srcdir) ;; \
389 esac; \
390 for i in $$list; do \
391 if test -f "$$i"; then \
392 echo "$(subdir)/$$i"; \
393 else \
394 echo "$$sdir/$$i"; \
395 fi; \
396 done >> $(top_builddir)/cscope.files
397327
398328 distclean-tags:
399329 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
533463
534464 .MAKE: install-am install-strip
535465
536 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
537 clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
538 distclean-compile distclean-generic distclean-tags distdir dvi \
539 dvi-am html html-am info info-am install install-am \
540 install-data install-data-am install-dvi install-dvi-am \
541 install-exec install-exec-am install-html install-html-am \
542 install-info install-info-am install-man install-pdf \
543 install-pdf-am install-ps install-ps-am install-strip \
544 installcheck installcheck-am installdirs maintainer-clean \
466 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
467 clean-noinstLIBRARIES ctags distclean distclean-compile \
468 distclean-generic distclean-tags distdir dvi dvi-am html \
469 html-am info info-am install install-am install-data \
470 install-data-am install-dvi install-dvi-am install-exec \
471 install-exec-am install-html install-html-am install-info \
472 install-info-am install-man install-pdf install-pdf-am \
473 install-ps install-ps-am install-strip installcheck \
474 installcheck-am installdirs maintainer-clean \
545475 maintainer-clean-generic mostlyclean mostlyclean-compile \
546 mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
476 mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
547477 uninstall-am
548478
549479
+12
-0
dlib/dlib.c less more
405405 va_copy(argp2, argp);
406406 n = vsnprintf(ds->str + ds->len, ds->sz - ds->len, format, argp2);
407407 va_end(argp2);
408 #if defined(__sgi)
409 /* IRIX does not conform to C99; if the entire argument did not fit
410 * into the buffer, n = buffer space used (minus 1 for terminator)
411 */
412 if (n > -1 && n + 1 < ds->sz - ds->len) {
413 ds->len += n; /* Success! */
414 break;
415 } else {
416 n_sz = ds->sz * 2;
417 }
418 #else
408419 if (n > -1 && n < ds->sz - ds->len) {
409420 ds->len += n; /* Success! */
410421 break;
413424 } else { /* old glibc */
414425 n_sz = ds->sz * 2;
415426 }
427 #endif
416428 dStr_resize(ds, n_sz, (ds->len > 0) ? 1 : 0);
417429 }
418430 }
+3
-2
doc/Dpid.txt less more
284284 Debugging a dpi
285285 ---------------
286286
287 The simplest way is to add printf() feedback using the MSG*
287 The simplest way is to add printf-like feedback using the MSG*
288288 macros. You can start the dpid by hand on a terminal to force
289 messages to go there.
289 messages to go there. Filter dpis use sdterr and server dpis
290 stdout.
290291
291292 Sometimes more complex dpis need more than MSG*. In this case
292293 you can use gdb like this.
+50
-78
doc/Makefile.in less more
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.11.6 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
3 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5 # Foundation, Inc.
56 # This Makefile.in is free software; the Free Software Foundation
67 # gives unlimited permission to copy and/or distribute it,
78 # with or without modifications, as long as this notice is preserved.
1415 @SET_MAKE@
1516
1617 VPATH = @srcdir@
17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18 am__make_running_with_option = \
19 case $${target_option-} in \
20 ?) ;; \
21 *) echo "am__make_running_with_option: internal error: invalid" \
22 "target option '$${target_option-}' specified" >&2; \
23 exit 1;; \
24 esac; \
25 has_opt=no; \
26 sane_makeflags=$$MAKEFLAGS; \
27 if $(am__is_gnu_make); then \
28 sane_makeflags=$$MFLAGS; \
29 else \
18 am__make_dryrun = \
19 { \
20 am__dry=no; \
3021 case $$MAKEFLAGS in \
3122 *\\[\ \ ]*) \
32 bs=\\; \
33 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
34 | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
23 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
24 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
25 *) \
26 for am__flg in $$MAKEFLAGS; do \
27 case $$am__flg in \
28 *=*|--*) ;; \
29 *n*) am__dry=yes; break;; \
30 esac; \
31 done;; \
3532 esac; \
36 fi; \
37 skip_next=no; \
38 strip_trailopt () \
39 { \
40 flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
41 }; \
42 for flg in $$sane_makeflags; do \
43 test $$skip_next = yes && { skip_next=no; continue; }; \
44 case $$flg in \
45 *=*|--*) continue;; \
46 -*I) strip_trailopt 'I'; skip_next=yes;; \
47 -*I?*) strip_trailopt 'I';; \
48 -*O) strip_trailopt 'O'; skip_next=yes;; \
49 -*O?*) strip_trailopt 'O';; \
50 -*l) strip_trailopt 'l'; skip_next=yes;; \
51 -*l?*) strip_trailopt 'l';; \
52 -[dEDm]) skip_next=yes;; \
53 -[JT]) skip_next=yes;; \
54 esac; \
55 case $$flg in \
56 *$$target_option*) has_opt=yes; break;; \
57 esac; \
58 done; \
59 test $$has_opt = yes
60 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
61 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
33 test $$am__dry = yes; \
34 }
6235 pkgdatadir = $(datadir)/@PACKAGE@
6336 pkgincludedir = $(includedir)/@PACKAGE@
6437 pkglibdir = $(libdir)/@PACKAGE@
7952 host_triplet = @host@
8053 target_triplet = @target@
8154 subdir = doc
82 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
83 $(dist_doc_DATA) README
55 DIST_COMMON = README $(dist_doc_DATA) $(srcdir)/Makefile.am \
56 $(srcdir)/Makefile.in
8457 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8558 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
8659 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
8962 CONFIG_HEADER = $(top_builddir)/config.h
9063 CONFIG_CLEAN_FILES =
9164 CONFIG_CLEAN_VPATH_FILES =
92 AM_V_P = $(am__v_P_@AM_V@)
93 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
94 am__v_P_0 = false
95 am__v_P_1 = :
96 AM_V_GEN = $(am__v_GEN_@AM_V@)
97 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
98 am__v_GEN_0 = @echo " GEN " $@;
99 am__v_GEN_1 =
100 AM_V_at = $(am__v_at_@AM_V@)
101 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
102 am__v_at_0 = @
103 am__v_at_1 =
10465 SOURCES =
10566 DIST_SOURCES =
10667 am__can_run_installinfo = \
140101 NROFF = nroff
141102 MANS = $(man_MANS)
142103 DATA = $(dist_doc_DATA)
143 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
144104 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
145105 ACLOCAL = @ACLOCAL@
146106 AMTAR = @AMTAR@
147 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
148107 AUTOCONF = @AUTOCONF@
149108 AUTOHEADER = @AUTOHEADER@
150109 AUTOMAKE = @AUTOMAKE@
165124 ECHO_T = @ECHO_T@
166125 EGREP = @EGREP@
167126 EXEEXT = @EXEEXT@
127 FLTK_CONFIG = @FLTK_CONFIG@
168128 GREP = @GREP@
169129 INSTALL = @INSTALL@
170130 INSTALL_DATA = @INSTALL_DATA@
402362 @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
403363 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
404364 dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
405 tags TAGS:
406
407 ctags CTAGS:
408
409 cscope cscopelist:
365 tags: TAGS
366 TAGS:
367
368 ctags: CTAGS
369 CTAGS:
410370
411371
412372 distdir: $(DISTFILES)
373 @list='$(MANS)'; if test -n "$$list"; then \
374 list=`for p in $$list; do \
375 if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
376 if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
377 if test -n "$$list" && \
378 grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
379 echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
380 grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
381 echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
382 echo " typically \`make maintainer-clean' will remove them" >&2; \
383 exit 1; \
384 else :; fi; \
385 else :; fi
413386 @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
414387 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
415388 list='$(DISTFILES)'; \
546519
547520 .MAKE: install-am install-strip
548521
549 .PHONY: all all-am check check-am clean clean-generic cscopelist-am \
550 ctags-am distclean distclean-generic distdir dvi dvi-am html \
551 html-am info info-am install install-am install-data \
552 install-data-am install-dist_docDATA install-dvi \
553 install-dvi-am install-exec install-exec-am install-html \
554 install-html-am install-info install-info-am install-man \
555 install-man1 install-pdf install-pdf-am install-ps \
556 install-ps-am install-strip installcheck installcheck-am \
557 installdirs maintainer-clean maintainer-clean-generic \
558 mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags-am \
559 uninstall uninstall-am uninstall-dist_docDATA uninstall-man \
560 uninstall-man1
522 .PHONY: all all-am check check-am clean clean-generic distclean \
523 distclean-generic distdir dvi dvi-am html html-am info info-am \
524 install install-am install-data install-data-am \
525 install-dist_docDATA install-dvi install-dvi-am install-exec \
526 install-exec-am install-html install-html-am install-info \
527 install-info-am install-man install-man1 install-pdf \
528 install-pdf-am install-ps install-ps-am install-strip \
529 installcheck installcheck-am installdirs maintainer-clean \
530 maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
531 pdf-am ps ps-am uninstall uninstall-am uninstall-dist_docDATA \
532 uninstall-man uninstall-man1
561533
562534
563535 dillo.1: $(srcdir)/dillo.1.in Makefile
+1
-1
doc/user_help.html less more
313313 <p>
314314 Example, in dillorc:<br>
315315 <blockquote>
316 <code>search_url="dd Duckduckgo http://duckduckgo.com/lite/?kp=-1&q=%s"</code>
316 <code>search_url="dd Duckduckgo http://duckduckgo.com/lite/?kp=-1&amp;q=%s"</code>
317317 </blockquote>
318318 means you can reach the location bar (CTRL+L), then type:
319319 <blockquote>
+137
-241
dpi/Makefile.in less more
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.11.6 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
3 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5 # Foundation, Inc.
56 # This Makefile.in is free software; the Free Software Foundation
67 # gives unlimited permission to copy and/or distribute it,
78 # with or without modifications, as long as this notice is preserved.
1415 @SET_MAKE@
1516
1617 VPATH = @srcdir@
17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18 am__make_running_with_option = \
19 case $${target_option-} in \
20 ?) ;; \
21 *) echo "am__make_running_with_option: internal error: invalid" \
22 "target option '$${target_option-}' specified" >&2; \
23 exit 1;; \
24 esac; \
25 has_opt=no; \
26 sane_makeflags=$$MAKEFLAGS; \
27 if $(am__is_gnu_make); then \
28 sane_makeflags=$$MFLAGS; \
29 else \
18 am__make_dryrun = \
19 { \
20 am__dry=no; \
3021 case $$MAKEFLAGS in \
3122 *\\[\ \ ]*) \
32 bs=\\; \
33 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
34 | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
23 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
24 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
25 *) \
26 for am__flg in $$MAKEFLAGS; do \
27 case $$am__flg in \
28 *=*|--*) ;; \
29 *n*) am__dry=yes; break;; \
30 esac; \
31 done;; \
3532 esac; \
36 fi; \
37 skip_next=no; \
38 strip_trailopt () \
39 { \
40 flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
41 }; \
42 for flg in $$sane_makeflags; do \
43 test $$skip_next = yes && { skip_next=no; continue; }; \
44 case $$flg in \
45 *=*|--*) continue;; \
46 -*I) strip_trailopt 'I'; skip_next=yes;; \
47 -*I?*) strip_trailopt 'I';; \
48 -*O) strip_trailopt 'O'; skip_next=yes;; \
49 -*O?*) strip_trailopt 'O';; \
50 -*l) strip_trailopt 'l'; skip_next=yes;; \
51 -*l?*) strip_trailopt 'l';; \
52 -[dEDm]) skip_next=yes;; \
53 -[JT]) skip_next=yes;; \
54 esac; \
55 case $$flg in \
56 *$$target_option*) has_opt=yes; break;; \
57 esac; \
58 done; \
59 test $$has_opt = yes
60 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
61 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
33 test $$am__dry = yes; \
34 }
6235 pkgdatadir = $(datadir)/@PACKAGE@
6336 pkgincludedir = $(includedir)/@PACKAGE@
6437 pkglibdir = $(libdir)/@PACKAGE@
8861 cookies_PROGRAMS = cookies.dpi$(EXEEXT)
8962 datauri_PROGRAMS = datauri.filter.dpi$(EXEEXT)
9063 subdir = dpi
91 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
92 $(top_srcdir)/depcomp
64 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
9365 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9466 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
9567 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
146118 vsource_filter_dpi_OBJECTS = $(am_vsource_filter_dpi_OBJECTS)
147119 vsource_filter_dpi_DEPENDENCIES = $(top_builddir)/dpip/libDpip.a \
148120 $(top_builddir)/dlib/libDlib.a
149 AM_V_P = $(am__v_P_@AM_V@)
150 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
151 am__v_P_0 = false
152 am__v_P_1 = :
153 AM_V_GEN = $(am__v_GEN_@AM_V@)
154 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
155 am__v_GEN_0 = @echo " GEN " $@;
156 am__v_GEN_1 =
157 AM_V_at = $(am__v_at_@AM_V@)
158 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
159 am__v_at_0 = @
160 am__v_at_1 =
161121 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
162122 depcomp = $(SHELL) $(top_srcdir)/depcomp
163123 am__depfiles_maybe = depfiles
164124 am__mv = mv -f
165125 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
166126 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
167 AM_V_CC = $(am__v_CC_@AM_V@)
168 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
169 am__v_CC_0 = @echo " CC " $@;
170 am__v_CC_1 =
171127 CCLD = $(CC)
172128 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
173 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
174 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
175 am__v_CCLD_0 = @echo " CCLD " $@;
176 am__v_CCLD_1 =
177 AM_V_lt = $(am__v_lt_@AM_V@)
178 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
179 am__v_lt_0 = --silent
180 am__v_lt_1 =
181129 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
182130 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
183 AM_V_CXX = $(am__v_CXX_@AM_V@)
184 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
185 am__v_CXX_0 = @echo " CXX " $@;
186 am__v_CXX_1 =
187131 CXXLD = $(CXX)
188132 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
189133 -o $@
190 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
191 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
192 am__v_CXXLD_0 = @echo " CXXLD " $@;
193 am__v_CXXLD_1 =
194134 SOURCES = $(bookmarks_dpi_SOURCES) $(cookies_dpi_SOURCES) \
195135 $(datauri_filter_dpi_SOURCES) $(downloads_dpi_SOURCES) \
196136 $(file_dpi_SOURCES) $(ftp_filter_dpi_SOURCES) \
206146 n|no|NO) false;; \
207147 *) (install-info --version) >/dev/null 2>&1;; \
208148 esac
209 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
210 # Read a list of newline-separated strings from the standard input,
211 # and print each of them once, without duplicates. Input order is
212 # *not* preserved.
213 am__uniquify_input = $(AWK) '\
214 BEGIN { nonempty = 0; } \
215 { items[$$0] = 1; nonempty = 1; } \
216 END { if (nonempty) { for (i in items) print i; }; } \
217 '
218 # Make sure the list of sources is unique. This is necessary because,
219 # e.g., the same source file might be shared among _SOURCES variables
220 # for different programs/libraries.
221 am__define_uniq_tagged_files = \
222 list='$(am__tagged_files)'; \
223 unique=`for i in $$list; do \
224 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
225 done | $(am__uniquify_input)`
226149 ETAGS = etags
227150 CTAGS = ctags
228151 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
229152 ACLOCAL = @ACLOCAL@
230153 AMTAR = @AMTAR@
231 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
232154 AUTOCONF = @AUTOCONF@
233155 AUTOHEADER = @AUTOHEADER@
234156 AUTOMAKE = @AUTOMAKE@
249171 ECHO_T = @ECHO_T@
250172 EGREP = @EGREP@
251173 EXEEXT = @EXEEXT@
174 FLTK_CONFIG = @FLTK_CONFIG@
252175 GREP = @GREP@
253176 INSTALL = @INSTALL@
254177 INSTALL_DATA = @INSTALL_DATA@
445368 fi; \
446369 for p in $$list; do echo "$$p $$p"; done | \
447370 sed 's/$(EXEEXT)$$//' | \
448 while read p p1; do if test -f $$p \
449 ; then echo "$$p"; echo "$$p"; else :; fi; \
371 while read p p1; do if test -f $$p; \
372 then echo "$$p"; echo "$$p"; else :; fi; \
450373 done | \
451 sed -e 'p;s,.*/,,;n;h' \
452 -e 's|.*|.|' \
374 sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
453375 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
454376 sed 'N;N;N;s,\n, ,g' | \
455377 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
470392 @list='$(bookmarks_PROGRAMS)'; test -n "$(bookmarksdir)" || list=; \
471393 files=`for p in $$list; do echo "$$p"; done | \
472394 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
473 -e 's/$$/$(EXEEXT)/' \
474 `; \
395 -e 's/$$/$(EXEEXT)/' `; \
475396 test -n "$$list" || exit 0; \
476397 echo " ( cd '$(DESTDIR)$(bookmarksdir)' && rm -f" $$files ")"; \
477398 cd "$(DESTDIR)$(bookmarksdir)" && rm -f $$files
487408 fi; \
488409 for p in $$list; do echo "$$p $$p"; done | \
489410 sed 's/$(EXEEXT)$$//' | \
490 while read p p1; do if test -f $$p \
491 ; then echo "$$p"; echo "$$p"; else :; fi; \
411 while read p p1; do if test -f $$p; \
412 then echo "$$p"; echo "$$p"; else :; fi; \
492413 done | \
493 sed -e 'p;s,.*/,,;n;h' \
494 -e 's|.*|.|' \
414 sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
495415 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
496416 sed 'N;N;N;s,\n, ,g' | \
497417 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
512432 @list='$(cookies_PROGRAMS)'; test -n "$(cookiesdir)" || list=; \
513433 files=`for p in $$list; do echo "$$p"; done | \
514434 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
515 -e 's/$$/$(EXEEXT)/' \
516 `; \
435 -e 's/$$/$(EXEEXT)/' `; \
517436 test -n "$$list" || exit 0; \
518437 echo " ( cd '$(DESTDIR)$(cookiesdir)' && rm -f" $$files ")"; \
519438 cd "$(DESTDIR)$(cookiesdir)" && rm -f $$files
529448 fi; \
530449 for p in $$list; do echo "$$p $$p"; done | \
531450 sed 's/$(EXEEXT)$$//' | \
532 while read p p1; do if test -f $$p \
533 ; then echo "$$p"; echo "$$p"; else :; fi; \
451 while read p p1; do if test -f $$p; \
452 then echo "$$p"; echo "$$p"; else :; fi; \
534453 done | \
535 sed -e 'p;s,.*/,,;n;h' \
536 -e 's|.*|.|' \
454 sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
537455 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
538456 sed 'N;N;N;s,\n, ,g' | \
539457 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
554472 @list='$(datauri_PROGRAMS)'; test -n "$(datauridir)" || list=; \
555473 files=`for p in $$list; do echo "$$p"; done | \
556474 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
557 -e 's/$$/$(EXEEXT)/' \
558 `; \
475 -e 's/$$/$(EXEEXT)/' `; \
559476 test -n "$$list" || exit 0; \
560477 echo " ( cd '$(DESTDIR)$(datauridir)' && rm -f" $$files ")"; \
561478 cd "$(DESTDIR)$(datauridir)" && rm -f $$files
571488 fi; \
572489 for p in $$list; do echo "$$p $$p"; done | \
573490 sed 's/$(EXEEXT)$$//' | \
574 while read p p1; do if test -f $$p \
575 ; then echo "$$p"; echo "$$p"; else :; fi; \
491 while read p p1; do if test -f $$p; \
492 then echo "$$p"; echo "$$p"; else :; fi; \
576493 done | \
577 sed -e 'p;s,.*/,,;n;h' \
578 -e 's|.*|.|' \
494 sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
579495 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
580496 sed 'N;N;N;s,\n, ,g' | \
581497 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
596512 @list='$(downloads_PROGRAMS)'; test -n "$(downloadsdir)" || list=; \
597513 files=`for p in $$list; do echo "$$p"; done | \
598514 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
599 -e 's/$$/$(EXEEXT)/' \
600 `; \
515 -e 's/$$/$(EXEEXT)/' `; \
601516 test -n "$$list" || exit 0; \
602517 echo " ( cd '$(DESTDIR)$(downloadsdir)' && rm -f" $$files ")"; \
603518 cd "$(DESTDIR)$(downloadsdir)" && rm -f $$files
613528 fi; \
614529 for p in $$list; do echo "$$p $$p"; done | \
615530 sed 's/$(EXEEXT)$$//' | \
616 while read p p1; do if test -f $$p \
617 ; then echo "$$p"; echo "$$p"; else :; fi; \
531 while read p p1; do if test -f $$p; \
532 then echo "$$p"; echo "$$p"; else :; fi; \
618533 done | \
619 sed -e 'p;s,.*/,,;n;h' \
620 -e 's|.*|.|' \
534 sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
621535 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
622536 sed 'N;N;N;s,\n, ,g' | \
623537 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
638552 @list='$(file_PROGRAMS)'; test -n "$(filedir)" || list=; \
639553 files=`for p in $$list; do echo "$$p"; done | \
640554 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
641 -e 's/$$/$(EXEEXT)/' \
642 `; \
555 -e 's/$$/$(EXEEXT)/' `; \
643556 test -n "$$list" || exit 0; \
644557 echo " ( cd '$(DESTDIR)$(filedir)' && rm -f" $$files ")"; \
645558 cd "$(DESTDIR)$(filedir)" && rm -f $$files
655568 fi; \
656569 for p in $$list; do echo "$$p $$p"; done | \
657570 sed 's/$(EXEEXT)$$//' | \
658 while read p p1; do if test -f $$p \
659 ; then echo "$$p"; echo "$$p"; else :; fi; \
571 while read p p1; do if test -f $$p; \
572 then echo "$$p"; echo "$$p"; else :; fi; \
660573 done | \
661 sed -e 'p;s,.*/,,;n;h' \
662 -e 's|.*|.|' \
574 sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
663575 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
664576 sed 'N;N;N;s,\n, ,g' | \
665577 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
680592 @list='$(ftp_PROGRAMS)'; test -n "$(ftpdir)" || list=; \
681593 files=`for p in $$list; do echo "$$p"; done | \
682594 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
683 -e 's/$$/$(EXEEXT)/' \
684 `; \
595 -e 's/$$/$(EXEEXT)/' `; \
685596 test -n "$$list" || exit 0; \
686597 echo " ( cd '$(DESTDIR)$(ftpdir)' && rm -f" $$files ")"; \
687598 cd "$(DESTDIR)$(ftpdir)" && rm -f $$files
697608 fi; \
698609 for p in $$list; do echo "$$p $$p"; done | \
699610 sed 's/$(EXEEXT)$$//' | \
700 while read p p1; do if test -f $$p \
701 ; then echo "$$p"; echo "$$p"; else :; fi; \
611 while read p p1; do if test -f $$p; \
612 then echo "$$p"; echo "$$p"; else :; fi; \
702613 done | \
703 sed -e 'p;s,.*/,,;n;h' \
704 -e 's|.*|.|' \
614 sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
705615 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
706616 sed 'N;N;N;s,\n, ,g' | \
707617 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
722632 @list='$(hello_PROGRAMS)'; test -n "$(hellodir)" || list=; \
723633 files=`for p in $$list; do echo "$$p"; done | \
724634 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
725 -e 's/$$/$(EXEEXT)/' \
726 `; \
635 -e 's/$$/$(EXEEXT)/' `; \
727636 test -n "$$list" || exit 0; \
728637 echo " ( cd '$(DESTDIR)$(hellodir)' && rm -f" $$files ")"; \
729638 cd "$(DESTDIR)$(hellodir)" && rm -f $$files
739648 fi; \
740649 for p in $$list; do echo "$$p $$p"; done | \
741650 sed 's/$(EXEEXT)$$//' | \
742 while read p p1; do if test -f $$p \
743 ; then echo "$$p"; echo "$$p"; else :; fi; \
651 while read p p1; do if test -f $$p; \
652 then echo "$$p"; echo "$$p"; else :; fi; \
744653 done | \
745 sed -e 'p;s,.*/,,;n;h' \
746 -e 's|.*|.|' \
654 sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
747655 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
748656 sed 'N;N;N;s,\n, ,g' | \
749657 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
764672 @list='$(https_PROGRAMS)'; test -n "$(httpsdir)" || list=; \
765673 files=`for p in $$list; do echo "$$p"; done | \
766674 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
767 -e 's/$$/$(EXEEXT)/' \
768 `; \
675 -e 's/$$/$(EXEEXT)/' `; \
769676 test -n "$$list" || exit 0; \
770677 echo " ( cd '$(DESTDIR)$(httpsdir)' && rm -f" $$files ")"; \
771678 cd "$(DESTDIR)$(httpsdir)" && rm -f $$files
781688 fi; \
782689 for p in $$list; do echo "$$p $$p"; done | \
783690 sed 's/$(EXEEXT)$$//' | \
784 while read p p1; do if test -f $$p \
785 ; then echo "$$p"; echo "$$p"; else :; fi; \
691 while read p p1; do if test -f $$p; \
692 then echo "$$p"; echo "$$p"; else :; fi; \
786693 done | \
787 sed -e 'p;s,.*/,,;n;h' \
788 -e 's|.*|.|' \
694 sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
789695 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
790696 sed 'N;N;N;s,\n, ,g' | \
791697 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
806712 @list='$(vsource_PROGRAMS)'; test -n "$(vsourcedir)" || list=; \
807713 files=`for p in $$list; do echo "$$p"; done | \
808714 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
809 -e 's/$$/$(EXEEXT)/' \
810 `; \
715 -e 's/$$/$(EXEEXT)/' `; \
811716 test -n "$$list" || exit 0; \
812717 echo " ( cd '$(DESTDIR)$(vsourcedir)' && rm -f" $$files ")"; \
813718 cd "$(DESTDIR)$(vsourcedir)" && rm -f $$files
814719
815720 clean-vsourcePROGRAMS:
816721 -test -z "$(vsource_PROGRAMS)" || rm -f $(vsource_PROGRAMS)
817
818722 bookmarks.dpi$(EXEEXT): $(bookmarks_dpi_OBJECTS) $(bookmarks_dpi_DEPENDENCIES) $(EXTRA_bookmarks_dpi_DEPENDENCIES)
819723 @rm -f bookmarks.dpi$(EXEEXT)
820 $(AM_V_CCLD)$(LINK) $(bookmarks_dpi_OBJECTS) $(bookmarks_dpi_LDADD) $(LIBS)
821
724 $(LINK) $(bookmarks_dpi_OBJECTS) $(bookmarks_dpi_LDADD) $(LIBS)
822725 cookies.dpi$(EXEEXT): $(cookies_dpi_OBJECTS) $(cookies_dpi_DEPENDENCIES) $(EXTRA_cookies_dpi_DEPENDENCIES)
823726 @rm -f cookies.dpi$(EXEEXT)
824 $(AM_V_CCLD)$(LINK) $(cookies_dpi_OBJECTS) $(cookies_dpi_LDADD) $(LIBS)
825
727 $(LINK) $(cookies_dpi_OBJECTS) $(cookies_dpi_LDADD) $(LIBS)
826728 datauri.filter.dpi$(EXEEXT): $(datauri_filter_dpi_OBJECTS) $(datauri_filter_dpi_DEPENDENCIES) $(EXTRA_datauri_filter_dpi_DEPENDENCIES)
827729 @rm -f datauri.filter.dpi$(EXEEXT)
828 $(AM_V_CCLD)$(LINK) $(datauri_filter_dpi_OBJECTS) $(datauri_filter_dpi_LDADD) $(LIBS)
829
730 $(LINK) $(datauri_filter_dpi_OBJECTS) $(datauri_filter_dpi_LDADD) $(LIBS)
830731 downloads.dpi$(EXEEXT): $(downloads_dpi_OBJECTS) $(downloads_dpi_DEPENDENCIES) $(EXTRA_downloads_dpi_DEPENDENCIES)
831732 @rm -f downloads.dpi$(EXEEXT)
832 $(AM_V_CXXLD)$(downloads_dpi_LINK) $(downloads_dpi_OBJECTS) $(downloads_dpi_LDADD) $(LIBS)
833
733 $(downloads_dpi_LINK) $(downloads_dpi_OBJECTS) $(downloads_dpi_LDADD) $(LIBS)
834734 file.dpi$(EXEEXT): $(file_dpi_OBJECTS) $(file_dpi_DEPENDENCIES) $(EXTRA_file_dpi_DEPENDENCIES)
835735 @rm -f file.dpi$(EXEEXT)
836 $(AM_V_CCLD)$(LINK) $(file_dpi_OBJECTS) $(file_dpi_LDADD) $(LIBS)
837
736 $(LINK) $(file_dpi_OBJECTS) $(file_dpi_LDADD) $(LIBS)
838737 ftp.filter.dpi$(EXEEXT): $(ftp_filter_dpi_OBJECTS) $(ftp_filter_dpi_DEPENDENCIES) $(EXTRA_ftp_filter_dpi_DEPENDENCIES)
839738 @rm -f ftp.filter.dpi$(EXEEXT)
840 $(AM_V_CCLD)$(LINK) $(ftp_filter_dpi_OBJECTS) $(ftp_filter_dpi_LDADD) $(LIBS)
841
739 $(LINK) $(ftp_filter_dpi_OBJECTS) $(ftp_filter_dpi_LDADD) $(LIBS)
842740 hello.filter.dpi$(EXEEXT): $(hello_filter_dpi_OBJECTS) $(hello_filter_dpi_DEPENDENCIES) $(EXTRA_hello_filter_dpi_DEPENDENCIES)
843741 @rm -f hello.filter.dpi$(EXEEXT)
844 $(AM_V_CCLD)$(LINK) $(hello_filter_dpi_OBJECTS) $(hello_filter_dpi_LDADD) $(LIBS)
845
742 $(LINK) $(hello_filter_dpi_OBJECTS) $(hello_filter_dpi_LDADD) $(LIBS)
846743 https.filter.dpi$(EXEEXT): $(https_filter_dpi_OBJECTS) $(https_filter_dpi_DEPENDENCIES) $(EXTRA_https_filter_dpi_DEPENDENCIES)
847744 @rm -f https.filter.dpi$(EXEEXT)
848 $(AM_V_CCLD)$(LINK) $(https_filter_dpi_OBJECTS) $(https_filter_dpi_LDADD) $(LIBS)
849
745 $(LINK) $(https_filter_dpi_OBJECTS) $(https_filter_dpi_LDADD) $(LIBS)
850746 vsource.filter.dpi$(EXEEXT): $(vsource_filter_dpi_OBJECTS) $(vsource_filter_dpi_DEPENDENCIES) $(EXTRA_vsource_filter_dpi_DEPENDENCIES)
851747 @rm -f vsource.filter.dpi$(EXEEXT)
852 $(AM_V_CCLD)$(LINK) $(vsource_filter_dpi_OBJECTS) $(vsource_filter_dpi_LDADD) $(LIBS)
748 $(LINK) $(vsource_filter_dpi_OBJECTS) $(vsource_filter_dpi_LDADD) $(LIBS)
853749
854750 mostlyclean-compile:
855751 -rm -f *.$(OBJEXT)
869765 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsource.Po@am__quote@
870766
871767 .c.o:
872 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
873 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
874 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
768 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
769 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
770 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
875771 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
876 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
772 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
877773
878774 .c.obj:
879 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
880 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
881 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
775 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
776 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
777 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
882778 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
883 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
779 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
884780
885781 .cc.o:
886 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
887 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
888 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
782 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
783 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
784 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
889785 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
890 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
786 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
891787
892788 .cc.obj:
893 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
894 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
895 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
789 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
790 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
791 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
896792 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
897 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
793 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
898794
899795 downloads_dpi-downloads.o: downloads.cc
900 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(downloads_dpi_CXXFLAGS) $(CXXFLAGS) -MT downloads_dpi-downloads.o -MD -MP -MF $(DEPDIR)/downloads_dpi-downloads.Tpo -c -o downloads_dpi-downloads.o `test -f 'downloads.cc' || echo '$(srcdir)/'`downloads.cc
901 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/downloads_dpi-downloads.Tpo $(DEPDIR)/downloads_dpi-downloads.Po
902 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='downloads.cc' object='downloads_dpi-downloads.o' libtool=no @AMDEPBACKSLASH@
796 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(downloads_dpi_CXXFLAGS) $(CXXFLAGS) -MT downloads_dpi-downloads.o -MD -MP -MF $(DEPDIR)/downloads_dpi-downloads.Tpo -c -o downloads_dpi-downloads.o `test -f 'downloads.cc' || echo '$(srcdir)/'`downloads.cc
797 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/downloads_dpi-downloads.Tpo $(DEPDIR)/downloads_dpi-downloads.Po
798 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='downloads.cc' object='downloads_dpi-downloads.o' libtool=no @AMDEPBACKSLASH@
903799 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
904 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(downloads_dpi_CXXFLAGS) $(CXXFLAGS) -c -o downloads_dpi-downloads.o `test -f 'downloads.cc' || echo '$(srcdir)/'`downloads.cc
800 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(downloads_dpi_CXXFLAGS) $(CXXFLAGS) -c -o downloads_dpi-downloads.o `test -f 'downloads.cc' || echo '$(srcdir)/'`downloads.cc
905801
906802 downloads_dpi-downloads.obj: downloads.cc
907 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(downloads_dpi_CXXFLAGS) $(CXXFLAGS) -MT downloads_dpi-downloads.obj -MD -MP -MF $(DEPDIR)/downloads_dpi-downloads.Tpo -c -o downloads_dpi-downloads.obj `if test -f 'downloads.cc'; then $(CYGPATH_W) 'downloads.cc'; else $(CYGPATH_W) '$(srcdir)/downloads.cc'; fi`
908 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/downloads_dpi-downloads.Tpo $(DEPDIR)/downloads_dpi-downloads.Po
909 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='downloads.cc' object='downloads_dpi-downloads.obj' libtool=no @AMDEPBACKSLASH@
803 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(downloads_dpi_CXXFLAGS) $(CXXFLAGS) -MT downloads_dpi-downloads.obj -MD -MP -MF $(DEPDIR)/downloads_dpi-downloads.Tpo -c -o downloads_dpi-downloads.obj `if test -f 'downloads.cc'; then $(CYGPATH_W) 'downloads.cc'; else $(CYGPATH_W) '$(srcdir)/downloads.cc'; fi`
804 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/downloads_dpi-downloads.Tpo $(DEPDIR)/downloads_dpi-downloads.Po
805 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='downloads.cc' object='downloads_dpi-downloads.obj' libtool=no @AMDEPBACKSLASH@
910806 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
911 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(downloads_dpi_CXXFLAGS) $(CXXFLAGS) -c -o downloads_dpi-downloads.obj `if test -f 'downloads.cc'; then $(CYGPATH_W) 'downloads.cc'; else $(CYGPATH_W) '$(srcdir)/downloads.cc'; fi`
912
913 ID: $(am__tagged_files)
914 $(am__define_uniq_tagged_files); mkid -fID $$unique
915 tags: tags-am
916 TAGS: tags
917
918 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
807 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(downloads_dpi_CXXFLAGS) $(CXXFLAGS) -c -o downloads_dpi-downloads.obj `if test -f 'downloads.cc'; then $(CYGPATH_W) 'downloads.cc'; else $(CYGPATH_W) '$(srcdir)/downloads.cc'; fi`
808
809 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
810 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
811 unique=`for i in $$list; do \
812 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
813 done | \
814 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
815 END { if (nonempty) { for (i in files) print i; }; }'`; \
816 mkid -fID $$unique
817 tags: TAGS
818
819 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
820 $(TAGS_FILES) $(LISP)
919821 set x; \
920822 here=`pwd`; \
921 $(am__define_uniq_tagged_files); \
823 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
824 unique=`for i in $$list; do \
825 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
826 done | \
827 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
828 END { if (nonempty) { for (i in files) print i; }; }'`; \
922829 shift; \
923830 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
924831 test -n "$$unique" || unique=$$empty_fix; \
930837 $$unique; \
931838 fi; \
932839 fi
933 ctags: ctags-am
934
935 CTAGS: ctags
936 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
937 $(am__define_uniq_tagged_files); \
840 ctags: CTAGS
841 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
842 $(TAGS_FILES) $(LISP)
843 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
844 unique=`for i in $$list; do \
845 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
846 done | \
847 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
848 END { if (nonempty) { for (i in files) print i; }; }'`; \
938849 test -z "$(CTAGS_ARGS)$$unique" \
939850 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
940851 $$unique
943854 here=`$(am__cd) $(top_builddir) && pwd` \
944855 && $(am__cd) $(top_srcdir) \
945856 && gtags -i $(GTAGS_ARGS) "$$here"
946 cscopelist: cscopelist-am
947
948 cscopelist-am: $(am__tagged_files)
949 list='$(am__tagged_files)'; \
950 case "$(srcdir)" in \
951 [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
952 *) sdir=$(subdir)/$(srcdir) ;; \
953 esac; \
954 for i in $$list; do \
955 if test -f "$$i"; then \
956 echo "$(subdir)/$$i"; \
957 else \
958 echo "$$sdir/$$i"; \
959 fi; \
960 done >> $(top_builddir)/cscope.files
961857
962858 distclean-tags:
963859 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
11111007
11121008 .MAKE: install-am install-strip
11131009
1114 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
1010 .PHONY: CTAGS GTAGS all all-am check check-am clean \
11151011 clean-bookmarksPROGRAMS clean-cookiesPROGRAMS \
11161012 clean-datauriPROGRAMS clean-downloadsPROGRAMS \
11171013 clean-filePROGRAMS clean-ftpPROGRAMS clean-generic \
11181014 clean-helloPROGRAMS clean-httpsPROGRAMS clean-vsourcePROGRAMS \
1119 cscopelist-am ctags ctags-am distclean distclean-compile \
1120 distclean-generic distclean-tags distdir dvi dvi-am html \
1121 html-am info info-am install install-am \
1122 install-bookmarksPROGRAMS install-cookiesPROGRAMS install-data \
1123 install-data-am install-datauriPROGRAMS \
1124 install-downloadsPROGRAMS install-dvi install-dvi-am \
1125 install-exec install-exec-am install-filePROGRAMS \
1126 install-ftpPROGRAMS install-helloPROGRAMS install-html \
1127 install-html-am install-httpsPROGRAMS install-info \
1128 install-info-am install-man install-pdf install-pdf-am \
1129 install-ps install-ps-am install-strip install-vsourcePROGRAMS \
1130 installcheck installcheck-am installdirs maintainer-clean \
1131 maintainer-clean-generic mostlyclean mostlyclean-compile \
1132 mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
1133 uninstall-am uninstall-bookmarksPROGRAMS \
1134 uninstall-cookiesPROGRAMS uninstall-datauriPROGRAMS \
1135 uninstall-downloadsPROGRAMS uninstall-filePROGRAMS \
1136 uninstall-ftpPROGRAMS uninstall-helloPROGRAMS \
1137 uninstall-httpsPROGRAMS uninstall-vsourcePROGRAMS
1015 ctags distclean distclean-compile distclean-generic \
1016 distclean-tags distdir dvi dvi-am html html-am info info-am \
1017 install install-am install-bookmarksPROGRAMS \
1018 install-cookiesPROGRAMS install-data install-data-am \
1019 install-datauriPROGRAMS install-downloadsPROGRAMS install-dvi \
1020 install-dvi-am install-exec install-exec-am \
1021 install-filePROGRAMS install-ftpPROGRAMS install-helloPROGRAMS \
1022 install-html install-html-am install-httpsPROGRAMS \
1023 install-info install-info-am install-man install-pdf \
1024 install-pdf-am install-ps install-ps-am install-strip \
1025 install-vsourcePROGRAMS installcheck installcheck-am \
1026 installdirs maintainer-clean maintainer-clean-generic \
1027 mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
1028 ps ps-am tags uninstall uninstall-am \
1029 uninstall-bookmarksPROGRAMS uninstall-cookiesPROGRAMS \
1030 uninstall-datauriPROGRAMS uninstall-downloadsPROGRAMS \
1031 uninstall-filePROGRAMS uninstall-ftpPROGRAMS \
1032 uninstall-helloPROGRAMS uninstall-httpsPROGRAMS \
1033 uninstall-vsourcePROGRAMS
11381034
11391035
11401036 # Tell versions [3.59,3.63) of GNU make to not export all variables.
+3
-4
dpi/cookies.c less more
10411041
10421042 if (tld_len > 0) {
10431043 /* These TLDs were chosen by examining the current publicsuffix list
1044 * in February 2014 and picking out those where it was simplest for
1044 * in October 2014 and picking out those where it was simplest for
10451045 * them to describe the situation by beginning with a "*.[tld]" rule
10461046 * or every rule was "[something].[tld]".
10471047 */
1048 const char *const tlds[] = {"bd","bn","ck","cy","er","et","fj","fk",
1048 const char *const tlds[] = {"bd","bn","ck","cy","er","fj","fk",
10491049 "gu","il","jm","ke","kh","kw","mm","mz",
1050 "ni","np","nz","pg","tr","uk","ye","za",
1051 "zm","zw"};
1050 "ni","np","pg","ye","za","zm","zw"};
10521051 uint_t i, tld_num = sizeof(tlds) / sizeof(tlds[0]);
10531052
10541053 for (i = 0; i < tld_num; i++) {
+2
-2
dpi/file.c less more
345345 sizeunits = "bytes";
346346 } else if (finfo->size / 1024 <= 9999) {
347347 size = finfo->size / 1024 + (finfo->size % 1024 >= 1024 / 2);
348 sizeunits = "Kb";
348 sizeunits = "KB";
349349 } else {
350350 size = finfo->size / 1048576 + (finfo->size % 1048576 >= 1048576 / 2);
351 sizeunits = "Mb";
351 sizeunits = "MB";
352352 }
353353
354354 /* we could note if it's a symlink... */
+18
-11
dpi/https.c less more
2121 * (at your option) any later version.
2222 *
2323 * As a special exception permission is granted to link the code of
24 * the https dillo plugin with the OpenSSL project's "OpenSSL"
25 * library, and distribute the linked executables, without including
26 * the source code for OpenSSL in the source distribution. You must
27 * obey the GNU General Public License, version 3, in all respects
28 * for all of the code used other than "OpenSSL".
24 * the https dillo plugin with the OpenSSL project's OpenSSL library
25 * (or a modified version of that library), and distribute the linked
26 * executables, without including the source code for the SSL library
27 * in the source distribution. You must obey the GNU General Public
28 * License, version 3, in all respects for all of the code used other
29 * than the SSL library.
2930 *
3031 */
3132
155156 }
156157 }
157158
158 /* Do not use the SSLv2 protocol. */
159 if (exit_error == 0){
160 SSL_CTX_set_options(ssl_context, SSL_OP_NO_SSLv2);
159 /* SSL2 has been known to be insecure forever, disabling SSL3 is in response
160 * to POODLE, and disabling compression is in response to CRIME.
161 */
162 if (exit_error == 0){
163 SSL_CTX_set_options(ssl_context,
164 SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_COMPRESSION);
161165 }
162166
163167 /*Set directory to load certificates from*/
187191 }
188192
189193 if (exit_error == 0){
190 /* Need to do the following if we want to deal with all
191 * possible ciphers
194 /* Don't want: eNULL, which has no encryption; aNULL, which has no
195 * authentication; LOW, which as of 2014 use 64 or 56-bit encryption;
196 * EXPORT40, which uses 40-bit encryption; RC4, for which methods were
197 * found in 2013 to defeat it somewhat too easily.
192198 */
193 SSL_set_cipher_list(ssl_connection, "ALL");
199 SSL_CTX_set_cipher_list(ssl_context,
200 "ALL:!aNULL:!eNULL:!LOW:!EXPORT40:!RC4");
194201
195202 /* Need to do this if we want to have the option of dealing
196203 * with self-signed certs
+40
-34
dpi/vsource.c less more
22 *
33 * This server is an example. Play with it and modify to your taste.
44 *
5 * Copyright 2010 Jorge Arellano Cid <jcid@dillo.org>
5 * Copyright 2010-2015 Jorge Arellano Cid <jcid@dillo.org>
66 *
77 * This program is free software; you can redistribute it and/or modify
88 * it under the terms of the GNU General Public License as published by
2424 * Debugging macros
2525 */
2626 #define _MSG(...)
27 #define MSG(...) printf("[vsource dpi]: " __VA_ARGS__)
27 #define MSG(...) fprintf(stderr, "[vsource dpi]: " __VA_ARGS__)
2828
2929 /*---------------------------------------------------------------------------*/
3030
4141
4242 /*
4343 * Send source as plain text
44 * (handles embedded null chars correctly).
4445 */
4546 void send_plain_text(Dsh *sh, int data_size)
4647 {
47 int bytes_read = 0;
48 char *src_str;
48 char *token;
49 int bytes_read = 0, token_size;
4950
5051 /* Send HTTP header for plain text MIME type */
5152 a_Dpip_dsh_write_str(sh, 0, "Content-type: text/plain\n\n");
5253
5354 while (bytes_read < data_size &&
54 (src_str = a_Dpip_dsh_read_token(sh, 1))) {
55 bytes_read += strlen(src_str);
56 a_Dpip_dsh_write_str(sh, 1, src_str);
57 dFree(src_str);
55 (token = a_Dpip_dsh_read_token2(sh, 1, &token_size))) {
56 bytes_read += token_size;
57 _MSG("data_size=%d bytes_read=%d\n", data_size, bytes_read);
58 a_Dpip_dsh_write(sh, 1, token, token_size);
59 dFree(token);
5860 }
5961 }
6062
6163 /*
6264 * Send source as plain text with line numbers
65 * (handles embedded null chars correctly).
6366 */
6467 void send_numbered_text(Dsh *sh, int data_size)
6568 {
66 int bytes_read = 0, line = 1;
67 char *p, *q, *src_str, line_str[32];
69 int bytes_read = 0, line = 1, token_size = 0;
70 char *p, *q, *token, line_str[32];
6871
6972 /* Send HTTP header for plain text MIME type */
7073 a_Dpip_dsh_write_str(sh, 0, "Content-type: text/plain\n\n");
7174
7275 while (bytes_read < data_size &&
73 (src_str = a_Dpip_dsh_read_token(sh, 1))) {
74 bytes_read += strlen(src_str);
75 p = q = src_str;
76 (token = a_Dpip_dsh_read_token2(sh, 1, &token_size))) {
77 bytes_read += token_size;
78 p = q = token;
7679
7780 while (*p) {
7881 snprintf(line_str, 32, "%2d: ", line);
8386 ++p;
8487 ++line;
8588 } else {
86 a_Dpip_dsh_write_str(sh, 1, q);
89 /* send all the rest */
90 a_Dpip_dsh_write(sh, 1, q, token_size - (q - token));
8791 break;
8892 }
8993 q = ++p;
9094 }
91 dFree(src_str);
95 dFree(token);
9296 }
9397 }
9498
9599 /*
96100 * Send source as html text with line numbers
101 * (handles embedded null chars correctly).
97102 */
98103 void send_html_text(Dsh *sh, const char *url, int data_size)
99104 {
100 int bytes_read = 0, old_line = 0, line = 1;
101 char *p, *q, *src_str, line_str[128];
105 int bytes_read = 0, old_line = 0, line = 1, token_size = 0;
106 char *p, *q, *token, line_str[128];
102107
103108 if (dStrnAsciiCasecmp(url, "dpi:", 4) == 0 &&
104109 strncmp(url+4, "/vsource/:", 10) == 0)
105110 url += 14;
106111
107 /* Send HTTP header for plain text MIME type */
112 /* Send HTTP header for html text MIME type */
108113 a_Dpip_dsh_write_str(sh, 0, "Content-type: text/html\n\n");
109114
110115 a_Dpip_dsh_write_str(sh, 0, DOCTYPE);
112117 "\n"
113118 "<html><head>\n"
114119 "<title>Source for %s</title>\n"
115 "<style type=\"text/css\">PRE {white-space: pre-wrap}\n"
120 "<style type=\"text/css\">\n"
121 " body {white-space: pre-wrap; font-family: monospace}\n"
122 " td.r1 {background-color:#B87333}\n"
123 " td.r2 {background-color:#DD7F32}\n"
116124 "</style>\n"
117125 "</head>\n"
118126 "<body id=\"dillo_vs\">\n<table cellpadding='0'>\n", url);
119127
120128 while (bytes_read < data_size &&
121 (src_str = a_Dpip_dsh_read_token(sh, 1))) {
122 bytes_read += strlen(src_str);
123 p = q = src_str;
129 (token = a_Dpip_dsh_read_token2(sh, 1, &token_size))) {
130 bytes_read += token_size;
131 p = q = token;
124132
125133 while (*p) {
126134 if (line > old_line) {
127135 snprintf(line_str, 128,
128 "%s<tr><td bgcolor='%s'>%d%s<td><pre>",
129 (line > 1) ? "</pre>" : "",
130 (line & 1) ? "#B87333" : "#DD7F32", line,
131 (line == 1 || (line % 10) == 0) ? "&nbsp;&nbsp;" : "");
136 "<tr><td class='%s'>%d%s<td>",
137 (line & 1) ? "r1" : "r2", line,
138 (line == 1 || (line % 10) == 0) ? "&nbsp;" : "");
132139 a_Dpip_dsh_write_str(sh, 0, line_str);
133140 old_line = line;
134141 }
142149 a_Dpip_dsh_write(sh, 0, q, p - q);
143150 a_Dpip_dsh_write_str(sh, 0, (*p == '<') ? "&lt;" : "&amp;");
144151 }
145 } else {
146 a_Dpip_dsh_write_str(sh, 1, q);
152 } else {
153 /* send all the rest */
154 a_Dpip_dsh_write(sh, 1, q, token_size - (q - token));
147155 break;
148156 }
149157 q = ++p;
150158 }
151 dFree(src_str);
152 }
153
154 if (data_size > 0)
155 a_Dpip_dsh_write_str(sh, 0, "</pre>");
159 dFree(token);
160 }
161
156162 a_Dpip_dsh_write_str(sh, 1, "</table></body></html>");
157163 }
158164
193199 * asking from us. a_Dpip_dsh_read_token() will block and return
194200 * a full dpip token or null on error (it's commented in dpip.c) */
195201 dpip_tag = a_Dpip_dsh_read_token(sh, 1);
196 MSG("tag = [%s]\n", dpip_tag);
202 _MSG("tag = [%s]\n", dpip_tag);
197203
198204 /* Now that we have the dpip_tag, let's isolate the command and url */
199205 cmd = a_Dpip_get_attr(dpip_tag, "cmd");
+74
-143
dpid/Makefile.in less more
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.11.6 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
3 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5 # Foundation, Inc.
56 # This Makefile.in is free software; the Free Software Foundation
67 # gives unlimited permission to copy and/or distribute it,
78 # with or without modifications, as long as this notice is preserved.
1516
1617
1718 VPATH = @srcdir@
18 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
19 am__make_running_with_option = \
20 case $${target_option-} in \
21 ?) ;; \
22 *) echo "am__make_running_with_option: internal error: invalid" \
23 "target option '$${target_option-}' specified" >&2; \
24 exit 1;; \
25 esac; \
26 has_opt=no; \
27 sane_makeflags=$$MAKEFLAGS; \
28 if $(am__is_gnu_make); then \
29 sane_makeflags=$$MFLAGS; \
30 else \
19 am__make_dryrun = \
20 { \
21 am__dry=no; \
3122 case $$MAKEFLAGS in \
3223 *\\[\ \ ]*) \
33 bs=\\; \
34 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
35 | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
24 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
25 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
26 *) \
27 for am__flg in $$MAKEFLAGS; do \
28 case $$am__flg in \
29 *=*|--*) ;; \
30 *n*) am__dry=yes; break;; \
31 esac; \
32 done;; \
3633 esac; \
37 fi; \
38 skip_next=no; \
39 strip_trailopt () \
40 { \
41 flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
42 }; \
43 for flg in $$sane_makeflags; do \
44 test $$skip_next = yes && { skip_next=no; continue; }; \
45 case $$flg in \
46 *=*|--*) continue;; \
47 -*I) strip_trailopt 'I'; skip_next=yes;; \
48 -*I?*) strip_trailopt 'I';; \
49 -*O) strip_trailopt 'O'; skip_next=yes;; \
50 -*O?*) strip_trailopt 'O';; \
51 -*l) strip_trailopt 'l'; skip_next=yes;; \
52 -*l?*) strip_trailopt 'l';; \
53 -[dEDm]) skip_next=yes;; \
54 -[JT]) skip_next=yes;; \
55 esac; \
56 case $$flg in \
57 *$$target_option*) has_opt=yes; break;; \
58 esac; \
59 done; \
60 test $$has_opt = yes
61 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
62 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
34 test $$am__dry = yes; \
35 }
6336 pkgdatadir = $(datadir)/@PACKAGE@
6437 pkgincludedir = $(includedir)/@PACKAGE@
6538 pkglibdir = $(libdir)/@PACKAGE@
8154 target_triplet = @target@
8255 bin_PROGRAMS = dpid$(EXEEXT) dpidc$(EXEEXT)
8356 subdir = dpid
84 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
85 $(top_srcdir)/depcomp TODO
57 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
8658 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8759 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
8860 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
10375 dpidc_OBJECTS = $(am_dpidc_OBJECTS)
10476 dpidc_DEPENDENCIES = $(top_builddir)/dpip/libDpip.a \
10577 $(top_builddir)/dlib/libDlib.a
106 AM_V_P = $(am__v_P_@AM_V@)
107 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
108 am__v_P_0 = false
109 am__v_P_1 = :
110 AM_V_GEN = $(am__v_GEN_@AM_V@)
111 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
112 am__v_GEN_0 = @echo " GEN " $@;
113 am__v_GEN_1 =
114 AM_V_at = $(am__v_at_@AM_V@)
115 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
116 am__v_at_0 = @
117 am__v_at_1 =
11878 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
11979 depcomp = $(SHELL) $(top_srcdir)/depcomp
12080 am__depfiles_maybe = depfiles
12181 am__mv = mv -f
12282 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
12383 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
124 AM_V_CC = $(am__v_CC_@AM_V@)
125 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
126 am__v_CC_0 = @echo " CC " $@;
127 am__v_CC_1 =
12884 CCLD = $(CC)
12985 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
130 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
131 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
132 am__v_CCLD_0 = @echo " CCLD " $@;
133 am__v_CCLD_1 =
13486 SOURCES = $(dpid_SOURCES) $(dpidc_SOURCES)
13587 DIST_SOURCES = $(dpid_SOURCES) $(dpidc_SOURCES)
13688 am__can_run_installinfo = \
166118 $(am__cd) "$$dir" && rm -f $$files; }; \
167119 }
168120 DATA = $(sysconf_DATA)
169 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
170 # Read a list of newline-separated strings from the standard input,
171 # and print each of them once, without duplicates. Input order is
172 # *not* preserved.
173 am__uniquify_input = $(AWK) '\
174 BEGIN { nonempty = 0; } \
175 { items[$$0] = 1; nonempty = 1; } \
176 END { if (nonempty) { for (i in items) print i; }; } \
177 '
178 # Make sure the list of sources is unique. This is necessary because,
179 # e.g., the same source file might be shared among _SOURCES variables
180 # for different programs/libraries.
181 am__define_uniq_tagged_files = \
182 list='$(am__tagged_files)'; \
183 unique=`for i in $$list; do \
184 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
185 done | $(am__uniquify_input)`
186121 ETAGS = etags
187122 CTAGS = ctags
188123 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
189124 ACLOCAL = @ACLOCAL@
190125 AMTAR = @AMTAR@
191 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
192126 AUTOCONF = @AUTOCONF@
193127 AUTOHEADER = @AUTOHEADER@
194128 AUTOMAKE = @AUTOMAKE@
209143 ECHO_T = @ECHO_T@
210144 EGREP = @EGREP@
211145 EXEEXT = @EXEEXT@
146 FLTK_CONFIG = @FLTK_CONFIG@
212147 GREP = @GREP@
213148 INSTALL = @INSTALL@
214149 INSTALL_DATA = @INSTALL_DATA@
376311 fi; \
377312 for p in $$list; do echo "$$p $$p"; done | \
378313 sed 's/$(EXEEXT)$$//' | \
379 while read p p1; do if test -f $$p \
380 ; then echo "$$p"; echo "$$p"; else :; fi; \
314 while read p p1; do if test -f $$p; \
315 then echo "$$p"; echo "$$p"; else :; fi; \
381316 done | \
382 sed -e 'p;s,.*/,,;n;h' \
383 -e 's|.*|.|' \
317 sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
384318 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
385319 sed 'N;N;N;s,\n, ,g' | \
386320 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
401335 @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
402336 files=`for p in $$list; do echo "$$p"; done | \
403337 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
404 -e 's/$$/$(EXEEXT)/' \
405 `; \
338 -e 's/$$/$(EXEEXT)/' `; \
406339 test -n "$$list" || exit 0; \
407340 echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
408341 cd "$(DESTDIR)$(bindir)" && rm -f $$files
409342
410343 clean-binPROGRAMS:
411344 -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
412
413345 dpid$(EXEEXT): $(dpid_OBJECTS) $(dpid_DEPENDENCIES) $(EXTRA_dpid_DEPENDENCIES)
414346 @rm -f dpid$(EXEEXT)
415 $(AM_V_CCLD)$(LINK) $(dpid_OBJECTS) $(dpid_LDADD) $(LIBS)
416
347 $(LINK) $(dpid_OBJECTS) $(dpid_LDADD) $(LIBS)
417348 dpidc$(EXEEXT): $(dpidc_OBJECTS) $(dpidc_DEPENDENCIES) $(EXTRA_dpidc_DEPENDENCIES)
418349 @rm -f dpidc$(EXEEXT)
419 $(AM_V_CCLD)$(LINK) $(dpidc_OBJECTS) $(dpidc_LDADD) $(LIBS)
350 $(LINK) $(dpidc_OBJECTS) $(dpidc_LDADD) $(LIBS)
420351
421352 mostlyclean-compile:
422353 -rm -f *.$(OBJEXT)
433364 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc_new.Po@am__quote@
434365
435366 .c.o:
436 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
437 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
438 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
367 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
368 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
369 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
439370 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
440 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
371 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
441372
442373 .c.obj:
443 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
444 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
445 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
374 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
375 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
376 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
446377 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
447 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
378 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
448379 install-sysconfDATA: $(sysconf_DATA)
449380 @$(NORMAL_INSTALL)
450381 @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
467398 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
468399 dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
469400
470 ID: $(am__tagged_files)
471 $(am__define_uniq_tagged_files); mkid -fID $$unique
472 tags: tags-am
473 TAGS: tags
474
475 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
401 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
402 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
403 unique=`for i in $$list; do \
404 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
405 done | \
406 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
407 END { if (nonempty) { for (i in files) print i; }; }'`; \
408 mkid -fID $$unique
409 tags: TAGS
410
411 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
412 $(TAGS_FILES) $(LISP)
476413 set x; \
477414 here=`pwd`; \
478 $(am__define_uniq_tagged_files); \
415 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
416 unique=`for i in $$list; do \
417 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
418 done | \
419 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
420 END { if (nonempty) { for (i in files) print i; }; }'`; \
479421 shift; \
480422 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
481423 test -n "$$unique" || unique=$$empty_fix; \
487429 $$unique; \
488430 fi; \
489431 fi
490 ctags: ctags-am
491
492 CTAGS: ctags
493 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
494 $(am__define_uniq_tagged_files); \
432 ctags: CTAGS
433 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
434 $(TAGS_FILES) $(LISP)
435 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
436 unique=`for i in $$list; do \
437 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
438 done | \
439 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
440 END { if (nonempty) { for (i in files) print i; }; }'`; \
495441 test -z "$(CTAGS_ARGS)$$unique" \
496442 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
497443 $$unique
500446 here=`$(am__cd) $(top_builddir) && pwd` \
501447 && $(am__cd) $(top_srcdir) \
502448 && gtags -i $(GTAGS_ARGS) "$$here"
503 cscopelist: cscopelist-am
504
505 cscopelist-am: $(am__tagged_files)
506 list='$(am__tagged_files)'; \
507 case "$(srcdir)" in \
508 [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
509 *) sdir=$(subdir)/$(srcdir) ;; \
510 esac; \
511 for i in $$list; do \
512 if test -f "$$i"; then \
513 echo "$(subdir)/$$i"; \
514 else \
515 echo "$$sdir/$$i"; \
516 fi; \
517 done >> $(top_builddir)/cscope.files
518449
519450 distclean-tags:
520451 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
658589
659590 .MAKE: install-am install-strip
660591
661 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
662 clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
663 distclean distclean-compile distclean-generic distclean-tags \
664 distdir dvi dvi-am html html-am info info-am install \
665 install-am install-binPROGRAMS install-data install-data-am \
666 install-dvi install-dvi-am install-exec install-exec-am \
667 install-html install-html-am install-info install-info-am \
668 install-man install-pdf install-pdf-am install-ps \
669 install-ps-am install-strip install-sysconfDATA installcheck \
670 installcheck-am installdirs maintainer-clean \
671 maintainer-clean-generic mostlyclean mostlyclean-compile \
672 mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
673 uninstall-am uninstall-binPROGRAMS uninstall-sysconfDATA
592 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
593 clean-generic ctags distclean distclean-compile \
594 distclean-generic distclean-tags distdir dvi dvi-am html \
595 html-am info info-am install install-am install-binPROGRAMS \
596 install-data install-data-am install-dvi install-dvi-am \
597 install-exec install-exec-am install-html install-html-am \
598 install-info install-info-am install-man install-pdf \
599 install-pdf-am install-ps install-ps-am install-strip \
600 install-sysconfDATA installcheck installcheck-am installdirs \
601 maintainer-clean maintainer-clean-generic mostlyclean \
602 mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
603 tags uninstall uninstall-am uninstall-binPROGRAMS \
604 uninstall-sysconfDATA
674605
675606
676607 dpidrc: $(srcdir)/dpidrc.in Makefile
+69
-139
dpip/Makefile.in less more
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.11.6 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
3 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5 # Foundation, Inc.
56 # This Makefile.in is free software; the Free Software Foundation
67 # gives unlimited permission to copy and/or distribute it,
78 # with or without modifications, as long as this notice is preserved.
1415 @SET_MAKE@
1516
1617 VPATH = @srcdir@
17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18 am__make_running_with_option = \
19 case $${target_option-} in \
20 ?) ;; \
21 *) echo "am__make_running_with_option: internal error: invalid" \
22 "target option '$${target_option-}' specified" >&2; \
23 exit 1;; \
24 esac; \
25 has_opt=no; \
26 sane_makeflags=$$MAKEFLAGS; \
27 if $(am__is_gnu_make); then \
28 sane_makeflags=$$MFLAGS; \
29 else \
18 am__make_dryrun = \
19 { \
20 am__dry=no; \
3021 case $$MAKEFLAGS in \
3122 *\\[\ \ ]*) \
32 bs=\\; \
33 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
34 | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
23 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
24 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
25 *) \
26 for am__flg in $$MAKEFLAGS; do \
27 case $$am__flg in \
28 *=*|--*) ;; \
29 *n*) am__dry=yes; break;; \
30 esac; \
31 done;; \
3532 esac; \
36 fi; \
37 skip_next=no; \
38 strip_trailopt () \
39 { \
40 flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
41 }; \
42 for flg in $$sane_makeflags; do \
43 test $$skip_next = yes && { skip_next=no; continue; }; \
44 case $$flg in \
45 *=*|--*) continue;; \
46 -*I) strip_trailopt 'I'; skip_next=yes;; \
47 -*I?*) strip_trailopt 'I';; \
48 -*O) strip_trailopt 'O'; skip_next=yes;; \
49 -*O?*) strip_trailopt 'O';; \
50 -*l) strip_trailopt 'l'; skip_next=yes;; \
51 -*l?*) strip_trailopt 'l';; \
52 -[dEDm]) skip_next=yes;; \
53 -[JT]) skip_next=yes;; \
54 esac; \
55 case $$flg in \
56 *$$target_option*) has_opt=yes; break;; \
57 esac; \
58 done; \
59 test $$has_opt = yes
60 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
61 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
33 test $$am__dry = yes; \
34 }
6235 pkgdatadir = $(datadir)/@PACKAGE@
6336 pkgincludedir = $(includedir)/@PACKAGE@
6437 pkglibdir = $(libdir)/@PACKAGE@
7952 host_triplet = @host@
8053 target_triplet = @target@
8154 subdir = dpip
82 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
83 $(top_srcdir)/depcomp
55 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
8456 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8557 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
8658 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9264 LIBRARIES = $(noinst_LIBRARIES)
9365 AR = ar
9466 ARFLAGS = cru
95 AM_V_AR = $(am__v_AR_@AM_V@)
96 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
97 am__v_AR_0 = @echo " AR " $@;
98 am__v_AR_1 =
9967 libDpip_a_AR = $(AR) $(ARFLAGS)
10068 libDpip_a_LIBADD =
10169 am_libDpip_a_OBJECTS = dpip.$(OBJEXT)
10270 libDpip_a_OBJECTS = $(am_libDpip_a_OBJECTS)
103 AM_V_P = $(am__v_P_@AM_V@)
104 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
105 am__v_P_0 = false
106 am__v_P_1 = :
107 AM_V_GEN = $(am__v_GEN_@AM_V@)
108 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
109 am__v_GEN_0 = @echo " GEN " $@;
110 am__v_GEN_1 =
111 AM_V_at = $(am__v_at_@AM_V@)
112 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
113 am__v_at_0 = @
114 am__v_at_1 =
11571 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
11672 depcomp = $(SHELL) $(top_srcdir)/depcomp
11773 am__depfiles_maybe = depfiles
11874 am__mv = mv -f
11975 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
12076 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
121 AM_V_CC = $(am__v_CC_@AM_V@)
122 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
123 am__v_CC_0 = @echo " CC " $@;
124 am__v_CC_1 =
12577 CCLD = $(CC)
12678 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
127 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
128 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
129 am__v_CCLD_0 = @echo " CCLD " $@;
130 am__v_CCLD_1 =
13179 SOURCES = $(libDpip_a_SOURCES)
13280 DIST_SOURCES = $(libDpip_a_SOURCES)
13381 am__can_run_installinfo = \
13583 n|no|NO) false;; \
13684 *) (install-info --version) >/dev/null 2>&1;; \
13785 esac
138 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
139 # Read a list of newline-separated strings from the standard input,
140 # and print each of them once, without duplicates. Input order is
141 # *not* preserved.
142 am__uniquify_input = $(AWK) '\
143 BEGIN { nonempty = 0; } \
144 { items[$$0] = 1; nonempty = 1; } \
145 END { if (nonempty) { for (i in items) print i; }; } \
146 '
147 # Make sure the list of sources is unique. This is necessary because,
148 # e.g., the same source file might be shared among _SOURCES variables
149 # for different programs/libraries.
150 am__define_uniq_tagged_files = \
151 list='$(am__tagged_files)'; \
152 unique=`for i in $$list; do \
153 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
154 done | $(am__uniquify_input)`
15586 ETAGS = etags
15687 CTAGS = ctags
15788 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
15889 ACLOCAL = @ACLOCAL@
15990 AMTAR = @AMTAR@
160 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
16191 AUTOCONF = @AUTOCONF@
16292 AUTOHEADER = @AUTOHEADER@
16393 AUTOMAKE = @AUTOMAKE@
178108 ECHO_T = @ECHO_T@
179109 EGREP = @EGREP@
180110 EXEEXT = @EXEEXT@
111 FLTK_CONFIG = @FLTK_CONFIG@
181112 GREP = @GREP@
182113 INSTALL = @INSTALL@
183114 INSTALL_DATA = @INSTALL_DATA@
318249
319250 clean-noinstLIBRARIES:
320251 -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
321
322252 libDpip.a: $(libDpip_a_OBJECTS) $(libDpip_a_DEPENDENCIES) $(EXTRA_libDpip_a_DEPENDENCIES)
323 $(AM_V_at)-rm -f libDpip.a
324 $(AM_V_AR)$(libDpip_a_AR) libDpip.a $(libDpip_a_OBJECTS) $(libDpip_a_LIBADD)
325 $(AM_V_at)$(RANLIB) libDpip.a
253 -rm -f libDpip.a
254 $(libDpip_a_AR) libDpip.a $(libDpip_a_OBJECTS) $(libDpip_a_LIBADD)
255 $(RANLIB) libDpip.a
326256
327257 mostlyclean-compile:
328258 -rm -f *.$(OBJEXT)
333263 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dpip.Po@am__quote@
334264
335265 .c.o:
336 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
337 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
338 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
266 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
267 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
268 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
339269 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
340 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
270 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
341271
342272 .c.obj:
343 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
344 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
345 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
273 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
274 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
275 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
346276 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
347 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
348
349 ID: $(am__tagged_files)
350 $(am__define_uniq_tagged_files); mkid -fID $$unique
351 tags: tags-am
352 TAGS: tags
353
354 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
277 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
278
279 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
280 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
281 unique=`for i in $$list; do \
282 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
283 done | \
284 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
285 END { if (nonempty) { for (i in files) print i; }; }'`; \
286 mkid -fID $$unique
287 tags: TAGS
288
289 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
290 $(TAGS_FILES) $(LISP)
355291 set x; \
356292 here=`pwd`; \
357 $(am__define_uniq_tagged_files); \
293 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
294 unique=`for i in $$list; do \
295 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
296 done | \
297 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
298 END { if (nonempty) { for (i in files) print i; }; }'`; \
358299 shift; \
359300 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
360301 test -n "$$unique" || unique=$$empty_fix; \
366307 $$unique; \
367308 fi; \
368309 fi
369 ctags: ctags-am
370
371 CTAGS: ctags
372 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
373 $(am__define_uniq_tagged_files); \
310 ctags: CTAGS
311 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
312 $(TAGS_FILES) $(LISP)
313 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
314 unique=`for i in $$list; do \
315 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
316 done | \
317 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
318 END { if (nonempty) { for (i in files) print i; }; }'`; \
374319 test -z "$(CTAGS_ARGS)$$unique" \
375320 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
376321 $$unique
379324 here=`$(am__cd) $(top_builddir) && pwd` \
380325 && $(am__cd) $(top_srcdir) \
381326 && gtags -i $(GTAGS_ARGS) "$$here"
382 cscopelist: cscopelist-am
383
384 cscopelist-am: $(am__tagged_files)
385 list='$(am__tagged_files)'; \
386 case "$(srcdir)" in \
387 [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
388 *) sdir=$(subdir)/$(srcdir) ;; \
389 esac; \
390 for i in $$list; do \
391 if test -f "$$i"; then \
392 echo "$(subdir)/$$i"; \
393 else \
394 echo "$$sdir/$$i"; \
395 fi; \
396 done >> $(top_builddir)/cscope.files
397327
398328 distclean-tags:
399329 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
533463
534464 .MAKE: install-am install-strip
535465
536 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
537 clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
538 distclean-compile distclean-generic distclean-tags distdir dvi \
539 dvi-am html html-am info info-am install install-am \
540 install-data install-data-am install-dvi install-dvi-am \
541 install-exec install-exec-am install-html install-html-am \
542 install-info install-info-am install-man install-pdf \
543 install-pdf-am install-ps install-ps-am install-strip \
544 installcheck installcheck-am installdirs maintainer-clean \
466 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
467 clean-noinstLIBRARIES ctags distclean distclean-compile \
468 distclean-generic distclean-tags distdir dvi dvi-am html \
469 html-am info info-am install install-am install-data \
470 install-data-am install-dvi install-dvi-am install-exec \
471 install-exec-am install-html install-html-am install-info \
472 install-info-am install-man install-pdf install-pdf-am \
473 install-ps install-ps-am install-strip installcheck \
474 installcheck-am installdirs maintainer-clean \
545475 maintainer-clean-generic mostlyclean mostlyclean-compile \
546 mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
476 mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
547477 uninstall-am
548478
549479
+19
-4
dpip/dpip.c less more
00 /*
11 * File: dpip.c
22 *
3 * Copyright 2005-2007 Jorge Arellano Cid <jcid@dillo.org>
3 * Copyright 2005-2015 Jorge Arellano Cid <jcid@dillo.org>
44 *
55 * This program is free software; you can redistribute it and/or modify
66 * it under the terms of the GNU General Public License as published by
426426
427427 /*
428428 * Return a newlly allocated string with the next dpip token in the socket.
429 * Return value: token string on success, NULL otherwise
430 */
431 char *a_Dpip_dsh_read_token(Dsh *dsh, int blocking)
429 * Return value: token string and length on success, NULL otherwise.
430 * (useful for handling null characters in the data stream)
431 */
432 char *a_Dpip_dsh_read_token2(Dsh *dsh, int blocking, int *DataSize)
432433 {
433434 char *p, *ret = NULL;
435 *DataSize = 0;
434436
435437 /* Read all available data without blocking */
436438 Dpip_dsh_read(dsh, 0);
461463 /* return a full tag */
462464 if ((p = strstr(dsh->rdbuf->str, DPIP_TAG_END))) {
463465 ret = dStrndup(dsh->rdbuf->str, p - dsh->rdbuf->str + 3);
466 *DataSize = p - dsh->rdbuf->str + 3;
464467 dStr_erase(dsh->rdbuf, 0, p - dsh->rdbuf->str + 3);
465468 if (strstr(ret, DPIP_MODE_SWITCH_TAG))
466469 dsh->mode |= DPIP_LAST_TAG;
469472 /* raw mode, return what we have "as is" */
470473 if (dsh->rdbuf->len > 0) {
471474 ret = dStrndup(dsh->rdbuf->str, dsh->rdbuf->len);
475 *DataSize = dsh->rdbuf->len;
472476 dStr_truncate(dsh->rdbuf, 0);
473477 }
474478 }
475479
476480 return ret;
481 }
482
483 /*
484 * Return a newlly allocated string with the next dpip token in the socket.
485 * Return value: token string on success, NULL otherwise
486 */
487 char *a_Dpip_dsh_read_token(Dsh *dsh, int blocking)
488 {
489 int token_size;
490
491 return a_Dpip_dsh_read_token2(dsh, blocking, &token_size);
477492 }
478493
479494 /*
+1
-0
dpip/dpip.h less more
6969 int a_Dpip_dsh_tryflush(Dsh *dsh);
7070 int a_Dpip_dsh_trywrite(Dsh *dsh, const char *Data, int DataSize);
7171 char *a_Dpip_dsh_read_token(Dsh *dsh, int blocking);
72 char *a_Dpip_dsh_read_token2(Dsh *dsh, int blocking, int *DataSize);
7273 void a_Dpip_dsh_close(Dsh *dsh);
7374 void a_Dpip_dsh_free(Dsh *dsh);
7475
+167
-251
dw/Makefile.in less more
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.11.6 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
3 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5 # Foundation, Inc.
56 # This Makefile.in is free software; the Free Software Foundation
67 # gives unlimited permission to copy and/or distribute it,
78 # with or without modifications, as long as this notice is preserved.
1415 @SET_MAKE@
1516
1617 VPATH = @srcdir@
17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18 am__make_running_with_option = \
19 case $${target_option-} in \
20 ?) ;; \
21 *) echo "am__make_running_with_option: internal error: invalid" \
22 "target option '$${target_option-}' specified" >&2; \
23 exit 1;; \
24 esac; \
25 has_opt=no; \
26 sane_makeflags=$$MAKEFLAGS; \
27 if $(am__is_gnu_make); then \
28 sane_makeflags=$$MFLAGS; \
29 else \
18 am__make_dryrun = \
19 { \
20 am__dry=no; \
3021 case $$MAKEFLAGS in \
3122 *\\[\ \ ]*) \
32 bs=\\; \
33 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
34 | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
23 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
24 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
25 *) \
26 for am__flg in $$MAKEFLAGS; do \
27 case $$am__flg in \
28 *=*|--*) ;; \
29 *n*) am__dry=yes; break;; \
30 esac; \
31 done;; \
3532 esac; \
36 fi; \
37 skip_next=no; \
38 strip_trailopt () \
39 { \
40 flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
41 }; \
42 for flg in $$sane_makeflags; do \
43 test $$skip_next = yes && { skip_next=no; continue; }; \
44 case $$flg in \
45 *=*|--*) continue;; \
46 -*I) strip_trailopt 'I'; skip_next=yes;; \
47 -*I?*) strip_trailopt 'I';; \
48 -*O) strip_trailopt 'O'; skip_next=yes;; \
49 -*O?*) strip_trailopt 'O';; \
50 -*l) strip_trailopt 'l'; skip_next=yes;; \
51 -*l?*) strip_trailopt 'l';; \
52 -[dEDm]) skip_next=yes;; \
53 -[JT]) skip_next=yes;; \
54 esac; \
55 case $$flg in \
56 *$$target_option*) has_opt=yes; break;; \
57 esac; \
58 done; \
59 test $$has_opt = yes
60 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
61 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
33 test $$am__dry = yes; \
34 }
6235 pkgdatadir = $(datadir)/@PACKAGE@
6336 pkgincludedir = $(includedir)/@PACKAGE@
6437 pkglibdir = $(libdir)/@PACKAGE@
7952 host_triplet = @host@
8053 target_triplet = @target@
8154 subdir = dw
82 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
83 $(top_srcdir)/depcomp
55 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
8456 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8557 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
8658 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9264 LIBRARIES = $(noinst_LIBRARIES)
9365 AR = ar
9466 ARFLAGS = cru
95 AM_V_AR = $(am__v_AR_@AM_V@)
96 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
97 am__v_AR_0 = @echo " AR " $@;
98 am__v_AR_1 =
9967 libDw_core_a_AR = $(AR) $(ARFLAGS)
10068 libDw_core_a_LIBADD =
10169 am_libDw_core_a_OBJECTS = findtext.$(OBJEXT) imgrenderer.$(OBJEXT) \
12290 tablecell.$(OBJEXT) textblock.$(OBJEXT) \
12391 textblock_iterator.$(OBJEXT) textblock_linebreaking.$(OBJEXT)
12492 libDw_widgets_a_OBJECTS = $(am_libDw_widgets_a_OBJECTS)
125 AM_V_P = $(am__v_P_@AM_V@)
126 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
127 am__v_P_0 = false
128 am__v_P_1 = :
129 AM_V_GEN = $(am__v_GEN_@AM_V@)
130 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
131 am__v_GEN_0 = @echo " GEN " $@;
132 am__v_GEN_1 =
133 AM_V_at = $(am__v_at_@AM_V@)
134 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
135 am__v_at_0 = @
136 am__v_at_1 =
13793 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
13894 depcomp = $(SHELL) $(top_srcdir)/depcomp
13995 am__depfiles_maybe = depfiles
14096 am__mv = mv -f
141 AM_V_lt = $(am__v_lt_@AM_V@)
142 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
143 am__v_lt_0 = --silent
144 am__v_lt_1 =
14597 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
14698 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
147 AM_V_CXX = $(am__v_CXX_@AM_V@)
148 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
149 am__v_CXX_0 = @echo " CXX " $@;
150 am__v_CXX_1 =
15199 CXXLD = $(CXX)
152100 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
153101 -o $@
154 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
155 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
156 am__v_CXXLD_0 = @echo " CXXLD " $@;
157 am__v_CXXLD_1 =
158102 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
159103 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
160 AM_V_CC = $(am__v_CC_@AM_V@)
161 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
162 am__v_CC_0 = @echo " CC " $@;
163 am__v_CC_1 =
164104 CCLD = $(CC)
165105 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
166 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
167 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
168 am__v_CCLD_0 = @echo " CCLD " $@;
169 am__v_CCLD_1 =
170106 SOURCES = $(libDw_core_a_SOURCES) $(libDw_fltk_a_SOURCES) \
171107 $(libDw_widgets_a_SOURCES)
172108 DIST_SOURCES = $(libDw_core_a_SOURCES) $(libDw_fltk_a_SOURCES) \
176112 n|no|NO) false;; \
177113 *) (install-info --version) >/dev/null 2>&1;; \
178114 esac
179 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
180 # Read a list of newline-separated strings from the standard input,
181 # and print each of them once, without duplicates. Input order is
182 # *not* preserved.
183 am__uniquify_input = $(AWK) '\
184 BEGIN { nonempty = 0; } \
185 { items[$$0] = 1; nonempty = 1; } \
186 END { if (nonempty) { for (i in items) print i; }; } \
187 '
188 # Make sure the list of sources is unique. This is necessary because,
189 # e.g., the same source file might be shared among _SOURCES variables
190 # for different programs/libraries.
191 am__define_uniq_tagged_files = \
192 list='$(am__tagged_files)'; \
193 unique=`for i in $$list; do \
194 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
195 done | $(am__uniquify_input)`
196115 ETAGS = etags
197116 CTAGS = ctags
198117 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
199118 ACLOCAL = @ACLOCAL@
200119 AMTAR = @AMTAR@
201 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
202120 AUTOCONF = @AUTOCONF@
203121 AUTOHEADER = @AUTOHEADER@
204122 AUTOMAKE = @AUTOMAKE@
219137 ECHO_T = @ECHO_T@
220138 EGREP = @EGREP@
221139 EXEEXT = @EXEEXT@
140 FLTK_CONFIG = @FLTK_CONFIG@
222141 GREP = @GREP@
223142 INSTALL = @INSTALL@
224143 INSTALL_DATA = @INSTALL_DATA@
430349
431350 clean-noinstLIBRARIES:
432351 -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
433
434352 libDw-core.a: $(libDw_core_a_OBJECTS) $(libDw_core_a_DEPENDENCIES) $(EXTRA_libDw_core_a_DEPENDENCIES)
435 $(AM_V_at)-rm -f libDw-core.a
436 $(AM_V_AR)$(libDw_core_a_AR) libDw-core.a $(libDw_core_a_OBJECTS) $(libDw_core_a_LIBADD)
437 $(AM_V_at)$(RANLIB) libDw-core.a
438
353 -rm -f libDw-core.a
354 $(libDw_core_a_AR) libDw-core.a $(libDw_core_a_OBJECTS) $(libDw_core_a_LIBADD)
355 $(RANLIB) libDw-core.a
439356 libDw-fltk.a: $(libDw_fltk_a_OBJECTS) $(libDw_fltk_a_DEPENDENCIES) $(EXTRA_libDw_fltk_a_DEPENDENCIES)
440 $(AM_V_at)-rm -f libDw-fltk.a
441 $(AM_V_AR)$(libDw_fltk_a_AR) libDw-fltk.a $(libDw_fltk_a_OBJECTS) $(libDw_fltk_a_LIBADD)
442 $(AM_V_at)$(RANLIB) libDw-fltk.a
443
357 -rm -f libDw-fltk.a
358 $(libDw_fltk_a_AR) libDw-fltk.a $(libDw_fltk_a_OBJECTS) $(libDw_fltk_a_LIBADD)
359 $(RANLIB) libDw-fltk.a
444360 libDw-widgets.a: $(libDw_widgets_a_OBJECTS) $(libDw_widgets_a_DEPENDENCIES) $(EXTRA_libDw_widgets_a_DEPENDENCIES)
445 $(AM_V_at)-rm -f libDw-widgets.a
446 $(AM_V_AR)$(libDw_widgets_a_AR) libDw-widgets.a $(libDw_widgets_a_OBJECTS) $(libDw_widgets_a_LIBADD)
447 $(AM_V_at)$(RANLIB) libDw-widgets.a
361 -rm -f libDw-widgets.a
362 $(libDw_widgets_a_AR) libDw-widgets.a $(libDw_widgets_a_OBJECTS) $(libDw_widgets_a_LIBADD)
363 $(RANLIB) libDw-widgets.a
448364
449365 mostlyclean-compile:
450366 -rm -f *.$(OBJEXT)
483399 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/widget.Po@am__quote@
484400
485401 .cc.o:
486 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
487 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
488 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
489 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
490 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
402 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
403 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
404 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
405 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
406 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
491407
492408 .cc.obj:
493 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
494 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
495 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
496 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
497 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
409 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
410 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
411 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
412 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
413 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
498414
499415 libDw_fltk_a-fltkcomplexbutton.o: fltkcomplexbutton.cc
500 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkcomplexbutton.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkcomplexbutton.Tpo -c -o libDw_fltk_a-fltkcomplexbutton.o `test -f 'fltkcomplexbutton.cc' || echo '$(srcdir)/'`fltkcomplexbutton.cc
501 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkcomplexbutton.Tpo $(DEPDIR)/libDw_fltk_a-fltkcomplexbutton.Po
502 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkcomplexbutton.cc' object='libDw_fltk_a-fltkcomplexbutton.o' libtool=no @AMDEPBACKSLASH@
503 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
504 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkcomplexbutton.o `test -f 'fltkcomplexbutton.cc' || echo '$(srcdir)/'`fltkcomplexbutton.cc
416 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkcomplexbutton.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkcomplexbutton.Tpo -c -o libDw_fltk_a-fltkcomplexbutton.o `test -f 'fltkcomplexbutton.cc' || echo '$(srcdir)/'`fltkcomplexbutton.cc
417 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkcomplexbutton.Tpo $(DEPDIR)/libDw_fltk_a-fltkcomplexbutton.Po
418 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkcomplexbutton.cc' object='libDw_fltk_a-fltkcomplexbutton.o' libtool=no @AMDEPBACKSLASH@
419 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
420 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkcomplexbutton.o `test -f 'fltkcomplexbutton.cc' || echo '$(srcdir)/'`fltkcomplexbutton.cc
505421
506422 libDw_fltk_a-fltkcomplexbutton.obj: fltkcomplexbutton.cc
507 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkcomplexbutton.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkcomplexbutton.Tpo -c -o libDw_fltk_a-fltkcomplexbutton.obj `if test -f 'fltkcomplexbutton.cc'; then $(CYGPATH_W) 'fltkcomplexbutton.cc'; else $(CYGPATH_W) '$(srcdir)/fltkcomplexbutton.cc'; fi`
508 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkcomplexbutton.Tpo $(DEPDIR)/libDw_fltk_a-fltkcomplexbutton.Po
509 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkcomplexbutton.cc' object='libDw_fltk_a-fltkcomplexbutton.obj' libtool=no @AMDEPBACKSLASH@
510 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
511 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkcomplexbutton.obj `if test -f 'fltkcomplexbutton.cc'; then $(CYGPATH_W) 'fltkcomplexbutton.cc'; else $(CYGPATH_W) '$(srcdir)/fltkcomplexbutton.cc'; fi`
423 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkcomplexbutton.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkcomplexbutton.Tpo -c -o libDw_fltk_a-fltkcomplexbutton.obj `if test -f 'fltkcomplexbutton.cc'; then $(CYGPATH_W) 'fltkcomplexbutton.cc'; else $(CYGPATH_W) '$(srcdir)/fltkcomplexbutton.cc'; fi`
424 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkcomplexbutton.Tpo $(DEPDIR)/libDw_fltk_a-fltkcomplexbutton.Po
425 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkcomplexbutton.cc' object='libDw_fltk_a-fltkcomplexbutton.obj' libtool=no @AMDEPBACKSLASH@
426 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
427 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkcomplexbutton.obj `if test -f 'fltkcomplexbutton.cc'; then $(CYGPATH_W) 'fltkcomplexbutton.cc'; else $(CYGPATH_W) '$(srcdir)/fltkcomplexbutton.cc'; fi`
512428
513429 libDw_fltk_a-fltkflatview.o: fltkflatview.cc
514 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkflatview.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkflatview.Tpo -c -o libDw_fltk_a-fltkflatview.o `test -f 'fltkflatview.cc' || echo '$(srcdir)/'`fltkflatview.cc
515 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkflatview.Tpo $(DEPDIR)/libDw_fltk_a-fltkflatview.Po
516 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkflatview.cc' object='libDw_fltk_a-fltkflatview.o' libtool=no @AMDEPBACKSLASH@
517 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
518 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkflatview.o `test -f 'fltkflatview.cc' || echo '$(srcdir)/'`fltkflatview.cc
430 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkflatview.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkflatview.Tpo -c -o libDw_fltk_a-fltkflatview.o `test -f 'fltkflatview.cc' || echo '$(srcdir)/'`fltkflatview.cc
431 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkflatview.Tpo $(DEPDIR)/libDw_fltk_a-fltkflatview.Po
432 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkflatview.cc' object='libDw_fltk_a-fltkflatview.o' libtool=no @AMDEPBACKSLASH@
433 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
434 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkflatview.o `test -f 'fltkflatview.cc' || echo '$(srcdir)/'`fltkflatview.cc
519435
520436 libDw_fltk_a-fltkflatview.obj: fltkflatview.cc
521 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkflatview.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkflatview.Tpo -c -o libDw_fltk_a-fltkflatview.obj `if test -f 'fltkflatview.cc'; then $(CYGPATH_W) 'fltkflatview.cc'; else $(CYGPATH_W) '$(srcdir)/fltkflatview.cc'; fi`
522 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkflatview.Tpo $(DEPDIR)/libDw_fltk_a-fltkflatview.Po
523 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkflatview.cc' object='libDw_fltk_a-fltkflatview.obj' libtool=no @AMDEPBACKSLASH@
524 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
525 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkflatview.obj `if test -f 'fltkflatview.cc'; then $(CYGPATH_W) 'fltkflatview.cc'; else $(CYGPATH_W) '$(srcdir)/fltkflatview.cc'; fi`
437 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkflatview.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkflatview.Tpo -c -o libDw_fltk_a-fltkflatview.obj `if test -f 'fltkflatview.cc'; then $(CYGPATH_W) 'fltkflatview.cc'; else $(CYGPATH_W) '$(srcdir)/fltkflatview.cc'; fi`
438 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkflatview.Tpo $(DEPDIR)/libDw_fltk_a-fltkflatview.Po
439 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkflatview.cc' object='libDw_fltk_a-fltkflatview.obj' libtool=no @AMDEPBACKSLASH@
440 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
441 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkflatview.obj `if test -f 'fltkflatview.cc'; then $(CYGPATH_W) 'fltkflatview.cc'; else $(CYGPATH_W) '$(srcdir)/fltkflatview.cc'; fi`
526442
527443 libDw_fltk_a-fltkimgbuf.o: fltkimgbuf.cc
528 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkimgbuf.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkimgbuf.Tpo -c -o libDw_fltk_a-fltkimgbuf.o `test -f 'fltkimgbuf.cc' || echo '$(srcdir)/'`fltkimgbuf.cc
529 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkimgbuf.Tpo $(DEPDIR)/libDw_fltk_a-fltkimgbuf.Po
530 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkimgbuf.cc' object='libDw_fltk_a-fltkimgbuf.o' libtool=no @AMDEPBACKSLASH@
531 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
532 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkimgbuf.o `test -f 'fltkimgbuf.cc' || echo '$(srcdir)/'`fltkimgbuf.cc
444 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkimgbuf.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkimgbuf.Tpo -c -o libDw_fltk_a-fltkimgbuf.o `test -f 'fltkimgbuf.cc' || echo '$(srcdir)/'`fltkimgbuf.cc
445 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkimgbuf.Tpo $(DEPDIR)/libDw_fltk_a-fltkimgbuf.Po
446 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkimgbuf.cc' object='libDw_fltk_a-fltkimgbuf.o' libtool=no @AMDEPBACKSLASH@
447 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
448 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkimgbuf.o `test -f 'fltkimgbuf.cc' || echo '$(srcdir)/'`fltkimgbuf.cc
533449
534450 libDw_fltk_a-fltkimgbuf.obj: fltkimgbuf.cc
535 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkimgbuf.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkimgbuf.Tpo -c -o libDw_fltk_a-fltkimgbuf.obj `if test -f 'fltkimgbuf.cc'; then $(CYGPATH_W) 'fltkimgbuf.cc'; else $(CYGPATH_W) '$(srcdir)/fltkimgbuf.cc'; fi`
536 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkimgbuf.Tpo $(DEPDIR)/libDw_fltk_a-fltkimgbuf.Po
537 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkimgbuf.cc' object='libDw_fltk_a-fltkimgbuf.obj' libtool=no @AMDEPBACKSLASH@
538 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
539 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkimgbuf.obj `if test -f 'fltkimgbuf.cc'; then $(CYGPATH_W) 'fltkimgbuf.cc'; else $(CYGPATH_W) '$(srcdir)/fltkimgbuf.cc'; fi`
451 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkimgbuf.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkimgbuf.Tpo -c -o libDw_fltk_a-fltkimgbuf.obj `if test -f 'fltkimgbuf.cc'; then $(CYGPATH_W) 'fltkimgbuf.cc'; else $(CYGPATH_W) '$(srcdir)/fltkimgbuf.cc'; fi`
452 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkimgbuf.Tpo $(DEPDIR)/libDw_fltk_a-fltkimgbuf.Po
453 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkimgbuf.cc' object='libDw_fltk_a-fltkimgbuf.obj' libtool=no @AMDEPBACKSLASH@
454 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
455 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkimgbuf.obj `if test -f 'fltkimgbuf.cc'; then $(CYGPATH_W) 'fltkimgbuf.cc'; else $(CYGPATH_W) '$(srcdir)/fltkimgbuf.cc'; fi`
540456
541457 libDw_fltk_a-fltkmisc.o: fltkmisc.cc
542 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkmisc.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkmisc.Tpo -c -o libDw_fltk_a-fltkmisc.o `test -f 'fltkmisc.cc' || echo '$(srcdir)/'`fltkmisc.cc
543 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkmisc.Tpo $(DEPDIR)/libDw_fltk_a-fltkmisc.Po
544 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkmisc.cc' object='libDw_fltk_a-fltkmisc.o' libtool=no @AMDEPBACKSLASH@
545 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
546 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkmisc.o `test -f 'fltkmisc.cc' || echo '$(srcdir)/'`fltkmisc.cc
458 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkmisc.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkmisc.Tpo -c -o libDw_fltk_a-fltkmisc.o `test -f 'fltkmisc.cc' || echo '$(srcdir)/'`fltkmisc.cc
459 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkmisc.Tpo $(DEPDIR)/libDw_fltk_a-fltkmisc.Po
460 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkmisc.cc' object='libDw_fltk_a-fltkmisc.o' libtool=no @AMDEPBACKSLASH@
461 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
462 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkmisc.o `test -f 'fltkmisc.cc' || echo '$(srcdir)/'`fltkmisc.cc
547463
548464 libDw_fltk_a-fltkmisc.obj: fltkmisc.cc
549 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkmisc.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkmisc.Tpo -c -o libDw_fltk_a-fltkmisc.obj `if test -f 'fltkmisc.cc'; then $(CYGPATH_W) 'fltkmisc.cc'; else $(CYGPATH_W) '$(srcdir)/fltkmisc.cc'; fi`
550 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkmisc.Tpo $(DEPDIR)/libDw_fltk_a-fltkmisc.Po
551 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkmisc.cc' object='libDw_fltk_a-fltkmisc.obj' libtool=no @AMDEPBACKSLASH@
552 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
553 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkmisc.obj `if test -f 'fltkmisc.cc'; then $(CYGPATH_W) 'fltkmisc.cc'; else $(CYGPATH_W) '$(srcdir)/fltkmisc.cc'; fi`
465 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkmisc.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkmisc.Tpo -c -o libDw_fltk_a-fltkmisc.obj `if test -f 'fltkmisc.cc'; then $(CYGPATH_W) 'fltkmisc.cc'; else $(CYGPATH_W) '$(srcdir)/fltkmisc.cc'; fi`
466 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkmisc.Tpo $(DEPDIR)/libDw_fltk_a-fltkmisc.Po
467 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkmisc.cc' object='libDw_fltk_a-fltkmisc.obj' libtool=no @AMDEPBACKSLASH@
468 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
469 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkmisc.obj `if test -f 'fltkmisc.cc'; then $(CYGPATH_W) 'fltkmisc.cc'; else $(CYGPATH_W) '$(srcdir)/fltkmisc.cc'; fi`
554470
555471 libDw_fltk_a-fltkplatform.o: fltkplatform.cc
556 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkplatform.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkplatform.Tpo -c -o libDw_fltk_a-fltkplatform.o `test -f 'fltkplatform.cc' || echo '$(srcdir)/'`fltkplatform.cc
557 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkplatform.Tpo $(DEPDIR)/libDw_fltk_a-fltkplatform.Po
558 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkplatform.cc' object='libDw_fltk_a-fltkplatform.o' libtool=no @AMDEPBACKSLASH@
559 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
560 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkplatform.o `test -f 'fltkplatform.cc' || echo '$(srcdir)/'`fltkplatform.cc
472 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkplatform.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkplatform.Tpo -c -o libDw_fltk_a-fltkplatform.o `test -f 'fltkplatform.cc' || echo '$(srcdir)/'`fltkplatform.cc
473 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkplatform.Tpo $(DEPDIR)/libDw_fltk_a-fltkplatform.Po
474 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkplatform.cc' object='libDw_fltk_a-fltkplatform.o' libtool=no @AMDEPBACKSLASH@
475 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
476 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkplatform.o `test -f 'fltkplatform.cc' || echo '$(srcdir)/'`fltkplatform.cc
561477
562478 libDw_fltk_a-fltkplatform.obj: fltkplatform.cc
563 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkplatform.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkplatform.Tpo -c -o libDw_fltk_a-fltkplatform.obj `if test -f 'fltkplatform.cc'; then $(CYGPATH_W) 'fltkplatform.cc'; else $(CYGPATH_W) '$(srcdir)/fltkplatform.cc'; fi`
564 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkplatform.Tpo $(DEPDIR)/libDw_fltk_a-fltkplatform.Po
565 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkplatform.cc' object='libDw_fltk_a-fltkplatform.obj' libtool=no @AMDEPBACKSLASH@
566 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
567 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkplatform.obj `if test -f 'fltkplatform.cc'; then $(CYGPATH_W) 'fltkplatform.cc'; else $(CYGPATH_W) '$(srcdir)/fltkplatform.cc'; fi`
479 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkplatform.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkplatform.Tpo -c -o libDw_fltk_a-fltkplatform.obj `if test -f 'fltkplatform.cc'; then $(CYGPATH_W) 'fltkplatform.cc'; else $(CYGPATH_W) '$(srcdir)/fltkplatform.cc'; fi`
480 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkplatform.Tpo $(DEPDIR)/libDw_fltk_a-fltkplatform.Po
481 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkplatform.cc' object='libDw_fltk_a-fltkplatform.obj' libtool=no @AMDEPBACKSLASH@
482 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
483 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkplatform.obj `if test -f 'fltkplatform.cc'; then $(CYGPATH_W) 'fltkplatform.cc'; else $(CYGPATH_W) '$(srcdir)/fltkplatform.cc'; fi`
568484
569485 libDw_fltk_a-fltkpreview.o: fltkpreview.cc
570 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkpreview.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkpreview.Tpo -c -o libDw_fltk_a-fltkpreview.o `test -f 'fltkpreview.cc' || echo '$(srcdir)/'`fltkpreview.cc
571 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkpreview.Tpo $(DEPDIR)/libDw_fltk_a-fltkpreview.Po
572 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkpreview.cc' object='libDw_fltk_a-fltkpreview.o' libtool=no @AMDEPBACKSLASH@
573 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
574 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkpreview.o `test -f 'fltkpreview.cc' || echo '$(srcdir)/'`fltkpreview.cc
486 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkpreview.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkpreview.Tpo -c -o libDw_fltk_a-fltkpreview.o `test -f 'fltkpreview.cc' || echo '$(srcdir)/'`fltkpreview.cc
487 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkpreview.Tpo $(DEPDIR)/libDw_fltk_a-fltkpreview.Po
488 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkpreview.cc' object='libDw_fltk_a-fltkpreview.o' libtool=no @AMDEPBACKSLASH@
489 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
490 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkpreview.o `test -f 'fltkpreview.cc' || echo '$(srcdir)/'`fltkpreview.cc
575491
576492 libDw_fltk_a-fltkpreview.obj: fltkpreview.cc
577 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkpreview.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkpreview.Tpo -c -o libDw_fltk_a-fltkpreview.obj `if test -f 'fltkpreview.cc'; then $(CYGPATH_W) 'fltkpreview.cc'; else $(CYGPATH_W) '$(srcdir)/fltkpreview.cc'; fi`
578 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkpreview.Tpo $(DEPDIR)/libDw_fltk_a-fltkpreview.Po
579 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkpreview.cc' object='libDw_fltk_a-fltkpreview.obj' libtool=no @AMDEPBACKSLASH@
580 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
581 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkpreview.obj `if test -f 'fltkpreview.cc'; then $(CYGPATH_W) 'fltkpreview.cc'; else $(CYGPATH_W) '$(srcdir)/fltkpreview.cc'; fi`
493 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkpreview.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkpreview.Tpo -c -o libDw_fltk_a-fltkpreview.obj `if test -f 'fltkpreview.cc'; then $(CYGPATH_W) 'fltkpreview.cc'; else $(CYGPATH_W) '$(srcdir)/fltkpreview.cc'; fi`
494 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkpreview.Tpo $(DEPDIR)/libDw_fltk_a-fltkpreview.Po
495 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkpreview.cc' object='libDw_fltk_a-fltkpreview.obj' libtool=no @AMDEPBACKSLASH@
496 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
497 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkpreview.obj `if test -f 'fltkpreview.cc'; then $(CYGPATH_W) 'fltkpreview.cc'; else $(CYGPATH_W) '$(srcdir)/fltkpreview.cc'; fi`
582498
583499 libDw_fltk_a-fltkui.o: fltkui.cc
584 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkui.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkui.Tpo -c -o libDw_fltk_a-fltkui.o `test -f 'fltkui.cc' || echo '$(srcdir)/'`fltkui.cc
585 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkui.Tpo $(DEPDIR)/libDw_fltk_a-fltkui.Po
586 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkui.cc' object='libDw_fltk_a-fltkui.o' libtool=no @AMDEPBACKSLASH@
587 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
588 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkui.o `test -f 'fltkui.cc' || echo '$(srcdir)/'`fltkui.cc
500 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkui.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkui.Tpo -c -o libDw_fltk_a-fltkui.o `test -f 'fltkui.cc' || echo '$(srcdir)/'`fltkui.cc
501 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkui.Tpo $(DEPDIR)/libDw_fltk_a-fltkui.Po
502 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkui.cc' object='libDw_fltk_a-fltkui.o' libtool=no @AMDEPBACKSLASH@
503 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
504 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkui.o `test -f 'fltkui.cc' || echo '$(srcdir)/'`fltkui.cc
589505
590506 libDw_fltk_a-fltkui.obj: fltkui.cc
591 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkui.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkui.Tpo -c -o libDw_fltk_a-fltkui.obj `if test -f 'fltkui.cc'; then $(CYGPATH_W) 'fltkui.cc'; else $(CYGPATH_W) '$(srcdir)/fltkui.cc'; fi`
592 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkui.Tpo $(DEPDIR)/libDw_fltk_a-fltkui.Po
593 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkui.cc' object='libDw_fltk_a-fltkui.obj' libtool=no @AMDEPBACKSLASH@
594 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
595 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkui.obj `if test -f 'fltkui.cc'; then $(CYGPATH_W) 'fltkui.cc'; else $(CYGPATH_W) '$(srcdir)/fltkui.cc'; fi`
507 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkui.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkui.Tpo -c -o libDw_fltk_a-fltkui.obj `if test -f 'fltkui.cc'; then $(CYGPATH_W) 'fltkui.cc'; else $(CYGPATH_W) '$(srcdir)/fltkui.cc'; fi`
508 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkui.Tpo $(DEPDIR)/libDw_fltk_a-fltkui.Po
509 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkui.cc' object='libDw_fltk_a-fltkui.obj' libtool=no @AMDEPBACKSLASH@
510 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
511 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkui.obj `if test -f 'fltkui.cc'; then $(CYGPATH_W) 'fltkui.cc'; else $(CYGPATH_W) '$(srcdir)/fltkui.cc'; fi`
596512
597513 libDw_fltk_a-fltkviewbase.o: fltkviewbase.cc
598 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkviewbase.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkviewbase.Tpo -c -o libDw_fltk_a-fltkviewbase.o `test -f 'fltkviewbase.cc' || echo '$(srcdir)/'`fltkviewbase.cc
599 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkviewbase.Tpo $(DEPDIR)/libDw_fltk_a-fltkviewbase.Po
600 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkviewbase.cc' object='libDw_fltk_a-fltkviewbase.o' libtool=no @AMDEPBACKSLASH@
601 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
602 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkviewbase.o `test -f 'fltkviewbase.cc' || echo '$(srcdir)/'`fltkviewbase.cc
514 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkviewbase.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkviewbase.Tpo -c -o libDw_fltk_a-fltkviewbase.o `test -f 'fltkviewbase.cc' || echo '$(srcdir)/'`fltkviewbase.cc
515 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkviewbase.Tpo $(DEPDIR)/libDw_fltk_a-fltkviewbase.Po
516 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkviewbase.cc' object='libDw_fltk_a-fltkviewbase.o' libtool=no @AMDEPBACKSLASH@
517 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
518 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkviewbase.o `test -f 'fltkviewbase.cc' || echo '$(srcdir)/'`fltkviewbase.cc
603519
604520 libDw_fltk_a-fltkviewbase.obj: fltkviewbase.cc
605 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkviewbase.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkviewbase.Tpo -c -o libDw_fltk_a-fltkviewbase.obj `if test -f 'fltkviewbase.cc'; then $(CYGPATH_W) 'fltkviewbase.cc'; else $(CYGPATH_W) '$(srcdir)/fltkviewbase.cc'; fi`
606 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkviewbase.Tpo $(DEPDIR)/libDw_fltk_a-fltkviewbase.Po
607 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkviewbase.cc' object='libDw_fltk_a-fltkviewbase.obj' libtool=no @AMDEPBACKSLASH@
608 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
609 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkviewbase.obj `if test -f 'fltkviewbase.cc'; then $(CYGPATH_W) 'fltkviewbase.cc'; else $(CYGPATH_W) '$(srcdir)/fltkviewbase.cc'; fi`
521 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkviewbase.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkviewbase.Tpo -c -o libDw_fltk_a-fltkviewbase.obj `if test -f 'fltkviewbase.cc'; then $(CYGPATH_W) 'fltkviewbase.cc'; else $(CYGPATH_W) '$(srcdir)/fltkviewbase.cc'; fi`
522 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkviewbase.Tpo $(DEPDIR)/libDw_fltk_a-fltkviewbase.Po
523 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkviewbase.cc' object='libDw_fltk_a-fltkviewbase.obj' libtool=no @AMDEPBACKSLASH@
524 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
525 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkviewbase.obj `if test -f 'fltkviewbase.cc'; then $(CYGPATH_W) 'fltkviewbase.cc'; else $(CYGPATH_W) '$(srcdir)/fltkviewbase.cc'; fi`
610526
611527 libDw_fltk_a-fltkviewport.o: fltkviewport.cc
612 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkviewport.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkviewport.Tpo -c -o libDw_fltk_a-fltkviewport.o `test -f 'fltkviewport.cc' || echo '$(srcdir)/'`fltkviewport.cc
613 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkviewport.Tpo $(DEPDIR)/libDw_fltk_a-fltkviewport.Po
614 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkviewport.cc' object='libDw_fltk_a-fltkviewport.o' libtool=no @AMDEPBACKSLASH@
615 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
616 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkviewport.o `test -f 'fltkviewport.cc' || echo '$(srcdir)/'`fltkviewport.cc
528 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkviewport.o -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkviewport.Tpo -c -o libDw_fltk_a-fltkviewport.o `test -f 'fltkviewport.cc' || echo '$(srcdir)/'`fltkviewport.cc
529 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkviewport.Tpo $(DEPDIR)/libDw_fltk_a-fltkviewport.Po
530 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkviewport.cc' object='libDw_fltk_a-fltkviewport.o' libtool=no @AMDEPBACKSLASH@
531 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
532 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkviewport.o `test -f 'fltkviewport.cc' || echo '$(srcdir)/'`fltkviewport.cc
617533
618534 libDw_fltk_a-fltkviewport.obj: fltkviewport.cc
619 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkviewport.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkviewport.Tpo -c -o libDw_fltk_a-fltkviewport.obj `if test -f 'fltkviewport.cc'; then $(CYGPATH_W) 'fltkviewport.cc'; else $(CYGPATH_W) '$(srcdir)/fltkviewport.cc'; fi`
620 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libDw_fltk_a-fltkviewport.Tpo $(DEPDIR)/libDw_fltk_a-fltkviewport.Po
621 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='fltkviewport.cc' object='libDw_fltk_a-fltkviewport.obj' libtool=no @AMDEPBACKSLASH@
622 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
623 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkviewport.obj `if test -f 'fltkviewport.cc'; then $(CYGPATH_W) 'fltkviewport.cc'; else $(CYGPATH_W) '$(srcdir)/fltkviewport.cc'; fi`
624
625 ID: $(am__tagged_files)
626 $(am__define_uniq_tagged_files); mkid -fID $$unique
627 tags: tags-am
628 TAGS: tags
629
630 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
535 @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -MT libDw_fltk_a-fltkviewport.obj -MD -MP -MF $(DEPDIR)/libDw_fltk_a-fltkviewport.Tpo -c -o libDw_fltk_a-fltkviewport.obj `if test -f 'fltkviewport.cc'; then $(CYGPATH_W) 'fltkviewport.cc'; else $(CYGPATH_W) '$(srcdir)/fltkviewport.cc'; fi`
536 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libDw_fltk_a-fltkviewport.Tpo $(DEPDIR)/libDw_fltk_a-fltkviewport.Po
537 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='fltkviewport.cc' object='libDw_fltk_a-fltkviewport.obj' libtool=no @AMDEPBACKSLASH@
538 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
539 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDw_fltk_a_CXXFLAGS) $(CXXFLAGS) -c -o libDw_fltk_a-fltkviewport.obj `if test -f 'fltkviewport.cc'; then $(CYGPATH_W) 'fltkviewport.cc'; else $(CYGPATH_W) '$(srcdir)/fltkviewport.cc'; fi`
540
541 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
542 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
543 unique=`for i in $$list; do \
544 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
545 done | \
546 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
547 END { if (nonempty) { for (i in files) print i; }; }'`; \
548 mkid -fID $$unique
549 tags: TAGS
550
551 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
552 $(TAGS_FILES) $(LISP)
631553 set x; \
632554 here=`pwd`; \
633 $(am__define_uniq_tagged_files); \
555 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
556 unique=`for i in $$list; do \
557 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
558 done | \
559 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
560 END { if (nonempty) { for (i in files) print i; }; }'`; \
634561 shift; \
635562 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
636563 test -n "$$unique" || unique=$$empty_fix; \
642569 $$unique; \
643570 fi; \
644571 fi
645 ctags: ctags-am
646
647 CTAGS: ctags
648 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
649 $(am__define_uniq_tagged_files); \
572 ctags: CTAGS
573 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
574 $(TAGS_FILES) $(LISP)
575 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
576 unique=`for i in $$list; do \
577 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
578 done | \
579 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
580 END { if (nonempty) { for (i in files) print i; }; }'`; \
650581 test -z "$(CTAGS_ARGS)$$unique" \
651582 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
652583 $$unique
655586 here=`$(am__cd) $(top_builddir) && pwd` \
656587 && $(am__cd) $(top_srcdir) \
657588 && gtags -i $(GTAGS_ARGS) "$$here"
658 cscopelist: cscopelist-am
659
660 cscopelist-am: $(am__tagged_files)
661 list='$(am__tagged_files)'; \
662 case "$(srcdir)" in \
663 [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
664 *) sdir=$(subdir)/$(srcdir) ;; \
665 esac; \
666 for i in $$list; do \
667 if test -f "$$i"; then \
668 echo "$(subdir)/$$i"; \
669 else \
670 echo "$$sdir/$$i"; \
671 fi; \
672 done >> $(top_builddir)/cscope.files
673589
674590 distclean-tags:
675591 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
809725
810726 .MAKE: install-am install-strip
811727
812 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
813 clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
814 distclean-compile distclean-generic distclean-tags distdir dvi \
815 dvi-am html html-am info info-am install install-am \
816 install-data install-data-am install-dvi install-dvi-am \
817 install-exec install-exec-am install-html install-html-am \
818 install-info install-info-am install-man install-pdf \
819 install-pdf-am install-ps install-ps-am install-strip \
820 installcheck installcheck-am installdirs maintainer-clean \
728 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
729 clean-noinstLIBRARIES ctags distclean distclean-compile \
730 distclean-generic distclean-tags distdir dvi dvi-am html \
731 html-am info info-am install install-am install-data \
732 install-data-am install-dvi install-dvi-am install-exec \
733 install-exec-am install-html install-html-am install-info \
734 install-info-am install-man install-pdf install-pdf-am \
735 install-ps install-ps-am install-strip installcheck \
736 installcheck-am installdirs maintainer-clean \
821737 maintainer-clean-generic mostlyclean mostlyclean-compile \
822 mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
738 mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
823739 uninstall-am
824740
825741
+6
-4
dw/fltkimgbuf.cc less more
7979 {
8080 DBG_OBJ_CREATE ("dw::fltk::FltkImgbuf");
8181
82 _MSG("FltkImgbuf: new root %p\n", this);
82 _MSG ("FltkImgbuf::FltkImgbuf: new root %p\n", this);
8383 init (type, width, height, gamma, NULL);
8484 }
8585
8888 {
8989 DBG_OBJ_CREATE ("dw::fltk::FltkImgbuf");
9090
91 _MSG("FltkImgbuf: new scaled %p, root is %p\n", this, root);
91 _MSG ("FltkImgbuf::FltkImgbuf: new scaled %p, root is %p\n", this, root);
9292 init (type, width, height, gamma, root);
9393 }
9494
134134 case RGB: bpp = 3; break;
135135 default: bpp = 1; break;
136136 }
137 _MSG("FltkImgbuf::init width=%d height=%d bpp=%d gamma=%g\n",
138 width, height, bpp, gamma);
137 _MSG("FltkImgbuf::init this=%p width=%d height=%d bpp=%d gamma=%g\n",
138 this, width, height, bpp, gamma);
139139 rawdata = new uchar[bpp * width * height];
140140 // Set light-gray as interim background color.
141141 memset(rawdata, 222, width*height*bpp);
162162
163163 FltkImgbuf::~FltkImgbuf ()
164164 {
165 _MSG ("FltkImgbuf::~FltkImgbuf\n");
166
165167 if (!isRoot())
166168 root->detachScaledBuf (this);
167169
+9
-6
dw/fltkplatform.cc less more
412412 core::ui::EntryResource *
413413 FltkPlatform::FltkResourceFactory::createEntryResource (int size,
414414 bool password,
415 const char *label)
416 {
417 return new ui::FltkEntryResource (platform, size, password, label);
415 const char *label,
416 const char *placeholder)
417 {
418 return new ui::FltkEntryResource (platform, size, password, label,
419 placeholder);
418420 }
419421
420422 core::ui::MultiLineTextResource *
421423 FltkPlatform::FltkResourceFactory::createMultiLineTextResource (int cols,
422 int rows)
423 {
424 return new ui::FltkMultiLineTextResource (platform, cols, rows);
424 int rows,
425 const char *placeholder)
426 {
427 return new ui::FltkMultiLineTextResource (platform, cols, rows,placeholder);
425428 }
426429
427430 core::ui::CheckButtonResource *
+4
-2
dw/fltkplatform.hh less more
109109 int rows);
110110 core::ui::OptionMenuResource *createOptionMenuResource ();
111111 core::ui::EntryResource *createEntryResource (int size, bool password,
112 const char *label);
112 const char *label,
113 const char *placeholder);
113114 core::ui::MultiLineTextResource *createMultiLineTextResource (int cols,
114 int rows);
115 int rows,
116 const char *placeholder);
115117 core::ui::CheckButtonResource *createCheckButtonResource (bool
116118 activated);
117119 core::ui::RadioButtonResource *
+285
-35
dw/fltkui.cc less more
3636 #include <stdio.h>
3737
3838 //----------------------------------------------------------------------------
39
40 static Fl_Color fltkui_dimmed(Fl_Color c, Fl_Color bg)
41 {
42 return fl_color_average(c, bg, .33f);
43 };
44
45 //----------------------------------------------------------------------------
3946 /*
4047 * Local sub classes
4148 */
4249
4350 /*
44 * Used to enable CTRL+{a,e,d,k} in form inputs (for start,end,del,cut)
51 * Used to show optional placeholder text and to enable CTRL+{a,e,d,k} in
52 * form inputs (for start,end,del,cut)
4553 */
4654 class CustInput2 : public Fl_Input {
4755 public:
48 CustInput2 (int x, int y, int w, int h, const char* l=0) :
49 Fl_Input(x,y,w,h,l) {};
56 CustInput2 (int x, int y, int w, int h, const char* l=0);
57 ~CustInput2 () { if (placeholder) free(placeholder); };
58 void set_placeholder(const char *str);
59 int show_placeholder();
60 int show_normal(const char *str);
61 void textcolor(Fl_Color c);
62 void input_type(int t);
63 int value(const char* str);
64 const char* value();
5065 int handle(int e);
66 private:
67 char *placeholder;
68 bool showing_placeholder;
69 Fl_Color usual_color;
70 int usual_type;
5171 };
5272
73 CustInput2::CustInput2 (int x, int y, int w, int h, const char* l) :
74 Fl_Input(x,y,w,h,l)
75 {
76 placeholder = NULL;
77 showing_placeholder = false;
78 usual_color = FL_BLACK; /* just init until widget style is set */
79 };
80
81 /*
82 * Show normal text.
83 */
84 int CustInput2::show_normal(const char *str)
85 {
86 showing_placeholder = false;
87 Fl_Input::textcolor(usual_color);
88 Fl_Input::input_type(usual_type);
89 return Fl_Input::value(str);
90 }
91
92 /*
93 * Show the placeholder text.
94 */
95 int CustInput2::show_placeholder()
96 {
97 int ret;
98
99 showing_placeholder = true;
100 Fl_Input::textcolor(fltkui_dimmed(usual_color, color()));
101 Fl_Input::input_type(FL_NORMAL_INPUT);
102 ret = Fl_Input::value(placeholder);
103 position(0);
104 return ret;
105 }
106
107 /*
108 * Set the placeholder text.
109 */
110 void CustInput2::set_placeholder(const char *str)
111 {
112 if (placeholder)
113 free(placeholder);
114 placeholder = strdup(str);
115
116 if ((Fl::focus() != this) && !*value()) {
117 show_placeholder();
118 }
119 }
120
121 /*
122 * Set the text color.
123 */
124 void CustInput2::textcolor(Fl_Color c)
125 {
126 usual_color = c;
127 if (showing_placeholder)
128 c = fltkui_dimmed(c, color());
129 Fl_Input::textcolor(c);
130 }
131
132 /*
133 * Set the input type (normal, password, etc.)
134 */
135 void CustInput2::input_type(int t)
136 {
137 usual_type = t;
138 Fl_Input::input_type(t);
139 }
140
141 /*
142 * Set the value of the input.
143 * NOTE that we're not being very careful with the return value, which is
144 * supposed to be nonzero iff the value was changed.
145 */
146 int CustInput2::value(const char *str)
147 {
148 return (placeholder && (!str || !*str) && Fl::focus() != this)
149 ? show_placeholder() : show_normal(str);
150 }
151
152 /*
153 * Return the value (text) of the input.
154 */
155 const char* CustInput2::value()
156 {
157 return showing_placeholder ? "" : Fl_Input::value();
158 }
159
53160 int CustInput2::handle(int e)
54161 {
55 int k = Fl::event_key();
162 int rc, k = Fl::event_key();
56163
57164 _MSG("CustInput2::handle event=%d\n", e);
58165
81188 return 0;
82189 }
83190 }
84 }
85 return Fl_Input::handle(e);
191 } else if (e == FL_UNFOCUS) {
192 if (placeholder && !value()[0]) {
193 show_placeholder();
194 }
195 }
196
197 rc = Fl_Input::handle(e);
198
199 if (rc && e == FL_FOCUS) {
200 // Nonzero return from handle() should mean that focus was accepted.
201 if (showing_placeholder)
202 show_normal("");
203 }
204 return rc;
205 }
206
207 /*
208 * Used to show optional placeholder text.
209 */
210 class CustTextEditor : public Fl_Text_Editor {
211 public:
212 CustTextEditor (int x, int y, int w, int h, const char* l=0);
213 ~CustTextEditor ();
214 void set_placeholder(const char *str);
215 void show_placeholder();
216 void show_normal(const char *str);
217 void textcolor(Fl_Color c);
218 void value(const char* str);
219 char* value();
220 int handle(int e);
221 private:
222 char *placeholder;
223 bool showing_placeholder;
224 Fl_Color usual_color;
225 char *text_copy;
226 };
227
228 CustTextEditor::CustTextEditor (int x, int y, int w, int h, const char* l) :
229 Fl_Text_Editor(x,y,w,h,l)
230 {
231 placeholder = NULL;
232 showing_placeholder = false;
233 buffer(new Fl_Text_Buffer());
234 usual_color = FL_BLACK; /* just init until widget style is set */
235 text_copy = NULL;
236 };
237
238 CustTextEditor::~CustTextEditor ()
239 {
240 Fl_Text_Buffer *buf = buffer();
241
242 buffer(NULL);
243 delete buf;
244
245 if (placeholder)
246 free(placeholder);
247 if (text_copy)
248 free(text_copy);
249 }
250
251 /*
252 * Show normal text.
253 */
254 void CustTextEditor::show_normal(const char *str)
255 {
256 showing_placeholder = false;
257 Fl_Text_Editor::textcolor(usual_color);
258 buffer()->text(str);
259 }
260
261 /*
262 * Show the placeholder text.
263 */
264 void CustTextEditor::show_placeholder()
265 {
266 showing_placeholder = true;
267 Fl_Text_Editor::textcolor(fltkui_dimmed(usual_color, color()));
268 buffer()->text(placeholder);
269 }
270
271 /*
272 * Set the placeholder text.
273 */
274 void CustTextEditor::set_placeholder(const char *str)
275 {
276 if (placeholder)
277 free(placeholder);
278 placeholder = strdup(str);
279
280 if ((Fl::focus() != this) && buffer()->length() == 0) {
281 show_placeholder();
282 }
283 }
284
285 /*
286 * Set the text color.
287 */
288 void CustTextEditor::textcolor(Fl_Color c)
289 {
290 usual_color = c;
291 if (showing_placeholder)
292 c = fltkui_dimmed(c, color());
293 Fl_Text_Editor::textcolor(c);
294 }
295
296 /*
297 * Set the value of the input.
298 */
299 void CustTextEditor::value(const char *str)
300 {
301 if (placeholder && (!str || !*str) && Fl::focus() != this)
302 show_placeholder();
303 else
304 show_normal(str);
305 }
306
307 /*
308 * Return the value (text) of the input.
309 */
310 char* CustTextEditor::value()
311 {
312 /* FLTK-1.3 insists upon returning a new copy of the buffer text, so
313 * we have to keep track of it.
314 */
315 if (text_copy)
316 free(text_copy);
317 text_copy = showing_placeholder ? strdup("") : buffer()->text();
318 return text_copy;
319 }
320
321 int CustTextEditor::handle(int e)
322 {
323 int rc;
324
325 if (e == FL_UNFOCUS) {
326 if (placeholder && buffer()->length() == 0) {
327 show_placeholder();
328 }
329 }
330
331 rc = Fl_Text_Editor::handle(e);
332
333 if (rc && e == FL_FOCUS) {
334 // Nonzero return from handle() should mean that focus was accepted.
335 if (showing_placeholder)
336 show_normal("");
337 }
338 return rc;
86339 }
87340
88341
562815 // ----------------------------------------------------------------------
563816
564817 FltkEntryResource::FltkEntryResource (FltkPlatform *platform, int size,
565 bool password, const char *label):
818 bool password, const char *label,
819 const char *placeholder):
566820 FltkSpecificResource <dw::core::ui::EntryResource> (platform)
567821 {
568822 this->size = size;
569823 this->password = password;
570824 this->label = label ? strdup(label) : NULL;
571825 this->label_w = 0;
826 this->placeholder = placeholder ? strdup(placeholder) : NULL;
572827
573828 initText = NULL;
574829 editable = false;
582837 free((char *)initText);
583838 if (label)
584839 free(label);
840 if (placeholder)
841 free(placeholder);
585842 }
586843
587844 Fl_Widget *FltkEntryResource::createNewWidget (core::Allocation
588845 *allocation)
589846 {
590 Fl_Input *input =
847 CustInput2 *input =
591848 new CustInput2(allocation->x, allocation->y, allocation->width,
592849 allocation->ascent + allocation->descent);
593 if (password)
594 input->type(FL_SECRET_INPUT);
850 input->input_type(password ? FL_SECRET_INPUT : FL_NORMAL_INPUT);
595851 input->callback (widgetCallback, this);
596852 input->when (FL_WHEN_ENTER_KEY_ALWAYS);
597853
601857 }
602858 if (initText)
603859 input->value (initText);
860 if (placeholder)
861 input->set_placeholder(placeholder);
604862
605863 return input;
606864 }
608866 void FltkEntryResource::setWidgetStyle (Fl_Widget *widget,
609867 core::style::Style *style)
610868 {
611 Fl_Input *in = (Fl_Input *)widget;
869 CustInput2 *in = (CustInput2 *)widget;
612870
613871 FltkResource::setWidgetStyle(widget, style);
614872
615873 in->textcolor(widget->labelcolor());
616 in->cursor_color(in->textcolor());
874 in->cursor_color(widget->labelcolor());
617875 in->textsize(in->labelsize());
618876 in->textfont(in->labelfont());
619877
673931
674932 const char *FltkEntryResource::getText ()
675933 {
676 return ((Fl_Input*)widget)->value ();
934 return ((CustInput2*)widget)->value ();
677935 }
678936
679937 void FltkEntryResource::setText (const char *text)
682940 free((char *)initText);
683941 initText = strdup (text);
684942
685 ((Fl_Input*)widget)->value (initText);
943 ((CustInput2*)widget)->value (initText);
686944 }
687945
688946 bool FltkEntryResource::isEditable ()
717975 }
718976
719977 FltkMultiLineTextResource::FltkMultiLineTextResource (FltkPlatform *platform,
720 int cols, int rows):
978 int cols, int rows,
979 const char *placeholder):
721980 FltkSpecificResource <dw::core::ui::MultiLineTextResource> (platform)
722981 {
723 buffer = new Fl_Text_Buffer;
724 text_copy = NULL;
725982 editable = false;
726983
727984 numCols = cols;
736993 MSG_WARN("numRows = %d is set to 1.\n", numRows);
737994 numRows = 1;
738995 }
996 this->placeholder = placeholder ? strdup(placeholder) : NULL;
739997
740998 init (platform);
741999 }
7421000
7431001 FltkMultiLineTextResource::~FltkMultiLineTextResource ()
7441002 {
745 /* Free memory avoiding a double-free of text buffers */
746 ((Fl_Text_Editor *) widget)->buffer (0);
747 delete buffer;
748 if (text_copy)
749 free(text_copy);
1003 if (placeholder)
1004 free(placeholder);
7501005 }
7511006
7521007 Fl_Widget *FltkMultiLineTextResource::createNewWidget (core::Allocation
7531008 *allocation)
7541009 {
755 Fl_Text_Editor *text =
756 new Fl_Text_Editor (allocation->x, allocation->y, allocation->width,
1010 CustTextEditor *text =
1011 new CustTextEditor (allocation->x, allocation->y, allocation->width,
7571012 allocation->ascent + allocation->descent);
7581013 text->wrap_mode(Fl_Text_Display::WRAP_AT_BOUNDS, 0);
759 text->buffer (buffer);
7601014 text->remove_key_binding(FL_BackSpace, FL_TEXT_EDITOR_ANY_STATE);
7611015 text->add_key_binding(FL_BackSpace, 0, Fl_Text_Editor::kf_backspace);
7621016 text->add_key_binding(FL_BackSpace, FL_CTRL, kf_backspace_word);
1017 if (placeholder)
1018 text->set_placeholder(placeholder);
7631019 return text;
7641020 }
7651021
7661022 void FltkMultiLineTextResource::setWidgetStyle (Fl_Widget *widget,
7671023 core::style::Style *style)
7681024 {
769 Fl_Text_Editor *ed = (Fl_Text_Editor *)widget;
1025 CustTextEditor *ed = (CustTextEditor *)widget;
7701026
7711027 FltkResource::setWidgetStyle(widget, style);
7721028
7731029 ed->textcolor(widget->labelcolor());
774 ed->cursor_color(ed->textcolor());
1030 ed->cursor_color(widget->labelcolor());
7751031 ed->textsize(ed->labelsize());
7761032 ed->textfont(ed->labelfont());
7771033 }
8001056
8011057 const char *FltkMultiLineTextResource::getText ()
8021058 {
803 /* FLTK-1.3 insists upon returning a new copy of the buffer text, so
804 * we have to keep track of it.
805 */
806 if (text_copy)
807 free(text_copy);
808 text_copy = buffer->text();
809 return text_copy;
1059 return ((CustTextEditor*)widget)->value ();
8101060 }
8111061
8121062 void FltkMultiLineTextResource::setText (const char *text)
8131063 {
814 buffer->text (text);
1064 ((CustTextEditor*)widget)->value (text);
8151065 }
8161066
8171067 bool FltkMultiLineTextResource::isEditable ()
+5
-5
dw/fltkui.hh less more
300300 const char *initText;
301301 char *label;
302302 int label_w;
303 char *placeholder;
303304 bool editable;
304305
305306 static void widgetCallback (Fl_Widget *widget, void *data);
311312
312313 public:
313314 FltkEntryResource (FltkPlatform *platform, int size, bool password,
314 const char *label);
315 const char *label, const char *placeholder);
315316 ~FltkEntryResource ();
316317
317318 void sizeRequest (core::Requisition *requisition);
329330 public FltkSpecificResource <dw::core::ui::MultiLineTextResource>
330331 {
331332 private:
332 Fl_Text_Buffer *buffer;
333 char *text_copy;
334333 bool editable;
335334 int numCols, numRows;
336
335 char *placeholder;
337336 protected:
338337 Fl_Widget *createNewWidget (core::Allocation *allocation);
339338 void setWidgetStyle (Fl_Widget *widget, core::style::Style *style);
340339
341340 public:
342 FltkMultiLineTextResource (FltkPlatform *platform, int cols, int rows);
341 FltkMultiLineTextResource (FltkPlatform *platform, int cols, int rows,
342 const char *placeholder);
343343 ~FltkMultiLineTextResource ();
344344
345345 void sizeRequest (core::Requisition *requisition);
+5
-5
dw/image.cc less more
424424 {
425425 core::Imgbuf *oldBuf = this->buffer;
426426
427 if (resize)
428 queueResize (0, true);
429
430 if (wasAllocated () && getContentWidth () > 0 && getContentHeight () > 0) {
431 // Only scale when both dimensions are known.
427 if (wasAllocated () && needsResize () &&
428 getContentWidth () > 0 && getContentHeight () > 0) {
429 // Don't create a new buffer for the transition from alt text to img,
430 // and only scale when both dimensions are known.
432431 this->buffer =
433432 buffer->getScaledBuf (getContentWidth (), getContentHeight ());
434433 } else {
435434 this->buffer = buffer;
436435 buffer->ref ();
437436 }
437 queueResize (0, true);
438438
439439 DBG_OBJ_ASSOC_CHILD (this->buffer);
440440
+4
-2
dw/ui.hh less more
543543 selectionMode, int rows) = 0;
544544 virtual OptionMenuResource *createOptionMenuResource () = 0;
545545 virtual EntryResource *createEntryResource (int size, bool password,
546 const char *label) = 0;
546 const char *label,
547 const char *placeholder) = 0;
547548 virtual MultiLineTextResource *createMultiLineTextResource (int cols,
548 int rows) = 0;
549 int rows,
550 const char *placeholder) = 0;
549551 virtual CheckButtonResource *createCheckButtonResource (bool activated) = 0;
550552 virtual RadioButtonResource *createRadioButtonResource (RadioButtonResource
551553 *groupedWith,
+4
-1
dw/widget.cc less more
158158 {
159159 /** \todo Maybe only the intersection? */
160160 layout->queueDraw (x + allocation.x, y + allocation.y, width, height);
161 _MSG("Widget::queueDrawArea x=%d y=%d w=%d h=%d\n", x, y, width, height);
161 _MSG("Widget::queueDrawArea alloc(%d %d %d %d) wid(%d %d %d %d)\n",
162 allocation.x, allocation.y,
163 allocation.width, allocation.ascent + allocation.descent,
164 x, y, width, height);
162165 }
163166
164167 /**
+7
-7
install-sh less more
00 #!/bin/sh
11 # install - install a program, script, or datafile
22
3 scriptversion=2011-11-20.07; # UTC
3 scriptversion=2011-01-19.21; # UTC
44
55 # This originates from X11R5 (mit/util/scripts/install.sh), which was
66 # later released in X11R6 (xc/config/util/install.sh) with the
3434 # FSF changes to this file are in the public domain.
3535 #
3636 # Calling this script install-sh is preferred over install.sh, to prevent
37 # 'make' implicit rules from creating a file called install from it
37 # `make' implicit rules from creating a file called install from it
3838 # when there is no Makefile.
3939 #
4040 # This script is compatible with the BSD install script, but was written
155155 -s) stripcmd=$stripprog;;
156156
157157 -t) dst_arg=$2
158 # Protect names problematic for 'test' and other utilities.
158 # Protect names problematic for `test' and other utilities.
159159 case $dst_arg in
160160 -* | [=\(\)!]) dst_arg=./$dst_arg;;
161161 esac
189189 fi
190190 shift # arg
191191 dst_arg=$arg
192 # Protect names problematic for 'test' and other utilities.
192 # Protect names problematic for `test' and other utilities.
193193 case $dst_arg in
194194 -* | [=\(\)!]) dst_arg=./$dst_arg;;
195195 esac
201201 echo "$0: no input file specified." >&2
202202 exit 1
203203 fi
204 # It's OK to call 'install-sh -d' without argument.
204 # It's OK to call `install-sh -d' without argument.
205205 # This can happen when creating conditional directories.
206206 exit 0
207207 fi
239239
240240 for src
241241 do
242 # Protect names problematic for 'test' and other utilities.
242 # Protect names problematic for `test' and other utilities.
243243 case $src in
244244 -* | [=\(\)!]) src=./$src;;
245245 esac
353353 if test -z "$dir_arg" || {
354354 # Check for POSIX incompatibilities with -m.
355355 # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
356 # other-writable bit of parent directory when it shouldn't.
356 # other-writeable bit of parent directory when it shouldn't.
357357 # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
358358 ls_ld_tmpdir=`ls -ld "$tmpdir"`
359359 case $ls_ld_tmpdir in
+69
-147
lout/Makefile.in less more
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.11.6 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
3 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5 # Foundation, Inc.
56 # This Makefile.in is free software; the Free Software Foundation
67 # gives unlimited permission to copy and/or distribute it,
78 # with or without modifications, as long as this notice is preserved.
1415 @SET_MAKE@
1516
1617 VPATH = @srcdir@
17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18 am__make_running_with_option = \
19 case $${target_option-} in \
20 ?) ;; \
21 *) echo "am__make_running_with_option: internal error: invalid" \
22 "target option '$${target_option-}' specified" >&2; \
23 exit 1;; \
24 esac; \
25 has_opt=no; \
26 sane_makeflags=$$MAKEFLAGS; \
27 if $(am__is_gnu_make); then \
28 sane_makeflags=$$MFLAGS; \
29 else \
18 am__make_dryrun = \
19 { \
20 am__dry=no; \
3021 case $$MAKEFLAGS in \
3122 *\\[\ \ ]*) \
32 bs=\\; \
33 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
34 | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
23 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
24 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
25 *) \
26 for am__flg in $$MAKEFLAGS; do \
27 case $$am__flg in \
28 *=*|--*) ;; \
29 *n*) am__dry=yes; break;; \
30 esac; \
31 done;; \
3532 esac; \
36 fi; \
37 skip_next=no; \
38 strip_trailopt () \
39 { \
40 flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
41 }; \
42 for flg in $$sane_makeflags; do \
43 test $$skip_next = yes && { skip_next=no; continue; }; \
44 case $$flg in \
45 *=*|--*) continue;; \
46 -*I) strip_trailopt 'I'; skip_next=yes;; \
47 -*I?*) strip_trailopt 'I';; \
48 -*O) strip_trailopt 'O'; skip_next=yes;; \
49 -*O?*) strip_trailopt 'O';; \
50 -*l) strip_trailopt 'l'; skip_next=yes;; \
51 -*l?*) strip_trailopt 'l';; \
52 -[dEDm]) skip_next=yes;; \
53 -[JT]) skip_next=yes;; \
54 esac; \
55 case $$flg in \
56 *$$target_option*) has_opt=yes; break;; \
57 esac; \
58 done; \
59 test $$has_opt = yes
60 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
61 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
33 test $$am__dry = yes; \
34 }
6235 pkgdatadir = $(datadir)/@PACKAGE@
6336 pkgincludedir = $(includedir)/@PACKAGE@
6437 pkglibdir = $(libdir)/@PACKAGE@
7952 host_triplet = @host@
8053 target_triplet = @target@
8154 subdir = lout
82 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
83 $(top_srcdir)/depcomp
55 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
8456 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8557 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
8658 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9264 LIBRARIES = $(noinst_LIBRARIES)
9365 AR = ar
9466 ARFLAGS = cru
95 AM_V_AR = $(am__v_AR_@AM_V@)
96 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
97 am__v_AR_0 = @echo " AR " $@;
98 am__v_AR_1 =
9967 liblout_a_AR = $(AR) $(ARFLAGS)
10068 liblout_a_LIBADD =
10169 am_liblout_a_OBJECTS = container.$(OBJEXT) identity.$(OBJEXT) \
10270 misc.$(OBJEXT) object.$(OBJEXT) signal.$(OBJEXT) \
10371 unicode.$(OBJEXT)
10472 liblout_a_OBJECTS = $(am_liblout_a_OBJECTS)
105 AM_V_P = $(am__v_P_@AM_V@)
106 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
107 am__v_P_0 = false
108 am__v_P_1 = :
109 AM_V_GEN = $(am__v_GEN_@AM_V@)
110 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
111 am__v_GEN_0 = @echo " GEN " $@;
112 am__v_GEN_1 =
113 AM_V_at = $(am__v_at_@AM_V@)
114 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
115 am__v_at_0 = @
116 am__v_at_1 =
11773 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
11874 depcomp = $(SHELL) $(top_srcdir)/depcomp
11975 am__depfiles_maybe = depfiles
12076 am__mv = mv -f
12177 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
12278 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
123 AM_V_CXX = $(am__v_CXX_@AM_V@)
124 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
125 am__v_CXX_0 = @echo " CXX " $@;
126 am__v_CXX_1 =
12779 CXXLD = $(CXX)
12880 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
12981 -o $@
130 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
131 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
132 am__v_CXXLD_0 = @echo " CXXLD " $@;
133 am__v_CXXLD_1 =
13482 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
13583 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
136 AM_V_CC = $(am__v_CC_@AM_V@)
137 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
138 am__v_CC_0 = @echo " CC " $@;
139 am__v_CC_1 =
14084 CCLD = $(CC)
14185 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
142 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
143 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
144 am__v_CCLD_0 = @echo " CCLD " $@;
145 am__v_CCLD_1 =
14686 SOURCES = $(liblout_a_SOURCES)
14787 DIST_SOURCES = $(liblout_a_SOURCES)
14888 am__can_run_installinfo = \
15090 n|no|NO) false;; \
15191 *) (install-info --version) >/dev/null 2>&1;; \
15292 esac
153 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
154 # Read a list of newline-separated strings from the standard input,
155 # and print each of them once, without duplicates. Input order is
156 # *not* preserved.
157 am__uniquify_input = $(AWK) '\
158 BEGIN { nonempty = 0; } \
159 { items[$$0] = 1; nonempty = 1; } \
160 END { if (nonempty) { for (i in items) print i; }; } \
161 '
162 # Make sure the list of sources is unique. This is necessary because,
163 # e.g., the same source file might be shared among _SOURCES variables
164 # for different programs/libraries.
165 am__define_uniq_tagged_files = \
166 list='$(am__tagged_files)'; \
167 unique=`for i in $$list; do \
168 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
169 done | $(am__uniquify_input)`
17093 ETAGS = etags
17194 CTAGS = ctags
17295 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
17396 ACLOCAL = @ACLOCAL@
17497 AMTAR = @AMTAR@
175 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
17698 AUTOCONF = @AUTOCONF@
17799 AUTOHEADER = @AUTOHEADER@
178100 AUTOMAKE = @AUTOMAKE@
193115 ECHO_T = @ECHO_T@
194116 EGREP = @EGREP@
195117 EXEEXT = @EXEEXT@
118 FLTK_CONFIG = @FLTK_CONFIG@
196119 GREP = @GREP@
197120 INSTALL = @INSTALL@
198121 INSTALL_DATA = @INSTALL_DATA@
345268
346269 clean-noinstLIBRARIES:
347270 -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
348
349271 liblout.a: $(liblout_a_OBJECTS) $(liblout_a_DEPENDENCIES) $(EXTRA_liblout_a_DEPENDENCIES)
350 $(AM_V_at)-rm -f liblout.a
351 $(AM_V_AR)$(liblout_a_AR) liblout.a $(liblout_a_OBJECTS) $(liblout_a_LIBADD)
352 $(AM_V_at)$(RANLIB) liblout.a
272 -rm -f liblout.a
273 $(liblout_a_AR) liblout.a $(liblout_a_OBJECTS) $(liblout_a_LIBADD)
274 $(RANLIB) liblout.a
353275
354276 mostlyclean-compile:
355277 -rm -f *.$(OBJEXT)
365287 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unicode.Po@am__quote@
366288
367289 .cc.o:
368 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
369 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
370 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
290 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
291 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
292 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
371293 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
372 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
294 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
373295
374296 .cc.obj:
375 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
376 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
377 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
297 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
298 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
299 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
378300 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
379 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
380
381 ID: $(am__tagged_files)
382 $(am__define_uniq_tagged_files); mkid -fID $$unique
383 tags: tags-am
384 TAGS: tags
385
386 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
301 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
302
303 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
304 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
305 unique=`for i in $$list; do \
306 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
307 done | \
308 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
309 END { if (nonempty) { for (i in files) print i; }; }'`; \
310 mkid -fID $$unique
311 tags: TAGS
312
313 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
314 $(TAGS_FILES) $(LISP)
387315 set x; \
388316 here=`pwd`; \
389 $(am__define_uniq_tagged_files); \
317 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
318 unique=`for i in $$list; do \
319 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
320 done | \
321 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
322 END { if (nonempty) { for (i in files) print i; }; }'`; \
390323 shift; \
391324 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
392325 test -n "$$unique" || unique=$$empty_fix; \
398331 $$unique; \
399332 fi; \
400333 fi
401 ctags: ctags-am
402
403 CTAGS: ctags
404 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
405 $(am__define_uniq_tagged_files); \
334 ctags: CTAGS
335 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
336 $(TAGS_FILES) $(LISP)
337 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
338 unique=`for i in $$list; do \
339 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
340 done | \
341 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
342 END { if (nonempty) { for (i in files) print i; }; }'`; \
406343 test -z "$(CTAGS_ARGS)$$unique" \
407344 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
408345 $$unique
411348 here=`$(am__cd) $(top_builddir) && pwd` \
412349 && $(am__cd) $(top_srcdir) \
413350 && gtags -i $(GTAGS_ARGS) "$$here"
414 cscopelist: cscopelist-am
415
416 cscopelist-am: $(am__tagged_files)
417 list='$(am__tagged_files)'; \
418 case "$(srcdir)" in \
419 [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
420 *) sdir=$(subdir)/$(srcdir) ;; \
421 esac; \
422 for i in $$list; do \
423 if test -f "$$i"; then \
424 echo "$(subdir)/$$i"; \
425 else \
426 echo "$$sdir/$$i"; \
427 fi; \
428 done >> $(top_builddir)/cscope.files
429351
430352 distclean-tags:
431353 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
565487
566488 .MAKE: install-am install-strip
567489
568 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
569 clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
570 distclean-compile distclean-generic distclean-tags distdir dvi \
571 dvi-am html html-am info info-am install install-am \
572 install-data install-data-am install-dvi install-dvi-am \
573 install-exec install-exec-am install-html install-html-am \
574 install-info install-info-am install-man install-pdf \
575 install-pdf-am install-ps install-ps-am install-strip \
576 installcheck installcheck-am installdirs maintainer-clean \
490 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
491 clean-noinstLIBRARIES ctags distclean distclean-compile \
492 distclean-generic distclean-tags distdir dvi dvi-am html \
493 html-am info info-am install install-am install-data \
494 install-data-am install-dvi install-dvi-am install-exec \
495 install-exec-am install-html install-html-am install-info \
496 install-info-am install-man install-pdf install-pdf-am \
497 install-ps install-ps-am install-strip installcheck \
498 installcheck-am installdirs maintainer-clean \
577499 maintainer-clean-generic mostlyclean mostlyclean-compile \
578 mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
500 mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
579501 uninstall-am
580502
581503
+271
-155
missing less more
00 #! /bin/sh
1 # Common wrapper for a few potentially missing GNU programs.
2
3 scriptversion=2013-10-28.13; # UTC
4
5 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
6 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
1 # Common stub for a few missing GNU programs while installing.
2
3 scriptversion=2012-01-06.13; # UTC
4
5 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
6 # 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
7 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
78
89 # This program is free software; you can redistribute it and/or modify
910 # it under the terms of the GNU General Public License as published by
2425 # the same distribution terms that you use for the rest of that program.
2526
2627 if test $# -eq 0; then
27 echo 1>&2 "Try '$0 --help' for more information"
28 echo 1>&2 "Try \`$0 --help' for more information"
2829 exit 1
2930 fi
3031
32 run=:
33 sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
34 sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
35
36 # In the cases where this matters, `missing' is being run in the
37 # srcdir already.
38 if test -f configure.ac; then
39 configure_ac=configure.ac
40 else
41 configure_ac=configure.in
42 fi
43
44 msg="missing on your system"
45
3146 case $1 in
32
33 --is-lightweight)
34 # Used by our autoconf macros to check whether the available missing
35 # script is modern enough.
36 exit 0
37 ;;
38
39 --run)
40 # Back-compat with the calling convention used by older automake.
41 shift
42 ;;
47 --run)
48 # Try to run requested program, and just exit if it succeeds.
49 run=
50 shift
51 "$@" && exit 0
52 # Exit code 63 means version mismatch. This often happens
53 # when the user try to use an ancient version of a tool on
54 # a file that requires a minimum version. In this case we
55 # we should proceed has if the program had been absent, or
56 # if --run hadn't been passed.
57 if test $? = 63; then
58 run=:
59 msg="probably too old"
60 fi
61 ;;
4362
4463 -h|--h|--he|--hel|--help)
4564 echo "\
4665 $0 [OPTION]... PROGRAM [ARGUMENT]...
4766
48 Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
49 to PROGRAM being missing or too old.
67 Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
68 error status if there is no known handling for PROGRAM.
5069
5170 Options:
5271 -h, --help display this help and exit
5372 -v, --version output version information and exit
73 --run try to run the given command, and emulate it if it fails
5474
5575 Supported PROGRAM values:
56 aclocal autoconf autoheader autom4te automake makeinfo
57 bison yacc flex lex help2man
58
59 Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
60 'g' are ignored when checking the name.
76 aclocal touch file \`aclocal.m4'
77 autoconf touch file \`configure'
78 autoheader touch file \`config.h.in'
79 autom4te touch the output file, or create a stub one
80 automake touch all \`Makefile.in' files
81 bison create \`y.tab.[ch]', if possible, from existing .[ch]
82 flex create \`lex.yy.c', if possible, from existing .c
83 help2man touch the output file
84 lex create \`lex.yy.c', if possible, from existing .c
85 makeinfo touch the output file
86 yacc create \`y.tab.[ch]', if possible, from existing .[ch]
87
88 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
89 \`g' are ignored when checking the name.
6190
6291 Send bug reports to <bug-automake@gnu.org>."
6392 exit $?
6998 ;;
7099
71100 -*)
72 echo 1>&2 "$0: unknown '$1' option"
73 echo 1>&2 "Try '$0 --help' for more information"
101 echo 1>&2 "$0: Unknown \`$1' option"
102 echo 1>&2 "Try \`$0 --help' for more information"
74103 exit 1
75104 ;;
76105
77106 esac
78107
79 # Run the given program, remember its exit status.
80 "$@"; st=$?
81
82 # If it succeeded, we are done.
83 test $st -eq 0 && exit 0
84
85 # Also exit now if we it failed (or wasn't found), and '--version' was
86 # passed; such an option is passed most likely to detect whether the
87 # program is present and works.
88 case $2 in --version|--help) exit $st;; esac
89
90 # Exit code 63 means version mismatch. This often happens when the user
91 # tries to use an ancient version of a tool on a file that requires a
92 # minimum version.
93 if test $st -eq 63; then
94 msg="probably too old"
95 elif test $st -eq 127; then
96 # Program was missing.
97 msg="missing on your system"
98 else
99 # Program was found and executed, but failed. Give up.
100 exit $st
101 fi
102
103 perl_URL=http://www.perl.org/
104 flex_URL=http://flex.sourceforge.net/
105 gnu_software_URL=http://www.gnu.org/software
106
107 program_details ()
108 {
109 case $1 in
110 aclocal|automake)
111 echo "The '$1' program is part of the GNU Automake package:"
112 echo "<$gnu_software_URL/automake>"
113 echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
114 echo "<$gnu_software_URL/autoconf>"
115 echo "<$gnu_software_URL/m4/>"
116 echo "<$perl_URL>"
117 ;;
118 autoconf|autom4te|autoheader)
119 echo "The '$1' program is part of the GNU Autoconf package:"
120 echo "<$gnu_software_URL/autoconf/>"
121 echo "It also requires GNU m4 and Perl in order to run:"
122 echo "<$gnu_software_URL/m4/>"
123 echo "<$perl_URL>"
124 ;;
125 esac
126 }
127
128 give_advice ()
129 {
130 # Normalize program name to check for.
131 normalized_program=`echo "$1" | sed '
132 s/^gnu-//; t
133 s/^gnu//; t
134 s/^g//; t'`
135
136 printf '%s\n' "'$1' is $msg."
137
138 configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
139 case $normalized_program in
140 autoconf*)
141 echo "You should only need it if you modified 'configure.ac',"
142 echo "or m4 files included by it."
143 program_details 'autoconf'
144 ;;
145 autoheader*)
146 echo "You should only need it if you modified 'acconfig.h' or"
147 echo "$configure_deps."
148 program_details 'autoheader'
149 ;;
150 automake*)
151 echo "You should only need it if you modified 'Makefile.am' or"
152 echo "$configure_deps."
153 program_details 'automake'
154 ;;
155 aclocal*)
156 echo "You should only need it if you modified 'acinclude.m4' or"
157 echo "$configure_deps."
158 program_details 'aclocal'
159 ;;
160 autom4te*)
161 echo "You might have modified some maintainer files that require"
162 echo "the 'autom4te' program to be rebuilt."
163 program_details 'autom4te'
164 ;;
165 bison*|yacc*)
166 echo "You should only need it if you modified a '.y' file."
167 echo "You may want to install the GNU Bison package:"
168 echo "<$gnu_software_URL/bison/>"
169 ;;
170 lex*|flex*)
171 echo "You should only need it if you modified a '.l' file."
172 echo "You may want to install the Fast Lexical Analyzer package:"
173 echo "<$flex_URL>"
174 ;;
175 help2man*)
176 echo "You should only need it if you modified a dependency" \
177 "of a man page."
178 echo "You may want to install the GNU Help2man package:"
179 echo "<$gnu_software_URL/help2man/>"
180 ;;
181 makeinfo*)
182 echo "You should only need it if you modified a '.texi' file, or"
183 echo "any other file indirectly affecting the aspect of the manual."
184 echo "You might want to install the Texinfo package:"
185 echo "<$gnu_software_URL/texinfo/>"
186 echo "The spurious makeinfo call might also be the consequence of"
187 echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
188 echo "want to install GNU make:"
189 echo "<$gnu_software_URL/make/>"
190 ;;
191 *)
192 echo "You might have modified some files without having the proper"
193 echo "tools for further handling them. Check the 'README' file, it"
194 echo "often tells you about the needed prerequisites for installing"
195 echo "this package. You may also peek at any GNU archive site, in"
196 echo "case some other package contains this missing '$1' program."
197 ;;
198 esac
199 }
200
201 give_advice "$1" | sed -e '1s/^/WARNING: /' \
202 -e '2,$s/^/ /' >&2
203
204 # Propagate the correct exit status (expected to be 127 for a program
205 # not found, 63 for a program that failed due to version mismatch).
206 exit $st
108 # normalize program name to check for.
109 program=`echo "$1" | sed '
110 s/^gnu-//; t
111 s/^gnu//; t
112 s/^g//; t'`
113
114 # Now exit if we have it, but it failed. Also exit now if we
115 # don't have it and --version was passed (most likely to detect
116 # the program). This is about non-GNU programs, so use $1 not
117 # $program.
118 case $1 in
119 lex*|yacc*)
120 # Not GNU programs, they don't have --version.
121 ;;
122
123 *)
124 if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
125 # We have it, but it failed.
126 exit 1
127 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
128 # Could not run --version or --help. This is probably someone
129 # running `$TOOL --version' or `$TOOL --help' to check whether
130 # $TOOL exists and not knowing $TOOL uses missing.
131 exit 1
132 fi
133 ;;
134 esac
135
136 # If it does not exist, or fails to run (possibly an outdated version),
137 # try to emulate it.
138 case $program in
139 aclocal*)
140 echo 1>&2 "\
141 WARNING: \`$1' is $msg. You should only need it if
142 you modified \`acinclude.m4' or \`${configure_ac}'. You might want
143 to install the \`Automake' and \`Perl' packages. Grab them from
144 any GNU archive site."
145 touch aclocal.m4
146 ;;
147
148 autoconf*)
149 echo 1>&2 "\
150 WARNING: \`$1' is $msg. You should only need it if
151 you modified \`${configure_ac}'. You might want to install the
152 \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
153 archive site."
154 touch configure
155 ;;
156
157 autoheader*)
158 echo 1>&2 "\
159 WARNING: \`$1' is $msg. You should only need it if
160 you modified \`acconfig.h' or \`${configure_ac}'. You might want
161 to install the \`Autoconf' and \`GNU m4' packages. Grab them
162 from any GNU archive site."
163 files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
164 test -z "$files" && files="config.h"
165 touch_files=
166 for f in $files; do
167 case $f in
168 *:*) touch_files="$touch_files "`echo "$f" |
169 sed -e 's/^[^:]*://' -e 's/:.*//'`;;
170 *) touch_files="$touch_files $f.in";;
171 esac
172 done
173 touch $touch_files
174 ;;
175
176 automake*)
177 echo 1>&2 "\
178 WARNING: \`$1' is $msg. You should only need it if
179 you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
180 You might want to install the \`Automake' and \`Perl' packages.
181 Grab them from any GNU archive site."
182 find . -type f -name Makefile.am -print |
183 sed 's/\.am$/.in/' |
184 while read f; do touch "$f"; done
185 ;;
186
187 autom4te*)
188 echo 1>&2 "\
189 WARNING: \`$1' is needed, but is $msg.
190 You might have modified some files without having the
191 proper tools for further handling them.
192 You can get \`$1' as part of \`Autoconf' from any GNU
193 archive site."
194
195 file=`echo "$*" | sed -n "$sed_output"`
196 test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
197 if test -f "$file"; then
198 touch $file
199 else
200 test -z "$file" || exec >$file
201 echo "#! /bin/sh"
202 echo "# Created by GNU Automake missing as a replacement of"
203 echo "# $ $@"
204 echo "exit 0"
205 chmod +x $file
206 exit 1
207 fi
208 ;;
209
210 bison*|yacc*)
211 echo 1>&2 "\
212 WARNING: \`$1' $msg. You should only need it if
213 you modified a \`.y' file. You may need the \`Bison' package
214 in order for those modifications to take effect. You can get
215 \`Bison' from any GNU archive site."
216 rm -f y.tab.c y.tab.h
217 if test $# -ne 1; then
218 eval LASTARG=\${$#}
219 case $LASTARG in
220 *.y)
221 SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
222 if test -f "$SRCFILE"; then
223 cp "$SRCFILE" y.tab.c
224 fi
225 SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
226 if test -f "$SRCFILE"; then
227 cp "$SRCFILE" y.tab.h
228 fi
229 ;;
230 esac
231 fi
232 if test ! -f y.tab.h; then
233 echo >y.tab.h
234 fi
235 if test ! -f y.tab.c; then
236 echo 'main() { return 0; }' >y.tab.c
237 fi
238 ;;
239
240 lex*|flex*)
241 echo 1>&2 "\
242 WARNING: \`$1' is $msg. You should only need it if
243 you modified a \`.l' file. You may need the \`Flex' package
244 in order for those modifications to take effect. You can get
245 \`Flex' from any GNU archive site."
246 rm -f lex.yy.c
247 if test $# -ne 1; then
248 eval LASTARG=\${$#}
249 case $LASTARG in
250 *.l)
251 SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
252 if test -f "$SRCFILE"; then
253 cp "$SRCFILE" lex.yy.c
254 fi
255 ;;
256 esac
257 fi
258 if test ! -f lex.yy.c; then
259 echo 'main() { return 0; }' >lex.yy.c
260 fi
261 ;;
262
263 help2man*)
264 echo 1>&2 "\
265 WARNING: \`$1' is $msg. You should only need it if
266 you modified a dependency of a manual page. You may need the
267 \`Help2man' package in order for those modifications to take
268 effect. You can get \`Help2man' from any GNU archive site."
269
270 file=`echo "$*" | sed -n "$sed_output"`
271 test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
272 if test -f "$file"; then
273 touch $file
274 else
275 test -z "$file" || exec >$file
276 echo ".ab help2man is required to generate this page"
277 exit $?
278 fi
279 ;;
280
281 makeinfo*)
282 echo 1>&2 "\
283 WARNING: \`$1' is $msg. You should only need it if
284 you modified a \`.texi' or \`.texinfo' file, or any other file
285 indirectly affecting the aspect of the manual. The spurious
286 call might also be the consequence of using a buggy \`make' (AIX,
287 DU, IRIX). You might want to install the \`Texinfo' package or
288 the \`GNU make' package. Grab either from any GNU archive site."
289 # The file to touch is that specified with -o ...
290 file=`echo "$*" | sed -n "$sed_output"`
291 test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
292 if test -z "$file"; then
293 # ... or it is the one specified with @setfilename ...
294 infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
295 file=`sed -n '
296 /^@setfilename/{
297 s/.* \([^ ]*\) *$/\1/
298 p
299 q
300 }' $infile`
301 # ... or it is derived from the source name (dir/f.texi becomes f.info)
302 test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
303 fi
304 # If the file does not exist, the user really needs makeinfo;
305 # let's fail without touching anything.
306 test -f $file || exit 1
307 touch $file
308 ;;
309
310 *)
311 echo 1>&2 "\
312 WARNING: \`$1' is needed, and is $msg.
313 You might have modified some files without having the
314 proper tools for further handling them. Check the \`README' file,
315 it often tells you about the needed prerequisites for installing
316 this package. You may also peek at any GNU archive site, in case
317 some other package would contain this missing \`$1' program."
318 exit 1
319 ;;
320 esac
321
322 exit 0
207323
208324 # Local variables:
209325 # eval: (add-hook 'write-file-hooks 'time-stamp)
+77
-155
src/IO/Makefile.in less more
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.11.6 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
3 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5 # Foundation, Inc.
56 # This Makefile.in is free software; the Free Software Foundation
67 # gives unlimited permission to copy and/or distribute it,
78 # with or without modifications, as long as this notice is preserved.
1415 @SET_MAKE@
1516
1617 VPATH = @srcdir@
17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18 am__make_running_with_option = \
19 case $${target_option-} in \
20 ?) ;; \
21 *) echo "am__make_running_with_option: internal error: invalid" \
22 "target option '$${target_option-}' specified" >&2; \
23 exit 1;; \
24 esac; \
25 has_opt=no; \
26 sane_makeflags=$$MAKEFLAGS; \
27 if $(am__is_gnu_make); then \
28 sane_makeflags=$$MFLAGS; \
29 else \
18 am__make_dryrun = \
19 { \
20 am__dry=no; \
3021 case $$MAKEFLAGS in \
3122 *\\[\ \ ]*) \
32 bs=\\; \
33 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
34 | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
23 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
24 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
25 *) \
26 for am__flg in $$MAKEFLAGS; do \
27 case $$am__flg in \
28 *=*|--*) ;; \
29 *n*) am__dry=yes; break;; \
30 esac; \
31 done;; \
3532 esac; \
36 fi; \
37 skip_next=no; \
38 strip_trailopt () \
39 { \
40 flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
41 }; \
42 for flg in $$sane_makeflags; do \
43 test $$skip_next = yes && { skip_next=no; continue; }; \
44 case $$flg in \
45 *=*|--*) continue;; \
46 -*I) strip_trailopt 'I'; skip_next=yes;; \
47 -*I?*) strip_trailopt 'I';; \
48 -*O) strip_trailopt 'O'; skip_next=yes;; \
49 -*O?*) strip_trailopt 'O';; \
50 -*l) strip_trailopt 'l'; skip_next=yes;; \
51 -*l?*) strip_trailopt 'l';; \
52 -[dEDm]) skip_next=yes;; \
53 -[JT]) skip_next=yes;; \
54 esac; \
55 case $$flg in \
56 *$$target_option*) has_opt=yes; break;; \
57 esac; \
58 done; \
59 test $$has_opt = yes
60 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
61 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
33 test $$am__dry = yes; \
34 }
6235 pkgdatadir = $(datadir)/@PACKAGE@
6336 pkgincludedir = $(includedir)/@PACKAGE@
6437 pkglibdir = $(libdir)/@PACKAGE@
7952 host_triplet = @host@
8053 target_triplet = @target@
8154 subdir = src/IO
82 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
83 $(top_srcdir)/depcomp
55 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
8456 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8557 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
8658 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9264 LIBRARIES = $(noinst_LIBRARIES)
9365 AR = ar
9466 ARFLAGS = cru
95 AM_V_AR = $(am__v_AR_@AM_V@)
96 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
97 am__v_AR_0 = @echo " AR " $@;
98 am__v_AR_1 =
9967 libDiof_a_AR = $(AR) $(ARFLAGS)
10068 libDiof_a_LIBADD =
10169 am_libDiof_a_OBJECTS = mime.$(OBJEXT) about.$(OBJEXT) http.$(OBJEXT) \
10270 dpi.$(OBJEXT) IO.$(OBJEXT) iowatch.$(OBJEXT)
10371 libDiof_a_OBJECTS = $(am_libDiof_a_OBJECTS)
104 AM_V_P = $(am__v_P_@AM_V@)
105 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
106 am__v_P_0 = false
107 am__v_P_1 = :
108 AM_V_GEN = $(am__v_GEN_@AM_V@)
109 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
110 am__v_GEN_0 = @echo " GEN " $@;
111 am__v_GEN_1 =
112 AM_V_at = $(am__v_at_@AM_V@)
113 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
114 am__v_at_0 = @
115 am__v_at_1 =
11672 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
11773 depcomp = $(SHELL) $(top_srcdir)/depcomp
11874 am__depfiles_maybe = depfiles
11975 am__mv = mv -f
12076 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
12177 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
122 AM_V_CC = $(am__v_CC_@AM_V@)
123 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
124 am__v_CC_0 = @echo " CC " $@;
125 am__v_CC_1 =
12678 CCLD = $(CC)
12779 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
128 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
129 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
130 am__v_CCLD_0 = @echo " CCLD " $@;
131 am__v_CCLD_1 =
13280 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
13381 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
134 AM_V_CXX = $(am__v_CXX_@AM_V@)
135 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
136 am__v_CXX_0 = @echo " CXX " $@;
137 am__v_CXX_1 =
13882 CXXLD = $(CXX)
13983 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
14084 -o $@
141 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
142 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
143 am__v_CXXLD_0 = @echo " CXXLD " $@;
144 am__v_CXXLD_1 =
14585 SOURCES = $(libDiof_a_SOURCES)
14686 DIST_SOURCES = $(libDiof_a_SOURCES)
14787 am__can_run_installinfo = \
14989 n|no|NO) false;; \
15090 *) (install-info --version) >/dev/null 2>&1;; \
15191 esac
152 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
153 # Read a list of newline-separated strings from the standard input,
154 # and print each of them once, without duplicates. Input order is
155 # *not* preserved.
156 am__uniquify_input = $(AWK) '\
157 BEGIN { nonempty = 0; } \
158 { items[$$0] = 1; nonempty = 1; } \
159 END { if (nonempty) { for (i in items) print i; }; } \
160 '
161 # Make sure the list of sources is unique. This is necessary because,
162 # e.g., the same source file might be shared among _SOURCES variables
163 # for different programs/libraries.
164 am__define_uniq_tagged_files = \
165 list='$(am__tagged_files)'; \
166 unique=`for i in $$list; do \
167 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
168 done | $(am__uniquify_input)`
16992 ETAGS = etags
17093 CTAGS = ctags
17194 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
17295 ACLOCAL = @ACLOCAL@
17396 AMTAR = @AMTAR@
174 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
17597 AUTOCONF = @AUTOCONF@
17698 AUTOHEADER = @AUTOHEADER@
17799 AUTOMAKE = @AUTOMAKE@
192114 ECHO_T = @ECHO_T@
193115 EGREP = @EGREP@
194116 EXEEXT = @EXEEXT@
117 FLTK_CONFIG = @FLTK_CONFIG@
195118 GREP = @GREP@
196119 INSTALL = @INSTALL@
197120 INSTALL_DATA = @INSTALL_DATA@
343266
344267 clean-noinstLIBRARIES:
345268 -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
346
347269 libDiof.a: $(libDiof_a_OBJECTS) $(libDiof_a_DEPENDENCIES) $(EXTRA_libDiof_a_DEPENDENCIES)
348 $(AM_V_at)-rm -f libDiof.a
349 $(AM_V_AR)$(libDiof_a_AR) libDiof.a $(libDiof_a_OBJECTS) $(libDiof_a_LIBADD)
350 $(AM_V_at)$(RANLIB) libDiof.a
270 -rm -f libDiof.a
271 $(libDiof_a_AR) libDiof.a $(libDiof_a_OBJECTS) $(libDiof_a_LIBADD)
272 $(RANLIB) libDiof.a
351273
352274 mostlyclean-compile:
353275 -rm -f *.$(OBJEXT)
363285 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mime.Po@am__quote@
364286
365287 .c.o:
366 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
367 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
368 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
288 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
289 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
290 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
369291 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
370 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
292 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
371293
372294 .c.obj:
373 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
374 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
375 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
295 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
296 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
297 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
376298 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
377 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
299 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
378300
379301 .cc.o:
380 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
381 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
382 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
302 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
303 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
304 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
383305 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
384 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
306 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
385307
386308 .cc.obj:
387 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
388 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
389 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
309 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
310 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
311 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
390312 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
391 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
392
393 ID: $(am__tagged_files)
394 $(am__define_uniq_tagged_files); mkid -fID $$unique
395 tags: tags-am
396 TAGS: tags
397
398 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
313 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
314
315 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
316 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
317 unique=`for i in $$list; do \
318 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
319 done | \
320 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
321 END { if (nonempty) { for (i in files) print i; }; }'`; \
322 mkid -fID $$unique
323 tags: TAGS
324
325 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
326 $(TAGS_FILES) $(LISP)
399327 set x; \
400328 here=`pwd`; \
401 $(am__define_uniq_tagged_files); \
329 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
330 unique=`for i in $$list; do \
331 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
332 done | \
333 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
334 END { if (nonempty) { for (i in files) print i; }; }'`; \
402335 shift; \
403336 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
404337 test -n "$$unique" || unique=$$empty_fix; \
410343 $$unique; \
411344 fi; \
412345 fi
413 ctags: ctags-am
414
415 CTAGS: ctags
416 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
417 $(am__define_uniq_tagged_files); \
346 ctags: CTAGS
347 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
348 $(TAGS_FILES) $(LISP)
349 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
350 unique=`for i in $$list; do \
351 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
352 done | \
353 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
354 END { if (nonempty) { for (i in files) print i; }; }'`; \
418355 test -z "$(CTAGS_ARGS)$$unique" \
419356 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
420357 $$unique
423360 here=`$(am__cd) $(top_builddir) && pwd` \
424361 && $(am__cd) $(top_srcdir) \
425362 && gtags -i $(GTAGS_ARGS) "$$here"
426 cscopelist: cscopelist-am
427
428 cscopelist-am: $(am__tagged_files)
429 list='$(am__tagged_files)'; \
430 case "$(srcdir)" in \
431 [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
432 *) sdir=$(subdir)/$(srcdir) ;; \
433 esac; \
434 for i in $$list; do \
435 if test -f "$$i"; then \
436 echo "$(subdir)/$$i"; \
437 else \
438 echo "$$sdir/$$i"; \
439 fi; \
440 done >> $(top_builddir)/cscope.files
441363
442364 distclean-tags:
443365 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
577499
578500 .MAKE: install-am install-strip
579501
580 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
581 clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
582 distclean-compile distclean-generic distclean-tags distdir dvi \
583 dvi-am html html-am info info-am install install-am \
584 install-data install-data-am install-dvi install-dvi-am \
585 install-exec install-exec-am install-html install-html-am \
586 install-info install-info-am install-man install-pdf \
587 install-pdf-am install-ps install-ps-am install-strip \
588 installcheck installcheck-am installdirs maintainer-clean \
502 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
503 clean-noinstLIBRARIES ctags distclean distclean-compile \
504 distclean-generic distclean-tags distdir dvi dvi-am html \
505 html-am info info-am install install-am install-data \
506 install-data-am install-dvi install-dvi-am install-exec \
507 install-exec-am install-html install-html-am install-info \
508 install-info-am install-man install-pdf install-pdf-am \
509 install-ps install-ps-am install-strip installcheck \
510 installcheck-am installdirs maintainer-clean \
589511 maintainer-clean-generic mostlyclean mostlyclean-compile \
590 mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
512 mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
591513 uninstall-am
592514
593515
+60
-49
src/IO/about.c less more
228228 "<table border='0' cellpadding='5' cellspacing='1' width='100%'>\n"
229229 "<tr>\n"
230230 " <td bgcolor='#CCCCCC'>\n"
231 " <h4>Release overview</h4>\n"
232 " December 24, 2014\n"
231 " <h4>Notes</h4>\n"
233232 "<tr>\n"
234233 " <td bgcolor='#FFFFFF'>\n"
235234 " <table border='0' cellspacing='0' cellpadding='5'>\n"
236235 " <tr>\n"
237236 " <td>\n"
237 "<ul>\n"
238 " <li> Read the <a href='http://www.dillo.org/dillo3-help.html'>help</a>,\n"
239 " it's short.\n"
240 " <li> There's a\n"
241 " <a href='http://www.dillo.org/dillorc'>dillorc</a>\n"
242 " (readable config) file inside the tarball. It is well-commented\n"
243 " and has plenty of options to customize dillo, so <STRONG>copy\n"
244 " it</STRONG> to your <STRONG>~/.dillo/</STRONG> directory, and\n"
245 " modify it to your taste.\n"
246 " <li> The right mouse button brings up a context-sensitive menu\n"
247 " (available on pages, links, images, forms, the Back and Forward buttons,\n"
248 " and the bug meter).\n"
249 " <li> Cookies are disabled by default for privacy. To log into certain\n"
250 " sites, you may need to <a href='http://www.dillo.org/Cookies.txt'>enable\n"
251 " cookies selectively</a>.\n"
252 " <li> To stop third-party ads and tracking, you can use a\n"
253 " ~/.dillo/<a href='http://www.dillo.org/domainrc'>domainrc</a>/ file.\n"
254 " <li> Frames, Java and Javascript are not supported.\n"
255 " <li> This release is mainly intended for <strong>developers</strong>\n"
256 " and <strong>advanced users</strong>.\n"
257 " <li> Documentation for developers is in the <CODE>/doc</CODE>\n"
258 " dir inside the tarball; you can find directions on everything\n"
259 " else at the home page.\n"
260 "</ul>\n"
261 " </table>\n"
262 "</table>\n"
263 "</table>\n"
264 "\n"
265 "<br>\n"
266 "\n"
267 "<table border='0' cellpadding='0' cellspacing='0' align='center' bgcolor='#000000' width='100%'><tr><td>\n"
268 "<table border='0' cellpadding='5' cellspacing='1' width='100%'>\n"
269 "<tr>\n"
270 " <td bgcolor='#CCCCCC'>\n"
271 " <h4>Release overview</h4>\n"
272 " ---- --, 2015\n"
273 "<tr>\n"
274 " <td bgcolor='#FFFFFF'>\n"
275 " <table border='0' cellspacing='0' cellpadding='5'>\n"
276 " <tr>\n"
277 " <td>\n"
238278 "<p>\n"
239 "The dillo-3.0.4.1 release brings you fixes:\n"
279 "Among the changes in dillo-3.0.5 are:\n"
240280 "<ul>\n"
241 "<li> for linking with the recently-released fltk-1.3.3\n"
242 " (we don't use <tt>fl_oldfocus</tt> anymore).\n"
243 "<li> to make sure that windows are resizable with fltk-1.3.3.\n"
244 "<li> not to load background images, or follow redirections or meta refresh,\n"
245 " in <tt>--local</tt> mode (security).\n"
246 "<li> to permit linking on OS X (remove our <tt>Fl_Printer</tt> stub).\n"
247 "<li> for a crash when searching from the address bar and no search urls are\n"
248 " found in dillorc.\n"
281 "<li>Image buffer/cache improvements.\n"
282 "<li>Fix for segfault when there's no dpid and view source is requested.\n"
283 "<li>Fix view-source dpi to handle null characters correctly.\n"
284 "<li>Made view-source dpi use CSS formatting (it's shorter and cleaner).\n"
285 "<li>Crosscompile/buildroot-friendly fltk-config test.\n"
286 "<li>Fix X11 icon name.\n"
287 "<li>In location bar, tend toward showing beginning of URL instead of end.\n"
288 "<li>Handle irix's version of vsnprintf().\n"
289 "<li>INPUT, TEXTAREA placeholder attribute.\n"
290 "<li>Better notification when user's domainrc settings block page\n"
291 " redirection.\n"
292 "<li>Fix bug with font_factor preference and CSS font-size:(larger|smaller).\n"
293 "<li>Recognize Menu key in keysrc.\n"
294 "<li>HTTPS: change cipher list to \"ALL:!aNULL:!eNULL:!LOW:!EXPORT40:!RC4\",\n"
295 " disable SSL3, disable TLS compression.\n"
296 "<li>Avoid requesting background images if an ancestor has display:none.\n"
297 "<li>Ignore built-in search url if any are specified in dillorc.\n"
249298 "</ul>\n"
250299 "<p>\n"
251300 "...that shouldn't have to wait until dillo-3.1 is ready with its floating\n"
254303 " </table>\n"
255304 "</table>\n"
256305 "</table>\n"
257 "\n"
258 "<br>\n"
259 "\n"
260 "<table border='0' cellpadding='0' cellspacing='0' align='center' bgcolor='#000000' width='100%'><tr><td>\n"
261 "<table border='0' cellpadding='5' cellspacing='1' width='100%'>\n"
262 "<tr>\n"
263 " <td bgcolor='#CCCCCC'>\n"
264 " <h4>Notes</h4>\n"
265 "<tr>\n"
266 " <td bgcolor='#FFFFFF'>\n"
267 " <table border='0' cellspacing='0' cellpadding='5'>\n"
268 " <tr>\n"
269 " <td>\n"
270 "<ul>\n"
271 " <li> There's a\n"
272 " <a href='http://www.dillo.org/dillorc'>dillorc</a>\n"
273 " (readable config) file inside the tarball. It is well-commented\n"
274 " and has plenty of options to customize dillo, so <STRONG>copy\n"
275 " it</STRONG> to your <STRONG>~/.dillo/</STRONG> directory, and\n"
276 " modify it to your taste.\n"
277 " <li> Documentation for developers is in the <CODE>/doc</CODE>\n"
278 " dir inside the tarball; you can find directions on everything\n"
279 " else at the home page.\n"
280 " <li> The right mouse button brings up a context-sensitive menu\n"
281 " (available on pages, links, images, forms, the Back and Forward buttons,\n"
282 " and the bug meter).\n"
283 " <li> Dillo behaves very nicely when browsing local files, images, and HTML.\n"
284 " It's also very good for Internet searching.\n"
285 " <li> This release is mainly intended for <strong>developers</strong>\n"
286 " and <strong>advanced users</strong>.\n"
287 " <li> Frames, Java and Javascript are not supported.\n"
288 "</ul>\n"
289 "<br>\n"
290 " </table>\n"
291 "</table>\n"
292 "</table>\n"
293 "\n"
294 "<table border='0' width='100%' cellpadding='0' cellspacing='0'><tr><td height='10'></table>\n"
295306 "\n"
296307 "\n"
297308 "<!-- the main layout table, a small vertical spacer -->\n"
+148
-189
src/Makefile.in less more
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.11.6 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
3 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5 # Foundation, Inc.
56 # This Makefile.in is free software; the Free Software Foundation
67 # gives unlimited permission to copy and/or distribute it,
78 # with or without modifications, as long as this notice is preserved.
1516
1617
1718 VPATH = @srcdir@
18 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
19 am__make_running_with_option = \
20 case $${target_option-} in \
21 ?) ;; \
22 *) echo "am__make_running_with_option: internal error: invalid" \
23 "target option '$${target_option-}' specified" >&2; \
24 exit 1;; \
25 esac; \
26 has_opt=no; \
27 sane_makeflags=$$MAKEFLAGS; \
28 if $(am__is_gnu_make); then \
29 sane_makeflags=$$MFLAGS; \
30 else \
19 am__make_dryrun = \
20 { \
21 am__dry=no; \
3122 case $$MAKEFLAGS in \
3223 *\\[\ \ ]*) \
33 bs=\\; \
34 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
35 | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
24 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
25 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
26 *) \
27 for am__flg in $$MAKEFLAGS; do \
28 case $$am__flg in \
29 *=*|--*) ;; \
30 *n*) am__dry=yes; break;; \
31 esac; \
32 done;; \
3633 esac; \
37 fi; \
38 skip_next=no; \
39 strip_trailopt () \
40 { \
41 flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
42 }; \
43 for flg in $$sane_makeflags; do \
44 test $$skip_next = yes && { skip_next=no; continue; }; \
45 case $$flg in \
46 *=*|--*) continue;; \
47 -*I) strip_trailopt 'I'; skip_next=yes;; \
48 -*I?*) strip_trailopt 'I';; \
49 -*O) strip_trailopt 'O'; skip_next=yes;; \
50 -*O?*) strip_trailopt 'O';; \
51 -*l) strip_trailopt 'l'; skip_next=yes;; \
52 -*l?*) strip_trailopt 'l';; \
53 -[dEDm]) skip_next=yes;; \
54 -[JT]) skip_next=yes;; \
55 esac; \
56 case $$flg in \
57 *$$target_option*) has_opt=yes; break;; \
58 esac; \
59 done; \
60 test $$has_opt = yes
61 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
62 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
34 test $$am__dry = yes; \
35 }
6336 pkgdatadir = $(datadir)/@PACKAGE@
6437 pkgincludedir = $(includedir)/@PACKAGE@
6538 pkglibdir = $(libdir)/@PACKAGE@
8154 target_triplet = @target@
8255 bin_PROGRAMS = dillo$(EXEEXT)
8356 subdir = src
84 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
85 $(top_srcdir)/depcomp $(dist_sysconf_DATA)
57 DIST_COMMON = $(dist_sysconf_DATA) $(srcdir)/Makefile.am \
58 $(srcdir)/Makefile.in
8659 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
8760 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
8861 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
11386 $(top_builddir)/dw/libDw-widgets.a \
11487 $(top_builddir)/dw/libDw-fltk.a \
11588 $(top_builddir)/dw/libDw-core.a $(top_builddir)/lout/liblout.a
116 AM_V_P = $(am__v_P_@AM_V@)
117 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
118 am__v_P_0 = false
119 am__v_P_1 = :
120 AM_V_GEN = $(am__v_GEN_@AM_V@)
121 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
122 am__v_GEN_0 = @echo " GEN " $@;
123 am__v_GEN_1 =
124 AM_V_at = $(am__v_at_@AM_V@)
125 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
126 am__v_at_0 = @
127 am__v_at_1 =
12889 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
12990 depcomp = $(SHELL) $(top_srcdir)/depcomp
13091 am__depfiles_maybe = depfiles
13192 am__mv = mv -f
13293 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
13394 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
134 AM_V_CC = $(am__v_CC_@AM_V@)
135 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
136 am__v_CC_0 = @echo " CC " $@;
137 am__v_CC_1 =
13895 CCLD = $(CC)
13996 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
140 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
141 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
142 am__v_CCLD_0 = @echo " CCLD " $@;
143 am__v_CCLD_1 =
14497 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
14598 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
146 AM_V_CXX = $(am__v_CXX_@AM_V@)
147 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
148 am__v_CXX_0 = @echo " CXX " $@;
149 am__v_CXX_1 =
15099 CXXLD = $(CXX)
151100 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
152101 -o $@
153 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
154 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
155 am__v_CXXLD_0 = @echo " CXXLD " $@;
156 am__v_CXXLD_1 =
157102 SOURCES = $(dillo_SOURCES)
158103 DIST_SOURCES = $(dillo_SOURCES)
159 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
160 ctags-recursive dvi-recursive html-recursive info-recursive \
161 install-data-recursive install-dvi-recursive \
162 install-exec-recursive install-html-recursive \
163 install-info-recursive install-pdf-recursive \
164 install-ps-recursive install-recursive installcheck-recursive \
165 installdirs-recursive pdf-recursive ps-recursive \
166 tags-recursive uninstall-recursive
104 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
105 html-recursive info-recursive install-data-recursive \
106 install-dvi-recursive install-exec-recursive \
107 install-html-recursive install-info-recursive \
108 install-pdf-recursive install-ps-recursive install-recursive \
109 installcheck-recursive installdirs-recursive pdf-recursive \
110 ps-recursive uninstall-recursive
167111 am__can_run_installinfo = \
168112 case $$AM_UPDATE_INFO_DIR in \
169113 n|no|NO) false;; \
199143 DATA = $(dist_sysconf_DATA)
200144 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
201145 distclean-recursive maintainer-clean-recursive
202 am__recursive_targets = \
203 $(RECURSIVE_TARGETS) \
204 $(RECURSIVE_CLEAN_TARGETS) \
205 $(am__extra_recursive_targets)
206 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
146 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
147 $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
207148 distdir
208 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
209 # Read a list of newline-separated strings from the standard input,
210 # and print each of them once, without duplicates. Input order is
211 # *not* preserved.
212 am__uniquify_input = $(AWK) '\
213 BEGIN { nonempty = 0; } \
214 { items[$$0] = 1; nonempty = 1; } \
215 END { if (nonempty) { for (i in items) print i; }; } \
216 '
217 # Make sure the list of sources is unique. This is necessary because,
218 # e.g., the same source file might be shared among _SOURCES variables
219 # for different programs/libraries.
220 am__define_uniq_tagged_files = \
221 list='$(am__tagged_files)'; \
222 unique=`for i in $$list; do \
223 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
224 done | $(am__uniquify_input)`
225149 ETAGS = etags
226150 CTAGS = ctags
227151 DIST_SUBDIRS = $(SUBDIRS)
253177 reldir="$$dir2"
254178 ACLOCAL = @ACLOCAL@
255179 AMTAR = @AMTAR@
256 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
257180 AUTOCONF = @AUTOCONF@
258181 AUTOHEADER = @AUTOHEADER@
259182 AUTOMAKE = @AUTOMAKE@
274197 ECHO_T = @ECHO_T@
275198 EGREP = @EGREP@
276199 EXEEXT = @EXEEXT@
200 FLTK_CONFIG = @FLTK_CONFIG@
277201 GREP = @GREP@
278202 INSTALL = @INSTALL@
279203 INSTALL_DATA = @INSTALL_DATA@
538462 fi; \
539463 for p in $$list; do echo "$$p $$p"; done | \
540464 sed 's/$(EXEEXT)$$//' | \
541 while read p p1; do if test -f $$p \
542 ; then echo "$$p"; echo "$$p"; else :; fi; \
465 while read p p1; do if test -f $$p; \
466 then echo "$$p"; echo "$$p"; else :; fi; \
543467 done | \
544 sed -e 'p;s,.*/,,;n;h' \
545 -e 's|.*|.|' \
468 sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
546469 -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
547470 sed 'N;N;N;s,\n, ,g' | \
548471 $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
563486 @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
564487 files=`for p in $$list; do echo "$$p"; done | \
565488 sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
566 -e 's/$$/$(EXEEXT)/' \
567 `; \
489 -e 's/$$/$(EXEEXT)/' `; \
568490 test -n "$$list" || exit 0; \
569491 echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
570492 cd "$(DESTDIR)$(bindir)" && rm -f $$files
571493
572494 clean-binPROGRAMS:
573495 -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
574
575496 dillo$(EXEEXT): $(dillo_OBJECTS) $(dillo_DEPENDENCIES) $(EXTRA_dillo_DEPENDENCIES)
576497 @rm -f dillo$(EXEEXT)
577 $(AM_V_CXXLD)$(CXXLINK) $(dillo_OBJECTS) $(dillo_LDADD) $(LIBS)
498 $(CXXLINK) $(dillo_OBJECTS) $(dillo_LDADD) $(LIBS)
578499
579500 mostlyclean-compile:
580501 -rm -f *.$(OBJEXT)
632553 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xembed.Po@am__quote@
633554
634555 .c.o:
635 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
636 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
637 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
556 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
557 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
558 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
638559 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
639 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
560 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
640561
641562 .c.obj:
642 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
643 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
644 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
563 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
564 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
565 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
645566 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
646 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
567 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
647568
648569 .cc.o:
649 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
650 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
651 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
570 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
571 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
572 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
652573 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
653 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
574 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
654575
655576 .cc.obj:
656 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
657 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
658 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
577 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
578 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
579 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
659580 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
660 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
581 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
661582 install-dist_sysconfDATA: $(dist_sysconf_DATA)
662583 @$(NORMAL_INSTALL)
663584 @list='$(dist_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
681602 dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
682603
683604 # This directory's subdirectories are mostly independent; you can cd
684 # into them and run 'make' without going through this Makefile.
685 # To change the values of 'make' variables: instead of editing Makefiles,
686 # (1) if the variable is set in 'config.status', edit 'config.status'
687 # (which will cause the Makefiles to be regenerated when you run 'make');
688 # (2) otherwise, pass the desired values on the 'make' command line.
689 $(am__recursive_targets):
690 @fail=; \
691 if $(am__make_keepgoing); then \
692 failcom='fail=yes'; \
693 else \
694 failcom='exit 1'; \
695 fi; \
605 # into them and run `make' without going through this Makefile.
606 # To change the values of `make' variables: instead of editing Makefiles,
607 # (1) if the variable is set in `config.status', edit `config.status'
608 # (which will cause the Makefiles to be regenerated when you run `make');
609 # (2) otherwise, pass the desired values on the `make' command line.
610 $(RECURSIVE_TARGETS):
611 @fail= failcom='exit 1'; \
612 for f in x $$MAKEFLAGS; do \
613 case $$f in \
614 *=* | --[!k]*);; \
615 *k*) failcom='fail=yes';; \
616 esac; \
617 done; \
696618 dot_seen=no; \
697619 target=`echo $@ | sed s/-recursive//`; \
698 case "$@" in \
699 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
700 *) list='$(SUBDIRS)' ;; \
701 esac; \
702 for subdir in $$list; do \
620 list='$(SUBDIRS)'; for subdir in $$list; do \
703621 echo "Making $$target in $$subdir"; \
704622 if test "$$subdir" = "."; then \
705623 dot_seen=yes; \
714632 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
715633 fi; test -z "$$fail"
716634
717 ID: $(am__tagged_files)
718 $(am__define_uniq_tagged_files); mkid -fID $$unique
719 tags: tags-recursive
720 TAGS: tags
721
722 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
635 $(RECURSIVE_CLEAN_TARGETS):
636 @fail= failcom='exit 1'; \
637 for f in x $$MAKEFLAGS; do \
638 case $$f in \
639 *=* | --[!k]*);; \
640 *k*) failcom='fail=yes';; \
641 esac; \
642 done; \
643 dot_seen=no; \
644 case "$@" in \
645 distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
646 *) list='$(SUBDIRS)' ;; \
647 esac; \
648 rev=''; for subdir in $$list; do \
649 if test "$$subdir" = "."; then :; else \
650 rev="$$subdir $$rev"; \
651 fi; \
652 done; \
653 rev="$$rev ."; \
654 target=`echo $@ | sed s/-recursive//`; \
655 for subdir in $$rev; do \
656 echo "Making $$target in $$subdir"; \
657 if test "$$subdir" = "."; then \
658 local_target="$$target-am"; \
659 else \
660 local_target="$$target"; \
661 fi; \
662 ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
663 || eval $$failcom; \
664 done && test -z "$$fail"
665 tags-recursive:
666 list='$(SUBDIRS)'; for subdir in $$list; do \
667 test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
668 done
669 ctags-recursive:
670 list='$(SUBDIRS)'; for subdir in $$list; do \
671 test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
672 done
673
674 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
675 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
676 unique=`for i in $$list; do \
677 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
678 done | \
679 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
680 END { if (nonempty) { for (i in files) print i; }; }'`; \
681 mkid -fID $$unique
682 tags: TAGS
683
684 TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
685 $(TAGS_FILES) $(LISP)
723686 set x; \
724687 here=`pwd`; \
725688 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
735698 set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
736699 fi; \
737700 done; \
738 $(am__define_uniq_tagged_files); \
701 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
702 unique=`for i in $$list; do \
703 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
704 done | \
705 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
706 END { if (nonempty) { for (i in files) print i; }; }'`; \
739707 shift; \
740708 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
741709 test -n "$$unique" || unique=$$empty_fix; \
747715 $$unique; \
748716 fi; \
749717 fi
750 ctags: ctags-recursive
751
752 CTAGS: ctags
753 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
754 $(am__define_uniq_tagged_files); \
718 ctags: CTAGS
719 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
720 $(TAGS_FILES) $(LISP)
721 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
722 unique=`for i in $$list; do \
723 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
724 done | \
725 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
726 END { if (nonempty) { for (i in files) print i; }; }'`; \
755727 test -z "$(CTAGS_ARGS)$$unique" \
756728 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
757729 $$unique
760732 here=`$(am__cd) $(top_builddir) && pwd` \
761733 && $(am__cd) $(top_srcdir) \
762734 && gtags -i $(GTAGS_ARGS) "$$here"
763 cscopelist: cscopelist-recursive
764
765 cscopelist-am: $(am__tagged_files)
766 list='$(am__tagged_files)'; \
767 case "$(srcdir)" in \
768 [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
769 *) sdir=$(subdir)/$(srcdir) ;; \
770 esac; \
771 for i in $$list; do \
772 if test -f "$$i"; then \
773 echo "$(subdir)/$$i"; \
774 else \
775 echo "$$sdir/$$i"; \
776 fi; \
777 done >> $(top_builddir)/cscope.files
778735
779736 distclean-tags:
780737 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
941898
942899 uninstall-am: uninstall-binPROGRAMS uninstall-dist_sysconfDATA
943900
944 .MAKE: $(am__recursive_targets) install-am install-strip
945
946 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
947 check-am clean clean-binPROGRAMS clean-generic cscopelist-am \
948 ctags ctags-am distclean distclean-compile distclean-generic \
949 distclean-tags distdir dvi dvi-am html html-am info info-am \
950 install install-am install-binPROGRAMS install-data \
951 install-data-am install-dist_sysconfDATA install-dvi \
952 install-dvi-am install-exec install-exec-am install-html \
953 install-html-am install-info install-info-am install-man \
954 install-pdf install-pdf-am install-ps install-ps-am \
955 install-strip installcheck installcheck-am installdirs \
956 installdirs-am maintainer-clean maintainer-clean-generic \
957 mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
958 ps ps-am tags tags-am uninstall uninstall-am \
901 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
902 install-am install-strip tags-recursive
903
904 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
905 all all-am check check-am clean clean-binPROGRAMS \
906 clean-generic ctags ctags-recursive distclean \
907 distclean-compile distclean-generic distclean-tags distdir dvi \
908 dvi-am html html-am info info-am install install-am \
909 install-binPROGRAMS install-data install-data-am \
910 install-dist_sysconfDATA install-dvi install-dvi-am \
911 install-exec install-exec-am install-html install-html-am \
912 install-info install-info-am install-man install-pdf \
913 install-pdf-am install-ps install-ps-am install-strip \
914 installcheck installcheck-am installdirs installdirs-am \
915 maintainer-clean maintainer-clean-generic mostlyclean \
916 mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
917 tags tags-recursive uninstall uninstall-am \
959918 uninstall-binPROGRAMS uninstall-dist_sysconfDATA
960919
961920
+69
-47
src/cache.c less more
109109 }
110110
111111 /*
112 * Initialize dicache data
112 * Initialize cache data
113113 */
114114 void a_Cache_init(void)
115115 {
673673 if (header[9] == '3' && header[10] == '0' &&
674674 (location_str = Cache_parse_field(header, "Location"))) {
675675 /* 30x: URL redirection */
676 DilloUrl *location_url = a_Url_new(location_str,URL_STR_(entry->Url));
677
678 if (!a_Domain_permit(entry->Url, location_url)) {
679 /* don't redirect; just show body like usual (if any) */
676 entry->Location = a_Url_new(location_str, URL_STR_(entry->Url));
677
678 if (!a_Domain_permit(entry->Url, entry->Location) ||
679 (URL_FLAGS(entry->Location) & (URL_Post + URL_Get) &&
680 dStrAsciiCasecmp(URL_SCHEME(entry->Location), "dpi") == 0 &&
681 dStrAsciiCasecmp(URL_SCHEME(entry->Url), "dpi") != 0)) {
682 /* Domain test, and forbid dpi GET and POST from non dpi-generated
683 * urls.
684 */
680685 MSG("Redirection not followed from %s to %s\n",
681 URL_HOST(entry->Url), URL_STR(location_url));
682 a_Url_free(location_url);
686 URL_HOST(entry->Url), URL_STR(entry->Location));
683687 } else {
684688 entry->Flags |= CA_Redirect;
685689 if (header[11] == '1')
686690 entry->Flags |= CA_ForceRedirect; /* 301 Moved Permanently */
687691 else if (header[11] == '2')
688692 entry->Flags |= CA_TempRedirect; /* 302 Temporary Redirect */
689
690 if (URL_FLAGS(location_url) & (URL_Post + URL_Get) &&
691 dStrAsciiCasecmp(URL_SCHEME(location_url), "dpi") == 0 &&
692 dStrAsciiCasecmp(URL_SCHEME(entry->Url), "dpi") != 0) {
693 /* Forbid dpi GET and POST from non dpi-generated urls */
694 MSG("Redirection Denied! '%s' -> '%s'\n",
695 URL_STR(entry->Url), URL_STR(location_url));
696 a_Url_free(location_url);
697 } else {
698 entry->Location = location_url;
699 }
700693 }
701694 dFree(location_str);
702695 } else if (strncmp(header + 9, "401", 3) == 0) {
750743
751744 if (!web->requester ||
752745 a_Url_same_organization(entry->Url, web->requester)) {
746 /* If cookies are third party, don't even consider them. */
753747 char *server_date = Cache_parse_field(header, "Date");
754748
755749 a_Cookies_set(Cookies, entry->Url, server_date);
758752 }
759753 }
760754 }
761 if (i >= dList_length(ClientQueue)) {
762 MSG("Cache: cookies not accepted from '%s'\n", URL_STR(entry->Url));
763 }
764
765755 for (i = 0; (data = dList_nth_data(Cookies, i)); ++i)
766756 dFree(data);
767757 dList_free(Cookies);
10901080 a_UIcmd_save_link(data->bw, data->url);
10911081 a_Url_free(data->url);
10921082 dFree(data);
1083 }
1084
1085 /*
1086 * Let the client know that we're not following a redirection.
1087 */
1088 static void Cache_provide_redirection_blocked_page(CacheEntry_t *entry,
1089 CacheClient_t *client)
1090 {
1091 DilloWeb *clientWeb = client->Web;
1092
1093 a_Web_dispatch_by_type("text/html", clientWeb, &client->Callback,
1094 &client->CbData);
1095 client->Buf = dStrconcat("<!doctype html><html><body>"
1096 "Dillo blocked a redirection attempt from <a href=\"",
1097 URL_STR(entry->Url), "\">", URL_STR(entry->Url),
1098 "</a> to <a href=\"", URL_STR(entry->Location), "\">",
1099 URL_STR(entry->Location), "</a> based on your domainrc "
1100 "settings.</body></html>", NULL);
1101 client->BufSize = strlen(client->Buf);
1102 (client->Callback)(CA_Send, client);
1103 dFree(client->Buf);
10931104 }
10941105
10951106 /*
11771188 /* Set the client function */
11781189 if (!Client->Callback) {
11791190 Client->Callback = Cache_null_client;
1180 if (TypeMismatch) {
1181 AbortEntry = TRUE;
1191
1192 if (entry->Location && !(entry->Flags & CA_Redirect)) {
1193 /* Not following redirection, so don't display page body. */
11821194 } else {
1183 const char *curr_type = Cache_current_content_type(entry);
1184 st = a_Web_dispatch_by_type(curr_type, ClientWeb,
1185 &Client->Callback, &Client->CbData);
1186 if (st == -1) {
1187 /* MIME type is not viewable */
1188 if (ClientWeb->flags & WEB_RootUrl) {
1189 MSG("Content-Type '%s' not viewable.\n", curr_type);
1190 /* prepare a download offer... */
1191 AbortEntry = OfferDownload = TRUE;
1192 } else {
1193 /* TODO: Resource Type not handled.
1194 * Not aborted to avoid multiple connections on the same
1195 * resource. A better idea is to abort the connection and
1196 * to keep a failed-resource flag in the cache entry. */
1195 if (TypeMismatch) {
1196 AbortEntry = TRUE;
1197 } else {
1198 const char *curr_type = Cache_current_content_type(entry);
1199 st = a_Web_dispatch_by_type(curr_type, ClientWeb,
1200 &Client->Callback,
1201 &Client->CbData);
1202 if (st == -1) {
1203 /* MIME type is not viewable */
1204 if (ClientWeb->flags & WEB_RootUrl) {
1205 MSG("Content-Type '%s' not viewable.\n", curr_type);
1206 /* prepare a download offer... */
1207 AbortEntry = OfferDownload = TRUE;
1208 } else {
1209 /* TODO: Resource Type not handled.
1210 * Not aborted to avoid multiple connections on the
1211 * same resource. A better idea is to abort the
1212 * connection and to keep a failed-resource flag in
1213 * the cache entry. */
1214 }
11971215 }
11981216 }
1199 }
1200 if (AbortEntry) {
1201 if (ClientWeb->flags & WEB_RootUrl)
1202 a_Nav_cancel_expect_if_eq(Client_bw, Client->Url);
1203 a_Bw_remove_client(Client_bw, Client->Key);
1204 Cache_client_dequeue(Client);
1205 --i; /* Keep the index value in the next iteration */
1206 continue;
1217 if (AbortEntry) {
1218 if (ClientWeb->flags & WEB_RootUrl)
1219 a_Nav_cancel_expect_if_eq(Client_bw, Client->Url);
1220 a_Bw_remove_client(Client_bw, Client->Key);
1221 Cache_client_dequeue(Client);
1222 --i; /* Keep the index value in the next iteration */
1223 continue;
1224 }
12071225 }
12081226 }
12091227
12271245 if (entry->Flags & CA_GotData) {
12281246 /* Copy flags to a local var */
12291247 int flags = ClientWeb->flags;
1248
1249 if (ClientWeb->flags & WEB_RootUrl && entry->Location &&
1250 !(entry->Flags & CA_Redirect)) {
1251 Cache_provide_redirection_blocked_page(entry, Client);
1252 }
12301253 /* We finished sending data, let the client know */
12311254 (Client->Callback)(CA_Close, Client);
12321255 if (ClientWeb->flags & WEB_RootUrl)
12631286
12641287 /* Trigger cleanup when there are no cache clients */
12651288 if (dList_length(ClientQueue) == 0) {
1266 _MSG(" a_Dicache_cleanup()\n");
12671289 a_Dicache_cleanup();
12681290 }
12691291
+2
-2
src/capi.c less more
570570 } else {
571571 /* Re-use an open connection */
572572 conn = Capi_conn_find(server);
573 if (conn) {
574 /* found */
573 if (conn && conn->InfoSend) {
574 /* found & active */
575575 dbuf = a_Chain_dbuf_new(data, data_sz, 0);
576576 a_Capi_ccc(OpSend, 1, BCK, conn->InfoSend, dbuf, NULL);
577577 dFree(dbuf);
+7
-0
src/colors.c less more
6161 { "darkgoldenrod", 0xb8860b},
6262 { "darkgray", 0xa9a9a9},
6363 { "darkgreen", 0x006400},
64 { "darkgrey", 0xa9a9a9},
6465 { "darkkhaki", 0xbdb76b},
6566 { "darkmagenta", 0x8b008b},
6667 { "darkolivegreen", 0x556b2f},
7172 { "darkseagreen", 0x8fbc8f},
7273 { "darkslateblue", 0x483d8b},
7374 { "darkslategray", 0x2f4f4f},
75 { "darkslategrey", 0x2f4f4f},
7476 { "darkturquoise", 0x00ced1},
7577 { "darkviolet", 0x9400d3},
7678 { "deeppink", 0xff1493},
7779 { "deepskyblue", 0x00bfff},
7880 { "dimgray", 0x696969},
81 { "dimgrey", 0x696969},
7982 { "dodgerblue", 0x1e90ff},
8083 { "firebrick", 0xb22222},
8184 { "floralwhite", 0xfffaf0},
9295 { "green", 0x008000},
9396 #ifdef EXTENDED_COLOR
9497 { "greenyellow", 0xadff2f},
98 { "grey", 0x808080},
9599 { "honeydew", 0xf0fff0},
96100 { "hotpink", 0xff69b4},
97101 { "indianred", 0xcd5c5c},
106110 { "lightcoral", 0xf08080},
107111 { "lightcyan", 0xe0ffff},
108112 { "lightgoldenrodyellow", 0xfafad2},
113 { "lightgray", 0xd3d3d3},
109114 { "lightgreen", 0x90ee90},
110115 { "lightgrey", 0xd3d3d3},
111116 { "lightpink", 0xffb6c1},
113118 { "lightseagreen", 0x20b2aa},
114119 { "lightskyblue", 0x87cefa},
115120 { "lightslategray", 0x778899},
121 { "lightslategrey", 0x778899},
116122 { "lightsteelblue", 0xb0c4de},
117123 { "lightyellow", 0xffffe0},
118124 #endif
177183 { "skyblue", 0x87ceeb},
178184 { "slateblue", 0x6a5acd},
179185 { "slategray", 0x708090},
186 { "slategrey", 0x708090},
180187 { "snow", 0xfffafa},
181188 { "springgreen", 0x00ff7f},
182189 { "steelblue", 0x4682b4},
+126
-164
src/dicache.c less more
2727 DIC_Jpeg
2828 };
2929
30 typedef struct {
31 int valid; /* flag */
32 DilloUrl *url; /* primary "Key" for this dicache entry */
33 DICacheEntry *first; /* pointer to the first dicache entry in this list */
34 } DICacheNode;
35
36 /*
37 * List of DICacheNode. One node per URL. Each node may have several
38 * versions of the same image in a linked list.
30
31 /*
32 * List of DICacheEntry. May hold several versions of the same image,
33 * although most of the time it holds just one.
3934 */
4035 static Dlist *CachedIMGs = NULL;
4136
4439 * of all the images in the dicache. */
4540
4641 /*
47 * Compare two dicache nodes
48 */
49 static int Dicache_node_cmp(const void *v1, const void *v2)
50 {
51 const DICacheNode *n1 = v1, *n2 = v2;
52
53 return a_Url_cmp(n1->url, n2->url);
54 }
55
56 /*
57 * Compare function for searching a node by Url
58 */
59 static int Dicache_node_by_url_cmp(const void *v1, const void *v2)
60 {
61 const DICacheNode *node = v1;
62 const DilloUrl *url = v2;
63
64 return a_Url_cmp(node->url, url);
42 * Compare function for image entries
43 */
44 static int Dicache_entry_cmp(const void *v1, const void *v2)
45 {
46 const DICacheEntry *e1 = v1, *e2 = v2;
47
48 int st = a_Url_cmp(e1->url, e2->url);
49 if (st == 0) {
50 if (e2->version == DIC_Last)
51 st = (e1->Flags & DIF_Last ? 0 : -1);
52 else
53 st = (e1->version - e2->version);
54 }
55 return st;
6556 }
6657
6758 /*
8273
8374 entry->width = 0;
8475 entry->height = 0;
76 entry->Flags = DIF_Valid;
77 entry->SurvCleanup = 0;
8578 entry->type = DILLO_IMG_TYPE_NOTSET;
8679 entry->cmap = NULL;
8780 entry->v_imgbuf = NULL;
9689 entry->DecoderData = NULL;
9790 entry->DecodedSize = 0;
9891
99 entry->next = NULL;
100
10192 return entry;
10293 }
10394
10495 /*
10596 * Add a new entry in the dicache
106 * (a single node (URL) may have several entries)
97 * (a single URL may have several entries)
10798 */
10899 static DICacheEntry *Dicache_add_entry(const DilloUrl *Url)
109100 {
110 DICacheEntry *entry;
111 DICacheNode *node;
101 DICacheEntry e, *entry, *last;
112102
113103 entry = Dicache_entry_new();
114
115 if ((node = dList_find_sorted(CachedIMGs, Url, Dicache_node_by_url_cmp))) {
116 /* this URL is already in CachedIMGs, add entry at the END of the list */
117 DICacheEntry *ptr = node->first;
118
119 node->valid = 1;
120 for ( ; ptr->next; ptr = ptr->next);
121 ptr->next = entry;
122 entry->version = ptr->version+1;
123 entry->url = node->url;
124
125 } else { /* no node yet, so create one */
126 DICacheNode *node = dNew(DICacheNode, 1);
127
128 node->url = a_Url_dup(Url);
129 entry->url = node->url;
130 node->first = entry;
131 node->valid = 1;
132 dList_insert_sorted(CachedIMGs, node, Dicache_node_cmp);
133 }
104 e.url = (DilloUrl*)Url;
105 e.version = DIC_Last;
106 last = dList_find_sorted(CachedIMGs, &e, Dicache_entry_cmp);
107 if (last) {
108 /* URL is already in CachedIMGs, make a new version */
109 last->Flags &= ~DIF_Last;
110 entry->version = last->version + 1;
111 }
112 entry->url = a_Url_dup(Url);
113 entry->Flags |= DIF_Last;
114 dList_insert_sorted(CachedIMGs, entry, Dicache_entry_cmp);
134115
135116 return entry;
136117 }
144125 */
145126 DICacheEntry *a_Dicache_get_entry(const DilloUrl *Url, int version)
146127 {
147 DICacheNode *node;
128 DICacheEntry e;
148129 DICacheEntry *entry = NULL;
149130
150131 dReturn_val_if_fail(version != 0, NULL);
151
152 node = dList_find_sorted(CachedIMGs, Url, Dicache_node_by_url_cmp);
153 if (node) {
154 if (version == DIC_Last) {
155 if (node->valid) {
156 entry = node->first;
157 for ( ; (entry && entry->next); entry = entry->next);
158 }
159 } else {
160 entry = node->first;
161 for ( ; entry && entry->version != version; entry = entry->next) ;
162 }
163 }
132 e.url = (DilloUrl*)Url;
133 e.version = version;
134 entry = dList_find_sorted(CachedIMGs, &e, Dicache_entry_cmp);
135 if (entry && !(entry->Flags & DIF_Valid) && version == DIC_Last)
136 entry = NULL;
164137 return entry;
165138 }
166139
169142 */
170143 static void Dicache_remove(const DilloUrl *Url, int version)
171144 {
172 DICacheNode *node;
173 DICacheEntry *entry, *prev;
145 DICacheEntry e, *entry;
146
174147 _MSG("Dicache_remove url=%s\n", URL_STR(Url));
175 node = dList_find_sorted(CachedIMGs, Url, Dicache_node_by_url_cmp);
176 prev = entry = (node) ? node->first : NULL;
177
178 while (entry && (entry->version != version) ) {
179 prev = entry;
180 entry = entry->next;
181 }
182
183 if (entry) {
184 _MSG("Dicache_remove Decoder=%p DecoderData=%p\n",
185 entry->Decoder, entry->DecoderData);
186 /* Eliminate this dicache entry */
187 dFree(entry->cmap);
188 a_Bitvec_free(entry->BitVec);
189 a_Imgbuf_unref(entry->v_imgbuf);
190 if (entry->Decoder) {
191 entry->Decoder(CA_Abort, entry->DecoderData);
192 }
193 dicache_size_total -= entry->TotalSize;
194
195 if (node->first == entry) {
196 if (!entry->next) {
197 /* last entry with this URL. Remove the node as well */
198 dList_remove(CachedIMGs, node);
199 a_Url_free(node->url);
200 dFree(node);
201 } else
202 node->first = entry->next;
203 } else {
204 prev->next = entry->next;
205 }
206 dFree(entry);
207 }
208 }
209
210 /*
211 * Unrefs the counter of a dicache entry, and _if_ no DwImage is acessing
212 * this buffer, then we call Dicache_remove() to do the job.
148 e.url = (DilloUrl*)Url;
149 e.version = version;
150 entry = dList_find_sorted(CachedIMGs, &e, Dicache_entry_cmp);
151 dReturn_if (entry == NULL);
152
153 _MSG("Dicache_remove Imgbuf=%p Decoder=%p DecoderData=%p\n",
154 entry->v_imgbuf, entry->Decoder, entry->DecoderData);
155 /* Eliminate this dicache entry */
156 dList_remove(CachedIMGs, entry);
157 dicache_size_total -= entry->TotalSize;
158
159 /* entry cleanup */
160 a_Url_free(entry->url);
161 dFree(entry->cmap);
162 a_Bitvec_free(entry->BitVec);
163 a_Imgbuf_unref(entry->v_imgbuf);
164 if (entry->Decoder) {
165 entry->Decoder(CA_Abort, entry->DecoderData);
166 }
167 dFree(entry);
168 }
169
170 /*
171 * Unrefs the counter of a dicache entry (it counts cache clients).
172 * If there're no clients and no imgbuf, remove the entry.
173 * Otherwise, let a_Dicache_cleanup() do the job later
174 * (keeping it cached meanwhile for e.g. reload, repush, back/fwd).
213175 */
214176 void a_Dicache_unref(const DilloUrl *Url, int version)
215177 {
216178 DICacheEntry *entry;
217179
218 _MSG("a_Dicache_unref\n");
219180 if ((entry = a_Dicache_get_entry(Url, version))) {
220 if (--entry->RefCount == 0) {
181 _MSG("a_Dicache_unref: RefCount=%d State=%d ImgbufLastRef=%d\n",
182 entry->RefCount, entry->State,
183 entry->v_imgbuf ? a_Imgbuf_last_reference(entry->v_imgbuf) : -1);
184 if (entry->RefCount > 0) --entry->RefCount;
185 if (entry->RefCount == 0 && entry->v_imgbuf == NULL)
221186 Dicache_remove(Url, version);
222 }
223187 }
224188 }
225189
243207 */
244208 void a_Dicache_invalidate_entry(const DilloUrl *Url)
245209 {
246 DICacheNode *node;
247
248 node = dList_find_sorted(CachedIMGs, Url, Dicache_node_by_url_cmp);
249 if (node)
250 node->valid = 0;
210 DICacheEntry *entry = a_Dicache_get_entry(Url, DIC_Last);
211 if (entry)
212 entry->Flags &= ~DIF_Valid;
251213 }
252214
253215
255217
256218 /*
257219 * Set image's width, height & type
258 * (By now, we'll use the image information despite the html tags --Jcid)
220 * - 'width' and 'height' come from the image data.
221 * - HTML width and height attrs are handled with setNonCssHint.
222 * - CSS sizing is handled by the CSS engine.
259223 */
260224 void a_Dicache_set_parms(DilloUrl *url, int version, DilloImage *Image,
261225 uint_t width, uint_t height, DilloImgType type,
268232 /* Find the DicEntry for this Image */
269233 DicEntry = a_Dicache_get_entry(url, version);
270234 dReturn_if_fail ( DicEntry != NULL );
271 /* Parameters already set? */
235 /* Parameters already set? Don't do it twice. */
272236 dReturn_if_fail ( DicEntry->State < DIC_SetParms );
273237
274238 _MSG(" RefCount=%d version=%d\n", DicEntry->RefCount, DicEntry->version);
291255 /*
292256 * Implement the set_cmap method for the Image
293257 */
294 void a_Dicache_set_cmap(DilloUrl *url, int version, DilloImage *Image,
258 void a_Dicache_set_cmap(DilloUrl *url, int version, int bg_color,
295259 const uchar_t *cmap, uint_t num_colors,
296260 int num_colors_max, int bg_index)
297261 {
304268 DicEntry->cmap = dNew0(uchar_t, 3 * num_colors_max);
305269 memcpy(DicEntry->cmap, cmap, 3 * num_colors);
306270 if (bg_index >= 0 && (uint_t)bg_index < num_colors) {
307 DicEntry->cmap[bg_index * 3] = (Image->bg_color >> 16) & 0xff;
308 DicEntry->cmap[bg_index * 3 + 1] = (Image->bg_color >> 8) & 0xff;
309 DicEntry->cmap[bg_index * 3 + 2] = (Image->bg_color) & 0xff;
271 DicEntry->cmap[bg_index * 3] = (bg_color >> 16) & 0xff;
272 DicEntry->cmap[bg_index * 3 + 1] = (bg_color >> 8) & 0xff;
273 DicEntry->cmap[bg_index * 3 + 2] = (bg_color) & 0xff;
310274 }
311275
312276 DicEntry->State = DIC_SetCmap;
367331
368332 /* a_Dicache_unref() may free DicEntry */
369333 _MSG("a_Dicache_close RefCount=%d\n", DicEntry->RefCount - 1);
334 _MSG("a_Dicache_close DIC_Close=%d State=%d\n", DIC_Close, DicEntry->State);
335 _MSG(" a_Dicache_close imgbuf=%p Decoder=%p DecoderData=%p\n",
336 DicEntry->v_imgbuf, DicEntry->Decoder, DicEntry->DecoderData);
370337
371338 if (DicEntry->State < DIC_Close) {
372339 DicEntry->State = DIC_Close;
409376
410377 DicEntry = a_Dicache_get_entry(web->url, DIC_Last);
411378 if (!DicEntry) {
412 /* Let's create an entry for this image... */
379 /* Create an entry for this image... */
413380 DicEntry = Dicache_add_entry(web->url);
414 DicEntry->DecoderData =
415 (ImgType == DIC_Png) ?
416 a_Png_new(web->Image, DicEntry->url, DicEntry->version) :
417 (ImgType == DIC_Gif) ?
418 a_Gif_new(web->Image, DicEntry->url, DicEntry->version) :
419 (ImgType == DIC_Jpeg) ?
420 a_Jpeg_new(web->Image, DicEntry->url, DicEntry->version) :
421 NULL;
381 /* Attach a decoder */
382 if (ImgType == DIC_Jpeg) {
383 DicEntry->Decoder = (CA_Callback_t)a_Jpeg_callback;
384 DicEntry->DecoderData =
385 a_Jpeg_new(web->Image, DicEntry->url, DicEntry->version);
386 } else if (ImgType == DIC_Gif) {
387 DicEntry->Decoder = (CA_Callback_t)a_Gif_callback;
388 DicEntry->DecoderData =
389 a_Gif_new(web->Image, DicEntry->url, DicEntry->version);
390 } else if (ImgType == DIC_Png) {
391 DicEntry->Decoder = (CA_Callback_t)a_Png_callback;
392 DicEntry->DecoderData =
393 a_Png_new(web->Image, DicEntry->url, DicEntry->version);
394 }
422395 } else {
423396 /* Repeated image */
424397 a_Dicache_ref(DicEntry->url, DicEntry->version);
425398 }
426 DicEntry->Decoder = (ImgType == DIC_Png) ? (CA_Callback_t)a_Png_callback :
427 (ImgType == DIC_Gif) ? (CA_Callback_t)a_Gif_callback :
428 (ImgType == DIC_Jpeg) ? (CA_Callback_t)a_Jpeg_callback:
429 NULL;
399 /* Survive three cleanup passes (set to zero = old behaviour). */
400 DicEntry->SurvCleanup = 3;
401
430402 *Data = DicEntry->DecoderData;
431403 *Call = (CA_Callback_t) a_Dicache_callback;
432404
534506 void a_Dicache_cleanup(void)
535507 {
536508 int i;
537 DICacheNode *node;
538509 DICacheEntry *entry;
539510
540 _MSG("a_Dicache_cleanup\n");
541 for (i = 0; i < dList_length(CachedIMGs); ++i) {
542 node = dList_nth_data(CachedIMGs, i);
543 /* iterate each entry of this node */
544 for (entry = node->first; entry; entry = entry->next) {
545 if (entry->v_imgbuf &&
546 a_Imgbuf_last_reference(entry->v_imgbuf)) {
547 /* free this unused entry */
548 if (entry->next) {
549 Dicache_remove(node->url, entry->version);
550 } else {
551 Dicache_remove(node->url, entry->version);
552 --i;
553 break;
554 }
555 }
511 for (i = 0; (entry = dList_nth_data(CachedIMGs, i)); ++i) {
512 _MSG(" SurvCleanup = %d\n", entry->SurvCleanup);
513 if (entry->RefCount == 0 &&
514 (!entry->v_imgbuf || a_Imgbuf_last_reference(entry->v_imgbuf))) {
515 if (--entry->SurvCleanup >= 0)
516 continue; /* keep the entry one more pass */
517
518 /* free this unused entry */
519 Dicache_remove(entry->url, entry->version);
520 --i; /* adjust counter */
556521 }
557522 }
523 MSG("a_Dicache_cleanup: length = %d\n", dList_length(CachedIMGs));
558524 }
559525
560526 /* ------------------------------------------------------------------------- */
561527
562528 /*
563529 * Deallocate memory used by dicache module
564 * (Call this one at exit time)
530 * (Call this one at exit time, with no cache clients queued)
565531 */
566532 void a_Dicache_freeall(void)
567533 {
568 DICacheNode *node;
569534 DICacheEntry *entry;
570535
571 /* Remove every dicache node and its entries */
572 while ((node = dList_nth_data(CachedIMGs, 0))) {
573 while ((entry = node->first)) {
574 node->first = entry->next;
575 dFree(entry->cmap);
576 a_Bitvec_free(entry->BitVec);
577 a_Imgbuf_unref(entry->v_imgbuf);
578 dicache_size_total -= entry->TotalSize;
579 }
580 dList_remove_fast(CachedIMGs, node);
581 a_Url_free(node->url);
582 dFree(node);
536 /* Remove all the dicache entries */
537 while ((entry = dList_nth_data(CachedIMGs, dList_length(CachedIMGs)-1))) {
538 dList_remove_fast(CachedIMGs, entry);
539 a_Url_free(entry->url);
540 dFree(entry->cmap);
541 a_Bitvec_free(entry->BitVec);
542 a_Imgbuf_unref(entry->v_imgbuf);
543 dicache_size_total -= entry->TotalSize;
544 dFree(entry);
583545 }
584546 dList_free(CachedIMGs);
585547 }
+8
-5
src/dicache.h less more
1111
1212 /* Symbolic name to request the last version of an image */
1313 #define DIC_Last -1
14 /* Flags: Last version, Valid entry */
15 #define DIF_Last 1
16 #define DIF_Valid 2
1417
1518
1619 /* These will reflect the entry's "state" */
2528
2629 typedef struct DICacheEntry {
2730 DilloUrl *url; /* Image URL for this entry */
31 DilloImgType type; /* Image type */
2832 uint_t width, height; /* As taken from image data */
29 DilloImgType type; /* Image type */
33 short Flags; /* See Flags */
34 short SurvCleanup; /* Cleanup-pass survival for unused images */
3035 uchar_t *cmap; /* Color map */
3136 void *v_imgbuf; /* Void pointer to an Imgbuf object */
3237 uint_t TotalSize; /* Amount of memory the image takes up */
3742 int version; /* Version number, used for different
3843 versions of the same URL image */
3944
45 uint_t DecodedSize; /* Size of already decoded data */
4046 CA_Callback_t Decoder; /* Client function */
4147 void *DecoderData; /* Client function data */
42 uint_t DecodedSize; /* Size of already decoded data */
43
44 struct DICacheEntry *next; /* Link to the next "newer" version */
4548 } DICacheEntry;
4649
4750
6063 void a_Dicache_set_parms(DilloUrl *url, int version, DilloImage *Image,
6164 uint_t width, uint_t height, DilloImgType type,
6265 double gamma);
63 void a_Dicache_set_cmap(DilloUrl *url, int version, DilloImage *Image,
66 void a_Dicache_set_cmap(DilloUrl *url, int version, int bg_color,
6467 const uchar_t *cmap, uint_t num_colors,
6568 int num_colors_max, int bg_index);
6669 void a_Dicache_new_scan(const DilloUrl *url, int version);
+4
-0
src/dillo.cc less more
495495 Fl_Window::default_xclass("dillo");
496496
497497 Fl::scheme(prefs.theme);
498
499 // Disable drag and drop as it crashes on MacOSX
500 Fl::dnd_text_ops(0);
501
498502 setColors();
499503
500504 if (!prefs.show_ui_tooltip) {
+2
-2
src/domain.c less more
128128 ret = source_host[0] == '\0' ||
129129 !dStrAsciiCasecmp(URL_SCHEME(dest), "data");
130130 if (ret == FALSE)
131 MSG("Domain: DENIED from %s to %s.\n", source_host, URL_STR(dest));
131 MSG("Domain: DENIED %s -> %s.\n", source_host, URL_STR(dest));
132132 return ret;
133133 }
134134
150150 if (ret == FALSE) {
151151 const char *src = source_host[0] ? source_host : URL_STR(source);
152152
153 MSG("Domain: DENIED from %s to %s.\n", src, dest_host);
153 MSG("Domain: DENIED %s -> %s.\n", src, dest_host);
154154 }
155155 return ret;
156156 }
+30
-24
src/form.cc less more
342342 HT2TB(html)->addParbreak (9, html->wordStyle ());
343343
344344 if (html->InFlags & IN_FORM) {
345 BUG_MSG("nested forms\n");
345 BUG_MSG("Nested <form>.");
346346 return;
347347 }
348348 html->InFlags |= IN_FORM;
355355 if (!dStrAsciiCasecmp(attrbuf, "post")) {
356356 method = DILLO_HTML_METHOD_POST;
357357 } else if (dStrAsciiCasecmp(attrbuf, "get")) {
358 BUG_MSG("Unknown form submission method \"%s\"\n", attrbuf);
358 BUG_MSG("<form> submission method unknown: '%s'.", attrbuf);
359359 }
360360 }
361361 if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "action")))
362362 action = a_Html_url_new(html, attrbuf, NULL, 0);
363363 else {
364364 if (html->DocType != DT_HTML || html->DocTypeVersion <= 4.01f)
365 BUG_MSG("action attribute is required for <form>\n");
365 BUG_MSG("<form> requires action attribute.");
366366 action = a_Url_dup(html->base_url);
367367 }
368368 content_type = DILLO_HTML_ENC_URLENCODED;
416416 if (size < 1 || size > MAX_SIZE) {
417417 int badSize = size;
418418 size = (size < 1 ? 20 : MAX_SIZE);
419 BUG_MSG("input size=%d, using size=%d instead\n", badSize, size);
419 BUG_MSG("<input> size=%d, using size=%d instead.", badSize, size);
420420 }
421421 }
422422 return size;
430430 DilloHtmlInputType inp_type;
431431 Resource *resource = NULL;
432432 Embed *embed = NULL;
433 char *value, *name, *type, *init_str;
433 char *value, *name, *type, *init_str, *placeholder = NULL;
434434 const char *attrbuf, *label;
435435 bool init_val = false;
436436 ResourceFactory *factory;
437437
438438 if (html->InFlags & IN_SELECT) {
439 BUG_MSG("<input> element inside <select>\n");
439 BUG_MSG("<input> inside <select>.");
440440 return;
441441 }
442442 if (html->InFlags & IN_BUTTON) {
443 BUG_MSG("<input> element inside <button>\n");
443 BUG_MSG("<input> inside <button>.");
444444 return;
445445 }
446446
455455 inp_type = DILLO_HTML_INPUT_UNKNOWN;
456456 if (!dStrAsciiCasecmp(type, "password")) {
457457 inp_type = DILLO_HTML_INPUT_PASSWORD;
458 placeholder = a_Html_get_attr_wdef(html, tag,tagsize,"placeholder",NULL);
458459 attrbuf = a_Html_get_attr(html, tag, tagsize, "size");
459460 int size = Html_input_get_size(html, attrbuf);
460 resource = factory->createEntryResource (size, true, NULL);
461 resource = factory->createEntryResource (size, true, NULL, placeholder);
461462 init_str = value;
462463 } else if (!dStrAsciiCasecmp(type, "checkbox")) {
463464 inp_type = DILLO_HTML_INPUT_CHECKBOX;
477478 inp_type = DILLO_HTML_INPUT_HIDDEN;
478479 init_str = value;
479480 int size = Html_input_get_size(html, NULL);
480 resource = factory->createEntryResource(size, false, name);
481 resource = factory->createEntryResource(size, false, name, NULL);
481482 } else if (!dStrAsciiCasecmp(type, "submit")) {
482483 inp_type = DILLO_HTML_INPUT_SUBMIT;
483484 init_str = (value) ? value : dStrdup("submit");
506507 DilloHtmlForm *form = html->getCurrentForm();
507508 if (form->method != DILLO_HTML_METHOD_POST) {
508509 valid = false;
509 BUG_MSG("Forms with file input MUST use HTTP POST method\n");
510 BUG_MSG("<form> with file input MUST use HTTP POST method.");
510511 MSG("File input ignored in form not using HTTP POST method\n");
511512 } else if (form->content_type != DILLO_HTML_ENC_MULTIPART) {
512513 valid = false;
513 BUG_MSG("Forms with file input MUST use multipart/form-data"
514 " encoding\n");
514 BUG_MSG("<form> with file input MUST use multipart/form-data"
515 " encoding.");
515516 MSG("File input ignored in form not using multipart/form-data"
516517 " encoding\n");
517518 }
530531 } else {
531532 /* Text input, which also is the default */
532533 inp_type = DILLO_HTML_INPUT_TEXT;
534 placeholder = a_Html_get_attr_wdef(html, tag,tagsize,"placeholder",NULL);
533535 attrbuf = a_Html_get_attr(html, tag, tagsize, "size");
534536 int size = Html_input_get_size(html, attrbuf);
535 resource = factory->createEntryResource(size, false, NULL);
537 resource = factory->createEntryResource(size, false, NULL, placeholder);
536538 init_str = value;
537539 }
538540 if (resource)
572574 dFree(name);
573575 if (init_str != value)
574576 dFree(init_str);
577 dFree(placeholder);
575578 dFree(value);
576579 }
577580
605608 HT2TB(html)->addText(attrbuf, html->wordStyle ());
606609
607610 ResourceFactory *factory = HT2LT(html)->getResourceFactory();
608 EntryResource *entryResource = factory->createEntryResource (20,false,NULL);
611 EntryResource *entryResource = factory->createEntryResource (20, false,
612 NULL, NULL);
609613 embed = new Embed (entryResource);
610614 Html_add_input(html, DILLO_HTML_INPUT_INDEX, embed, NULL, NULL, FALSE);
611615
640644 cols = strtol(attrbuf, NULL, 10);
641645 } else {
642646 if (html->DocType != DT_HTML || html->DocTypeVersion <= 4.01f)
643 BUG_MSG("cols attribute is required for <textarea>\n");
647 BUG_MSG("<textarea> requires cols attribute.");
644648 cols = 20;
645649 }
646650 if (cols < 1 || cols > MAX_COLS) {
647651 int badCols = cols;
648652 cols = (cols < 1 ? 20 : MAX_COLS);
649 BUG_MSG("textarea cols=%d, using cols=%d instead\n", badCols, cols);
653 BUG_MSG("<textarea> cols=%d, using cols=%d instead.", badCols, cols);
650654 }
651655 if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "rows"))) {
652656 rows = strtol(attrbuf, NULL, 10);
653657 } else {
654658 if (html->DocType != DT_HTML || html->DocTypeVersion <= 4.01f)
655 BUG_MSG("rows attribute is required for <textarea>\n");
659 BUG_MSG("<textarea> requires rows attribute.");
656660 rows = 10;
657661 }
658662 if (rows < 1 || rows > MAX_ROWS) {
659663 int badRows = rows;
660664 rows = (rows < 1 ? 2 : MAX_ROWS);
661 BUG_MSG("textarea rows=%d, using rows=%d instead\n", badRows, rows);
665 BUG_MSG("<textarea> rows=%d, using rows=%d instead.", badRows, rows);
662666 }
663667 name = NULL;
664668 if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "name")))
665669 name = dStrdup(attrbuf);
666670
671 attrbuf = a_Html_get_attr(html, tag, tagsize, "placeholder");
672
667673 ResourceFactory *factory = HT2LT(html)->getResourceFactory();
668674 MultiLineTextResource *textres =
669 factory->createMultiLineTextResource (cols, rows);
675 factory->createMultiLineTextResource (cols, rows, attrbuf);
670676
671677 Embed *embed = new Embed(textres);
672678 /* Readonly or not? */
798804 void Html_tag_open_optgroup(DilloHtml *html, const char *tag, int tagsize)
799805 {
800806 if (!(html->InFlags & IN_SELECT)) {
801 BUG_MSG("<optgroup> element outside <select>\n");
807 BUG_MSG("<optgroup> outside <select>.");
802808 return;
803809 }
804810 if (html->InFlags & IN_OPTGROUP) {
805 BUG_MSG("nested <optgroup>\n");
811 BUG_MSG("Nested <optgroup>.");
806812 return;
807813 }
808814 if (html->InFlags & IN_OPTION) {
820826 bool enabled = (a_Html_get_attr(html, tag, tagsize, "disabled") == NULL);
821827
822828 if (!label) {
823 BUG_MSG("label attribute is required for <optgroup>\n");
829 BUG_MSG("<optgroup> requires label attribute.");
824830 label = strdup("");
825831 }
826832
858864 void Html_tag_open_option(DilloHtml *html, const char *tag, int tagsize)
859865 {
860866 if (!(html->InFlags & IN_SELECT)) {
861 BUG_MSG("<option> element outside <select>\n");
867 BUG_MSG("<option> outside <select>.");
862868 return;
863869 }
864870 if (html->InFlags & IN_OPTION)
917923 inp_type = DILLO_HTML_INPUT_BUTTON_SUBMIT;
918924 } else {
919925 inp_type = DILLO_HTML_INPUT_UNKNOWN;
920 BUG_MSG("Unknown button type: \"%s\"\n", type);
926 BUG_MSG("<button> type unknown: '%s'.", type);
921927 }
922928
923929 if (inp_type != DILLO_HTML_INPUT_UNKNOWN) {
+6
-9
src/gif.c less more
102102 size_t ColorMap_ofs;
103103 uint_t ColorResolution;
104104 uint_t NumColors;
105 #if 0
106 int Background;
107 #endif
105 int Background;
108106 uint_t spill_line_index;
109107 #if 0
110108 uint_t AspectRatio; /* AspectRatio (not used) */
164162 gif->state = 0;
165163 gif->Start_Ofs = 0;
166164 gif->linebuf = NULL;
167 #if 0
168 gif->Background = -1;
169 #endif
165 gif->Background = Image->bg_color;
170166 gif->transparent = -1;
171167 gif->num_spill_lines_max = 0;
172168 gif->spill_lines = NULL;
221217 int bufsize, bytes_consumed;
222218
223219 /* Sanity checks */
224 if (!Buf || !gif->Image || BufSize == 0)
220 if (!Buf || BufSize == 0)
225221 return;
226222
227223 buf = ((uchar_t *) Buf) + gif->Start_Ofs;
819815 a_Dicache_set_parms(gif->url, gif->version, gif->Image,
820816 gif->Width, gif->Height, DILLO_IMG_TYPE_INDEXED,
821817 1 / 2.2);
818 gif->Image = NULL; /* safeguard: hereafter it may be freed by its owner */
822819
823820 Flags = buf[8];
824821
849846 gif->spill_line_index = 0;
850847 gif->linebuf = dMalloc(gif->Width);
851848 gif->state = 3; /*Process the lzw data next */
852 if (gif->Image && gif->ColorMap_ofs) {
853 a_Dicache_set_cmap(gif->url, gif->version, gif->Image,
849 if (gif->ColorMap_ofs) {
850 a_Dicache_set_cmap(gif->url, gif->version, gif->Background,
854851 (uchar_t *) Buf + gif->ColorMap_ofs,
855852 gif->NumColors, 256, gif->transparent);
856853 }
+172
-128
src/html.cc less more
131131 {
132132 va_list argp;
133133
134 if (bw->num_page_bugs)
135 dStr_append_c(bw->page_bugs, '\n');
134136 dStr_sprintfa(bw->page_bugs,
135137 "HTML warning: line %d, ",
136 getCurTagLineNumber());
138 getCurrLineNumber());
137139 va_start(argp, format);
138140 dStr_vsprintfa(bw->page_bugs, format, argp);
139141 va_end(argp);
157159 const char *suffix = (n_ic) > 1 ? "s" : "";
158160 n_ic_spc = URL_ILLEGAL_CHARS_SPC(url);
159161 if (n_ic == n_ic_spc) {
160 BUG_MSG("URL has %d illegal space%s\n", n_ic, suffix);
162 BUG_MSG("URL has %d illegal space%s ('%s').", n_ic, suffix, url_str);
161163 } else if (n_ic_spc == 0) {
162 BUG_MSG("URL has %d illegal character%s in {00-1F, 7F} range\n",
163 n_ic, suffix);
164 BUG_MSG("URL has %d illegal byte%s in {00-1F, 7F-FF} range ('%s').",
165 n_ic, suffix, url_str);
164166 } else {
165 BUG_MSG("URL has %d illegal character%s: "
166 "%d space%s, and %d in {00-1F, 7F} range\n",
167 BUG_MSG("URL has %d illegal byte%s: "
168 "%d space%s and %d in {00-1F, 7F-FF} range ('%s').",
167169 n_ic, suffix,
168 n_ic_spc, n_ic_spc > 1 ? "s" : "", n_ic-n_ic_spc);
170 n_ic_spc, n_ic_spc > 1 ? "s" : "", n_ic-n_ic_spc, url_str);
169171 }
170172 }
171173 return url;
289291 TextAlignType textAlignType = TEXT_ALIGN_LEFT;
290292
291293 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
292 BUG_MSG("The align attribute is obsolete in HTML5.\n");
294 BUG_MSG("The align attribute is obsolete in HTML5.");
293295
294296 if (dStrAsciiCasecmp (align, "left") == 0)
295297 textAlignType = TEXT_ALIGN_LEFT;
333335
334336 if ((attr = a_Html_get_attr(html, tag, tagsize, "valign"))) {
335337 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
336 BUG_MSG("The valign attribute is obsolete in HTML5.\n");
338 BUG_MSG("The valign attribute is obsolete in HTML5.");
337339
338340 if (dStrAsciiCasecmp (attr, "top") == 0)
339341 valign = VALIGN_TOP;
396398
397399 stop_parser = false;
398400
399 CurrTagOfs = 0;
400 OldTagOfs = 0;
401 OldTagLine = 1;
401 CurrOfs = OldOfs = 0;
402 OldLine = 1;
402403
403404 DocType = DT_NONE; /* assume Tag Soup 0.0! :-) */
404405 DocTypeVersion = 0.0f;
538539 }
539540
540541 /*
541 * Return the line number of the tag being processed by the parser.
542 * Return the line number of the tag/word being processed by the parser.
542543 * Also update the offsets.
543544 */
544 int DilloHtml::getCurTagLineNumber()
545 int DilloHtml::getCurrLineNumber()
545546 {
546547 int i, ofs, line;
547548 const char *p = Start_Buf;
550551 /* Disable line counting for META hack. Buffers differ. */
551552 dReturn_val_if((InFlags & IN_META_HACK), -1);
552553
553 ofs = CurrTagOfs;
554 line = OldTagLine;
555 for (i = OldTagOfs; i < ofs; ++i)
554 ofs = CurrOfs;
555 line = OldLine;
556 for (i = OldOfs; i < ofs; ++i)
556557 if (p[i] == '\n' || (p[i] == '\r' && p[i+1] != '\n'))
557558 ++line;
558 OldTagOfs = CurrTagOfs;
559 OldTagLine = line;
559 OldOfs = CurrOfs;
560 OldLine = line;
560561 return line;
561562 }
562563
943944
944945 if (!isocode || errno || isocode > 0xffff) {
945946 /* this catches null bytes, errors and codes >= 0xFFFF */
946 BUG_MSG("numeric character reference \"%s\" out of range\n", tok);
947 BUG_MSG("Numeric character reference \"%s\" out of range.", tok);
947948 isocode = -2;
948949 }
949950
951952 if (*s == ';')
952953 s++;
953954 else if (prefs.show_extra_warnings)
954 BUG_MSG("numeric character reference without trailing ';'\n");
955 BUG_MSG("Numeric character reference without trailing ';'.");
955956 }
956957
957958 } else if (isalpha(*s)) {
968969 } else {
969970 if ((html->DocType == DT_HTML && html->DocTypeVersion == 4.01f) ||
970971 html->DocType == DT_XHTML)
971 BUG_MSG("undefined character entity '%s'\n", tok);
972 BUG_MSG("Undefined character entity '%s'.", tok);
972973 isocode = -3;
973974 }
974975 }
975976 if (c == ';')
976977 s++;
977978 else if (prefs.show_extra_warnings)
978 BUG_MSG("character entity reference without trailing ';'\n");
979 BUG_MSG("Character entity reference without trailing ';'.");
979980 }
980981
981982 *entsize = s-tok+1;
985986 /* TODO: remove this hack. */
986987 isocode = Html_ms_stupid_quotes_2ucs(isocode);
987988 } else if (isocode == -1 && prefs.show_extra_warnings)
988 BUG_MSG("literal '&'\n");
989 BUG_MSG("Literal '&'.");
989990
990991 return isocode;
991992 }
10941095 break;
10951096 case '\t':
10961097 if (prefs.show_extra_warnings)
1097 BUG_MSG("TAB character inside <PRE>\n");
1098 BUG_MSG("TAB character inside <pre>.");
10981099 offset = TAB_SIZE - html->pre_column % TAB_SIZE;
10991100 spaceCnt += offset;
11001101 html->pre_column += offset;
13131314 int toptag_idx = S_TOP(html)->tag_idx;
13141315 TagInfo toptag = Tags[toptag_idx];
13151316 if (s_sz > idx + 1 && toptag.EndTag != 'O')
1316 BUG_MSG(" - forcing close of open tag: <%s>\n", toptag.name);
1317 BUG_MSG(" - forcing close of open tag: <%s>.", toptag.name);
13171318 _MSG("Close: %*s%s\n", size," ", toptag.name);
13181319 if (toptag.close)
13191320 toptag.close(html);
13711372 if (matched) {
13721373 Html_tag_cleanup_to_idx(html, stack_idx);
13731374 } else if (expected) {
1374 BUG_MSG("unexpected closing tag: </%s> -- expected </%s>.\n",
1375 BUG_MSG("Unexpected closing tag: </%s> -- expected </%s>.",
13751376 new_tag.name, Tags[tag_idx].name);
13761377 } else {
1377 BUG_MSG("unexpected closing tag: </%s>.\n", new_tag.name);
1378 BUG_MSG("Unexpected closing tag: </%s>.", new_tag.name);
13781379 }
13791380 }
13801381
14101411 }
14111412
14121413 if (matched) {
1413 BUG_MSG("attempt to nest <%s> element inside <%s> -- closing <%s>\n",
1414 BUG_MSG("Attempt to nest <%s> element inside <%s> -- closing <%s>.",
14141415 Tags[new_idx].name, Tags[u_idx].name, Tags[u_idx].name);
14151416 Html_tag_cleanup_to_idx(html, stack_idx);
14161417 } else {
14801481 else {
14811482 /* allow only whitespaces */
14821483 if (*end && !isspace (*end)) {
1483 BUG_MSG("Garbage after length: %s\n", attr);
1484 BUG_MSG("Garbage after length: '%s'.", attr);
14841485 l = CSS_CREATE_LENGTH(0.0, CSS_LENGTH_TYPE_AUTO);
14851486 }
14861487 }
15001501 int32_t color = a_Color_parse(str, default_color, &err);
15011502
15021503 if (err) {
1503 BUG_MSG("color \"%s\" is not in \"#RRGGBB\" format\n", str);
1504 BUG_MSG("Color '%s' is not in \"#RRGGBB\" format.", str);
15041505 }
15051506 return color;
15061507 }
15171518 bool valid = *val && !strchr(val, ' ');
15181519
15191520 if (!valid) {
1520 BUG_MSG("'%s' value must not be empty and must not contain spaces.\n",
1521 attrname);
1521 BUG_MSG("'%s' value \"%s\" must not be empty and must not contain "
1522 "spaces.", attrname, val);
15221523 }
15231524 return valid ? 1 : 0;
15241525 } else {
15291530 break;
15301531
15311532 if (val[i] || !(isascii(val[0]) && isalpha(val[0])))
1532 BUG_MSG("'%s' value \"%s\" is not of the form "
1533 "[A-Za-z][A-Za-z0-9:_.-]*\n", attrname, val);
1533 BUG_MSG("%s attribute value \"%s\" is not of the form "
1534 "'[A-Za-z][A-Za-z0-9:_.-]*'.", attrname, val);
15341535
15351536 return !(val[i]);
15361537 }
15581559 static void Html_parse_doctype(DilloHtml *html, const char *tag, int tagsize)
15591560 {
15601561 static const char HTML_SGML_sig [] = "<!DOCTYPE HTML PUBLIC ";
1561 static const char HTML5_sig [] = "<!DOCTYPE html>";
15621562 static const char HTML20 [] = "-//IETF//DTD HTML";
15631563 static const char HTML32 [] = "-//W3C//DTD HTML 3.2";
15641564 static const char HTML40 [] = "-//W3C//DTD HTML 4.0";
15951595 _MSG("New: {%s}\n", ntag);
15961596
15971597 if (html->DocType != DT_NONE)
1598 BUG_MSG("Multiple DOCTYPE declarations.\n");
1598 BUG_MSG("Multiple DOCTYPE declarations.");
15991599
16001600 /* The default DT_NONE type is TagSoup */
16011601 if (i > strlen(HTML_SGML_sig) && // avoid out of bounds reads!
16231623 html->DocType = DT_HTML;
16241624 html->DocTypeVersion = 2.0f;
16251625 }
1626 } else if (!dStrAsciiCasecmp(ntag, HTML5_sig)) {
1626 } else if (!dStrAsciiCasecmp(ntag, "<!DOCTYPE html>") ||
1627 !dStrAsciiCasecmp(ntag, "<!DOCTYPE html >") ||
1628 !dStrAsciiCasecmp(ntag,
1629 "<!DOCTYPE html SYSTEM \"about:legacy-compat\">") ||
1630 !dStrAsciiCasecmp(ntag,
1631 "<!DOCTYPE html SYSTEM 'about:legacy-compat'>")) {
16271632 html->DocType = DT_HTML;
16281633 html->DocTypeVersion = 5.0f;
16291634 }
16301635 if (html->DocType == DT_NONE) {
16311636 html->DocType = DT_UNRECOGNIZED;
1632 BUG_MSG("DOCTYPE not recognized:\n%s.\n", ntag);
1637 BUG_MSG("DOCTYPE not recognized: ('%s').", ntag);
16331638 }
16341639 dFree(ntag);
16351640 }
16481653 ++html->Num_HTML;
16491654
16501655 if (html->Num_HTML > 1) {
1651 BUG_MSG("HTML element was already open\n");
1656 BUG_MSG("<html> was already open.");
16521657 html->ReqTagClose = true;
16531658 }
16541659 }
16671672 static void Html_tag_open_head(DilloHtml *html, const char *tag, int tagsize)
16681673 {
16691674 if (html->InFlags & IN_BODY) {
1670 BUG_MSG("HEAD element must go before the BODY section\n");
1675 BUG_MSG("<head> must go before the BODY section.");
16711676 html->ReqTagClose = true;
16721677 return;
16731678 }
16751680 if (html->Num_HEAD < UCHAR_MAX)
16761681 ++html->Num_HEAD;
16771682 if (html->InFlags & IN_HEAD) {
1678 BUG_MSG("HEAD element was already open\n");
1683 BUG_MSG("<head> was already open.");
16791684 html->ReqTagClose = true;
16801685 } else if (html->Num_HEAD > 1) {
1681 BUG_MSG("HEAD section already finished -- ignoring\n");
1686 BUG_MSG("<head> already finished -- ignoring.");
16821687 html->ReqTagClose = true;
16831688 } else {
16841689 html->InFlags |= IN_HEAD;
16951700 if (html->Num_HEAD == 1) {
16961701 /* match for the well formed start of HEAD section */
16971702 if (html->Num_TITLE == 0)
1698 BUG_MSG("HEAD section lacks the TITLE element\n");
1703 BUG_MSG("<head> lacks <title>.");
16991704
17001705 html->InFlags &= ~IN_HEAD;
17011706
17251730 if (html->Num_TITLE < UCHAR_MAX)
17261731 ++html->Num_TITLE;
17271732 if (html->Num_TITLE > 1)
1728 BUG_MSG("A redundant TITLE element was found\n");
1733 BUG_MSG("Redundant <title>.");
17291734 } else {
1730 BUG_MSG("TITLE element must be inside the HEAD section -- ignoring\n");
1735 BUG_MSG("<title> must be inside <head> -- ignoring.");
17311736 }
17321737 }
17331738
17751780
17761781 if (!(attrbuf = a_Html_get_attr(html, tag, tagsize, "type"))) {
17771782 if (html->DocType != DT_HTML || html->DocTypeVersion <= 4.01f)
1778 BUG_MSG("type attribute is required for <style>\n");
1783 BUG_MSG("<style> requires type attribute.");
17791784 } else if (dStrAsciiCasecmp(attrbuf, "text/css")) {
17801785 html->loadCssFromStash = false;
17811786 }
17991804 static void Html_tag_close_style(DilloHtml *html)
18001805 {
18011806 if (prefs.parse_embedded_css && html->loadCssFromStash)
1802 html->styleEngine->parse(html, html->base_url, html->Stash->str, html->Stash->len,
1803 CSS_ORIGIN_AUTHOR);
1807 html->styleEngine->parse(html, html->base_url, html->Stash->str,
1808 html->Stash->len, CSS_ORIGIN_AUTHOR);
18041809 }
18051810
18061811 /*
18241829 ++html->Num_BODY;
18251830
18261831 if (html->Num_BODY > 1) {
1827 BUG_MSG("BODY element was already open\n");
1832 BUG_MSG("<body> was already open.");
18281833 html->ReqTagClose = true;
18291834 return;
18301835 }
18311836
18321837 if (html->InFlags & IN_HEAD) {
18331838 /* if we're here, it's bad XHTML, no need to recover */
1834 BUG_MSG("unclosed HEAD element\n");
1839 BUG_MSG("Unclosed <head>.");
18351840 }
18361841
18371842 if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "bgcolor"))) {
18381843 color = a_Html_color_parse(html, attrbuf, -1);
18391844
18401845 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
1841 BUG_MSG("<body> bgcolor attribute is obsolete.\n");
1846 BUG_MSG("<body> bgcolor attribute is obsolete.");
18421847
18431848 if (color != -1)
18441849 html->styleEngine->setNonCssHint (CSS_PROPERTY_BACKGROUND_COLOR,
18491854 color = a_Html_color_parse(html, attrbuf, -1);
18501855
18511856 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
1852 BUG_MSG("<body> text attribute is obsolete.\n");
1857 BUG_MSG("<body> text attribute is obsolete.");
18531858
18541859 if (color != -1)
18551860 html->styleEngine->setNonCssHint (CSS_PROPERTY_COLOR,
18611866 if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "link"))) {
18621867 html->non_css_link_color = a_Html_color_parse(html, attrbuf, -1);
18631868 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
1864 BUG_MSG("<body> link attribute is obsolete.\n");
1869 BUG_MSG("<body> link attribute is obsolete.");
18651870 }
18661871
18671872 if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "vlink"))) {
18681873 html->non_css_visited_color = a_Html_color_parse(html, attrbuf, -1);
18691874 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
1870 BUG_MSG("<body> vlink attribute is obsolete.\n");
1875 BUG_MSG("<body> vlink attribute is obsolete.");
18711876 }
18721877
18731878 html->dw->setStyle (html->style ());
23372342 DilloUrl *url;
23382343
23392344 if (html->InFlags & IN_MAP) {
2340 BUG_MSG("nested <map>\n");
2345 BUG_MSG("Nested <map>.");
23412346 } else {
23422347 if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "name"))) {
23432348 html->InFlags |= IN_MAP;
23472352 a_Url_free (url);
23482353 dFree(hash_name);
23492354 } else {
2350 BUG_MSG("name attribute is required for <map>\n");
2355 BUG_MSG("<map> requires name attribute.");
23512356 }
23522357 }
23532358 }
23992404 if (!*newtail)
24002405 break;
24012406 if (*newtail != ',') {
2402 BUG_MSG("area coords must be integers separated by commas.\n");
2407 BUG_MSG("<area> coords must be integers separated by commas.");
24032408 }
24042409 tail = newtail + 1;
24052410 }
24222427 Shape *shape = NULL;
24232428
24242429 if (!(html->InFlags & IN_MAP)) {
2425 BUG_MSG("<area> element not inside <map>\n");
2430 BUG_MSG("<area> not inside <map>.");
24262431 return;
24272432 }
24282433 attrbuf = a_Html_get_attr(html, tag, tagsize, "shape");
24382443 } else if (dStrnAsciiCasecmp(attrbuf, "poly", 4) == 0) {
24392444 type = POLYGON;
24402445 } else {
2441 BUG_MSG("<area> unknown shape: \"%s\"\n", attrbuf);
2446 BUG_MSG("<area> unknown shape: '%s'.", attrbuf);
24422447 type = UNKNOWN;
24432448 }
24442449 if (type == RECTANGLE || type == CIRCLE || type == POLYGON) {
24482453
24492454 if (type == RECTANGLE) {
24502455 if (coords->size() != 4)
2451 BUG_MSG("<area> rectangle must have four coordinate values\n");
2456 BUG_MSG("<area> rectangle must have four coordinate values.");
24522457 if (coords->size() >= 4)
24532458 shape = new Rectangle(coords->get(0),
24542459 coords->get(1),
24562461 coords->get(3) - coords->get(1));
24572462 } else if (type == CIRCLE) {
24582463 if (coords->size() != 3)
2459 BUG_MSG("<area> circle must have three coordinate values\n");
2464 BUG_MSG("<area> circle must have three coordinate values.");
24602465 if (coords->size() >= 3)
24612466 shape = new Circle(coords->get(0), coords->get(1),
24622467 coords->get(2));
24642469 Polygon *poly;
24652470 int i;
24662471 if (coords->size() % 2)
2467 BUG_MSG("<area> polygon with odd number of coordinates\n");
2472 BUG_MSG("<area> polygon with odd number of coordinates.");
24682473 shape = poly = new Polygon();
24692474 for (i = 0; i < (coords->size() / 2); i++)
24702475 poly->addPoint(coords->get(2*i), coords->get(2*i + 1));
26002605 const char *attrbuf;
26012606
26022607 if (!(html->InFlags & IN_MEDIA)) {
2603 BUG_MSG("<source> element not inside a media element.\n");
2608 BUG_MSG("<source> not inside a media element.");
26042609 return;
26052610 }
26062611 if (!(attrbuf = a_Html_get_attr(html, tag, tagsize, "src"))) {
2607 BUG_MSG("src attribute is required in <source> element.\n");
2612 BUG_MSG("<source> requires src attribute.");
26082613 return;
26092614 } else {
26102615 DilloUrl *url = a_Html_url_new(html, attrbuf, NULL, 0);
26812686 if ((ch == '"' || ch == '\'') &&
26822687 (p2 = strchr(Buf->str + i + 1 , ch))) {
26832688 p1 = Buf->str + i;
2684 BUG_MSG("link depends on javascript()\n");
2689 BUG_MSG("Link depends on javascript().");
26852690 dStr_truncate(Buf, p2 - Buf->str);
26862691 dStr_erase(Buf, 0, p1 - Buf->str + 1);
26872692 }
26962701 {
26972702 _MSG("Registering ANCHOR: %s\n", name);
26982703 if (!HT2TB(html)->addAnchor (name, html->style ()))
2699 BUG_MSG("Anchor names must be unique within the document ('%s')\n",name);
2704 BUG_MSG("Anchor names must be unique within the document (\"%s\").",
2705 name);
27002706 /*
27012707 * According to Sec. 12.2.1 of the HTML 4.01 spec, "anchor names that
27022708 * differ only in case may not appear in the same document", but
27662772 /* We compare the "id" value with the url-decoded "name" value */
27672773 if (!id || strcmp(nameVal, id)) {
27682774 if (id)
2769 BUG_MSG("'id' and 'name' attribute of <a> tag differ\n");
2775 BUG_MSG("In <a>, id ('%s') and name ('%s') attributes differ.",
2776 id, nameVal);
27702777 Html_add_anchor(html, nameVal);
27712778 }
27722779
28422849 html->styleEngine->setNonCssHint (CSS_PROPERTY_LIST_STYLE_TYPE,
28432850 CSS_TYPE_ENUM, list_style_type);
28442851 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
2845 BUG_MSG("<ul> type attribute is obsolete.\n");
2852 BUG_MSG("<ul> type attribute is obsolete.");
28462853 }
28472854
28482855 S_TOP(html)->list_type = HTML_LIST_UNORDERED;
28642871 S_TOP(html)->ref_list_item = NULL;
28652872
28662873 if (prefs.show_extra_warnings)
2867 BUG_MSG("Obsolete list type; use <UL> instead\n");
2874 BUG_MSG("Obsolete list type; use <ul> instead.");
28682875 }
28692876
28702877 /*
28722879 */
28732880 static void Html_tag_open_menu(DilloHtml *html, const char *tag, int tagsize)
28742881 {
2875 Html_tag_open_dir(html, tag, tagsize);
2882 /* In another bit of ridiculous mess from the HTML5 world, the menu
2883 * element, which was deprecated in HTML4:
2884 * - does not appear at all in W3C's HTML5 spec
2885 * - appears in WHATWG's HTML5 doc and the W3C's 5.1 draft, where it
2886 * means something totally different than it did in the old days
2887 * (now it's for popup menus and toolbar menus rather than being a
2888 * sort of list).
2889 */
2890 if (!(html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f))
2891 Html_tag_open_dir(html, tag, tagsize);
28762892 }
28772893
28782894 /*
29052921
29062922 if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "start")) &&
29072923 (n = (int) strtol(attrbuf, NULL, 10)) < 0) {
2908 BUG_MSG( "illegal '-' character in START attribute; Starting from 0\n");
2924 BUG_MSG("Illegal '-' character in START attribute; Starting from 0.");
29092925 n = 0;
29102926 }
29112927 S_TOP(html)->list_number = n;
29222938 const char *attrbuf;
29232939
29242940 if (S_TOP(html)->list_type == HTML_LIST_NONE)
2925 BUG_MSG("<li> outside <ul> or <ol>\n");
2941 BUG_MSG("<li> outside <ul> or <ol>.");
29262942
29272943 html->InFlags |= IN_LI;
29282944
29332949 // ordered
29342950 if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "value")) &&
29352951 (*list_number = strtol(attrbuf, NULL, 10)) < 0) {
2936 BUG_MSG("illegal negative LIST VALUE attribute; Starting from 0\n");
2952 BUG_MSG("Illegal negative list value attribute; Starting from 0.");
29372953 *list_number = 0;
29382954 }
29392955 }
29602976 width_ptr = a_Html_get_attr_wdef(html, tag, tagsize, "width", NULL);
29612977 if (width_ptr) {
29622978 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
2963 BUG_MSG("<hr> width attribute is obsolete.\n");
2979 BUG_MSG("<hr> width attribute is obsolete.");
29642980 html->styleEngine->setNonCssHint (CSS_PROPERTY_WIDTH,
29652981 CSS_TYPE_LENGTH_PERCENTAGE,
29662982 a_Html_parse_length (html, width_ptr));
29702986 if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "size"))) {
29712987 size = strtol(attrbuf, NULL, 10);
29722988 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
2973 BUG_MSG("<hr> size attribute is obsolete.\n");
2989 BUG_MSG("<hr> size attribute is obsolete.");
29742990 }
29752991
29762992 a_Html_tag_set_align_attr(html, tag, tagsize);
29782994 /* TODO: evaluate attribute */
29792995 if (a_Html_get_attr(html, tag, tagsize, "noshade")) {
29802996 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
2981 BUG_MSG("<hr> noshade attribute is obsolete.\n");
2997 BUG_MSG("<hr> noshade attribute is obsolete.");
29822998 html->styleEngine->setNonCssHint (CSS_PROPERTY_BORDER_TOP_STYLE,
29832999 CSS_TYPE_ENUM, BORDER_SOLID);
29843000 html->styleEngine->setNonCssHint (CSS_PROPERTY_BORDER_BOTTOM_STYLE,
30703086 * Check whether a tag is in the "excluding" element set for PRE
30713087 * Excl. Set = {IMG, OBJECT, APPLET, BIG, SMALL, SUB, SUP, FONT, BASEFONT}
30723088 */
3073 static int Html_tag_pre_excludes(int tag_idx)
3074 {
3075 const char *es_set[] = {"img", "object", "applet", "big", "small", "sub",
3076 "sup", "font", "basefont", NULL};
3077 static int ei_set[10], i;
3078
3079 /* initialize array */
3080 if (!ei_set[0])
3081 for (i = 0; es_set[i]; ++i)
3082 ei_set[i] = a_Html_tag_index(es_set[i]);
3083
3084 for (i = 0; ei_set[i]; ++i)
3085 if (tag_idx == ei_set[i])
3086 return 1;
3089 static int Html_tag_pre_excludes(DilloHtml *html, int tag_idx)
3090 {
3091 if (!(html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)) {
3092 /* HTML5 doesn't say anything about excluding elements */
3093 const char *es_set[] = {"img", "object", "applet", "big", "small", "sub",
3094 "sup", "font", "basefont", NULL};
3095 static int ei_set[10], i;
3096
3097 /* initialize array */
3098 if (!ei_set[0])
3099 for (i = 0; es_set[i]; ++i)
3100 ei_set[i] = a_Html_tag_index(es_set[i]);
3101
3102 for (i = 0; ei_set[i]; ++i)
3103 if (tag_idx == ei_set[i])
3104 return 1;
3105 }
30873106 return 0;
30883107 }
30893108
31333152
31343153 /* only valid inside HEAD */
31353154 if (!(html->InFlags & IN_HEAD)) {
3136 BUG_MSG("META element must be inside the HEAD section\n");
3155 if (!((html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f) &&
3156 a_Html_get_attr(html, tag, tagsize, "itemprop"))) {
3157 /* With the HTML 5.1 draft spec, meta with itemprop may appear
3158 * in the body.
3159 */
3160 BUG_MSG("This <meta> element must be inside the HEAD section.");
3161 }
31373162 return;
31383163 }
31393164
31663191
31673192 if (a_Url_cmp(html->base_url, new_url) == 0) {
31683193 /* redirection loop, or empty url string: ignore */
3169 BUG_MSG("META refresh: %s\n",
3194 BUG_MSG("<meta> refresh: %s.",
31703195 *mr_url ? "redirection loop" : "no target URL");
31713196 } else if (delay == 0) {
31723197 /* zero-delay redirection */
32953320
32963321 /* Ignore LINK outside HEAD */
32973322 if (!(html->InFlags & IN_HEAD)) {
3298 BUG_MSG("LINK element must be inside the HEAD section\n");
3323 if (!((html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f) &&
3324 a_Html_get_attr(html, tag, tagsize, "itemprop"))) {
3325 /* With the HTML 5.1 draft spec, link with itemprop may appear
3326 * in the body.
3327 */
3328 BUG_MSG("This <link> element must be inside the HEAD section.");
3329 }
32993330 return;
33003331 }
33013332 /* Remote stylesheets enabled? */
33403371 a_Url_free(html->base_url);
33413372 html->base_url = BaseUrl;
33423373 } else {
3343 BUG_MSG("base URI is relative (it MUST be absolute)\n");
3374 BUG_MSG("<base> URI is relative (it MUST be absolute).");
33443375 a_Url_free(BaseUrl);
33453376 }
33463377 }
33473378 } else {
3348 BUG_MSG("the BASE element must appear in the HEAD section\n");
3379 BUG_MSG("<base> not inside HEAD section.");
33493380 }
33503381 }
33513382
33723403 }
33733404
33743405 /*
3375 * <DIV> (TODO: make a complete implementation)
3376 */
3377 static void Html_tag_open_div(DilloHtml *html, const char *tag, int tagsize)
3406 * html5 sectioning stuff: article aside nav section header footer
3407 */
3408 static void Html_tag_open_sectioning(DilloHtml *html, const char *tag,
3409 int tagsize)
33783410 {
33793411 const char *attrbuf;
3380
3381 a_Html_tag_set_align_attr (html, tag, tagsize);
33823412
33833413 if (prefs.show_tooltip &&
33843414 (attrbuf = a_Html_get_attr(html, tag, tagsize, "title"))) {
33863416 html->styleEngine->setNonCssHint (PROPERTY_X_TOOLTIP, CSS_TYPE_STRING,
33873417 attrbuf);
33883418 }
3419 }
3420
3421 /*
3422 * <DIV> (TODO: make a complete implementation)
3423 */
3424 static void Html_tag_open_div(DilloHtml *html, const char *tag, int tagsize)
3425 {
3426 a_Html_tag_set_align_attr (html, tag, tagsize);
3427 Html_tag_open_sectioning(html, tag, tagsize);
33893428 }
33903429
33913430 /*
34373476 {"address", B8(010110),'R',2,Html_tag_open_default, NULL, Html_tag_close_par},
34383477 {"area", B8(010001),'F',0, Html_tag_open_default, Html_tag_content_area,
34393478 NULL},
3440 {"article", B8(011110),'R',2, Html_tag_open_default, NULL, NULL},
3441 {"aside", B8(011110),'R',2, Html_tag_open_default, NULL, NULL},
3479 {"article", B8(011110),'R',2, Html_tag_open_sectioning, NULL, NULL},
3480 {"aside", B8(011110),'R',2, Html_tag_open_sectioning, NULL, NULL},
34423481 {"audio", B8(011101),'R',2, Html_tag_open_audio, NULL, Html_tag_close_media},
34433482 {"b", B8(010101),'R',2, Html_tag_open_default, NULL, NULL},
34443483 {"base", B8(100001),'F',0, Html_tag_open_base, NULL, NULL},
34713510 {"figcaption", B8(011110),'R',2, Html_tag_open_default, NULL, NULL},
34723511 {"figure", B8(011110),'R',2, Html_tag_open_default, NULL, NULL},
34733512 {"font", B8(010101),'R',2, Html_tag_open_font, NULL, NULL},
3474 {"footer", B8(011110),'R',2, Html_tag_open_default, NULL, NULL},
3513 {"footer", B8(011110),'R',2, Html_tag_open_sectioning, NULL, NULL},
34753514 {"form", B8(011110),'R',2, Html_tag_open_form, NULL, Html_tag_close_form},
34763515 {"frame", B8(010010),'F',0, Html_tag_open_frame, Html_tag_content_frame,
34773516 NULL},
34843523 {"h5", B8(010110),'R',2, Html_tag_open_h, NULL, NULL},
34853524 {"h6", B8(010110),'R',2, Html_tag_open_h, NULL, NULL},
34863525 {"head", B8(101101),'O',1, Html_tag_open_head, NULL, Html_tag_close_head},
3487 {"header", B8(011110),'R',2, Html_tag_open_default, NULL, NULL},
3526 {"header", B8(011110),'R',2, Html_tag_open_sectioning, NULL, NULL},
34883527 {"hr", B8(010010),'F',0, Html_tag_open_hr, Html_tag_content_hr,
34893528 NULL},
34903529 {"html", B8(001110),'O',1, Html_tag_open_html, NULL, Html_tag_close_html},
35063545 {"mark", B8(010101),'R',2, Html_tag_open_default, NULL, NULL},
35073546 /* menu 1010 -- TODO: not exactly 1010, it can contain LI and inline */
35083547 {"menu", B8(011010),'R',2, Html_tag_open_menu, NULL, Html_tag_close_par},
3509 {"meta", B8(100001),'F',0, Html_tag_open_meta, NULL, NULL},
3510 {"nav", B8(011110),'R',2, Html_tag_open_default, NULL, NULL},
3548 {"meta", B8(110001),'F',0, Html_tag_open_meta, NULL, NULL},
3549 {"nav", B8(011110),'R',2, Html_tag_open_sectioning, NULL, NULL},
35113550 /* noframes 1011 -- obsolete in HTML5 */
35123551 /* noscript 1011 */
35133552 {"object", B8(111101),'R',2, Html_tag_open_object, Html_tag_content_object,
35233562 {"s", B8(010101),'R',2, Html_tag_open_default, NULL, NULL},
35243563 {"samp", B8(010101),'R',2, Html_tag_open_default, NULL, NULL},
35253564 {"script", B8(111001),'R',2, Html_tag_open_script,NULL,Html_tag_close_script},
3526 {"section", B8(011110),'R',2, Html_tag_open_default, NULL, NULL},
3565 {"section", B8(011110),'R',2, Html_tag_open_sectioning, NULL, NULL},
35273566 {"select", B8(010101),'R',2, Html_tag_open_select,NULL,Html_tag_close_select},
35283567 {"small", B8(010101),'R',2, Html_tag_open_default, NULL, NULL},
35293568 {"source", B8(010001),'F',0, Html_tag_open_source, Html_tag_content_source,
36833722
36843723 /* we have an inline (or empty) container... */
36853724 if (Tags[oldtag_idx].EndTag == 'R') {
3686 BUG_MSG("<%s> is not allowed to contain <%s>. -- closing <%s>\n",
3725 BUG_MSG("<%s> is not allowed to contain <%s>. -- closing <%s>.",
36873726 Tags[oldtag_idx].name, Tags[new_idx].name,
36883727 Tags[oldtag_idx].name);
36893728 }
37123751 int tag_idx;
37133752
37143753 if (!(html->InFlags & IN_HTML) && html->DocType == DT_NONE)
3715 BUG_MSG("the required DOCTYPE declaration is missing.\n");
3754 BUG_MSG("The required DOCTYPE declaration is missing. "
3755 "Handling as HTML4.");
37163756
37173757 if (!(html->InFlags & IN_HTML)) {
37183758 tag = "<html>";
37623802 static void Html_parse_common_attrs(DilloHtml *html, char *tag, int tagsize)
37633803 {
37643804 const char *attrbuf;
3805 char lang[3];
37653806
37663807 if (tagsize >= 8 && /* length of "<t id=i>" */
37673808 (attrbuf = a_Html_get_attr(html, tag, tagsize, "id"))) {
37873828 html->styleEngine->setStyle (attrbuf);
37883829 }
37893830
3790 /* handle "xml:lang" and "lang" attributes */
3791 int hasXmlLang = 0;
3831 /* handle "xml:lang" and "lang" attributes
3832 * We use only the first two chars of the value to deal with
3833 * extended language tags (see http://www.rfc-editor.org/rfc/bcp/bcp47.txt)
3834 */
3835 memset(lang, 0, sizeof(lang));
37923836 if (tagsize >= 14) {
37933837 /* length of "<t xml:lang=i>" */
37943838 attrbuf = a_Html_get_attr(html, tag, tagsize, "xml:lang");
3795 if (attrbuf) {
3796 html->styleEngine->setNonCssHint(PROPERTY_X_LANG, CSS_TYPE_STRING,
3797 attrbuf);
3798 hasXmlLang = 1;
3799 }
3800 }
3801 if (!hasXmlLang && tagsize >= 10) { /* 'xml:lang' prevails over 'lang' */
3839 if (attrbuf)
3840 strncpy(lang, attrbuf, 2);
3841 }
3842 if (!lang[0] && tagsize >= 10) { /* 'xml:lang' prevails over 'lang' */
38023843 /* length of "<t lang=i>" */
38033844 attrbuf = a_Html_get_attr(html, tag, tagsize, "lang");
38043845 if (attrbuf)
3805 html->styleEngine->setNonCssHint(PROPERTY_X_LANG, CSS_TYPE_STRING,
3806 attrbuf);
3807 }
3846 strncpy(lang, attrbuf, 2);
3847 }
3848 if (lang[0])
3849 html->styleEngine->setNonCssHint(PROPERTY_X_LANG, CSS_TYPE_STRING, lang);
38083850 }
38093851
38103852 /*
38283870 }
38293871 for (int i = 0; i < 9; i++) {
38303872 if (indexes[i] == ni) {
3831 BUG_MSG("<%s> is obsolete in HTML5.\n", Tags[ni].name);
3873 BUG_MSG("<%s> is obsolete in HTML5.", Tags[ni].name);
38323874 break;
38333875 }
38343876 }
39173959
39183960 /* TODO: this is only raising a warning, take some defined action.
39193961 * Note: apache uses IMG inside PRE (we could use its "alt"). */
3920 if ((html->InFlags & IN_PRE) && Html_tag_pre_excludes(ni))
3921 BUG_MSG("<pre> is not allowed to contain <%s>\n", Tags[ni].name);
3962 if ((html->InFlags & IN_PRE) && Html_tag_pre_excludes(html, ni))
3963 BUG_MSG("<pre> is not allowed to contain <%s>.", Tags[ni].name);
39223964
39233965 /* Make sure these elements don't nest each other */
39243966 if (html->InFlags & (IN_BUTTON | IN_SELECT | IN_TEXTAREA))
42274269 buf_index = bufsize;
42284270 } else {
42294271 /* Tag: search end of tag (skipping over quoted strings) */
4230 html->CurrTagOfs = html->Start_Ofs + token_start;
4272 html->CurrOfs = html->Start_Ofs + token_start;
42314273
42324274 while ( buf_index < bufsize ) {
42334275 buf_index++;
42484290 if (buf[offset] == ch || !buf[offset]) {
42494291 buf_index = offset;
42504292 } else {
4251 BUG_MSG("attribute lacks closing quote\n");
4293 BUG_MSG("Attribute lacks closing quote.");
42524294 break;
42534295 }
42544296 }
42564298 /* unterminated tag detected */
42574299 p = dStrndup(buf+token_start+1,
42584300 strcspn(buf+token_start+1, " <\n\r\t"));
4259 BUG_MSG("<%s> element lacks its closing '>'\n", p);
4301 BUG_MSG("<%s> lacks its closing '>'.", p);
42604302 dFree(p);
42614303 --buf_index;
42624304 break;
42714313 }
42724314 } else {
42734315 /* A Word: search for whitespace or tag open */
4316 html->CurrOfs = html->Start_Ofs + token_start;
4317
42744318 while (++buf_index < bufsize) {
42754319 buf_index += strcspn(buf + buf_index, " <\n\r\t\f\v");
42764320 if (buf[buf_index] == '<' && (ch = buf[buf_index + 1]) &&
+2
-3
src/html_common.hh less more
155155 char *content_type, *charset;
156156 bool stop_parser;
157157
158 size_t CurrTagOfs;
159 size_t OldTagOfs, OldTagLine;
158 size_t CurrOfs, OldOfs, OldLine;
160159
161160 DilloHtmlDocumentType DocType; /* as given by DOCTYPE tag */
162161 float DocTypeVersion; /* HTML or XHTML version number */
210209 void bugMessage(const char *format, ... );
211210 void connectSignals(dw::core::Widget *dw);
212211 void write(char *Buf, int BufSize, int Eof);
213 int getCurTagLineNumber();
212 int getCurrLineNumber();
214213 void finishParsing(int ClientKey);
215214 int formNew(DilloHtmlMethod method, const DilloUrl *action,
216215 DilloHtmlEnc enc, const char *charset);
+4
-2
src/image.cc less more
105105 int version, uint_t width, uint_t height,
106106 DilloImgType type)
107107 {
108 _MSG("a_Image_set_parms: width=%d height=%d\n", width, height);
108 _MSG("a_Image_set_parms: width=%d height=%d iw=%d ih=%d\n",
109 width, height, Image->width, Image->height);
109110
110 bool resize = (Image->width != width || Image->height != height);
111 /* Resize from 0,0 to width,height */
112 bool resize = true;
111113 I2IR(Image)->setBuffer((Imgbuf*)v_imgbuf, resize);
112114
113115 if (!Image->BitVec)
+2
-2
src/jpeg.c less more
272272 } else if (jpeg->cinfo.num_components == 3) {
273273 type = DILLO_IMG_TYPE_RGB;
274274 } else {
275 MSG("4-component JPEG!\n");
276275 if (jpeg->cinfo.jpeg_color_space == JCS_YCCK)
277 MSG("YCCK. Are the colors wrong?\n");
276 MSG("YCCK JPEG. Are the colors wrong?\n");
278277 if (!jpeg->cinfo.saw_Adobe_marker)
279278 MSG("No adobe marker! Is the image shown in reverse video?\n");
280279 type = DILLO_IMG_TYPE_CMYK_INV;
303302 (uint_t)jpeg->cinfo.image_width,
304303 (uint_t)jpeg->cinfo.image_height,
305304 type, 1 / 2.2);
305 jpeg->Image = NULL; /* safeguard: may be freed by its owner later */
306306
307307 /* decompression step 4 (see libjpeg.doc) */
308308 jpeg->state = DILLO_JPEG_STARTING;
+1
-0
src/keys.cc less more
5858 { "Home", FL_Home },
5959 { "Insert", FL_Insert },
6060 { "Left", FL_Left },
61 { "Menu", FL_Menu },
6162 { "PageDown", FL_Page_Down },
6263 { "PageUp", FL_Page_Up },
6364 { "Print", FL_Print },
+1
-1
src/keysrc less more
88 # (OS X: Use "Meta" for Command)
99 #
1010 # Key names recognized: "Backspace", "Delete", "Down", "End", "Esc",
11 # "F1" through "F12", "Home", "Insert", "Left", "PageDown", "PageUp",
11 # "F1" through "F12", "Home", "Insert", "Left", "Menu", "PageDown", "PageUp",
1212 # "Print", "Return", "Right", "Space", "Tab", "Up".
1313 #
1414 # Multimedia keys: "Back", "Favorites", "Forward", "HomePage", "Mail",
+3
-3
src/paths.cc less more
3737 oldWorkingDir = dGetcwd();
3838 rc = chdir("/tmp");
3939 if (rc == -1) {
40 MSG("paths: error changing directory to /tmp: %s\n",
40 MSG("paths: Error changing directory to /tmp: %s\n",
4141 dStrerror(errno));
4242 }
4343
4444 path = dStrconcat(dGethomedir(), "/.dillo", NULL);
4545 if (stat(path, &st) == -1) {
4646 if (errno == ENOENT) {
47 MSG("paths: creating directory %s.\n", path);
47 MSG("paths: Creating directory '%s/'\n", path);
4848 if (mkdir(path, 0700) < 0) {
49 MSG("paths: error creating directory %s: %s\n",
49 MSG("paths: Error creating directory %s: %s\n",
5050 path, dStrerror(errno));
5151 }
5252 } else {
+6
-3
src/png.c less more
6161 DilloImage *Image; /* Image meta data */
6262 DilloUrl *url; /* Primary Key for the dicache */
6363 int version; /* Secondary Key for the dicache */
64 int bgcolor; /* Parent widget background color */
6465
6566 png_uint_32 width; /* png image width */
6667 png_uint_32 height; /* png image height */
203204 a_Dicache_set_parms(png->url, png->version, png->Image,
204205 (uint_t)png->width, (uint_t)png->height,
205206 DILLO_IMG_TYPE_RGB, file_gamma);
207 png->Image = NULL; /* safeguard: hereafter it may be freed by its owner */
206208 }
207209
208210 static void
243245
244246 /* TODO: maybe change prefs.bg_color to `a_Dw_widget_get_bg_color`,
245247 * when background colors are correctly implementated */
246 bg_blue = (png->Image->bg_color) & 0xFF;
247 bg_green = (png->Image->bg_color>>8) & 0xFF;
248 bg_red = (png->Image->bg_color>>16) & 0xFF;
248 bg_blue = (png->bgcolor) & 0xFF;
249 bg_green = (png->bgcolor>>8) & 0xFF;
250 bg_red = (png->bgcolor>>16) & 0xFF;
249251
250252 for (i = 0; i < png->width; i++) {
251253 a = *(data+3);
432434 png->Image = Image;
433435 png->url = url;
434436 png->version = version;
437 png->bgcolor = Image->bg_color;
435438 png->error = 0;
436439 png->ipbuf = NULL;
437440 png->ipbufstart = 0;
+100
-96
src/prefsparser.cc less more
3838 const char *name;
3939 void *pref;
4040 PrefType_t type;
41 int count;
4142 } SymNode_t;
4243
4344 /*
4445 * Parse a name/value pair and set preferences accordingly.
4546 */
46 int PrefsParser::parseOption(char *name, char *value)
47 static int parseOption(char *name, char *value,
48 SymNode_t *symbols, int n_symbols)
4749 {
48 const SymNode_t *node;
49 uint_t i;
50 SymNode_t *node;
51 int i;
5052 int st;
5153
52 /* Symbol array, sorted alphabetically */
53 const SymNode_t symbols[] = {
54 { "allow_white_bg", &prefs.allow_white_bg, PREFS_BOOL },
55 { "white_bg_replacement", &prefs.white_bg_replacement, PREFS_COLOR },
56 { "bg_color", &prefs.bg_color, PREFS_COLOR },
57 { "buffered_drawing", &prefs.buffered_drawing, PREFS_INT32 },
58 { "contrast_visited_color", &prefs.contrast_visited_color, PREFS_BOOL },
59 { "enterpress_forces_submit", &prefs.enterpress_forces_submit,
60 PREFS_BOOL },
61 { "focus_new_tab", &prefs.focus_new_tab, PREFS_BOOL },
62 { "font_cursive", &prefs.font_cursive, PREFS_STRING },
63 { "font_factor", &prefs.font_factor, PREFS_DOUBLE },
64 { "font_fantasy", &prefs.font_fantasy, PREFS_STRING },
65 { "font_max_size", &prefs.font_max_size, PREFS_INT32 },
66 { "font_min_size", &prefs.font_min_size, PREFS_INT32 },
67 { "font_monospace", &prefs.font_monospace, PREFS_STRING },
68 { "font_sans_serif", &prefs.font_sans_serif, PREFS_STRING },
69 { "font_serif", &prefs.font_serif, PREFS_STRING },
70 { "fullwindow_start", &prefs.fullwindow_start, PREFS_BOOL },
71 { "geometry", NULL, PREFS_GEOMETRY },
72 { "home", &prefs.home, PREFS_URL },
73 { "http_language", &prefs.http_language, PREFS_STRING },
74 { "http_max_conns", &prefs.http_max_conns, PREFS_INT32 },
75 { "http_proxy", &prefs.http_proxy, PREFS_URL },
76 { "http_proxyuser", &prefs.http_proxyuser, PREFS_STRING },
77 { "http_referer", &prefs.http_referer, PREFS_STRING },
78 { "http_user_agent", &prefs.http_user_agent, PREFS_STRING },
79 { "limit_text_width", &prefs.limit_text_width, PREFS_BOOL },
80 { "load_images", &prefs.load_images, PREFS_BOOL },
81 { "load_background_images", &prefs.load_background_images, PREFS_BOOL },
82 { "load_stylesheets", &prefs.load_stylesheets, PREFS_BOOL },
83 { "middle_click_drags_page", &prefs.middle_click_drags_page,
84 PREFS_BOOL },
85 { "middle_click_opens_new_tab", &prefs.middle_click_opens_new_tab,
86 PREFS_BOOL },
87 { "right_click_closes_tab", &prefs.right_click_closes_tab, PREFS_BOOL },
88 { "no_proxy", &prefs.no_proxy, PREFS_STRING },
89 { "panel_size", &prefs.panel_size, PREFS_PANEL_SIZE },
90 { "parse_embedded_css", &prefs.parse_embedded_css, PREFS_BOOL },
91 { "save_dir", &prefs.save_dir, PREFS_STRING },
92 { "search_url", &prefs.search_urls, PREFS_STRINGS },
93 { "show_back", &prefs.show_back, PREFS_BOOL },
94 { "show_bookmarks", &prefs.show_bookmarks, PREFS_BOOL },
95 { "show_clear_url", &prefs.show_clear_url, PREFS_BOOL },
96 { "show_extra_warnings", &prefs.show_extra_warnings, PREFS_BOOL },
97 { "show_filemenu", &prefs.show_filemenu, PREFS_BOOL },
98 { "show_forw", &prefs.show_forw, PREFS_BOOL },
99 { "show_help", &prefs.show_help, PREFS_BOOL },
100 { "show_home", &prefs.show_home, PREFS_BOOL },
101 { "show_msg", &prefs.show_msg, PREFS_BOOL },
102 { "show_progress_box", &prefs.show_progress_box, PREFS_BOOL },
103 { "show_quit_dialog", &prefs.show_quit_dialog, PREFS_BOOL },
104 { "show_reload", &prefs.show_reload, PREFS_BOOL },
105 { "show_save", &prefs.show_save, PREFS_BOOL },
106 { "show_url", &prefs.show_url, PREFS_BOOL },
107 { "show_search", &prefs.show_search, PREFS_BOOL },
108 { "show_stop", &prefs.show_stop, PREFS_BOOL },
109 { "show_tools", &prefs.show_tools, PREFS_BOOL },
110 { "show_tooltip", &prefs.show_tooltip, PREFS_BOOL },
111 { "show_ui_tooltip", &prefs.show_ui_tooltip, PREFS_BOOL },
112 { "small_icons", &prefs.small_icons, PREFS_BOOL },
113 { "start_page", &prefs.start_page, PREFS_URL },
114 { "theme", &prefs.theme, PREFS_STRING },
115 { "ui_button_highlight_color", &prefs.ui_button_highlight_color,
116 PREFS_COLOR },
117 { "ui_fg_color", &prefs.ui_fg_color, PREFS_COLOR },
118 { "ui_main_bg_color", &prefs.ui_main_bg_color, PREFS_COLOR },
119 { "ui_selection_color", &prefs.ui_selection_color, PREFS_COLOR },
120 { "ui_tab_active_bg_color", &prefs.ui_tab_active_bg_color, PREFS_COLOR },
121 { "ui_tab_bg_color", &prefs.ui_tab_bg_color, PREFS_COLOR },
122 { "ui_tab_active_fg_color", &prefs.ui_tab_active_fg_color, PREFS_COLOR },
123 { "ui_tab_fg_color", &prefs.ui_tab_fg_color, PREFS_COLOR },
124 { "ui_text_bg_color", &prefs.ui_text_bg_color, PREFS_COLOR },
125 { "w3c_plus_heuristics", &prefs.w3c_plus_heuristics, PREFS_BOOL },
126 { "penalty_hyphen", &prefs.penalty_hyphen, PREFS_FRACTION_100 },
127 { "penalty_hyphen_2", &prefs.penalty_hyphen_2, PREFS_FRACTION_100 },
128 { "penalty_em_dash_left", &prefs.penalty_em_dash_left,
129 PREFS_FRACTION_100 },
130 { "penalty_em_dash_right", &prefs.penalty_em_dash_right,
131 PREFS_FRACTION_100 },
132 { "penalty_em_dash_right_2", &prefs.penalty_em_dash_right_2,
133 PREFS_FRACTION_100 },
134 { "stretchability_factor", &prefs.stretchability_factor,
135 PREFS_FRACTION_100 }
136 };
137
13854 node = NULL;
139 for (i = 0; i < sizeof(symbols) / sizeof(symbols[0]); i++) {
55 for (i = 0; i < n_symbols; i++) {
14056 if (!strcmp(symbols[i].name, name)) {
14157 node = & (symbols[i]);
14258 break;
16581 case PREFS_STRINGS:
16682 {
16783 Dlist *lp = *(Dlist **)node->pref;
168 if (dList_length(lp) == 2 && !dList_nth_data(lp, 1)) {
84 if (node->count == 0) {
16985 /* override the default */
170 void *data = dList_nth_data(lp, 0);
171 dList_remove(lp, data);
172 dList_remove(lp, NULL);
173 dFree(data);
86 for (i = 0; i < dList_length(lp); i++) {
87 void *data = dList_nth_data(lp, i);
88 dList_remove(lp, data);
89 dFree(data);
90 }
17491 }
17592 dList_append(lp, dStrdup(value));
17693 break;
213130 MSG_WARN("prefs: {%s} IS recognized but not handled!\n", name);
214131 break; /* Not reached */
215132 }
133 node->count++;
134
216135 return 0;
217136 }
218137
224143 char *line, *name, *value, *oldLocale;
225144 int st;
226145
146 /* Symbol array, sorted alphabetically */
147 SymNode_t symbols[] = {
148 { "allow_white_bg", &prefs.allow_white_bg, PREFS_BOOL, 0 },
149 { "white_bg_replacement", &prefs.white_bg_replacement, PREFS_COLOR, 0 },
150 { "bg_color", &prefs.bg_color, PREFS_COLOR, 0 },
151 { "buffered_drawing", &prefs.buffered_drawing, PREFS_INT32, 0 },
152 { "contrast_visited_color", &prefs.contrast_visited_color, PREFS_BOOL, 0 },
153 { "enterpress_forces_submit", &prefs.enterpress_forces_submit,
154 PREFS_BOOL, 0 },
155 { "focus_new_tab", &prefs.focus_new_tab, PREFS_BOOL, 0 },
156 { "font_cursive", &prefs.font_cursive, PREFS_STRING, 0 },
157 { "font_factor", &prefs.font_factor, PREFS_DOUBLE, 0 },
158 { "font_fantasy", &prefs.font_fantasy, PREFS_STRING, 0 },
159 { "font_max_size", &prefs.font_max_size, PREFS_INT32, 0 },
160 { "font_min_size", &prefs.font_min_size, PREFS_INT32, 0 },
161 { "font_monospace", &prefs.font_monospace, PREFS_STRING, 0 },
162 { "font_sans_serif", &prefs.font_sans_serif, PREFS_STRING, 0 },
163 { "font_serif", &prefs.font_serif, PREFS_STRING, 0 },
164 { "fullwindow_start", &prefs.fullwindow_start, PREFS_BOOL, 0 },
165 { "geometry", NULL, PREFS_GEOMETRY, 0 },
166 { "home", &prefs.home, PREFS_URL, 0 },
167 { "http_language", &prefs.http_language, PREFS_STRING, 0 },
168 { "http_max_conns", &prefs.http_max_conns, PREFS_INT32, 0 },
169 { "http_proxy", &prefs.http_proxy, PREFS_URL, 0 },
170 { "http_proxyuser", &prefs.http_proxyuser, PREFS_STRING, 0 },
171 { "http_referer", &prefs.http_referer, PREFS_STRING, 0 },
172 { "http_user_agent", &prefs.http_user_agent, PREFS_STRING, 0 },
173 { "limit_text_width", &prefs.limit_text_width, PREFS_BOOL, 0 },
174 { "load_images", &prefs.load_images, PREFS_BOOL, 0 },
175 { "load_background_images", &prefs.load_background_images, PREFS_BOOL, 0 },
176 { "load_stylesheets", &prefs.load_stylesheets, PREFS_BOOL, 0 },
177 { "middle_click_drags_page", &prefs.middle_click_drags_page,
178 PREFS_BOOL, 0 },
179 { "middle_click_opens_new_tab", &prefs.middle_click_opens_new_tab,
180 PREFS_BOOL, 0 },
181 { "right_click_closes_tab", &prefs.right_click_closes_tab, PREFS_BOOL, 0 },
182 { "no_proxy", &prefs.no_proxy, PREFS_STRING, 0 },
183 { "panel_size", &prefs.panel_size, PREFS_PANEL_SIZE, 0 },
184 { "parse_embedded_css", &prefs.parse_embedded_css, PREFS_BOOL, 0 },
185 { "save_dir", &prefs.save_dir, PREFS_STRING, 0 },
186 { "search_url", &prefs.search_urls, PREFS_STRINGS, 0 },
187 { "show_back", &prefs.show_back, PREFS_BOOL, 0 },
188 { "show_bookmarks", &prefs.show_bookmarks, PREFS_BOOL, 0 },
189 { "show_clear_url", &prefs.show_clear_url, PREFS_BOOL, 0 },
190 { "show_extra_warnings", &prefs.show_extra_warnings, PREFS_BOOL, 0 },
191 { "show_filemenu", &prefs.show_filemenu, PREFS_BOOL, 0 },
192 { "show_forw", &prefs.show_forw, PREFS_BOOL, 0 },
193 { "show_help", &prefs.show_help, PREFS_BOOL, 0 },
194 { "show_home", &prefs.show_home, PREFS_BOOL, 0 },
195 { "show_msg", &prefs.show_msg, PREFS_BOOL, 0 },
196 { "show_progress_box", &prefs.show_progress_box, PREFS_BOOL, 0 },
197 { "show_quit_dialog", &prefs.show_quit_dialog, PREFS_BOOL, 0 },
198 { "show_reload", &prefs.show_reload, PREFS_BOOL, 0 },
199 { "show_save", &prefs.show_save, PREFS_BOOL, 0 },
200 { "show_url", &prefs.show_url, PREFS_BOOL, 0 },
201 { "show_search", &prefs.show_search, PREFS_BOOL, 0 },
202 { "show_stop", &prefs.show_stop, PREFS_BOOL, 0 },
203 { "show_tools", &prefs.show_tools, PREFS_BOOL, 0 },
204 { "show_tooltip", &prefs.show_tooltip, PREFS_BOOL, 0 },
205 { "show_ui_tooltip", &prefs.show_ui_tooltip, PREFS_BOOL, 0 },
206 { "small_icons", &prefs.small_icons, PREFS_BOOL, 0 },
207 { "start_page", &prefs.start_page, PREFS_URL, 0 },
208 { "theme", &prefs.theme, PREFS_STRING, 0 },
209 { "ui_button_highlight_color", &prefs.ui_button_highlight_color,
210 PREFS_COLOR, 0 },
211 { "ui_fg_color", &prefs.ui_fg_color, PREFS_COLOR, 0 },
212 { "ui_main_bg_color", &prefs.ui_main_bg_color, PREFS_COLOR, 0 },
213 { "ui_selection_color", &prefs.ui_selection_color, PREFS_COLOR, 0 },
214 { "ui_tab_active_bg_color", &prefs.ui_tab_active_bg_color, PREFS_COLOR, 0 },
215 { "ui_tab_bg_color", &prefs.ui_tab_bg_color, PREFS_COLOR, 0 },
216 { "ui_tab_active_fg_color", &prefs.ui_tab_active_fg_color, PREFS_COLOR, 0 },
217 { "ui_tab_fg_color", &prefs.ui_tab_fg_color, PREFS_COLOR, 0 },
218 { "ui_text_bg_color", &prefs.ui_text_bg_color, PREFS_COLOR, 0 },
219 { "w3c_plus_heuristics", &prefs.w3c_plus_heuristics, PREFS_BOOL, 0 },
220 { "penalty_hyphen", &prefs.penalty_hyphen, PREFS_FRACTION_100, 0 },
221 { "penalty_hyphen_2", &prefs.penalty_hyphen_2, PREFS_FRACTION_100, 0 },
222 { "penalty_em_dash_left", &prefs.penalty_em_dash_left,
223 PREFS_FRACTION_100, 0 },
224 { "penalty_em_dash_right", &prefs.penalty_em_dash_right,
225 PREFS_FRACTION_100, 0 },
226 { "penalty_em_dash_right_2", &prefs.penalty_em_dash_right_2,
227 PREFS_FRACTION_100, 0 },
228 { "stretchability_factor", &prefs.stretchability_factor,
229 PREFS_FRACTION_100, 0 }
230 };
227231 // changing the LC_NUMERIC locale (temporarily) to C
228232 // avoids parsing problems with float numbers
229233 oldLocale = dStrdup(setlocale(LC_NUMERIC, NULL));
235239
236240 if (st == 0) {
237241 _MSG("prefsparser: name=%s, value=%s\n", name, value);
238 parseOption(name, value);
242 parseOption(name, value, symbols, sizeof(symbols) / sizeof(symbols[0]));
239243 } else if (st < 0) {
240244 MSG_ERR("prefsparser: Syntax error in dillorc:"
241245 " name=\"%s\" value=\"%s\"\n", name, value);
+0
-1
src/prefsparser.hh less more
1414 #ifdef __cplusplus
1515 class PrefsParser {
1616 public:
17 static int parseOption(char *name, char *value);
1817 static int parseLine(char *line, char *name, char *value);
1918 static void parse(FILE *fp);
2019 };
+12
-10
src/styleengine.cc less more
111111
112112 void StyleEngine::stackPush () {
113113 static const Node emptyNode = {
114 NULL, NULL, NULL, NULL, NULL, NULL, false, NULL
114 NULL, NULL, NULL, NULL, NULL, NULL, false, false, NULL
115115 };
116116
117117 stack->setSize (stack->size () + 1, emptyNode);
144144
145145 dn->element = element;
146146 n->doctreeNode = dn;
147 if (stack->size () > 1)
148 n->displayNone = stack->getRef (stack->size () - 2)->displayNone;
147149 }
148150
149151 void StyleEngine::startElement (const char *tagname, BrowserWindow *bw) {
363365 DilloUrl *imgUrl = NULL;
364366
365367 /* Determine font first so it can be used to resolve relative lengths. */
366 for (int i = 0; i < props->size (); i++) {
367 CssProperty *p = props->getRef (i);
368 for (int j = 0; j < props->size (); j++) {
369 CssProperty *p = props->getRef (j);
368370
369371 switch (p->name) {
370372 case CSS_PROPERTY_FONT_FAMILY:
426428 fontAttrs.size = roundInt(24.2 * prefs.font_factor);
427429 break;
428430 case CSS_FONT_SIZE_SMALLER:
429 fontAttrs.size = roundInt(fontAttrs.size * 0.83 *
430 prefs.font_factor);
431 fontAttrs.size = roundInt(fontAttrs.size * 0.83);
431432 break;
432433 case CSS_FONT_SIZE_LARGER:
433 fontAttrs.size = roundInt(fontAttrs.size * 1.2 *
434 prefs.font_factor);
434 fontAttrs.size = roundInt(fontAttrs.size * 1.2);
435435 break;
436436 default:
437437 assert(false); // invalid font-size enum
511511
512512 attrs->font = Font::create (layout, &fontAttrs);
513513
514 for (int i = 0; i < props->size (); i++) {
515 CssProperty *p = props->getRef (i);
514 for (int j = 0; j < props->size (); j++) {
515 CssProperty *p = props->getRef (j);
516516
517517 switch (p->name) {
518518 /* \todo missing cases */
595595 break;
596596 case CSS_PROPERTY_DISPLAY:
597597 attrs->display = (DisplayType) p->value.intVal;
598 if (attrs->display == DISPLAY_NONE)
599 stack->getRef (i)->displayNone = true;
598600 break;
599601 case CSS_PROPERTY_LINE_HEIGHT:
600602 if (p->type == CSS_TYPE_ENUM) { //only valid enum value is "normal"
708710 }
709711
710712 if (imgUrl && prefs.load_background_images &&
711 attrs->display != DISPLAY_NONE &&
713 !stack->getRef (i)->displayNone &&
712714 !(URL_FLAGS(pageUrl) & URL_SpamSafe))
713715 {
714716 attrs->backgroundImage = StyleImage::create();
+1
-0
src/styleengine.hh less more
2626 dw::core::style::Style *wordStyle;
2727 dw::core::style::Style *backgroundStyle;
2828 bool inheritBackgroundColor;
29 bool displayNone;
2930 DoctreeNode *doctreeNode;
3031 };
3132
+11
-11
src/table.cc less more
4747 if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "cellspacing"))) {
4848 cellspacing = strtol (attrbuf, NULL, 10);
4949 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
50 BUG_MSG("<table> cellspacing attribute is obsolete.\n");
50 BUG_MSG("<table> cellspacing attribute is obsolete.");
5151 }
5252
5353 if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "cellpadding"))) {
5454 cellpadding = strtol (attrbuf, NULL, 10);
5555 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
56 BUG_MSG("<table> cellpadding attribute is obsolete.\n");
56 BUG_MSG("<table> cellpadding attribute is obsolete.");
5757 }
5858
5959 if (border != -1) {
8787 CSS_TYPE_LENGTH_PERCENTAGE,
8888 a_Html_parse_length (html, attrbuf));
8989 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
90 BUG_MSG("<table> width attribute is obsolete.\n");
90 BUG_MSG("<table> width attribute is obsolete.");
9191 }
9292
9393 if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "align"))) {
101101 html->styleEngine->setNonCssHint (CSS_PROPERTY_TEXT_ALIGN,
102102 CSS_TYPE_ENUM, TEXT_ALIGN_CENTER);
103103 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
104 BUG_MSG("<table> align attribute is obsolete.\n");
104 BUG_MSG("<table> align attribute is obsolete.");
105105 }
106106
107107 if ((attrbuf = a_Html_get_attr(html, tag, tagsize, "bgcolor"))) {
110110 html->styleEngine->setNonCssHint (CSS_PROPERTY_BACKGROUND_COLOR,
111111 CSS_TYPE_COLOR, bgcolor);
112112 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
113 BUG_MSG("<table> bgcolor attribute is obsolete.\n");
113 BUG_MSG("<table> bgcolor attribute is obsolete.");
114114 }
115115
116116 html->style (); // evaluate now, so we can build non-css hints for the cells
191191 html->styleEngine->setNonCssHint (CSS_PROPERTY_BACKGROUND_COLOR,
192192 CSS_TYPE_COLOR, bgcolor);
193193 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
194 BUG_MSG("<tr> bgcolor attribute is obsolete.\n");
194 BUG_MSG("<tr> bgcolor attribute is obsolete.");
195195 }
196196
197197 if (a_Html_get_attr (html, tag, tagsize, "align")) {
378378 }
379379 if (a_Html_get_attr(html, tag, tagsize, "nowrap")) {
380380 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
381 BUG_MSG("<t%c> nowrap attribute is obsolete.\n",
381 BUG_MSG("<t%c> nowrap attribute is obsolete.",
382382 (tagsize >=3 && (D_ASCII_TOLOWER(tag[2]) == 'd')) ? 'd' : 'h');
383383 html->styleEngine->setNonCssHint(CSS_PROPERTY_WHITE_SPACE,
384384 CSS_TYPE_ENUM, WHITE_SPACE_NOWRAP);
391391 CSS_TYPE_LENGTH_PERCENTAGE,
392392 a_Html_parse_length (html, attrbuf));
393393 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
394 BUG_MSG("<t%c> width attribute is obsolete.\n",
394 BUG_MSG("<t%c> width attribute is obsolete.",
395395 (tagsize >=3 && (D_ASCII_TOLOWER(tag[2]) == 'd')) ? 'd' : 'h');
396396 }
397397
403403 html->styleEngine->setNonCssHint (CSS_PROPERTY_BACKGROUND_COLOR,
404404 CSS_TYPE_COLOR, bgcolor);
405405 if (html->DocType == DT_HTML && html->DocTypeVersion >= 5.0f)
406 BUG_MSG("<t%c> bgcolor attribute is obsolete.\n",
406 BUG_MSG("<t%c> bgcolor attribute is obsolete.",
407407 (tagsize >=3 && (D_ASCII_TOLOWER(tag[2]) == 'd')) ? 'd' : 'h');
408408 }
409409
422422
423423 switch (S_TOP(html)->table_mode) {
424424 case DILLO_HTML_TABLE_MODE_NONE:
425 BUG_MSG("<t%c> outside <table>\n",
425 BUG_MSG("<t%c> outside <table>.",
426426 (tagsize >=3 && (D_ASCII_TOLOWER(tag[2]) == 'd')) ? 'd' : 'h');
427427 return;
428428
429429 case DILLO_HTML_TABLE_MODE_TOP:
430 BUG_MSG("<t%c> outside <tr>\n",
430 BUG_MSG("<t%c> outside <tr>.",
431431 (tagsize >=3 && (D_ASCII_TOLOWER(tag[2]) == 'd')) ? 'd' : 'h');
432432 /* a_Dw_table_add_cell takes care that dillo does not crash. */
433433 /* continues */
+1
-1
src/ui.cc less more
815815 {
816816 if (!str) str = "";
817817 Location->value(str);
818 Location->position(strlen(str));
818 Location->position((Fl::focus() == Location) ? strlen(str) : 0);
819819 }
820820
821821 /*
+16
-3
src/uicmd.cc less more
7070 static BrowserWindow *UIcmd_tab_new(CustTabs *tabs, UI *old_ui, int focus);
7171 static void close_tab_btn_cb (Fl_Widget *w, void *cb_data);
7272 static char *UIcmd_make_search_str(const char *str);
73 static void UIcmd_set_window_labels(Fl_Window *win, const char *str);
7374
7475 //----------------------------------------------------------------------------
7576
432433 // Update window title
433434 if ((bw = a_UIcmd_get_bw_by_widget(cbtn->ui()))) {
434435 const char *title = (cbtn->ui())->label();
435 cbtn->window()->copy_label(title ? title : "");
436 UIcmd_set_window_labels(cbtn->window(), title ? title : "");
436437 }
437438 // Update focus priority
438439 increase_focus_counter();
567568 }
568569
569570 /*
571 * Set the window name and icon name.
572 */
573 static void UIcmd_set_window_labels(Fl_Window *win, const char *str)
574 {
575 const char *copy;
576
577 win->Fl_Widget::copy_label(str);
578 copy = win->label();
579 win->label(copy, copy);
580 }
581
582 /*
570583 * Create a new Tab button, UI and its associated BrowserWindow data
571584 * structure.
572585 */
605618
606619 // Clear the window title
607620 if (focus)
608 new_ui->window()->copy_label(new_ui->label());
621 UIcmd_set_window_labels(new_ui->window(), new_ui->label());
609622
610623 // WORKAROUND: see findbar_toggle()
611624 new_ui->findbar_toggle(0);
14121425
14131426 if (a_UIcmd_get_bw_by_widget(BW2UI(bw)->tabs()->wizard()->value()) == bw) {
14141427 // This is the focused bw, set window title
1415 BW2UI(bw)->window()->copy_label(title);
1428 UIcmd_set_window_labels(BW2UI(bw)->window(), title);
14161429 }
14171430 }
14181431
+12
-9
src/url.c less more
365365
366366 dReturn_val_if_fail (url_str != NULL, NULL);
367367
368 /* Count illegal characters (0x00-0x1F, 0x7F and space) */
368 /* Count illegal characters (0x00-0x1F, 0x7F-0xFF and space) */
369369 n_ic = n_ic_spc = 0;
370370 for (p = (char*)url_str; *p; p++) {
371371 n_ic_spc += (*p == ' ') ? 1 : 0;
372 n_ic += (*p != ' ' && *p > 0x1F && *p != 0x7F) ? 0 : 1;
372 n_ic += (*p != ' ' && *p > 0x1F && *p < 0x7F) ? 0 : 1;
373373 }
374374 if (n_ic) {
375375 /* Encode illegal characters (they could also be stripped).
376376 * There's no standard for illegal chars; we chose to encode. */
377377 p = str1 = dNew(char, strlen(url_str) + 2*n_ic + 1);
378378 for (i = 0; url_str[i]; ++i)
379 if (url_str[i] > 0x1F && url_str[i] != 0x7F && url_str[i] != ' ')
379 if (url_str[i] > 0x1F && url_str[i] < 0x7F && url_str[i] != ' ')
380380 *p++ = url_str[i];
381381 else {
382382 *p++ = '%';
610610 /*
611611 * RFC-3986 suggests this stripping when "importing" URLs from other media.
612612 * Strip: "URL:", enclosing < >, and embedded whitespace.
613 * (We also strip illegal chars: 00-1F and 7F)
613 * (We also strip illegal chars: 00-1F and 7F-FF)
614614 */
615615 char *a_Url_string_strip_delimiters(const char *str)
616616 {
625625 text++;
626626
627627 for (p = new_str; *text; text++)
628 if (*text > 0x1F && *text != 0x7F && *text != ' ')
628 if (*text > 0x1F && *text < 0x7F && *text != ' ')
629629 *p++ = *text;
630630 if (p > new_str && p[-1] == '>')
631631 --p;
687687
688688 if (tld_len > 0) {
689689 /* These TLDs were chosen by examining the current publicsuffix list
690 * in February 2014 and picking out those where it was simplest for
690 * in October 2014 and picking out those where it was simplest for
691691 * them to describe the situation by beginning with a "*.[tld]" rule
692692 * or every rule was "[something].[tld]".
693 *
694 * TODO: Consider the old publicsuffix code again. This TLD list has
695 * shrunk and shrunk over the years, and has become a poorer and
696 * poorer approximation of administrative boundaries.
693697 */
694 const char *const tlds[] = {"bd","bn","ck","cy","er","et","fj","fk",
698 const char *const tlds[] = {"bd","bn","ck","cy","er","fj","fk",
695699 "gu","il","jm","ke","kh","kw","mm","mz",
696 "ni","np","nz","pg","tr","uk","ye","za",
697 "zm","zw"};
700 "ni","np","pg","ye","za","zm","zw"};
698701 uint_t i, tld_num = sizeof(tlds) / sizeof(tlds[0]);
699702
700703 for (i = 0; i < tld_num; i++) {
+19
-19
test/Makefile.am less more
3333 $(top_builddir)/dw/libDw-fltk.a \
3434 $(top_builddir)/dw/libDw-core.a \
3535 $(top_builddir)/lout/liblout.a \
36 @LIBFLTK_LIBS@
36 @LIBFLTK_LIBS@ @LIBX11_LIBS@
3737
3838 dw_example_SOURCES = dw_example.cc
3939 dw_example_LDADD = \
4141 $(top_builddir)/dw/libDw-fltk.a \
4242 $(top_builddir)/dw/libDw-core.a \
4343 $(top_builddir)/lout/liblout.a \
44 @LIBFLTK_LIBS@
44 @LIBFLTK_LIBS@ @LIBX11_LIBS@
4545
4646 dw_find_test_SOURCES = dw_find_test.cc
4747 dw_find_test_LDADD = \
4949 $(top_builddir)/dw/libDw-fltk.a \
5050 $(top_builddir)/dw/libDw-core.a \
5151 $(top_builddir)/lout/liblout.a \
52 @LIBFLTK_LIBS@
52 @LIBFLTK_LIBS@ @LIBX11_LIBS@
5353
5454 dw_links_SOURCES = dw_links.cc
5555 dw_links_LDADD = \
5757 $(top_builddir)/dw/libDw-fltk.a \
5858 $(top_builddir)/dw/libDw-core.a \
5959 $(top_builddir)/lout/liblout.a \
60 @LIBFLTK_LIBS@
60 @LIBFLTK_LIBS@ @LIBX11_LIBS@
6161
6262 dw_links2_SOURCES = dw_links2.cc
6363 dw_links2_LDADD = \
6565 $(top_builddir)/dw/libDw-fltk.a \
6666 $(top_builddir)/dw/libDw-core.a \
6767 $(top_builddir)/lout/liblout.a \
68 @LIBFLTK_LIBS@
68 @LIBFLTK_LIBS@ @LIBX11_LIBS@
6969
7070 dw_image_background_SOURCES = dw_image_background.cc
7171 dw_image_background_LDADD = \
7373 $(top_builddir)/dw/libDw-fltk.a \
7474 $(top_builddir)/dw/libDw-core.a \
7575 $(top_builddir)/lout/liblout.a \
76 @LIBFLTK_LIBS@
76 @LIBFLTK_LIBS@ @LIBX11_LIBS@
7777
7878 dw_images_simple_SOURCES = dw_images_simple.cc
7979 dw_images_simple_LDADD = \
8181 $(top_builddir)/dw/libDw-fltk.a \
8282 $(top_builddir)/dw/libDw-core.a \
8383 $(top_builddir)/lout/liblout.a \
84 @LIBFLTK_LIBS@
84 @LIBFLTK_LIBS@ @LIBX11_LIBS@
8585
8686 dw_images_scaled_SOURCES = dw_images_scaled.cc
8787 dw_images_scaled_LDADD = \
8989 $(top_builddir)/dw/libDw-fltk.a \
9090 $(top_builddir)/dw/libDw-core.a \
9191 $(top_builddir)/lout/liblout.a \
92 @LIBFLTK_LIBS@
92 @LIBFLTK_LIBS@ @LIBX11_LIBS@
9393
9494 dw_images_scaled2_SOURCES = dw_images_scaled2.cc
9595 dw_images_scaled2_LDADD = \
9797 $(top_builddir)/dw/libDw-fltk.a \
9898 $(top_builddir)/dw/libDw-core.a \
9999 $(top_builddir)/lout/liblout.a \
100 @LIBFLTK_LIBS@
100 @LIBFLTK_LIBS@ @LIBX11_LIBS@
101101
102102 dw_lists_SOURCES = dw_lists.cc
103103 dw_lists_LDADD = \
105105 $(top_builddir)/dw/libDw-fltk.a \
106106 $(top_builddir)/dw/libDw-core.a \
107107 $(top_builddir)/lout/liblout.a \
108 @LIBFLTK_LIBS@
108 @LIBFLTK_LIBS@ @LIBX11_LIBS@
109109
110110 dw_table_aligned_SOURCES = dw_table_aligned.cc
111111 dw_table_aligned_LDADD = \
113113 $(top_builddir)/dw/libDw-fltk.a \
114114 $(top_builddir)/dw/libDw-core.a \
115115 $(top_builddir)/lout/liblout.a \
116 @LIBFLTK_LIBS@
116 @LIBFLTK_LIBS@ @LIBX11_LIBS@
117117
118118 dw_table_SOURCES = dw_table.cc
119119 dw_table_LDADD = \
121121 $(top_builddir)/dw/libDw-fltk.a \
122122 $(top_builddir)/dw/libDw-core.a \
123123 $(top_builddir)/lout/liblout.a \
124 @LIBFLTK_LIBS@
124 @LIBFLTK_LIBS@ @LIBX11_LIBS@
125125
126126 dw_border_test_SOURCES = dw_border_test.cc
127127 dw_border_test_LDADD = \
129129 $(top_builddir)/dw/libDw-fltk.a \
130130 $(top_builddir)/dw/libDw-core.a \
131131 $(top_builddir)/lout/liblout.a \
132 @LIBFLTK_LIBS@
132 @LIBFLTK_LIBS@ @LIBX11_LIBS@
133133
134134
135135 dw_imgbuf_mem_test_SOURCES = dw_imgbuf_mem_test.cc
138138 $(top_builddir)/dw/libDw-fltk.a \
139139 $(top_builddir)/dw/libDw-core.a \
140140 $(top_builddir)/lout/liblout.a \
141 @LIBFLTK_LIBS@
141 @LIBFLTK_LIBS@ @LIBX11_LIBS@
142142
143143 dw_resource_test_SOURCES = dw_resource_test.cc
144144 dw_resource_test_LDADD = \
146146 $(top_builddir)/dw/libDw-fltk.a \
147147 $(top_builddir)/dw/libDw-core.a \
148148 $(top_builddir)/lout/liblout.a \
149 @LIBFLTK_LIBS@
149 @LIBFLTK_LIBS@ @LIBX11_LIBS@
150150
151151 dw_ui_test_SOURCES = \
152152 dw_ui_test.cc \
157157 $(top_builddir)/dw/libDw-fltk.a \
158158 $(top_builddir)/dw/libDw-core.a \
159159 $(top_builddir)/lout/liblout.a \
160 @LIBFLTK_LIBS@
160 @LIBFLTK_LIBS@ @LIBX11_LIBS@
161161
162162 shapes_SOURCES = shapes.cc
163163 shapes_LDADD = \
179179 $(top_builddir)/dw/libDw-fltk.a \
180180 $(top_builddir)/dw/libDw-core.a \
181181 $(top_builddir)/lout/liblout.a \
182 @LIBFLTK_LIBS@
182 @LIBFLTK_LIBS@ @LIBX11_LIBS@
183183
184184 trie_SOURCES = trie.cc
185185
188188 $(top_builddir)/dw/libDw-fltk.a \
189189 $(top_builddir)/dw/libDw-core.a \
190190 $(top_builddir)/lout/liblout.a \
191 @LIBFLTK_LIBS@
191 @LIBFLTK_LIBS@ @LIBX11_LIBS@
192192
193193 notsosimplevector_SOURCES = notsosimplevector.cc
194194
198198
199199 unicode_test_LDADD = \
200200 $(top_builddir)/lout/liblout.a \
201 @LIBFLTK_LIBS@
201 @LIBFLTK_LIBS@ @LIBX11_LIBS@
+116
-212
test/Makefile.in less more
0 # Makefile.in generated by automake 1.14.1 from Makefile.am.
0 # Makefile.in generated by automake 1.11.6 from Makefile.am.
11 # @configure_input@
22
3 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
4
3 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5 # Foundation, Inc.
56 # This Makefile.in is free software; the Free Software Foundation
67 # gives unlimited permission to copy and/or distribute it,
78 # with or without modifications, as long as this notice is preserved.
1415 @SET_MAKE@
1516
1617 VPATH = @srcdir@
17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
18 am__make_running_with_option = \
19 case $${target_option-} in \
20 ?) ;; \
21 *) echo "am__make_running_with_option: internal error: invalid" \
22 "target option '$${target_option-}' specified" >&2; \
23 exit 1;; \
24 esac; \
25 has_opt=no; \
26 sane_makeflags=$$MAKEFLAGS; \
27 if $(am__is_gnu_make); then \
28 sane_makeflags=$$MFLAGS; \
29 else \
18 am__make_dryrun = \
19 { \
20 am__dry=no; \
3021 case $$MAKEFLAGS in \
3122 *\\[\ \ ]*) \
32 bs=\\; \
33 sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
34 | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
23 echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
24 | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
25 *) \
26 for am__flg in $$MAKEFLAGS; do \
27 case $$am__flg in \
28 *=*|--*) ;; \
29 *n*) am__dry=yes; break;; \
30 esac; \
31 done;; \
3532 esac; \
36 fi; \
37 skip_next=no; \
38 strip_trailopt () \
39 { \
40 flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
41 }; \
42 for flg in $$sane_makeflags; do \
43 test $$skip_next = yes && { skip_next=no; continue; }; \
44 case $$flg in \
45 *=*|--*) continue;; \
46 -*I) strip_trailopt 'I'; skip_next=yes;; \
47 -*I?*) strip_trailopt 'I';; \
48 -*O) strip_trailopt 'O'; skip_next=yes;; \
49 -*O?*) strip_trailopt 'O';; \
50 -*l) strip_trailopt 'l'; skip_next=yes;; \
51 -*l?*) strip_trailopt 'l';; \
52 -[dEDm]) skip_next=yes;; \
53 -[JT]) skip_next=yes;; \
54 esac; \
55 case $$flg in \
56 *$$target_option*) has_opt=yes; break;; \
57 esac; \
58 done; \
59 test $$has_opt = yes
60 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
61 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
33 test $$am__dry = yes; \
34 }
6235 pkgdatadir = $(datadir)/@PACKAGE@
6336 pkgincludedir = $(includedir)/@PACKAGE@
6437 pkglibdir = $(libdir)/@PACKAGE@
8962 liang$(EXEEXT) trie$(EXEEXT) notsosimplevector$(EXEEXT) \
9063 unicode-test$(EXEEXT)
9164 subdir = test
92 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
93 $(top_srcdir)/depcomp
65 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
9466 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9567 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
9668 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
207179 am_unicode_test_OBJECTS = unicode_test.$(OBJEXT)
208180 unicode_test_OBJECTS = $(am_unicode_test_OBJECTS)
209181 unicode_test_DEPENDENCIES = $(top_builddir)/lout/liblout.a
210 AM_V_P = $(am__v_P_@AM_V@)
211 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
212 am__v_P_0 = false
213 am__v_P_1 = :
214 AM_V_GEN = $(am__v_GEN_@AM_V@)
215 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
216 am__v_GEN_0 = @echo " GEN " $@;
217 am__v_GEN_1 =
218 AM_V_at = $(am__v_at_@AM_V@)
219 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
220 am__v_at_0 = @
221 am__v_at_1 =
222182 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
223183 depcomp = $(SHELL) $(top_srcdir)/depcomp
224184 am__depfiles_maybe = depfiles
225185 am__mv = mv -f
226186 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
227187 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
228 AM_V_CC = $(am__v_CC_@AM_V@)
229 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
230 am__v_CC_0 = @echo " CC " $@;
231 am__v_CC_1 =
232188 CCLD = $(CC)
233189 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
234 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
235 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
236 am__v_CCLD_0 = @echo " CCLD " $@;
237 am__v_CCLD_1 =
238190 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
239191 $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
240 AM_V_CXX = $(am__v_CXX_@AM_V@)
241 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
242 am__v_CXX_0 = @echo " CXX " $@;
243 am__v_CXX_1 =
244192 CXXLD = $(CXX)
245193 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
246194 -o $@
247 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
248 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
249 am__v_CXXLD_0 = @echo " CXXLD " $@;
250 am__v_CXXLD_1 =
251195 SOURCES = $(containers_SOURCES) $(cookies_SOURCES) \
252196 $(dw_anchors_test_SOURCES) $(dw_border_test_SOURCES) \
253197 $(dw_example_SOURCES) $(dw_find_test_SOURCES) \
275219 n|no|NO) false;; \
276220 *) (install-info --version) >/dev/null 2>&1;; \
277221 esac
278 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
279 # Read a list of newline-separated strings from the standard input,
280 # and print each of them once, without duplicates. Input order is
281 # *not* preserved.
282 am__uniquify_input = $(AWK) '\
283 BEGIN { nonempty = 0; } \
284 { items[$$0] = 1; nonempty = 1; } \
285 END { if (nonempty) { for (i in items) print i; }; } \
286 '
287 # Make sure the list of sources is unique. This is necessary because,
288 # e.g., the same source file might be shared among _SOURCES variables
289 # for different programs/libraries.
290 am__define_uniq_tagged_files = \
291 list='$(am__tagged_files)'; \
292 unique=`for i in $$list; do \
293 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
294 done | $(am__uniquify_input)`
295222 ETAGS = etags
296223 CTAGS = ctags
297224 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
298225 ACLOCAL = @ACLOCAL@
299226 AMTAR = @AMTAR@
300 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
301227 AUTOCONF = @AUTOCONF@
302228 AUTOHEADER = @AUTOHEADER@
303229 AUTOMAKE = @AUTOMAKE@
318244 ECHO_T = @ECHO_T@
319245 EGREP = @EGREP@
320246 EXEEXT = @EXEEXT@
247 FLTK_CONFIG = @FLTK_CONFIG@
321248 GREP = @GREP@
322249 INSTALL = @INSTALL@
323250 INSTALL_DATA = @INSTALL_DATA@
424351 $(top_builddir)/dw/libDw-fltk.a \
425352 $(top_builddir)/dw/libDw-core.a \
426353 $(top_builddir)/lout/liblout.a \
427 @LIBFLTK_LIBS@
354 @LIBFLTK_LIBS@ @LIBX11_LIBS@
428355
429356 dw_example_SOURCES = dw_example.cc
430357 dw_example_LDADD = \
432359 $(top_builddir)/dw/libDw-fltk.a \
433360 $(top_builddir)/dw/libDw-core.a \
434361 $(top_builddir)/lout/liblout.a \
435 @LIBFLTK_LIBS@
362 @LIBFLTK_LIBS@ @LIBX11_LIBS@
436363
437364 dw_find_test_SOURCES = dw_find_test.cc
438365 dw_find_test_LDADD = \
440367 $(top_builddir)/dw/libDw-fltk.a \
441368 $(top_builddir)/dw/libDw-core.a \
442369 $(top_builddir)/lout/liblout.a \
443 @LIBFLTK_LIBS@
370 @LIBFLTK_LIBS@ @LIBX11_LIBS@
444371
445372 dw_links_SOURCES = dw_links.cc
446373 dw_links_LDADD = \
448375 $(top_builddir)/dw/libDw-fltk.a \
449376 $(top_builddir)/dw/libDw-core.a \
450377 $(top_builddir)/lout/liblout.a \
451 @LIBFLTK_LIBS@
378 @LIBFLTK_LIBS@ @LIBX11_LIBS@
452379
453380 dw_links2_SOURCES = dw_links2.cc
454381 dw_links2_LDADD = \
456383 $(top_builddir)/dw/libDw-fltk.a \
457384 $(top_builddir)/dw/libDw-core.a \
458385 $(top_builddir)/lout/liblout.a \
459 @LIBFLTK_LIBS@
386 @LIBFLTK_LIBS@ @LIBX11_LIBS@
460387
461388 dw_image_background_SOURCES = dw_image_background.cc
462389 dw_image_background_LDADD = \
464391 $(top_builddir)/dw/libDw-fltk.a \
465392 $(top_builddir)/dw/libDw-core.a \
466393 $(top_builddir)/lout/liblout.a \
467 @LIBFLTK_LIBS@
394 @LIBFLTK_LIBS@ @LIBX11_LIBS@
468395
469396 dw_images_simple_SOURCES = dw_images_simple.cc
470397 dw_images_simple_LDADD = \
472399 $(top_builddir)/dw/libDw-fltk.a \
473400 $(top_builddir)/dw/libDw-core.a \
474401 $(top_builddir)/lout/liblout.a \
475 @LIBFLTK_LIBS@
402 @LIBFLTK_LIBS@ @LIBX11_LIBS@
476403
477404 dw_images_scaled_SOURCES = dw_images_scaled.cc
478405 dw_images_scaled_LDADD = \
480407 $(top_builddir)/dw/libDw-fltk.a \
481408 $(top_builddir)/dw/libDw-core.a \
482409 $(top_builddir)/lout/liblout.a \
483 @LIBFLTK_LIBS@
410 @LIBFLTK_LIBS@ @LIBX11_LIBS@
484411
485412 dw_images_scaled2_SOURCES = dw_images_scaled2.cc
486413 dw_images_scaled2_LDADD = \
488415 $(top_builddir)/dw/libDw-fltk.a \
489416 $(top_builddir)/dw/libDw-core.a \
490417 $(top_builddir)/lout/liblout.a \
491 @LIBFLTK_LIBS@
418 @LIBFLTK_LIBS@ @LIBX11_LIBS@
492419
493420 dw_lists_SOURCES = dw_lists.cc
494421 dw_lists_LDADD = \
496423 $(top_builddir)/dw/libDw-fltk.a \
497424 $(top_builddir)/dw/libDw-core.a \
498425 $(top_builddir)/lout/liblout.a \
499 @LIBFLTK_LIBS@
426 @LIBFLTK_LIBS@ @LIBX11_LIBS@
500427
501428 dw_table_aligned_SOURCES = dw_table_aligned.cc
502429 dw_table_aligned_LDADD = \
504431 $(top_builddir)/dw/libDw-fltk.a \
505432 $(top_builddir)/dw/libDw-core.a \
506433 $(top_builddir)/lout/liblout.a \
507 @LIBFLTK_LIBS@
434 @LIBFLTK_LIBS@ @LIBX11_LIBS@
508435
509436 dw_table_SOURCES = dw_table.cc
510437 dw_table_LDADD = \
512439 $(top_builddir)/dw/libDw-fltk.a \
513440 $(top_builddir)/dw/libDw-core.a \
514441 $(top_builddir)/lout/liblout.a \
515 @LIBFLTK_LIBS@
442 @LIBFLTK_LIBS@ @LIBX11_LIBS@
516443
517444 dw_border_test_SOURCES = dw_border_test.cc
518445 dw_border_test_LDADD = \
520447 $(top_builddir)/dw/libDw-fltk.a \
521448 $(top_builddir)/dw/libDw-core.a \
522449 $(top_builddir)/lout/liblout.a \
523 @LIBFLTK_LIBS@
450 @LIBFLTK_LIBS@ @LIBX11_LIBS@
524451
525452 dw_imgbuf_mem_test_SOURCES = dw_imgbuf_mem_test.cc
526453 dw_imgbuf_mem_test_LDADD = \
528455 $(top_builddir)/dw/libDw-fltk.a \
529456 $(top_builddir)/dw/libDw-core.a \
530457 $(top_builddir)/lout/liblout.a \
531 @LIBFLTK_LIBS@
458 @LIBFLTK_LIBS@ @LIBX11_LIBS@
532459
533460 dw_resource_test_SOURCES = dw_resource_test.cc
534461 dw_resource_test_LDADD = \
536463 $(top_builddir)/dw/libDw-fltk.a \
537464 $(top_builddir)/dw/libDw-core.a \
538465 $(top_builddir)/lout/liblout.a \
539 @LIBFLTK_LIBS@
466 @LIBFLTK_LIBS@ @LIBX11_LIBS@
540467
541468 dw_ui_test_SOURCES = \
542469 dw_ui_test.cc \
548475 $(top_builddir)/dw/libDw-fltk.a \
549476 $(top_builddir)/dw/libDw-core.a \
550477 $(top_builddir)/lout/liblout.a \
551 @LIBFLTK_LIBS@
478 @LIBFLTK_LIBS@ @LIBX11_LIBS@
552479
553480 shapes_SOURCES = shapes.cc
554481 shapes_LDADD = \
568495 $(top_builddir)/dw/libDw-fltk.a \
569496 $(top_builddir)/dw/libDw-core.a \
570497 $(top_builddir)/lout/liblout.a \
571 @LIBFLTK_LIBS@
498 @LIBFLTK_LIBS@ @LIBX11_LIBS@
572499
573500 trie_SOURCES = trie.cc
574501 trie_LDADD = \
576503 $(top_builddir)/dw/libDw-fltk.a \
577504 $(top_builddir)/dw/libDw-core.a \
578505 $(top_builddir)/lout/liblout.a \
579 @LIBFLTK_LIBS@
506 @LIBFLTK_LIBS@ @LIBX11_LIBS@
580507
581508 notsosimplevector_SOURCES = notsosimplevector.cc
582509 notsosimplevector_LDADD = $(top_builddir)/lout/liblout.a
583510 unicode_test_SOURCES = unicode_test.cc
584511 unicode_test_LDADD = \
585512 $(top_builddir)/lout/liblout.a \
586 @LIBFLTK_LIBS@
513 @LIBFLTK_LIBS@ @LIBX11_LIBS@
587514
588515 all: all-am
589516
622549
623550 clean-noinstPROGRAMS:
624551 -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
625
626552 containers$(EXEEXT): $(containers_OBJECTS) $(containers_DEPENDENCIES) $(EXTRA_containers_DEPENDENCIES)
627553 @rm -f containers$(EXEEXT)
628 $(AM_V_CXXLD)$(CXXLINK) $(containers_OBJECTS) $(containers_LDADD) $(LIBS)
629
554 $(CXXLINK) $(containers_OBJECTS) $(containers_LDADD) $(LIBS)
630555 cookies$(EXEEXT): $(cookies_OBJECTS) $(cookies_DEPENDENCIES) $(EXTRA_cookies_DEPENDENCIES)
631556 @rm -f cookies$(EXEEXT)
632 $(AM_V_CCLD)$(LINK) $(cookies_OBJECTS) $(cookies_LDADD) $(LIBS)
633
557 $(LINK) $(cookies_OBJECTS) $(cookies_LDADD) $(LIBS)
634558 dw-anchors-test$(EXEEXT): $(dw_anchors_test_OBJECTS) $(dw_anchors_test_DEPENDENCIES) $(EXTRA_dw_anchors_test_DEPENDENCIES)
635559 @rm -f dw-anchors-test$(EXEEXT)
636 $(AM_V_CXXLD)$(CXXLINK) $(dw_anchors_test_OBJECTS) $(dw_anchors_test_LDADD) $(LIBS)
637
560 $(CXXLINK) $(dw_anchors_test_OBJECTS) $(dw_anchors_test_LDADD) $(LIBS)
638561 dw-border-test$(EXEEXT): $(dw_border_test_OBJECTS) $(dw_border_test_DEPENDENCIES) $(EXTRA_dw_border_test_DEPENDENCIES)
639562 @rm -f dw-border-test$(EXEEXT)
640 $(AM_V_CXXLD)$(CXXLINK) $(dw_border_test_OBJECTS) $(dw_border_test_LDADD) $(LIBS)
641
563 $(CXXLINK) $(dw_border_test_OBJECTS) $(dw_border_test_LDADD) $(LIBS)
642564 dw-example$(EXEEXT): $(dw_example_OBJECTS) $(dw_example_DEPENDENCIES) $(EXTRA_dw_example_DEPENDENCIES)
643565 @rm -f dw-example$(EXEEXT)
644 $(AM_V_CXXLD)$(CXXLINK) $(dw_example_OBJECTS) $(dw_example_LDADD) $(LIBS)
645
566 $(CXXLINK) $(dw_example_OBJECTS) $(dw_example_LDADD) $(LIBS)
646567 dw-find-test$(EXEEXT): $(dw_find_test_OBJECTS) $(dw_find_test_DEPENDENCIES) $(EXTRA_dw_find_test_DEPENDENCIES)
647568 @rm -f dw-find-test$(EXEEXT)
648 $(AM_V_CXXLD)$(CXXLINK) $(dw_find_test_OBJECTS) $(dw_find_test_LDADD) $(LIBS)
649
569 $(CXXLINK) $(dw_find_test_OBJECTS) $(dw_find_test_LDADD) $(LIBS)
650570 dw-image-background$(EXEEXT): $(dw_image_background_OBJECTS) $(dw_image_background_DEPENDENCIES) $(EXTRA_dw_image_background_DEPENDENCIES)
651571 @rm -f dw-image-background$(EXEEXT)
652 $(AM_V_CXXLD)$(CXXLINK) $(dw_image_background_OBJECTS) $(dw_image_background_LDADD) $(LIBS)
653
572 $(CXXLINK) $(dw_image_background_OBJECTS) $(dw_image_background_LDADD) $(LIBS)
654573 dw-images-scaled$(EXEEXT): $(dw_images_scaled_OBJECTS) $(dw_images_scaled_DEPENDENCIES) $(EXTRA_dw_images_scaled_DEPENDENCIES)
655574 @rm -f dw-images-scaled$(EXEEXT)
656 $(AM_V_CXXLD)$(CXXLINK) $(dw_images_scaled_OBJECTS) $(dw_images_scaled_LDADD) $(LIBS)
657
575 $(CXXLINK) $(dw_images_scaled_OBJECTS) $(dw_images_scaled_LDADD) $(LIBS)
658576 dw-images-scaled2$(EXEEXT): $(dw_images_scaled2_OBJECTS) $(dw_images_scaled2_DEPENDENCIES) $(EXTRA_dw_images_scaled2_DEPENDENCIES)
659577 @rm -f dw-images-scaled2$(EXEEXT)
660 $(AM_V_CXXLD)$(CXXLINK) $(dw_images_scaled2_OBJECTS) $(dw_images_scaled2_LDADD) $(LIBS)
661
578 $(CXXLINK) $(dw_images_scaled2_OBJECTS) $(dw_images_scaled2_LDADD) $(LIBS)
662579 dw-images-simple$(EXEEXT): $(dw_images_simple_OBJECTS) $(dw_images_simple_DEPENDENCIES) $(EXTRA_dw_images_simple_DEPENDENCIES)
663580 @rm -f dw-images-simple$(EXEEXT)
664 $(AM_V_CXXLD)$(CXXLINK) $(dw_images_simple_OBJECTS) $(dw_images_simple_LDADD) $(LIBS)
665
581 $(CXXLINK) $(dw_images_simple_OBJECTS) $(dw_images_simple_LDADD) $(LIBS)
666582 dw-imgbuf-mem-test$(EXEEXT): $(dw_imgbuf_mem_test_OBJECTS) $(dw_imgbuf_mem_test_DEPENDENCIES) $(EXTRA_dw_imgbuf_mem_test_DEPENDENCIES)
667583 @rm -f dw-imgbuf-mem-test$(EXEEXT)
668 $(AM_V_CXXLD)$(CXXLINK) $(dw_imgbuf_mem_test_OBJECTS) $(dw_imgbuf_mem_test_LDADD) $(LIBS)
669
584 $(CXXLINK) $(dw_imgbuf_mem_test_OBJECTS) $(dw_imgbuf_mem_test_LDADD) $(LIBS)
670585 dw-links$(EXEEXT): $(dw_links_OBJECTS) $(dw_links_DEPENDENCIES) $(EXTRA_dw_links_DEPENDENCIES)
671586 @rm -f dw-links$(EXEEXT)
672 $(AM_V_CXXLD)$(CXXLINK) $(dw_links_OBJECTS) $(dw_links_LDADD) $(LIBS)
673
587 $(CXXLINK) $(dw_links_OBJECTS) $(dw_links_LDADD) $(LIBS)
674588 dw-links2$(EXEEXT): $(dw_links2_OBJECTS) $(dw_links2_DEPENDENCIES) $(EXTRA_dw_links2_DEPENDENCIES)
675589 @rm -f dw-links2$(EXEEXT)
676 $(AM_V_CXXLD)$(CXXLINK) $(dw_links2_OBJECTS) $(dw_links2_LDADD) $(LIBS)
677
590 $(CXXLINK) $(dw_links2_OBJECTS) $(dw_links2_LDADD) $(LIBS)
678591 dw-lists$(EXEEXT): $(dw_lists_OBJECTS) $(dw_lists_DEPENDENCIES) $(EXTRA_dw_lists_DEPENDENCIES)
679592 @rm -f dw-lists$(EXEEXT)
680 $(AM_V_CXXLD)$(CXXLINK) $(dw_lists_OBJECTS) $(dw_lists_LDADD) $(LIBS)
681
593 $(CXXLINK) $(dw_lists_OBJECTS) $(dw_lists_LDADD) $(LIBS)
682594 dw-resource-test$(EXEEXT): $(dw_resource_test_OBJECTS) $(dw_resource_test_DEPENDENCIES) $(EXTRA_dw_resource_test_DEPENDENCIES)
683595 @rm -f dw-resource-test$(EXEEXT)
684 $(AM_V_CXXLD)$(CXXLINK) $(dw_resource_test_OBJECTS) $(dw_resource_test_LDADD) $(LIBS)
685
596 $(CXXLINK) $(dw_resource_test_OBJECTS) $(dw_resource_test_LDADD) $(LIBS)
686597 dw-table$(EXEEXT): $(dw_table_OBJECTS) $(dw_table_DEPENDENCIES) $(EXTRA_dw_table_DEPENDENCIES)
687598 @rm -f dw-table$(EXEEXT)
688 $(AM_V_CXXLD)$(CXXLINK) $(dw_table_OBJECTS) $(dw_table_LDADD) $(LIBS)
689
599 $(CXXLINK) $(dw_table_OBJECTS) $(dw_table_LDADD) $(LIBS)
690600 dw-table-aligned$(EXEEXT): $(dw_table_aligned_OBJECTS) $(dw_table_aligned_DEPENDENCIES) $(EXTRA_dw_table_aligned_DEPENDENCIES)
691601 @rm -f dw-table-aligned$(EXEEXT)
692 $(AM_V_CXXLD)$(CXXLINK) $(dw_table_aligned_OBJECTS) $(dw_table_aligned_LDADD) $(LIBS)
693
602 $(CXXLINK) $(dw_table_aligned_OBJECTS) $(dw_table_aligned_LDADD) $(LIBS)
694603 dw-ui-test$(EXEEXT): $(dw_ui_test_OBJECTS) $(dw_ui_test_DEPENDENCIES) $(EXTRA_dw_ui_test_DEPENDENCIES)
695604 @rm -f dw-ui-test$(EXEEXT)
696 $(AM_V_CXXLD)$(CXXLINK) $(dw_ui_test_OBJECTS) $(dw_ui_test_LDADD) $(LIBS)
697
605 $(CXXLINK) $(dw_ui_test_OBJECTS) $(dw_ui_test_LDADD) $(LIBS)
698606 liang$(EXEEXT): $(liang_OBJECTS) $(liang_DEPENDENCIES) $(EXTRA_liang_DEPENDENCIES)
699607 @rm -f liang$(EXEEXT)
700 $(AM_V_CXXLD)$(CXXLINK) $(liang_OBJECTS) $(liang_LDADD) $(LIBS)
701
608 $(CXXLINK) $(liang_OBJECTS) $(liang_LDADD) $(LIBS)
702609 notsosimplevector$(EXEEXT): $(notsosimplevector_OBJECTS) $(notsosimplevector_DEPENDENCIES) $(EXTRA_notsosimplevector_DEPENDENCIES)
703610 @rm -f notsosimplevector$(EXEEXT)
704 $(AM_V_CXXLD)$(CXXLINK) $(notsosimplevector_OBJECTS) $(notsosimplevector_LDADD) $(LIBS)
705
611 $(CXXLINK) $(notsosimplevector_OBJECTS) $(notsosimplevector_LDADD) $(LIBS)
706612 shapes$(EXEEXT): $(shapes_OBJECTS) $(shapes_DEPENDENCIES) $(EXTRA_shapes_DEPENDENCIES)
707613 @rm -f shapes$(EXEEXT)
708 $(AM_V_CXXLD)$(CXXLINK) $(shapes_OBJECTS) $(shapes_LDADD) $(LIBS)
709
614 $(CXXLINK) $(shapes_OBJECTS) $(shapes_LDADD) $(LIBS)
710615 trie$(EXEEXT): $(trie_OBJECTS) $(trie_DEPENDENCIES) $(EXTRA_trie_DEPENDENCIES)
711616 @rm -f trie$(EXEEXT)
712 $(AM_V_CXXLD)$(CXXLINK) $(trie_OBJECTS) $(trie_LDADD) $(LIBS)
713
617 $(CXXLINK) $(trie_OBJECTS) $(trie_LDADD) $(LIBS)
714618 unicode-test$(EXEEXT): $(unicode_test_OBJECTS) $(unicode_test_DEPENDENCIES) $(EXTRA_unicode_test_DEPENDENCIES)
715619 @rm -f unicode-test$(EXEEXT)
716 $(AM_V_CXXLD)$(CXXLINK) $(unicode_test_OBJECTS) $(unicode_test_LDADD) $(LIBS)
620 $(CXXLINK) $(unicode_test_OBJECTS) $(unicode_test_LDADD) $(LIBS)
717621
718622 mostlyclean-compile:
719623 -rm -f *.$(OBJEXT)
747651 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unicode_test.Po@am__quote@
748652
749653 .c.o:
750 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
751 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
752 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
654 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
655 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
656 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
753657 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
754 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
658 @am__fastdepCC_FALSE@ $(COMPILE) -c $<
755659
756660 .c.obj:
757 @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
758 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
759 @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
661 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
662 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
663 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
760664 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
761 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
665 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
762666
763667 .cc.o:
764 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
765 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
766 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
668 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
669 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
670 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
767671 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
768 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
672 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
769673
770674 .cc.obj:
771 @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
772 @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
773 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
675 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
676 @am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
677 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
774678 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
775 @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
776
777 ID: $(am__tagged_files)
778 $(am__define_uniq_tagged_files); mkid -fID $$unique
779 tags: tags-am
780 TAGS: tags
781
782 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
679 @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
680
681 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
682 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
683 unique=`for i in $$list; do \
684 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
685 done | \
686 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
687 END { if (nonempty) { for (i in files) print i; }; }'`; \
688 mkid -fID $$unique
689 tags: TAGS
690
691 TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
692 $(TAGS_FILES) $(LISP)
783693 set x; \
784694 here=`pwd`; \
785 $(am__define_uniq_tagged_files); \
695 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
696 unique=`for i in $$list; do \
697 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
698 done | \
699 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
700 END { if (nonempty) { for (i in files) print i; }; }'`; \
786701 shift; \
787702 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
788703 test -n "$$unique" || unique=$$empty_fix; \
794709 $$unique; \
795710 fi; \
796711 fi
797 ctags: ctags-am
798
799 CTAGS: ctags
800 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
801 $(am__define_uniq_tagged_files); \
712 ctags: CTAGS
713 CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
714 $(TAGS_FILES) $(LISP)
715 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
716 unique=`for i in $$list; do \
717 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
718 done | \
719 $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
720 END { if (nonempty) { for (i in files) print i; }; }'`; \
802721 test -z "$(CTAGS_ARGS)$$unique" \
803722 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
804723 $$unique
807726 here=`$(am__cd) $(top_builddir) && pwd` \
808727 && $(am__cd) $(top_srcdir) \
809728 && gtags -i $(GTAGS_ARGS) "$$here"
810 cscopelist: cscopelist-am
811
812 cscopelist-am: $(am__tagged_files)
813 list='$(am__tagged_files)'; \
814 case "$(srcdir)" in \
815 [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
816 *) sdir=$(subdir)/$(srcdir) ;; \
817 esac; \
818 for i in $$list; do \
819 if test -f "$$i"; then \
820 echo "$(subdir)/$$i"; \
821 else \
822 echo "$$sdir/$$i"; \
823 fi; \
824 done >> $(top_builddir)/cscope.files
825729
826730 distclean-tags:
827731 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
961865
962866 .MAKE: install-am install-strip
963867
964 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
965 clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
966 distclean-compile distclean-generic distclean-tags distdir dvi \
967 dvi-am html html-am info info-am install install-am \
968 install-data install-data-am install-dvi install-dvi-am \
969 install-exec install-exec-am install-html install-html-am \
970 install-info install-info-am install-man install-pdf \
971 install-pdf-am install-ps install-ps-am install-strip \
972 installcheck installcheck-am installdirs maintainer-clean \
868 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
869 clean-noinstPROGRAMS ctags distclean distclean-compile \
870 distclean-generic distclean-tags distdir dvi dvi-am html \
871 html-am info info-am install install-am install-data \
872 install-data-am install-dvi install-dvi-am install-exec \
873 install-exec-am install-html install-html-am install-info \
874 install-info-am install-man install-pdf install-pdf-am \
875 install-ps install-ps-am install-strip installcheck \
876 installcheck-am installdirs maintainer-clean \
973877 maintainer-clean-generic mostlyclean mostlyclean-compile \
974 mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
878 mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
975879 uninstall-am
976880
977881
+11
-11
test/cookies.c less more
879879 path();
880880
881881 /* LEADING/TRAILING DOTS AND A LITTLE PUBLIC SUFFIX */
882 a_Cookies_set("name=val; domain=co.uk", "www.co.uk", "/", NULL);
883 expect(__LINE__, "", "http", "www.co.uk", "/");
884
885 a_Cookies_set("name=val; domain=.co.uk", "www.co.uk", "/", NULL);
886 expect(__LINE__, "", "http", "www.co.uk", "/");
887
888 a_Cookies_set("name=val; domain=co.uk.", "www.co.uk.", "/", NULL);
889 expect(__LINE__, "", "http", "www.co.uk.", "/");
890
891 a_Cookies_set("name=val; domain=.co.uk.", "www.co.uk.", "/", NULL);
892 expect(__LINE__, "", "http", ".www.co.uk.", "/");
882 a_Cookies_set("name=val; domain=co.il", "www.co.il", "/", NULL);
883 expect(__LINE__, "", "http", "www.co.il", "/");
884
885 a_Cookies_set("name=val; domain=.co.il", "www.co.il", "/", NULL);
886 expect(__LINE__, "", "http", "www.co.il", "/");
887
888 a_Cookies_set("name=val; domain=co.il.", "www.co.il.", "/", NULL);
889 expect(__LINE__, "", "http", "www.co.il.", "/");
890
891 a_Cookies_set("name=val; domain=.co.il.", "www.co.il.", "/", NULL);
892 expect(__LINE__, "", "http", ".www.co.il.", "/");
893893
894894 a_Cookies_set("name=val; domain=co.org", "www.co.org", "/", NULL);
895895 expect(__LINE__, "Cookie: name=val\r\n", "http", "www.co.org", "/");
+5
-3
test/dw_ui_test.cc less more
8080 // First of all, the resources. Later, they are embedded into the
8181 // widget tree.
8282 EntryResource *entryres1 =
83 layout->getResourceFactory()->createEntryResource (10, false, NULL);
83 layout->getResourceFactory()->createEntryResource (10, false, NULL,NULL);
8484 entryres1->setText ("Hi!");
8585 EntryResource *entryres2 =
86 layout->getResourceFactory()->createEntryResource (10, true, NULL);
86 layout->getResourceFactory()->createEntryResource (10, true, NULL,
87 "password field!");
8788 MultiLineTextResource *textres =
88 layout->getResourceFactory()->createMultiLineTextResource (15,3);
89 layout->getResourceFactory()->createMultiLineTextResource (15,3,
90 "textarea placeholder!");
8991 RadioButtonResource *radiores1 =
9092 layout->getResourceFactory()->createRadioButtonResource (NULL, false);
9193 RadioButtonResource *radiores2 =