1 diff -urN dillo-0.6.6/AUTHORS dillo2-0.6.6/AUTHORS
2 --- dillo-0.6.6/AUTHORS 2002-05-29 15:26:51.000000000 -0600
3 +++ dillo2-0.6.6/AUTHORS 2003-04-21 12:35:02.000000000 -0600
12 + * Andreas Schweitzer
14 _________________________________________________________________
16 diff -urN dillo-0.6.6/ChangeLog dillo2-0.6.6/ChangeLog
17 --- dillo-0.6.6/ChangeLog 2002-05-29 15:20:44.000000000 -0600
18 +++ dillo2-0.6.6/ChangeLog 2003-04-21 12:35:02.000000000 -0600
20 =============================================================================
23 +dillo-0.6.7 [?, 2002]
25 + - * Added code so that tooltips stay within the screen.
26 + Patch: Pekka Lampila, Sebastian Geerken
27 + - * Fixed a problem occurring when scrolling with the "b" key.
28 + Patch: Livio Baldini
29 + - * Fixed a memory leak in DwAlignedPage.
30 + Patch: Jörgen Viksell, Sebastian Geerken
31 + - * Fixed a bug in DwPage ("height" argument).
32 + Patch: Pekka Lampila
33 + - * Removed space around tables.
34 + * Implemented the <button> tag! (BUG#276)
35 + Patches: Sebastian Geerken
36 + - * Added support for <input type=image...> (BUG#313)
37 + Patch: Madis Janson, Sebastian Geerken, Jorge Arellano
38 + - * Made a better EAGAIN handler, and enabled FreeIOVec operation in IOWrite.
39 + Patch: Jorge Arellano, Livio Baldini
40 + - * Avoided a file lock when cookiesrc disables cookies (BUG#358).
41 + Patch: Jorge Arellano
44 dillo-0.6.6 [May 30, 2002]
46 - * Added a few canonical casts to fix some obvious 64bit issues.
47 diff -urN dillo-0.6.6/ChangeLog.old dillo2-0.6.6/ChangeLog.old
48 --- dillo-0.6.6/ChangeLog.old 2000-08-30 10:17:58.000000000 -0600
49 +++ dillo2-0.6.6/ChangeLog.old 1969-12-31 17:00:00.000000000 -0700
52 -This is the Changelog file that existed before Dillo began.
55 -===========================================================================
58 -Wed 28 Oct 1999 Christopher Reid Palmer <chrisp@innerfireworks.com>
60 - * support for arrow keys
66 - * URL sub-tree cleanups and speed-ups
70 - * menu hotkeys, menu pulloffs and Location pull-off
71 - * file:/ URL bugfix, for larger than 12 char names
74 - * fix to cursor change
76 -Fri Jul 23 22:12:14 1999 ObiTuarY <obituary@freshmeat.net>
78 - * *.*: Upgraded to autoconf 2.13 and automake 1.4. Reorganization
80 - * src/interface.{c,h}: Added pixmaps for the buttons. Removed the
81 - open button. Doesn't it feel redundant with the location text entry
83 - * src/pixmaps.h: New file holding the pixmaps.
85 -0.2.0 17-18 Jul 1999 Christopher Reid Palmer <chrisp@innerFireWorks.com>
86 - * Restructured menus, beginning to implement functionality of new menu items.
87 - * Closed hole for when ~/.gzilla exists but is not a dir.
88 - * Poked at bookmarks.
92 -===========================================================================
96 -Mon Dec 21 00:07:36 1998 Raph Levien <raph@gimp.org>
98 - * gzilladns.c: fixed a bug (adding the input handler more
99 - than once) that got triggered in Gtk 1.1.x.
100 - * gzillageturl.c: added an "about:" mechanism with simple
101 - redirects. This is 0.1.7.
103 -Sun Dec 20 22:25:17 1998 Raph Levien <raph@gimp.org>
105 - * Accelerator group code so that it now compiles with both
106 - Gtk 1.0.x and 1.1.x
107 - * Added directory scanning support to gzilla_file (thanks to Jim
110 -0.1.5 (2 Jan 1998 RLL)
111 - * Finished moving junk out of bytesink (mostly into linkblock).
112 - Now, the former abstraction is lean and mean, and the latter
114 - * Tried to hook up most of the abort/destroy logic, so it should
115 - leak a lot less memory now.
116 - * I'm moving images from gtk_preview to gzw_image as well.
118 -0.1.4 (26 Nov 1997 RLL)
119 - * Pages > 32kpixels actually scroll now.
120 - * Pretty significant rework of the whole abort architecture (see
121 - abort.html for more details). Also separated out some of the
122 - web-specific stuff in bytesink to linkblock.
123 - * It seems relatively stable now, but it's nowhere near freeing
124 - all of the memory it allocates.
127 - * Switched page widget from gtk to gzw.
128 - * Significant enhancements in functionality and stability.
131 - * Major change is reorganization of network code - all fetches now
132 - go through gzilla_url_get.
134 - * Aborts (i.e. the implementation of the Stop button) are now
135 - handled by a new bytesink signal ("abort"). The abort logic has
136 - been partially upgraded to handle multiple windows - now,
137 - gzilla_bw_abort_all aborts all bytesinks in a window.
140 diff -urN dillo-0.6.6/Makefile dillo2-0.6.6/Makefile
141 --- dillo-0.6.6/Makefile 1969-12-31 17:00:00.000000000 -0700
142 +++ dillo2-0.6.6/Makefile 2003-04-21 14:26:43.000000000 -0600
144 +# Makefile.in generated by automake 1.6.3 from Makefile.am.
145 +# Makefile. Generated from Makefile.in by configure.
147 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
148 +# Free Software Foundation, Inc.
149 +# This Makefile.in is free software; the Free Software Foundation
150 +# gives unlimited permission to copy and/or distribute it,
151 +# with or without modifications, as long as this notice is preserved.
153 +# This program is distributed in the hope that it will be useful,
154 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
155 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
156 +# PARTICULAR PURPOSE.
165 +exec_prefix = ${prefix}
167 +bindir = ${exec_prefix}/bin
168 +sbindir = ${exec_prefix}/sbin
169 +libexecdir = ${exec_prefix}/libexec
170 +datadir = ${prefix}/share
171 +sysconfdir = ${prefix}/etc
172 +sharedstatedir = ${prefix}/com
173 +localstatedir = ${prefix}/var
174 +libdir = ${exec_prefix}/lib
175 +infodir = ${prefix}/info
176 +mandir = ${prefix}/man
177 +includedir = ${prefix}/include
178 +oldincludedir = /usr/include
179 +pkgdatadir = $(datadir)/dillo
180 +pkglibdir = $(libdir)/dillo
181 +pkgincludedir = $(includedir)/dillo
184 +ACLOCAL = aclocal-1.6
186 +AUTOMAKE = automake-1.6
187 +AUTOHEADER = autoheader
189 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
190 +INSTALL = /usr/bin/install -c
191 +INSTALL_PROGRAM = ${INSTALL}
192 +INSTALL_DATA = ${INSTALL} -m 644
193 +install_sh_DATA = $(install_sh) -c -m 644
194 +install_sh_PROGRAM = $(install_sh) -c
195 +install_sh_SCRIPT = $(install_sh) -c
196 +INSTALL_SCRIPT = ${INSTALL}
197 +INSTALL_HEADER = $(INSTALL_DATA)
202 +NORMAL_UNINSTALL = :
213 +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
214 +LIBJPEG_LIB = -ljpeg
216 +PKG_CONFIG = /usr/bin/pkg-config
220 +am__include = include
222 +install_sh = /home/pb/dillo2/install-sh
226 +EXTRA_DIST = ChangeLog.old dillorc
228 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
229 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
230 +CONFIG_HEADER = config.h
231 +CONFIG_CLEAN_FILES =
234 +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
235 + uninstall-info-recursive all-recursive install-data-recursive \
236 + install-exec-recursive installdirs-recursive install-recursive \
237 + uninstall-recursive check-recursive installcheck-recursive
238 +DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
239 + Makefile.in NEWS aclocal.m4 config.h.in configure configure.in \
240 + depcomp install-sh missing mkinstalldirs
241 +DIST_SUBDIRS = $(SUBDIRS)
243 + $(MAKE) $(AM_MAKEFLAGS) all-recursive
247 +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
249 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
250 + cd $(top_srcdir) && \
251 + $(AUTOMAKE) --gnu Makefile
252 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
253 + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
255 +$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
256 + $(SHELL) ./config.status --recheck
257 +$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
258 + cd $(srcdir) && $(AUTOCONF)
260 +$(ACLOCAL_M4): configure.in
261 + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
264 + @if test ! -f $@; then \
266 + $(MAKE) stamp-h1; \
269 +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
271 + cd $(top_builddir) && $(SHELL) ./config.status config.h
273 +$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
274 + cd $(top_srcdir) && $(AUTOHEADER)
275 + touch $(srcdir)/config.h.in
278 + -rm -f config.h stamp-h1
281 +# This directory's subdirectories are mostly independent; you can cd
282 +# into them and run `make' without going through this Makefile.
283 +# To change the values of `make' variables: instead of editing Makefiles,
284 +# (1) if the variable is set in `config.status', edit `config.status'
285 +# (which will cause the Makefiles to be regenerated when you run `make');
286 +# (2) otherwise, pass the desired values on the `make' command line.
287 +$(RECURSIVE_TARGETS):
288 + @set fnord $$MAKEFLAGS; amf=$$2; \
290 + target=`echo $@ | sed s/-recursive//`; \
291 + list='$(SUBDIRS)'; for subdir in $$list; do \
292 + echo "Making $$target in $$subdir"; \
293 + if test "$$subdir" = "."; then \
295 + local_target="$$target-am"; \
297 + local_target="$$target"; \
299 + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
300 + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
302 + if test "$$dot_seen" = "no"; then \
303 + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
304 + fi; test -z "$$fail"
306 +mostlyclean-recursive clean-recursive distclean-recursive \
307 +maintainer-clean-recursive:
308 + @set fnord $$MAKEFLAGS; amf=$$2; \
311 + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
312 + *) list='$(SUBDIRS)' ;; \
314 + rev=''; for subdir in $$list; do \
315 + if test "$$subdir" = "."; then :; else \
316 + rev="$$subdir $$rev"; \
320 + target=`echo $@ | sed s/-recursive//`; \
321 + for subdir in $$rev; do \
322 + echo "Making $$target in $$subdir"; \
323 + if test "$$subdir" = "."; then \
324 + local_target="$$target-am"; \
326 + local_target="$$target"; \
328 + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
329 + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
330 + done && test -z "$$fail"
332 + list='$(SUBDIRS)'; for subdir in $$list; do \
333 + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
341 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
342 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
343 + unique=`for i in $$list; do \
344 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
346 + $(AWK) ' { files[$$0] = 1; } \
347 + END { for (i in files) print i; }'`; \
350 +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
351 + $(TAGS_FILES) $(LISP)
354 + list='$(SUBDIRS)'; for subdir in $$list; do \
355 + if test "$$subdir" = .; then :; else \
356 + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
359 + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
360 + unique=`for i in $$list; do \
361 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
363 + $(AWK) ' { files[$$0] = 1; } \
364 + END { for (i in files) print i; }'`; \
365 + test -z "$(ETAGS_ARGS)$$tags$$unique" \
366 + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
370 + here=`$(am__cd) $(top_builddir) && pwd` \
371 + && cd $(top_srcdir) \
372 + && gtags -i $(GTAGS_ARGS) $$here
375 + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
376 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
379 +distdir = $(PACKAGE)-$(VERSION)
381 +am__remove_distdir = \
382 + { test ! -d $(distdir) \
383 + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
384 + && rm -fr $(distdir); }; }
387 +distcleancheck_listfiles = find . -type f -print
389 +distdir: $(DISTFILES)
390 + $(am__remove_distdir)
392 + @list='$(DISTFILES)'; for file in $$list; do \
393 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
394 + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
395 + if test "$$dir" != "$$file" && test "$$dir" != "."; then \
397 + $(mkinstalldirs) "$(distdir)$$dir"; \
401 + if test -d $$d/$$file; then \
402 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
403 + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
405 + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
407 + test -f $(distdir)/$$file \
408 + || cp -p $$d/$$file $(distdir)/$$file \
412 + list='$(SUBDIRS)'; for subdir in $$list; do \
413 + if test "$$subdir" = .; then :; else \
414 + test -d $(distdir)/$$subdir \
415 + || mkdir $(distdir)/$$subdir \
418 + $(MAKE) $(AM_MAKEFLAGS) \
419 + top_distdir="$(top_distdir)" \
420 + distdir=../$(distdir)/$$subdir \
425 + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
426 + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
427 + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
428 + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
429 + || chmod -R a+r $(distdir)
431 + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
432 + $(am__remove_distdir)
434 +dist dist-all: distdir
435 + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
436 + $(am__remove_distdir)
438 +# This target untars the dist file and tries a VPATH configuration. Then
439 +# it guarantees that the distribution is self-contained by making another
442 + $(am__remove_distdir)
443 + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
444 + chmod -R a-w $(distdir); chmod a+w $(distdir)
445 + mkdir $(distdir)/=build
446 + mkdir $(distdir)/=inst
447 + chmod a-w $(distdir)
448 + dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
449 + && cd $(distdir)/=build \
450 + && ../configure --srcdir=.. --prefix=$$dc_install_base \
451 + $(DISTCHECK_CONFIGURE_FLAGS) \
452 + && $(MAKE) $(AM_MAKEFLAGS) \
453 + && $(MAKE) $(AM_MAKEFLAGS) dvi \
454 + && $(MAKE) $(AM_MAKEFLAGS) check \
455 + && $(MAKE) $(AM_MAKEFLAGS) install \
456 + && $(MAKE) $(AM_MAKEFLAGS) installcheck \
457 + && $(MAKE) $(AM_MAKEFLAGS) uninstall \
458 + && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
459 + || { echo "ERROR: files left after uninstall:" ; \
460 + find $$dc_install_base -type f -print ; \
462 + && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
463 + && rm -f $(distdir).tar.gz \
464 + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
465 + $(am__remove_distdir)
466 + @echo "$(distdir).tar.gz is ready for distribution" | \
467 + sed 'h;s/./=/g;p;x;p;x'
468 +distcleancheck: distclean
469 + if test '$(srcdir)' = . ; then \
470 + echo "ERROR: distcleancheck can only run from a VPATH build" ; \
473 + test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
474 + || { echo "ERROR: files left after distclean:" ; \
475 + $(distcleancheck_listfiles) ; \
478 +check: check-recursive
479 +all-am: Makefile config.h
480 +installdirs: installdirs-recursive
483 +install: install-recursive
484 +install-exec: install-exec-recursive
485 +install-data: install-data-recursive
486 +uninstall: uninstall-recursive
489 + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
491 +installcheck: installcheck-recursive
493 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
494 + INSTALL_STRIP_FLAG=-s \
495 + `test -z '$(STRIP)' || \
496 + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
497 +mostlyclean-generic:
502 + -rm -f Makefile $(CONFIG_CLEAN_FILES)
504 +maintainer-clean-generic:
505 + @echo "This command is intended for maintainers to use"
506 + @echo "it deletes files that may require special tools to rebuild."
507 +clean: clean-recursive
509 +clean-am: clean-generic mostlyclean-am
511 +distclean: distclean-recursive
512 + -rm -f $(am__CONFIG_DISTCLEAN_FILES)
513 +distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
519 +info: info-recursive
523 +install-data-am: install-data-local
527 +install-info: install-info-recursive
533 +maintainer-clean: maintainer-clean-recursive
534 + -rm -f $(am__CONFIG_DISTCLEAN_FILES)
535 + -rm -rf autom4te.cache
536 +maintainer-clean-am: distclean-am maintainer-clean-generic
538 +mostlyclean: mostlyclean-recursive
540 +mostlyclean-am: mostlyclean-generic
542 +uninstall-am: uninstall-info-am uninstall-local
544 +uninstall-info: uninstall-info-recursive
546 +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
547 + clean-generic clean-recursive dist dist-all dist-gzip distcheck \
548 + distclean distclean-generic distclean-hdr distclean-recursive \
549 + distclean-tags distcleancheck distdir dvi dvi-am dvi-recursive \
550 + info info-am info-recursive install install-am install-data \
551 + install-data-am install-data-local install-data-recursive \
552 + install-exec install-exec-am install-exec-recursive \
553 + install-info install-info-am install-info-recursive install-man \
554 + install-recursive install-strip installcheck installcheck-am \
555 + installdirs installdirs-am installdirs-recursive \
556 + maintainer-clean maintainer-clean-generic \
557 + maintainer-clean-recursive mostlyclean mostlyclean-generic \
558 + mostlyclean-recursive tags tags-recursive uninstall \
559 + uninstall-am uninstall-info-am uninstall-info-recursive \
560 + uninstall-local uninstall-recursive
563 +install-data-local: dillorc
564 + -if [ -d $(DESTDIR)$(sysconfdir) ]; then \
565 + $(INSTALL_DATA) --backup=t $(srcdir)/dillorc $(DESTDIR)$(sysconfdir)/; \
566 + elif [ -d /etc/ ]; then \
567 + $(INSTALL_DATA) --backup=t $(srcdir)/dillorc /etc/; \
571 + -if [ -d $(DESTDIR)$(sysconfdir) ]; then \
572 + rm -f $(DESTDIR)$(sysconfdir)/dillorc*; \
573 + elif [ -d /etc/ ]; then \
574 + rm -f /etc/dillorc*
576 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
577 +# Otherwise a system limit (for SysV at least) may be exceeded.
579 diff -urN dillo-0.6.6/Makefile.am dillo2-0.6.6/Makefile.am
580 --- dillo-0.6.6/Makefile.am 2002-02-14 06:48:46.000000000 -0700
581 +++ dillo2-0.6.6/Makefile.am 2003-04-21 12:35:04.000000000 -0600
585 -EXTRA_DIST = ChangeLog dillorc
586 +EXTRA_DIST = ChangeLog.old dillorc
588 install-data-local: dillorc
589 -if [ -d $(DESTDIR)$(sysconfdir) ]; then \
590 diff -urN dillo-0.6.6/Makefile.in dillo2-0.6.6/Makefile.in
591 --- dillo-0.6.6/Makefile.in 2002-05-29 15:02:18.000000000 -0600
592 +++ dillo2-0.6.6/Makefile.in 2003-04-21 14:25:02.000000000 -0600
594 -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
595 +# Makefile.in generated by automake 1.6.3 from Makefile.am.
598 -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
599 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
600 +# Free Software Foundation, Inc.
601 # This Makefile.in is free software; the Free Software Foundation
602 # gives unlimited permission to copy and/or distribute it,
603 # with or without modifications, as long as this notice is preserved.
605 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
606 # PARTICULAR PURPOSE.
615 includedir = @includedir@
616 oldincludedir = /usr/include
620 pkgdatadir = $(datadir)/@PACKAGE@
621 pkglibdir = $(libdir)/@PACKAGE@
622 pkgincludedir = $(includedir)/@PACKAGE@
628 AUTOMAKE = @AUTOMAKE@
629 AUTOHEADER = @AUTOHEADER@
631 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
633 -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
634 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
635 INSTALL_DATA = @INSTALL_DATA@
636 +install_sh_DATA = $(install_sh) -c -m 644
637 +install_sh_PROGRAM = $(install_sh) -c
638 +install_sh_SCRIPT = $(install_sh) -c
639 INSTALL_SCRIPT = @INSTALL_SCRIPT@
640 +INSTALL_HEADER = $(INSTALL_DATA)
641 transform = @program_transform_name@
652 +PATH_SEPARATOR = @PATH_SEPARATOR@
656 -GTK_CFLAGS = @GTK_CFLAGS@
657 -GTK_CONFIG = @GTK_CONFIG@
658 -GTK_LIBS = @GTK_LIBS@
660 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
661 LIBJPEG_LIB = @LIBJPEG_LIB@
662 -MAKEINFO = @MAKEINFO@
664 +PKG_CONFIG = @PKG_CONFIG@
669 +am__include = @am__include@
670 +am__quote = @am__quote@
671 +install_sh = @install_sh@
676 -EXTRA_DIST = ChangeLog dillorc
677 +EXTRA_DIST = ChangeLog.old dillorc
679 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
680 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
681 CONFIG_HEADER = config.h
682 -CONFIG_CLEAN_FILES =
683 -DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
684 -Makefile.am Makefile.in NEWS aclocal.m4 config.h.in configure \
685 -configure.in install-sh missing mkinstalldirs
687 +CONFIG_CLEAN_FILES =
690 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
691 +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
692 + uninstall-info-recursive all-recursive install-data-recursive \
693 + install-exec-recursive installdirs-recursive install-recursive \
694 + uninstall-recursive check-recursive installcheck-recursive
695 +DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
696 + Makefile.in NEWS aclocal.m4 config.h.in configure configure.in \
697 + depcomp install-sh missing mkinstalldirs
698 +DIST_SUBDIRS = $(SUBDIRS)
700 + $(MAKE) $(AM_MAKEFLAGS) all-recursive
706 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
707 - cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
709 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
710 - cd $(top_builddir) \
711 - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
712 +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
714 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
715 + cd $(top_srcdir) && \
716 + $(AUTOMAKE) --gnu Makefile
717 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
718 + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
720 -$(ACLOCAL_M4): configure.in
721 - cd $(srcdir) && $(ACLOCAL)
723 -config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
724 +$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
725 $(SHELL) ./config.status --recheck
726 -$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
727 +$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
728 cd $(srcdir) && $(AUTOCONF)
731 - @if test ! -f $@; then \
735 -stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
736 - cd $(top_builddir) \
737 - && CONFIG_FILES= CONFIG_HEADERS=config.h \
738 - $(SHELL) ./config.status
739 - @echo timestamp > stamp-h 2> /dev/null
740 -$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
741 +$(ACLOCAL_M4): configure.in
742 + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
745 @if test ! -f $@; then \
746 - rm -f $(srcdir)/stamp-h.in; \
747 - $(MAKE) $(srcdir)/stamp-h.in; \
749 + $(MAKE) stamp-h1; \
751 -$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
752 - cd $(top_srcdir) && $(AUTOHEADER)
753 - @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
756 +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
758 + cd $(top_builddir) && $(SHELL) ./config.status config.h
761 +$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
762 + cd $(top_srcdir) && $(AUTOHEADER)
763 + touch $(srcdir)/config.h.in
768 -maintainer-clean-hdr:
769 + -rm -f config.h stamp-h1
772 # This directory's subdirectories are mostly independent; you can cd
773 # into them and run `make' without going through this Makefile.
775 # (1) if the variable is set in `config.status', edit `config.status'
776 # (which will cause the Makefiles to be regenerated when you run `make');
777 # (2) otherwise, pass the desired values on the `make' command line.
781 -all-recursive install-data-recursive install-exec-recursive \
782 -installdirs-recursive install-recursive uninstall-recursive \
783 -check-recursive installcheck-recursive info-recursive dvi-recursive:
784 - @set fnord $(MAKEFLAGS); amf=$$2; \
785 +$(RECURSIVE_TARGETS):
786 + @set fnord $$MAKEFLAGS; amf=$$2; \
788 target=`echo $@ | sed s/-recursive//`; \
789 list='$(SUBDIRS)'; for subdir in $$list; do \
790 @@ -162,13 +162,18 @@
792 mostlyclean-recursive clean-recursive distclean-recursive \
793 maintainer-clean-recursive:
794 - @set fnord $(MAKEFLAGS); amf=$$2; \
795 + @set fnord $$MAKEFLAGS; amf=$$2; \
797 - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
798 - rev="$$subdir $$rev"; \
799 - test "$$subdir" = "." && dot_seen=yes; \
801 + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
802 + *) list='$(SUBDIRS)' ;; \
804 + rev=''; for subdir in $$list; do \
805 + if test "$$subdir" = "."; then :; else \
806 + rev="$$subdir $$rev"; \
809 - test "$$dot_seen" = "no" && rev=". $$rev"; \
811 target=`echo $@ | sed s/-recursive//`; \
812 for subdir in $$rev; do \
813 echo "Making $$target in $$subdir"; \
814 @@ -185,176 +190,231 @@
815 test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
823 -ID: $(HEADERS) $(SOURCES) $(LISP)
824 - list='$(SOURCES) $(HEADERS)'; \
825 - unique=`for i in $$list; do echo $$i; done | \
826 - awk ' { files[$$0] = 1; } \
827 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
828 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
829 + unique=`for i in $$list; do \
830 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
832 + $(AWK) ' { files[$$0] = 1; } \
833 END { for (i in files) print i; }'`; \
834 - here=`pwd` && cd $(srcdir) \
835 - && mkid -f$$here/ID $$unique $(LISP)
838 -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
839 +TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
840 + $(TAGS_FILES) $(LISP)
843 list='$(SUBDIRS)'; for subdir in $$list; do \
844 - if test "$$subdir" = .; then :; else \
845 + if test "$$subdir" = .; then :; else \
846 test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
850 - list='$(SOURCES) $(HEADERS)'; \
851 - unique=`for i in $$list; do echo $$i; done | \
852 - awk ' { files[$$0] = 1; } \
853 + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
854 + unique=`for i in $$list; do \
855 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
857 + $(AWK) ' { files[$$0] = 1; } \
858 END { for (i in files) print i; }'`; \
859 - test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
860 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
865 + test -z "$(ETAGS_ARGS)$$tags$$unique" \
866 + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
870 + here=`$(am__cd) $(top_builddir) && pwd` \
871 + && cd $(top_srcdir) \
872 + && gtags -i $(GTAGS_ARGS) $$here
877 -maintainer-clean-tags:
878 + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
879 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
882 distdir = $(PACKAGE)-$(VERSION)
883 -top_distdir = $(distdir)
885 -# This target untars the dist file and tries a VPATH configuration. Then
886 -# it guarantees that the distribution is self-contained by making another
890 - GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
891 - mkdir $(distdir)/=build
892 - mkdir $(distdir)/=inst
893 - dc_install_base=`cd $(distdir)/=inst && pwd`; \
894 - cd $(distdir)/=build \
895 - && ../configure --srcdir=.. --prefix=$$dc_install_base \
896 - && $(MAKE) $(AM_MAKEFLAGS) \
897 - && $(MAKE) $(AM_MAKEFLAGS) dvi \
898 - && $(MAKE) $(AM_MAKEFLAGS) check \
899 - && $(MAKE) $(AM_MAKEFLAGS) install \
900 - && $(MAKE) $(AM_MAKEFLAGS) installcheck \
901 - && $(MAKE) $(AM_MAKEFLAGS) dist
903 - @banner="$(distdir).tar.gz is ready for distribution"; \
904 - dashes=`echo "$$banner" | sed s/./=/g`; \
909 - -chmod -R a+r $(distdir)
910 - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
913 - -chmod -R a+r $(distdir)
914 - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
916 +am__remove_distdir = \
917 + { test ! -d $(distdir) \
918 + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
919 + && rm -fr $(distdir); }; }
922 +distcleancheck_listfiles = find . -type f -print
924 distdir: $(DISTFILES)
926 + $(am__remove_distdir)
928 - -chmod 777 $(distdir)
929 - here=`cd $(top_builddir) && pwd`; \
930 - top_distdir=`cd $(distdir) && pwd`; \
931 - distdir=`cd $(distdir) && pwd`; \
933 - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
934 - @for file in $(DISTFILES); do \
936 + @list='$(DISTFILES)'; for file in $$list; do \
937 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
938 + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
939 + if test "$$dir" != "$$file" && test "$$dir" != "."; then \
941 + $(mkinstalldirs) "$(distdir)$$dir"; \
945 if test -d $$d/$$file; then \
946 - cp -pr $$d/$$file $(distdir)/$$file; \
947 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
948 + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
950 + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
952 test -f $(distdir)/$$file \
953 - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
954 - || cp -p $$d/$$file $(distdir)/$$file || :; \
955 + || cp -p $$d/$$file $(distdir)/$$file \
959 - for subdir in $(SUBDIRS); do \
960 + list='$(SUBDIRS)'; for subdir in $$list; do \
961 if test "$$subdir" = .; then :; else \
962 test -d $(distdir)/$$subdir \
963 || mkdir $(distdir)/$$subdir \
965 - chmod 777 $(distdir)/$$subdir; \
966 - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
968 + $(MAKE) $(AM_MAKEFLAGS) \
969 + top_distdir="$(top_distdir)" \
970 + distdir=../$(distdir)/$$subdir \
976 -info: info-recursive
979 + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
980 + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
981 + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
982 + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
983 + || chmod -R a+r $(distdir)
985 + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
986 + $(am__remove_distdir)
988 +dist dist-all: distdir
989 + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
990 + $(am__remove_distdir)
992 +# This target untars the dist file and tries a VPATH configuration. Then
993 +# it guarantees that the distribution is self-contained by making another
996 + $(am__remove_distdir)
997 + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
998 + chmod -R a-w $(distdir); chmod a+w $(distdir)
999 + mkdir $(distdir)/=build
1000 + mkdir $(distdir)/=inst
1001 + chmod a-w $(distdir)
1002 + dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
1003 + && cd $(distdir)/=build \
1004 + && ../configure --srcdir=.. --prefix=$$dc_install_base \
1005 + $(DISTCHECK_CONFIGURE_FLAGS) \
1006 + && $(MAKE) $(AM_MAKEFLAGS) \
1007 + && $(MAKE) $(AM_MAKEFLAGS) dvi \
1008 + && $(MAKE) $(AM_MAKEFLAGS) check \
1009 + && $(MAKE) $(AM_MAKEFLAGS) install \
1010 + && $(MAKE) $(AM_MAKEFLAGS) installcheck \
1011 + && $(MAKE) $(AM_MAKEFLAGS) uninstall \
1012 + && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
1013 + || { echo "ERROR: files left after uninstall:" ; \
1014 + find $$dc_install_base -type f -print ; \
1016 + && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
1017 + && rm -f $(distdir).tar.gz \
1018 + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
1019 + $(am__remove_distdir)
1020 + @echo "$(distdir).tar.gz is ready for distribution" | \
1021 + sed 'h;s/./=/g;p;x;p;x'
1022 +distcleancheck: distclean
1023 + if test '$(srcdir)' = . ; then \
1024 + echo "ERROR: distcleancheck can only run from a VPATH build" ; \
1027 + test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
1028 + || { echo "ERROR: files left after distclean:" ; \
1029 + $(distcleancheck_listfiles) ; \
1032 check: check-recursive
1034 -installcheck: installcheck-recursive
1035 -all-recursive-am: config.h
1036 - $(MAKE) $(AM_MAKEFLAGS) all-recursive
1037 +all-am: Makefile config.h
1038 +installdirs: installdirs-recursive
1042 +install: install-recursive
1043 install-exec: install-exec-recursive
1045 -install-data-am: install-data-local
1046 install-data: install-data-recursive
1047 +uninstall: uninstall-recursive
1050 @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
1051 -install: install-recursive
1052 -uninstall-am: uninstall-local
1053 -uninstall: uninstall-recursive
1054 -all-am: Makefile config.h
1055 -all-redirect: all-recursive-am
1057 - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
1058 -installdirs: installdirs-recursive
1062 +installcheck: installcheck-recursive
1064 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1065 + INSTALL_STRIP_FLAG=-s \
1066 + `test -z '$(STRIP)' || \
1067 + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
1068 mostlyclean-generic:
1073 -rm -f Makefile $(CONFIG_CLEAN_FILES)
1074 - -rm -f config.cache config.log stamp-h stamp-h[0-9]*
1076 maintainer-clean-generic:
1077 -mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
1078 + @echo "This command is intended for maintainers to use"
1079 + @echo "it deletes files that may require special tools to rebuild."
1080 +clean: clean-recursive
1082 -mostlyclean: mostlyclean-recursive
1083 +clean-am: clean-generic mostlyclean-am
1085 -clean-am: clean-hdr clean-tags clean-generic mostlyclean-am
1086 +distclean: distclean-recursive
1087 + -rm -f $(am__CONFIG_DISTCLEAN_FILES)
1088 +distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
1090 -clean: clean-recursive
1093 -distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
1096 -distclean: distclean-recursive
1097 - -rm -f config.status
1098 +info: info-recursive
1100 -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
1101 - maintainer-clean-generic distclean-am
1102 - @echo "This command is intended for maintainers to use;"
1103 - @echo "it deletes files that may require special tools to rebuild."
1106 +install-data-am: install-data-local
1110 +install-info: install-info-recursive
1116 maintainer-clean: maintainer-clean-recursive
1117 - -rm -f config.status
1118 + -rm -f $(am__CONFIG_DISTCLEAN_FILES)
1119 + -rm -rf autom4te.cache
1120 +maintainer-clean-am: distclean-am maintainer-clean-generic
1122 +mostlyclean: mostlyclean-recursive
1124 +mostlyclean-am: mostlyclean-generic
1126 -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
1127 -install-data-recursive uninstall-data-recursive install-exec-recursive \
1128 -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
1129 -all-recursive check-recursive installcheck-recursive info-recursive \
1130 -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
1131 -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
1132 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
1133 -dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
1134 -install-exec-am install-exec install-data-local install-data-am \
1135 -install-data install-am install uninstall-local uninstall-am uninstall \
1136 -all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
1137 -distclean-generic clean-generic maintainer-clean-generic clean \
1138 -mostlyclean distclean maintainer-clean
1139 +uninstall-am: uninstall-info-am uninstall-local
1141 +uninstall-info: uninstall-info-recursive
1143 +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
1144 + clean-generic clean-recursive dist dist-all dist-gzip distcheck \
1145 + distclean distclean-generic distclean-hdr distclean-recursive \
1146 + distclean-tags distcleancheck distdir dvi dvi-am dvi-recursive \
1147 + info info-am info-recursive install install-am install-data \
1148 + install-data-am install-data-local install-data-recursive \
1149 + install-exec install-exec-am install-exec-recursive \
1150 + install-info install-info-am install-info-recursive install-man \
1151 + install-recursive install-strip installcheck installcheck-am \
1152 + installdirs installdirs-am installdirs-recursive \
1153 + maintainer-clean maintainer-clean-generic \
1154 + maintainer-clean-recursive mostlyclean mostlyclean-generic \
1155 + mostlyclean-recursive tags tags-recursive uninstall \
1156 + uninstall-am uninstall-info-am uninstall-info-recursive \
1157 + uninstall-local uninstall-recursive
1160 install-data-local: dillorc
1162 elif [ -d /etc/ ]; then \
1166 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1167 # Otherwise a system limit (for SysV at least) may be exceeded.
1169 diff -urN dillo-0.6.6/aclocal.m4 dillo2-0.6.6/aclocal.m4
1170 --- dillo-0.6.6/aclocal.m4 2002-05-29 15:02:15.000000000 -0600
1171 +++ dillo2-0.6.6/aclocal.m4 2003-04-21 14:24:42.000000000 -0600
1173 -dnl aclocal.m4 generated automatically by aclocal 1.4-p4
1174 +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
1176 -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
1177 -dnl This file is free software; the Free Software Foundation
1178 -dnl gives unlimited permission to copy and/or distribute it,
1179 -dnl with or without modifications, as long as this notice is preserved.
1181 -dnl This program is distributed in the hope that it will be useful,
1182 -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
1183 -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1184 -dnl PARTICULAR PURPOSE.
1186 -# Do all the work for Automake. This macro actually does too much --
1187 -# some checks are only needed if your package does certain things.
1188 -# But this isn't really a big deal.
1189 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
1190 +# Free Software Foundation, Inc.
1191 +# This file is free software; the Free Software Foundation
1192 +# gives unlimited permission to copy and/or distribute it,
1193 +# with or without modifications, as long as this notice is preserved.
1195 +# This program is distributed in the hope that it will be useful,
1196 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
1197 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1198 +# PARTICULAR PURPOSE.
1200 +# Do all the work for Automake. -*- Autoconf -*-
1202 +# This macro actually does too much some checks are only needed if
1203 +# your package does certain things. But this isn't really a big deal.
1205 +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
1206 +# Free Software Foundation, Inc.
1208 +# This program is free software; you can redistribute it and/or modify
1209 +# it under the terms of the GNU General Public License as published by
1210 +# the Free Software Foundation; either version 2, or (at your option)
1211 +# any later version.
1213 +# This program is distributed in the hope that it will be useful,
1214 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1215 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1216 +# GNU General Public License for more details.
1218 +# You should have received a copy of the GNU General Public License
1219 +# along with this program; if not, write to the Free Software
1220 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1225 +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
1226 +# written in clear, in which case automake, when reading aclocal.m4,
1227 +# will think it sees a *use*, and therefore will trigger all it's
1228 +# C support machinery. Also note that it means that autoscan, seeing
1229 +# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
1234 +# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
1235 +# the ones we care about.
1236 +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
1238 +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
1239 +# AM_INIT_AUTOMAKE([OPTIONS])
1240 +# -----------------------------------------------
1241 +# The call with PACKAGE and VERSION arguments is the old style
1242 +# call (pre autoconf-2.50), which is being phased out. PACKAGE
1243 +# and VERSION should now be passed to AC_INIT and removed from
1244 +# the call to AM_INIT_AUTOMAKE.
1245 +# We support both call styles for the transition. After
1246 +# the next Automake release, Autoconf can make the AC_INIT
1247 +# arguments mandatory, and then we can depend on a new Autoconf
1248 +# release and drop the old call support.
1249 +AC_DEFUN([AM_INIT_AUTOMAKE],
1250 +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
1251 + AC_REQUIRE([AC_PROG_INSTALL])dnl
1252 +# test to see if srcdir already configured
1253 +if test "`cd $srcdir && pwd`" != "`pwd`" &&
1254 + test -f $srcdir/config.status; then
1255 + AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
1259 +# Define the identity of the package.
1260 +dnl Distinguish between old-style and new-style calls.
1262 +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
1263 + AC_SUBST([PACKAGE], [$1])dnl
1264 + AC_SUBST([VERSION], [$2])],
1265 +[_AM_SET_OPTIONS([$1])dnl
1266 + AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
1267 + AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
1269 +_AM_IF_OPTION([no-define],,
1270 +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
1271 + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
1273 +# Some tools Automake needs.
1274 +AC_REQUIRE([AM_SANITY_CHECK])dnl
1275 +AC_REQUIRE([AC_ARG_PROGRAM])dnl
1276 +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
1277 +AM_MISSING_PROG(AUTOCONF, autoconf)
1278 +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
1279 +AM_MISSING_PROG(AUTOHEADER, autoheader)
1280 +AM_MISSING_PROG(MAKEINFO, makeinfo)
1281 +AM_MISSING_PROG(AMTAR, tar)
1283 +AM_PROG_INSTALL_STRIP
1284 +# We need awk for the "check" target. The system "awk" is bad on
1286 +AC_REQUIRE([AC_PROG_AWK])dnl
1287 +AC_REQUIRE([AC_PROG_MAKE_SET])dnl
1289 +_AM_IF_OPTION([no-dependencies],,
1290 +[AC_PROVIDE_IFELSE([AC_PROG_][CC],
1291 + [_AM_DEPENDENCIES(CC)],
1292 + [define([AC_PROG_][CC],
1293 + defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
1294 +AC_PROVIDE_IFELSE([AC_PROG_][CXX],
1295 + [_AM_DEPENDENCIES(CXX)],
1296 + [define([AC_PROG_][CXX],
1297 + defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
1302 -dnl AM_INIT_AUTOMAKE(package,version, [no-define])
1303 +# Copyright 2002 Free Software Foundation, Inc.
1305 -AC_DEFUN(AM_INIT_AUTOMAKE,
1306 -[AC_REQUIRE([AC_PROG_INSTALL])
1311 -dnl test to see if srcdir already configured
1312 -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
1313 - AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
1316 -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
1317 -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
1318 -AC_REQUIRE([AM_SANITY_CHECK])
1319 -AC_REQUIRE([AC_ARG_PROGRAM])
1320 -dnl FIXME This is truly gross.
1321 -missing_dir=`cd $ac_aux_dir && pwd`
1322 -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
1323 -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
1324 -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
1325 -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
1326 -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
1327 -AC_REQUIRE([AC_PROG_MAKE_SET])])
1328 +# This program is free software; you can redistribute it and/or modify
1329 +# it under the terms of the GNU General Public License as published by
1330 +# the Free Software Foundation; either version 2, or (at your option)
1331 +# any later version.
1333 +# This program is distributed in the hope that it will be useful,
1334 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1335 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1336 +# GNU General Public License for more details.
1338 +# You should have received a copy of the GNU General Public License
1339 +# along with this program; if not, write to the Free Software
1340 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1342 +# AM_AUTOMAKE_VERSION(VERSION)
1343 +# ----------------------------
1344 +# Automake X.Y traces this macro to ensure aclocal.m4 has been
1345 +# generated from the m4 files accompanying Automake X.Y.
1346 +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
1348 +# AM_SET_CURRENT_AUTOMAKE_VERSION
1349 +# -------------------------------
1350 +# Call AM_AUTOMAKE_VERSION so it can be traced.
1351 +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
1352 +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
1353 + [AM_AUTOMAKE_VERSION([1.6.3])])
1355 +# Helper functions for option handling. -*- Autoconf -*-
1357 +# Copyright 2001, 2002 Free Software Foundation, Inc.
1359 +# This program is free software; you can redistribute it and/or modify
1360 +# it under the terms of the GNU General Public License as published by
1361 +# the Free Software Foundation; either version 2, or (at your option)
1362 +# any later version.
1364 +# This program is distributed in the hope that it will be useful,
1365 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1366 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1367 +# GNU General Public License for more details.
1369 +# You should have received a copy of the GNU General Public License
1370 +# along with this program; if not, write to the Free Software
1371 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1376 +# _AM_MANGLE_OPTION(NAME)
1377 +# -----------------------
1378 +AC_DEFUN([_AM_MANGLE_OPTION],
1379 +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
1381 +# _AM_SET_OPTION(NAME)
1382 +# ------------------------------
1383 +# Set option NAME. Presently that only means defining a flag for this option.
1384 +AC_DEFUN([_AM_SET_OPTION],
1385 +[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
1387 +# _AM_SET_OPTIONS(OPTIONS)
1388 +# ----------------------------------
1389 +# OPTIONS is a space-separated list of Automake options.
1390 +AC_DEFUN([_AM_SET_OPTIONS],
1391 +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
1393 +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
1394 +# -------------------------------------------
1395 +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
1396 +AC_DEFUN([_AM_IF_OPTION],
1397 +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
1400 # Check to make sure that the build environment is sane.
1403 -AC_DEFUN(AM_SANITY_CHECK,
1404 +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
1406 +# This program is free software; you can redistribute it and/or modify
1407 +# it under the terms of the GNU General Public License as published by
1408 +# the Free Software Foundation; either version 2, or (at your option)
1409 +# any later version.
1411 +# This program is distributed in the hope that it will be useful,
1412 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1413 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1414 +# GNU General Public License for more details.
1416 +# You should have received a copy of the GNU General Public License
1417 +# along with this program; if not, write to the Free Software
1418 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1425 +AC_DEFUN([AM_SANITY_CHECK],
1426 [AC_MSG_CHECKING([whether build environment is sane])
1429 -echo timestamp > conftestfile
1430 +echo timestamp > conftest.file
1431 # Do `set' in a subshell so we don't clobber the current shell's
1432 # arguments. Must try -L first in case configure is actually a
1433 # symlink; some systems play weird games with the mod time of symlinks
1434 # (eg FreeBSD returns the mod time of the symlink's containing
1437 - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
1438 - if test "[$]*" = "X"; then
1439 + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
1440 + if test "$[*]" = "X"; then
1442 - set X `ls -t $srcdir/configure conftestfile`
1443 + set X `ls -t $srcdir/configure conftest.file`
1445 - if test "[$]*" != "X $srcdir/configure conftestfile" \
1446 - && test "[$]*" != "X conftestfile $srcdir/configure"; then
1447 + rm -f conftest.file
1448 + if test "$[*]" != "X $srcdir/configure conftest.file" \
1449 + && test "$[*]" != "X conftest.file $srcdir/configure"; then
1451 # If neither matched, then we have a broken ls. This can happen
1452 # if, for instance, CONFIG_SHELL is bash and it inherits a
1454 alias in your environment])
1457 - test "[$]2" = conftestfile
1458 + test "$[2]" = conftest.file
1462 @@ -83,48 +246,611 @@
1463 AC_MSG_ERROR([newly created file is older than distributed files!
1464 Check your system clock])
1467 AC_MSG_RESULT(yes)])
1469 -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
1470 -dnl The program must properly implement --version.
1471 -AC_DEFUN(AM_MISSING_PROG,
1472 -[AC_MSG_CHECKING(for working $2)
1473 -# Run test in a subshell; some versions of sh will print an error if
1474 -# an executable is not found, even if stderr is redirected.
1475 -# Redirect stdin to placate older versions of autoconf. Sigh.
1476 -if ($2 --version) < /dev/null > /dev/null 2>&1; then
1478 - AC_MSG_RESULT(found)
1482 +# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
1484 +# This program is free software; you can redistribute it and/or modify
1485 +# it under the terms of the GNU General Public License as published by
1486 +# the Free Software Foundation; either version 2, or (at your option)
1487 +# any later version.
1489 +# This program is distributed in the hope that it will be useful,
1490 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1491 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1492 +# GNU General Public License for more details.
1494 +# You should have received a copy of the GNU General Public License
1495 +# along with this program; if not, write to the Free Software
1496 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1501 +# AM_MISSING_PROG(NAME, PROGRAM)
1502 +# ------------------------------
1503 +AC_DEFUN([AM_MISSING_PROG],
1504 +[AC_REQUIRE([AM_MISSING_HAS_RUN])
1505 +$1=${$1-"${am_missing_run}$2"}
1509 +# AM_MISSING_HAS_RUN
1510 +# ------------------
1511 +# Define MISSING if not defined so far and test if it supports --run.
1512 +# If it does, set am_missing_run to use it, otherwise, to nothing.
1513 +AC_DEFUN([AM_MISSING_HAS_RUN],
1514 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1515 +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
1516 +# Use eval to expand $SHELL
1517 +if eval "$MISSING --run true"; then
1518 + am_missing_run="$MISSING --run "
1520 - $1="$3/missing $2"
1521 - AC_MSG_RESULT(missing)
1523 + AC_MSG_WARN([`missing' script is too old or missing])
1528 +# AM_AUX_DIR_EXPAND
1530 +# Copyright 2001 Free Software Foundation, Inc.
1532 +# This program is free software; you can redistribute it and/or modify
1533 +# it under the terms of the GNU General Public License as published by
1534 +# the Free Software Foundation; either version 2, or (at your option)
1535 +# any later version.
1537 +# This program is distributed in the hope that it will be useful,
1538 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1539 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1540 +# GNU General Public License for more details.
1542 +# You should have received a copy of the GNU General Public License
1543 +# along with this program; if not, write to the Free Software
1544 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1547 +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
1548 +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
1549 +# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
1551 +# Of course, Automake must honor this variable whenever it calls a
1552 +# tool from the auxiliary directory. The problem is that $srcdir (and
1553 +# therefore $ac_aux_dir as well) can be either absolute or relative,
1554 +# depending on how configure is run. This is pretty annoying, since
1555 +# it makes $ac_aux_dir quite unusable in subdirectories: in the top
1556 +# source directory, any form will work fine, but in subdirectories a
1557 +# relative path needs to be adjusted first.
1559 +# $ac_aux_dir/missing
1560 +# fails when called from a subdirectory if $ac_aux_dir is relative
1561 +# $top_srcdir/$ac_aux_dir/missing
1562 +# fails if $ac_aux_dir is absolute,
1563 +# fails when called from a subdirectory in a VPATH build with
1564 +# a relative $ac_aux_dir
1566 +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
1567 +# are both prefixed by $srcdir. In an in-source build this is usually
1568 +# harmless because $srcdir is `.', but things will broke when you
1569 +# start a VPATH build or use an absolute $srcdir.
1571 +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
1572 +# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
1573 +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
1574 +# and then we would define $MISSING as
1575 +# MISSING="\${SHELL} $am_aux_dir/missing"
1576 +# This will work as long as MISSING is not called from configure, because
1577 +# unfortunately $(top_srcdir) has no meaning in configure.
1578 +# However there are other variables, like CC, which are often used in
1579 +# configure, and could therefore not use this "fixed" $ac_aux_dir.
1581 +# Another solution, used here, is to always expand $ac_aux_dir to an
1582 +# absolute PATH. The drawback is that using absolute paths prevent a
1583 +# configured tree to be moved without reconfiguration.
1585 +# Rely on autoconf to set up CDPATH properly.
1588 +AC_DEFUN([AM_AUX_DIR_EXPAND], [
1589 +# expand $ac_aux_dir to an absolute path
1590 +am_aux_dir=`cd $ac_aux_dir && pwd`
1593 +# AM_PROG_INSTALL_SH
1594 +# ------------------
1595 +# Define $install_sh.
1597 +# Copyright 2001 Free Software Foundation, Inc.
1599 +# This program is free software; you can redistribute it and/or modify
1600 +# it under the terms of the GNU General Public License as published by
1601 +# the Free Software Foundation; either version 2, or (at your option)
1602 +# any later version.
1604 +# This program is distributed in the hope that it will be useful,
1605 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1606 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1607 +# GNU General Public License for more details.
1609 +# You should have received a copy of the GNU General Public License
1610 +# along with this program; if not, write to the Free Software
1611 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1614 +AC_DEFUN([AM_PROG_INSTALL_SH],
1615 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1616 +install_sh=${install_sh-"$am_aux_dir/install-sh"}
1617 +AC_SUBST(install_sh)])
1619 +# AM_PROG_INSTALL_STRIP
1621 +# Copyright 2001 Free Software Foundation, Inc.
1623 +# This program is free software; you can redistribute it and/or modify
1624 +# it under the terms of the GNU General Public License as published by
1625 +# the Free Software Foundation; either version 2, or (at your option)
1626 +# any later version.
1628 +# This program is distributed in the hope that it will be useful,
1629 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1630 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1631 +# GNU General Public License for more details.
1633 +# You should have received a copy of the GNU General Public License
1634 +# along with this program; if not, write to the Free Software
1635 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1638 +# One issue with vendor `install' (even GNU) is that you can't
1639 +# specify the program used to strip binaries. This is especially
1640 +# annoying in cross-compiling environments, where the build's strip
1641 +# is unlikely to handle the host's binaries.
1642 +# Fortunately install-sh will honor a STRIPPROG variable, so we
1643 +# always use install-sh in `make install-strip', and initialize
1644 +# STRIPPROG with the value of the STRIP variable (set by the user).
1645 +AC_DEFUN([AM_PROG_INSTALL_STRIP],
1646 +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1647 +# Installed binaries are usually stripped using `strip' when the user
1648 +# run `make install-strip'. However `strip' might not be the right
1649 +# tool to use in cross-compilation environments, therefore Automake
1650 +# will honor the `STRIP' environment variable to overrule this program.
1651 +dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
1652 +if test "$cross_compiling" != no; then
1653 + AC_CHECK_TOOL([STRIP], [strip], :)
1655 +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
1656 +AC_SUBST([INSTALL_STRIP_PROGRAM])])
1658 +# serial 4 -*- Autoconf -*-
1660 +# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
1662 +# This program is free software; you can redistribute it and/or modify
1663 +# it under the terms of the GNU General Public License as published by
1664 +# the Free Software Foundation; either version 2, or (at your option)
1665 +# any later version.
1667 +# This program is distributed in the hope that it will be useful,
1668 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1669 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1670 +# GNU General Public License for more details.
1672 +# You should have received a copy of the GNU General Public License
1673 +# along with this program; if not, write to the Free Software
1674 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1678 +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
1679 +# written in clear, in which case automake, when reading aclocal.m4,
1680 +# will think it sees a *use*, and therefore will trigger all it's
1681 +# C support machinery. Also note that it means that autoscan, seeing
1682 +# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
1686 +# _AM_DEPENDENCIES(NAME)
1687 +# ----------------------
1688 +# See how the compiler implements dependency checking.
1689 +# NAME is "CC", "CXX", "GCJ", or "OBJC".
1690 +# We try a few techniques and use that to set a single cache variable.
1692 +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
1693 +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
1694 +# dependency, and given that the user is not expected to run this macro,
1695 +# just rely on AC_PROG_CC.
1696 +AC_DEFUN([_AM_DEPENDENCIES],
1697 +[AC_REQUIRE([AM_SET_DEPDIR])dnl
1698 +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
1699 +AC_REQUIRE([AM_MAKE_INCLUDE])dnl
1700 +AC_REQUIRE([AM_DEP_TRACK])dnl
1702 +ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
1703 + [$1], CXX, [depcc="$CXX" am_compiler_list=],
1704 + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
1705 + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
1706 + [depcc="$$1" am_compiler_list=])
1708 +AC_CACHE_CHECK([dependency style of $depcc],
1709 + [am_cv_$1_dependencies_compiler_type],
1710 +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
1711 + # We make a subdir and do the tests there. Otherwise we can end up
1712 + # making bogus files that we don't know about and never remove. For
1713 + # instance it was reported that on HP-UX the gcc test will end up
1714 + # making a dummy file named `D' -- because `-MD' means `put the output
1716 + mkdir conftest.dir
1717 + # Copy depcomp to subdir because otherwise we won't find it if we're
1718 + # using a relative directory.
1719 + cp "$am_depcomp" conftest.dir
1722 + am_cv_$1_dependencies_compiler_type=none
1723 + if test "$am_compiler_list" = ""; then
1724 + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
1726 + for depmode in $am_compiler_list; do
1727 + # We need to recreate these files for each test, as the compiler may
1728 + # overwrite some of them when testing with obscure command lines.
1729 + # This happens at least with the AIX C compiler.
1730 + echo '#include "conftest.h"' > conftest.c
1731 + echo 'int i;' > conftest.h
1732 + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
1736 + # after this tag, mechanisms are not by side-effect, so they'll
1737 + # only be used when explicitly requested
1738 + if test "x$enable_dependency_tracking" = xyes; then
1746 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
1747 + # mode. It turns out that the SunPro C++ compiler does not properly
1748 + # handle `-M -o', and we need to detect this.
1749 + if depmode=$depmode \
1750 + source=conftest.c object=conftest.o \
1751 + depfile=conftest.Po tmpdepfile=conftest.TPo \
1752 + $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
1753 + grep conftest.h conftest.Po > /dev/null 2>&1 &&
1754 + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
1755 + am_cv_$1_dependencies_compiler_type=$depmode
1761 + rm -rf conftest.dir
1763 + am_cv_$1_dependencies_compiler_type=none
1766 +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
1769 -# Like AC_CONFIG_HEADER, but automatically create stamp file.
1771 -AC_DEFUN(AM_CONFIG_HEADER,
1773 -AC_CONFIG_HEADER([$1])
1774 -dnl When config.status generates a header, we must update the stamp-h file.
1775 -dnl This file resides in the same directory as the config header
1776 -dnl that is generated. We must strip everything past the first ":",
1777 -dnl and everything past the last "/".
1778 -AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
1779 -ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
1780 -<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
1782 -for am_file in <<$1>>; do
1783 - case " <<$>>CONFIG_HEADERS " in
1784 - *" <<$>>am_file "*<<)>>
1785 - echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
1788 - am_indx=`expr "<<$>>am_indx" + 1`
1790 -changequote([,]))])
1793 +# Choose a directory name for dependency files.
1794 +# This macro is AC_REQUIREd in _AM_DEPENDENCIES
1795 +AC_DEFUN([AM_SET_DEPDIR],
1796 +[rm -f .deps 2>/dev/null
1797 +mkdir .deps 2>/dev/null
1798 +if test -d .deps; then
1801 + # MS-DOS does not allow filenames that begin with a dot.
1804 +rmdir .deps 2>/dev/null
1811 +AC_DEFUN([AM_DEP_TRACK],
1812 +[AC_ARG_ENABLE(dependency-tracking,
1813 +[ --disable-dependency-tracking Speeds up one-time builds
1814 + --enable-dependency-tracking Do not reject slow dependency extractors])
1815 +if test "x$enable_dependency_tracking" != xno; then
1816 + am_depcomp="$ac_aux_dir/depcomp"
1817 + AMDEPBACKSLASH='\'
1819 +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
1820 +AC_SUBST([AMDEPBACKSLASH])
1823 +# Generate code to set up dependency tracking. -*- Autoconf -*-
1825 +# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
1827 +# This program is free software; you can redistribute it and/or modify
1828 +# it under the terms of the GNU General Public License as published by
1829 +# the Free Software Foundation; either version 2, or (at your option)
1830 +# any later version.
1832 +# This program is distributed in the hope that it will be useful,
1833 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1834 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1835 +# GNU General Public License for more details.
1837 +# You should have received a copy of the GNU General Public License
1838 +# along with this program; if not, write to the Free Software
1839 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1844 +# _AM_OUTPUT_DEPENDENCY_COMMANDS
1845 +# ------------------------------
1846 +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
1847 +[for mf in $CONFIG_FILES; do
1848 + # Strip MF so we end up with the name of the file.
1849 + mf=`echo "$mf" | sed -e 's/:.*$//'`
1850 + # Check whether this is an Automake generated Makefile or not.
1851 + # We used to match only the files named `Makefile.in', but
1852 + # some people rename them; so instead we look at the file content.
1853 + # Grep'ing the first line is not enough: some people post-process
1854 + # each Makefile.in and add a new line on top of each file to say so.
1855 + # So let's grep whole file.
1856 + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
1857 + dirpart=`AS_DIRNAME("$mf")`
1861 + grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
1862 + # Extract the definition of DEP_FILES from the Makefile without
1864 + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
1865 + test -z "$DEPDIR" && continue
1866 + # When using ansi2knr, U may be empty or an underscore; expand it
1867 + U=`sed -n -e '/^U = / s///p' < "$mf"`
1868 + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
1869 + # We invoke sed twice because it is the simplest approach to
1870 + # changing $(DEPDIR) to its actual value in the expansion.
1871 + for file in `sed -n -e '
1872 + /^DEP_FILES = .*\\\\$/ {
1881 + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
1882 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
1883 + # Make sure the directory exists.
1884 + test -f "$dirpart/$file" && continue
1885 + fdir=`AS_DIRNAME(["$file"])`
1886 + AS_MKDIR_P([$dirpart/$fdir])
1887 + # echo "creating $dirpart/$file"
1888 + echo '# dummy' > "$dirpart/$file"
1891 +])# _AM_OUTPUT_DEPENDENCY_COMMANDS
1894 +# AM_OUTPUT_DEPENDENCY_COMMANDS
1895 +# -----------------------------
1896 +# This macro should only be invoked once -- use via AC_REQUIRE.
1898 +# This code is only required when automatic dependency tracking
1899 +# is enabled. FIXME. This creates each `.P' file that we will
1900 +# need in order to bootstrap the dependency handling code.
1901 +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
1902 +[AC_CONFIG_COMMANDS([depfiles],
1903 + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
1904 + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
1907 +# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*-
1909 +# This program is free software; you can redistribute it and/or modify
1910 +# it under the terms of the GNU General Public License as published by
1911 +# the Free Software Foundation; either version 2, or (at your option)
1912 +# any later version.
1914 +# This program is distributed in the hope that it will be useful,
1915 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1916 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1917 +# GNU General Public License for more details.
1919 +# You should have received a copy of the GNU General Public License
1920 +# along with this program; if not, write to the Free Software
1921 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1926 +# AM_MAKE_INCLUDE()
1927 +# -----------------
1928 +# Check to see how make treats includes.
1929 +AC_DEFUN([AM_MAKE_INCLUDE],
1930 +[am_make=${MAKE-make}
1931 +cat > confinc << 'END'
1935 +# If we don't find an include directive, just comment out the code.
1936 +AC_MSG_CHECKING([for style of include used by $am_make])
1940 +# First try GNU make style include.
1941 +echo "include confinc" > confmf
1942 +# We grep out `Entering directory' and `Leaving directory'
1943 +# messages which can occur if `w' ends up in MAKEFLAGS.
1944 +# In particular we don't look at `^make:' because GNU make might
1945 +# be invoked under some other name (usually "gmake"), in which
1946 +# case it prints its new name instead of `make'.
1947 +if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
1948 + am__include=include
1952 +# Now try BSD make style include.
1953 +if test "$am__include" = "#"; then
1954 + echo '.include "confinc"' > confmf
1955 + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
1956 + am__include=.include
1961 +AC_SUBST(am__include)
1962 +AC_SUBST(am__quote)
1963 +AC_MSG_RESULT($_am_result)
1964 +rm -f confinc confmf
1967 +# AM_CONDITIONAL -*- Autoconf -*-
1969 +# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
1971 +# This program is free software; you can redistribute it and/or modify
1972 +# it under the terms of the GNU General Public License as published by
1973 +# the Free Software Foundation; either version 2, or (at your option)
1974 +# any later version.
1976 +# This program is distributed in the hope that it will be useful,
1977 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
1978 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1979 +# GNU General Public License for more details.
1981 +# You should have received a copy of the GNU General Public License
1982 +# along with this program; if not, write to the Free Software
1983 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
1990 +# AM_CONDITIONAL(NAME, SHELL-CONDITION)
1991 +# -------------------------------------
1992 +# Define a conditional.
1993 +AC_DEFUN([AM_CONDITIONAL],
1994 +[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
1995 + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
1996 +AC_SUBST([$1_TRUE])
1997 +AC_SUBST([$1_FALSE])
2005 +AC_CONFIG_COMMANDS_PRE(
2006 +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
2007 + AC_MSG_ERROR([conditional \"$1\" was never defined.
2008 +Usually this means the macro was only invoked conditionally.])
2011 +# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
2013 +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
2015 +# This program is free software; you can redistribute it and/or modify
2016 +# it under the terms of the GNU General Public License as published by
2017 +# the Free Software Foundation; either version 2, or (at your option)
2018 +# any later version.
2020 +# This program is distributed in the hope that it will be useful,
2021 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
2022 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2023 +# GNU General Public License for more details.
2025 +# You should have received a copy of the GNU General Public License
2026 +# along with this program; if not, write to the Free Software
2027 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
2034 +# When config.status generates a header, we must update the stamp-h file.
2035 +# This file resides in the same directory as the config header
2036 +# that is generated. We must strip everything past the first ":",
2037 +# and everything past the last "/".
2039 +# _AM_DIRNAME(PATH)
2040 +# -----------------
2041 +# Like AS_DIRNAME, only do it during macro expansion
2042 +AC_DEFUN([_AM_DIRNAME],
2043 + [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
2044 + m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
2045 + m4_if(regexp([$1], [^/.*]), -1,
2047 + patsubst([$1], [^\(/\).*], [\1])),
2048 + patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
2049 + patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
2053 +# The stamp files are numbered to have different names.
2054 +# We could number them on a directory basis, but that's additional
2055 +# complications, let's have a unique counter.
2056 +m4_define([_AM_STAMP_Count], [0])
2059 +# _AM_STAMP(HEADER)
2060 +# -----------------
2061 +# The name of the stamp file for HEADER.
2062 +AC_DEFUN([_AM_STAMP],
2063 +[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
2064 +AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
2065 + [:.*])))/stamp-h[]_AM_STAMP_Count])
2068 +# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
2069 +# ------------------------------------------------------------
2070 +# We used to try to get a real timestamp in stamp-h. But the fear is that
2071 +# that will cause unnecessary cvs conflicts.
2072 +AC_DEFUN([_AM_CONFIG_HEADER],
2073 +[# Add the stamp file to the list of files AC keeps track of,
2074 +# along with our hook.
2075 +AC_CONFIG_HEADERS([$1],
2076 + [# update the timestamp
2077 +echo 'timestamp for $1' >"_AM_STAMP([$1])"
2080 +])# _AM_CONFIG_HEADER
2083 +# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
2084 +# --------------------------------------------------------------
2085 +AC_DEFUN([AM_CONFIG_HEADER],
2086 +[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
2087 +])# AM_CONFIG_HEADER
2090 +# Copyright 1996, 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
2092 +# This program is free software; you can redistribute it and/or modify
2093 +# it under the terms of the GNU General Public License as published by
2094 +# the Free Software Foundation; either version 2, or (at your option)
2095 +# any later version.
2097 +# This program is distributed in the hope that it will be useful,
2098 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
2099 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2100 +# GNU General Public License for more details.
2102 +# You should have received a copy of the GNU General Public License
2103 +# along with this program; if not, write to the Free Software
2104 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
2110 # program @code{ansi2knr}, which comes with Ghostscript.
2113 -AC_DEFUN(AM_PROG_CC_STDC,
2114 +AC_DEFUN([AM_PROG_CC_STDC],
2115 [AC_REQUIRE([AC_PROG_CC])
2116 AC_BEFORE([$0], [AC_C_INLINE])
2117 AC_BEFORE([$0], [AC_C_CONST])
2119 dnl FIXME: can't do this because then AC_AIX won't work due to a
2120 dnl circular dependency.
2121 dnl AC_BEFORE([$0], [AC_PROG_CPP])
2122 -AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
2123 +AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
2124 AC_CACHE_VAL(am_cv_prog_cc_stdc,
2125 [am_cv_prog_cc_stdc=no
2127 @@ -161,9 +887,10 @@
2128 # breaks some systems' header files.
2129 # AIX -qlanglvl=ansi
2130 # Ultrix and OSF/1 -std1
2131 -# HP-UX -Aa -D_HPUX_SOURCE
2132 +# HP-UX 10.20 and later -Ae
2133 +# HP-UX older versions -Aa -D_HPUX_SOURCE
2134 # SVR4 -Xc -D__EXTENSIONS__
2135 -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
2136 +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
2138 CC="$ac_save_CC $ac_arg"
2141 if test -z "$am_cv_prog_cc_stdc"; then
2142 AC_MSG_RESULT([none needed])
2144 - AC_MSG_RESULT($am_cv_prog_cc_stdc)
2145 + AC_MSG_RESULT([$am_cv_prog_cc_stdc])
2147 case "x$am_cv_prog_cc_stdc" in
2149 @@ -213,198 +940,61 @@
2153 -# Configure paths for GTK+
2154 -# Owen Taylor 97-11-3
2156 -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
2157 -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
2159 -AC_DEFUN(AM_PATH_GTK,
2161 -dnl Get the cflags and libraries from the gtk-config script
2163 -AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
2164 - gtk_config_prefix="$withval", gtk_config_prefix="")
2165 -AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
2166 - gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
2167 -AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
2168 - , enable_gtktest=yes)
2170 - for module in . $4
2174 - gtk_config_args="$gtk_config_args gthread"
2178 +dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
2179 +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
2180 +dnl also defines GSTUFF_PKG_ERRORS on error
2181 +AC_DEFUN(PKG_CHECK_MODULES, [
2184 - if test x$gtk_config_exec_prefix != x ; then
2185 - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
2186 - if test x${GTK_CONFIG+set} != xset ; then
2187 - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
2190 - if test x$gtk_config_prefix != x ; then
2191 - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
2192 - if test x${GTK_CONFIG+set} != xset ; then
2193 - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
2195 + if test -z "$PKG_CONFIG"; then
2196 + AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
2199 - AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
2200 - min_gtk_version=ifelse([$1], ,0.99.7,$1)
2201 - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
2203 - if test "$GTK_CONFIG" = "no" ; then
2205 + if test "$PKG_CONFIG" = "no" ; then
2206 + echo "*** The pkg-config script could not be found. Make sure it is"
2207 + echo "*** in your path, or set the PKG_CONFIG environment variable"
2208 + echo "*** to the full path to pkg-config."
2209 + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
2211 - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
2212 - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
2213 - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
2214 - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
2215 - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
2216 - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
2217 - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
2218 - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
2219 - if test "x$enable_gtktest" = "xyes" ; then
2220 - ac_save_CFLAGS="$CFLAGS"
2221 - ac_save_LIBS="$LIBS"
2222 - CFLAGS="$CFLAGS $GTK_CFLAGS"
2223 - LIBS="$GTK_LIBS $LIBS"
2225 -dnl Now check if the installed GTK is sufficiently new. (Also sanity
2226 -dnl checks the results of gtk-config to some extent
2228 - rm -f conf.gtktest
2230 -#include <gtk/gtk.h>
2232 -#include <stdlib.h>
2237 - int major, minor, micro;
2238 - char *tmp_version;
2240 - system ("touch conf.gtktest");
2241 + PKG_CONFIG_MIN_VERSION=0.9.0
2242 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
2243 + AC_MSG_CHECKING(for $2)
2245 + if $PKG_CONFIG --exists "$2" ; then
2246 + AC_MSG_RESULT(yes)
2249 + AC_MSG_CHECKING($1_CFLAGS)
2250 + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
2251 + AC_MSG_RESULT($$1_CFLAGS)
2253 + AC_MSG_CHECKING($1_LIBS)
2254 + $1_LIBS=`$PKG_CONFIG --libs "$2"`
2255 + AC_MSG_RESULT($$1_LIBS)
2259 + ## If we have a custom action on failure, don't print errors, but
2260 + ## do set a variable so people can do so.
2261 + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
2262 + ifelse([$4], ,echo $$1_PKG_ERRORS,)
2265 - /* HP/UX 9 (%@#!) writes to sscanf strings */
2266 - tmp_version = g_strdup("$min_gtk_version");
2267 - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
2268 - printf("%s, bad version string\n", "$min_gtk_version");
2272 - if ((gtk_major_version != $gtk_config_major_version) ||
2273 - (gtk_minor_version != $gtk_config_minor_version) ||
2274 - (gtk_micro_version != $gtk_config_micro_version))
2276 - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
2277 - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
2278 - gtk_major_version, gtk_minor_version, gtk_micro_version);
2279 - printf ("*** was found! If gtk-config was correct, then it is best\n");
2280 - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
2281 - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
2282 - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
2283 - printf("*** required on your system.\n");
2284 - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
2285 - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
2286 - printf("*** before re-running configure\n");
2288 -#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
2289 - else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
2290 - (gtk_minor_version != GTK_MINOR_VERSION) ||
2291 - (gtk_micro_version != GTK_MICRO_VERSION))
2293 - printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
2294 - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
2295 - printf("*** library (version %d.%d.%d)\n",
2296 - gtk_major_version, gtk_minor_version, gtk_micro_version);
2298 -#endif /* defined (GTK_MAJOR_VERSION) ... */
2301 - if ((gtk_major_version > major) ||
2302 - ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
2303 - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
2307 + AC_SUBST($1_CFLAGS)
2311 - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
2312 - gtk_major_version, gtk_minor_version, gtk_micro_version);
2313 - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
2314 - major, minor, micro);
2315 - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
2317 - printf("*** If you have already installed a sufficiently new version, this error\n");
2318 - printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
2319 - printf("*** being found. The easiest way to fix this is to remove the old version\n");
2320 - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
2321 - printf("*** correct copy of gtk-config. (In this case, you will have to\n");
2322 - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
2323 - printf("*** so that the correct libraries are found at run-time))\n");
2328 -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
2329 - CFLAGS="$ac_save_CFLAGS"
2330 - LIBS="$ac_save_LIBS"
2331 + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
2332 + echo "*** See http://www.freedesktop.org/software/pkgconfig"
2335 - if test "x$no_gtk" = x ; then
2336 - AC_MSG_RESULT(yes)
2337 - ifelse([$2], , :, [$2])
2340 - if test "$GTK_CONFIG" = "no" ; then
2341 - echo "*** The gtk-config script installed by GTK could not be found"
2342 - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
2343 - echo "*** your path, or set the GTK_CONFIG environment variable to the"
2344 - echo "*** full path to gtk-config."
2346 - if test -f conf.gtktest ; then
2349 - echo "*** Could not run GTK test program, checking why..."
2350 - CFLAGS="$CFLAGS $GTK_CFLAGS"
2351 - LIBS="$LIBS $GTK_LIBS"
2353 -#include <gtk/gtk.h>
2355 -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
2356 - [ echo "*** The test program compiled, but did not run. This usually means"
2357 - echo "*** that the run-time linker is not finding GTK or finding the wrong"
2358 - echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
2359 - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
2360 - echo "*** to the installed location Also, make sure you have run ldconfig if that"
2361 - echo "*** is required on your system"
2363 - echo "*** If you have an old version installed, it is best to remove it, although"
2364 - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
2366 - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
2367 - echo "*** came with the system with the command"
2369 - echo "*** rpm --erase --nodeps gtk gtk-devel" ],
2370 - [ echo "*** The test program failed to compile or link. See the file config.log for the"
2371 - echo "*** exact error that occured. This usually means GTK was incorrectly installed"
2372 - echo "*** or that you have moved GTK since it was installed. In the latter case, you"
2373 - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
2374 - CFLAGS="$ac_save_CFLAGS"
2375 - LIBS="$ac_save_LIBS"
2381 + if test $succeeded = yes; then
2382 ifelse([$3], , :, [$3])
2384 + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
2386 - AC_SUBST(GTK_CFLAGS)
2387 - AC_SUBST(GTK_LIBS)
2388 - rm -f conf.gtktest
2393 diff -urN dillo-0.6.6/config.h dillo2-0.6.6/config.h
2394 --- dillo-0.6.6/config.h 1969-12-31 17:00:00.000000000 -0700
2395 +++ dillo2-0.6.6/config.h 2003-04-21 14:24:16.000000000 -0600
2397 +/* config.h. Generated by configure. */
2398 +/* config.h.in. Generated from configure.in by autoheader. */
2400 +/* Define to 1 if you have the <fcntl.h> header file. */
2401 +#define HAVE_FCNTL_H 1
2403 +/* Define to 1 if you have the <inttypes.h> header file. */
2404 +#define HAVE_INTTYPES_H 1
2406 +/* Define to 1 if you have the <jconfig.h> header file. */
2407 +#define HAVE_JCONFIG_H 1
2409 +/* Define to 1 if you have the <jerror.h> header file. */
2410 +#define HAVE_JERROR_H 1
2412 +/* Define to 1 if you have the <jmorecfg.h> header file. */
2413 +#define HAVE_JMORECFG_H 1
2415 +/* Define to 1 if you have the <jpeglib.h> header file. */
2416 +#define HAVE_JPEGLIB_H 1
2418 +/* Define to 1 if you have the `png' library (-lpng). */
2419 +#define HAVE_LIBPNG 1
2421 +/* Define to 1 if you have the `pthread' library (-lpthread). */
2422 +#define HAVE_LIBPTHREAD 1
2424 +/* Define to 1 if you have the `z' library (-lz). */
2425 +#define HAVE_LIBZ 1
2427 +/* Define to 1 if you have the <memory.h> header file. */
2428 +#define HAVE_MEMORY_H 1
2430 +/* Define to 1 if you have the `socket' function. */
2431 +#define HAVE_SOCKET 1
2433 +/* Define to 1 if you have the <stdint.h> header file. */
2434 +#define HAVE_STDINT_H 1
2436 +/* Define to 1 if you have the <stdlib.h> header file. */
2437 +#define HAVE_STDLIB_H 1
2439 +/* Define to 1 if you have the <strings.h> header file. */
2440 +#define HAVE_STRINGS_H 1
2442 +/* Define to 1 if you have the <string.h> header file. */
2443 +#define HAVE_STRING_H 1
2445 +/* Define to 1 if you have the <sys/stat.h> header file. */
2446 +#define HAVE_SYS_STAT_H 1
2448 +/* Define to 1 if you have the <sys/types.h> header file. */
2449 +#define HAVE_SYS_TYPES_H 1
2451 +/* Define to 1 if you have the <sys/uio.h> header file. */
2452 +#define HAVE_SYS_UIO_H 1
2454 +/* Define to 1 if you have the <unistd.h> header file. */
2455 +#define HAVE_UNISTD_H 1
2457 +/* Name of package */
2458 +#define PACKAGE "dillo"
2460 +/* Define to the address where bug reports for this package should be sent. */
2461 +#define PACKAGE_BUGREPORT ""
2463 +/* Define to the full name of this package. */
2464 +#define PACKAGE_NAME ""
2466 +/* Define to the full name and version of this package. */
2467 +#define PACKAGE_STRING ""
2469 +/* Define to the one symbol short name of this package. */
2470 +#define PACKAGE_TARNAME ""
2472 +/* Define to the version of this package. */
2473 +#define PACKAGE_VERSION ""
2475 +/* Define to 1 if you have the ANSI C header files. */
2476 +#define STDC_HEADERS 1
2478 +/* Version number of package */
2479 +#define VERSION "0.6.6"
2480 diff -urN dillo-0.6.6/config.h.in dillo2-0.6.6/config.h.in
2481 --- dillo-0.6.6/config.h.in 2002-03-02 07:15:36.000000000 -0700
2482 +++ dillo2-0.6.6/config.h.in 2003-04-21 14:27:01.000000000 -0600
2484 -/* config.h.in. Generated automatically from configure.in by autoheader. */
2485 +/* config.h.in. Generated from configure.in by autoheader. */
2487 -/* Define if you have the <fcntl.h> header file. */
2488 +/* Define to 1 if you have the <fcntl.h> header file. */
2491 -/* Define if you have the <jconfig.h> header file. */
2492 +/* Define to 1 if you have the <inttypes.h> header file. */
2493 +#undef HAVE_INTTYPES_H
2495 +/* Define to 1 if you have the <jconfig.h> header file. */
2496 #undef HAVE_JCONFIG_H
2498 -/* Define if you have the <jerror.h> header file. */
2499 +/* Define to 1 if you have the <jerror.h> header file. */
2500 #undef HAVE_JERROR_H
2502 -/* Define if you have the <jmorecfg.h> header file. */
2503 +/* Define to 1 if you have the <jmorecfg.h> header file. */
2504 #undef HAVE_JMORECFG_H
2506 -/* Define if you have the <jpeglib.h> header file. */
2507 +/* Define to 1 if you have the <jpeglib.h> header file. */
2508 #undef HAVE_JPEGLIB_H
2510 -/* Define if you have the `png' library (-lpng). */
2511 +/* Define to 1 if you have the `png' library (-lpng). */
2514 -/* Define if you have the `pthread' library (-lpthread). */
2515 +/* Define to 1 if you have the `pthread' library (-lpthread). */
2516 #undef HAVE_LIBPTHREAD
2518 -/* Define if you have the `z' library (-lz). */
2519 +/* Define to 1 if you have the `z' library (-lz). */
2522 -/* Define if you have the `socket' function. */
2523 +/* Define to 1 if you have the <memory.h> header file. */
2524 +#undef HAVE_MEMORY_H
2526 +/* Define to 1 if you have the `socket' function. */
2529 -/* Define if you have the <sys/uio.h> header file. */
2530 +/* Define to 1 if you have the <stdint.h> header file. */
2531 +#undef HAVE_STDINT_H
2533 +/* Define to 1 if you have the <stdlib.h> header file. */
2534 +#undef HAVE_STDLIB_H
2536 +/* Define to 1 if you have the <strings.h> header file. */
2537 +#undef HAVE_STRINGS_H
2539 +/* Define to 1 if you have the <string.h> header file. */
2540 +#undef HAVE_STRING_H
2542 +/* Define to 1 if you have the <sys/stat.h> header file. */
2543 +#undef HAVE_SYS_STAT_H
2545 +/* Define to 1 if you have the <sys/types.h> header file. */
2546 +#undef HAVE_SYS_TYPES_H
2548 +/* Define to 1 if you have the <sys/uio.h> header file. */
2549 #undef HAVE_SYS_UIO_H
2551 -/* Define if you have the <unistd.h> header file. */
2552 +/* Define to 1 if you have the <unistd.h> header file. */
2553 #undef HAVE_UNISTD_H
2555 /* Name of package */
2558 -/* Define if you have the ANSI C header files. */
2559 +/* Define to the address where bug reports for this package should be sent. */
2560 +#undef PACKAGE_BUGREPORT
2562 +/* Define to the full name of this package. */
2563 +#undef PACKAGE_NAME
2565 +/* Define to the full name and version of this package. */
2566 +#undef PACKAGE_STRING
2568 +/* Define to the one symbol short name of this package. */
2569 +#undef PACKAGE_TARNAME
2571 +/* Define to the version of this package. */
2572 +#undef PACKAGE_VERSION
2574 +/* Define to 1 if you have the ANSI C header files. */
2577 /* Version number of package */
2578 diff -urN dillo-0.6.6/config.log dillo2-0.6.6/config.log
2579 --- dillo-0.6.6/config.log 1969-12-31 17:00:00.000000000 -0700
2580 +++ dillo2-0.6.6/config.log 2003-04-21 14:27:11.000000000 -0600
2582 +This file contains any messages produced by compilers while
2583 +running configure, to aid debugging if configure makes a mistake.
2585 +It was created by configure, which was
2586 +generated by GNU Autoconf 2.57. Invocation command line was
2588 + $ ./configure --prefix=/usr --enable-ipv6 --no-create --no-recursion
2594 +hostname = smackdown
2596 +uname -r = 2.4.19-netwinder
2598 +uname -v = #1 Thu Mar 20 03:14:34 CET 2003
2600 +/usr/bin/uname -p = unknown
2601 +/bin/uname -X = unknown
2604 +/usr/bin/arch -k = unknown
2605 +/usr/convex/getsysinfo = unknown
2607 +/bin/machine = unknown
2608 +/usr/bin/oslevel = unknown
2609 +/bin/universe = unknown
2611 +PATH: /usr/local/bin
2622 +configure:1315: checking for a BSD-compatible install
2623 +configure:1369: result: /usr/bin/install -c
2624 +configure:1380: checking whether build environment is sane
2625 +configure:1423: result: yes
2626 +configure:1448: WARNING: `missing' script is too old or missing
2627 +configure:1456: checking for gawk
2628 +configure:1472: found /usr/bin/gawk
2629 +configure:1482: result: gawk
2630 +configure:1492: checking whether make sets $(MAKE)
2631 +configure:1512: result: yes
2632 +configure:1766: checking for gcc
2633 +configure:1782: found /usr/bin/gcc
2634 +configure:1792: result: gcc
2635 +configure:2036: checking for C compiler version
2636 +configure:2039: gcc --version </dev/null >&5
2637 +gcc (GCC) 3.2.3 20030228 (Debian prerelease)
2638 +Copyright (C) 2002 Free Software Foundation, Inc.
2639 +This is free software; see the source for copying conditions. There is NO
2640 +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
2642 +configure:2042: $? = 0
2643 +configure:2044: gcc -v </dev/null >&5
2644 +Reading specs from /usr/lib/gcc-lib/arm-linux/3.2.3/specs
2645 +Configured with: ../src/configure -v --enable-languages=c,c++,java,f77,proto,objc --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-gxx-include-dir=/usr/include/c++/3.2 --enable-shared --with-system-zlib --enable-nls --without-included-gettext --enable-__cxa_atexit --enable-clocale=gnu --enable-java-gc=boehm --enable-objc-gc arm-linux
2646 +Thread model: posix
2647 +gcc version 3.2.3 20030228 (Debian prerelease)
2648 +configure:2047: $? = 0
2649 +configure:2049: gcc -V </dev/null >&5
2650 +gcc: argument to `-V' is missing
2651 +configure:2052: $? = 1
2652 +configure:2076: checking for C compiler default output
2653 +configure:2079: gcc -I/usr/local/include -L/usr/local/lib conftest.c >&5
2654 +configure:2082: $? = 0
2655 +configure:2128: result: a.out
2656 +configure:2133: checking whether the C compiler works
2657 +configure:2139: ./a.out
2658 +configure:2142: $? = 0
2659 +configure:2159: result: yes
2660 +configure:2166: checking whether we are cross compiling
2661 +configure:2168: result: no
2662 +configure:2171: checking for suffix of executables
2663 +configure:2173: gcc -o conftest -I/usr/local/include -L/usr/local/lib conftest.c >&5
2664 +configure:2176: $? = 0
2665 +configure:2201: result:
2666 +configure:2207: checking for suffix of object files
2667 +configure:2229: gcc -c -I/usr/local/include conftest.c >&5
2668 +configure:2232: $? = 0
2669 +configure:2254: result: o
2670 +configure:2258: checking whether we are using the GNU C compiler
2671 +configure:2283: gcc -c -I/usr/local/include conftest.c >&5
2672 +configure:2286: $? = 0
2673 +configure:2289: test -s conftest.o
2674 +configure:2292: $? = 0
2675 +configure:2305: result: yes
2676 +configure:2311: checking whether gcc accepts -g
2677 +configure:2333: gcc -c -g -I/usr/local/include conftest.c >&5
2678 +configure:2336: $? = 0
2679 +configure:2339: test -s conftest.o
2680 +configure:2342: $? = 0
2681 +configure:2353: result: yes
2682 +configure:2370: checking for gcc option to accept ANSI C
2683 +configure:2431: gcc -c -g -O2 -I/usr/local/include conftest.c >&5
2684 +configure:2434: $? = 0
2685 +configure:2437: test -s conftest.o
2686 +configure:2440: $? = 0
2687 +configure:2458: result: none needed
2688 +configure:2476: gcc -c -g -O2 -I/usr/local/include conftest.c >&5
2689 +conftest.c:2: syntax error before "me"
2690 +configure:2479: $? = 1
2691 +configure: failed program was:
2692 +| #ifndef __cplusplus
2695 +configure:2607: checking for style of include used by make
2696 +configure:2635: result: GNU
2697 +configure:2663: checking dependency style of gcc
2698 +configure:2725: result: gcc3
2699 +configure:2734: checking for gcc option to accept ANSI C
2700 +configure:2798: gcc -c -g -O2 -I/usr/local/include conftest.c >&5
2701 +configure:2801: $? = 0
2702 +configure:2804: test -s conftest.o
2703 +configure:2807: $? = 0
2704 +configure:2822: result: none needed
2705 +configure:2874: checking for ranlib
2706 +configure:2890: found /usr/bin/ranlib
2707 +configure:2901: result: ranlib
2708 +configure:2923: checking for pkg-config
2709 +configure:2941: found /usr/bin/pkg-config
2710 +configure:2954: result: /usr/bin/pkg-config
2711 +configure:2971: checking for gtk+-2.0 >= 2.0.0
2712 +configure:2975: result: yes
2713 +configure:2979: checking GTK_CFLAGS
2714 +configure:2982: result: -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
2715 +configure:2985: checking GTK_LIBS
2716 +configure:2988: result: -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
2717 +configure:3041: checking for jpeg_destroy_decompress in -ljpeg
2718 +configure:3072: gcc -o conftest -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -L/usr/local/lib -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 conftest.c -ljpeg >&5
2719 +configure:3075: $? = 0
2720 +configure:3078: test -s conftest
2721 +configure:3081: $? = 0
2722 +configure:3093: result: yes
2723 +configure:3110: checking how to run the C preprocessor
2724 +configure:3146: gcc -E -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c
2725 +configure:3152: $? = 0
2726 +configure:3184: gcc -E -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c
2727 +configure:3185:28: ac_nonexistent.h: No such file or directory
2728 +configure:3190: $? = 1
2729 +configure: failed program was:
2730 +| #line 3175 "configure"
2731 +| /* confdefs.h. */
2733 +| #define PACKAGE_NAME ""
2734 +| #define PACKAGE_TARNAME ""
2735 +| #define PACKAGE_VERSION ""
2736 +| #define PACKAGE_STRING ""
2737 +| #define PACKAGE_BUGREPORT ""
2738 +| #define PACKAGE "dillo"
2739 +| #define VERSION "0.6.6"
2740 +| /* end confdefs.h. */
2741 +| #include <ac_nonexistent.h>
2742 +configure:3228: result: gcc -E
2743 +configure:3253: gcc -E -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c
2744 +configure:3259: $? = 0
2745 +configure:3291: gcc -E -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c
2746 +configure:3292:28: ac_nonexistent.h: No such file or directory
2747 +configure:3297: $? = 1
2748 +configure: failed program was:
2749 +| #line 3282 "configure"
2750 +| /* confdefs.h. */
2752 +| #define PACKAGE_NAME ""
2753 +| #define PACKAGE_TARNAME ""
2754 +| #define PACKAGE_VERSION ""
2755 +| #define PACKAGE_STRING ""
2756 +| #define PACKAGE_BUGREPORT ""
2757 +| #define PACKAGE "dillo"
2758 +| #define VERSION "0.6.6"
2759 +| /* end confdefs.h. */
2760 +| #include <ac_nonexistent.h>
2761 +configure:3340: checking for egrep
2762 +configure:3350: result: grep -E
2763 +configure:3355: checking for ANSI C header files
2764 +configure:3381: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2765 +configure:3384: $? = 0
2766 +configure:3387: test -s conftest.o
2767 +configure:3390: $? = 0
2768 +configure:3479: gcc -o conftest -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -L/usr/local/lib -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 conftest.c >&5
2769 +configure: In function `main':
2770 +configure:3477: warning: implicit declaration of function `exit'
2771 +configure:3482: $? = 0
2772 +configure:3484: ./conftest
2773 +configure:3487: $? = 0
2774 +configure:3502: result: yes
2775 +configure:3526: checking for sys/types.h
2776 +configure:3543: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2777 +configure:3546: $? = 0
2778 +configure:3549: test -s conftest.o
2779 +configure:3552: $? = 0
2780 +configure:3563: result: yes
2781 +configure:3526: checking for sys/stat.h
2782 +configure:3543: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2783 +configure:3546: $? = 0
2784 +configure:3549: test -s conftest.o
2785 +configure:3552: $? = 0
2786 +configure:3563: result: yes
2787 +configure:3526: checking for stdlib.h
2788 +configure:3543: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2789 +configure:3546: $? = 0
2790 +configure:3549: test -s conftest.o
2791 +configure:3552: $? = 0
2792 +configure:3563: result: yes
2793 +configure:3526: checking for string.h
2794 +configure:3543: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2795 +configure:3546: $? = 0
2796 +configure:3549: test -s conftest.o
2797 +configure:3552: $? = 0
2798 +configure:3563: result: yes
2799 +configure:3526: checking for memory.h
2800 +configure:3543: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2801 +configure:3546: $? = 0
2802 +configure:3549: test -s conftest.o
2803 +configure:3552: $? = 0
2804 +configure:3563: result: yes
2805 +configure:3526: checking for strings.h
2806 +configure:3543: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2807 +configure:3546: $? = 0
2808 +configure:3549: test -s conftest.o
2809 +configure:3552: $? = 0
2810 +configure:3563: result: yes
2811 +configure:3526: checking for inttypes.h
2812 +configure:3543: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2813 +configure:3546: $? = 0
2814 +configure:3549: test -s conftest.o
2815 +configure:3552: $? = 0
2816 +configure:3563: result: yes
2817 +configure:3526: checking for stdint.h
2818 +configure:3543: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2819 +configure:3546: $? = 0
2820 +configure:3549: test -s conftest.o
2821 +configure:3552: $? = 0
2822 +configure:3563: result: yes
2823 +configure:3526: checking for unistd.h
2824 +configure:3543: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2825 +configure:3546: $? = 0
2826 +configure:3549: test -s conftest.o
2827 +configure:3552: $? = 0
2828 +configure:3563: result: yes
2829 +configure:3592: checking jpeglib.h usability
2830 +configure:3605: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2831 +configure:3608: $? = 0
2832 +configure:3611: test -s conftest.o
2833 +configure:3614: $? = 0
2834 +configure:3624: result: yes
2835 +configure:3628: checking jpeglib.h presence
2836 +configure:3639: gcc -E -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c
2837 +configure:3645: $? = 0
2838 +configure:3664: result: yes
2839 +configure:3700: checking for jpeglib.h
2840 +configure:3707: result: yes
2841 +configure:3592: checking jconfig.h usability
2842 +configure:3605: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2843 +configure:3608: $? = 0
2844 +configure:3611: test -s conftest.o
2845 +configure:3614: $? = 0
2846 +configure:3624: result: yes
2847 +configure:3628: checking jconfig.h presence
2848 +configure:3639: gcc -E -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c
2849 +configure:3645: $? = 0
2850 +configure:3664: result: yes
2851 +configure:3700: checking for jconfig.h
2852 +configure:3707: result: yes
2853 +configure:3592: checking jerror.h usability
2854 +configure:3605: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2855 +configure:3608: $? = 0
2856 +configure:3611: test -s conftest.o
2857 +configure:3614: $? = 0
2858 +configure:3624: result: yes
2859 +configure:3628: checking jerror.h presence
2860 +configure:3639: gcc -E -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c
2861 +configure:3645: $? = 0
2862 +configure:3664: result: yes
2863 +configure:3700: checking for jerror.h
2864 +configure:3707: result: yes
2865 +configure:3592: checking jmorecfg.h usability
2866 +configure:3605: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2867 +configure:3608: $? = 0
2868 +configure:3611: test -s conftest.o
2869 +configure:3614: $? = 0
2870 +configure:3624: result: yes
2871 +configure:3628: checking jmorecfg.h presence
2872 +configure:3639: gcc -E -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c
2873 +configure:3645: $? = 0
2874 +configure:3664: result: yes
2875 +configure:3700: checking for jmorecfg.h
2876 +configure:3707: result: yes
2877 +configure:3736: checking for pthread_create in -lpthread
2878 +configure:3767: gcc -o conftest -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -L/usr/local/lib -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 conftest.c -lpthread >&5
2879 +configure:3770: $? = 0
2880 +configure:3773: test -s conftest
2881 +configure:3776: $? = 0
2882 +configure:3788: result: yes
2883 +configure:3991: checking for zlibVersion in -lz
2884 +configure:4022: gcc -o conftest -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -L/usr/local/lib -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 conftest.c -lz -lpthread >&5
2885 +configure:4025: $? = 0
2886 +configure:4028: test -s conftest
2887 +configure:4031: $? = 0
2888 +configure:4043: result: yes
2889 +configure:4055: checking for png_check_sig in -lpng
2890 +configure:4086: gcc -o conftest -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -L/usr/local/lib -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 conftest.c -lpng -lz -lpthread >&5
2891 +configure:4089: $? = 0
2892 +configure:4092: test -s conftest
2893 +configure:4095: $? = 0
2894 +configure:4107: result: yes
2895 +configure:4136: checking for ANSI C header files
2896 +configure:4283: result: yes
2897 +configure:4309: checking fcntl.h usability
2898 +configure:4322: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -DENABLE_IPV6 -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2899 +configure:4325: $? = 0
2900 +configure:4328: test -s conftest.o
2901 +configure:4331: $? = 0
2902 +configure:4341: result: yes
2903 +configure:4345: checking fcntl.h presence
2904 +configure:4356: gcc -E -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c
2905 +configure:4362: $? = 0
2906 +configure:4381: result: yes
2907 +configure:4417: checking for fcntl.h
2908 +configure:4424: result: yes
2909 +configure:4300: checking for unistd.h
2910 +configure:4305: result: yes
2911 +configure:4309: checking sys/uio.h usability
2912 +configure:4322: gcc -c -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -DENABLE_IPV6 -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c >&5
2913 +configure:4325: $? = 0
2914 +configure:4328: test -s conftest.o
2915 +configure:4331: $? = 0
2916 +configure:4341: result: yes
2917 +configure:4345: checking sys/uio.h presence
2918 +configure:4356: gcc -E -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include conftest.c
2919 +configure:4362: $? = 0
2920 +configure:4381: result: yes
2921 +configure:4417: checking for sys/uio.h
2922 +configure:4424: result: yes
2923 +configure:4442: checking for socket
2924 +configure:4492: gcc -o conftest -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -DENABLE_IPV6 -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -L/usr/local/lib -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 conftest.c -lpng -lz -lpthread >&5
2925 +configure:4495: $? = 0
2926 +configure:4498: test -s conftest
2927 +configure:4501: $? = 0
2928 +configure:4512: result: yes
2929 +configure:4635: creating ./config.status
2931 +## ---------------- ##
2932 +## Cache variables. ##
2933 +## ---------------- ##
2935 +ac_cv_c_compiler_gnu=yes
2937 +ac_cv_env_CC_value=
2938 +ac_cv_env_CFLAGS_set=
2939 +ac_cv_env_CFLAGS_value=
2940 +ac_cv_env_CPPFLAGS_set=
2941 +ac_cv_env_CPPFLAGS_value=
2943 +ac_cv_env_CPP_value=
2944 +ac_cv_env_LDFLAGS_set=
2945 +ac_cv_env_LDFLAGS_value=
2946 +ac_cv_env_build_alias_set=
2947 +ac_cv_env_build_alias_value=
2948 +ac_cv_env_host_alias_set=
2949 +ac_cv_env_host_alias_value=
2950 +ac_cv_env_target_alias_set=
2951 +ac_cv_env_target_alias_value=
2953 +ac_cv_func_socket=yes
2954 +ac_cv_header_fcntl_h=yes
2955 +ac_cv_header_inttypes_h=yes
2956 +ac_cv_header_jconfig_h=yes
2957 +ac_cv_header_jerror_h=yes
2958 +ac_cv_header_jmorecfg_h=yes
2959 +ac_cv_header_jpeglib_h=yes
2960 +ac_cv_header_memory_h=yes
2961 +ac_cv_header_stdc=yes
2962 +ac_cv_header_stdint_h=yes
2963 +ac_cv_header_stdlib_h=yes
2964 +ac_cv_header_string_h=yes
2965 +ac_cv_header_strings_h=yes
2966 +ac_cv_header_sys_stat_h=yes
2967 +ac_cv_header_sys_types_h=yes
2968 +ac_cv_header_sys_uio_h=yes
2969 +ac_cv_header_unistd_h=yes
2970 +ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
2971 +ac_cv_lib_png_png_check_sig=yes
2972 +ac_cv_lib_pthread_pthread_create=yes
2973 +ac_cv_lib_z_zlibVersion=yes
2975 +ac_cv_path_PKG_CONFIG=/usr/bin/pkg-config
2976 +ac_cv_path_install='/usr/bin/install -c'
2977 +ac_cv_prog_AWK=gawk
2978 +ac_cv_prog_CPP='gcc -E'
2979 +ac_cv_prog_ac_ct_CC=gcc
2980 +ac_cv_prog_ac_ct_RANLIB=ranlib
2981 +ac_cv_prog_cc_g=yes
2982 +ac_cv_prog_cc_stdc=
2983 +ac_cv_prog_egrep='grep -E'
2984 +ac_cv_prog_make_make_set=yes
2985 +am_cv_CC_dependencies_compiler_type=gcc3
2986 +am_cv_prog_cc_stdc=
2988 +## ----------------- ##
2989 +## Output variables. ##
2990 +## ----------------- ##
2992 +ACLOCAL='aclocal-1.6'
2997 +AUTOCONF='autoconf'
2998 +AUTOHEADER='autoheader'
2999 +AUTOMAKE='automake-1.6'
3002 +CCDEPMODE='depmode=gcc3'
3003 +CFLAGS='-g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -DENABLE_IPV6'
3005 +CPPFLAGS=' -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include '
3006 +DEFS='-DHAVE_CONFIG_H'
3013 +GTK_CFLAGS='-I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include '
3014 +GTK_LIBS='-Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 '
3015 +INSTALL_DATA='${INSTALL} -m 644'
3016 +INSTALL_PROGRAM='${INSTALL}'
3017 +INSTALL_SCRIPT='${INSTALL}'
3018 +INSTALL_STRIP_PROGRAM='${SHELL} $(install_sh) -c -s'
3019 +LDFLAGS=' -L/usr/local/lib -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 '
3020 +LIBJPEG_LIB='-ljpeg'
3022 +LIBS='-lpng -lz -lpthread '
3024 +MAKEINFO='makeinfo'
3027 +PACKAGE_BUGREPORT=''
3033 +PKG_CONFIG='/usr/bin/pkg-config'
3040 +ac_ct_RANLIB='ranlib'
3042 +am__include='include'
3045 +bindir='${exec_prefix}/bin'
3047 +datadir='${prefix}/share'
3049 +exec_prefix='${prefix}'
3051 +includedir='${prefix}/include'
3052 +infodir='${prefix}/info'
3053 +install_sh='/home/pb/dillo2/install-sh'
3055 +libdir='${exec_prefix}/lib'
3056 +libexecdir='${exec_prefix}/libexec'
3057 +localstatedir='${prefix}/var'
3058 +mandir='${prefix}/man'
3059 +oldincludedir='/usr/include'
3061 +program_transform_name='s,x,x,'
3062 +sbindir='${exec_prefix}/sbin'
3063 +sharedstatedir='${prefix}/com'
3065 +sysconfdir='${prefix}/etc'
3073 +#define HAVE_FCNTL_H 1
3074 +#define HAVE_INTTYPES_H 1
3075 +#define HAVE_JCONFIG_H 1
3076 +#define HAVE_JERROR_H 1
3077 +#define HAVE_JMORECFG_H 1
3078 +#define HAVE_JPEGLIB_H 1
3079 +#define HAVE_LIBPNG 1
3080 +#define HAVE_LIBPTHREAD 1
3081 +#define HAVE_LIBZ 1
3082 +#define HAVE_MEMORY_H 1
3083 +#define HAVE_SOCKET 1
3084 +#define HAVE_STDINT_H 1
3085 +#define HAVE_STDLIB_H 1
3086 +#define HAVE_STRINGS_H 1
3087 +#define HAVE_STRING_H 1
3088 +#define HAVE_SYS_STAT_H 1
3089 +#define HAVE_SYS_TYPES_H 1
3090 +#define HAVE_SYS_UIO_H 1
3091 +#define HAVE_UNISTD_H 1
3092 +#define HAVE_UNISTD_H 1
3093 +#define PACKAGE "dillo"
3094 +#define PACKAGE_BUGREPORT ""
3095 +#define PACKAGE_NAME ""
3096 +#define PACKAGE_STRING ""
3097 +#define PACKAGE_TARNAME ""
3098 +#define PACKAGE_VERSION ""
3099 +#define STDC_HEADERS 1
3100 +#define STDC_HEADERS 1
3101 +#define VERSION "0.6.6"
3105 +## ---------------------- ##
3106 +## Running config.status. ##
3107 +## ---------------------- ##
3109 +This file was extended by config.status, which was
3110 +generated by GNU Autoconf 2.57. Invocation command line was
3116 + $ ./config.status Makefile
3120 +config.status:662: creating Makefile
3122 +## ---------------------- ##
3123 +## Running config.status. ##
3124 +## ---------------------- ##
3126 +This file was extended by config.status, which was
3127 +generated by GNU Autoconf 2.57. Invocation command line was
3133 + $ ./config.status config.h
3137 +config.status:766: creating config.h
3138 +config.status:895: config.h is unchanged
3140 +## ---------------------- ##
3141 +## Running config.status. ##
3142 +## ---------------------- ##
3144 +This file was extended by config.status, which was
3145 +generated by GNU Autoconf 2.57. Invocation command line was
3151 + $ ./config.status doc/Makefile
3155 +config.status:662: creating doc/Makefile
3157 +## ---------------------- ##
3158 +## Running config.status. ##
3159 +## ---------------------- ##
3161 +This file was extended by config.status, which was
3162 +generated by GNU Autoconf 2.57. Invocation command line was
3168 + $ ./config.status src/Makefile depfiles
3172 +config.status:662: creating src/Makefile
3173 +config.status:1001: executing depfiles commands
3175 +## ---------------------- ##
3176 +## Running config.status. ##
3177 +## ---------------------- ##
3179 +This file was extended by config.status, which was
3180 +generated by GNU Autoconf 2.57. Invocation command line was
3186 + $ ./config.status src/IO/Makefile depfiles
3190 +config.status:662: creating src/IO/Makefile
3191 +config.status:1001: executing depfiles commands
3192 diff -urN dillo-0.6.6/config.status dillo2-0.6.6/config.status
3193 --- dillo-0.6.6/config.status 1969-12-31 17:00:00.000000000 -0700
3194 +++ dillo2-0.6.6/config.status 2003-04-21 14:26:40.000000000 -0600
3197 +# Generated by configure.
3198 +# Run this file to recreate the current configuration.
3199 +# Compiler output produced by configure, useful for debugging
3200 +# configure, is in config.log if it exists.
3203 +ac_cs_recheck=false
3205 +SHELL=${CONFIG_SHELL-/bin/sh}
3206 +## --------------------- ##
3207 +## M4sh Initialization. ##
3208 +## --------------------- ##
3210 +# Be Bourne compatible
3211 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
3214 + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
3215 + # is contrary to our usage. Disable this feature.
3216 + alias -g '${1+"$@"}'='"$@"'
3217 +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
3221 +# Support unset when possible.
3222 +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
3229 +# Work around bugs in pre-3.0 UWIN ksh.
3230 +$as_unset ENV MAIL MAILPATH
3237 + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
3238 + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
3239 + LC_TELEPHONE LC_TIME
3241 + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
3242 + eval $as_var=C; export $as_var
3248 +# Required to use basename.
3249 +if expr a : '\(a\)' >/dev/null 2>&1; then
3255 +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
3256 + as_basename=basename
3262 +# Name of the executable.
3263 +as_me=`$as_basename "$0" ||
3264 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
3265 + X"$0" : 'X\(//\)$' \| \
3266 + X"$0" : 'X\(/\)$' \| \
3267 + . : '\(.\)' 2>/dev/null ||
3269 + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
3270 + /^X\/\(\/\/\)$/{ s//\1/; q; }
3271 + /^X\/\(\/\).*/{ s//\1/; q; }
3275 +# PATH needs CR, and LINENO needs CR and PATH.
3276 +# Avoid depending upon Character Ranges.
3277 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
3278 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
3279 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
3280 +as_cr_digits='0123456789'
3281 +as_cr_alnum=$as_cr_Letters$as_cr_digits
3283 +# The user is always right.
3284 +if test "${PATH_SEPARATOR+set}" != set; then
3285 + echo "#! /bin/sh" >conf$$.sh
3286 + echo "exit 0" >>conf$$.sh
3287 + chmod +x conf$$.sh
3288 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
3289 + PATH_SEPARATOR=';'
3297 + as_lineno_1=$LINENO
3298 + as_lineno_2=$LINENO
3299 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
3300 + test "x$as_lineno_1" != "x$as_lineno_2" &&
3301 + test "x$as_lineno_3" = "x$as_lineno_2" || {
3302 + # Find who we are. Look in the path if we contain no path at all
3303 + # relative or not.
3305 + *[\\/]* ) as_myself=$0 ;;
3306 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3307 +for as_dir in $PATH
3310 + test -z "$as_dir" && as_dir=.
3311 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
3316 + # We did not find ourselves, most probably we were run as `sh COMMAND'
3317 + # in which case we are not to be found in the path.
3318 + if test "x$as_myself" = x; then
3321 + if test ! -f "$as_myself"; then
3322 + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
3323 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
3324 + { (exit 1); exit 1; }; }
3326 + case $CONFIG_SHELL in
3328 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3329 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
3332 + test -z "$as_dir" && as_dir=.
3333 + for as_base in sh bash ksh sh5; do
3336 + if ("$as_dir/$as_base" -c '
3337 + as_lineno_1=$LINENO
3338 + as_lineno_2=$LINENO
3339 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
3340 + test "x$as_lineno_1" != "x$as_lineno_2" &&
3341 + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
3342 + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
3343 + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
3344 + CONFIG_SHELL=$as_dir/$as_base
3345 + export CONFIG_SHELL
3346 + exec "$CONFIG_SHELL" "$0" ${1+"$@"}
3354 + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
3355 + # uniformly replaced by the line number. The first 'sed' inserts a
3356 + # line-number line before each line; the second 'sed' does the real
3357 + # work. The second script uses 'N' to pair each line-number line
3358 + # with the numbered line, and appends trailing '-' during
3359 + # substitution so that $LINENO is not a special case at line end.
3360 + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
3361 + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
3362 + sed '=' <$as_myself |
3367 + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
3370 + s,^['$as_cr_digits']*\n,,
3371 + ' >$as_me.lineno &&
3372 + chmod +x $as_me.lineno ||
3373 + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
3374 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
3375 + { (exit 1); exit 1; }; }
3377 + # Don't try to exec as it changes $[0], causing all sort of problems
3378 + # (the dirname of $[0] is not the place where we might find the
3379 + # original and so on. Autoconf is especially sensible to this).
3381 + # Exit status is that of the last command.
3386 +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
3387 + *c*,-n*) ECHO_N= ECHO_C='
3389 + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
3390 + *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
3393 +if expr a : '\(a\)' >/dev/null 2>&1; then
3399 +rm -f conf$$ conf$$.exe conf$$.file
3401 +if ln -s conf$$.file conf$$ 2>/dev/null; then
3402 + # We could just check for DJGPP; but this test a) works b) is more generic
3403 + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
3404 + if test -f conf$$.exe; then
3405 + # Don't use ln at all; we don't have any links
3410 +elif ln conf$$.file conf$$ 2>/dev/null; then
3415 +rm -f conf$$ conf$$.exe conf$$.file
3417 +if mkdir -p . 2>/dev/null; then
3423 +as_executable_p="test -f"
3425 +# Sed expression to map a string onto a valid CPP name.
3426 +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
3428 +# Sed expression to map a string onto a valid variable name.
3429 +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
3433 +# We need space, tab and new line, in precisely that order.
3443 +# Open the log real soon, to keep \$[0] and so on meaningful, and to
3444 +# report actual input values of CONFIG_FILES etc. instead of their
3445 +# values after options handling. Logging --version etc. is OK.
3449 + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
3450 +## Running $as_me. ##
3455 +This file was extended by $as_me, which was
3456 +generated by GNU Autoconf 2.57. Invocation command line was
3458 + CONFIG_FILES = $CONFIG_FILES
3459 + CONFIG_HEADERS = $CONFIG_HEADERS
3460 + CONFIG_LINKS = $CONFIG_LINKS
3461 + CONFIG_COMMANDS = $CONFIG_COMMANDS
3465 +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
3467 +config_files=" Makefile doc/Makefile src/Makefile src/IO/Makefile"
3468 +config_headers=" config.h"
3469 +config_commands=" depfiles"
3472 +\`$as_me' instantiates files from templates according to the
3473 +current configuration.
3475 +Usage: $0 [OPTIONS] [FILE]...
3477 + -h, --help print this help, then exit
3478 + -V, --version print version number, then exit
3479 + -q, --quiet do not print progress messages
3480 + -d, --debug don't remove temporary files
3481 + --recheck update $as_me by reconfiguring in the same conditions
3482 + --file=FILE[:TEMPLATE]
3483 + instantiate the configuration file FILE
3484 + --header=FILE[:TEMPLATE]
3485 + instantiate the configuration header FILE
3487 +Configuration files:
3490 +Configuration headers:
3493 +Configuration commands:
3496 +Report bugs to <bug-autoconf@gnu.org>."
3499 +configured by ./configure, generated by GNU Autoconf 2.57,
3500 + with options \"'--prefix=/usr' '--enable-ipv6'\"
3502 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
3503 +Free Software Foundation, Inc.
3504 +This config.status script is free software; the Free Software Foundation
3505 +gives unlimited permission to copy, distribute and modify it."
3507 +INSTALL="/usr/bin/install -c"
3508 +# If no file are specified by the user, then we need to provide default
3509 +# value. By we need to know if files were specified by the user.
3515 + ac_option=`expr "x$1" : 'x\([^=]*\)='`
3516 + ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
3524 + *) # This is not an option, so the user has probably given explicit
3527 + ac_need_defaults=false;;
3530 + case $ac_option in
3531 + # Handling of the options.
3532 + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
3533 + ac_cs_recheck=: ;;
3534 + --version | --vers* | -V )
3535 + echo "$ac_cs_version"; exit 0 ;;
3537 + # Conflict between --help and --header
3538 + { { echo "$as_me:$LINENO: error: ambiguous option: $1
3539 +Try \`$0 --help' for more information." >&5
3540 +echo "$as_me: error: ambiguous option: $1
3541 +Try \`$0 --help' for more information." >&2;}
3542 + { (exit 1); exit 1; }; };;
3543 + --help | --hel | -h )
3544 + echo "$ac_cs_usage"; exit 0 ;;
3545 + --debug | --d* | -d )
3547 + --file | --fil | --fi | --f )
3549 + CONFIG_FILES="$CONFIG_FILES $ac_optarg"
3550 + ac_need_defaults=false;;
3551 + --header | --heade | --head | --hea )
3553 + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
3554 + ac_need_defaults=false;;
3555 + -q | -quiet | --quiet | --quie | --qui | --qu | --q \
3556 + | -silent | --silent | --silen | --sile | --sil | --si | --s)
3559 + # This is an error.
3560 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
3561 +Try \`$0 --help' for more information." >&5
3562 +echo "$as_me: error: unrecognized option: $1
3563 +Try \`$0 --help' for more information." >&2;}
3564 + { (exit 1); exit 1; }; } ;;
3566 + *) ac_config_targets="$ac_config_targets $1" ;;
3572 +ac_configure_extra_args=
3574 +if $ac_cs_silent; then
3576 + ac_configure_extra_args="$ac_configure_extra_args --silent"
3579 +if $ac_cs_recheck; then
3580 + echo "running /bin/sh ./configure " '--prefix=/usr' '--enable-ipv6' $ac_configure_extra_args " --no-create --no-recursion" >&6
3581 + exec /bin/sh ./configure '--prefix=/usr' '--enable-ipv6' $ac_configure_extra_args --no-create --no-recursion
3585 +# INIT-COMMANDS section.
3588 +AMDEP_TRUE="" ac_aux_dir="."
3590 +for ac_config_target in $ac_config_targets
3592 + case "$ac_config_target" in
3593 + # Handling of arguments.
3594 + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
3595 + "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
3596 + "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
3597 + "src/IO/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/IO/Makefile" ;;
3598 + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
3599 + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
3600 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
3601 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
3602 + { (exit 1); exit 1; }; };;
3606 +# If the user did not use the arguments to specify the items to instantiate,
3607 +# then the envvar interface is used. Set only those that are not.
3608 +# We use the long form for the default assignment because of an extremely
3609 +# bizarre bug on SunOS 4.1.3.
3610 +if $ac_need_defaults; then
3611 + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
3612 + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
3613 + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
3616 +# Have a temporary directory for convenience. Make it in the build tree
3617 +# simply because there is no reason to put it here, and in addition,
3618 +# creating and moving files from /tmp can sometimes cause problems.
3619 +# Create a temporary directory, and hook for its removal unless debugging.
3622 + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
3623 + trap '{ (exit 1); exit 1; }' 1 2 13 15
3626 +# Create a (secure) tmp directory for tmp files.
3629 + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
3630 + test -n "$tmp" && test -d "$tmp"
3633 + tmp=./confstat$$-$RANDOM
3634 + (umask 077 && mkdir $tmp)
3637 + echo "$me: cannot create a temporary directory in ." >&2
3638 + { (exit 1); exit 1; }
3643 +# CONFIG_FILES section.
3646 +# No need to generate the scripts if there are no CONFIG_FILES.
3647 +# This happens for instance when ./config.status config.h
3648 +if test -n "$CONFIG_FILES"; then
3649 + # Protect against being on the right side of a sed subst in config.status.
3650 + sed 's/,@/@@/; s/@,/@@/; s/,;t t$/@;t t/; /@;t t$/s/[\\&,]/\\&/g;
3651 + s/@@/,@/; s/@@/@,/; s/@;t t$/,;t t/' >$tmp/subs.sed <<\CEOF
3652 +s,@SHELL@,/bin/sh,;t t
3653 +s,@PATH_SEPARATOR@,:,;t t
3654 +s,@PACKAGE_NAME@,,;t t
3655 +s,@PACKAGE_TARNAME@,,;t t
3656 +s,@PACKAGE_VERSION@,,;t t
3657 +s,@PACKAGE_STRING@,,;t t
3658 +s,@PACKAGE_BUGREPORT@,,;t t
3659 +s,@exec_prefix@,${prefix},;t t
3660 +s,@prefix@,/usr,;t t
3661 +s,@program_transform_name@,s,x,x,,;t t
3662 +s,@bindir@,${exec_prefix}/bin,;t t
3663 +s,@sbindir@,${exec_prefix}/sbin,;t t
3664 +s,@libexecdir@,${exec_prefix}/libexec,;t t
3665 +s,@datadir@,${prefix}/share,;t t
3666 +s,@sysconfdir@,${prefix}/etc,;t t
3667 +s,@sharedstatedir@,${prefix}/com,;t t
3668 +s,@localstatedir@,${prefix}/var,;t t
3669 +s,@libdir@,${exec_prefix}/lib,;t t
3670 +s,@includedir@,${prefix}/include,;t t
3671 +s,@oldincludedir@,/usr/include,;t t
3672 +s,@infodir@,${prefix}/info,;t t
3673 +s,@mandir@,${prefix}/man,;t t
3674 +s,@build_alias@,,;t t
3675 +s,@host_alias@,,;t t
3676 +s,@target_alias@,,;t t
3677 +s,@DEFS@,-DHAVE_CONFIG_H,;t t
3681 +s,@LIBS@,-lpng -lz -lpthread ,;t t
3682 +s,@INSTALL_PROGRAM@,${INSTALL},;t t
3683 +s,@INSTALL_SCRIPT@,${INSTALL},;t t
3684 +s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
3685 +s,@PACKAGE@,dillo,;t t
3686 +s,@VERSION@,0.6.6,;t t
3687 +s,@ACLOCAL@,aclocal-1.6,;t t
3688 +s,@AUTOCONF@,autoconf,;t t
3689 +s,@AUTOMAKE@,automake-1.6,;t t
3690 +s,@AUTOHEADER@,autoheader,;t t
3691 +s,@MAKEINFO@,makeinfo,;t t
3693 +s,@install_sh@,/home/pb/dillo2/install-sh,;t t
3695 +s,@ac_ct_STRIP@,,;t t
3696 +s,@INSTALL_STRIP_PROGRAM@,${SHELL} $(install_sh) -c -s,;t t
3700 +s,@CFLAGS@,-g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -DENABLE_IPV6,;t t
3701 +s,@LDFLAGS@, -L/usr/local/lib -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 ,;t t
3702 +s,@CPPFLAGS@, -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include ,;t t
3703 +s,@ac_ct_CC@,gcc,;t t
3706 +s,@DEPDIR@,.deps,;t t
3707 +s,@am__include@,include,;t t
3708 +s,@am__quote@,,;t t
3709 +s,@AMDEP_TRUE@,,;t t
3710 +s,@AMDEP_FALSE@,#,;t t
3711 +s,@AMDEPBACKSLASH@,\,;t t
3712 +s,@CCDEPMODE@,depmode=gcc3,;t t
3713 +s,@RANLIB@,ranlib,;t t
3714 +s,@ac_ct_RANLIB@,ranlib,;t t
3715 +s,@PKG_CONFIG@,/usr/bin/pkg-config,;t t
3716 +s,@GTK_CFLAGS@,-I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include ,;t t
3717 +s,@GTK_LIBS@,-Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 ,;t t
3718 +s,@CPP@,gcc -E,;t t
3719 +s,@EGREP@,grep -E,;t t
3720 +s,@LIBJPEG_LIB@,-ljpeg,;t t
3727 +s,@LTLIBOBJS@,,;t t
3730 + # Split the substitutions into bite-sized pieces for seds with
3731 + # small command number limits, like on Digital OSF/1 and HP-UX.
3732 + ac_max_sed_lines=48
3733 + ac_sed_frag=1 # Number of current file.
3734 + ac_beg=1 # First line for current file.
3735 + ac_end=$ac_max_sed_lines # Line after last line for current file.
3738 + while $ac_more_lines; do
3739 + if test $ac_beg -gt 1; then
3740 + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
3742 + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
3744 + if test ! -s $tmp/subs.frag; then
3745 + ac_more_lines=false
3747 + # The purpose of the label and of the branching condition is to
3748 + # speed up the sed processing (if there are no `@' at all, there
3749 + # is no need to browse any of the substitutions).
3750 + # These are the two extra sed commands mentioned above.
3752 + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
3753 + if test -z "$ac_sed_cmds"; then
3754 + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
3756 + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
3758 + ac_sed_frag=`expr $ac_sed_frag + 1`
3760 + ac_end=`expr $ac_end + $ac_max_sed_lines`
3763 + if test -z "$ac_sed_cmds"; then
3766 +fi # test -n "$CONFIG_FILES"
3768 +for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
3769 + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
3771 + - | *:- | *:-:* ) # input from stdin
3773 + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
3774 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
3775 + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
3776 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
3777 + * ) ac_file_in=$ac_file.in ;;
3780 + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
3781 + ac_dir=`(dirname "$ac_file") 2>/dev/null ||
3782 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
3783 + X"$ac_file" : 'X\(//\)[^/]' \| \
3784 + X"$ac_file" : 'X\(//\)$' \| \
3785 + X"$ac_file" : 'X\(/\)' \| \
3786 + . : '\(.\)' 2>/dev/null ||
3788 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
3789 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
3790 + /^X\(\/\/\)$/{ s//\1/; q; }
3791 + /^X\(\/\).*/{ s//\1/; q; }
3793 + { if $as_mkdir_p; then
3794 + mkdir -p "$ac_dir"
3798 + while test ! -d "$as_dir"; do
3799 + as_dirs="$as_dir $as_dirs"
3800 + as_dir=`(dirname "$as_dir") 2>/dev/null ||
3801 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
3802 + X"$as_dir" : 'X\(//\)[^/]' \| \
3803 + X"$as_dir" : 'X\(//\)$' \| \
3804 + X"$as_dir" : 'X\(/\)' \| \
3805 + . : '\(.\)' 2>/dev/null ||
3807 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
3808 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
3809 + /^X\(\/\/\)$/{ s//\1/; q; }
3810 + /^X\(\/\).*/{ s//\1/; q; }
3813 + test ! -n "$as_dirs" || mkdir $as_dirs
3814 + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
3815 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
3816 + { (exit 1); exit 1; }; }; }
3820 +if test "$ac_dir" != .; then
3821 + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
3822 + # A "../" for each directory in $ac_dir_suffix.
3823 + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
3825 + ac_dir_suffix= ac_top_builddir=
3829 + .) # No --srcdir option. We are building in place.
3831 + if test -z "$ac_top_builddir"; then
3834 + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
3836 + [\\/]* | ?:[\\/]* ) # Absolute path.
3837 + ac_srcdir=$srcdir$ac_dir_suffix;
3838 + ac_top_srcdir=$srcdir ;;
3839 + *) # Relative path.
3840 + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
3841 + ac_top_srcdir=$ac_top_builddir$srcdir ;;
3843 +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
3845 +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
3846 +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
3847 +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
3848 +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
3852 + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
3853 + *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
3856 + if test x"$ac_file" != x-; then
3857 + { echo "$as_me:$LINENO: creating $ac_file" >&5
3858 +echo "$as_me: creating $ac_file" >&6;}
3861 + # Let's still pretend it is `configure' which instantiates (i.e., don't
3862 + # use $as_me), people would be surprised to read:
3863 + # /* config.h. Generated by config.status. */
3864 + if test x"$ac_file" = x-; then
3867 + configure_input="$ac_file. "
3869 + configure_input=$configure_input"Generated from `echo $ac_file_in |
3870 + sed 's,.*/,,'` by configure."
3872 + # First look for the input files in the build tree, otherwise in the
3874 + ac_file_inputs=`IFS=:
3875 + for f in $ac_file_in; do
3877 + -) echo $tmp/stdin ;;
3879 + # Absolute (can't be DOS-style, as IFS=:)
3880 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
3881 +echo "$as_me: error: cannot find input file: $f" >&2;}
3882 + { (exit 1); exit 1; }; }
3885 + if test -f "$f"; then
3888 + elif test -f "$srcdir/$f"; then
3893 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
3894 +echo "$as_me: error: cannot find input file: $f" >&2;}
3895 + { (exit 1); exit 1; }; }
3898 + done` || { (exit 1); exit 1; }
3899 + sed "/^[ ]*VPATH[ ]*=/{
3900 +s/:*\$(srcdir):*/:/;
3901 +s/:*\${srcdir}:*/:/;
3903 +s/^\([^=]*=[ ]*\):*/\1/;
3909 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
3910 +s,@configure_input@,$configure_input,;t t
3911 +s,@srcdir@,$ac_srcdir,;t t
3912 +s,@abs_srcdir@,$ac_abs_srcdir,;t t
3913 +s,@top_srcdir@,$ac_top_srcdir,;t t
3914 +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
3915 +s,@builddir@,$ac_builddir,;t t
3916 +s,@abs_builddir@,$ac_abs_builddir,;t t
3917 +s,@top_builddir@,$ac_top_builddir,;t t
3918 +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
3919 +s,@INSTALL@,$ac_INSTALL,;t t
3920 +" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
3922 + if test x"$ac_file" != x-; then
3923 + mv $tmp/out $ac_file
3932 +# CONFIG_HEADER section.
3935 +# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
3936 +# NAME is the cpp macro being defined and VALUE is the value it is being given.
3938 +# ac_d sets the value in "#define NAME VALUE" lines.
3939 +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
3940 +ac_dB='[ ].*$,\1#\2'
3943 +# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
3944 +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
3945 +ac_uB='$,\1#\2define\3'
3949 +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
3950 + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
3952 + - | *:- | *:-:* ) # input from stdin
3954 + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
3955 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
3956 + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
3957 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
3958 + * ) ac_file_in=$ac_file.in ;;
3961 + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
3962 +echo "$as_me: creating $ac_file" >&6;}
3964 + # First look for the input files in the build tree, otherwise in the
3966 + ac_file_inputs=`IFS=:
3967 + for f in $ac_file_in; do
3969 + -) echo $tmp/stdin ;;
3971 + # Absolute (can't be DOS-style, as IFS=:)
3972 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
3973 +echo "$as_me: error: cannot find input file: $f" >&2;}
3974 + { (exit 1); exit 1; }; }
3977 + if test -f "$f"; then
3980 + elif test -f "$srcdir/$f"; then
3985 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
3986 +echo "$as_me: error: cannot find input file: $f" >&2;}
3987 + { (exit 1); exit 1; }; }
3990 + done` || { (exit 1); exit 1; }
3991 + # Remove the trailing spaces.
3992 + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
3994 + # Handle all the #define templates only if necessary.
3995 + if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then
3996 + # If there are no defines, we may have an empty if/fi
3998 + cat >$tmp/defines.sed <<CEOF
3999 +/^[ ]*#[ ]*define/!b
4002 +${ac_dA}PACKAGE_NAME${ac_dB}PACKAGE_NAME${ac_dC}""${ac_dD}
4003 +${ac_dA}PACKAGE_TARNAME${ac_dB}PACKAGE_TARNAME${ac_dC}""${ac_dD}
4004 +${ac_dA}PACKAGE_VERSION${ac_dB}PACKAGE_VERSION${ac_dC}""${ac_dD}
4005 +${ac_dA}PACKAGE_STRING${ac_dB}PACKAGE_STRING${ac_dC}""${ac_dD}
4006 +${ac_dA}PACKAGE_BUGREPORT${ac_dB}PACKAGE_BUGREPORT${ac_dC}""${ac_dD}
4007 +${ac_dA}PACKAGE${ac_dB}PACKAGE${ac_dC}"dillo"${ac_dD}
4008 +${ac_dA}VERSION${ac_dB}VERSION${ac_dC}"0.6.6"${ac_dD}
4009 +${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD}
4010 +${ac_dA}HAVE_SYS_TYPES_H${ac_dB}HAVE_SYS_TYPES_H${ac_dC}1${ac_dD}
4011 +${ac_dA}HAVE_SYS_STAT_H${ac_dB}HAVE_SYS_STAT_H${ac_dC}1${ac_dD}
4012 +${ac_dA}HAVE_STDLIB_H${ac_dB}HAVE_STDLIB_H${ac_dC}1${ac_dD}
4013 +${ac_dA}HAVE_STRING_H${ac_dB}HAVE_STRING_H${ac_dC}1${ac_dD}
4014 +${ac_dA}HAVE_MEMORY_H${ac_dB}HAVE_MEMORY_H${ac_dC}1${ac_dD}
4015 +${ac_dA}HAVE_STRINGS_H${ac_dB}HAVE_STRINGS_H${ac_dC}1${ac_dD}
4016 +${ac_dA}HAVE_INTTYPES_H${ac_dB}HAVE_INTTYPES_H${ac_dC}1${ac_dD}
4017 +${ac_dA}HAVE_STDINT_H${ac_dB}HAVE_STDINT_H${ac_dC}1${ac_dD}
4018 +${ac_dA}HAVE_UNISTD_H${ac_dB}HAVE_UNISTD_H${ac_dC}1${ac_dD}
4019 +${ac_dA}HAVE_JPEGLIB_H${ac_dB}HAVE_JPEGLIB_H${ac_dC}1${ac_dD}
4020 +${ac_dA}HAVE_JCONFIG_H${ac_dB}HAVE_JCONFIG_H${ac_dC}1${ac_dD}
4021 +${ac_dA}HAVE_JERROR_H${ac_dB}HAVE_JERROR_H${ac_dC}1${ac_dD}
4022 +${ac_dA}HAVE_JMORECFG_H${ac_dB}HAVE_JMORECFG_H${ac_dC}1${ac_dD}
4023 +${ac_dA}HAVE_LIBPTHREAD${ac_dB}HAVE_LIBPTHREAD${ac_dC}1${ac_dD}
4024 +${ac_dA}HAVE_LIBZ${ac_dB}HAVE_LIBZ${ac_dC}1${ac_dD}
4025 +${ac_dA}HAVE_LIBPNG${ac_dB}HAVE_LIBPNG${ac_dC}1${ac_dD}
4026 +${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD}
4027 +${ac_dA}HAVE_FCNTL_H${ac_dB}HAVE_FCNTL_H${ac_dC}1${ac_dD}
4028 +${ac_dA}HAVE_UNISTD_H${ac_dB}HAVE_UNISTD_H${ac_dC}1${ac_dD}
4029 +${ac_dA}HAVE_SYS_UIO_H${ac_dB}HAVE_SYS_UIO_H${ac_dC}1${ac_dD}
4030 +${ac_dA}HAVE_SOCKET${ac_dB}HAVE_SOCKET${ac_dC}1${ac_dD}
4032 + sed -f $tmp/defines.sed $tmp/in >$tmp/out
4034 + mv $tmp/out $tmp/in
4038 + # Handle all the #undef templates
4039 + cat >$tmp/undefs.sed <<CEOF
4040 +/^[ ]*#[ ]*undef/!b
4043 +${ac_uA}PACKAGE_NAME${ac_uB}PACKAGE_NAME${ac_uC}""${ac_uD}
4044 +${ac_uA}PACKAGE_TARNAME${ac_uB}PACKAGE_TARNAME${ac_uC}""${ac_uD}
4045 +${ac_uA}PACKAGE_VERSION${ac_uB}PACKAGE_VERSION${ac_uC}""${ac_uD}
4046 +${ac_uA}PACKAGE_STRING${ac_uB}PACKAGE_STRING${ac_uC}""${ac_uD}
4047 +${ac_uA}PACKAGE_BUGREPORT${ac_uB}PACKAGE_BUGREPORT${ac_uC}""${ac_uD}
4048 +${ac_uA}PACKAGE${ac_uB}PACKAGE${ac_uC}"dillo"${ac_uD}
4049 +${ac_uA}VERSION${ac_uB}VERSION${ac_uC}"0.6.6"${ac_uD}
4050 +${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD}
4051 +${ac_uA}HAVE_SYS_TYPES_H${ac_uB}HAVE_SYS_TYPES_H${ac_uC}1${ac_uD}
4052 +${ac_uA}HAVE_SYS_STAT_H${ac_uB}HAVE_SYS_STAT_H${ac_uC}1${ac_uD}
4053 +${ac_uA}HAVE_STDLIB_H${ac_uB}HAVE_STDLIB_H${ac_uC}1${ac_uD}
4054 +${ac_uA}HAVE_STRING_H${ac_uB}HAVE_STRING_H${ac_uC}1${ac_uD}
4055 +${ac_uA}HAVE_MEMORY_H${ac_uB}HAVE_MEMORY_H${ac_uC}1${ac_uD}
4056 +${ac_uA}HAVE_STRINGS_H${ac_uB}HAVE_STRINGS_H${ac_uC}1${ac_uD}
4057 +${ac_uA}HAVE_INTTYPES_H${ac_uB}HAVE_INTTYPES_H${ac_uC}1${ac_uD}
4058 +${ac_uA}HAVE_STDINT_H${ac_uB}HAVE_STDINT_H${ac_uC}1${ac_uD}
4059 +${ac_uA}HAVE_UNISTD_H${ac_uB}HAVE_UNISTD_H${ac_uC}1${ac_uD}
4060 +${ac_uA}HAVE_JPEGLIB_H${ac_uB}HAVE_JPEGLIB_H${ac_uC}1${ac_uD}
4061 +${ac_uA}HAVE_JCONFIG_H${ac_uB}HAVE_JCONFIG_H${ac_uC}1${ac_uD}
4062 +${ac_uA}HAVE_JERROR_H${ac_uB}HAVE_JERROR_H${ac_uC}1${ac_uD}
4063 +${ac_uA}HAVE_JMORECFG_H${ac_uB}HAVE_JMORECFG_H${ac_uC}1${ac_uD}
4064 +${ac_uA}HAVE_LIBPTHREAD${ac_uB}HAVE_LIBPTHREAD${ac_uC}1${ac_uD}
4065 +${ac_uA}HAVE_LIBZ${ac_uB}HAVE_LIBZ${ac_uC}1${ac_uD}
4066 +${ac_uA}HAVE_LIBPNG${ac_uB}HAVE_LIBPNG${ac_uC}1${ac_uD}
4067 +${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD}
4068 +${ac_uA}HAVE_FCNTL_H${ac_uB}HAVE_FCNTL_H${ac_uC}1${ac_uD}
4069 +${ac_uA}HAVE_UNISTD_H${ac_uB}HAVE_UNISTD_H${ac_uC}1${ac_uD}
4070 +${ac_uA}HAVE_SYS_UIO_H${ac_uB}HAVE_SYS_UIO_H${ac_uC}1${ac_uD}
4071 +${ac_uA}HAVE_SOCKET${ac_uB}HAVE_SOCKET${ac_uC}1${ac_uD}
4072 +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
4074 + sed -f $tmp/undefs.sed $tmp/in >$tmp/out
4076 + mv $tmp/out $tmp/in
4078 + # Let's still pretend it is `configure' which instantiates (i.e., don't
4079 + # use $as_me), people would be surprised to read:
4080 + # /* config.h. Generated by config.status. */
4081 + if test x"$ac_file" = x-; then
4082 + echo "/* Generated by configure. */" >$tmp/config.h
4084 + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
4086 + cat $tmp/in >>$tmp/config.h
4088 + if test x"$ac_file" != x-; then
4089 + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
4090 + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
4091 +echo "$as_me: $ac_file is unchanged" >&6;}
4093 + ac_dir=`(dirname "$ac_file") 2>/dev/null ||
4094 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
4095 + X"$ac_file" : 'X\(//\)[^/]' \| \
4096 + X"$ac_file" : 'X\(//\)$' \| \
4097 + X"$ac_file" : 'X\(/\)' \| \
4098 + . : '\(.\)' 2>/dev/null ||
4100 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
4101 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
4102 + /^X\(\/\/\)$/{ s//\1/; q; }
4103 + /^X\(\/\).*/{ s//\1/; q; }
4105 + { if $as_mkdir_p; then
4106 + mkdir -p "$ac_dir"
4110 + while test ! -d "$as_dir"; do
4111 + as_dirs="$as_dir $as_dirs"
4112 + as_dir=`(dirname "$as_dir") 2>/dev/null ||
4113 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
4114 + X"$as_dir" : 'X\(//\)[^/]' \| \
4115 + X"$as_dir" : 'X\(//\)$' \| \
4116 + X"$as_dir" : 'X\(/\)' \| \
4117 + . : '\(.\)' 2>/dev/null ||
4119 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
4120 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
4121 + /^X\(\/\/\)$/{ s//\1/; q; }
4122 + /^X\(\/\).*/{ s//\1/; q; }
4125 + test ! -n "$as_dirs" || mkdir $as_dirs
4126 + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
4127 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
4128 + { (exit 1); exit 1; }; }; }
4131 + mv $tmp/config.h $ac_file
4135 + rm -f $tmp/config.h
4137 + # Run the commands associated with the file.
4139 + config.h ) # update the timestamp
4140 +echo 'timestamp for config.h' >"./stamp-h1"
4146 +# CONFIG_COMMANDS section.
4148 +for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
4149 + ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
4150 + ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
4151 + ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
4152 +$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
4153 + X"$ac_dest" : 'X\(//\)[^/]' \| \
4154 + X"$ac_dest" : 'X\(//\)$' \| \
4155 + X"$ac_dest" : 'X\(/\)' \| \
4156 + . : '\(.\)' 2>/dev/null ||
4158 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
4159 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
4160 + /^X\(\/\/\)$/{ s//\1/; q; }
4161 + /^X\(\/\).*/{ s//\1/; q; }
4165 +if test "$ac_dir" != .; then
4166 + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
4167 + # A "../" for each directory in $ac_dir_suffix.
4168 + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
4170 + ac_dir_suffix= ac_top_builddir=
4174 + .) # No --srcdir option. We are building in place.
4176 + if test -z "$ac_top_builddir"; then
4179 + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
4181 + [\\/]* | ?:[\\/]* ) # Absolute path.
4182 + ac_srcdir=$srcdir$ac_dir_suffix;
4183 + ac_top_srcdir=$srcdir ;;
4184 + *) # Relative path.
4185 + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
4186 + ac_top_srcdir=$ac_top_builddir$srcdir ;;
4188 +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
4190 +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
4191 +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
4192 +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
4193 +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
4196 + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
4197 +echo "$as_me: executing $ac_dest commands" >&6;}
4199 + depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
4200 + # Strip MF so we end up with the name of the file.
4201 + mf=`echo "$mf" | sed -e 's/:.*$//'`
4202 + # Check whether this is an Automake generated Makefile or not.
4203 + # We used to match only the files named `Makefile.in', but
4204 + # some people rename them; so instead we look at the file content.
4205 + # Grep'ing the first line is not enough: some people post-process
4206 + # each Makefile.in and add a new line on top of each file to say so.
4207 + # So let's grep whole file.
4208 + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
4209 + dirpart=`(dirname "$mf") 2>/dev/null ||
4210 +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
4211 + X"$mf" : 'X\(//\)[^/]' \| \
4212 + X"$mf" : 'X\(//\)$' \| \
4213 + X"$mf" : 'X\(/\)' \| \
4214 + . : '\(.\)' 2>/dev/null ||
4216 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
4217 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
4218 + /^X\(\/\/\)$/{ s//\1/; q; }
4219 + /^X\(\/\).*/{ s//\1/; q; }
4224 + grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
4225 + # Extract the definition of DEP_FILES from the Makefile without
4227 + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
4228 + test -z "$DEPDIR" && continue
4229 + # When using ansi2knr, U may be empty or an underscore; expand it
4230 + U=`sed -n -e '/^U = / s///p' < "$mf"`
4231 + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
4232 + # We invoke sed twice because it is the simplest approach to
4233 + # changing $(DEPDIR) to its actual value in the expansion.
4234 + for file in `sed -n -e '
4235 + /^DEP_FILES = .*\\\\$/ {
4244 + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
4245 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
4246 + # Make sure the directory exists.
4247 + test -f "$dirpart/$file" && continue
4248 + fdir=`(dirname "$file") 2>/dev/null ||
4249 +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
4250 + X"$file" : 'X\(//\)[^/]' \| \
4251 + X"$file" : 'X\(//\)$' \| \
4252 + X"$file" : 'X\(/\)' \| \
4253 + . : '\(.\)' 2>/dev/null ||
4255 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
4256 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
4257 + /^X\(\/\/\)$/{ s//\1/; q; }
4258 + /^X\(\/\).*/{ s//\1/; q; }
4260 + { if $as_mkdir_p; then
4261 + mkdir -p $dirpart/$fdir
4263 + as_dir=$dirpart/$fdir
4265 + while test ! -d "$as_dir"; do
4266 + as_dirs="$as_dir $as_dirs"
4267 + as_dir=`(dirname "$as_dir") 2>/dev/null ||
4268 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
4269 + X"$as_dir" : 'X\(//\)[^/]' \| \
4270 + X"$as_dir" : 'X\(//\)$' \| \
4271 + X"$as_dir" : 'X\(/\)' \| \
4272 + . : '\(.\)' 2>/dev/null ||
4274 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
4275 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
4276 + /^X\(\/\/\)$/{ s//\1/; q; }
4277 + /^X\(\/\).*/{ s//\1/; q; }
4280 + test ! -n "$as_dirs" || mkdir $as_dirs
4281 + fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
4282 +echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
4283 + { (exit 1); exit 1; }; }; }
4285 + # echo "creating $dirpart/$file"
4286 + echo '# dummy' > "$dirpart/$file"
4293 +{ (exit 0); exit 0; }
4294 diff -urN dillo-0.6.6/configure dillo2-0.6.6/configure
4295 --- dillo-0.6.6/configure 2002-05-29 15:02:13.000000000 -0600
4296 +++ dillo2-0.6.6/configure 2003-04-21 14:25:39.000000000 -0600
4299 # Guess values for system-dependent variables and create Makefiles.
4300 -# Generated by Autoconf 2.50.
4301 +# Generated by GNU Autoconf 2.57.
4303 -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
4304 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
4305 # Free Software Foundation, Inc.
4306 # This configure script is free software; the Free Software Foundation
4307 # gives unlimited permission to copy, distribute and modify it.
4308 +## --------------------- ##
4309 +## M4sh Initialization. ##
4310 +## --------------------- ##
4312 # Be Bourne compatible
4313 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
4316 + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
4317 + # is contrary to our usage. Disable this feature.
4318 + alias -g '${1+"$@"}'='"$@"'
4319 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
4323 +# Support unset when possible.
4324 +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
4331 +# Work around bugs in pre-3.0 UWIN ksh.
4332 +$as_unset ENV MAIL MAILPATH
4339 + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
4340 + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
4341 + LC_TELEPHONE LC_TIME
4343 + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
4344 + eval $as_var=C; export $as_var
4350 +# Required to use basename.
4351 +if expr a : '\(a\)' >/dev/null 2>&1; then
4357 +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
4358 + as_basename=basename
4364 # Name of the executable.
4365 -as_me=`echo "$0" |sed 's,.*[\\/],,'`
4366 +as_me=`$as_basename "$0" ||
4367 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
4368 + X"$0" : 'X\(//\)$' \| \
4369 + X"$0" : 'X\(/\)$' \| \
4370 + . : '\(.\)' 2>/dev/null ||
4372 + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
4373 + /^X\/\(\/\/\)$/{ s//\1/; q; }
4374 + /^X\/\(\/\).*/{ s//\1/; q; }
4378 +# PATH needs CR, and LINENO needs CR and PATH.
4379 +# Avoid depending upon Character Ranges.
4380 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
4381 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
4382 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
4383 +as_cr_digits='0123456789'
4384 +as_cr_alnum=$as_cr_Letters$as_cr_digits
4386 +# The user is always right.
4387 +if test "${PATH_SEPARATOR+set}" != set; then
4388 + echo "#! /bin/sh" >conf$$.sh
4389 + echo "exit 0" >>conf$$.sh
4390 + chmod +x conf$$.sh
4391 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
4392 + PATH_SEPARATOR=';'
4400 + as_lineno_1=$LINENO
4401 + as_lineno_2=$LINENO
4402 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
4403 + test "x$as_lineno_1" != "x$as_lineno_2" &&
4404 + test "x$as_lineno_3" = "x$as_lineno_2" || {
4405 + # Find who we are. Look in the path if we contain no path at all
4406 + # relative or not.
4408 + *[\\/]* ) as_myself=$0 ;;
4409 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4410 +for as_dir in $PATH
4413 + test -z "$as_dir" && as_dir=.
4414 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
4419 + # We did not find ourselves, most probably we were run as `sh COMMAND'
4420 + # in which case we are not to be found in the path.
4421 + if test "x$as_myself" = x; then
4424 + if test ! -f "$as_myself"; then
4425 + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
4426 + { (exit 1); exit 1; }; }
4428 + case $CONFIG_SHELL in
4430 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4431 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
4434 + test -z "$as_dir" && as_dir=.
4435 + for as_base in sh bash ksh sh5; do
4438 + if ("$as_dir/$as_base" -c '
4439 + as_lineno_1=$LINENO
4440 + as_lineno_2=$LINENO
4441 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
4442 + test "x$as_lineno_1" != "x$as_lineno_2" &&
4443 + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
4444 + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
4445 + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
4446 + CONFIG_SHELL=$as_dir/$as_base
4447 + export CONFIG_SHELL
4448 + exec "$CONFIG_SHELL" "$0" ${1+"$@"}
4456 + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
4457 + # uniformly replaced by the line number. The first 'sed' inserts a
4458 + # line-number line before each line; the second 'sed' does the real
4459 + # work. The second script uses 'N' to pair each line-number line
4460 + # with the numbered line, and appends trailing '-' during
4461 + # substitution so that $LINENO is not a special case at line end.
4462 + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
4463 + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
4464 + sed '=' <$as_myself |
4469 + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
4472 + s,^['$as_cr_digits']*\n,,
4473 + ' >$as_me.lineno &&
4474 + chmod +x $as_me.lineno ||
4475 + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
4476 + { (exit 1); exit 1; }; }
4478 + # Don't try to exec as it changes $[0], causing all sort of problems
4479 + # (the dirname of $[0] is not the place where we might find the
4480 + # original and so on. Autoconf is especially sensible to this).
4482 + # Exit status is that of the last command.
4487 +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
4488 + *c*,-n*) ECHO_N= ECHO_C='
4490 + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
4491 + *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
4494 if expr a : '\(a\)' >/dev/null 2>&1; then
4496 @@ -42,24 +215,20 @@
4498 rm -f conf$$ conf$$.exe conf$$.file
4500 -as_executable_p="test -f"
4502 -# Support unset when possible.
4503 -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
4505 +if mkdir -p . 2>/dev/null; then
4513 -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
4514 -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
4515 -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
4516 -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
4517 -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
4518 -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
4519 -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
4520 -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
4521 +as_executable_p="test -f"
4523 +# Sed expression to map a string onto a valid CPP name.
4524 +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
4526 +# Sed expression to map a string onto a valid variable name.
4527 +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
4531 # We need space, tab and new line, in precisely that order.
4536 -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
4541 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
4545 ac_default_prefix=/usr/local
4546 +ac_config_libobj_dir=.
4552 SHELL=${CONFIG_SHELL-/bin/sh}
4554 # Maximum number of lines to put in a shell here document.
4555 @@ -91,17 +263,53 @@
4556 # only ac_max_sed_lines should be used.
4557 : ${ac_max_here_lines=38}
4559 -# Avoid depending upon Character Ranges.
4560 -ac_cr_az='abcdefghijklmnopqrstuvwxyz'
4561 -ac_cr_AZ='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
4562 -ac_cr_09='0123456789'
4563 -ac_cr_alnum=$ac_cr_az$ac_cr_AZ$ac_cr_09
4565 -# Sed expression to map a string onto a valid sh and CPP variable names.
4566 -ac_tr_sh="sed y%*+%pp%;s%[^_$ac_cr_alnum]%_%g"
4567 -ac_tr_cpp="sed y%*$ac_cr_az%P$ac_cr_AZ%;s%[^_$ac_cr_alnum]%_%g"
4568 +# Identity of this package.
4575 ac_unique_file="src/dillo.c"
4576 +# Factoring default headers for most tests.
4577 +ac_includes_default="\
4579 +#if HAVE_SYS_TYPES_H
4580 +# include <sys/types.h>
4582 +#if HAVE_SYS_STAT_H
4583 +# include <sys/stat.h>
4586 +# include <stdlib.h>
4587 +# include <stddef.h>
4590 +# include <stdlib.h>
4594 +# if !STDC_HEADERS && HAVE_MEMORY_H
4595 +# include <memory.h>
4597 +# include <string.h>
4600 +# include <strings.h>
4602 +#if HAVE_INTTYPES_H
4603 +# include <inttypes.h>
4606 +# include <stdint.h>
4610 +# include <unistd.h>
4613 +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE RANLIB ac_ct_RANLIB PKG_CONFIG GTK_CFLAGS GTK_LIBS CPP EGREP LIBJPEG_LIB src doc bin util lib LIBOBJS LTLIBOBJS'
4616 # Initialize some variables set by options.
4618 @@ -141,13 +349,6 @@
4619 infodir='${prefix}/info'
4620 mandir='${prefix}/man'
4622 -# Identity of this package.
4633 -disable-* | --disable-*)
4634 ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
4635 # Reject names that are not valid shell variable names.
4636 - expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
4637 + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
4638 { echo "$as_me: error: invalid feature name: $ac_feature" >&2
4639 { (exit 1); exit 1; }; }
4640 ac_feature=`echo $ac_feature | sed 's/-/_/g'`
4642 -enable-* | --enable-*)
4643 ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
4644 # Reject names that are not valid shell variable names.
4645 - expr "x$ac_feature" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
4646 + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
4647 { echo "$as_me: error: invalid feature name: $ac_feature" >&2
4648 { (exit 1); exit 1; }; }
4649 ac_feature=`echo $ac_feature | sed 's/-/_/g'`
4653 -no-create | --no-create | --no-creat | --no-crea | --no-cre \
4654 - | --no-cr | --no-c)
4655 + | --no-cr | --no-c | -n)
4658 -no-recursion | --no-recursion | --no-recursio | --no-recursi \
4661 ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
4662 # Reject names that are not valid shell variable names.
4663 - expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
4664 + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
4665 { echo "$as_me: error: invalid package name: $ac_package" >&2
4666 { (exit 1); exit 1; }; }
4667 ac_package=`echo $ac_package| sed 's/-/_/g'`
4669 -without-* | --without-*)
4670 ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
4671 # Reject names that are not valid shell variable names.
4672 - expr "x$ac_package" : ".*[^-_$ac_cr_alnum]" >/dev/null &&
4673 + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
4674 { echo "$as_me: error: invalid package name: $ac_package" >&2
4675 { (exit 1); exit 1; }; }
4676 ac_package=`echo $ac_package | sed 's/-/_/g'`
4679 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
4680 # Reject names that are not valid shell variable names.
4681 - expr "x$ac_envvar" : ".*[^_$ac_cr_alnum]" >/dev/null &&
4682 + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
4683 { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
4684 { (exit 1); exit 1; }; }
4685 ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
4688 # FIXME: should be removed in autoconf 3.0.
4689 echo "$as_me: WARNING: you should use --build, --host, --target" >&2
4690 - expr "x$ac_option" : ".*[^-._$ac_cr_alnum]" >/dev/null &&
4691 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
4692 echo "$as_me: WARNING: invalid host type: $ac_option" >&2
4693 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
4695 @@ -454,26 +655,36 @@
4698 # Be sure to have absolute paths.
4699 +for ac_var in exec_prefix prefix
4701 + eval ac_val=$`echo $ac_var`
4703 + [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
4704 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
4705 + { (exit 1); exit 1; }; };;
4709 +# Be sure to have absolute paths.
4710 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
4711 - localstatedir libdir includedir oldincludedir infodir mandir \
4712 - exec_prefix prefix
4713 + localstatedir libdir includedir oldincludedir infodir mandir
4715 eval ac_val=$`echo $ac_var`
4717 [\\/$]* | ?:[\\/]* ) ;;
4719 - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2
4720 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
4721 { (exit 1); exit 1; }; };;
4725 # There might be people who depend on the old broken behavior: `$host'
4726 # used to hold the argument of --host etc.
4727 +# FIXME: To remove some day.
4730 target=$target_alias
4732 -# FIXME: should be removed in autoconf 3.0.
4733 +# FIXME: To remove some day.
4734 if test "x$host_alias" != x; then
4735 if test "x$build_alias" = x; then
4736 cross_compiling=maybe
4737 @@ -489,13 +700,23 @@
4739 test "$silent" = yes && exec 6>/dev/null
4742 # Find the source files, if location was not specified.
4743 if test -z "$srcdir"; then
4744 ac_srcdir_defaulted=yes
4745 # Try the directory containing this script, then its parent.
4747 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'`
4748 - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
4749 + ac_confdir=`(dirname "$0") 2>/dev/null ||
4750 +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
4751 + X"$0" : 'X\(//\)[^/]' \| \
4752 + X"$0" : 'X\(//\)$' \| \
4753 + X"$0" : 'X\(/\)' \| \
4754 + . : '\(.\)' 2>/dev/null ||
4756 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
4757 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
4758 + /^X\(\/\/\)$/{ s//\1/; q; }
4759 + /^X\(\/\).*/{ s//\1/; q; }
4762 if test ! -r $srcdir/$ac_unique_file; then
4764 @@ -505,13 +726,16 @@
4766 if test ! -r $srcdir/$ac_unique_file; then
4767 if test "$ac_srcdir_defaulted" = yes; then
4768 - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2
4769 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
4770 { (exit 1); exit 1; }; }
4772 - { echo "$as_me: error: cannot find sources in $srcdir" >&2
4773 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
4774 { (exit 1); exit 1; }; }
4777 +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
4778 + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
4779 + { (exit 1); exit 1; }; }
4780 srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
4781 ac_env_build_alias_set=${build_alias+set}
4782 ac_env_build_alias_value=$build_alias
4784 if test "$ac_init_help" = "long"; then
4785 # Omit some internal or obsolete options to make the list less imposing.
4786 # This message is too long to be a string in the A/UX 3.1 sh.
4789 \`configure' configures this package to adapt to many kinds of systems.
4791 Usage: $0 [OPTION]... [VAR=VALUE]...
4793 -n, --no-create do not create output files
4794 --srcdir=DIR find the sources in DIR [configure dir or \`..']
4801 Installation directories:
4802 --prefix=PREFIX install architecture-independent files in PREFIX
4803 [$ac_default_prefix]
4804 @@ -602,20 +826,20 @@
4805 --oldincludedir=DIR C header files for non-gcc [/usr/include]
4806 --infodir=DIR info documentation [PREFIX/info]
4807 --mandir=DIR man documentation [PREFIX/man]
4815 --program-prefix=PREFIX prepend PREFIX to installed program names
4816 --program-suffix=SUFFIX append SUFFIX to installed program names
4817 --program-transform-name=PROGRAM run sed PROGRAM on installed program names
4822 if test -n "$ac_init_help"; then
4828 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
4829 @@ -625,15 +849,15 @@
4830 --enable-insure Try to compile and run with Insure++
4831 --enable-ansi Try to compile and run with ANSI flags
4832 --enable-cookies Build with support for cookies
4833 - --disable-gtktest Do not try to compile and run a test GTK program
4834 + --enable-ipv6 Build with support for IPv6
4835 + --disable-dependency-tracking Speeds up one-time builds
4836 + --enable-dependency-tracking Do not reject slow dependency extractors
4839 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
4840 --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
4841 --with-jpeg-lib=DIR Specify where to find libjpeg
4842 --with-jpeg-inc=DIR Specify where to find libjpeg's headers
4843 - --with-gtk-prefix=PFX Prefix where GTK is installed (optional)
4844 - --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
4846 Some influential environment variables:
4847 CC C compiler command
4848 @@ -647,40 +871,60 @@
4849 Use these variables to override the choices made by `configure' or to help
4850 it to find libraries and programs with nonstandard names/locations.
4856 if test "$ac_init_help" = "recursive"; then
4857 # If there are subdirs, report their specific --help.
4859 - for ac_subdir in : $ac_subdirs_all; do test "x$ac_subdir" = x: && continue
4861 - # A "../" for each directory in /$ac_subdir.
4862 - ac_dots=`echo $ac_subdir |
4863 - sed 's,^\./,,;s,[^/]$,&/,;s,[^/]*/,../,g'`
4866 - .) # No --srcdir option. We are building in place.
4867 - ac_sub_srcdir=$srcdir ;;
4868 - [\\/]* | ?:[\\/]* ) # Absolute path.
4869 - ac_sub_srcdir=$srcdir/$ac_subdir ;;
4870 - *) # Relative path.
4871 - ac_sub_srcdir=$ac_dots$srcdir/$ac_subdir ;;
4873 + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
4874 + test -d $ac_dir || continue
4877 +if test "$ac_dir" != .; then
4878 + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
4879 + # A "../" for each directory in $ac_dir_suffix.
4880 + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
4882 + ac_dir_suffix= ac_top_builddir=
4886 + .) # No --srcdir option. We are building in place.
4888 + if test -z "$ac_top_builddir"; then
4891 + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
4893 + [\\/]* | ?:[\\/]* ) # Absolute path.
4894 + ac_srcdir=$srcdir$ac_dir_suffix;
4895 + ac_top_srcdir=$srcdir ;;
4896 + *) # Relative path.
4897 + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
4898 + ac_top_srcdir=$ac_top_builddir$srcdir ;;
4900 +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
4902 +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
4903 +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
4904 +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
4905 +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
4908 # Check for guested configure; otherwise get Cygnus style configure.
4909 - if test -f $ac_sub_srcdir/configure.gnu; then
4910 + if test -f $ac_srcdir/configure.gnu; then
4912 - $SHELL $ac_sub_srcdir/configure.gnu --help=recursive
4913 - elif test -f $ac_sub_srcdir/configure; then
4914 + $SHELL $ac_srcdir/configure.gnu --help=recursive
4915 + elif test -f $ac_srcdir/configure; then
4917 - $SHELL $ac_sub_srcdir/configure --help=recursive
4918 - elif test -f $ac_sub_srcdir/configure.ac ||
4919 - test -f $ac_sub_srcdir/configure.in; then
4920 + $SHELL $ac_srcdir/configure --help=recursive
4921 + elif test -f $ac_srcdir/configure.ac ||
4922 + test -f $ac_srcdir/configure.in; then
4924 $ac_configure --help
4926 - echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2
4927 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
4931 @@ -688,31 +932,31 @@
4933 test -n "$ac_init_help" && exit 0
4934 if $ac_init_version; then
4938 -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
4939 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
4940 Free Software Foundation, Inc.
4941 This configure script is free software; the Free Software Foundation
4942 gives unlimited permission to copy, distribute and modify it.
4950 This file contains any messages produced by compilers while
4951 running configure, to aid debugging if configure makes a mistake.
4953 It was created by $as_me, which was
4954 -generated by GNU Autoconf 2.50. Invocation command line was
4955 +generated by GNU Autoconf 2.57. Invocation command line was
4970 hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
4971 uname -m = `(uname -m) 2>/dev/null || echo unknown`
4972 @@ -731,83 +975,160 @@
4973 /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
4974 /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
4980 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4981 +for as_dir in $PATH
4984 + test -z "$as_dir" && as_dir=.
4985 + echo "PATH: $as_dir"
5005 # Keep a trace of the command line.
5006 # Strip out --no-create and --no-recursion so they do not pile up.
5007 +# Strip out --silent because we don't want to record it for future runs.
5008 # Also quote any args containing shell meta-characters.
5009 +# Make two passes to allow for proper duplicate-argument suppression.
5011 +ac_configure_args0=
5012 +ac_configure_args1=
5015 +ac_must_keep_next=false
5019 - -no-create | --no-create | --no-creat | --no-crea | --no-cre \
5020 - | --no-cr | --no-c) ;;
5021 - -no-recursion | --no-recursion | --no-recursio | --no-recursi \
5022 - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
5023 - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
5024 - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"`
5025 - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
5027 - *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg"
5030 - # Get rid of the leading space.
5034 + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
5035 + -q | -quiet | --quiet | --quie | --qui | --qu | --q \
5036 + | -silent | --silent | --silen | --sile | --sil)
5038 + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
5039 + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
5042 + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
5044 + ac_configure_args1="$ac_configure_args1 '$ac_arg'"
5045 + if test $ac_must_keep_next = true; then
5046 + ac_must_keep_next=false # Got value, back to normal.
5049 + *=* | --config-cache | -C | -disable-* | --disable-* \
5050 + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
5051 + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
5052 + | -with-* | --with-* | -without-* | --without-* | --x)
5053 + case "$ac_configure_args0 " in
5054 + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
5057 + -* ) ac_must_keep_next=true ;;
5060 + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
5061 + # Get rid of the leading space.
5067 +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
5068 +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
5070 # When interrupted or exit'd, cleanup temporary files, and complete
5071 # config.log. We remove comments because anyway the quotes in there
5072 # would cause problems or look ugly.
5073 +# WARNING: Be sure not to use single quotes in there, as some shells,
5074 +# such as our DU 5.0 friend, will then `close' the trap.
5075 trap 'exit_status=$?
5076 # Save into config.log some information that might help in debugging.
5078 - echo "## ----------------- ##" >&5
5079 - echo "## Cache variables. ##" >&5
5080 - echo "## ----------------- ##" >&5
5082 - # The following way of writing the cache mishandles newlines in values,
5087 +## ---------------- ##
5088 +## Cache variables. ##
5089 +## ---------------- ##
5092 + # The following way of writing the cache mishandles newlines in values,
5095 case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
5098 "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
5099 - s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
5100 + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
5104 - "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
5105 + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
5109 - sed "/^$/d" confdefs.h >conftest.log
5110 - if test -s conftest.log; then
5112 - echo "## ------------ ##" >&5
5113 - echo "## confdefs.h. ##" >&5
5114 - echo "## ------------ ##" >&5
5116 - cat conftest.log >&5
5119 - test "$ac_signal" != 0 &&
5120 - echo "$as_me: caught signal $ac_signal" >&5
5121 - echo "$as_me: exit $exit_status" >&5
5122 - rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files &&
5127 +## ----------------- ##
5128 +## Output variables. ##
5129 +## ----------------- ##
5132 + for ac_var in $ac_subst_vars
5134 + eval ac_val=$`echo $ac_var`
5135 + echo "$ac_var='"'"'$ac_val'"'"'"
5139 + if test -n "$ac_subst_files"; then
5141 +## ------------- ##
5142 +## Output files. ##
5143 +## ------------- ##
5146 + for ac_var in $ac_subst_files
5148 + eval ac_val=$`echo $ac_var`
5149 + echo "$ac_var='"'"'$ac_val'"'"'"
5154 + if test -s confdefs.h; then
5161 + sed "/^$/d" confdefs.h | sort
5164 + test "$ac_signal" != 0 &&
5165 + echo "$as_me: caught signal $ac_signal"
5166 + echo "$as_me: exit $exit_status"
5168 + rm -f core core.* *.core &&
5169 + rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
5172 for ac_signal in 1 2 13 15; do
5173 - trap 'ac_status=$?; ac_signal='$ac_signal'; { (exit $ac_status); exit $ac_status; }' $ac_signal
5174 + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
5178 @@ -816,6 +1137,33 @@
5179 # AIX cpp loses on an empty file, so make sure it contains at least a newline.
5182 +# Predefined preprocessor variables.
5184 +cat >>confdefs.h <<_ACEOF
5185 +#define PACKAGE_NAME "$PACKAGE_NAME"
5189 +cat >>confdefs.h <<_ACEOF
5190 +#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
5194 +cat >>confdefs.h <<_ACEOF
5195 +#define PACKAGE_VERSION "$PACKAGE_VERSION"
5199 +cat >>confdefs.h <<_ACEOF
5200 +#define PACKAGE_STRING "$PACKAGE_STRING"
5204 +cat >>confdefs.h <<_ACEOF
5205 +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
5209 # Let the site file select an alternate cache file if it wants to.
5210 # Prefer explicitly selected file to automatically selected ones.
5211 if test -z "$CONFIG_SITE"; then
5212 @@ -827,9 +1175,9 @@
5214 for ac_site_file in $CONFIG_SITE; do
5215 if test -r "$ac_site_file"; then
5216 - { echo "$as_me:830: loading site script $ac_site_file" >&5
5217 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
5218 echo "$as_me: loading site script $ac_site_file" >&6;}
5219 - cat "$ac_site_file" >&5
5220 + sed 's/^/| /' "$ac_site_file" >&5
5224 @@ -838,7 +1186,7 @@
5225 # Some versions of bash will fail to source /dev/null (special
5226 # files actually), so we avoid doing that.
5227 if test -f "$cache_file"; then
5228 - { echo "$as_me:841: loading cache $cache_file" >&5
5229 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5
5230 echo "$as_me: loading cache $cache_file" >&6;}
5232 [\\/]* | ?:[\\/]* ) . $cache_file;;
5233 @@ -846,14 +1194,14 @@
5237 - { echo "$as_me:849: creating cache $cache_file" >&5
5238 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5
5239 echo "$as_me: creating cache $cache_file" >&6;}
5243 # Check that the precious variables saved in the cache have kept the same
5245 -ac_suggest_removing_cache=false
5246 +ac_cache_corrupted=false
5247 for ac_var in `(set) 2>&1 |
5248 sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
5249 eval ac_old_set=\$ac_cv_env_${ac_var}_set
5250 @@ -862,31 +1210,44 @@
5251 eval ac_new_val="\$ac_env_${ac_var}_value"
5252 case $ac_old_set,$ac_new_set in
5254 - { echo "$as_me:865: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
5255 -echo "$as_me: WARNING: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
5256 - ac_suggest_removing_cache=: ;;
5257 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
5258 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
5259 + ac_cache_corrupted=: ;;
5261 - { echo "$as_me:869: WARNING: \`$ac_var' was not set in the previous run" >&5
5262 -echo "$as_me: WARNING: \`$ac_var' was not set in the previous run" >&2;}
5263 - ac_suggest_removing_cache=: ;;
5264 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
5265 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
5266 + ac_cache_corrupted=: ;;
5269 if test "x$ac_old_val" != "x$ac_new_val"; then
5270 - { echo "$as_me:875: WARNING: \`$ac_var' has changed since the previous run:" >&5
5271 -echo "$as_me: WARNING: \`$ac_var' has changed since the previous run:" >&2;}
5272 - { echo "$as_me:877: WARNING: former value: $ac_old_val" >&5
5273 -echo "$as_me: WARNING: former value: $ac_old_val" >&2;}
5274 - { echo "$as_me:879: WARNING: current value: $ac_new_val" >&5
5275 -echo "$as_me: WARNING: current value: $ac_new_val" >&2;}
5276 - ac_suggest_removing_cache=:
5277 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
5278 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
5279 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
5280 +echo "$as_me: former value: $ac_old_val" >&2;}
5281 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
5282 +echo "$as_me: current value: $ac_new_val" >&2;}
5283 + ac_cache_corrupted=:
5286 + # Pass precious variables to config.status.
5287 + if test "$ac_new_set" = set; then
5288 + case $ac_new_val in
5289 + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
5290 + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
5291 + *) ac_arg=$ac_var=$ac_new_val ;;
5293 + case " $ac_configure_args " in
5294 + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
5295 + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
5299 -if $ac_suggest_removing_cache; then
5300 - { echo "$as_me:886: WARNING: changes in the environment can compromise the build" >&5
5301 -echo "$as_me: WARNING: changes in the environment can compromise the build" >&2;}
5302 - { echo "$as_me:888: WARNING: consider removing $cache_file and starting over" >&5
5303 -echo "$as_me: WARNING: consider removing $cache_file and starting over" >&2;}
5304 +if $ac_cache_corrupted; then
5305 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
5306 +echo "$as_me: error: changes in the environment can compromise the build" >&2;}
5307 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
5308 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
5309 + { (exit 1); exit 1; }; }
5313 @@ -895,27 +1256,25 @@
5314 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5315 ac_compiler_gnu=$ac_cv_c_compiler_gnu
5317 -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
5318 - *c*,-n*) ECHO_N= ECHO_C='
5320 - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
5321 - *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
5323 -echo "#! $SHELL" >conftest.sh
5324 -echo "exit 0" >>conftest.sh
5325 -chmod +x conftest.sh
5326 -if { (echo "$as_me:907: PATH=\".;.\"; conftest.sh") >&5
5327 - (PATH=".;."; conftest.sh) 2>&5
5329 - echo "$as_me:910: \$? = $ac_status" >&5
5330 - (exit $ac_status); }; then
5331 - ac_path_separator=';'
5333 - ac_path_separator=:
5335 -PATH_SEPARATOR="$ac_path_separator"
5355 +am__api_version="1.6"
5357 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
5358 if test -f $ac_dir/install-sh; then
5359 @@ -933,7 +1292,7 @@
5362 if test -z "$ac_aux_dir"; then
5363 - { { echo "$as_me:936: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
5364 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
5365 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
5366 { (exit 1); exit 1; }; }
5368 @@ -953,43 +1312,48 @@
5369 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
5370 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
5371 # ./install, which can be erroneously created by make from ./install.sh.
5372 -echo "$as_me:956: checking for a BSD compatible install" >&5
5373 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
5374 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
5375 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
5376 if test -z "$INSTALL"; then
5377 if test "${ac_cv_path_install+set}" = set; then
5378 echo $ECHO_N "(cached) $ECHO_C" >&6
5380 - ac_save_IFS=$IFS; IFS=$ac_path_separator
5381 - for ac_dir in $PATH; do
5383 - # Account for people who put trailing slashes in PATH elements.
5385 - / | ./ | .// | /cC/* \
5386 - | /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* \
5389 - # OSF1 and SCO ODT 3.0 have their own names for install.
5390 - # Don't use installbsd from OSF since it installs stuff as root
5392 - for ac_prog in ginstall scoinst install; do
5393 - if $as_executable_p "$ac_dir/$ac_prog"; then
5394 - if test $ac_prog = install &&
5395 - grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then
5396 - # AIX install. It has an incompatible calling convention.
5398 - elif test $ac_prog = install &&
5399 - grep pwplus "$ac_dir/$ac_prog" >/dev/null 2>&1; then
5400 - # program-specific install script used by HP pwplus--don't use.
5403 - ac_cv_path_install="$ac_dir/$ac_prog -c"
5407 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5408 +for as_dir in $PATH
5411 + test -z "$as_dir" && as_dir=.
5412 + # Account for people who put trailing slashes in PATH elements.
5414 + ./ | .// | /cC/* | \
5415 + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
5418 + # OSF1 and SCO ODT 3.0 have their own names for install.
5419 + # Don't use installbsd from OSF since it installs stuff as root
5421 + for ac_prog in ginstall scoinst install; do
5422 + for ac_exec_ext in '' $ac_executable_extensions; do
5423 + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
5424 + if test $ac_prog = install &&
5425 + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5426 + # AIX install. It has an incompatible calling convention.
5428 + elif test $ac_prog = install &&
5429 + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5430 + # program-specific install script used by HP pwplus--don't use.
5433 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
5448 if test "${ac_cv_path_install+set}" = set; then
5449 @@ -1002,7 +1366,7 @@
5450 INSTALL=$ac_install_sh
5453 -echo "$as_me:1005: result: $INSTALL" >&5
5454 +echo "$as_me:$LINENO: result: $INSTALL" >&5
5455 echo "${ECHO_T}$INSTALL" >&6
5457 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
5458 @@ -1013,80 +1377,128 @@
5460 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
5462 -echo "$as_me:1016: checking whether build environment is sane" >&5
5463 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5
5464 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
5467 -echo timestamp > conftestfile
5468 +echo timestamp > conftest.file
5469 # Do `set' in a subshell so we don't clobber the current shell's
5470 # arguments. Must try -L first in case configure is actually a
5471 # symlink; some systems play weird games with the mod time of symlinks
5472 # (eg FreeBSD returns the mod time of the symlink's containing
5475 - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
5476 + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
5477 if test "$*" = "X"; then
5479 - set X `ls -t $srcdir/configure conftestfile`
5480 + set X `ls -t $srcdir/configure conftest.file`
5482 - if test "$*" != "X $srcdir/configure conftestfile" \
5483 - && test "$*" != "X conftestfile $srcdir/configure"; then
5484 + rm -f conftest.file
5485 + if test "$*" != "X $srcdir/configure conftest.file" \
5486 + && test "$*" != "X conftest.file $srcdir/configure"; then
5488 # If neither matched, then we have a broken ls. This can happen
5489 # if, for instance, CONFIG_SHELL is bash and it inherits a
5490 # broken ls alias from the environment. This has actually
5491 # happened. Such a system could not be considered "sane".
5492 - { { echo "$as_me:1039: error: ls -t appears to fail. Make sure there is not a broken
5493 + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
5494 alias in your environment" >&5
5495 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
5496 alias in your environment" >&2;}
5497 { (exit 1); exit 1; }; }
5500 - test "$2" = conftestfile
5501 + test "$2" = conftest.file
5507 - { { echo "$as_me:1052: error: newly created file is older than distributed files!
5508 + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
5509 Check your system clock" >&5
5510 echo "$as_me: error: newly created file is older than distributed files!
5511 Check your system clock" >&2;}
5512 { (exit 1); exit 1; }; }
5515 -echo "$as_me:1059: result: yes" >&5
5516 +echo "$as_me:$LINENO: result: yes" >&5
5517 echo "${ECHO_T}yes" >&6
5518 -if test "$program_transform_name" = s,x,x,; then
5519 - program_transform_name=
5521 - # Double any \ or $. echo might interpret backslashes.
5522 - cat <<\EOF >conftest.sed
5523 -s,\\,\\\\,g; s,\$,$$,g
5525 - program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
5526 - rm -f conftest.sed
5528 test "$program_prefix" != NONE &&
5529 - program_transform_name="s,^,${program_prefix},;$program_transform_name"
5530 + program_transform_name="s,^,$program_prefix,;$program_transform_name"
5531 # Use a double $ so make ignores it.
5532 test "$program_suffix" != NONE &&
5533 - program_transform_name="s,\$\$,${program_suffix},;$program_transform_name"
5534 + program_transform_name="s,\$,$program_suffix,;$program_transform_name"
5535 +# Double any \ or $. echo might interpret backslashes.
5536 +# By default was `s,x,x', remove it if useless.
5537 +cat <<\_ACEOF >conftest.sed
5538 +s/[\\$]/&&/g;s/;s,x,x,$//
5540 +program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
5544 +# expand $ac_aux_dir to an absolute path
5545 +am_aux_dir=`cd $ac_aux_dir && pwd`
5547 +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
5548 +# Use eval to expand $SHELL
5549 +if eval "$MISSING --run true"; then
5550 + am_missing_run="$MISSING --run "
5553 + { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
5554 +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
5557 +for ac_prog in gawk mawk nawk awk
5559 + # Extract the first word of "$ac_prog", so it can be a program name with args.
5560 +set dummy $ac_prog; ac_word=$2
5561 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5562 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5563 +if test "${ac_cv_prog_AWK+set}" = set; then
5564 + echo $ECHO_N "(cached) $ECHO_C" >&6
5566 + if test -n "$AWK"; then
5567 + ac_cv_prog_AWK="$AWK" # Let the user override the test.
5569 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5570 +for as_dir in $PATH
5573 + test -z "$as_dir" && as_dir=.
5574 + for ac_exec_ext in '' $ac_executable_extensions; do
5575 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5576 + ac_cv_prog_AWK="$ac_prog"
5577 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5585 +AWK=$ac_cv_prog_AWK
5586 +if test -n "$AWK"; then
5587 + echo "$as_me:$LINENO: result: $AWK" >&5
5588 +echo "${ECHO_T}$AWK" >&6
5590 + echo "$as_me:$LINENO: result: no" >&5
5591 +echo "${ECHO_T}no" >&6
5594 -# sed with no file args requires a program.
5595 -test -z "$program_transform_name" && program_transform_name="s,x,x,"
5596 + test -n "$AWK" && break
5599 -echo "$as_me:1080: checking whether ${MAKE-make} sets \${MAKE}" >&5
5600 -echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
5601 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
5602 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
5603 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
5604 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
5605 echo $ECHO_N "(cached) $ECHO_C" >&6
5607 - cat >conftest.make <<\EOF
5608 + cat >conftest.make <<\_ACEOF
5610 - @echo 'ac_maketemp="${MAKE}"'
5612 + @echo 'ac_maketemp="$(MAKE)"'
5614 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
5615 eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
5616 if test -n "$ac_maketemp"; then
5617 @@ -1097,129 +1509,176 @@
5620 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
5621 - echo "$as_me:1100: result: yes" >&5
5622 + echo "$as_me:$LINENO: result: yes" >&5
5623 echo "${ECHO_T}yes" >&6
5626 - echo "$as_me:1104: result: no" >&5
5627 + echo "$as_me:$LINENO: result: no" >&5
5628 echo "${ECHO_T}no" >&6
5629 SET_MAKE="MAKE=${MAKE-make}"
5636 -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
5637 - { { echo "$as_me:1114: error: source directory already configured; run \"make distclean\" there first" >&5
5638 + # test to see if srcdir already configured
5639 +if test "`cd $srcdir && pwd`" != "`pwd`" &&
5640 + test -f $srcdir/config.status; then
5641 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
5642 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
5643 { (exit 1); exit 1; }; }
5646 -cat >>confdefs.h <<EOF
5647 +# Define the identity of the package.
5652 +cat >>confdefs.h <<_ACEOF
5653 #define PACKAGE "$PACKAGE"
5657 -cat >>confdefs.h <<EOF
5659 +cat >>confdefs.h <<_ACEOF
5660 #define VERSION "$VERSION"
5664 -missing_dir=`cd $ac_aux_dir && pwd`
5665 -echo "$as_me:1128: checking for working aclocal" >&5
5666 -echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
5667 -# Run test in a subshell; some versions of sh will print an error if
5668 -# an executable is not found, even if stderr is redirected.
5669 -# Redirect stdin to placate older versions of autoconf. Sigh.
5670 -if (aclocal --version) < /dev/null > /dev/null 2>&1; then
5672 - echo "$as_me:1135: result: found" >&5
5673 -echo "${ECHO_T}found" >&6
5675 - ACLOCAL="$missing_dir/missing aclocal"
5676 - echo "$as_me:1139: result: missing" >&5
5677 -echo "${ECHO_T}missing" >&6
5680 -echo "$as_me:1143: checking for working autoconf" >&5
5681 -echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
5682 -# Run test in a subshell; some versions of sh will print an error if
5683 -# an executable is not found, even if stderr is redirected.
5684 -# Redirect stdin to placate older versions of autoconf. Sigh.
5685 -if (autoconf --version) < /dev/null > /dev/null 2>&1; then
5687 - echo "$as_me:1150: result: found" >&5
5688 -echo "${ECHO_T}found" >&6
5690 - AUTOCONF="$missing_dir/missing autoconf"
5691 - echo "$as_me:1154: result: missing" >&5
5692 -echo "${ECHO_T}missing" >&6
5695 -echo "$as_me:1158: checking for working automake" >&5
5696 -echo $ECHO_N "checking for working automake... $ECHO_C" >&6
5697 -# Run test in a subshell; some versions of sh will print an error if
5698 -# an executable is not found, even if stderr is redirected.
5699 -# Redirect stdin to placate older versions of autoconf. Sigh.
5700 -if (automake --version) < /dev/null > /dev/null 2>&1; then
5702 - echo "$as_me:1165: result: found" >&5
5703 -echo "${ECHO_T}found" >&6
5705 - AUTOMAKE="$missing_dir/missing automake"
5706 - echo "$as_me:1169: result: missing" >&5
5707 -echo "${ECHO_T}missing" >&6
5710 -echo "$as_me:1173: checking for working autoheader" >&5
5711 -echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
5712 -# Run test in a subshell; some versions of sh will print an error if
5713 -# an executable is not found, even if stderr is redirected.
5714 -# Redirect stdin to placate older versions of autoconf. Sigh.
5715 -if (autoheader --version) < /dev/null > /dev/null 2>&1; then
5716 - AUTOHEADER=autoheader
5717 - echo "$as_me:1180: result: found" >&5
5718 -echo "${ECHO_T}found" >&6
5720 - AUTOHEADER="$missing_dir/missing autoheader"
5721 - echo "$as_me:1184: result: missing" >&5
5722 -echo "${ECHO_T}missing" >&6
5725 -echo "$as_me:1188: checking for working makeinfo" >&5
5726 -echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
5727 -# Run test in a subshell; some versions of sh will print an error if
5728 -# an executable is not found, even if stderr is redirected.
5729 -# Redirect stdin to placate older versions of autoconf. Sigh.
5730 -if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
5732 - echo "$as_me:1195: result: found" >&5
5733 -echo "${ECHO_T}found" >&6
5735 - MAKEINFO="$missing_dir/missing makeinfo"
5736 - echo "$as_me:1199: result: missing" >&5
5737 -echo "${ECHO_T}missing" >&6
5739 +# Some tools Automake needs.
5741 -ac_config_headers="$ac_config_headers config.h"
5742 +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
5744 -ac_config_commands="$ac_config_commands default-1"
5746 -CPPFLAGS="$CPPFLAGS -I/usr/local/include"
5747 -LDFLAGS="$LDFLAGS -L/usr/local/lib"
5748 +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
5750 -# Check whether --with-jpeg-lib or --without-jpeg-lib was given.
5751 -if test "${with_jpeg_lib+set}" = set; then
5752 - withval="$with_jpeg_lib"
5753 - LIBJPEG_LIBDIR=$withval
5756 -# Check whether --with-jpeg-inc or --without-jpeg-inc was given.
5757 -if test "${with_jpeg_inc+set}" = set; then
5758 - withval="$with_jpeg_inc"
5759 - LIBJPEG_INCDIR=$withval
5761 +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
5763 -# Check whether --enable-efence or --disable-efence was given.
5765 +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
5768 +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
5771 +AMTAR=${AMTAR-"${am_missing_run}tar"}
5773 +install_sh=${install_sh-"$am_aux_dir/install-sh"}
5775 +# Installed binaries are usually stripped using `strip' when the user
5776 +# run `make install-strip'. However `strip' might not be the right
5777 +# tool to use in cross-compilation environments, therefore Automake
5778 +# will honor the `STRIP' environment variable to overrule this program.
5779 +if test "$cross_compiling" != no; then
5780 + if test -n "$ac_tool_prefix"; then
5781 + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
5782 +set dummy ${ac_tool_prefix}strip; ac_word=$2
5783 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5784 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5785 +if test "${ac_cv_prog_STRIP+set}" = set; then
5786 + echo $ECHO_N "(cached) $ECHO_C" >&6
5788 + if test -n "$STRIP"; then
5789 + ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
5791 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5792 +for as_dir in $PATH
5795 + test -z "$as_dir" && as_dir=.
5796 + for ac_exec_ext in '' $ac_executable_extensions; do
5797 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5798 + ac_cv_prog_STRIP="${ac_tool_prefix}strip"
5799 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5807 +STRIP=$ac_cv_prog_STRIP
5808 +if test -n "$STRIP"; then
5809 + echo "$as_me:$LINENO: result: $STRIP" >&5
5810 +echo "${ECHO_T}$STRIP" >&6
5812 + echo "$as_me:$LINENO: result: no" >&5
5813 +echo "${ECHO_T}no" >&6
5817 +if test -z "$ac_cv_prog_STRIP"; then
5818 + ac_ct_STRIP=$STRIP
5819 + # Extract the first word of "strip", so it can be a program name with args.
5820 +set dummy strip; ac_word=$2
5821 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5822 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5823 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
5824 + echo $ECHO_N "(cached) $ECHO_C" >&6
5826 + if test -n "$ac_ct_STRIP"; then
5827 + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
5829 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5830 +for as_dir in $PATH
5833 + test -z "$as_dir" && as_dir=.
5834 + for ac_exec_ext in '' $ac_executable_extensions; do
5835 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5836 + ac_cv_prog_ac_ct_STRIP="strip"
5837 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5843 + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
5846 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
5847 +if test -n "$ac_ct_STRIP"; then
5848 + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
5849 +echo "${ECHO_T}$ac_ct_STRIP" >&6
5851 + echo "$as_me:$LINENO: result: no" >&5
5852 +echo "${ECHO_T}no" >&6
5855 + STRIP=$ac_ct_STRIP
5857 + STRIP="$ac_cv_prog_STRIP"
5861 +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
5863 +# We need awk for the "check" target. The system "awk" is bad on
5868 +# Add the stamp file to the list of files AC keeps track of,
5869 +# along with our hook.
5870 + ac_config_headers="$ac_config_headers config.h"
5875 +CPPFLAGS="$CPPFLAGS -I/usr/local/include"
5876 +LDFLAGS="$LDFLAGS -L/usr/local/lib"
5880 +# Check whether --with-jpeg-lib or --without-jpeg-lib was given.
5881 +if test "${with_jpeg_lib+set}" = set; then
5882 + withval="$with_jpeg_lib"
5883 + LIBJPEG_LIBDIR=$withval
5886 +# Check whether --with-jpeg-inc or --without-jpeg-inc was given.
5887 +if test "${with_jpeg_inc+set}" = set; then
5888 + withval="$with_jpeg_inc"
5889 + LIBJPEG_INCDIR=$withval
5892 +# Check whether --enable-efence or --disable-efence was given.
5893 if test "${enable_efence+set}" = set; then
5894 enableval="$enable_efence"
5896 @@ -1252,6 +1711,11 @@
5897 enableval="$enable_cookies"
5900 +# Check whether --enable-ipv6 or --disable-ipv6 was given.
5901 +if test "${enable_ipv6+set}" = set; then
5902 + enableval="$enable_ipv6"
5907 ac_cpp='$CPP $CPPFLAGS'
5908 @@ -1261,7 +1725,7 @@
5909 if test -n "$ac_tool_prefix"; then
5910 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
5911 set dummy ${ac_tool_prefix}gcc; ac_word=$2
5912 -echo "$as_me:1264: checking for $ac_word" >&5
5913 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5914 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5915 if test "${ac_cv_prog_CC+set}" = set; then
5916 echo $ECHO_N "(cached) $ECHO_C" >&6
5917 @@ -1269,25 +1733,28 @@
5918 if test -n "$CC"; then
5919 ac_cv_prog_CC="$CC" # Let the user override the test.
5921 - ac_save_IFS=$IFS; IFS=$ac_path_separator
5923 -for ac_dir in $ac_dummy; do
5925 - test -z "$ac_dir" && ac_dir=.
5926 - $as_executable_p "$ac_dir/$ac_word" || continue
5927 -ac_cv_prog_CC="${ac_tool_prefix}gcc"
5928 -echo "$as_me:1279: found $ac_dir/$ac_word" >&5
5930 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5931 +for as_dir in $PATH
5934 + test -z "$as_dir" && as_dir=.
5935 + for ac_exec_ext in '' $ac_executable_extensions; do
5936 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5937 + ac_cv_prog_CC="${ac_tool_prefix}gcc"
5938 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5947 if test -n "$CC"; then
5948 - echo "$as_me:1287: result: $CC" >&5
5949 + echo "$as_me:$LINENO: result: $CC" >&5
5950 echo "${ECHO_T}$CC" >&6
5952 - echo "$as_me:1290: result: no" >&5
5953 + echo "$as_me:$LINENO: result: no" >&5
5954 echo "${ECHO_T}no" >&6
5957 @@ -1296,7 +1763,7 @@
5959 # Extract the first word of "gcc", so it can be a program name with args.
5960 set dummy gcc; ac_word=$2
5961 -echo "$as_me:1299: checking for $ac_word" >&5
5962 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5963 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5964 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
5965 echo $ECHO_N "(cached) $ECHO_C" >&6
5966 @@ -1304,25 +1771,28 @@
5967 if test -n "$ac_ct_CC"; then
5968 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
5970 - ac_save_IFS=$IFS; IFS=$ac_path_separator
5972 -for ac_dir in $ac_dummy; do
5974 - test -z "$ac_dir" && ac_dir=.
5975 - $as_executable_p "$ac_dir/$ac_word" || continue
5976 -ac_cv_prog_ac_ct_CC="gcc"
5977 -echo "$as_me:1314: found $ac_dir/$ac_word" >&5
5979 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5980 +for as_dir in $PATH
5983 + test -z "$as_dir" && as_dir=.
5984 + for ac_exec_ext in '' $ac_executable_extensions; do
5985 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5986 + ac_cv_prog_ac_ct_CC="gcc"
5987 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5995 ac_ct_CC=$ac_cv_prog_ac_ct_CC
5996 if test -n "$ac_ct_CC"; then
5997 - echo "$as_me:1322: result: $ac_ct_CC" >&5
5998 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
5999 echo "${ECHO_T}$ac_ct_CC" >&6
6001 - echo "$as_me:1325: result: no" >&5
6002 + echo "$as_me:$LINENO: result: no" >&5
6003 echo "${ECHO_T}no" >&6
6006 @@ -1335,7 +1805,7 @@
6007 if test -n "$ac_tool_prefix"; then
6008 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
6009 set dummy ${ac_tool_prefix}cc; ac_word=$2
6010 -echo "$as_me:1338: checking for $ac_word" >&5
6011 +echo "$as_me:$LINENO: checking for $ac_word" >&5
6012 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
6013 if test "${ac_cv_prog_CC+set}" = set; then
6014 echo $ECHO_N "(cached) $ECHO_C" >&6
6015 @@ -1343,25 +1813,28 @@
6016 if test -n "$CC"; then
6017 ac_cv_prog_CC="$CC" # Let the user override the test.
6019 - ac_save_IFS=$IFS; IFS=$ac_path_separator
6021 -for ac_dir in $ac_dummy; do
6023 - test -z "$ac_dir" && ac_dir=.
6024 - $as_executable_p "$ac_dir/$ac_word" || continue
6025 -ac_cv_prog_CC="${ac_tool_prefix}cc"
6026 -echo "$as_me:1353: found $ac_dir/$ac_word" >&5
6028 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6029 +for as_dir in $PATH
6032 + test -z "$as_dir" && as_dir=.
6033 + for ac_exec_ext in '' $ac_executable_extensions; do
6034 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6035 + ac_cv_prog_CC="${ac_tool_prefix}cc"
6036 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6045 if test -n "$CC"; then
6046 - echo "$as_me:1361: result: $CC" >&5
6047 + echo "$as_me:$LINENO: result: $CC" >&5
6048 echo "${ECHO_T}$CC" >&6
6050 - echo "$as_me:1364: result: no" >&5
6051 + echo "$as_me:$LINENO: result: no" >&5
6052 echo "${ECHO_T}no" >&6
6055 @@ -1370,7 +1843,7 @@
6057 # Extract the first word of "cc", so it can be a program name with args.
6058 set dummy cc; ac_word=$2
6059 -echo "$as_me:1373: checking for $ac_word" >&5
6060 +echo "$as_me:$LINENO: checking for $ac_word" >&5
6061 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
6062 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
6063 echo $ECHO_N "(cached) $ECHO_C" >&6
6064 @@ -1378,25 +1851,28 @@
6065 if test -n "$ac_ct_CC"; then
6066 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
6068 - ac_save_IFS=$IFS; IFS=$ac_path_separator
6070 -for ac_dir in $ac_dummy; do
6072 - test -z "$ac_dir" && ac_dir=.
6073 - $as_executable_p "$ac_dir/$ac_word" || continue
6074 -ac_cv_prog_ac_ct_CC="cc"
6075 -echo "$as_me:1388: found $ac_dir/$ac_word" >&5
6077 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6078 +for as_dir in $PATH
6081 + test -z "$as_dir" && as_dir=.
6082 + for ac_exec_ext in '' $ac_executable_extensions; do
6083 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6084 + ac_cv_prog_ac_ct_CC="cc"
6085 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6093 ac_ct_CC=$ac_cv_prog_ac_ct_CC
6094 if test -n "$ac_ct_CC"; then
6095 - echo "$as_me:1396: result: $ac_ct_CC" >&5
6096 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
6097 echo "${ECHO_T}$ac_ct_CC" >&6
6099 - echo "$as_me:1399: result: no" >&5
6100 + echo "$as_me:$LINENO: result: no" >&5
6101 echo "${ECHO_T}no" >&6
6104 @@ -1409,7 +1885,7 @@
6105 if test -z "$CC"; then
6106 # Extract the first word of "cc", so it can be a program name with args.
6107 set dummy cc; ac_word=$2
6108 -echo "$as_me:1412: checking for $ac_word" >&5
6109 +echo "$as_me:$LINENO: checking for $ac_word" >&5
6110 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
6111 if test "${ac_cv_prog_CC+set}" = set; then
6112 echo $ECHO_N "(cached) $ECHO_C" >&6
6113 @@ -1418,19 +1894,22 @@
6114 ac_cv_prog_CC="$CC" # Let the user override the test.
6117 - ac_save_IFS=$IFS; IFS=$ac_path_separator
6119 -for ac_dir in $ac_dummy; do
6121 - test -z "$ac_dir" && ac_dir=.
6122 - $as_executable_p "$ac_dir/$ac_word" || continue
6123 -if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
6124 - ac_prog_rejected=yes
6128 -echo "$as_me:1432: found $ac_dir/$ac_word" >&5
6130 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6131 +for as_dir in $PATH
6134 + test -z "$as_dir" && as_dir=.
6135 + for ac_exec_ext in '' $ac_executable_extensions; do
6136 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6137 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
6138 + ac_prog_rejected=yes
6141 + ac_cv_prog_CC="cc"
6142 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6148 if test $ac_prog_rejected = yes; then
6149 @@ -1442,19 +1921,17 @@
6150 # However, it has the same basename, so the bogon will be chosen
6151 # first if we set CC to just the basename; use the full file name.
6153 - set dummy "$ac_dir/$ac_word" ${1+"$@"}
6155 - ac_cv_prog_CC="$@"
6156 + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
6162 if test -n "$CC"; then
6163 - echo "$as_me:1454: result: $CC" >&5
6164 + echo "$as_me:$LINENO: result: $CC" >&5
6165 echo "${ECHO_T}$CC" >&6
6167 - echo "$as_me:1457: result: no" >&5
6168 + echo "$as_me:$LINENO: result: no" >&5
6169 echo "${ECHO_T}no" >&6
6172 @@ -1465,7 +1942,7 @@
6174 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
6175 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
6176 -echo "$as_me:1468: checking for $ac_word" >&5
6177 +echo "$as_me:$LINENO: checking for $ac_word" >&5
6178 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
6179 if test "${ac_cv_prog_CC+set}" = set; then
6180 echo $ECHO_N "(cached) $ECHO_C" >&6
6181 @@ -1473,25 +1950,28 @@
6182 if test -n "$CC"; then
6183 ac_cv_prog_CC="$CC" # Let the user override the test.
6185 - ac_save_IFS=$IFS; IFS=$ac_path_separator
6187 -for ac_dir in $ac_dummy; do
6189 - test -z "$ac_dir" && ac_dir=.
6190 - $as_executable_p "$ac_dir/$ac_word" || continue
6191 -ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
6192 -echo "$as_me:1483: found $ac_dir/$ac_word" >&5
6194 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6195 +for as_dir in $PATH
6198 + test -z "$as_dir" && as_dir=.
6199 + for ac_exec_ext in '' $ac_executable_extensions; do
6200 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6201 + ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
6202 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6211 if test -n "$CC"; then
6212 - echo "$as_me:1491: result: $CC" >&5
6213 + echo "$as_me:$LINENO: result: $CC" >&5
6214 echo "${ECHO_T}$CC" >&6
6216 - echo "$as_me:1494: result: no" >&5
6217 + echo "$as_me:$LINENO: result: no" >&5
6218 echo "${ECHO_T}no" >&6
6221 @@ -1504,7 +1984,7 @@
6223 # Extract the first word of "$ac_prog", so it can be a program name with args.
6224 set dummy $ac_prog; ac_word=$2
6225 -echo "$as_me:1507: checking for $ac_word" >&5
6226 +echo "$as_me:$LINENO: checking for $ac_word" >&5
6227 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
6228 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
6229 echo $ECHO_N "(cached) $ECHO_C" >&6
6230 @@ -1512,25 +1992,28 @@
6231 if test -n "$ac_ct_CC"; then
6232 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
6234 - ac_save_IFS=$IFS; IFS=$ac_path_separator
6236 -for ac_dir in $ac_dummy; do
6238 - test -z "$ac_dir" && ac_dir=.
6239 - $as_executable_p "$ac_dir/$ac_word" || continue
6240 -ac_cv_prog_ac_ct_CC="$ac_prog"
6241 -echo "$as_me:1522: found $ac_dir/$ac_word" >&5
6243 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6244 +for as_dir in $PATH
6247 + test -z "$as_dir" && as_dir=.
6248 + for ac_exec_ext in '' $ac_executable_extensions; do
6249 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6250 + ac_cv_prog_ac_ct_CC="$ac_prog"
6251 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6259 ac_ct_CC=$ac_cv_prog_ac_ct_CC
6260 if test -n "$ac_ct_CC"; then
6261 - echo "$as_me:1530: result: $ac_ct_CC" >&5
6262 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
6263 echo "${ECHO_T}$ac_ct_CC" >&6
6265 - echo "$as_me:1533: result: no" >&5
6266 + echo "$as_me:$LINENO: result: no" >&5
6267 echo "${ECHO_T}no" >&6
6270 @@ -1542,13 +2025,40 @@
6274 -test -z "$CC" && { { echo "$as_me:1545: error: no acceptable cc found in \$PATH" >&5
6275 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
6277 +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
6278 +See \`config.log' for more details." >&5
6279 +echo "$as_me: error: no acceptable C compiler found in \$PATH
6280 +See \`config.log' for more details." >&2;}
6281 { (exit 1); exit 1; }; }
6283 +# Provide some information about the compiler.
6284 +echo "$as_me:$LINENO:" \
6285 + "checking for C compiler version" >&5
6286 +ac_compiler=`set X $ac_compile; echo $2`
6287 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
6288 + (eval $ac_compiler --version </dev/null >&5) 2>&5
6290 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6291 + (exit $ac_status); }
6292 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
6293 + (eval $ac_compiler -v </dev/null >&5) 2>&5
6295 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6296 + (exit $ac_status); }
6297 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
6298 + (eval $ac_compiler -V </dev/null >&5) 2>&5
6300 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6301 + (exit $ac_status); }
6303 cat >conftest.$ac_ext <<_ACEOF
6304 -#line 1550 "configure"
6305 -#include "confdefs.h"
6306 +#line $LINENO "configure"
6309 +cat confdefs.h >>conftest.$ac_ext
6310 +cat >>conftest.$ac_ext <<_ACEOF
6311 +/* end confdefs.h. */
6315 @@ -1559,94 +2069,120 @@
6318 ac_clean_files_save=$ac_clean_files
6319 -ac_clean_files="$ac_clean_files a.out a.exe"
6320 +ac_clean_files="$ac_clean_files a.out a.exe b.out"
6321 # Try to create an executable without -o first, disregard a.out.
6322 -# It will help us diagnose broken compiler, and finding out an intuition
6323 +# It will help us diagnose broken compilers, and finding out an intuition
6325 -echo "$as_me:1566: checking for C compiler default output" >&5
6326 +echo "$as_me:$LINENO: checking for C compiler default output" >&5
6327 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
6328 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
6329 -if { (eval echo "$as_me:1569: \"$ac_link_default\"") >&5
6330 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
6331 (eval $ac_link_default) 2>&5
6333 - echo "$as_me:1572: \$? = $ac_status" >&5
6334 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6335 (exit $ac_status); }; then
6336 - for ac_file in `ls a.exe conftest.exe a.* conftest conftest.* 2>/dev/null`; do
6337 + # Find the output, starting from the most likely. This scheme is
6338 +# not robust to junk in `.', hence go to wildcards (a.*) only as a last
6341 +# Be careful to initialize this variable, since it used to be cached.
6342 +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
6344 +# b.out is created by i960 compilers.
6345 +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
6347 + test -f "$ac_file" || continue
6349 - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
6350 - a.out ) # We found the default executable, but exeext='' is most
6351 - # certainly right.
6353 - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
6354 - export ac_cv_exeext
6357 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
6359 + conftest.$ac_ext )
6360 + # This is the source file.
6363 + # We found the default executable, but exeext='' is most
6364 + # certainly right.
6367 + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
6368 + # FIXME: I believe we export ac_cv_exeext for Libtool,
6369 + # but it would be cool to find out if it's true. Does anybody
6370 + # maintain Libtool? --akim.
6371 + export ac_cv_exeext
6378 echo "$as_me: failed program was:" >&5
6379 -cat conftest.$ac_ext >&5
6380 -{ { echo "$as_me:1589: error: C compiler cannot create executables" >&5
6381 -echo "$as_me: error: C compiler cannot create executables" >&2;}
6382 +sed 's/^/| /' conftest.$ac_ext >&5
6384 +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
6385 +See \`config.log' for more details." >&5
6386 +echo "$as_me: error: C compiler cannot create executables
6387 +See \`config.log' for more details." >&2;}
6388 { (exit 77); exit 77; }; }
6391 ac_exeext=$ac_cv_exeext
6392 -echo "$as_me:1595: result: $ac_file" >&5
6393 +echo "$as_me:$LINENO: result: $ac_file" >&5
6394 echo "${ECHO_T}$ac_file" >&6
6396 # Check the compiler produces executables we can run. If not, either
6397 # the compiler is broken, or we cross compile.
6398 -echo "$as_me:1600: checking whether the C compiler works" >&5
6399 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5
6400 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
6401 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
6402 # If not cross compiling, check that we can run a simple program.
6403 if test "$cross_compiling" != yes; then
6404 if { ac_try='./$ac_file'
6405 - { (eval echo "$as_me:1606: \"$ac_try\"") >&5
6406 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6409 - echo "$as_me:1609: \$? = $ac_status" >&5
6410 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6411 (exit $ac_status); }; }; then
6414 if test "$cross_compiling" = maybe; then
6417 - { { echo "$as_me:1616: error: cannot run C compiled programs.
6418 -If you meant to cross compile, use \`--host'." >&5
6419 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
6420 +If you meant to cross compile, use \`--host'.
6421 +See \`config.log' for more details." >&5
6422 echo "$as_me: error: cannot run C compiled programs.
6423 -If you meant to cross compile, use \`--host'." >&2;}
6424 +If you meant to cross compile, use \`--host'.
6425 +See \`config.log' for more details." >&2;}
6426 { (exit 1); exit 1; }; }
6430 -echo "$as_me:1624: result: yes" >&5
6431 +echo "$as_me:$LINENO: result: yes" >&5
6432 echo "${ECHO_T}yes" >&6
6434 -rm -f a.out a.exe conftest$ac_cv_exeext
6435 +rm -f a.out a.exe conftest$ac_cv_exeext b.out
6436 ac_clean_files=$ac_clean_files_save
6437 # Check the compiler produces executables we can run. If not, either
6438 # the compiler is broken, or we cross compile.
6439 -echo "$as_me:1631: checking whether we are cross compiling" >&5
6440 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
6441 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
6442 -echo "$as_me:1633: result: $cross_compiling" >&5
6443 +echo "$as_me:$LINENO: result: $cross_compiling" >&5
6444 echo "${ECHO_T}$cross_compiling" >&6
6446 -echo "$as_me:1636: checking for executable suffix" >&5
6447 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
6448 -if { (eval echo "$as_me:1638: \"$ac_link\"") >&5
6449 +echo "$as_me:$LINENO: checking for suffix of executables" >&5
6450 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
6451 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6452 (eval $ac_link) 2>&5
6454 - echo "$as_me:1641: \$? = $ac_status" >&5
6455 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6456 (exit $ac_status); }; then
6457 # If both `conftest.exe' and `conftest' are `present' (well, observable)
6458 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
6459 # work properly (i.e., refer to `conftest.exe'), while it won't with
6461 -for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
6462 +for ac_file in conftest.exe conftest conftest.*; do
6463 + test -f "$ac_file" || continue
6465 - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
6466 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
6467 *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
6470 @@ -1654,26 +2190,32 @@
6474 - { { echo "$as_me:1657: error: cannot compute EXEEXT: cannot compile and link" >&5
6475 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
6476 + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
6477 +See \`config.log' for more details." >&5
6478 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
6479 +See \`config.log' for more details." >&2;}
6480 { (exit 1); exit 1; }; }
6483 rm -f conftest$ac_cv_exeext
6484 -echo "$as_me:1663: result: $ac_cv_exeext" >&5
6485 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
6486 echo "${ECHO_T}$ac_cv_exeext" >&6
6488 rm -f conftest.$ac_ext
6489 EXEEXT=$ac_cv_exeext
6491 -echo "$as_me:1669: checking for object suffix" >&5
6492 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
6493 +echo "$as_me:$LINENO: checking for suffix of object files" >&5
6494 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
6495 if test "${ac_cv_objext+set}" = set; then
6496 echo $ECHO_N "(cached) $ECHO_C" >&6
6498 cat >conftest.$ac_ext <<_ACEOF
6499 -#line 1675 "configure"
6500 -#include "confdefs.h"
6501 +#line $LINENO "configure"
6504 +cat confdefs.h >>conftest.$ac_ext
6505 +cat >>conftest.$ac_ext <<_ACEOF
6506 +/* end confdefs.h. */
6510 @@ -1684,40 +2226,47 @@
6513 rm -f conftest.o conftest.obj
6514 -if { (eval echo "$as_me:1687: \"$ac_compile\"") >&5
6515 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6516 (eval $ac_compile) 2>&5
6518 - echo "$as_me:1690: \$? = $ac_status" >&5
6519 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6520 (exit $ac_status); }; then
6521 for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
6523 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
6524 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
6525 *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
6530 echo "$as_me: failed program was:" >&5
6531 -cat conftest.$ac_ext >&5
6532 -{ { echo "$as_me:1702: error: cannot compute OBJEXT: cannot compile" >&5
6533 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
6534 +sed 's/^/| /' conftest.$ac_ext >&5
6536 +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
6537 +See \`config.log' for more details." >&5
6538 +echo "$as_me: error: cannot compute suffix of object files: cannot compile
6539 +See \`config.log' for more details." >&2;}
6540 { (exit 1); exit 1; }; }
6543 rm -f conftest.$ac_cv_objext conftest.$ac_ext
6545 -echo "$as_me:1709: result: $ac_cv_objext" >&5
6546 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
6547 echo "${ECHO_T}$ac_cv_objext" >&6
6548 OBJEXT=$ac_cv_objext
6550 -echo "$as_me:1713: checking whether we are using the GNU C compiler" >&5
6551 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
6552 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
6553 if test "${ac_cv_c_compiler_gnu+set}" = set; then
6554 echo $ECHO_N "(cached) $ECHO_C" >&6
6556 cat >conftest.$ac_ext <<_ACEOF
6557 -#line 1719 "configure"
6558 -#include "confdefs.h"
6559 +#line $LINENO "configure"
6562 +cat confdefs.h >>conftest.$ac_ext
6563 +cat >>conftest.$ac_ext <<_ACEOF
6564 +/* end confdefs.h. */
6568 @@ -1731,41 +2280,46 @@
6571 rm -f conftest.$ac_objext
6572 -if { (eval echo "$as_me:1734: \"$ac_compile\"") >&5
6573 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6574 (eval $ac_compile) 2>&5
6576 - echo "$as_me:1737: \$? = $ac_status" >&5
6577 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6578 (exit $ac_status); } &&
6579 { ac_try='test -s conftest.$ac_objext'
6580 - { (eval echo "$as_me:1740: \"$ac_try\"") >&5
6581 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6584 - echo "$as_me:1743: \$? = $ac_status" >&5
6585 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6586 (exit $ac_status); }; }; then
6589 echo "$as_me: failed program was:" >&5
6590 -cat conftest.$ac_ext >&5
6591 +sed 's/^/| /' conftest.$ac_ext >&5
6595 rm -f conftest.$ac_objext conftest.$ac_ext
6596 ac_cv_c_compiler_gnu=$ac_compiler_gnu
6599 -echo "$as_me:1755: result: $ac_cv_c_compiler_gnu" >&5
6600 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
6601 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
6602 GCC=`test $ac_compiler_gnu = yes && echo yes`
6603 ac_test_CFLAGS=${CFLAGS+set}
6604 ac_save_CFLAGS=$CFLAGS
6606 -echo "$as_me:1761: checking whether $CC accepts -g" >&5
6607 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
6608 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
6609 if test "${ac_cv_prog_cc_g+set}" = set; then
6610 echo $ECHO_N "(cached) $ECHO_C" >&6
6612 cat >conftest.$ac_ext <<_ACEOF
6613 -#line 1767 "configure"
6614 -#include "confdefs.h"
6615 +#line $LINENO "configure"
6618 +cat confdefs.h >>conftest.$ac_ext
6619 +cat >>conftest.$ac_ext <<_ACEOF
6620 +/* end confdefs.h. */
6624 @@ -1776,26 +2330,27 @@
6627 rm -f conftest.$ac_objext
6628 -if { (eval echo "$as_me:1779: \"$ac_compile\"") >&5
6629 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6630 (eval $ac_compile) 2>&5
6632 - echo "$as_me:1782: \$? = $ac_status" >&5
6633 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6634 (exit $ac_status); } &&
6635 { ac_try='test -s conftest.$ac_objext'
6636 - { (eval echo "$as_me:1785: \"$ac_try\"") >&5
6637 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6640 - echo "$as_me:1788: \$? = $ac_status" >&5
6641 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6642 (exit $ac_status); }; }; then
6645 echo "$as_me: failed program was:" >&5
6646 -cat conftest.$ac_ext >&5
6647 +sed 's/^/| /' conftest.$ac_ext >&5
6651 rm -f conftest.$ac_objext conftest.$ac_ext
6653 -echo "$as_me:1798: result: $ac_cv_prog_cc_g" >&5
6654 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
6655 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
6656 if test "$ac_test_CFLAGS" = set; then
6657 CFLAGS=$ac_save_CFLAGS
6658 @@ -1812,6 +2367,102 @@
6662 +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
6663 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
6664 +if test "${ac_cv_prog_cc_stdc+set}" = set; then
6665 + echo $ECHO_N "(cached) $ECHO_C" >&6
6667 + ac_cv_prog_cc_stdc=no
6669 +cat >conftest.$ac_ext <<_ACEOF
6670 +#line $LINENO "configure"
6673 +cat confdefs.h >>conftest.$ac_ext
6674 +cat >>conftest.$ac_ext <<_ACEOF
6675 +/* end confdefs.h. */
6676 +#include <stdarg.h>
6678 +#include <sys/types.h>
6679 +#include <sys/stat.h>
6680 +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
6681 +struct buf { int x; };
6682 +FILE * (*rcsopen) (struct buf *, struct stat *, int);
6683 +static char *e (p, i)
6689 +static char *f (char * (*g) (char **, int), char **p, ...)
6694 + s = g (p, va_arg (v,int));
6698 +int test (int i, double x);
6699 +struct s1 {int (*f) (int a);};
6700 +struct s2 {int (*f) (double a);};
6701 +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
6707 +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
6712 +# Don't try gcc -ansi; that turns off useful extensions and
6713 +# breaks some systems' header files.
6714 +# AIX -qlanglvl=ansi
6715 +# Ultrix and OSF/1 -std1
6716 +# HP-UX 10.20 and later -Ae
6717 +# HP-UX older versions -Aa -D_HPUX_SOURCE
6718 +# SVR4 -Xc -D__EXTENSIONS__
6719 +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
6721 + CC="$ac_save_CC $ac_arg"
6722 + rm -f conftest.$ac_objext
6723 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6724 + (eval $ac_compile) 2>&5
6726 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6727 + (exit $ac_status); } &&
6728 + { ac_try='test -s conftest.$ac_objext'
6729 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6730 + (eval $ac_try) 2>&5
6732 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6733 + (exit $ac_status); }; }; then
6734 + ac_cv_prog_cc_stdc=$ac_arg
6737 + echo "$as_me: failed program was:" >&5
6738 +sed 's/^/| /' conftest.$ac_ext >&5
6741 +rm -f conftest.$ac_objext
6743 +rm -f conftest.$ac_ext conftest.$ac_objext
6748 +case "x$ac_cv_prog_cc_stdc" in
6750 + echo "$as_me:$LINENO: result: none needed" >&5
6751 +echo "${ECHO_T}none needed" >&6 ;;
6753 + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
6754 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
6755 + CC="$CC $ac_cv_prog_cc_stdc" ;;
6758 # Some people use a C++ compiler to compile C. Since we use `exit',
6759 # in C++ we need to declare it. In case someone uses the same compiler
6760 # for both compiling C and C++ we need to have the C++ compiler decide
6761 @@ -1822,16 +2473,16 @@
6764 rm -f conftest.$ac_objext
6765 -if { (eval echo "$as_me:1825: \"$ac_compile\"") >&5
6766 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6767 (eval $ac_compile) 2>&5
6769 - echo "$as_me:1828: \$? = $ac_status" >&5
6770 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6771 (exit $ac_status); } &&
6772 { ac_try='test -s conftest.$ac_objext'
6773 - { (eval echo "$as_me:1831: \"$ac_try\"") >&5
6774 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6777 - echo "$as_me:1834: \$? = $ac_status" >&5
6778 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6779 (exit $ac_status); }; }; then
6780 for ac_declaration in \
6782 @@ -1843,8 +2494,12 @@
6785 cat >conftest.$ac_ext <<_ACEOF
6786 -#line 1846 "configure"
6787 -#include "confdefs.h"
6788 +#line $LINENO "configure"
6791 +cat confdefs.h >>conftest.$ac_ext
6792 +cat >>conftest.$ac_ext <<_ACEOF
6793 +/* end confdefs.h. */
6797 @@ -1856,27 +2511,32 @@
6800 rm -f conftest.$ac_objext
6801 -if { (eval echo "$as_me:1859: \"$ac_compile\"") >&5
6802 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6803 (eval $ac_compile) 2>&5
6805 - echo "$as_me:1862: \$? = $ac_status" >&5
6806 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6807 (exit $ac_status); } &&
6808 { ac_try='test -s conftest.$ac_objext'
6809 - { (eval echo "$as_me:1865: \"$ac_try\"") >&5
6810 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6813 - echo "$as_me:1868: \$? = $ac_status" >&5
6814 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6815 (exit $ac_status); }; }; then
6818 echo "$as_me: failed program was:" >&5
6819 -cat conftest.$ac_ext >&5
6820 +sed 's/^/| /' conftest.$ac_ext >&5
6824 rm -f conftest.$ac_objext conftest.$ac_ext
6825 cat >conftest.$ac_ext <<_ACEOF
6826 -#line 1878 "configure"
6827 -#include "confdefs.h"
6828 +#line $LINENO "configure"
6831 +cat confdefs.h >>conftest.$ac_ext
6832 +cat >>conftest.$ac_ext <<_ACEOF
6833 +/* end confdefs.h. */
6837 @@ -1887,31 +2547,36 @@
6840 rm -f conftest.$ac_objext
6841 -if { (eval echo "$as_me:1890: \"$ac_compile\"") >&5
6842 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6843 (eval $ac_compile) 2>&5
6845 - echo "$as_me:1893: \$? = $ac_status" >&5
6846 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6847 (exit $ac_status); } &&
6848 { ac_try='test -s conftest.$ac_objext'
6849 - { (eval echo "$as_me:1896: \"$ac_try\"") >&5
6850 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6853 - echo "$as_me:1899: \$? = $ac_status" >&5
6854 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6855 (exit $ac_status); }; }; then
6858 echo "$as_me: failed program was:" >&5
6859 -cat conftest.$ac_ext >&5
6860 +sed 's/^/| /' conftest.$ac_ext >&5
6863 rm -f conftest.$ac_objext conftest.$ac_ext
6865 -echo '#ifdef __cplusplus' >>confdefs.h
6866 -echo $ac_declaration >>confdefs.h
6867 -echo '#endif' >>confdefs.h
6869 +if test -n "$ac_declaration"; then
6870 + echo '#ifdef __cplusplus' >>confdefs.h
6871 + echo $ac_declaration >>confdefs.h
6872 + echo '#endif' >>confdefs.h
6876 echo "$as_me: failed program was:" >&5
6877 -cat conftest.$ac_ext >&5
6878 +sed 's/^/| /' conftest.$ac_ext >&5
6881 rm -f conftest.$ac_objext conftest.$ac_ext
6883 @@ -1919,8 +2584,154 @@
6884 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6885 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6886 ac_compiler_gnu=$ac_cv_c_compiler_gnu
6887 +rm -f .deps 2>/dev/null
6888 +mkdir .deps 2>/dev/null
6889 +if test -d .deps; then
6892 + # MS-DOS does not allow filenames that begin with a dot.
6895 +rmdir .deps 2>/dev/null
6898 + ac_config_commands="$ac_config_commands depfiles"
6901 +am_make=${MAKE-make}
6902 +cat > confinc << 'END'
6906 +# If we don't find an include directive, just comment out the code.
6907 +echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
6908 +echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
6912 +# First try GNU make style include.
6913 +echo "include confinc" > confmf
6914 +# We grep out `Entering directory' and `Leaving directory'
6915 +# messages which can occur if `w' ends up in MAKEFLAGS.
6916 +# In particular we don't look at `^make:' because GNU make might
6917 +# be invoked under some other name (usually "gmake"), in which
6918 +# case it prints its new name instead of `make'.
6919 +if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
6920 + am__include=include
6924 +# Now try BSD make style include.
6925 +if test "$am__include" = "#"; then
6926 + echo '.include "confinc"' > confmf
6927 + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
6928 + am__include=.include
6935 +echo "$as_me:$LINENO: result: $_am_result" >&5
6936 +echo "${ECHO_T}$_am_result" >&6
6937 +rm -f confinc confmf
6939 +# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
6940 +if test "${enable_dependency_tracking+set}" = set; then
6941 + enableval="$enable_dependency_tracking"
6944 +if test "x$enable_dependency_tracking" != xno; then
6945 + am_depcomp="$ac_aux_dir/depcomp"
6946 + AMDEPBACKSLASH='\'
6950 +if test "x$enable_dependency_tracking" != xno; then
6961 +depcc="$CC" am_compiler_list=
6963 +echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
6964 +echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
6965 +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
6966 + echo $ECHO_N "(cached) $ECHO_C" >&6
6968 + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
6969 + # We make a subdir and do the tests there. Otherwise we can end up
6970 + # making bogus files that we don't know about and never remove. For
6971 + # instance it was reported that on HP-UX the gcc test will end up
6972 + # making a dummy file named `D' -- because `-MD' means `put the output
6974 + mkdir conftest.dir
6975 + # Copy depcomp to subdir because otherwise we won't find it if we're
6976 + # using a relative directory.
6977 + cp "$am_depcomp" conftest.dir
6980 + am_cv_CC_dependencies_compiler_type=none
6981 + if test "$am_compiler_list" = ""; then
6982 + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
6984 + for depmode in $am_compiler_list; do
6985 + # We need to recreate these files for each test, as the compiler may
6986 + # overwrite some of them when testing with obscure command lines.
6987 + # This happens at least with the AIX C compiler.
6988 + echo '#include "conftest.h"' > conftest.c
6989 + echo 'int i;' > conftest.h
6990 + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
6994 + # after this tag, mechanisms are not by side-effect, so they'll
6995 + # only be used when explicitly requested
6996 + if test "x$enable_dependency_tracking" = xyes; then
7004 + # We check with `-c' and `-o' for the sake of the "dashmstdout"
7005 + # mode. It turns out that the SunPro C++ compiler does not properly
7006 + # handle `-M -o', and we need to detect this.
7007 + if depmode=$depmode \
7008 + source=conftest.c object=conftest.o \
7009 + depfile=conftest.Po tmpdepfile=conftest.TPo \
7010 + $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
7011 + grep conftest.h conftest.Po > /dev/null 2>&1 &&
7012 + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
7013 + am_cv_CC_dependencies_compiler_type=$depmode
7019 + rm -rf conftest.dir
7021 + am_cv_CC_dependencies_compiler_type=none
7025 +echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
7026 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
7027 +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
7031 -echo "$as_me:1923: checking for ${CC-cc} option to accept ANSI C" >&5
7035 +echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5
7036 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
7037 if test "${am_cv_prog_cc_stdc+set}" = set; then
7038 echo $ECHO_N "(cached) $ECHO_C" >&6
7039 @@ -1931,14 +2742,19 @@
7040 # breaks some systems' header files.
7041 # AIX -qlanglvl=ansi
7042 # Ultrix and OSF/1 -std1
7043 -# HP-UX -Aa -D_HPUX_SOURCE
7044 +# HP-UX 10.20 and later -Ae
7045 +# HP-UX older versions -Aa -D_HPUX_SOURCE
7046 # SVR4 -Xc -D__EXTENSIONS__
7047 -for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
7048 +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
7050 CC="$ac_save_CC $ac_arg"
7051 cat >conftest.$ac_ext <<_ACEOF
7052 -#line 1940 "configure"
7053 -#include "confdefs.h"
7054 +#line $LINENO "configure"
7057 +cat confdefs.h >>conftest.$ac_ext
7058 +cat >>conftest.$ac_ext <<_ACEOF
7059 +/* end confdefs.h. */
7062 #include <sys/types.h>
7063 @@ -1979,21 +2795,22 @@
7066 rm -f conftest.$ac_objext
7067 -if { (eval echo "$as_me:1982: \"$ac_compile\"") >&5
7068 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7069 (eval $ac_compile) 2>&5
7071 - echo "$as_me:1985: \$? = $ac_status" >&5
7072 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7073 (exit $ac_status); } &&
7074 { ac_try='test -s conftest.$ac_objext'
7075 - { (eval echo "$as_me:1988: \"$ac_try\"") >&5
7076 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7079 - echo "$as_me:1991: \$? = $ac_status" >&5
7080 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7081 (exit $ac_status); }; }; then
7082 am_cv_prog_cc_stdc="$ac_arg"; break
7084 echo "$as_me: failed program was:" >&5
7085 -cat conftest.$ac_ext >&5
7086 +sed 's/^/| /' conftest.$ac_ext >&5
7089 rm -f conftest.$ac_objext conftest.$ac_ext
7091 @@ -2002,10 +2819,10 @@
7094 if test -z "$am_cv_prog_cc_stdc"; then
7095 - echo "$as_me:2005: result: none needed" >&5
7096 + echo "$as_me:$LINENO: result: none needed" >&5
7097 echo "${ECHO_T}none needed" >&6
7099 - echo "$as_me:2008: result: $am_cv_prog_cc_stdc" >&5
7100 + echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5
7101 echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6
7103 case "x$am_cv_prog_cc_stdc" in
7104 @@ -2016,7 +2833,7 @@
7105 if test -n "$ac_tool_prefix"; then
7106 # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
7107 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
7108 -echo "$as_me:2019: checking for $ac_word" >&5
7109 +echo "$as_me:$LINENO: checking for $ac_word" >&5
7110 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
7111 if test "${ac_cv_prog_RANLIB+set}" = set; then
7112 echo $ECHO_N "(cached) $ECHO_C" >&6
7113 @@ -2024,25 +2841,28 @@
7114 if test -n "$RANLIB"; then
7115 ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
7117 - ac_save_IFS=$IFS; IFS=$ac_path_separator
7119 -for ac_dir in $ac_dummy; do
7121 - test -z "$ac_dir" && ac_dir=.
7122 - $as_executable_p "$ac_dir/$ac_word" || continue
7123 -ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
7124 -echo "$as_me:2034: found $ac_dir/$ac_word" >&5
7126 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7127 +for as_dir in $PATH
7130 + test -z "$as_dir" && as_dir=.
7131 + for ac_exec_ext in '' $ac_executable_extensions; do
7132 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7133 + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
7134 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7142 RANLIB=$ac_cv_prog_RANLIB
7143 if test -n "$RANLIB"; then
7144 - echo "$as_me:2042: result: $RANLIB" >&5
7145 + echo "$as_me:$LINENO: result: $RANLIB" >&5
7146 echo "${ECHO_T}$RANLIB" >&6
7148 - echo "$as_me:2045: result: no" >&5
7149 + echo "$as_me:$LINENO: result: no" >&5
7150 echo "${ECHO_T}no" >&6
7153 @@ -2051,7 +2871,7 @@
7154 ac_ct_RANLIB=$RANLIB
7155 # Extract the first word of "ranlib", so it can be a program name with args.
7156 set dummy ranlib; ac_word=$2
7157 -echo "$as_me:2054: checking for $ac_word" >&5
7158 +echo "$as_me:$LINENO: checking for $ac_word" >&5
7159 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
7160 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
7161 echo $ECHO_N "(cached) $ECHO_C" >&6
7162 @@ -2059,15 +2879,18 @@
7163 if test -n "$ac_ct_RANLIB"; then
7164 ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
7166 - ac_save_IFS=$IFS; IFS=$ac_path_separator
7168 -for ac_dir in $ac_dummy; do
7170 - test -z "$ac_dir" && ac_dir=.
7171 - $as_executable_p "$ac_dir/$ac_word" || continue
7172 -ac_cv_prog_ac_ct_RANLIB="ranlib"
7173 -echo "$as_me:2069: found $ac_dir/$ac_word" >&5
7175 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7176 +for as_dir in $PATH
7179 + test -z "$as_dir" && as_dir=.
7180 + for ac_exec_ext in '' $ac_executable_extensions; do
7181 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7182 + ac_cv_prog_ac_ct_RANLIB="ranlib"
7183 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7189 test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
7190 @@ -2075,10 +2898,10 @@
7192 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
7193 if test -n "$ac_ct_RANLIB"; then
7194 - echo "$as_me:2078: result: $ac_ct_RANLIB" >&5
7195 + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
7196 echo "${ECHO_T}$ac_ct_RANLIB" >&6
7198 - echo "$as_me:2081: result: no" >&5
7199 + echo "$as_me:$LINENO: result: no" >&5
7200 echo "${ECHO_T}no" >&6
7203 @@ -2087,300 +2910,112 @@
7204 RANLIB="$ac_cv_prog_RANLIB"
7207 -if test -z "$GTK_CONFIG"; then
7208 - GTK_CONFIG=`which gtk-config || which gtk12-config`
7211 -# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
7212 -if test "${with_gtk_prefix+set}" = set; then
7213 - withval="$with_gtk_prefix"
7214 - gtk_config_prefix="$withval"
7216 - gtk_config_prefix=""
7219 -# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
7220 -if test "${with_gtk_exec_prefix+set}" = set; then
7221 - withval="$with_gtk_exec_prefix"
7222 - gtk_config_exec_prefix="$withval"
7224 - gtk_config_exec_prefix=""
7226 -# Check whether --enable-gtktest or --disable-gtktest was given.
7227 -if test "${enable_gtktest+set}" = set; then
7228 - enableval="$enable_gtktest"
7231 - enable_gtktest=yes
7239 - gtk_config_args="$gtk_config_args gthread"
7244 - if test x$gtk_config_exec_prefix != x ; then
7245 - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
7246 - if test x${GTK_CONFIG+set} != xset ; then
7247 - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
7250 - if test x$gtk_config_prefix != x ; then
7251 - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
7252 - if test x${GTK_CONFIG+set} != xset ; then
7253 - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
7258 - # Extract the first word of "gtk-config", so it can be a program name with args.
7259 -set dummy gtk-config; ac_word=$2
7260 -echo "$as_me:2141: checking for $ac_word" >&5
7261 + if test -z "$PKG_CONFIG"; then
7262 + # Extract the first word of "pkg-config", so it can be a program name with args.
7263 +set dummy pkg-config; ac_word=$2
7264 +echo "$as_me:$LINENO: checking for $ac_word" >&5
7265 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
7266 -if test "${ac_cv_path_GTK_CONFIG+set}" = set; then
7267 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
7268 echo $ECHO_N "(cached) $ECHO_C" >&6
7270 - case $GTK_CONFIG in
7271 + case $PKG_CONFIG in
7273 - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
7274 + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
7277 - ac_save_IFS=$IFS; IFS=$ac_path_separator
7279 -for ac_dir in $ac_dummy; do
7281 - test -z "$ac_dir" && ac_dir=.
7282 - if $as_executable_p "$ac_dir/$ac_word"; then
7283 - ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
7284 - echo "$as_me:2158: found $ac_dir/$ac_word" >&5
7287 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7288 +for as_dir in $PATH
7291 + test -z "$as_dir" && as_dir=.
7292 + for ac_exec_ext in '' $ac_executable_extensions; do
7293 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7294 + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
7295 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
7301 - test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
7302 + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
7306 -GTK_CONFIG=$ac_cv_path_GTK_CONFIG
7307 +PKG_CONFIG=$ac_cv_path_PKG_CONFIG
7309 -if test -n "$GTK_CONFIG"; then
7310 - echo "$as_me:2170: result: $GTK_CONFIG" >&5
7311 -echo "${ECHO_T}$GTK_CONFIG" >&6
7312 +if test -n "$PKG_CONFIG"; then
7313 + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
7314 +echo "${ECHO_T}$PKG_CONFIG" >&6
7316 - echo "$as_me:2173: result: no" >&5
7317 + echo "$as_me:$LINENO: result: no" >&5
7318 echo "${ECHO_T}no" >&6
7321 - min_gtk_version=1.2.0
7322 - echo "$as_me:2178: checking for GTK - version >= $min_gtk_version" >&5
7323 -echo $ECHO_N "checking for GTK - version >= $min_gtk_version... $ECHO_C" >&6
7325 - if test "$GTK_CONFIG" = "no" ; then
7329 + if test "$PKG_CONFIG" = "no" ; then
7330 + echo "*** The pkg-config script could not be found. Make sure it is"
7331 + echo "*** in your path, or set the PKG_CONFIG environment variable"
7332 + echo "*** to the full path to pkg-config."
7333 + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
7335 - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
7336 - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
7337 - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
7338 - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
7339 - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
7340 - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
7341 - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
7342 - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
7343 - if test "x$enable_gtktest" = "xyes" ; then
7344 - ac_save_CFLAGS="$CFLAGS"
7345 - ac_save_LIBS="$LIBS"
7346 - CFLAGS="$CFLAGS $GTK_CFLAGS"
7347 - LIBS="$GTK_LIBS $LIBS"
7348 - rm -f conf.gtktest
7349 - if test "$cross_compiling" = yes; then
7350 - echo $ac_n "cross compiling; assumed OK... $ac_c"
7352 - cat >conftest.$ac_ext <<_ACEOF
7353 -#line 2202 "configure"
7354 -#include "confdefs.h"
7355 + PKG_CONFIG_MIN_VERSION=0.9.0
7356 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
7357 + echo "$as_me:$LINENO: checking for gtk+-2.0 >= $GTK_REQUIRED" >&5
7358 +echo $ECHO_N "checking for gtk+-2.0 >= $GTK_REQUIRED... $ECHO_C" >&6
7360 -#include <gtk/gtk.h>
7362 -#include <stdlib.h>
7363 + if $PKG_CONFIG --exists "gtk+-2.0 >= $GTK_REQUIRED" ; then
7364 + echo "$as_me:$LINENO: result: yes" >&5
7365 +echo "${ECHO_T}yes" >&6
7371 - int major, minor, micro;
7372 - char *tmp_version;
7373 + echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5
7374 +echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6
7375 + GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED"`
7376 + echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5
7377 +echo "${ECHO_T}$GTK_CFLAGS" >&6
7379 + echo "$as_me:$LINENO: checking GTK_LIBS" >&5
7380 +echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6
7381 + GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED"`
7382 + echo "$as_me:$LINENO: result: $GTK_LIBS" >&5
7383 +echo "${ECHO_T}$GTK_LIBS" >&6
7387 + ## If we have a custom action on failure, don't print errors, but
7388 + ## do set a variable so people can do so.
7389 + GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED"`
7390 + echo $GTK_PKG_ERRORS
7393 - system ("touch conf.gtktest");
7395 - /* HP/UX 9 (%@#!) writes to sscanf strings */
7396 - tmp_version = g_strdup("$min_gtk_version");
7397 - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
7398 - printf("%s, bad version string\n", "$min_gtk_version");
7402 - if ((gtk_major_version != $gtk_config_major_version) ||
7403 - (gtk_minor_version != $gtk_config_minor_version) ||
7404 - (gtk_micro_version != $gtk_config_micro_version))
7406 - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
7407 - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
7408 - gtk_major_version, gtk_minor_version, gtk_micro_version);
7409 - printf ("*** was found! If gtk-config was correct, then it is best\n");
7410 - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
7411 - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
7412 - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
7413 - printf("*** required on your system.\n");
7414 - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
7415 - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
7416 - printf("*** before re-running configure\n");
7418 -#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
7419 - else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
7420 - (gtk_minor_version != GTK_MINOR_VERSION) ||
7421 - (gtk_micro_version != GTK_MICRO_VERSION))
7423 - printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
7424 - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
7425 - printf("*** library (version %d.%d.%d)\n",
7426 - gtk_major_version, gtk_minor_version, gtk_micro_version);
7428 -#endif /* defined (GTK_MAJOR_VERSION) ... */
7431 - if ((gtk_major_version > major) ||
7432 - ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
7433 - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
7439 - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
7440 - gtk_major_version, gtk_minor_version, gtk_micro_version);
7441 - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
7442 - major, minor, micro);
7443 - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
7445 - printf("*** If you have already installed a sufficiently new version, this error\n");
7446 - printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
7447 - printf("*** being found. The easiest way to fix this is to remove the old version\n");
7448 - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
7449 - printf("*** correct copy of gtk-config. (In this case, you will have to\n");
7450 - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
7451 - printf("*** so that the correct libraries are found at run-time))\n");
7458 -rm -f conftest$ac_exeext
7459 -if { (eval echo "$as_me:2281: \"$ac_link\"") >&5
7460 - (eval $ac_link) 2>&5
7462 - echo "$as_me:2284: \$? = $ac_status" >&5
7463 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
7464 - { (eval echo "$as_me:2286: \"$ac_try\"") >&5
7465 - (eval $ac_try) 2>&5
7467 - echo "$as_me:2289: \$? = $ac_status" >&5
7468 - (exit $ac_status); }; }; then
7471 - echo "$as_me: program exited with status $ac_status" >&5
7472 -echo "$as_me: failed program was:" >&5
7473 -cat conftest.$ac_ext >&5
7476 -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
7478 - CFLAGS="$ac_save_CFLAGS"
7479 - LIBS="$ac_save_LIBS"
7481 + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
7482 + echo "*** See http://www.freedesktop.org/software/pkgconfig"
7485 - if test "x$no_gtk" = x ; then
7486 - echo "$as_me:2305: result: yes" >&5
7487 -echo "${ECHO_T}yes" >&6
7488 - LIBS="$LIBS $GTK_LIBS" CFLAGS="$GTK_CFLAGS $CFLAGS"
7490 + if test $succeeded = yes; then
7493 - echo "$as_me:2309: result: no" >&5
7494 -echo "${ECHO_T}no" >&6
7495 - if test "$GTK_CONFIG" = "no" ; then
7496 - echo "*** The gtk-config script installed by GTK could not be found"
7497 - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
7498 - echo "*** your path, or set the GTK_CONFIG environment variable to the"
7499 - echo "*** full path to gtk-config."
7501 - if test -f conf.gtktest ; then
7504 - echo "*** Could not run GTK test program, checking why..."
7505 - CFLAGS="$CFLAGS $GTK_CFLAGS"
7506 - LIBS="$LIBS $GTK_LIBS"
7507 - cat >conftest.$ac_ext <<_ACEOF
7508 -#line 2324 "configure"
7509 -#include "confdefs.h"
7510 + { { echo "$as_me:$LINENO: error: Library requirements (gtk+-2.0 >= $GTK_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
7511 +echo "$as_me: error: Library requirements (gtk+-2.0 >= $GTK_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
7512 + { (exit 1); exit 1; }; }
7515 -#include <gtk/gtk.h>
7521 - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version));
7526 -rm -f conftest.$ac_objext conftest$ac_exeext
7527 -if { (eval echo "$as_me:2339: \"$ac_link\"") >&5
7528 - (eval $ac_link) 2>&5
7530 - echo "$as_me:2342: \$? = $ac_status" >&5
7531 - (exit $ac_status); } &&
7532 - { ac_try='test -s conftest$ac_exeext'
7533 - { (eval echo "$as_me:2345: \"$ac_try\"") >&5
7534 - (eval $ac_try) 2>&5
7536 - echo "$as_me:2348: \$? = $ac_status" >&5
7537 - (exit $ac_status); }; }; then
7538 - echo "*** The test program compiled, but did not run. This usually means"
7539 - echo "*** that the run-time linker is not finding GTK or finding the wrong"
7540 - echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
7541 - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
7542 - echo "*** to the installed location Also, make sure you have run ldconfig if that"
7543 - echo "*** is required on your system"
7545 - echo "*** If you have an old version installed, it is best to remove it, although"
7546 - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
7548 - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
7549 - echo "*** came with the system with the command"
7551 - echo "*** rpm --erase --nodeps gtk gtk-devel"
7553 - echo "$as_me: failed program was:" >&5
7554 -cat conftest.$ac_ext >&5
7555 - echo "*** The test program failed to compile or link. See the file config.log for the"
7556 - echo "*** exact error that occured. This usually means GTK was incorrectly installed"
7557 - echo "*** or that you have moved GTK since it was installed. In the latter case, you"
7558 - echo "*** may want to edit the gtk-config script: $GTK_CONFIG"
7560 -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7561 - CFLAGS="$ac_save_CFLAGS"
7562 - LIBS="$ac_save_LIBS"
7567 - { echo "$as_me:2379: WARNING: Unable to find Gtk+ with a version >= 1.2.0" >&5
7568 -echo "$as_me: WARNING: Unable to find Gtk+ with a version >= 1.2.0" >&2;}
7570 +CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
7571 +LDFLAGS="$LDFLAGS $GTK_LIBS"
7573 - rm -f conf.gtktest
7575 if eval "test x$GCC = xyes"; then
7576 if test "`echo $CFLAGS | grep '\-Wall' 2> /dev/null`" = ""; then
7577 @@ -2398,10 +3033,12 @@
7583 if test -n "$LIBJPEG_LIBDIR"; then
7584 LIBS="$LIBS -L$LIBJPEG_LIBDIR"
7586 -echo "$as_me:2404: checking for jpeg_destroy_decompress in -ljpeg" >&5
7587 +echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5
7588 echo $ECHO_N "checking for jpeg_destroy_decompress in -ljpeg... $ECHO_C" >&6
7589 if test "${ac_cv_lib_jpeg_jpeg_destroy_decompress+set}" = set; then
7590 echo $ECHO_N "(cached) $ECHO_C" >&6
7591 @@ -2409,8 +3046,12 @@
7592 ac_check_lib_save_LIBS=$LIBS
7594 cat >conftest.$ac_ext <<_ACEOF
7595 -#line 2412 "configure"
7596 -#include "confdefs.h"
7597 +#line $LINENO "configure"
7600 +cat confdefs.h >>conftest.$ac_ext
7601 +cat >>conftest.$ac_ext <<_ACEOF
7602 +/* end confdefs.h. */
7604 /* Override any gcc2 internal prototype to avoid an error. */
7606 @@ -2428,27 +3069,28 @@
7609 rm -f conftest.$ac_objext conftest$ac_exeext
7610 -if { (eval echo "$as_me:2431: \"$ac_link\"") >&5
7611 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7612 (eval $ac_link) 2>&5
7614 - echo "$as_me:2434: \$? = $ac_status" >&5
7615 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7616 (exit $ac_status); } &&
7617 { ac_try='test -s conftest$ac_exeext'
7618 - { (eval echo "$as_me:2437: \"$ac_try\"") >&5
7619 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7622 - echo "$as_me:2440: \$? = $ac_status" >&5
7623 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7624 (exit $ac_status); }; }; then
7625 ac_cv_lib_jpeg_jpeg_destroy_decompress=yes
7627 echo "$as_me: failed program was:" >&5
7628 -cat conftest.$ac_ext >&5
7629 +sed 's/^/| /' conftest.$ac_ext >&5
7631 ac_cv_lib_jpeg_jpeg_destroy_decompress=no
7633 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7634 LIBS=$ac_check_lib_save_LIBS
7636 -echo "$as_me:2451: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
7637 +echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_decompress" >&5
7638 echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_decompress" >&6
7639 if test $ac_cv_lib_jpeg_jpeg_destroy_decompress = yes; then
7641 @@ -2465,7 +3107,7 @@
7642 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7643 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7644 ac_compiler_gnu=$ac_cv_c_compiler_gnu
7645 -echo "$as_me:2468: checking how to run the C preprocessor" >&5
7646 +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
7647 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
7648 # On Suns, sometimes $CPP names a directory.
7649 if test -n "$CPP" && test -d "$CPP"; then
7650 @@ -2478,27 +3120,36 @@
7651 # Double quotes because CPP needs to be expanded
7652 for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
7654 - # break 2 since there is a loop in there.
7656 for ac_c_preproc_warn_flag in '' yes
7658 # Use a header file that comes with gcc, so configuring glibc
7659 # with a fresh cross-compiler works.
7660 + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
7661 + # <limits.h> exists even on freestanding compilers.
7662 # On the NeXT, cc -E runs the code through the compiler's parser,
7663 # not just through cpp. "Syntax error" is here to catch this case.
7664 cat >conftest.$ac_ext <<_ACEOF
7665 -#line 2490 "configure"
7666 -#include "confdefs.h"
7667 -#include <assert.h>
7668 +#line $LINENO "configure"
7671 +cat confdefs.h >>conftest.$ac_ext
7672 +cat >>conftest.$ac_ext <<_ACEOF
7673 +/* end confdefs.h. */
7675 +# include <limits.h>
7677 +# include <assert.h>
7681 -if { (eval echo "$as_me:2495: \"$ac_cpp conftest.$ac_ext\"") >&5
7682 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7683 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7685 - egrep -v '^ *\+' conftest.er1 >conftest.err
7686 + grep -v '^ *+' conftest.er1 >conftest.err
7688 cat conftest.err >&5
7689 - echo "$as_me:2501: \$? = $ac_status" >&5
7690 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7691 (exit $ac_status); } >/dev/null; then
7692 if test -s conftest.err; then
7693 ac_cpp_err=$ac_c_preproc_warn_flag
7694 @@ -2512,7 +3163,8 @@
7697 echo "$as_me: failed program was:" >&5
7698 - cat conftest.$ac_ext >&5
7699 +sed 's/^/| /' conftest.$ac_ext >&5
7701 # Broken: fails on valid input.
7704 @@ -2521,17 +3173,21 @@
7705 # OK, works on sane cases. Now check whether non-existent headers
7706 # can be detected and how.
7707 cat >conftest.$ac_ext <<_ACEOF
7708 -#line 2524 "configure"
7709 -#include "confdefs.h"
7710 +#line $LINENO "configure"
7713 +cat confdefs.h >>conftest.$ac_ext
7714 +cat >>conftest.$ac_ext <<_ACEOF
7715 +/* end confdefs.h. */
7716 #include <ac_nonexistent.h>
7718 -if { (eval echo "$as_me:2528: \"$ac_cpp conftest.$ac_ext\"") >&5
7719 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7720 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7722 - egrep -v '^ *\+' conftest.er1 >conftest.err
7723 + grep -v '^ *+' conftest.er1 >conftest.err
7725 cat conftest.err >&5
7726 - echo "$as_me:2534: \$? = $ac_status" >&5
7727 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7728 (exit $ac_status); } >/dev/null; then
7729 if test -s conftest.err; then
7730 ac_cpp_err=$ac_c_preproc_warn_flag
7731 @@ -2546,7 +3202,8 @@
7734 echo "$as_me: failed program was:" >&5
7735 - cat conftest.$ac_ext >&5
7736 +sed 's/^/| /' conftest.$ac_ext >&5
7738 # Passes both tests.
7741 @@ -2557,7 +3214,7 @@
7742 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
7743 rm -f conftest.err conftest.$ac_ext
7744 if $ac_preproc_ok; then
7750 @@ -2568,28 +3225,38 @@
7754 -echo "$as_me:2571: result: $CPP" >&5
7755 +echo "$as_me:$LINENO: result: $CPP" >&5
7756 echo "${ECHO_T}$CPP" >&6
7758 for ac_c_preproc_warn_flag in '' yes
7760 # Use a header file that comes with gcc, so configuring glibc
7761 # with a fresh cross-compiler works.
7762 + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
7763 + # <limits.h> exists even on freestanding compilers.
7764 # On the NeXT, cc -E runs the code through the compiler's parser,
7765 # not just through cpp. "Syntax error" is here to catch this case.
7766 cat >conftest.$ac_ext <<_ACEOF
7767 -#line 2581 "configure"
7768 -#include "confdefs.h"
7769 -#include <assert.h>
7770 +#line $LINENO "configure"
7773 +cat confdefs.h >>conftest.$ac_ext
7774 +cat >>conftest.$ac_ext <<_ACEOF
7775 +/* end confdefs.h. */
7777 +# include <limits.h>
7779 +# include <assert.h>
7783 -if { (eval echo "$as_me:2586: \"$ac_cpp conftest.$ac_ext\"") >&5
7784 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7785 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7787 - egrep -v '^ *\+' conftest.er1 >conftest.err
7788 + grep -v '^ *+' conftest.er1 >conftest.err
7790 cat conftest.err >&5
7791 - echo "$as_me:2592: \$? = $ac_status" >&5
7792 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7793 (exit $ac_status); } >/dev/null; then
7794 if test -s conftest.err; then
7795 ac_cpp_err=$ac_c_preproc_warn_flag
7796 @@ -2603,7 +3270,8 @@
7799 echo "$as_me: failed program was:" >&5
7800 - cat conftest.$ac_ext >&5
7801 +sed 's/^/| /' conftest.$ac_ext >&5
7803 # Broken: fails on valid input.
7806 @@ -2612,17 +3280,21 @@
7807 # OK, works on sane cases. Now check whether non-existent headers
7808 # can be detected and how.
7809 cat >conftest.$ac_ext <<_ACEOF
7810 -#line 2615 "configure"
7811 -#include "confdefs.h"
7812 +#line $LINENO "configure"
7815 +cat confdefs.h >>conftest.$ac_ext
7816 +cat >>conftest.$ac_ext <<_ACEOF
7817 +/* end confdefs.h. */
7818 #include <ac_nonexistent.h>
7820 -if { (eval echo "$as_me:2619: \"$ac_cpp conftest.$ac_ext\"") >&5
7821 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7822 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7824 - egrep -v '^ *\+' conftest.er1 >conftest.err
7825 + grep -v '^ *+' conftest.er1 >conftest.err
7827 cat conftest.err >&5
7828 - echo "$as_me:2625: \$? = $ac_status" >&5
7829 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7830 (exit $ac_status); } >/dev/null; then
7831 if test -s conftest.err; then
7832 ac_cpp_err=$ac_c_preproc_warn_flag
7833 @@ -2637,7 +3309,8 @@
7836 echo "$as_me: failed program was:" >&5
7837 - cat conftest.$ac_ext >&5
7838 +sed 's/^/| /' conftest.$ac_ext >&5
7840 # Passes both tests.
7843 @@ -2650,8 +3323,10 @@
7844 if $ac_preproc_ok; then
7847 - { { echo "$as_me:2653: error: C preprocessor \"$CPP\" fails sanity check" >&5
7848 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
7849 + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
7850 +See \`config.log' for more details." >&5
7851 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
7852 +See \`config.log' for more details." >&2;}
7853 { (exit 1); exit 1; }; }
7856 @@ -2661,26 +3336,316 @@
7857 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7858 ac_compiler_gnu=$ac_cv_c_compiler_gnu
7860 -for ac_header in jpeglib.h jconfig.h jerror.h jmorecfg.h
7862 +echo "$as_me:$LINENO: checking for egrep" >&5
7863 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6
7864 +if test "${ac_cv_prog_egrep+set}" = set; then
7865 + echo $ECHO_N "(cached) $ECHO_C" >&6
7867 + if echo a | (grep -E '(a|b)') >/dev/null 2>&1
7868 + then ac_cv_prog_egrep='grep -E'
7869 + else ac_cv_prog_egrep='egrep'
7872 +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
7873 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6
7874 + EGREP=$ac_cv_prog_egrep
7877 +echo "$as_me:$LINENO: checking for ANSI C header files" >&5
7878 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
7879 +if test "${ac_cv_header_stdc+set}" = set; then
7880 + echo $ECHO_N "(cached) $ECHO_C" >&6
7882 + cat >conftest.$ac_ext <<_ACEOF
7883 +#line $LINENO "configure"
7886 +cat confdefs.h >>conftest.$ac_ext
7887 +cat >>conftest.$ac_ext <<_ACEOF
7888 +/* end confdefs.h. */
7889 +#include <stdlib.h>
7890 +#include <stdarg.h>
7891 +#include <string.h>
7902 +rm -f conftest.$ac_objext
7903 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7904 + (eval $ac_compile) 2>&5
7906 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7907 + (exit $ac_status); } &&
7908 + { ac_try='test -s conftest.$ac_objext'
7909 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7910 + (eval $ac_try) 2>&5
7912 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7913 + (exit $ac_status); }; }; then
7914 + ac_cv_header_stdc=yes
7916 + echo "$as_me: failed program was:" >&5
7917 +sed 's/^/| /' conftest.$ac_ext >&5
7919 +ac_cv_header_stdc=no
7921 +rm -f conftest.$ac_objext conftest.$ac_ext
7923 +if test $ac_cv_header_stdc = yes; then
7924 + # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
7925 + cat >conftest.$ac_ext <<_ACEOF
7926 +#line $LINENO "configure"
7929 +cat confdefs.h >>conftest.$ac_ext
7930 +cat >>conftest.$ac_ext <<_ACEOF
7931 +/* end confdefs.h. */
7932 +#include <string.h>
7935 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
7936 + $EGREP "memchr" >/dev/null 2>&1; then
7939 + ac_cv_header_stdc=no
7945 +if test $ac_cv_header_stdc = yes; then
7946 + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
7947 + cat >conftest.$ac_ext <<_ACEOF
7948 +#line $LINENO "configure"
7951 +cat confdefs.h >>conftest.$ac_ext
7952 +cat >>conftest.$ac_ext <<_ACEOF
7953 +/* end confdefs.h. */
7954 +#include <stdlib.h>
7957 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
7958 + $EGREP "free" >/dev/null 2>&1; then
7961 + ac_cv_header_stdc=no
7967 +if test $ac_cv_header_stdc = yes; then
7968 + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
7969 + if test "$cross_compiling" = yes; then
7972 + cat >conftest.$ac_ext <<_ACEOF
7973 +#line $LINENO "configure"
7976 +cat confdefs.h >>conftest.$ac_ext
7977 +cat >>conftest.$ac_ext <<_ACEOF
7978 +/* end confdefs.h. */
7980 +#if ((' ' & 0x0FF) == 0x020)
7981 +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
7982 +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
7984 +# define ISLOWER(c) \
7985 + (('a' <= (c) && (c) <= 'i') \
7986 + || ('j' <= (c) && (c) <= 'r') \
7987 + || ('s' <= (c) && (c) <= 'z'))
7988 +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
7991 +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
7996 + for (i = 0; i < 256; i++)
7997 + if (XOR (islower (i), ISLOWER (i))
7998 + || toupper (i) != TOUPPER (i))
8003 +rm -f conftest$ac_exeext
8004 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8005 + (eval $ac_link) 2>&5
8007 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8008 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8009 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8010 + (eval $ac_try) 2>&5
8012 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8013 + (exit $ac_status); }; }; then
8016 + echo "$as_me: program exited with status $ac_status" >&5
8017 +echo "$as_me: failed program was:" >&5
8018 +sed 's/^/| /' conftest.$ac_ext >&5
8020 +( exit $ac_status )
8021 +ac_cv_header_stdc=no
8023 +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
8027 +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
8028 +echo "${ECHO_T}$ac_cv_header_stdc" >&6
8029 +if test $ac_cv_header_stdc = yes; then
8031 +cat >>confdefs.h <<\_ACEOF
8032 +#define STDC_HEADERS 1
8037 +# On IRIX 5.3, sys/types and inttypes.h are conflicting.
8047 +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
8048 + inttypes.h stdint.h unistd.h
8050 -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
8051 -echo "$as_me:2667: checking for $ac_header" >&5
8052 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
8053 +echo "$as_me:$LINENO: checking for $ac_header" >&5
8054 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8055 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then
8056 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8057 echo $ECHO_N "(cached) $ECHO_C" >&6
8059 cat >conftest.$ac_ext <<_ACEOF
8060 -#line 2673 "configure"
8061 -#include "confdefs.h"
8062 +#line $LINENO "configure"
8065 +cat confdefs.h >>conftest.$ac_ext
8066 +cat >>conftest.$ac_ext <<_ACEOF
8067 +/* end confdefs.h. */
8068 +$ac_includes_default
8070 +#include <$ac_header>
8072 +rm -f conftest.$ac_objext
8073 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8074 + (eval $ac_compile) 2>&5
8076 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8077 + (exit $ac_status); } &&
8078 + { ac_try='test -s conftest.$ac_objext'
8079 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8080 + (eval $ac_try) 2>&5
8082 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8083 + (exit $ac_status); }; }; then
8084 + eval "$as_ac_Header=yes"
8086 + echo "$as_me: failed program was:" >&5
8087 +sed 's/^/| /' conftest.$ac_ext >&5
8089 +eval "$as_ac_Header=no"
8091 +rm -f conftest.$ac_objext conftest.$ac_ext
8093 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
8094 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8095 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
8096 + cat >>confdefs.h <<_ACEOF
8097 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
8109 +for ac_header in jpeglib.h jconfig.h jerror.h jmorecfg.h
8111 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
8112 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8113 + echo "$as_me:$LINENO: checking for $ac_header" >&5
8114 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8115 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8116 + echo $ECHO_N "(cached) $ECHO_C" >&6
8118 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
8119 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8121 + # Is the header compilable?
8122 +echo "$as_me:$LINENO: checking $ac_header usability" >&5
8123 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
8124 +cat >conftest.$ac_ext <<_ACEOF
8125 +#line $LINENO "configure"
8128 +cat confdefs.h >>conftest.$ac_ext
8129 +cat >>conftest.$ac_ext <<_ACEOF
8130 +/* end confdefs.h. */
8131 +$ac_includes_default
8132 +#include <$ac_header>
8134 +rm -f conftest.$ac_objext
8135 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8136 + (eval $ac_compile) 2>&5
8138 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8139 + (exit $ac_status); } &&
8140 + { ac_try='test -s conftest.$ac_objext'
8141 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8142 + (eval $ac_try) 2>&5
8144 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8145 + (exit $ac_status); }; }; then
8146 + ac_header_compiler=yes
8148 + echo "$as_me: failed program was:" >&5
8149 +sed 's/^/| /' conftest.$ac_ext >&5
8151 +ac_header_compiler=no
8153 +rm -f conftest.$ac_objext conftest.$ac_ext
8154 +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
8155 +echo "${ECHO_T}$ac_header_compiler" >&6
8157 +# Is the header present?
8158 +echo "$as_me:$LINENO: checking $ac_header presence" >&5
8159 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
8160 +cat >conftest.$ac_ext <<_ACEOF
8161 +#line $LINENO "configure"
8164 +cat confdefs.h >>conftest.$ac_ext
8165 +cat >>conftest.$ac_ext <<_ACEOF
8166 +/* end confdefs.h. */
8167 #include <$ac_header>
8169 -if { (eval echo "$as_me:2677: \"$ac_cpp conftest.$ac_ext\"") >&5
8170 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
8171 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8173 - egrep -v '^ *\+' conftest.er1 >conftest.err
8174 + grep -v '^ *+' conftest.er1 >conftest.err
8176 cat conftest.err >&5
8177 - echo "$as_me:2683: \$? = $ac_status" >&5
8178 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8179 (exit $ac_status); } >/dev/null; then
8180 if test -s conftest.err; then
8181 ac_cpp_err=$ac_c_preproc_warn_flag
8182 @@ -2691,24 +3656,70 @@
8185 if test -z "$ac_cpp_err"; then
8186 - eval "$ac_ac_Header=yes"
8187 + ac_header_preproc=yes
8189 echo "$as_me: failed program was:" >&5
8190 - cat conftest.$ac_ext >&5
8191 - eval "$ac_ac_Header=no"
8192 +sed 's/^/| /' conftest.$ac_ext >&5
8194 + ac_header_preproc=no
8196 rm -f conftest.err conftest.$ac_ext
8197 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
8198 +echo "${ECHO_T}$ac_header_preproc" >&6
8200 +# So? What about this header?
8201 +case $ac_header_compiler:$ac_header_preproc in
8203 + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
8204 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
8205 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
8206 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
8209 +## ------------------------------------ ##
8210 +## Report this to bug-autoconf@gnu.org. ##
8211 +## ------------------------------------ ##
8214 + sed "s/^/$as_me: WARNING: /" >&2
8217 + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
8218 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
8219 + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
8220 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
8221 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
8222 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
8225 +## ------------------------------------ ##
8226 +## Report this to bug-autoconf@gnu.org. ##
8227 +## ------------------------------------ ##
8230 + sed "s/^/$as_me: WARNING: /" >&2
8233 +echo "$as_me:$LINENO: checking for $ac_header" >&5
8234 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8235 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8236 + echo $ECHO_N "(cached) $ECHO_C" >&6
8238 + eval "$as_ac_Header=$ac_header_preproc"
8240 -echo "$as_me:2702: result: `eval echo '${'$ac_ac_Header'}'`" >&5
8241 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
8242 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then
8243 - cat >>confdefs.h <<EOF
8244 -#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
8246 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
8247 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8250 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
8251 + cat >>confdefs.h <<_ACEOF
8252 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
8261 if test "x$jpeg_ok" = "xyes"; then
8262 @@ -2716,15 +3727,16 @@
8265 if test "x$jpeg_ok" = "xno"; then
8266 - { echo "$as_me:2719: WARNING: *** JPEG support will not be included ***" >&5
8267 + { echo "$as_me:$LINENO: WARNING: *** JPEG support will not be included ***" >&5
8268 echo "$as_me: WARNING: *** JPEG support will not be included ***" >&2;}
8276 -echo "$as_me:2727: checking for pthread_create in -lpthread" >&5
8277 +echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
8278 echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
8279 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
8280 echo $ECHO_N "(cached) $ECHO_C" >&6
8281 @@ -2732,8 +3744,12 @@
8282 ac_check_lib_save_LIBS=$LIBS
8283 LIBS="-lpthread $LIBS"
8284 cat >conftest.$ac_ext <<_ACEOF
8285 -#line 2735 "configure"
8286 -#include "confdefs.h"
8287 +#line $LINENO "configure"
8290 +cat confdefs.h >>conftest.$ac_ext
8291 +cat >>conftest.$ac_ext <<_ACEOF
8292 +/* end confdefs.h. */
8294 /* Override any gcc2 internal prototype to avoid an error. */
8296 @@ -2751,32 +3767,33 @@
8299 rm -f conftest.$ac_objext conftest$ac_exeext
8300 -if { (eval echo "$as_me:2754: \"$ac_link\"") >&5
8301 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8302 (eval $ac_link) 2>&5
8304 - echo "$as_me:2757: \$? = $ac_status" >&5
8305 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8306 (exit $ac_status); } &&
8307 { ac_try='test -s conftest$ac_exeext'
8308 - { (eval echo "$as_me:2760: \"$ac_try\"") >&5
8309 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8312 - echo "$as_me:2763: \$? = $ac_status" >&5
8313 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8314 (exit $ac_status); }; }; then
8315 ac_cv_lib_pthread_pthread_create=yes
8317 echo "$as_me: failed program was:" >&5
8318 -cat conftest.$ac_ext >&5
8319 +sed 's/^/| /' conftest.$ac_ext >&5
8321 ac_cv_lib_pthread_pthread_create=no
8323 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8324 LIBS=$ac_check_lib_save_LIBS
8326 -echo "$as_me:2774: result: $ac_cv_lib_pthread_pthread_create" >&5
8327 +echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
8328 echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
8329 if test $ac_cv_lib_pthread_pthread_create = yes; then
8330 - cat >>confdefs.h <<EOF
8331 + cat >>confdefs.h <<_ACEOF
8332 #define HAVE_LIBPTHREAD 1
8336 LIBS="-lpthread $LIBS"
8338 @@ -2785,21 +3802,25 @@
8342 - echo "$as_me:2788: checking whether pthreads work" >&5
8343 + echo "$as_me:$LINENO: checking whether pthreads work" >&5
8344 echo $ECHO_N "checking whether pthreads work... $ECHO_C" >&6
8345 LDFLAGS="$LDFLAGS -lpthread -lexc -ldb"
8346 - { echo "$as_me:2791: WARNING: *** _Untested pthreads_ try setting LDFLAGS manually if it doesn't work ***" >&5
8347 + { echo "$as_me:$LINENO: WARNING: *** _Untested pthreads_ try setting LDFLAGS manually if it doesn't work ***" >&5
8348 echo "$as_me: WARNING: *** _Untested pthreads_ try setting LDFLAGS manually if it doesn't work ***" >&2;}
8352 - echo "$as_me:2796: checking whether threads work with -pthread" >&5
8353 + echo "$as_me:$LINENO: checking whether threads work with -pthread" >&5
8354 echo $ECHO_N "checking whether threads work with -pthread... $ECHO_C" >&6
8355 LDSAVEFLAGS=$LDFLAGS
8356 LDFLAGS="$LDFLAGS -pthread"
8357 cat >conftest.$ac_ext <<_ACEOF
8358 -#line 2801 "configure"
8359 -#include "confdefs.h"
8360 +#line $LINENO "configure"
8363 +cat confdefs.h >>conftest.$ac_ext
8364 +cat >>conftest.$ac_ext <<_ACEOF
8365 +/* end confdefs.h. */
8367 /* Override any gcc2 internal prototype to avoid an error. */
8369 @@ -2817,32 +3838,33 @@
8372 rm -f conftest.$ac_objext conftest$ac_exeext
8373 -if { (eval echo "$as_me:2820: \"$ac_link\"") >&5
8374 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8375 (eval $ac_link) 2>&5
8377 - echo "$as_me:2823: \$? = $ac_status" >&5
8378 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8379 (exit $ac_status); } &&
8380 { ac_try='test -s conftest$ac_exeext'
8381 - { (eval echo "$as_me:2826: \"$ac_try\"") >&5
8382 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8385 - echo "$as_me:2829: \$? = $ac_status" >&5
8386 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8387 (exit $ac_status); }; }; then
8390 echo "$as_me: failed program was:" >&5
8391 -cat conftest.$ac_ext >&5
8392 +sed 's/^/| /' conftest.$ac_ext >&5
8396 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8397 if test "x$pthread_ok" = "xyes"; then
8398 - echo "$as_me:2839: result: yes" >&5
8399 + echo "$as_me:$LINENO: result: yes" >&5
8400 echo "${ECHO_T}yes" >&6
8402 - echo "$as_me:2842: result: no. Now we will try some libraries." >&5
8403 + echo "$as_me:$LINENO: result: no. Now we will try some libraries." >&5
8404 echo "${ECHO_T}no. Now we will try some libraries." >&6
8405 LDFLAGS=$LDSAVEFLAGS
8406 - echo "$as_me:2845: checking for library containing pthread_create" >&5
8407 + echo "$as_me:$LINENO: checking for library containing pthread_create" >&5
8408 echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >&6
8409 if test "${ac_cv_search_pthread_create+set}" = set; then
8410 echo $ECHO_N "(cached) $ECHO_C" >&6
8411 @@ -2850,8 +3872,12 @@
8412 ac_func_search_save_LIBS=$LIBS
8413 ac_cv_search_pthread_create=no
8414 cat >conftest.$ac_ext <<_ACEOF
8415 -#line 2853 "configure"
8416 -#include "confdefs.h"
8417 +#line $LINENO "configure"
8420 +cat confdefs.h >>conftest.$ac_ext
8421 +cat >>conftest.$ac_ext <<_ACEOF
8422 +/* end confdefs.h. */
8424 /* Override any gcc2 internal prototype to avoid an error. */
8426 @@ -2869,29 +3895,34 @@
8429 rm -f conftest.$ac_objext conftest$ac_exeext
8430 -if { (eval echo "$as_me:2872: \"$ac_link\"") >&5
8431 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8432 (eval $ac_link) 2>&5
8434 - echo "$as_me:2875: \$? = $ac_status" >&5
8435 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8436 (exit $ac_status); } &&
8437 { ac_try='test -s conftest$ac_exeext'
8438 - { (eval echo "$as_me:2878: \"$ac_try\"") >&5
8439 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8442 - echo "$as_me:2881: \$? = $ac_status" >&5
8443 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8444 (exit $ac_status); }; }; then
8445 ac_cv_search_pthread_create="none required"
8447 echo "$as_me: failed program was:" >&5
8448 -cat conftest.$ac_ext >&5
8449 +sed 's/^/| /' conftest.$ac_ext >&5
8452 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8453 if test "$ac_cv_search_pthread_create" = no; then
8454 for ac_lib in pthread c_r; do
8455 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
8456 cat >conftest.$ac_ext <<_ACEOF
8457 -#line 2893 "configure"
8458 -#include "confdefs.h"
8459 +#line $LINENO "configure"
8462 +cat confdefs.h >>conftest.$ac_ext
8463 +cat >>conftest.$ac_ext <<_ACEOF
8464 +/* end confdefs.h. */
8466 /* Override any gcc2 internal prototype to avoid an error. */
8468 @@ -2909,29 +3940,30 @@
8471 rm -f conftest.$ac_objext conftest$ac_exeext
8472 -if { (eval echo "$as_me:2912: \"$ac_link\"") >&5
8473 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8474 (eval $ac_link) 2>&5
8476 - echo "$as_me:2915: \$? = $ac_status" >&5
8477 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8478 (exit $ac_status); } &&
8479 { ac_try='test -s conftest$ac_exeext'
8480 - { (eval echo "$as_me:2918: \"$ac_try\"") >&5
8481 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8484 - echo "$as_me:2921: \$? = $ac_status" >&5
8485 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8486 (exit $ac_status); }; }; then
8487 ac_cv_search_pthread_create="-l$ac_lib"
8490 echo "$as_me: failed program was:" >&5
8491 -cat conftest.$ac_ext >&5
8492 +sed 's/^/| /' conftest.$ac_ext >&5
8495 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8498 LIBS=$ac_func_search_save_LIBS
8500 -echo "$as_me:2934: result: $ac_cv_search_pthread_create" >&5
8501 +echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5
8502 echo "${ECHO_T}$ac_cv_search_pthread_create" >&6
8503 if test "$ac_cv_search_pthread_create" != no; then
8504 test "$ac_cv_search_pthread_create" = "none required" || LIBS="$ac_cv_search_pthread_create $LIBS"
8505 @@ -2941,14 +3973,14 @@
8508 if test "x$thread_ok" = "xno"; then
8509 - { echo "$as_me:2944: WARNING: *** No pthreads found. ***" >&5
8510 + { echo "$as_me:$LINENO: WARNING: *** No pthreads found. ***" >&5
8511 echo "$as_me: WARNING: *** No pthreads found. ***" >&2;}
8512 - { { echo "$as_me:2946: error: *** Try setting LIBS or LDFLAGS manually to point to your pthreads library. ***" >&5
8513 + { { echo "$as_me:$LINENO: error: *** Try setting LIBS or LDFLAGS manually to point to your pthreads library. ***" >&5
8514 echo "$as_me: error: *** Try setting LIBS or LDFLAGS manually to point to your pthreads library. ***" >&2;}
8515 { (exit 1); exit 1; }; }
8518 - { echo "$as_me:2951: WARNING: found a way to link threads" >&5
8519 + { echo "$as_me:$LINENO: WARNING: found a way to link threads" >&5
8520 echo "$as_me: WARNING: found a way to link threads" >&2;}
8523 @@ -2956,7 +3988,10 @@
8527 -echo "$as_me:2959: checking for zlibVersion in -lz" >&5
8531 +echo "$as_me:$LINENO: checking for zlibVersion in -lz" >&5
8532 echo $ECHO_N "checking for zlibVersion in -lz... $ECHO_C" >&6
8533 if test "${ac_cv_lib_z_zlibVersion+set}" = set; then
8534 echo $ECHO_N "(cached) $ECHO_C" >&6
8535 @@ -2964,8 +3999,12 @@
8536 ac_check_lib_save_LIBS=$LIBS
8538 cat >conftest.$ac_ext <<_ACEOF
8539 -#line 2967 "configure"
8540 -#include "confdefs.h"
8541 +#line $LINENO "configure"
8544 +cat confdefs.h >>conftest.$ac_ext
8545 +cat >>conftest.$ac_ext <<_ACEOF
8546 +/* end confdefs.h. */
8548 /* Override any gcc2 internal prototype to avoid an error. */
8550 @@ -2983,38 +4022,40 @@
8553 rm -f conftest.$ac_objext conftest$ac_exeext
8554 -if { (eval echo "$as_me:2986: \"$ac_link\"") >&5
8555 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8556 (eval $ac_link) 2>&5
8558 - echo "$as_me:2989: \$? = $ac_status" >&5
8559 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8560 (exit $ac_status); } &&
8561 { ac_try='test -s conftest$ac_exeext'
8562 - { (eval echo "$as_me:2992: \"$ac_try\"") >&5
8563 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8566 - echo "$as_me:2995: \$? = $ac_status" >&5
8567 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8568 (exit $ac_status); }; }; then
8569 ac_cv_lib_z_zlibVersion=yes
8571 echo "$as_me: failed program was:" >&5
8572 -cat conftest.$ac_ext >&5
8573 +sed 's/^/| /' conftest.$ac_ext >&5
8575 ac_cv_lib_z_zlibVersion=no
8577 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8578 LIBS=$ac_check_lib_save_LIBS
8580 -echo "$as_me:3006: result: $ac_cv_lib_z_zlibVersion" >&5
8581 +echo "$as_me:$LINENO: result: $ac_cv_lib_z_zlibVersion" >&5
8582 echo "${ECHO_T}$ac_cv_lib_z_zlibVersion" >&6
8583 if test $ac_cv_lib_z_zlibVersion = yes; then
8584 - cat >>confdefs.h <<EOF
8585 + cat >>confdefs.h <<_ACEOF
8594 -echo "$as_me:3017: checking for png_check_sig in -lpng" >&5
8596 +echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
8597 echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
8598 if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
8599 echo $ECHO_N "(cached) $ECHO_C" >&6
8600 @@ -3022,8 +4063,12 @@
8601 ac_check_lib_save_LIBS=$LIBS
8603 cat >conftest.$ac_ext <<_ACEOF
8604 -#line 3025 "configure"
8605 -#include "confdefs.h"
8606 +#line $LINENO "configure"
8609 +cat confdefs.h >>conftest.$ac_ext
8610 +cat >>conftest.$ac_ext <<_ACEOF
8611 +/* end confdefs.h. */
8613 /* Override any gcc2 internal prototype to avoid an error. */
8615 @@ -3041,41 +4086,47 @@
8618 rm -f conftest.$ac_objext conftest$ac_exeext
8619 -if { (eval echo "$as_me:3044: \"$ac_link\"") >&5
8620 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8621 (eval $ac_link) 2>&5
8623 - echo "$as_me:3047: \$? = $ac_status" >&5
8624 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8625 (exit $ac_status); } &&
8626 { ac_try='test -s conftest$ac_exeext'
8627 - { (eval echo "$as_me:3050: \"$ac_try\"") >&5
8628 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8631 - echo "$as_me:3053: \$? = $ac_status" >&5
8632 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8633 (exit $ac_status); }; }; then
8634 ac_cv_lib_png_png_check_sig=yes
8636 echo "$as_me: failed program was:" >&5
8637 -cat conftest.$ac_ext >&5
8638 +sed 's/^/| /' conftest.$ac_ext >&5
8640 ac_cv_lib_png_png_check_sig=no
8642 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8643 LIBS=$ac_check_lib_save_LIBS
8645 -echo "$as_me:3064: result: $ac_cv_lib_png_png_check_sig" >&5
8646 +echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
8647 echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
8648 if test $ac_cv_lib_png_png_check_sig = yes; then
8649 - cat >>confdefs.h <<EOF
8650 + cat >>confdefs.h <<_ACEOF
8651 #define HAVE_LIBPNG 1
8660 if test "x$enable_cookies" = "xno" ; then
8661 CFLAGS="$CFLAGS -DDISABLE_COOKIES"
8664 +if test "x$enable_ipv6" = "xyes" ; then
8665 + CFLAGS="$CFLAGS -DENABLE_IPV6"
8669 if test "x$enable_efence" = "xyes" ; then
8670 LIBS="-lefence $LIBS"
8671 @@ -3084,55 +4135,67 @@
8672 CFLAGS="$CFLAGS -pg"
8675 -echo "$as_me:3087: checking for ANSI C header files" >&5
8677 +echo "$as_me:$LINENO: checking for ANSI C header files" >&5
8678 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
8679 if test "${ac_cv_header_stdc+set}" = set; then
8680 echo $ECHO_N "(cached) $ECHO_C" >&6
8682 cat >conftest.$ac_ext <<_ACEOF
8683 -#line 3093 "configure"
8684 -#include "confdefs.h"
8685 +#line $LINENO "configure"
8688 +cat confdefs.h >>conftest.$ac_ext
8689 +cat >>conftest.$ac_ext <<_ACEOF
8690 +/* end confdefs.h. */
8704 -if { (eval echo "$as_me:3101: \"$ac_cpp conftest.$ac_ext\"") >&5
8705 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8706 +rm -f conftest.$ac_objext
8707 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8708 + (eval $ac_compile) 2>&5
8710 - egrep -v '^ *\+' conftest.er1 >conftest.err
8711 - rm -f conftest.er1
8712 - cat conftest.err >&5
8713 - echo "$as_me:3107: \$? = $ac_status" >&5
8714 - (exit $ac_status); } >/dev/null; then
8715 - if test -s conftest.err; then
8716 - ac_cpp_err=$ac_c_preproc_warn_flag
8723 -if test -z "$ac_cpp_err"; then
8724 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8725 + (exit $ac_status); } &&
8726 + { ac_try='test -s conftest.$ac_objext'
8727 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8728 + (eval $ac_try) 2>&5
8730 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8731 + (exit $ac_status); }; }; then
8732 ac_cv_header_stdc=yes
8734 echo "$as_me: failed program was:" >&5
8735 - cat conftest.$ac_ext >&5
8736 - ac_cv_header_stdc=no
8737 +sed 's/^/| /' conftest.$ac_ext >&5
8739 +ac_cv_header_stdc=no
8741 -rm -f conftest.err conftest.$ac_ext
8742 +rm -f conftest.$ac_objext conftest.$ac_ext
8744 if test $ac_cv_header_stdc = yes; then
8745 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
8746 cat >conftest.$ac_ext <<_ACEOF
8747 -#line 3129 "configure"
8748 -#include "confdefs.h"
8749 +#line $LINENO "configure"
8752 +cat confdefs.h >>conftest.$ac_ext
8753 +cat >>conftest.$ac_ext <<_ACEOF
8754 +/* end confdefs.h. */
8758 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
8759 - egrep "memchr" >/dev/null 2>&1; then
8760 + $EGREP "memchr" >/dev/null 2>&1; then
8763 ac_cv_header_stdc=no
8764 @@ -3144,13 +4207,17 @@
8765 if test $ac_cv_header_stdc = yes; then
8766 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
8767 cat >conftest.$ac_ext <<_ACEOF
8768 -#line 3147 "configure"
8769 -#include "confdefs.h"
8770 +#line $LINENO "configure"
8773 +cat confdefs.h >>conftest.$ac_ext
8774 +cat >>conftest.$ac_ext <<_ACEOF
8775 +/* end confdefs.h. */
8779 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
8780 - egrep "free" >/dev/null 2>&1; then
8781 + $EGREP "free" >/dev/null 2>&1; then
8784 ac_cv_header_stdc=no
8785 @@ -3165,14 +4232,19 @@
8788 cat >conftest.$ac_ext <<_ACEOF
8789 -#line 3168 "configure"
8790 -#include "confdefs.h"
8791 +#line $LINENO "configure"
8794 +cat confdefs.h >>conftest.$ac_ext
8795 +cat >>conftest.$ac_ext <<_ACEOF
8796 +/* end confdefs.h. */
8798 #if ((' ' & 0x0FF) == 0x020)
8799 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
8800 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
8802 -# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
8803 +# define ISLOWER(c) \
8804 + (('a' <= (c) && (c) <= 'i') \
8805 || ('j' <= (c) && (c) <= 'r') \
8806 || ('s' <= (c) && (c) <= 'z'))
8807 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
8808 @@ -3191,57 +4263,109 @@
8811 rm -f conftest$ac_exeext
8812 -if { (eval echo "$as_me:3194: \"$ac_link\"") >&5
8813 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8814 (eval $ac_link) 2>&5
8816 - echo "$as_me:3197: \$? = $ac_status" >&5
8817 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8818 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8819 - { (eval echo "$as_me:3199: \"$ac_try\"") >&5
8820 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8823 - echo "$as_me:3202: \$? = $ac_status" >&5
8824 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8825 (exit $ac_status); }; }; then
8828 echo "$as_me: program exited with status $ac_status" >&5
8829 echo "$as_me: failed program was:" >&5
8830 -cat conftest.$ac_ext >&5
8831 +sed 's/^/| /' conftest.$ac_ext >&5
8833 +( exit $ac_status )
8834 ac_cv_header_stdc=no
8836 -rm -f core core.* *.core conftest$ac_exeext conftest.$ac_ext
8837 +rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
8841 -echo "$as_me:3215: result: $ac_cv_header_stdc" >&5
8842 +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
8843 echo "${ECHO_T}$ac_cv_header_stdc" >&6
8844 if test $ac_cv_header_stdc = yes; then
8846 -cat >>confdefs.h <<\EOF
8847 +cat >>confdefs.h <<\_ACEOF
8848 #define STDC_HEADERS 1
8857 for ac_header in fcntl.h unistd.h sys/uio.h
8859 -ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh`
8860 -echo "$as_me:3228: checking for $ac_header" >&5
8861 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
8862 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8863 + echo "$as_me:$LINENO: checking for $ac_header" >&5
8864 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8865 -if eval "test \"\${$ac_ac_Header+set}\" = set"; then
8866 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8867 echo $ECHO_N "(cached) $ECHO_C" >&6
8869 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
8870 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8872 - cat >conftest.$ac_ext <<_ACEOF
8873 -#line 3234 "configure"
8874 -#include "confdefs.h"
8875 + # Is the header compilable?
8876 +echo "$as_me:$LINENO: checking $ac_header usability" >&5
8877 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
8878 +cat >conftest.$ac_ext <<_ACEOF
8879 +#line $LINENO "configure"
8882 +cat confdefs.h >>conftest.$ac_ext
8883 +cat >>conftest.$ac_ext <<_ACEOF
8884 +/* end confdefs.h. */
8885 +$ac_includes_default
8886 +#include <$ac_header>
8888 +rm -f conftest.$ac_objext
8889 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8890 + (eval $ac_compile) 2>&5
8892 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8893 + (exit $ac_status); } &&
8894 + { ac_try='test -s conftest.$ac_objext'
8895 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8896 + (eval $ac_try) 2>&5
8898 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8899 + (exit $ac_status); }; }; then
8900 + ac_header_compiler=yes
8902 + echo "$as_me: failed program was:" >&5
8903 +sed 's/^/| /' conftest.$ac_ext >&5
8905 +ac_header_compiler=no
8907 +rm -f conftest.$ac_objext conftest.$ac_ext
8908 +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
8909 +echo "${ECHO_T}$ac_header_compiler" >&6
8911 +# Is the header present?
8912 +echo "$as_me:$LINENO: checking $ac_header presence" >&5
8913 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
8914 +cat >conftest.$ac_ext <<_ACEOF
8915 +#line $LINENO "configure"
8918 +cat confdefs.h >>conftest.$ac_ext
8919 +cat >>conftest.$ac_ext <<_ACEOF
8920 +/* end confdefs.h. */
8921 #include <$ac_header>
8923 -if { (eval echo "$as_me:3238: \"$ac_cpp conftest.$ac_ext\"") >&5
8924 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
8925 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8927 - egrep -v '^ *\+' conftest.er1 >conftest.err
8928 + grep -v '^ *+' conftest.er1 >conftest.err
8930 cat conftest.err >&5
8931 - echo "$as_me:3244: \$? = $ac_status" >&5
8932 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8933 (exit $ac_status); } >/dev/null; then
8934 if test -s conftest.err; then
8935 ac_cpp_err=$ac_c_preproc_warn_flag
8936 @@ -3252,99 +4376,166 @@
8939 if test -z "$ac_cpp_err"; then
8940 - eval "$ac_ac_Header=yes"
8941 + ac_header_preproc=yes
8943 echo "$as_me: failed program was:" >&5
8944 - cat conftest.$ac_ext >&5
8945 - eval "$ac_ac_Header=no"
8946 +sed 's/^/| /' conftest.$ac_ext >&5
8948 + ac_header_preproc=no
8950 rm -f conftest.err conftest.$ac_ext
8951 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
8952 +echo "${ECHO_T}$ac_header_preproc" >&6
8954 +# So? What about this header?
8955 +case $ac_header_compiler:$ac_header_preproc in
8957 + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
8958 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
8959 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
8960 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
8963 +## ------------------------------------ ##
8964 +## Report this to bug-autoconf@gnu.org. ##
8965 +## ------------------------------------ ##
8968 + sed "s/^/$as_me: WARNING: /" >&2
8971 + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
8972 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
8973 + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
8974 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
8975 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
8976 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
8979 +## ------------------------------------ ##
8980 +## Report this to bug-autoconf@gnu.org. ##
8981 +## ------------------------------------ ##
8984 + sed "s/^/$as_me: WARNING: /" >&2
8987 +echo "$as_me:$LINENO: checking for $ac_header" >&5
8988 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8989 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8990 + echo $ECHO_N "(cached) $ECHO_C" >&6
8992 + eval "$as_ac_Header=$ac_header_preproc"
8994 -echo "$as_me:3263: result: `eval echo '${'$ac_ac_Header'}'`" >&5
8995 -echo "${ECHO_T}`eval echo '${'$ac_ac_Header'}'`" >&6
8996 -if test `eval echo '${'$ac_ac_Header'}'` = yes; then
8997 - cat >>confdefs.h <<EOF
8998 -#define `echo "HAVE_$ac_header" | $ac_tr_cpp` 1
9000 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
9001 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
9004 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
9005 + cat >>confdefs.h <<_ACEOF
9006 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
9015 for ac_func in socket
9017 -ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh`
9018 -echo "$as_me:3276: checking for $ac_func" >&5
9019 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
9020 +echo "$as_me:$LINENO: checking for $ac_func" >&5
9021 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
9022 -if eval "test \"\${$ac_ac_var+set}\" = set"; then
9023 +if eval "test \"\${$as_ac_var+set}\" = set"; then
9024 echo $ECHO_N "(cached) $ECHO_C" >&6
9026 cat >conftest.$ac_ext <<_ACEOF
9027 -#line 3282 "configure"
9028 -#include "confdefs.h"
9029 +#line $LINENO "configure"
9032 +cat confdefs.h >>conftest.$ac_ext
9033 +cat >>conftest.$ac_ext <<_ACEOF
9034 +/* end confdefs.h. */
9035 /* System header to define __stub macros and hopefully few prototypes,
9036 - which can conflict with char $ac_func (); below. */
9037 -#include <assert.h>
9038 + which can conflict with char $ac_func (); below.
9039 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
9040 + <limits.h> exists even on freestanding compilers. */
9042 +# include <limits.h>
9044 +# include <assert.h>
9046 /* Override any gcc2 internal prototype to avoid an error. */
9051 /* We use char because int might match the return type of a gcc2
9052 builtin and then its argument prototype would still apply. */
9059 /* The GNU C library defines this for functions which it implements
9060 to always fail with ENOSYS. Some functions are actually named
9061 something starting with __ and the normal name is an alias. */
9062 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
9066 +char (*f) () = $ac_func;
9075 +return f != $ac_func;
9080 rm -f conftest.$ac_objext conftest$ac_exeext
9081 -if { (eval echo "$as_me:3313: \"$ac_link\"") >&5
9082 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9083 (eval $ac_link) 2>&5
9085 - echo "$as_me:3316: \$? = $ac_status" >&5
9086 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
9087 (exit $ac_status); } &&
9088 { ac_try='test -s conftest$ac_exeext'
9089 - { (eval echo "$as_me:3319: \"$ac_try\"") >&5
9090 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9093 - echo "$as_me:3322: \$? = $ac_status" >&5
9094 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
9095 (exit $ac_status); }; }; then
9096 - eval "$ac_ac_var=yes"
9097 + eval "$as_ac_var=yes"
9099 echo "$as_me: failed program was:" >&5
9100 -cat conftest.$ac_ext >&5
9101 -eval "$ac_ac_var=no"
9102 +sed 's/^/| /' conftest.$ac_ext >&5
9104 +eval "$as_ac_var=no"
9106 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9108 -echo "$as_me:3332: result: `eval echo '${'$ac_ac_var'}'`" >&5
9109 -echo "${ECHO_T}`eval echo '${'$ac_ac_var'}'`" >&6
9110 -if test `eval echo '${'$ac_ac_var'}'` = yes; then
9111 - cat >>confdefs.h <<EOF
9112 -#define `echo "HAVE_$ac_func" | $ac_tr_cpp` 1
9114 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
9115 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
9116 +if test `eval echo '${'$as_ac_var'}'` = yes; then
9117 + cat >>confdefs.h <<_ACEOF
9118 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
9125 if test "x$enable_insure" = "xyes" ; then
9126 CC="insure -Zoi \"compiler $CC\""
9127 LIBS="$LIBS -lstdc++-2-libc6.1-1-2.9.0"
9130 -ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile src/IO/Makefile"
9135 + ac_config_files="$ac_config_files Makefile doc/Makefile src/Makefile src/IO/Makefile"
9136 cat >confcache <<\_ACEOF
9137 # This file is a shell script that caches the results of configure
9138 # tests run on this system so they can be shared between configure
9139 @@ -3355,7 +4546,7 @@
9140 # config.status only pays attention to the cache file if you give it
9141 # the --recheck option to rerun configure.
9143 -# `ac_cv_env_foo' variables (set or unset) will be overriden when
9144 +# `ac_cv_env_foo' variables (set or unset) will be overridden when
9145 # loading this file, other *unset* `ac_cv_foo' will be assigned the
9148 @@ -3374,12 +4565,12 @@
9149 # substitution turns \\\\ into \\, and sed turns \\ into \).
9152 - s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
9153 + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
9156 # `set' quotes correctly as required by POSIX, so do not add quotes.
9158 - "s/^\\([_$ac_cr_alnum]*_cv_[_$ac_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
9159 + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
9163 @@ -3390,7 +4581,7 @@
9165 /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
9167 -if cmp -s $cache_file confcache; then :; else
9168 +if diff $cache_file confcache >/dev/null 2>&1; then :; else
9169 if test -w $cache_file; then
9170 test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
9171 cat confcache >$cache_file
9172 @@ -3421,35 +4612,234 @@
9174 DEFS=-DHAVE_CONFIG_H
9178 +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
9179 + # 1. Remove the extension, and $U if already installed.
9180 + ac_i=`echo "$ac_i" |
9181 + sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
9183 + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
9184 + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
9186 +LIBOBJS=$ac_libobjs
9188 +LTLIBOBJS=$ac_ltlibobjs
9191 +if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
9192 + { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
9193 +Usually this means the macro was only invoked conditionally." >&5
9194 +echo "$as_me: error: conditional \"AMDEP\" was never defined.
9195 +Usually this means the macro was only invoked conditionally." >&2;}
9196 + { (exit 1); exit 1; }; }
9199 : ${CONFIG_STATUS=./config.status}
9200 ac_clean_files_save=$ac_clean_files
9201 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
9202 -{ echo "$as_me:3427: creating $CONFIG_STATUS" >&5
9203 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
9204 echo "$as_me: creating $CONFIG_STATUS" >&6;}
9205 cat >$CONFIG_STATUS <<_ACEOF
9207 -# Generated automatically by configure.
9208 +# Generated by $as_me.
9209 # Run this file to recreate the current configuration.
9210 # Compiler output produced by configure, useful for debugging
9211 # configure, is in config.log if it exists.
9214 +ac_cs_recheck=false
9216 SHELL=\${CONFIG_SHELL-$SHELL}
9217 -ac_cs_invocation="\$0 \$@"
9221 cat >>$CONFIG_STATUS <<\_ACEOF
9222 +## --------------------- ##
9223 +## M4sh Initialization. ##
9224 +## --------------------- ##
9226 # Be Bourne compatible
9227 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
9230 + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
9231 + # is contrary to our usage. Disable this feature.
9232 + alias -g '${1+"$@"}'='"$@"'
9233 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
9237 +# Support unset when possible.
9238 +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
9245 +# Work around bugs in pre-3.0 UWIN ksh.
9246 +$as_unset ENV MAIL MAILPATH
9253 + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
9254 + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
9255 + LC_TELEPHONE LC_TIME
9257 + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
9258 + eval $as_var=C; export $as_var
9264 +# Required to use basename.
9265 +if expr a : '\(a\)' >/dev/null 2>&1; then
9271 +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
9272 + as_basename=basename
9278 # Name of the executable.
9279 -as_me=`echo "$0" |sed 's,.*[\\/],,'`
9280 +as_me=`$as_basename "$0" ||
9281 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
9282 + X"$0" : 'X\(//\)$' \| \
9283 + X"$0" : 'X\(/\)$' \| \
9284 + . : '\(.\)' 2>/dev/null ||
9286 + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
9287 + /^X\/\(\/\/\)$/{ s//\1/; q; }
9288 + /^X\/\(\/\).*/{ s//\1/; q; }
9292 +# PATH needs CR, and LINENO needs CR and PATH.
9293 +# Avoid depending upon Character Ranges.
9294 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
9295 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
9296 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
9297 +as_cr_digits='0123456789'
9298 +as_cr_alnum=$as_cr_Letters$as_cr_digits
9300 +# The user is always right.
9301 +if test "${PATH_SEPARATOR+set}" != set; then
9302 + echo "#! /bin/sh" >conf$$.sh
9303 + echo "exit 0" >>conf$$.sh
9304 + chmod +x conf$$.sh
9305 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
9306 + PATH_SEPARATOR=';'
9314 + as_lineno_1=$LINENO
9315 + as_lineno_2=$LINENO
9316 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
9317 + test "x$as_lineno_1" != "x$as_lineno_2" &&
9318 + test "x$as_lineno_3" = "x$as_lineno_2" || {
9319 + # Find who we are. Look in the path if we contain no path at all
9320 + # relative or not.
9322 + *[\\/]* ) as_myself=$0 ;;
9323 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9324 +for as_dir in $PATH
9327 + test -z "$as_dir" && as_dir=.
9328 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
9333 + # We did not find ourselves, most probably we were run as `sh COMMAND'
9334 + # in which case we are not to be found in the path.
9335 + if test "x$as_myself" = x; then
9338 + if test ! -f "$as_myself"; then
9339 + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
9340 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
9341 + { (exit 1); exit 1; }; }
9343 + case $CONFIG_SHELL in
9345 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
9346 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
9349 + test -z "$as_dir" && as_dir=.
9350 + for as_base in sh bash ksh sh5; do
9353 + if ("$as_dir/$as_base" -c '
9354 + as_lineno_1=$LINENO
9355 + as_lineno_2=$LINENO
9356 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
9357 + test "x$as_lineno_1" != "x$as_lineno_2" &&
9358 + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
9359 + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
9360 + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
9361 + CONFIG_SHELL=$as_dir/$as_base
9362 + export CONFIG_SHELL
9363 + exec "$CONFIG_SHELL" "$0" ${1+"$@"}
9371 + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
9372 + # uniformly replaced by the line number. The first 'sed' inserts a
9373 + # line-number line before each line; the second 'sed' does the real
9374 + # work. The second script uses 'N' to pair each line-number line
9375 + # with the numbered line, and appends trailing '-' during
9376 + # substitution so that $LINENO is not a special case at line end.
9377 + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
9378 + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
9379 + sed '=' <$as_myself |
9384 + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
9387 + s,^['$as_cr_digits']*\n,,
9388 + ' >$as_me.lineno &&
9389 + chmod +x $as_me.lineno ||
9390 + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
9391 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
9392 + { (exit 1); exit 1; }; }
9394 + # Don't try to exec as it changes $[0], causing all sort of problems
9395 + # (the dirname of $[0] is not the place where we might find the
9396 + # original and so on. Autoconf is especially sensible to this).
9398 + # Exit status is that of the last command.
9403 +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
9404 + *c*,-n*) ECHO_N= ECHO_C='
9406 + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
9407 + *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
9410 if expr a : '\(a\)' >/dev/null 2>&1; then
9412 @@ -3475,24 +4865,20 @@
9414 rm -f conf$$ conf$$.exe conf$$.file
9416 -as_executable_p="test -f"
9418 -# Support unset when possible.
9419 -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
9421 +if mkdir -p . 2>/dev/null; then
9429 -$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; }
9430 -$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; }
9431 -$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; }
9432 -$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; }
9433 -$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; }
9434 -$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; }
9435 -$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; }
9436 -$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; }
9437 +as_executable_p="test -f"
9439 +# Sed expression to map a string onto a valid CPP name.
9440 +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
9442 +# Sed expression to map a string onto a valid variable name.
9443 +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
9447 # We need space, tab and new line, in precisely that order.
9448 @@ -3501,10 +4887,34 @@
9452 -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
9457 +# Open the log real soon, to keep \$[0] and so on meaningful, and to
9458 +# report actual input values of CONFIG_FILES etc. instead of their
9459 +# values after options handling. Logging --version etc. is OK.
9463 + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
9464 +## Running $as_me. ##
9469 +This file was extended by $as_me, which was
9470 +generated by GNU Autoconf 2.57. Invocation command line was
9472 + CONFIG_FILES = $CONFIG_FILES
9473 + CONFIG_HEADERS = $CONFIG_HEADERS
9474 + CONFIG_LINKS = $CONFIG_LINKS
9475 + CONFIG_COMMANDS = $CONFIG_COMMANDS
9479 +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
9483 # Files that config.status was made for.
9484 @@ -3524,7 +4934,7 @@
9485 echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
9488 -cat >>$CONFIG_STATUS <<\EOF
9489 +cat >>$CONFIG_STATUS <<\_ACEOF
9492 \`$as_me' instantiates files from templates according to the
9493 @@ -3534,6 +4944,7 @@
9495 -h, --help print this help, then exit
9496 -V, --version print version number, then exit
9497 + -q, --quiet do not print progress messages
9498 -d, --debug don't remove temporary files
9499 --recheck update $as_me by reconfiguring in the same conditions
9500 --file=FILE[:TEMPLATE]
9501 @@ -3551,12 +4962,12 @@
9504 Report bugs to <bug-autoconf@gnu.org>."
9508 -cat >>$CONFIG_STATUS <<EOF
9509 +cat >>$CONFIG_STATUS <<_ACEOF
9512 -configured by $0, generated by GNU Autoconf 2.50,
9513 +configured by $0, generated by GNU Autoconf 2.57,
9514 with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
9516 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
9517 @@ -3565,9 +4976,9 @@
9518 gives unlimited permission to copy, distribute and modify it."
9524 -cat >>$CONFIG_STATUS <<\EOF
9525 +cat >>$CONFIG_STATUS <<\_ACEOF
9526 # If no file are specified by the user, then we need to provide default
9527 # value. By we need to know if files were specified by the user.
9529 @@ -3577,30 +4988,30 @@
9531 ac_option=`expr "x$1" : 'x\([^=]*\)='`
9532 ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
9534 - set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
9544 *) # This is not an option, so the user has probably given explicit
9547 ac_need_defaults=false;;
9551 + case $ac_option in
9552 # Handling of the options.
9554 -cat >>$CONFIG_STATUS <<EOF
9556 +cat >>$CONFIG_STATUS <<\_ACEOF
9557 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
9558 - echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
9559 - exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
9561 -cat >>$CONFIG_STATUS <<\EOF
9562 + ac_cs_recheck=: ;;
9563 --version | --vers* | -V )
9564 echo "$ac_cs_version"; exit 0 ;;
9566 # Conflict between --help and --header
9567 - { { echo "$as_me:3603: error: ambiguous option: $1
9568 + { { echo "$as_me:$LINENO: error: ambiguous option: $1
9569 Try \`$0 --help' for more information." >&5
9570 echo "$as_me: error: ambiguous option: $1
9571 Try \`$0 --help' for more information." >&2;}
9572 @@ -3610,50 +5021,74 @@
9573 --debug | --d* | -d )
9575 --file | --fil | --fi | --f )
9577 - CONFIG_FILES="$CONFIG_FILES $1"
9579 + CONFIG_FILES="$CONFIG_FILES $ac_optarg"
9580 ac_need_defaults=false;;
9581 --header | --heade | --head | --hea )
9583 - CONFIG_HEADERS="$CONFIG_HEADERS $1"
9585 + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
9586 ac_need_defaults=false;;
9588 - # Handling of arguments.
9589 - 'Makefile' ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
9590 - 'doc/Makefile' ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
9591 - 'src/Makefile' ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
9592 - 'src/IO/Makefile' ) CONFIG_FILES="$CONFIG_FILES src/IO/Makefile" ;;
9593 - 'default-1' ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
9594 - 'config.h' ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
9595 + -q | -quiet | --quiet | --quie | --qui | --qu | --q \
9596 + | -silent | --silent | --silen | --sile | --sil | --si | --s)
9600 - -*) { { echo "$as_me:3630: error: unrecognized option: $1
9601 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
9602 Try \`$0 --help' for more information." >&5
9603 echo "$as_me: error: unrecognized option: $1
9604 Try \`$0 --help' for more information." >&2;}
9605 { (exit 1); exit 1; }; } ;;
9606 - *) { { echo "$as_me:3635: error: invalid argument: $1" >&5
9607 -echo "$as_me: error: invalid argument: $1" >&2;}
9608 - { (exit 1); exit 1; }; };;
9610 + *) ac_config_targets="$ac_config_targets $1" ;;
9618 +ac_configure_extra_args=
9620 -## ----------------------- ##
9621 -## Running config.status. ##
9622 -## ----------------------- ##
9623 +if $ac_cs_silent; then
9625 + ac_configure_extra_args="$ac_configure_extra_args --silent"
9629 +cat >>$CONFIG_STATUS <<_ACEOF
9630 +if \$ac_cs_recheck; then
9631 + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
9632 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
9637 +cat >>$CONFIG_STATUS <<_ACEOF
9639 +# INIT-COMMANDS section.
9642 -This file was extended by $as_me 2.50, executed with
9643 - > $ac_cs_invocation
9644 -on `(hostname || uname -n) 2>/dev/null | sed 1q`
9645 +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
9650 -cat >>$CONFIG_STATUS <<\EOF
9653 +cat >>$CONFIG_STATUS <<\_ACEOF
9654 +for ac_config_target in $ac_config_targets
9656 + case "$ac_config_target" in
9657 + # Handling of arguments.
9658 + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
9659 + "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
9660 + "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
9661 + "src/IO/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/IO/Makefile" ;;
9662 + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
9663 + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
9664 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
9665 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
9666 + { (exit 1); exit 1; }; };;
9670 # If the user did not use the arguments to specify the items to instantiate,
9671 # then the envvar interface is used. Set only those that are not.
9672 # We use the long form for the default assignment because of an extremely
9673 @@ -3664,38 +5099,34 @@
9674 test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
9677 +# Have a temporary directory for convenience. Make it in the build tree
9678 +# simply because there is no reason to put it here, and in addition,
9679 +# creating and moving files from /tmp can sometimes cause problems.
9680 # Create a temporary directory, and hook for its removal unless debugging.
9683 trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
9684 - trap '{ (exit $?); exit $?; }' 1 2 13 15
9685 + trap '{ (exit 1); exit 1; }' 1 2 13 15
9688 # Create a (secure) tmp directory for tmp files.
9692 - tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
9693 + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
9694 test -n "$tmp" && test -d "$tmp"
9697 - tmp=$TMPDIR/cs$$-$RANDOM
9698 + tmp=./confstat$$-$RANDOM
9699 (umask 077 && mkdir $tmp)
9702 - echo "$me: cannot create a temporary directory in $TMPDIR" >&2
9703 + echo "$me: cannot create a temporary directory in ." >&2
9704 { (exit 1); exit 1; }
9709 -cat >>$CONFIG_STATUS <<EOF
9711 -# INIT-COMMANDS section.
9717 -cat >>$CONFIG_STATUS <<EOF
9718 +cat >>$CONFIG_STATUS <<_ACEOF
9721 # CONFIG_FILES section.
9722 @@ -3708,6 +5139,12 @@
9723 sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
9724 s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
9725 s,@SHELL@,$SHELL,;t t
9726 +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
9727 +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
9728 +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
9729 +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
9730 +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
9731 +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
9732 s,@exec_prefix@,$exec_prefix,;t t
9733 s,@prefix@,$prefix,;t t
9734 s,@program_transform_name@,$program_transform_name,;t t
9735 @@ -3723,16 +5160,13 @@
9736 s,@oldincludedir@,$oldincludedir,;t t
9737 s,@infodir@,$infodir,;t t
9738 s,@mandir@,$mandir,;t t
9739 -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
9740 -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
9741 -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
9742 -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
9743 -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
9744 +s,@build_alias@,$build_alias,;t t
9745 +s,@host_alias@,$host_alias,;t t
9746 +s,@target_alias@,$target_alias,;t t
9747 +s,@DEFS@,$DEFS,;t t
9748 s,@ECHO_C@,$ECHO_C,;t t
9749 s,@ECHO_N@,$ECHO_N,;t t
9750 s,@ECHO_T@,$ECHO_T,;t t
9751 -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
9752 -s,@DEFS@,$DEFS,;t t
9754 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
9755 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
9756 @@ -3744,6 +5178,12 @@
9757 s,@AUTOMAKE@,$AUTOMAKE,;t t
9758 s,@AUTOHEADER@,$AUTOHEADER,;t t
9759 s,@MAKEINFO@,$MAKEINFO,;t t
9760 +s,@AMTAR@,$AMTAR,;t t
9761 +s,@install_sh@,$install_sh,;t t
9762 +s,@STRIP@,$STRIP,;t t
9763 +s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
9764 +s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
9766 s,@SET_MAKE@,$SET_MAKE,;t t
9768 s,@CFLAGS@,$CFLAGS,;t t
9769 @@ -3752,19 +5192,33 @@
9770 s,@ac_ct_CC@,$ac_ct_CC,;t t
9771 s,@EXEEXT@,$EXEEXT,;t t
9772 s,@OBJEXT@,$OBJEXT,;t t
9773 +s,@DEPDIR@,$DEPDIR,;t t
9774 +s,@am__include@,$am__include,;t t
9775 +s,@am__quote@,$am__quote,;t t
9776 +s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
9777 +s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
9778 +s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
9779 +s,@CCDEPMODE@,$CCDEPMODE,;t t
9780 s,@RANLIB@,$RANLIB,;t t
9781 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
9782 -s,@GTK_CONFIG@,$GTK_CONFIG,;t t
9783 +s,@PKG_CONFIG@,$PKG_CONFIG,;t t
9784 s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
9785 s,@GTK_LIBS@,$GTK_LIBS,;t t
9787 +s,@EGREP@,$EGREP,;t t
9788 s,@LIBJPEG_LIB@,$LIBJPEG_LIB,;t t
9789 -s,@src doc bin util lib@,$src doc bin util lib,;t t
9793 +s,@util@,$util,;t t
9795 +s,@LIBOBJS@,$LIBOBJS,;t t
9796 +s,@LTLIBOBJS@,$LTLIBOBJS,;t t
9802 - cat >>$CONFIG_STATUS <<\EOF
9803 + cat >>$CONFIG_STATUS <<\_ACEOF
9804 # Split the substitutions into bite-sized pieces for seds with
9805 # small command number limits, like on Digital OSF/1 and HP-UX.
9807 @@ -3803,8 +5257,8 @@
9809 fi # test -n "$CONFIG_FILES"
9812 -cat >>$CONFIG_STATUS <<\EOF
9814 +cat >>$CONFIG_STATUS <<\_ACEOF
9815 for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
9816 # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
9818 @@ -3818,7 +5272,8 @@
9821 # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
9822 - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
9823 + ac_dir=`(dirname "$ac_file") 2>/dev/null ||
9824 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
9825 X"$ac_file" : 'X\(//\)[^/]' \| \
9826 X"$ac_file" : 'X\(//\)$' \| \
9827 X"$ac_file" : 'X\(/\)' \| \
9828 @@ -3829,60 +5284,84 @@
9829 /^X\(\/\/\)$/{ s//\1/; q; }
9830 /^X\(\/\).*/{ s//\1/; q; }
9832 - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
9833 - { case "$ac_dir" in
9834 - [\\/]* | ?:[\\/]* ) as_incr_dir=;;
9835 - *) as_incr_dir=.;;
9838 -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
9839 - case $as_mkdir_dir in
9840 - # Skip DOS drivespec
9841 - ?:) as_incr_dir=$as_mkdir_dir ;;
9843 - as_incr_dir=$as_incr_dir/$as_mkdir_dir
9844 - test -d "$as_incr_dir" || mkdir "$as_incr_dir"
9849 - ac_dir_suffix="/`echo $ac_dir|sed 's,^\./,,'`"
9850 - # A "../" for each directory in $ac_dir_suffix.
9851 - ac_dots=`echo "$ac_dir_suffix" | sed 's,/[^/]*,../,g'`
9852 + { if $as_mkdir_p; then
9853 + mkdir -p "$ac_dir"
9855 - ac_dir_suffix= ac_dots=
9860 - if test -z "$ac_dots"; then
9863 - ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'`
9865 - [\\/]* | ?:[\\/]* )
9866 - ac_srcdir=$srcdir$ac_dir_suffix;
9867 - ac_top_srcdir=$srcdir ;;
9870 + while test ! -d "$as_dir"; do
9871 + as_dirs="$as_dir $as_dirs"
9872 + as_dir=`(dirname "$as_dir") 2>/dev/null ||
9873 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
9874 + X"$as_dir" : 'X\(//\)[^/]' \| \
9875 + X"$as_dir" : 'X\(//\)$' \| \
9876 + X"$as_dir" : 'X\(/\)' \| \
9877 + . : '\(.\)' 2>/dev/null ||
9879 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
9880 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
9881 + /^X\(\/\/\)$/{ s//\1/; q; }
9882 + /^X\(\/\).*/{ s//\1/; q; }
9885 + test ! -n "$as_dirs" || mkdir $as_dirs
9886 + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
9887 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
9888 + { (exit 1); exit 1; }; }; }
9892 +if test "$ac_dir" != .; then
9893 + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
9894 + # A "../" for each directory in $ac_dir_suffix.
9895 + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
9897 + ac_dir_suffix= ac_top_builddir=
9901 + .) # No --srcdir option. We are building in place.
9903 + if test -z "$ac_top_builddir"; then
9906 + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
9908 + [\\/]* | ?:[\\/]* ) # Absolute path.
9909 + ac_srcdir=$srcdir$ac_dir_suffix;
9910 + ac_top_srcdir=$srcdir ;;
9912 - ac_srcdir=$ac_dots$srcdir$ac_dir_suffix
9913 - ac_top_srcdir=$ac_dots$srcdir ;;
9915 + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
9916 + ac_top_srcdir=$ac_top_builddir$srcdir ;;
9918 +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
9920 +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
9921 +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
9922 +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
9923 +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
9927 [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
9928 - *) ac_INSTALL=$ac_dots$INSTALL ;;
9929 + *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
9932 if test x"$ac_file" != x-; then
9933 - { echo "$as_me:3877: creating $ac_file" >&5
9934 + { echo "$as_me:$LINENO: creating $ac_file" >&5
9935 echo "$as_me: creating $ac_file" >&6;}
9938 # Let's still pretend it is `configure' which instantiates (i.e., don't
9939 # use $as_me), people would be surprised to read:
9940 - # /* config.h. Generated automatically by config.status. */
9941 - configure_input="Generated automatically from `echo $ac_file_in |
9942 - sed 's,.*/,,'` by configure."
9943 + # /* config.h. Generated by config.status. */
9944 + if test x"$ac_file" = x-; then
9947 + configure_input="$ac_file. "
9949 + configure_input=$configure_input"Generated from `echo $ac_file_in |
9950 + sed 's,.*/,,'` by configure."
9952 # First look for the input files in the build tree, otherwise in the
9954 @@ -3892,7 +5371,7 @@
9955 -) echo $tmp/stdin ;;
9957 # Absolute (can't be DOS-style, as IFS=:)
9958 - test -f "$f" || { { echo "$as_me:3895: error: cannot find input file: $f" >&5
9959 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
9960 echo "$as_me: error: cannot find input file: $f" >&2;}
9961 { (exit 1); exit 1; }; }
9963 @@ -3905,23 +5384,29 @@
9967 - { { echo "$as_me:3908: error: cannot find input file: $f" >&5
9968 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
9969 echo "$as_me: error: cannot find input file: $f" >&2;}
9970 { (exit 1); exit 1; }; }
9973 done` || { (exit 1); exit 1; }
9975 -cat >>$CONFIG_STATUS <<EOF
9977 +cat >>$CONFIG_STATUS <<_ACEOF
9981 -cat >>$CONFIG_STATUS <<\EOF
9983 +cat >>$CONFIG_STATUS <<\_ACEOF
9985 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
9986 s,@configure_input@,$configure_input,;t t
9987 s,@srcdir@,$ac_srcdir,;t t
9988 +s,@abs_srcdir@,$ac_abs_srcdir,;t t
9989 s,@top_srcdir@,$ac_top_srcdir,;t t
9990 +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
9991 +s,@builddir@,$ac_builddir,;t t
9992 +s,@abs_builddir@,$ac_abs_builddir,;t t
9993 +s,@top_builddir@,$ac_top_builddir,;t t
9994 +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
9995 s,@INSTALL@,$ac_INSTALL,;t t
9996 " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
9998 @@ -3933,8 +5418,8 @@
10003 -cat >>$CONFIG_STATUS <<\EOF
10005 +cat >>$CONFIG_STATUS <<\_ACEOF
10008 # CONFIG_HEADER section.
10009 @@ -3966,7 +5451,7 @@
10010 * ) ac_file_in=$ac_file.in ;;
10013 - test x"$ac_file" != x- && { echo "$as_me:3969: creating $ac_file" >&5
10014 + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
10015 echo "$as_me: creating $ac_file" >&6;}
10017 # First look for the input files in the build tree, otherwise in the
10018 @@ -3977,7 +5462,7 @@
10019 -) echo $tmp/stdin ;;
10021 # Absolute (can't be DOS-style, as IFS=:)
10022 - test -f "$f" || { { echo "$as_me:3980: error: cannot find input file: $f" >&5
10023 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
10024 echo "$as_me: error: cannot find input file: $f" >&2;}
10025 { (exit 1); exit 1; }; }
10027 @@ -3990,7 +5475,7 @@
10031 - { { echo "$as_me:3993: error: cannot find input file: $f" >&5
10032 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
10033 echo "$as_me: error: cannot find input file: $f" >&2;}
10034 { (exit 1); exit 1; }; }
10036 @@ -3999,7 +5484,7 @@
10037 # Remove the trailing spaces.
10038 sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
10043 # Transform confdefs.h into two sed scripts, `conftest.defines' and
10044 # `conftest.undefs', that substitutes the proper values into
10045 @@ -4015,16 +5500,16 @@
10046 # `end' is used to avoid that the second main sed command (meant for
10047 # 0-ary CPP macros) applies to n-ary macro definitions.
10048 # See the Autoconf documentation for `clear'.
10049 -cat >confdef2sed.sed <<\EOF
10050 +cat >confdef2sed.sed <<\_ACEOF
10055 -s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp
10056 +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
10058 s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
10062 # If some macros were called several times there might be several times
10063 # the same #defines, which is useless. Nevertheless, we may not want to
10064 # sort them, since we want the *last* AC-DEFINE to be honored.
10065 @@ -4035,14 +5520,14 @@
10066 # This sed command replaces #undef with comments. This is necessary, for
10067 # example, in the case of _POSIX_SOURCE, which is predefined and required
10068 # on some systems where configure will not decide to define it.
10069 -cat >>conftest.undefs <<\EOF
10070 +cat >>conftest.undefs <<\_ACEOF
10071 s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
10075 # Break up conftest.defines because some shells have a limit on the size
10076 # of here documents, and old seds have small limits too (100 cmds).
10077 echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
10078 -echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
10079 +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
10080 echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
10081 echo ' :' >>$CONFIG_STATUS
10082 rm -f conftest.tail
10083 @@ -4066,7 +5551,7 @@
10084 mv conftest.tail conftest.defines
10086 rm -f conftest.defines
10087 -echo ' fi # egrep' >>$CONFIG_STATUS
10088 +echo ' fi # grep' >>$CONFIG_STATUS
10089 echo >>$CONFIG_STATUS
10091 # Break up conftest.undefs because some shells have a limit on the size
10092 @@ -4094,23 +5579,24 @@
10094 rm -f conftest.undefs
10096 -cat >>$CONFIG_STATUS <<\EOF
10097 +cat >>$CONFIG_STATUS <<\_ACEOF
10098 # Let's still pretend it is `configure' which instantiates (i.e., don't
10099 # use $as_me), people would be surprised to read:
10100 - # /* config.h. Generated automatically by config.status. */
10101 + # /* config.h. Generated by config.status. */
10102 if test x"$ac_file" = x-; then
10103 - echo "/* Generated automatically by configure. */" >$tmp/config.h
10104 + echo "/* Generated by configure. */" >$tmp/config.h
10106 - echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h
10107 + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
10109 cat $tmp/in >>$tmp/config.h
10111 if test x"$ac_file" != x-; then
10112 - if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
10113 - { echo "$as_me:4110: $ac_file is unchanged" >&5
10114 + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
10115 + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
10116 echo "$as_me: $ac_file is unchanged" >&6;}
10118 - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
10119 + ac_dir=`(dirname "$ac_file") 2>/dev/null ||
10120 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
10121 X"$ac_file" : 'X\(//\)[^/]' \| \
10122 X"$ac_file" : 'X\(//\)$' \| \
10123 X"$ac_file" : 'X\(/\)' \| \
10124 @@ -4121,24 +5607,31 @@
10125 /^X\(\/\/\)$/{ s//\1/; q; }
10126 /^X\(\/\).*/{ s//\1/; q; }
10128 - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
10129 - { case "$ac_dir" in
10130 - [\\/]* | ?:[\\/]* ) as_incr_dir=;;
10131 - *) as_incr_dir=.;;
10133 -as_dummy="$ac_dir"
10134 -for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
10135 - case $as_mkdir_dir in
10136 - # Skip DOS drivespec
10137 - ?:) as_incr_dir=$as_mkdir_dir ;;
10139 - as_incr_dir=$as_incr_dir/$as_mkdir_dir
10140 - test -d "$as_incr_dir" || mkdir "$as_incr_dir"
10144 + { if $as_mkdir_p; then
10145 + mkdir -p "$ac_dir"
10149 + while test ! -d "$as_dir"; do
10150 + as_dirs="$as_dir $as_dirs"
10151 + as_dir=`(dirname "$as_dir") 2>/dev/null ||
10152 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
10153 + X"$as_dir" : 'X\(//\)[^/]' \| \
10154 + X"$as_dir" : 'X\(//\)$' \| \
10155 + X"$as_dir" : 'X\(/\)' \| \
10156 + . : '\(.\)' 2>/dev/null ||
10158 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
10159 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
10160 + /^X\(\/\/\)$/{ s//\1/; q; }
10161 + /^X\(\/\).*/{ s//\1/; q; }
10164 + test ! -n "$as_dirs" || mkdir $as_dirs
10165 + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
10166 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
10167 + { (exit 1); exit 1; }; }; }
10171 mv $tmp/config.h $ac_file
10173 @@ -4146,9 +5639,15 @@
10175 rm -f $tmp/config.h
10177 + # Run the commands associated with the file.
10179 + config.h ) # update the timestamp
10180 +echo 'timestamp for config.h' >"./stamp-h1"
10185 -cat >>$CONFIG_STATUS <<\EOF
10187 +cat >>$CONFIG_STATUS <<\_ACEOF
10190 # CONFIG_COMMANDS section.
10191 @@ -4156,20 +5655,157 @@
10192 for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
10193 ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
10194 ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
10195 + ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
10196 +$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
10197 + X"$ac_dest" : 'X\(//\)[^/]' \| \
10198 + X"$ac_dest" : 'X\(//\)$' \| \
10199 + X"$ac_dest" : 'X\(/\)' \| \
10200 + . : '\(.\)' 2>/dev/null ||
10201 +echo X"$ac_dest" |
10202 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
10203 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
10204 + /^X\(\/\/\)$/{ s//\1/; q; }
10205 + /^X\(\/\).*/{ s//\1/; q; }
10209 +if test "$ac_dir" != .; then
10210 + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
10211 + # A "../" for each directory in $ac_dir_suffix.
10212 + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
10214 + ac_dir_suffix= ac_top_builddir=
10218 + .) # No --srcdir option. We are building in place.
10220 + if test -z "$ac_top_builddir"; then
10223 + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
10225 + [\\/]* | ?:[\\/]* ) # Absolute path.
10226 + ac_srcdir=$srcdir$ac_dir_suffix;
10227 + ac_top_srcdir=$srcdir ;;
10228 + *) # Relative path.
10229 + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
10230 + ac_top_srcdir=$ac_top_builddir$srcdir ;;
10232 +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
10234 +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
10235 +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
10236 +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
10237 +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
10240 + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
10241 +echo "$as_me: executing $ac_dest commands" >&6;}
10243 - default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;;
10244 + depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
10245 + # Strip MF so we end up with the name of the file.
10246 + mf=`echo "$mf" | sed -e 's/:.*$//'`
10247 + # Check whether this is an Automake generated Makefile or not.
10248 + # We used to match only the files named `Makefile.in', but
10249 + # some people rename them; so instead we look at the file content.
10250 + # Grep'ing the first line is not enough: some people post-process
10251 + # each Makefile.in and add a new line on top of each file to say so.
10252 + # So let's grep whole file.
10253 + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
10254 + dirpart=`(dirname "$mf") 2>/dev/null ||
10255 +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
10256 + X"$mf" : 'X\(//\)[^/]' \| \
10257 + X"$mf" : 'X\(//\)$' \| \
10258 + X"$mf" : 'X\(/\)' \| \
10259 + . : '\(.\)' 2>/dev/null ||
10261 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
10262 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
10263 + /^X\(\/\/\)$/{ s//\1/; q; }
10264 + /^X\(\/\).*/{ s//\1/; q; }
10269 + grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
10270 + # Extract the definition of DEP_FILES from the Makefile without
10271 + # running `make'.
10272 + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
10273 + test -z "$DEPDIR" && continue
10274 + # When using ansi2knr, U may be empty or an underscore; expand it
10275 + U=`sed -n -e '/^U = / s///p' < "$mf"`
10276 + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
10277 + # We invoke sed twice because it is the simplest approach to
10278 + # changing $(DEPDIR) to its actual value in the expansion.
10279 + for file in `sed -n -e '
10280 + /^DEP_FILES = .*\\\\$/ {
10281 + s/^DEP_FILES = //
10289 + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
10290 + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
10291 + # Make sure the directory exists.
10292 + test -f "$dirpart/$file" && continue
10293 + fdir=`(dirname "$file") 2>/dev/null ||
10294 +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
10295 + X"$file" : 'X\(//\)[^/]' \| \
10296 + X"$file" : 'X\(//\)$' \| \
10297 + X"$file" : 'X\(/\)' \| \
10298 + . : '\(.\)' 2>/dev/null ||
10300 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
10301 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
10302 + /^X\(\/\/\)$/{ s//\1/; q; }
10303 + /^X\(\/\).*/{ s//\1/; q; }
10305 + { if $as_mkdir_p; then
10306 + mkdir -p $dirpart/$fdir
10308 + as_dir=$dirpart/$fdir
10310 + while test ! -d "$as_dir"; do
10311 + as_dirs="$as_dir $as_dirs"
10312 + as_dir=`(dirname "$as_dir") 2>/dev/null ||
10313 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
10314 + X"$as_dir" : 'X\(//\)[^/]' \| \
10315 + X"$as_dir" : 'X\(//\)$' \| \
10316 + X"$as_dir" : 'X\(/\)' \| \
10317 + . : '\(.\)' 2>/dev/null ||
10319 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
10320 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
10321 + /^X\(\/\/\)$/{ s//\1/; q; }
10322 + /^X\(\/\).*/{ s//\1/; q; }
10325 + test ! -n "$as_dirs" || mkdir $as_dirs
10326 + fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
10327 +echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
10328 + { (exit 1); exit 1; }; }; }
10330 + # echo "creating $dirpart/$file"
10331 + echo '# dummy' > "$dirpart/$file"
10340 -cat >>$CONFIG_STATUS <<\EOF
10341 +cat >>$CONFIG_STATUS <<\_ACEOF
10343 { (exit 0); exit 0; }
10346 chmod +x $CONFIG_STATUS
10347 ac_clean_files=$ac_clean_files_save
10350 # configure is writing to config.log, and then calls config.status.
10351 # config.status does its own redirection, appending to config.log.
10352 # Unfortunately, on DOS this fails, as config.log is still kept open
10353 @@ -4180,8 +5816,11 @@
10354 # need to make the FD available again.
10355 if test "$no_create" != yes; then
10357 + ac_config_status_args=
10358 + test "$silent" = yes &&
10359 + ac_config_status_args="$ac_config_status_args --quiet"
10361 - $SHELL $CONFIG_STATUS || ac_cs_success=false
10362 + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
10364 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
10365 # would make configure fail if this is the last instruction.
10366 diff -urN dillo-0.6.6/configure.in dillo2-0.6.6/configure.in
10367 --- dillo-0.6.6/configure.in 2002-05-29 15:01:55.000000000 -0600
10368 +++ dillo2-0.6.6/configure.in 2003-04-21 12:35:09.000000000 -0600
10370 AC_ARG_ENABLE(ansi, [ --enable-ansi Try to compile and run with ANSI flags],
10372 AC_ARG_ENABLE(cookies,[ --enable-cookies Build with support for cookies], , )
10373 +AC_ARG_ENABLE(ipv6, [ --enable-ipv6 Build with support for IPv6], , )
10377 @@ -28,11 +29,12 @@
10379 dnl Check for Gtk+ (it checks glib too)
10381 -if test -z "$GTK_CONFIG"; then
10382 - GTK_CONFIG=`which gtk-config || which gtk12-config`
10384 -AM_PATH_GTK(1.2.0, [LIBS="$LIBS $GTK_LIBS" CFLAGS="$GTK_CFLAGS $CFLAGS"],
10385 -AC_MSG_WARN(Unable to find Gtk+ with a version >= 1.2.0))
10386 +GTK_REQUIRED=2.0.0
10388 +PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
10390 +CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
10391 +LDFLAGS="$LDFLAGS $GTK_LIBS"
10393 dnl Check for compiler options
10395 @@ -119,6 +121,10 @@
10396 CFLAGS="$CFLAGS -DDISABLE_COOKIES"
10399 +if test "x$enable_ipv6" = "xyes" ; then
10400 + CFLAGS="$CFLAGS -DENABLE_IPV6"
10404 if test "x$enable_efence" = "xyes" ; then
10405 LIBS="-lefence $LIBS"
10406 diff -urN dillo-0.6.6/debian/README.Debian dillo2-0.6.6/debian/README.Debian
10407 --- dillo-0.6.6/debian/README.Debian 1969-12-31 17:00:00.000000000 -0700
10408 +++ dillo2-0.6.6/debian/README.Debian 2003-04-21 12:36:34.000000000 -0600
10411 +To fully make use of dillo, you will want to copy the provided dillorc
10412 +file located in /usr/share/doc/dillo/dillorc into ~/.dillo/
10414 +This Debian package was created by Ron Farrer <rbf@debian.org>.
10415 diff -urN dillo-0.6.6/debian/changelog dillo2-0.6.6/debian/changelog
10416 --- dillo-0.6.6/debian/changelog 1969-12-31 17:00:00.000000000 -0700
10417 +++ dillo2-0.6.6/debian/changelog 2003-04-21 12:36:34.000000000 -0600
10419 +dillo (0.6.6-3) unstable; urgency=low
10421 + * Add build dependency on automake and autoconf, closes: #152820
10423 + -- Phil Blundell <pb@debian.org> Sat, 13 Jul 2002 13:17:27 +0100
10425 +dillo (0.6.6-2) unstable; urgency=low
10427 + * Correct menu, closes: #149483
10428 + * Fix typo in description, closes: #150415
10429 + * Don't force CFLAGS in debian/rules.
10430 + * Include IPv6 support.
10432 + -- Phil Blundell <pb@debian.org> Fri, 12 Jul 2002 19:23:03 +0100
10434 +dillo (0.6.6-1) unstable; urgency=low
10436 + * New upstream version, closes: #145294
10437 + * Install in /usr/bin, closes: #142755
10439 + -- Philip Blundell <pb@debian.org> Thu, 30 May 2002 21:53:16 +0100
10441 +dillo (0.6.4-4) unstable; urgency=low
10443 + * Update URL in debian/copyright, closes: #142741
10444 + * Set --prefix=/usr, closes: #142755
10445 + * Apply patch containing new pixmaps, closes: #142756
10447 + -- Philip Blundell <pb@debian.org> Sun, 14 Apr 2002 15:23:59 +0100
10449 +dillo (0.6.4-3) unstable; urgency=medium
10451 + * New maintainer, closes: #138950
10452 + * Revert previous bogus change to font specification,
10455 + -- Philip Blundell <pb@debian.org> Wed, 20 Mar 2002 01:35:24 +0000
10457 +dillo (0.6.4-2) unstable; urgency=low
10459 + * Fixed font reading problem, (Closes: Bug#134592)
10461 + -- Ron Farrer <rbf@debian.org> Thu, 21 Feb 2002 08:10:14 -0700
10463 +dillo (0.6.4-1) unstable; urgency=low
10465 + * New upstream release.
10466 + * Fixed Long description line, (Closes: Bug#130929)
10467 + * Fixed oversized control files, (Closes: Bug#130273)
10468 + * New release doesn't leak memory, (Closes: Bug#123437)
10470 + -- Ron Farrer <rbf@debian.org> Wed, 30 Jan 2002 07:22:41 -0700
10472 +dillo (0.6.3-2) unstable; urgency=low
10474 + * Added a dillo.desktop, (Closes: Bug#121767)
10475 + * Dillo 0.6.3 already uploaded, (Closes: Bug#126962)
10477 + -- Ron Farrer <rbf@debian.org> Tue, 01 Jan 2002 11:09:31 -0700
10479 +dillo (0.6.3-1) unstable; urgency=low
10481 + * New upstream release.
10483 + -- Ron Farrer <rbf@debian.org> Wed, 26 Dec 2001 21:32:29 -0700
10485 +dillo (0.6.2-1) unstable; urgency=low
10487 + * New upstream release, (Closes: Bug#115604)
10489 + -- Ron Farrer <rbf@debian.org> Thu, 18 Oct 2001 08:20:14 -0700
10491 +dillo (0.6.1-1) unstable; urgency=low
10493 + * New upstream release.
10495 + -- Ron Farrer <rbf@debian.org> Fri, 14 Sep 2001 10:40:56 -0700
10497 +dillo (0.6.0-1) unstable; urgency=low
10499 + * New upstream release, (Closes: Bug#107359)
10501 + -- Ron Farrer <rbf@debian.org> Tue, 31 Jul 2001 19:08:40 -0700
10503 +dillo (0.5.1-2) unstable; urgency=low
10505 + * Fixed build-depends, (Closes: Bug#100669)
10507 + -- Ron Farrer <rbf@debian.org> Fri, 15 Jun 2001 13:49:30 -0700
10509 +dillo (0.5.1-1) unstable; urgency=low
10511 + * New upstream release.
10513 + -- Ron Farrer <rbf@debian.org> Mon, 04 Jun 2001 10:06:50 -0700
10515 +dillo (0.5.0-1) unstable; urgency=low
10517 + * New upstream release.
10519 + -- Ron Farrer <rbf@debian.org> Thu, 10 May 2001 21:51:44 -0700
10521 +dillo (0.4.0-1) unstable; urgency=low
10523 + * New upstream release.
10525 + -- Ron Farrer <rbf@debian.org> Mon, 05 Mar 2001 9:04:17 -0800
10527 +dillo (0.3.2-1) unstable; urgency=low
10529 + * New upstream release.
10531 + -- Ron Farrer <rbf@debian.org> Thu, 01 Mar 2001 9:33:09 -0800
10533 +dillo (0.3.1-2) unstable; urgency=low
10535 + * Fixed man page, changed splash screen; Closes bug #82748
10537 + -- Ron Farrer <rbf@debian.org> Fri, 19 Jan 2001 10:05:27 -0800
10539 +dillo (0.3.1-1) unstable; urgency=low
10541 + * New upstream release.
10543 + -- Ron Farrer <rbf@debian.org> Wed, 27 Dec 2000 10:14:30 -0800
10545 +dillo (0.3.0.0-1) unstable; urgency=low
10547 + * New upstream release.
10549 + -- Ron Farrer <rbf@debian.org> Mon, 13 Nov 2000 09:12:54 -0800
10551 +dillo (0.3.0pre1-1) unstable; urgency=low
10553 + * New upstream release.
10554 + * gzilla is now dead upstream, dillo takes it's place.
10556 + -- Ron Farrer <rbf@debian.org> Wed, 8 Nov 2000 08:06:40 -0800
10558 +dillo (0.2.4-1) unstable; urgency=low
10560 + * Initial Release.
10562 + -- Ron Farrer <rbf@farrer.net> Sun, 3 Sep 2000 13:53:35 -0700
10565 +mode: debian-changelog
10567 diff -urN dillo-0.6.6/debian/control dillo2-0.6.6/debian/control
10568 --- dillo-0.6.6/debian/control 1969-12-31 17:00:00.000000000 -0700
10569 +++ dillo2-0.6.6/debian/control 2003-04-21 12:36:34.000000000 -0600
10574 +Maintainer: Phil Blundell <pb@debian.org>
10575 +Standards-Version: 3.1.1.1
10576 +Build-Depends: debhelper, libgtk1.2-dev, libglib1.2-dev, libpng2-dev, zlib1g-dev, libjpeg62-dev, automake, autoconf
10580 +Depends: ${shlibs:Depends}
10583 +Provides: www-browser
10584 +Description: GTK-based web browser
10585 + Dillo aims to be a multiplatform browser alternative that's small,
10586 + stable, developer-friendly, usable, fast, and extensible. Dillo is
10587 + mainly based on GTK+ (GNOME is NOT required!) Dillo is very fast!
10588 diff -urN dillo-0.6.6/debian/copyright dillo2-0.6.6/debian/copyright
10589 --- dillo-0.6.6/debian/copyright 1969-12-31 17:00:00.000000000 -0700
10590 +++ dillo2-0.6.6/debian/copyright 2003-04-21 12:36:34.000000000 -0600
10592 +This package was debianized by Ron Farrer <rbf@debian.org>.
10594 +It was downloaded from http://dillo.cipsga.org.br/
10598 +GNU GPL with following additions:
10600 +The gif.c module was adapted from ppmtogif.c as found in the
10601 +netpbm-1mar1994 release. That code included the following copyright
10604 +/* +-------------------------------------------------------------------+ */
10605 +/* | Copyright 1990, 1991, 1993, David Koblas. (koblas@netcom.com) | */
10606 +/* | Permission to use, copy, modify, and distribute this software | */
10607 +/* | and its documentation for any purpose and without fee is hereby | */
10608 +/* | granted, provided that the above copyright notice appear in all | */
10609 +/* | copies and that both that copyright notice and this permission | */
10610 +/* | notice appear in supporting documentation. This software is | */
10611 +/* | provided "as is" without express or implied warranty. | */
10612 +/* +-------------------------------------------------------------------+ */
10614 diff -urN dillo-0.6.6/debian/dillo.1x dillo2-0.6.6/debian/dillo.1x
10615 --- dillo-0.6.6/debian/dillo.1x 1969-12-31 17:00:00.000000000 -0700
10616 +++ dillo2-0.6.6/debian/dillo.1x 2003-04-21 12:36:34.000000000 -0600
10620 +dillo \- GTK-based web browser
10625 +This manual page documents briefly the
10628 +This manual page was written for the Debian GNU/Linux distribution
10629 +because the original program does not have a manual page.
10634 +and is a free browser which uses the GTK. It should be considered
10635 +"early alpha" software.
10637 +There are no options. Pass a URL on the command line to open the
10638 +browser at that location.
10640 +.I /usr/share/doc/dillo/dillorc
10642 +.IR ~/.dillo/dillorc .
10644 +.I ~/.dillo/dillorc
10646 +.I ~/.dillo/bookmarks.html
10649 +was created by the Dillo project. More information can be found on
10650 +the project home page:
10652 +http://dillo.sourceforge.net
10654 +This man page was created by Ron Farrer <rbf@debian.org> for the
10655 +Debian GNU/Linux distribution.
10656 diff -urN dillo-0.6.6/debian/dillo.desktop dillo2-0.6.6/debian/dillo.desktop
10657 --- dillo-0.6.6/debian/dillo.desktop 1969-12-31 17:00:00.000000000 -0700
10658 +++ dillo2-0.6.6/debian/dillo.desktop 2003-04-21 12:36:34.000000000 -0600
10662 +Comment=Lightweight browser
10666 diff -urN dillo-0.6.6/debian/dirs dillo2-0.6.6/debian/dirs
10667 --- dillo-0.6.6/debian/dirs 1969-12-31 17:00:00.000000000 -0700
10668 +++ dillo2-0.6.6/debian/dirs 2003-04-21 12:36:34.000000000 -0600
10670 +usr/share/gnome/apps/Internet/
10672 +usr/X11R6/include/X11/pixmaps
10673 diff -urN dillo-0.6.6/debian/docs dillo2-0.6.6/debian/docs
10674 --- dillo-0.6.6/debian/docs 1969-12-31 17:00:00.000000000 -0700
10675 +++ dillo2-0.6.6/debian/docs 2003-04-21 12:36:34.000000000 -0600
10683 +debian/README.Debian
10692 +doc/HtmlParser.txt
10697 diff -urN dillo-0.6.6/debian/menu dillo2-0.6.6/debian/menu
10698 --- dillo-0.6.6/debian/menu 1969-12-31 17:00:00.000000000 -0700
10699 +++ dillo2-0.6.6/debian/menu 2003-04-21 12:36:34.000000000 -0600
10701 +?package(dillo):needs=X11 section=Apps/Net\
10702 + title="dillo" command="/usr/bin/dillo"
10703 diff -urN dillo-0.6.6/debian/rules dillo2-0.6.6/debian/rules
10704 --- dillo-0.6.6/debian/rules 1969-12-31 17:00:00.000000000 -0700
10705 +++ dillo2-0.6.6/debian/rules 2003-04-21 12:36:34.000000000 -0600
10707 +#!/usr/bin/make -f
10712 + ./configure --prefix=/usr --enable-ipv6
10720 + -rm -f `find . -name "*~"`
10721 + -rm -rf debian/tmp debian/files* core debian/substvars debian/prerm.debhelper debian/postinst.debhelper debian/postrm.debhelper
10723 +binary-indep: checkroot build
10726 +binary-arch: checkroot build
10728 + -rm -rf debian/tmp
10729 + install -d debian/tmp
10730 + cd debian/tmp && install -d `cat ../dirs`
10731 + make install prefix=`pwd`/debian/tmp/usr
10734 + dh_installexamples
10735 + dh_installchangelogs
10738 + dh_installmanpages -pdillo
10739 + install debian/dillo.desktop debian/tmp/usr/share/gnome/apps/Internet/
10754 +# chown -R root.root debian/tmp
10755 +# chmod -R go=rX debian/tmp
10756 +# dpkg --build debian/tmp ..
10759 + test -f debian/rules
10762 +# Below here is fairly generic really
10764 +binary: binary-indep binary-arch
10768 + test root = "`whoami`"
10770 +.PHONY: binary binary-arch binary-indep clean checkroot
10771 diff -urN dillo-0.6.6/depcomp dillo2-0.6.6/depcomp
10772 --- dillo-0.6.6/depcomp 1969-12-31 17:00:00.000000000 -0700
10773 +++ dillo2-0.6.6/depcomp 2003-04-21 12:35:20.000000000 -0600
10777 +# depcomp - compile a program generating dependencies as side-effects
10778 +# Copyright 1999, 2000 Free Software Foundation, Inc.
10780 +# This program is free software; you can redistribute it and/or modify
10781 +# it under the terms of the GNU General Public License as published by
10782 +# the Free Software Foundation; either version 2, or (at your option)
10783 +# any later version.
10785 +# This program is distributed in the hope that it will be useful,
10786 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
10787 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10788 +# GNU General Public License for more details.
10790 +# You should have received a copy of the GNU General Public License
10791 +# along with this program; if not, write to the Free Software
10792 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
10793 +# 02111-1307, USA.
10795 +# As a special exception to the GNU General Public License, if you
10796 +# distribute this file as part of a program that contains a
10797 +# configuration script generated by Autoconf, you may include it under
10798 +# the same distribution terms that you use for the rest of that program.
10800 +# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
10802 +if test -z "$depmode" || test -z "$source" || test -z "$object"; then
10803 + echo "depcomp: Variables source, object and depmode must be set" 1>&2
10806 +# `libtool' can also be set to `yes' or `no'.
10808 +if test -z "$depfile"; then
10809 + base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
10810 + dir=`echo "$object" | sed 's,/.*$,/,'`
10811 + if test "$dir" = "$object"; then
10814 + # FIXME: should be _deps on DOS.
10815 + depfile="$dir.deps/$base"
10818 +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
10820 +rm -f "$tmpdepfile"
10822 +# Some modes work just like other modes, but use different flags. We
10823 +# parameterize here, but still list the modes in the big case below,
10824 +# to make depend.m4 easier to write. Note that we *cannot* use a case
10825 +# here, because this file can only contain one case statement.
10826 +if test "$depmode" = hp; then
10827 + # HP compiler uses -M and no extra arg.
10832 +if test "$depmode" = dashXmstdout; then
10833 + # This is just like dashmstdout with a different argument.
10835 + depmode=dashmstdout
10838 +case "$depmode" in
10840 +## gcc 3 implements dependency tracking that does exactly what
10841 +## we want. Yay! Note: for some reason libtool 1.4 doesn't like
10842 +## it if -MD -MP comes after the -MF stuff. Hmm.
10843 + "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
10845 + if test $stat -eq 0; then :
10847 + rm -f "$tmpdepfile"
10850 + mv "$tmpdepfile" "$depfile"
10854 +## There are various ways to get dependency output from gcc. Here's
10855 +## why we pick this rather obscure method:
10856 +## - Don't want to use -MD because we'd like the dependencies to end
10857 +## up in a subdir. Having to rename by hand is ugly.
10858 +## (We might end up doing this anyway to support other compilers.)
10859 +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
10860 +## -MM, not -M (despite what the docs say).
10861 +## - Using -M directly means running the compiler twice (even worse
10862 +## than renaming).
10863 + if test -z "$gccflag"; then
10866 + "$@" -Wp,"$gccflag$tmpdepfile"
10868 + if test $stat -eq 0; then :
10870 + rm -f "$tmpdepfile"
10874 + echo "$object : \\" > "$depfile"
10875 + alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
10876 +## The second -e expression handles DOS-style file names with drive letters.
10877 + sed -e 's/^[^:]*: / /' \
10878 + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
10879 +## This next piece of magic avoids the `deleted header file' problem.
10880 +## The problem is that when a header file which appears in a .P file
10881 +## is deleted, the dependency causes make to die (because there is
10882 +## typically no way to rebuild the header). We avoid this by adding
10883 +## dummy dependencies for each header file. Too bad gcc doesn't do
10884 +## this for us directly.
10886 +' < "$tmpdepfile" |
10887 +## Some versions of gcc put a space before the `:'. On the theory
10888 +## that the space means something, we add a space to the output as
10890 +## Some versions of the HPUX 10.20 sed can't process this invocation
10891 +## correctly. Breaking it into two sed invocations is a workaround.
10892 + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
10893 + rm -f "$tmpdepfile"
10897 + # This case exists only to let depend.m4 do its work. It works by
10898 + # looking at the text of this script. This case will never be run,
10899 + # since it is checked for above.
10904 + if test "$libtool" = yes; then
10905 + "$@" "-Wp,-MDupdate,$tmpdepfile"
10907 + "$@" -MDupdate "$tmpdepfile"
10910 + if test $stat -eq 0; then :
10912 + rm -f "$tmpdepfile"
10917 + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
10918 + echo "$object : \\" > "$depfile"
10920 + # Clip off the initial element (the dependent). Don't try to be
10921 + # clever and replace this with sed code, as IRIX sed won't handle
10922 + # lines with more than a fixed number of characters (4096 in
10923 + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
10924 + # the IRIX cc adds comments like `#:fec' to the end of the
10925 + # dependency line.
10927 +' < "$tmpdepfile" \
10928 + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
10933 + # The second pass generates a dummy entry for each header file.
10935 +' < "$tmpdepfile" \
10936 + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
10939 + # The sourcefile does not contain any dependencies, so just
10940 + # store a dummy comment line, to avoid errors with the Makefile
10941 + # "include basename.Plo" scheme.
10942 + echo "#dummy" > "$depfile"
10944 + rm -f "$tmpdepfile"
10948 + # The C for AIX Compiler uses -M and outputs the dependencies
10949 + # in a .u file. This file always lives in the current directory.
10950 + # Also, the AIX compiler puts `$object:' at the start of each line;
10951 + # $object doesn't have directory information.
10952 + stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
10953 + tmpdepfile="$stripped.u"
10954 + outname="$stripped.o"
10955 + if test "$libtool" = yes; then
10962 + if test $stat -eq 0; then :
10964 + rm -f "$tmpdepfile"
10968 + if test -f "$tmpdepfile"; then
10969 + # Each line is of the form `foo.o: dependent.h'.
10970 + # Do two passes, one to just change these to
10971 + # `$object: dependent.h' and one to simply `dependent.h:'.
10972 + sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
10973 + sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
10975 + # The sourcefile does not contain any dependencies, so just
10976 + # store a dummy comment line, to avoid errors with the Makefile
10977 + # "include basename.Plo" scheme.
10978 + echo "#dummy" > "$depfile"
10980 + rm -f "$tmpdepfile"
10984 + # The Tru64 compiler uses -MD to generate dependencies as a side
10985 + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
10986 + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
10987 + # dependencies in `foo.d' instead, so we check for that too.
10988 + # Subdirectories are respected.
10989 + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
10990 + test "x$dir" = "x$object" && dir=
10991 + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
10993 + if test "$libtool" = yes; then
10994 + tmpdepfile1="$dir.libs/$base.lo.d"
10995 + tmpdepfile2="$dir.libs/$base.d"
10998 + tmpdepfile1="$dir$base.o.d"
10999 + tmpdepfile2="$dir$base.d"
11004 + if test $stat -eq 0; then :
11006 + rm -f "$tmpdepfile1" "$tmpdepfile2"
11010 + if test -f "$tmpdepfile1"; then
11011 + tmpdepfile="$tmpdepfile1"
11013 + tmpdepfile="$tmpdepfile2"
11015 + if test -f "$tmpdepfile"; then
11016 + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
11017 + # That's a space and a tab in the [].
11018 + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
11020 + echo "#dummy" > "$depfile"
11022 + rm -f "$tmpdepfile"
11026 + # This comment above is used by automake to tell side-effect
11027 + # dependency tracking mechanisms from slower ones.
11030 + # Important note: in order to support this mode, a compiler *must*
11031 + # always write the proprocessed file to stdout, regardless of -o.
11034 + # Remove the call to Libtool.
11035 + if test "$libtool" = yes; then
11036 + while test $1 != '--mode=compile'; do
11042 + # Remove `-o $object'. We will use -o /dev/null later,
11043 + # however we can't do the remplacement now because
11044 + # `-o $object' might simply not be used
11056 + set fnord "$@" "$arg"
11063 + test -z "$dashmflag" && dashmflag=-M
11064 + "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
11066 + cat < "$tmpdepfile" > "$depfile"
11068 +' < "$tmpdepfile" | \
11069 +## Some versions of the HPUX 10.20 sed can't process this invocation
11070 +## correctly. Breaking it into two sed invocations is a workaround.
11071 + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
11072 + rm -f "$tmpdepfile"
11076 + # This case only exists to satisfy depend.m4. It is never actually
11077 + # run, as this mode is specially recognized in the preamble.
11086 + for arg in "$@"; do
11094 + set fnord "$@" "$arg"; shift ;;
11098 + set fnord "$@" "$arg"; shift ;;
11101 + obj_suffix="`echo $object | sed 's/^.*\././'`"
11102 + touch "$tmpdepfile"
11103 + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
11105 + cat < "$tmpdepfile" > "$depfile"
11106 + sed '1,2d' "$tmpdepfile" | tr ' ' '
11108 +## Some versions of the HPUX 10.20 sed can't process this invocation
11109 +## correctly. Breaking it into two sed invocations is a workaround.
11110 + sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
11111 + rm -f "$tmpdepfile" "$tmpdepfile".bak
11115 + # Important note: in order to support this mode, a compiler *must*
11116 + # always write the proprocessed file to stdout.
11119 + # Remove the call to Libtool.
11120 + if test "$libtool" = yes; then
11121 + while test $1 != '--mode=compile'; do
11127 + # Remove `-o $object'.
11139 + set fnord "$@" "$arg"
11147 + sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
11148 + sed '$ s: \\$::' > "$tmpdepfile"
11150 + echo "$object : \\" > "$depfile"
11151 + cat < "$tmpdepfile" >> "$depfile"
11152 + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
11153 + rm -f "$tmpdepfile"
11157 + # Important note: in order to support this mode, a compiler *must*
11158 + # always write the proprocessed file to stdout, regardless of -o,
11159 + # because we must use -o when running libtool.
11165 + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
11171 + set fnord "$@" "$arg"
11178 + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
11180 + echo "$object : \\" > "$depfile"
11181 + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
11182 + echo " " >> "$depfile"
11183 + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
11184 + rm -f "$tmpdepfile"
11192 + echo "Unknown depmode $depmode" 1>&2
11198 diff -urN dillo-0.6.6/doc/IO.txt dillo2-0.6.6/doc/IO.txt
11199 --- dillo-0.6.6/doc/IO.txt 2001-07-01 19:06:25.000000000 -0600
11200 +++ dillo2-0.6.6/doc/IO.txt 2003-04-21 12:35:26.000000000 -0600
11201 @@ -338,6 +338,7 @@
11202 better understood by examining the request structure:
11205 + gint Key; /* Primary Key (for klist) */
11206 gint Op; /* IORead | IOWrite | IOWrites */
11207 gint FD; /* Current File Descriptor */
11208 glong Status; /* Number of bytes read, or -errno code */
11209 diff -urN dillo-0.6.6/doc/Makefile dillo2-0.6.6/doc/Makefile
11210 --- dillo-0.6.6/doc/Makefile 2002-05-29 15:03:42.000000000 -0600
11211 +++ dillo2-0.6.6/doc/Makefile 2003-04-21 14:27:05.000000000 -0600
11213 -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
11214 +# Makefile.in generated by automake 1.6.3 from Makefile.am.
11215 +# doc/Makefile. Generated from Makefile.in by configure.
11217 -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
11218 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
11219 +# Free Software Foundation, Inc.
11220 # This Makefile.in is free software; the Free Software Foundation
11221 # gives unlimited permission to copy and/or distribute it,
11222 # with or without modifications, as long as this notice is preserved.
11227 -prefix = /usr/local
11229 exec_prefix = ${prefix}
11231 bindir = ${exec_prefix}/bin
11232 @@ -31,149 +33,184 @@
11233 mandir = ${prefix}/man
11234 includedir = ${prefix}/include
11235 oldincludedir = /usr/include
11239 pkgdatadir = $(datadir)/dillo
11240 pkglibdir = $(libdir)/dillo
11241 pkgincludedir = $(includedir)/dillo
11246 +ACLOCAL = aclocal-1.6
11247 AUTOCONF = autoconf
11248 -AUTOMAKE = automake
11249 +AUTOMAKE = automake-1.6
11250 AUTOHEADER = autoheader
11252 -INSTALL = /usr/bin/ginstall -c
11253 -INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
11254 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
11255 +INSTALL = /usr/bin/install -c
11256 +INSTALL_PROGRAM = ${INSTALL}
11257 INSTALL_DATA = ${INSTALL} -m 644
11258 +install_sh_DATA = $(install_sh) -c -m 644
11259 +install_sh_PROGRAM = $(install_sh) -c
11260 +install_sh_SCRIPT = $(install_sh) -c
11261 INSTALL_SCRIPT = ${INSTALL}
11262 +INSTALL_HEADER = $(INSTALL_DATA)
11268 NORMAL_UNINSTALL = :
11274 +PATH_SEPARATOR = :
11278 -GTK_CFLAGS = -I/opt/gnome/include/gtk-1.2 -I/opt/gnome/include/glib-1.2 -I/opt/gnome/lib/glib/include -I/usr/X11R6/include
11279 -GTK_CONFIG = /opt/gnome/bin/gtk-config
11280 -GTK_LIBS = -L/opt/gnome/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXext -lX11 -lm
11282 +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
11283 LIBJPEG_LIB = -ljpeg
11284 -MAKEINFO = makeinfo
11286 +PKG_CONFIG = /usr/bin/pkg-config
11290 -datadir = ${prefix}/share
11293 -EXTRA_DIST = Cache.txt Cookies.txt Dillo.txt Dw.txt DwImage.txt DwPage.txt DwStyle.txt DwTable.txt DwWidget.txt HtmlParser.txt IO.txt Images.txt Makefile Makefile.am Makefile.in NC_design.txt README
11294 +am__include = include
11296 +install_sh = /home/pb/dillo2/install-sh
11315 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
11316 -CONFIG_HEADER = ../config.h
11317 -CONFIG_CLEAN_FILES =
11318 -DIST_COMMON = README Makefile.am Makefile.in
11319 +CONFIG_HEADER = $(top_builddir)/config.h
11320 +CONFIG_CLEAN_FILES =
11322 +DIST_COMMON = README Makefile.am Makefile.in
11326 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
11332 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
11333 - cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile
11335 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
11336 - cd $(top_builddir) \
11337 - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
11339 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
11340 + cd $(top_srcdir) && \
11341 + $(AUTOMAKE) --gnu doc/Makefile
11342 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
11343 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
11344 +uninstall-info-am:
11348 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
11350 -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
11354 +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
11356 distdir: $(DISTFILES)
11357 - here=`cd $(top_builddir) && pwd`; \
11358 - top_distdir=`cd $(top_distdir) && pwd`; \
11359 - distdir=`cd $(distdir) && pwd`; \
11360 - cd $(top_srcdir) \
11361 - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile
11362 - @for file in $(DISTFILES); do \
11364 + @list='$(DISTFILES)'; for file in $$list; do \
11365 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
11366 + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
11367 + if test "$$dir" != "$$file" && test "$$dir" != "."; then \
11369 + $(mkinstalldirs) "$(distdir)$$dir"; \
11373 if test -d $$d/$$file; then \
11374 - cp -pr $$d/$$file $(distdir)/$$file; \
11375 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
11376 + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
11378 + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
11380 test -f $(distdir)/$$file \
11381 - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
11382 - || cp -p $$d/$$file $(distdir)/$$file || :; \
11383 + || cp -p $$d/$$file $(distdir)/$$file \
11394 -installcheck: installcheck-am
11396 -install-exec: install-exec-am
11400 -install-data: install-data-am
11403 -install-am: all-am
11404 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
11405 install: install-am
11407 +install-exec: install-exec-am
11408 +install-data: install-data-am
11409 uninstall: uninstall-am
11411 -all-redirect: all-am
11413 - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
11416 +install-am: all-am
11417 + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
11419 +installcheck: installcheck-am
11421 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
11422 + INSTALL_STRIP_FLAG=-s \
11423 + `test -z '$(STRIP)' || \
11424 + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
11425 mostlyclean-generic:
11430 -rm -f Makefile $(CONFIG_CLEAN_FILES)
11431 - -rm -f config.cache config.log stamp-h stamp-h[0-9]*
11433 maintainer-clean-generic:
11434 -mostlyclean-am: mostlyclean-generic
11435 + @echo "This command is intended for maintainers to use"
11436 + @echo "it deletes files that may require special tools to rebuild."
11439 -mostlyclean: mostlyclean-am
11440 +clean-am: clean-generic mostlyclean-am
11442 -clean-am: clean-generic mostlyclean-am
11443 +distclean: distclean-am
11446 +distclean-am: clean-am distclean-generic
11448 -distclean-am: distclean-generic clean-am
11451 -distclean: distclean-am
11454 -maintainer-clean-am: maintainer-clean-generic distclean-am
11455 - @echo "This command is intended for maintainers to use;"
11456 - @echo "it deletes files that may require special tools to rebuild."
11465 +install-info: install-info-am
11471 maintainer-clean: maintainer-clean-am
11473 -.PHONY: tags distdir info-am info dvi-am dvi check check-am \
11474 -installcheck-am installcheck install-exec-am install-exec \
11475 -install-data-am install-data install-am install uninstall-am uninstall \
11476 -all-redirect all-am all installdirs mostlyclean-generic \
11477 -distclean-generic clean-generic maintainer-clean-generic clean \
11478 -mostlyclean distclean maintainer-clean
11479 +maintainer-clean-am: distclean-am maintainer-clean-generic
11481 +mostlyclean: mostlyclean-am
11483 +mostlyclean-am: mostlyclean-generic
11485 +uninstall-am: uninstall-info-am
11487 +.PHONY: all all-am check check-am clean clean-generic distclean \
11488 + distclean-generic distdir dvi dvi-am info info-am install \
11489 + install-am install-data install-data-am install-exec \
11490 + install-exec-am install-info install-info-am install-man \
11491 + install-strip installcheck installcheck-am installdirs \
11492 + maintainer-clean maintainer-clean-generic mostlyclean \
11493 + mostlyclean-generic uninstall uninstall-am uninstall-info-am
11495 # Tell versions [3.59,3.63) of GNU make to not export all variables.
11496 # Otherwise a system limit (for SysV at least) may be exceeded.
11497 diff -urN dillo-0.6.6/doc/Makefile.am dillo2-0.6.6/doc/Makefile.am
11498 --- dillo-0.6.6/doc/Makefile.am 2002-05-27 15:27:46.000000000 -0600
11499 +++ dillo2-0.6.6/doc/Makefile.am 2003-04-21 12:35:27.000000000 -0600
11509 diff -urN dillo-0.6.6/doc/Makefile.in dillo2-0.6.6/doc/Makefile.in
11510 --- dillo-0.6.6/doc/Makefile.in 2002-05-29 15:03:04.000000000 -0600
11511 +++ dillo2-0.6.6/doc/Makefile.in 2003-04-21 12:35:27.000000000 -0600
11513 -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
11514 +# Makefile.in generated by automake 1.6.3 from Makefile.am.
11515 +# @configure_input@
11517 -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
11518 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
11519 +# Free Software Foundation, Inc.
11520 # This Makefile.in is free software; the Free Software Foundation
11521 # gives unlimited permission to copy and/or distribute it,
11522 # with or without modifications, as long as this notice is preserved.
11524 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
11525 # PARTICULAR PURPOSE.
11534 includedir = @includedir@
11535 oldincludedir = /usr/include
11539 pkgdatadir = $(datadir)/@PACKAGE@
11540 pkglibdir = $(libdir)/@PACKAGE@
11541 pkgincludedir = $(includedir)/@PACKAGE@
11545 ACLOCAL = @ACLOCAL@
11546 @@ -45,135 +43,174 @@
11547 AUTOMAKE = @AUTOMAKE@
11548 AUTOHEADER = @AUTOHEADER@
11550 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
11551 INSTALL = @INSTALL@
11552 -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
11553 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
11554 INSTALL_DATA = @INSTALL_DATA@
11555 +install_sh_DATA = $(install_sh) -c -m 644
11556 +install_sh_PROGRAM = $(install_sh) -c
11557 +install_sh_SCRIPT = $(install_sh) -c
11558 INSTALL_SCRIPT = @INSTALL_SCRIPT@
11559 +INSTALL_HEADER = $(INSTALL_DATA)
11560 transform = @program_transform_name@
11565 NORMAL_UNINSTALL = :
11571 +PATH_SEPARATOR = @PATH_SEPARATOR@
11575 -GTK_CFLAGS = @GTK_CFLAGS@
11576 -GTK_CONFIG = @GTK_CONFIG@
11577 -GTK_LIBS = @GTK_LIBS@
11579 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
11580 LIBJPEG_LIB = @LIBJPEG_LIB@
11581 -MAKEINFO = @MAKEINFO@
11582 PACKAGE = @PACKAGE@
11583 +PKG_CONFIG = @PKG_CONFIG@
11586 VERSION = @VERSION@
11587 -datadir = @datadir@
11588 +am__include = @am__include@
11589 +am__quote = @am__quote@
11590 +install_sh = @install_sh@
11608 -EXTRA_DIST = Cache.txt Cookies.txt Dillo.txt Dw.txt DwImage.txt DwPage.txt DwStyle.txt DwTable.txt DwWidget.txt HtmlParser.txt IO.txt Images.txt Makefile Makefile.am Makefile.in NC_design.txt README
11611 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
11612 -CONFIG_HEADER = ../config.h
11613 -CONFIG_CLEAN_FILES =
11614 -DIST_COMMON = README Makefile.am Makefile.in
11616 +CONFIG_HEADER = $(top_builddir)/config.h
11617 +CONFIG_CLEAN_FILES =
11619 +DIST_COMMON = README Makefile.am Makefile.in
11622 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
11628 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
11629 - cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile
11631 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
11632 - cd $(top_builddir) \
11633 - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
11635 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
11636 + cd $(top_srcdir) && \
11637 + $(AUTOMAKE) --gnu doc/Makefile
11638 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
11639 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
11640 +uninstall-info-am:
11644 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
11646 -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
11650 +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
11652 distdir: $(DISTFILES)
11653 - here=`cd $(top_builddir) && pwd`; \
11654 - top_distdir=`cd $(top_distdir) && pwd`; \
11655 - distdir=`cd $(distdir) && pwd`; \
11656 - cd $(top_srcdir) \
11657 - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile
11658 - @for file in $(DISTFILES); do \
11660 + @list='$(DISTFILES)'; for file in $$list; do \
11661 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
11662 + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
11663 + if test "$$dir" != "$$file" && test "$$dir" != "."; then \
11665 + $(mkinstalldirs) "$(distdir)$$dir"; \
11669 if test -d $$d/$$file; then \
11670 - cp -pr $$d/$$file $(distdir)/$$file; \
11671 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
11672 + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
11674 + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
11676 test -f $(distdir)/$$file \
11677 - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
11678 - || cp -p $$d/$$file $(distdir)/$$file || :; \
11679 + || cp -p $$d/$$file $(distdir)/$$file \
11690 -installcheck: installcheck-am
11692 -install-exec: install-exec-am
11696 -install-data: install-data-am
11699 -install-am: all-am
11700 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
11701 install: install-am
11703 +install-exec: install-exec-am
11704 +install-data: install-data-am
11705 uninstall: uninstall-am
11707 -all-redirect: all-am
11709 - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
11712 +install-am: all-am
11713 + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
11715 +installcheck: installcheck-am
11717 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
11718 + INSTALL_STRIP_FLAG=-s \
11719 + `test -z '$(STRIP)' || \
11720 + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
11721 mostlyclean-generic:
11726 -rm -f Makefile $(CONFIG_CLEAN_FILES)
11727 - -rm -f config.cache config.log stamp-h stamp-h[0-9]*
11729 maintainer-clean-generic:
11730 -mostlyclean-am: mostlyclean-generic
11731 + @echo "This command is intended for maintainers to use"
11732 + @echo "it deletes files that may require special tools to rebuild."
11735 -mostlyclean: mostlyclean-am
11736 +clean-am: clean-generic mostlyclean-am
11738 -clean-am: clean-generic mostlyclean-am
11739 +distclean: distclean-am
11742 +distclean-am: clean-am distclean-generic
11744 -distclean-am: distclean-generic clean-am
11747 -distclean: distclean-am
11750 -maintainer-clean-am: maintainer-clean-generic distclean-am
11751 - @echo "This command is intended for maintainers to use;"
11752 - @echo "it deletes files that may require special tools to rebuild."
11761 +install-info: install-info-am
11767 maintainer-clean: maintainer-clean-am
11769 -.PHONY: tags distdir info-am info dvi-am dvi check check-am \
11770 -installcheck-am installcheck install-exec-am install-exec \
11771 -install-data-am install-data install-am install uninstall-am uninstall \
11772 -all-redirect all-am all installdirs mostlyclean-generic \
11773 -distclean-generic clean-generic maintainer-clean-generic clean \
11774 -mostlyclean distclean maintainer-clean
11775 +maintainer-clean-am: distclean-am maintainer-clean-generic
11777 +mostlyclean: mostlyclean-am
11779 +mostlyclean-am: mostlyclean-generic
11781 +uninstall-am: uninstall-info-am
11783 +.PHONY: all all-am check check-am clean clean-generic distclean \
11784 + distclean-generic distdir dvi dvi-am info info-am install \
11785 + install-am install-data install-data-am install-exec \
11786 + install-exec-am install-info install-info-am install-man \
11787 + install-strip installcheck installcheck-am installdirs \
11788 + maintainer-clean maintainer-clean-generic mostlyclean \
11789 + mostlyclean-generic uninstall uninstall-am uninstall-info-am
11791 # Tell versions [3.59,3.63) of GNU make to not export all variables.
11792 # Otherwise a system limit (for SysV at least) may be exceeded.
11793 diff -urN dillo-0.6.6/mkinstalldirs dillo2-0.6.6/mkinstalldirs
11794 --- dillo-0.6.6/mkinstalldirs 2000-08-29 20:43:34.000000000 -0600
11795 +++ dillo2-0.6.6/mkinstalldirs 2003-04-21 12:35:08.000000000 -0600
11797 # Created: 1993-05-16
11800 -# $Id: mkinstalldirs,v 1.8 2000/08/30 02:43:34 jcid Exp $
11801 +# $Id: mkinstalldirs,v 1.1.1.1 2003/04/21 18:35:08 pb Exp $
11805 diff -urN dillo-0.6.6/src/IO/IO.c dillo2-0.6.6/src/IO/IO.c
11806 --- dillo-0.6.6/src/IO/IO.c 2002-04-25 08:32:05.000000000 -0600
11807 +++ dillo2-0.6.6/src/IO/IO.c 2003-04-21 12:36:30.000000000 -0600
11809 #include "../klist.h"
11812 -//#define DEBUG_LEVEL 3
11813 +#define DEBUG_LEVEL 4
11814 #include "../debug.h"
11818 g_return_if_fail(IO_get(io->Key) == NULL);
11820 if (io->Flags & IOFlag_FreeIOVec)
11821 - g_free(io->IOVec.iov_base);
11822 + g_free(io->IOVecStart);
11826 @@ -172,9 +172,7 @@
11829 * Write data, from a specific buffer, into a file descriptor
11830 - * (** Write operations MUST NOT free the buffer because the buffer
11831 - * start is modified.)
11832 - * todo: Implement IOWrites, remove the constraint stated above.
11833 + * todo: Implement IOWrites.
11835 static gboolean IO_write(IOData_t *io)
11837 @@ -193,13 +191,15 @@
11838 io->Status = -errno;
11839 if (errno == EINTR)
11841 - else if (errno == EAGAIN)
11842 - ret = TRUE; /* todo: ??? */
11844 + else if (errno == EAGAIN) {
11845 + DEBUG_MSG(4, " IO_write: EAGAIN\n");
11848 } else if ( St < io->IOVec.iov_len ){
11849 /* Not all data written */
11850 io->IOVec.iov_len -= St;
11851 io->IOVec.iov_base = (gchar *)io->IOVec.iov_base + St;
11852 + DEBUG_MSG(4, " IO_write: Changing iov_base (%d)\n", St);
11856 @@ -238,6 +238,9 @@
11858 } else if ( cond & G_IO_OUT ){ /* Write */
11859 while ( IO_write(io) );
11860 + io = IO_get(io_key); /* IO_write may have freed 'io' */
11861 + if (io && io->Status == -EAGAIN)
11862 + ret = TRUE; /* wait for another G_IO_OUT event... */
11865 if ( cond & G_IO_ERR ){ /* Error */
11866 @@ -262,6 +265,9 @@
11868 static void IO_submit(IOData_t *r_io)
11870 + /* Save IOVec's start */
11871 + r_io->IOVecStart = r_io->IOVec.iov_base;
11873 /* Insert this IO in ValidIOs */
11876 @@ -333,7 +339,7 @@
11877 /* Backwards call */
11880 - DEBUG_MSG(3, "IO : OpAbort [-1]\n");
11881 + DEBUG_MSG(4, "IO : OpAbort [-1]\n");
11882 io = Info->LocalKey;
11885 diff -urN dillo-0.6.6/src/IO/IO.h dillo2-0.6.6/src/IO/IO.h
11886 --- dillo-0.6.6/src/IO/IO.h 2002-01-27 06:44:52.000000000 -0700
11887 +++ dillo2-0.6.6/src/IO/IO.h 2003-04-21 12:36:30.000000000 -0600
11888 @@ -34,13 +34,13 @@
11889 gint Key; /* Primary Key (for klist) */
11890 gint Op; /* IORead | IOWrite | IOWrites */
11891 gint FD; /* Current File Descriptor */
11892 + gint Flags; /* Flag array (look definitions above) */
11893 glong Status; /* Number of bytes read, or -errno code */
11894 struct iovec IOVec; /* Buffer place and length */
11895 - gint Flags; /* Flag array (look definitions above) */
11896 + void *IOVecStart; /* PRIVATE: only used inside IO.c! */
11897 void *ExtData; /* External data reference (not used by IO.c) */
11898 void *Info; /* CCC Info structure for this IO */
11899 GIOChannel *GioCh; /* IO channel */
11900 - gint GdkTag; /* gdk_input tag (used to remove) */
11904 diff -urN dillo-0.6.6/src/IO/Makefile dillo2-0.6.6/src/IO/Makefile
11905 --- dillo-0.6.6/src/IO/Makefile 1969-12-31 17:00:00.000000000 -0700
11906 +++ dillo2-0.6.6/src/IO/Makefile 2003-04-21 14:27:11.000000000 -0600
11908 +# Makefile.in generated by automake 1.6.3 from Makefile.am.
11909 +# src/IO/Makefile. Generated from Makefile.in by configure.
11911 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
11912 +# Free Software Foundation, Inc.
11913 +# This Makefile.in is free software; the Free Software Foundation
11914 +# gives unlimited permission to copy and/or distribute it,
11915 +# with or without modifications, as long as this notice is preserved.
11917 +# This program is distributed in the hope that it will be useful,
11918 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
11919 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
11920 +# PARTICULAR PURPOSE.
11926 +top_srcdir = ../..
11929 +exec_prefix = ${prefix}
11931 +bindir = ${exec_prefix}/bin
11932 +sbindir = ${exec_prefix}/sbin
11933 +libexecdir = ${exec_prefix}/libexec
11934 +datadir = ${prefix}/share
11935 +sysconfdir = ${prefix}/etc
11936 +sharedstatedir = ${prefix}/com
11937 +localstatedir = ${prefix}/var
11938 +libdir = ${exec_prefix}/lib
11939 +infodir = ${prefix}/info
11940 +mandir = ${prefix}/man
11941 +includedir = ${prefix}/include
11942 +oldincludedir = /usr/include
11943 +pkgdatadir = $(datadir)/dillo
11944 +pkglibdir = $(libdir)/dillo
11945 +pkgincludedir = $(includedir)/dillo
11946 +top_builddir = ../..
11948 +ACLOCAL = aclocal-1.6
11949 +AUTOCONF = autoconf
11950 +AUTOMAKE = automake-1.6
11951 +AUTOHEADER = autoheader
11953 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
11954 +INSTALL = /usr/bin/install -c
11955 +INSTALL_PROGRAM = ${INSTALL}
11956 +INSTALL_DATA = ${INSTALL} -m 644
11957 +install_sh_DATA = $(install_sh) -c -m 644
11958 +install_sh_PROGRAM = $(install_sh) -c
11959 +install_sh_SCRIPT = $(install_sh) -c
11960 +INSTALL_SCRIPT = ${INSTALL}
11961 +INSTALL_HEADER = $(INSTALL_DATA)
11962 +transform = s,x,x,
11963 +NORMAL_INSTALL = :
11966 +NORMAL_UNINSTALL = :
11968 +POST_UNINSTALL = :
11972 +PATH_SEPARATOR = :
11977 +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
11978 +LIBJPEG_LIB = -ljpeg
11980 +PKG_CONFIG = /usr/bin/pkg-config
11984 +am__include = include
11986 +install_sh = /home/pb/dillo2/install-sh
11988 +noinst_LIBRARIES = libDio.a
11990 +libDio_a_SOURCES = \
12003 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
12004 +CONFIG_HEADER = $(top_builddir)/config.h
12005 +CONFIG_CLEAN_FILES =
12006 +LIBRARIES = $(noinst_LIBRARIES)
12008 +libDio_a_AR = $(AR) cru
12010 +am_libDio_a_OBJECTS = mime.$(OBJEXT) about.$(OBJEXT) Url.$(OBJEXT) \
12011 + proto.$(OBJEXT) file.$(OBJEXT) http.$(OBJEXT) IO.$(OBJEXT)
12012 +libDio_a_OBJECTS = $(am_libDio_a_OBJECTS)
12014 +DEFS = -DHAVE_CONFIG_H
12015 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
12016 +CPPFLAGS = -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
12017 +LDFLAGS = -L/usr/local/lib -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
12018 +LIBS = -lpng -lz -lpthread
12019 +depcomp = $(SHELL) $(top_srcdir)/depcomp
12020 +am__depfiles_maybe = depfiles
12021 +DEP_FILES = ./$(DEPDIR)/IO.Po ./$(DEPDIR)/Url.Po \
12022 + ./$(DEPDIR)/about.Po ./$(DEPDIR)/file.Po \
12023 + ./$(DEPDIR)/http.Po ./$(DEPDIR)/mime.Po \
12024 + ./$(DEPDIR)/proto.Po
12025 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
12026 + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
12028 +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
12029 +CFLAGS = -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -DENABLE_IPV6
12030 +DIST_SOURCES = $(libDio_a_SOURCES)
12031 +DIST_COMMON = Makefile.am Makefile.in
12032 +SOURCES = $(libDio_a_SOURCES)
12037 +.SUFFIXES: .c .o .obj
12038 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
12039 + cd $(top_srcdir) && \
12040 + $(AUTOMAKE) --gnu src/IO/Makefile
12041 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
12042 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
12046 +clean-noinstLIBRARIES:
12047 + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
12048 +libDio.a: $(libDio_a_OBJECTS) $(libDio_a_DEPENDENCIES)
12050 + $(libDio_a_AR) libDio.a $(libDio_a_OBJECTS) $(libDio_a_LIBADD)
12051 + $(RANLIB) libDio.a
12053 +mostlyclean-compile:
12054 + -rm -f *.$(OBJEXT) core *.core
12056 +distclean-compile:
12059 +include ./$(DEPDIR)/IO.Po
12060 +include ./$(DEPDIR)/Url.Po
12061 +include ./$(DEPDIR)/about.Po
12062 +include ./$(DEPDIR)/file.Po
12063 +include ./$(DEPDIR)/http.Po
12064 +include ./$(DEPDIR)/mime.Po
12065 +include ./$(DEPDIR)/proto.Po
12068 + -rm -rf ./$(DEPDIR)
12071 + source='$<' object='$@' libtool=no \
12072 + depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
12073 + $(CCDEPMODE) $(depcomp) \
12074 + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
12077 + source='$<' object='$@' libtool=no \
12078 + depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
12079 + $(CCDEPMODE) $(depcomp) \
12080 + $(COMPILE) -c `cygpath -w $<`
12081 +CCDEPMODE = depmode=gcc3
12082 +uninstall-info-am:
12089 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
12090 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
12091 + unique=`for i in $$list; do \
12092 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
12094 + $(AWK) ' { files[$$0] = 1; } \
12095 + END { for (i in files) print i; }'`; \
12096 + mkid -fID $$unique
12098 +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
12099 + $(TAGS_FILES) $(LISP)
12102 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
12103 + unique=`for i in $$list; do \
12104 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
12106 + $(AWK) ' { files[$$0] = 1; } \
12107 + END { for (i in files) print i; }'`; \
12108 + test -z "$(ETAGS_ARGS)$$tags$$unique" \
12109 + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
12113 + here=`$(am__cd) $(top_builddir) && pwd` \
12114 + && cd $(top_srcdir) \
12115 + && gtags -i $(GTAGS_ARGS) $$here
12118 + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
12119 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
12121 +top_distdir = ../..
12122 +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
12124 +distdir: $(DISTFILES)
12125 + @list='$(DISTFILES)'; for file in $$list; do \
12126 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
12127 + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
12128 + if test "$$dir" != "$$file" && test "$$dir" != "."; then \
12130 + $(mkinstalldirs) "$(distdir)$$dir"; \
12134 + if test -d $$d/$$file; then \
12135 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
12136 + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
12138 + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
12140 + test -f $(distdir)/$$file \
12141 + || cp -p $$d/$$file $(distdir)/$$file \
12147 +all-am: Makefile $(LIBRARIES)
12151 +install: install-am
12152 +install-exec: install-exec-am
12153 +install-data: install-data-am
12154 +uninstall: uninstall-am
12156 +install-am: all-am
12157 + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
12159 +installcheck: installcheck-am
12161 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
12162 + INSTALL_STRIP_FLAG=-s \
12163 + `test -z '$(STRIP)' || \
12164 + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
12165 +mostlyclean-generic:
12169 +distclean-generic:
12170 + -rm -f Makefile $(CONFIG_CLEAN_FILES)
12172 +maintainer-clean-generic:
12173 + @echo "This command is intended for maintainers to use"
12174 + @echo "it deletes files that may require special tools to rebuild."
12177 +clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
12179 +distclean: distclean-am
12181 +distclean-am: clean-am distclean-compile distclean-depend \
12182 + distclean-generic distclean-tags
12196 +install-info: install-info-am
12202 +maintainer-clean: maintainer-clean-am
12204 +maintainer-clean-am: distclean-am maintainer-clean-generic
12206 +mostlyclean: mostlyclean-am
12208 +mostlyclean-am: mostlyclean-compile mostlyclean-generic
12210 +uninstall-am: uninstall-info-am
12212 +.PHONY: GTAGS all all-am check check-am clean clean-generic \
12213 + clean-noinstLIBRARIES distclean distclean-compile \
12214 + distclean-depend distclean-generic distclean-tags distdir dvi \
12215 + dvi-am info info-am install install-am install-data \
12216 + install-data-am install-exec install-exec-am install-info \
12217 + install-info-am install-man install-strip installcheck \
12218 + installcheck-am installdirs maintainer-clean \
12219 + maintainer-clean-generic mostlyclean mostlyclean-compile \
12220 + mostlyclean-generic tags uninstall uninstall-am \
12221 + uninstall-info-am
12223 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
12224 +# Otherwise a system limit (for SysV at least) may be exceeded.
12226 diff -urN dillo-0.6.6/src/IO/Makefile.in dillo2-0.6.6/src/IO/Makefile.in
12227 --- dillo-0.6.6/src/IO/Makefile.in 2002-05-29 15:03:02.000000000 -0600
12228 +++ dillo2-0.6.6/src/IO/Makefile.in 2003-04-21 12:36:31.000000000 -0600
12230 -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
12231 +# Makefile.in generated by automake 1.6.3 from Makefile.am.
12232 +# @configure_input@
12234 -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
12235 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
12236 +# Free Software Foundation, Inc.
12237 # This Makefile.in is free software; the Free Software Foundation
12238 # gives unlimited permission to copy and/or distribute it,
12239 # with or without modifications, as long as this notice is preserved.
12241 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12242 # PARTICULAR PURPOSE.
12251 includedir = @includedir@
12252 oldincludedir = /usr/include
12256 pkgdatadir = $(datadir)/@PACKAGE@
12257 pkglibdir = $(libdir)/@PACKAGE@
12258 pkgincludedir = $(includedir)/@PACKAGE@
12260 top_builddir = ../..
12262 ACLOCAL = @ACLOCAL@
12263 @@ -45,257 +43,275 @@
12264 AUTOMAKE = @AUTOMAKE@
12265 AUTOHEADER = @AUTOHEADER@
12267 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
12268 INSTALL = @INSTALL@
12269 -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
12270 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
12271 INSTALL_DATA = @INSTALL_DATA@
12272 +install_sh_DATA = $(install_sh) -c -m 644
12273 +install_sh_PROGRAM = $(install_sh) -c
12274 +install_sh_SCRIPT = $(install_sh) -c
12275 INSTALL_SCRIPT = @INSTALL_SCRIPT@
12276 +INSTALL_HEADER = $(INSTALL_DATA)
12277 transform = @program_transform_name@
12282 NORMAL_UNINSTALL = :
12288 +PATH_SEPARATOR = @PATH_SEPARATOR@
12292 -GTK_CFLAGS = @GTK_CFLAGS@
12293 -GTK_CONFIG = @GTK_CONFIG@
12294 -GTK_LIBS = @GTK_LIBS@
12296 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
12297 LIBJPEG_LIB = @LIBJPEG_LIB@
12298 -MAKEINFO = @MAKEINFO@
12299 PACKAGE = @PACKAGE@
12300 +PKG_CONFIG = @PKG_CONFIG@
12303 VERSION = @VERSION@
12304 -datadir = @datadir@
12305 +am__include = @am__include@
12306 +am__quote = @am__quote@
12307 +install_sh = @install_sh@
12310 noinst_LIBRARIES = libDio.a
12312 -libDio_a_SOURCES = mime.c mime.h about.c Url.c Url.h proto.c file.c http.c IO.c IO.h
12313 +libDio_a_SOURCES = \
12326 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
12327 -CONFIG_HEADER = ../../config.h
12328 -CONFIG_CLEAN_FILES =
12329 -LIBRARIES = $(noinst_LIBRARIES)
12330 +CONFIG_HEADER = $(top_builddir)/config.h
12331 +CONFIG_CLEAN_FILES =
12332 +LIBRARIES = $(noinst_LIBRARIES)
12334 +libDio_a_AR = $(AR) cru
12336 +am_libDio_a_OBJECTS = mime.$(OBJEXT) about.$(OBJEXT) Url.$(OBJEXT) \
12337 + proto.$(OBJEXT) file.$(OBJEXT) http.$(OBJEXT) IO.$(OBJEXT)
12338 +libDio_a_OBJECTS = $(am_libDio_a_OBJECTS)
12341 -DEFS = @DEFS@ -I. -I$(srcdir) -I../..
12343 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
12344 CPPFLAGS = @CPPFLAGS@
12345 LDFLAGS = @LDFLAGS@
12348 -libDio_a_OBJECTS = mime.o about.o Url.o proto.o file.o http.o IO.o
12351 -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
12352 +depcomp = $(SHELL) $(top_srcdir)/depcomp
12353 +am__depfiles_maybe = depfiles
12354 +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/IO.Po ./$(DEPDIR)/Url.Po \
12355 +@AMDEP_TRUE@ ./$(DEPDIR)/about.Po ./$(DEPDIR)/file.Po \
12356 +@AMDEP_TRUE@ ./$(DEPDIR)/http.Po ./$(DEPDIR)/mime.Po \
12357 +@AMDEP_TRUE@ ./$(DEPDIR)/proto.Po
12358 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
12359 + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
12361 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
12362 -DIST_COMMON = Makefile.am Makefile.in
12365 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
12369 -DEP_FILES = .deps/IO.P .deps/Url.P .deps/about.P .deps/file.P \
12370 -.deps/http.P .deps/mime.P .deps/proto.P
12371 +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
12373 +DIST_SOURCES = $(libDio_a_SOURCES)
12374 +DIST_COMMON = Makefile.am Makefile.in
12375 SOURCES = $(libDio_a_SOURCES)
12376 -OBJECTS = $(libDio_a_OBJECTS)
12380 -.SUFFIXES: .S .c .o .s
12381 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
12382 - cd $(top_srcdir) && $(AUTOMAKE) --gnu src/IO/Makefile
12384 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
12385 - cd $(top_builddir) \
12386 - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
12390 +.SUFFIXES: .c .o .obj
12391 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
12392 + cd $(top_srcdir) && \
12393 + $(AUTOMAKE) --gnu src/IO/Makefile
12394 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
12395 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
12397 -mostlyclean-noinstLIBRARIES:
12400 clean-noinstLIBRARIES:
12401 -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
12403 -distclean-noinstLIBRARIES:
12405 -maintainer-clean-noinstLIBRARIES:
12412 +libDio.a: $(libDio_a_OBJECTS) $(libDio_a_DEPENDENCIES)
12414 + $(libDio_a_AR) libDio.a $(libDio_a_OBJECTS) $(libDio_a_LIBADD)
12415 + $(RANLIB) libDio.a
12417 mostlyclean-compile:
12418 - -rm -f *.o core *.core
12421 + -rm -f *.$(OBJEXT) core *.core
12426 -maintainer-clean-compile:
12427 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IO.Po@am__quote@
12428 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Url.Po@am__quote@
12429 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/about.Po@am__quote@
12430 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Po@am__quote@
12431 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Po@am__quote@
12432 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mime.Po@am__quote@
12433 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proto.Po@am__quote@
12435 -libDio.a: $(libDio_a_OBJECTS) $(libDio_a_DEPENDENCIES)
12437 - $(AR) cru libDio.a $(libDio_a_OBJECTS) $(libDio_a_LIBADD)
12438 - $(RANLIB) libDio.a
12440 + -rm -rf ./$(DEPDIR)
12443 +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
12444 +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
12445 +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
12446 + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
12449 +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
12450 +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
12451 +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
12452 + $(COMPILE) -c `cygpath -w $<`
12453 +CCDEPMODE = @CCDEPMODE@
12454 +uninstall-info-am:
12461 -ID: $(HEADERS) $(SOURCES) $(LISP)
12462 - list='$(SOURCES) $(HEADERS)'; \
12463 - unique=`for i in $$list; do echo $$i; done | \
12464 - awk ' { files[$$0] = 1; } \
12465 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
12466 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
12467 + unique=`for i in $$list; do \
12468 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
12470 + $(AWK) ' { files[$$0] = 1; } \
12471 END { for (i in files) print i; }'`; \
12472 - here=`pwd` && cd $(srcdir) \
12473 - && mkid -f$$here/ID $$unique $(LISP)
12474 + mkid -fID $$unique
12476 -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
12477 +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
12478 + $(TAGS_FILES) $(LISP)
12481 - list='$(SOURCES) $(HEADERS)'; \
12482 - unique=`for i in $$list; do echo $$i; done | \
12483 - awk ' { files[$$0] = 1; } \
12484 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
12485 + unique=`for i in $$list; do \
12486 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
12488 + $(AWK) ' { files[$$0] = 1; } \
12489 END { for (i in files) print i; }'`; \
12490 - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
12491 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
12496 + test -z "$(ETAGS_ARGS)$$tags$$unique" \
12497 + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
12501 + here=`$(am__cd) $(top_builddir) && pwd` \
12502 + && cd $(top_srcdir) \
12503 + && gtags -i $(GTAGS_ARGS) $$here
12508 -maintainer-clean-tags:
12509 + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
12510 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
12512 -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
12515 +top_distdir = ../..
12516 +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
12518 distdir: $(DISTFILES)
12519 - here=`cd $(top_builddir) && pwd`; \
12520 - top_distdir=`cd $(top_distdir) && pwd`; \
12521 - distdir=`cd $(distdir) && pwd`; \
12522 - cd $(top_srcdir) \
12523 - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/IO/Makefile
12524 - @for file in $(DISTFILES); do \
12526 + @list='$(DISTFILES)'; for file in $$list; do \
12527 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
12528 + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
12529 + if test "$$dir" != "$$file" && test "$$dir" != "."; then \
12531 + $(mkinstalldirs) "$(distdir)$$dir"; \
12535 if test -d $$d/$$file; then \
12536 - cp -pr $$d/$$file $(distdir)/$$file; \
12537 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
12538 + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
12540 + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
12542 test -f $(distdir)/$$file \
12543 - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
12544 - || cp -p $$d/$$file $(distdir)/$$file || :; \
12545 + || cp -p $$d/$$file $(distdir)/$$file \
12550 -DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
12552 --include $(DEP_FILES)
12554 -mostlyclean-depend:
12561 -maintainer-clean-depend:
12564 - @echo '$(COMPILE) -c $<'; \
12565 - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
12566 - @-cp .deps/$(*F).pp .deps/$(*F).P; \
12567 - tr ' ' '\012' < .deps/$(*F).pp \
12568 - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
12569 - >> .deps/$(*F).P; \
12570 - rm .deps/$(*F).pp
12573 - @echo '$(LTCOMPILE) -c $<'; \
12574 - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
12575 - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
12576 - < .deps/$(*F).pp > .deps/$(*F).P; \
12577 - tr ' ' '\012' < .deps/$(*F).pp \
12578 - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
12579 - >> .deps/$(*F).P; \
12580 - rm -f .deps/$(*F).pp
12588 -installcheck: installcheck-am
12590 -install-exec: install-exec-am
12591 +all-am: Makefile $(LIBRARIES)
12594 -install-data: install-data-am
12597 -install-am: all-am
12598 - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
12599 install: install-am
12601 +install-exec: install-exec-am
12602 +install-data: install-data-am
12603 uninstall: uninstall-am
12604 -all-am: Makefile $(LIBRARIES)
12605 -all-redirect: all-am
12607 - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
12610 +install-am: all-am
12611 + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
12613 +installcheck: installcheck-am
12615 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
12616 + INSTALL_STRIP_FLAG=-s \
12617 + `test -z '$(STRIP)' || \
12618 + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
12619 mostlyclean-generic:
12624 -rm -f Makefile $(CONFIG_CLEAN_FILES)
12625 - -rm -f config.cache config.log stamp-h stamp-h[0-9]*
12627 maintainer-clean-generic:
12628 -mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
12629 - mostlyclean-tags mostlyclean-depend mostlyclean-generic
12630 + @echo "This command is intended for maintainers to use"
12631 + @echo "it deletes files that may require special tools to rebuild."
12634 -mostlyclean: mostlyclean-am
12635 +clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
12637 -clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
12638 - clean-generic mostlyclean-am
12639 +distclean: distclean-am
12642 +distclean-am: clean-am distclean-compile distclean-depend \
12643 + distclean-generic distclean-tags
12645 -distclean-am: distclean-noinstLIBRARIES distclean-compile \
12646 - distclean-tags distclean-depend distclean-generic \
12650 -distclean: distclean-am
12653 -maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
12654 - maintainer-clean-compile maintainer-clean-tags \
12655 - maintainer-clean-depend maintainer-clean-generic \
12657 - @echo "This command is intended for maintainers to use;"
12658 - @echo "it deletes files that may require special tools to rebuild."
12667 +install-info: install-info-am
12673 maintainer-clean: maintainer-clean-am
12675 -.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
12676 -clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
12677 -mostlyclean-compile distclean-compile clean-compile \
12678 -maintainer-clean-compile tags mostlyclean-tags distclean-tags \
12679 -clean-tags maintainer-clean-tags distdir mostlyclean-depend \
12680 -distclean-depend clean-depend maintainer-clean-depend info-am info \
12681 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
12682 -install-exec install-data-am install-data install-am install \
12683 -uninstall-am uninstall all-redirect all-am all installdirs \
12684 -mostlyclean-generic distclean-generic clean-generic \
12685 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
12686 +maintainer-clean-am: distclean-am maintainer-clean-generic
12688 +mostlyclean: mostlyclean-am
12690 +mostlyclean-am: mostlyclean-compile mostlyclean-generic
12692 +uninstall-am: uninstall-info-am
12694 +.PHONY: GTAGS all all-am check check-am clean clean-generic \
12695 + clean-noinstLIBRARIES distclean distclean-compile \
12696 + distclean-depend distclean-generic distclean-tags distdir dvi \
12697 + dvi-am info info-am install install-am install-data \
12698 + install-data-am install-exec install-exec-am install-info \
12699 + install-info-am install-man install-strip installcheck \
12700 + installcheck-am installdirs maintainer-clean \
12701 + maintainer-clean-generic mostlyclean mostlyclean-compile \
12702 + mostlyclean-generic tags uninstall uninstall-am \
12703 + uninstall-info-am
12705 # Tell versions [3.59,3.63) of GNU make to not export all variables.
12706 # Otherwise a system limit (for SysV at least) may be exceeded.
12707 diff -urN dillo-0.6.6/src/IO/about.c dillo2-0.6.6/src/IO/about.c
12708 --- dillo-0.6.6/src/IO/about.c 2002-05-29 15:38:08.000000000 -0600
12709 +++ dillo2-0.6.6/src/IO/about.c 2003-04-21 12:36:31.000000000 -0600
12710 @@ -51,11 +51,11 @@
12713 <td BGCOLOR=\"#9090F0\">
12714 -<h1><b>Dillo 0.6.6</b></h1>
12715 +<h1><b>Dillo 0.6.7-pre</b></h1>
12718 <h1>Dillo project<br>
12719 - <h3>Version 0.6.6<BR> <EM>(this is alpha code)</EM> </h3></h1>
12720 + <h3>Version 0.6.7-pre<BR> <EM>(this is alpha code)</EM> </h3></h1>
12721 <h4> License: </h4>
12723 This program is free software; you can redistribute it and/or modify
12726 <h4> Release overview: </h4>
12728 - This is a pure bug-fix release. The main fixes were on cookies,
12729 -the others are detailed in the ChangeLog.
12731 </BLOCKQUOTE><BLOCKQUOTE>
12732 Remember that dillo project uses a release model where every new
12733 browser shall be better than the former.
12734 diff -urN dillo-0.6.6/src/IO/http.c dillo2-0.6.6/src/IO/http.c
12735 --- dillo-0.6.6/src/IO/http.c 2002-05-01 07:34:56.000000000 -0600
12736 +++ dillo2-0.6.6/src/IO/http.c 2003-04-21 12:36:33.000000000 -0600
12738 #include <sys/wait.h>
12739 #include <sys/socket.h> /* for lots of socket stuff */
12740 #include <netinet/in.h> /* for ntohl and stuff */
12741 +#include <arpa/inet.h> /* for inet_ntop */
12746 guint port; /* need a separate port in order to support PROXY */
12747 gboolean use_proxy; /* indicates whether to use proxy or not */
12748 DilloWeb *web; /* reference to client's web structure */
12749 - guint32 ip_addr; /* Holds the DNS answer */
12750 + GSList *addr_list; /* Holds the DNS answer */
12751 + GSList *addr_list_iter; /* Points to address currently being used */
12752 GIOChannel *GioCh; /* GIOChannel to monitor the connecting process */
12753 gint Err; /* Holds the errno of the connect() call */
12754 ChainLink *Info; /* Used for CCC asynchronous operations */
12757 static void Http_send_query(ChainLink *Info, SocketData_t *S);
12758 static void Http_expect_answer(SocketData_t *S);
12760 +static int Http_connect_socket(ChainLink *Info);
12764 @@ -209,6 +211,12 @@
12766 if ( cond & G_IO_HUP ) {
12767 DEBUG_MSG(3, "--Connection broken\n");
12768 + g_io_channel_close(S->GioCh);
12769 + if (S->addr_list_iter->next) {
12770 + S->addr_list_iter = S->addr_list_iter->next;
12771 + if (Http_connect_socket(Info) == 0)
12774 BW_MSG(S->web, 0, "ERROR: unable to connect to remote host");
12775 a_Chain_fcb(OpAbort, 1, Info, NULL, NULL);
12776 Http_socket_free(SKey);
12777 @@ -236,17 +244,53 @@
12778 static int Http_connect_socket(ChainLink *Info)
12781 +#ifdef ENABLE_IPV6
12782 + struct sockaddr_storage name;
12784 struct sockaddr_in name;
12789 S = a_Klist_get_data(ValidSocks, GPOINTER_TO_INT(Info->LocalKey));
12791 + dh = S->addr_list_iter->data;
12793 + if ( (S->SockFD = socket(dh->af, SOCK_STREAM, IPPROTO_TCP)) < 0 ) {
12795 + DEBUG_MSG(5, "Http_connect_socket ERROR: %s\n", g_strerror(errno));
12798 + /* set NONBLOCKING */
12799 + fcntl(S->SockFD, F_SETFL, O_NONBLOCK | fcntl(S->SockFD, F_GETFL));
12801 /* Some OSes require this... */
12802 memset(&name, 0, sizeof(name));
12803 /* Set remaining parms. */
12804 - name.sin_family = AF_INET;
12805 - name.sin_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
12806 - name.sin_addr.s_addr = htonl(S->ip_addr);
12807 + switch (dh->af) {
12810 + struct sockaddr_in *sin = (struct sockaddr_in *)&name;
12811 + sin->sin_family = dh->af;
12812 + sin->sin_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
12813 + memcpy(&sin->sin_addr, dh->data, dh->alen);
12814 + DEBUG_MSG(5, "Connecting to %s\n", inet_ntoa(sin->sin_addr));
12817 +#ifdef ENABLE_IPV6
12821 + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&name;
12822 + sin6->sin6_family = dh->af;
12823 + sin6->sin6_port = S->port ? htons(S->port) : htons(DILLO_URL_HTTP_PORT);
12824 + memcpy(&sin6->sin6_addr, dh->data, dh->alen);
12825 + inet_ntop(dh->af, dh->data, buf, sizeof(buf));
12826 + DEBUG_MSG(5, "Connecting to %s\n", buf);
12832 S->GioCh = g_io_channel_unix_new(S->SockFD);
12833 g_io_add_watch(S->GioCh, G_IO_ERR | G_IO_HUP | G_IO_OUT,
12834 @@ -357,13 +401,6 @@
12836 /* Set more socket parameters */
12838 - if ( (S->SockFD = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0 ) {
12840 - DEBUG_MSG(5, "Http_get ERROR: %s\n", g_strerror(errno));
12843 - /* set NONBLOCKING */
12844 - fcntl(S->SockFD, F_SETFL, O_NONBLOCK | fcntl(S->SockFD, F_GETFL));
12846 /* Let the user know what we'll do */
12847 BW_MSG(S->web, 1, "DNS solving %s", URL_HOST_(S->Url));
12848 @@ -402,8 +439,10 @@
12851 /* Successful DNS answer; save the IP */
12853 - S->ip_addr = *(int *)Data;
12855 + S->addr_list = (GSList *)Data;
12856 + S->addr_list_iter = S->addr_list;
12861 @@ -425,7 +464,6 @@
12862 a_Chain_del_link(Info, CCC_BCK);
12863 BW_MSG(S->web, 0, "ERROR: Dns can't solve %s",
12864 (S->use_proxy) ? URL_HOST_(HTTP_Proxy) : URL_HOST_(S->Url));
12865 - while (close(S->SockFD) == EINTR);
12866 Http_socket_free(SKey);
12867 /* send abort message to higher-level functions */
12868 a_Chain_fcb(OpAbort, 1, Info, NULL, NULL);
12869 diff -urN dillo-0.6.6/src/Makefile dillo2-0.6.6/src/Makefile
12870 --- dillo-0.6.6/src/Makefile 1969-12-31 17:00:00.000000000 -0700
12871 +++ dillo2-0.6.6/src/Makefile 2003-04-21 14:27:08.000000000 -0600
12873 +# Makefile.in generated by automake 1.6.3 from Makefile.am.
12874 +# src/Makefile. Generated from Makefile.in by configure.
12876 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
12877 +# Free Software Foundation, Inc.
12878 +# This Makefile.in is free software; the Free Software Foundation
12879 +# gives unlimited permission to copy and/or distribute it,
12880 +# with or without modifications, as long as this notice is preserved.
12882 +# This program is distributed in the hope that it will be useful,
12883 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12884 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
12885 +# PARTICULAR PURPOSE.
12894 +exec_prefix = ${prefix}
12896 +bindir = ${exec_prefix}/bin
12897 +sbindir = ${exec_prefix}/sbin
12898 +libexecdir = ${exec_prefix}/libexec
12899 +datadir = ${prefix}/share
12900 +sysconfdir = ${prefix}/etc
12901 +sharedstatedir = ${prefix}/com
12902 +localstatedir = ${prefix}/var
12903 +libdir = ${exec_prefix}/lib
12904 +infodir = ${prefix}/info
12905 +mandir = ${prefix}/man
12906 +includedir = ${prefix}/include
12907 +oldincludedir = /usr/include
12908 +pkgdatadir = $(datadir)/dillo
12909 +pkglibdir = $(libdir)/dillo
12910 +pkgincludedir = $(includedir)/dillo
12913 +ACLOCAL = aclocal-1.6
12914 +AUTOCONF = autoconf
12915 +AUTOMAKE = automake-1.6
12916 +AUTOHEADER = autoheader
12918 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
12919 +INSTALL = /usr/bin/install -c
12920 +INSTALL_PROGRAM = ${INSTALL}
12921 +INSTALL_DATA = ${INSTALL} -m 644
12922 +install_sh_DATA = $(install_sh) -c -m 644
12923 +install_sh_PROGRAM = $(install_sh) -c
12924 +install_sh_SCRIPT = $(install_sh) -c
12925 +INSTALL_SCRIPT = ${INSTALL}
12926 +INSTALL_HEADER = $(INSTALL_DATA)
12927 +transform = s,x,x,
12928 +NORMAL_INSTALL = :
12931 +NORMAL_UNINSTALL = :
12933 +POST_UNINSTALL = :
12937 +PATH_SEPARATOR = :
12942 +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
12943 +LIBJPEG_LIB = -ljpeg
12945 +PKG_CONFIG = /usr/bin/pkg-config
12949 +am__include = include
12951 +install_sh = /home/pb/dillo2/install-sh
12955 +bin_PROGRAMS = dillo
12957 +dillo_LDADD = IO/libDio.a -ljpeg
12970 + dw_aligned_page.c \
12971 + dw_aligned_page.h \
12980 + dw_ext_iterator.h \
12981 + dw_ext_iterator.c \
12982 + dw_gtk_scrolled_frame.c \
12983 + dw_gtk_scrolled_frame.h \
12984 + dw_gtk_scrolled_window.c \
12985 + dw_gtk_scrolled_window.h \
12986 + dw_gtk_viewport.c \
12987 + dw_gtk_viewport.h \
13055 +EXTRA_DIST = pixmaps_old.h dw_marshal.sh chg srch
13057 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
13058 +CONFIG_HEADER = $(top_builddir)/config.h
13059 +CONFIG_CLEAN_FILES =
13060 +bin_PROGRAMS = dillo$(EXEEXT)
13061 +PROGRAMS = $(bin_PROGRAMS)
13063 +am_dillo_OBJECTS = chain.$(OBJEXT) commands.$(OBJEXT) cache.$(OBJEXT) \
13064 + dw.$(OBJEXT) dw_aligned_page.$(OBJEXT) dw_bullet.$(OBJEXT) \
13065 + dw_button.$(OBJEXT) dw_container.$(OBJEXT) \
13066 + dw_embed_gtk.$(OBJEXT) dw_ext_iterator.$(OBJEXT) \
13067 + dw_gtk_scrolled_frame.$(OBJEXT) \
13068 + dw_gtk_scrolled_window.$(OBJEXT) dw_gtk_viewport.$(OBJEXT) \
13069 + dw_hruler.$(OBJEXT) dw_image.$(OBJEXT) dw_list_item.$(OBJEXT) \
13070 + dw_marshal.$(OBJEXT) dw_page.$(OBJEXT) dw_style.$(OBJEXT) \
13071 + dw_table.$(OBJEXT) dw_tooltip.$(OBJEXT) dw_widget.$(OBJEXT) \
13072 + findtext.$(OBJEXT) web.$(OBJEXT) progressbar.$(OBJEXT) \
13073 + dillo.$(OBJEXT) bookmark.$(OBJEXT) dicache.$(OBJEXT) \
13074 + dns.$(OBJEXT) gif.$(OBJEXT) jpeg.$(OBJEXT) png.$(OBJEXT) \
13075 + html.$(OBJEXT) image.$(OBJEXT) misc.$(OBJEXT) \
13076 + interface.$(OBJEXT) history.$(OBJEXT) nav.$(OBJEXT) \
13077 + plain.$(OBJEXT) menu.$(OBJEXT) prefs.$(OBJEXT) colors.$(OBJEXT) \
13078 + bitvec.$(OBJEXT) klist.$(OBJEXT) url.$(OBJEXT) \
13079 + cookies.$(OBJEXT)
13080 +dillo_OBJECTS = $(am_dillo_OBJECTS)
13081 +dillo_DEPENDENCIES = IO/libDio.a
13084 +DEFS = -DHAVE_CONFIG_H
13085 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
13086 +CPPFLAGS = -I/usr/local/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
13087 +LDFLAGS = -L/usr/local/lib -Wl,--export-dynamic -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
13088 +LIBS = -lpng -lz -lpthread
13089 +depcomp = $(SHELL) $(top_srcdir)/depcomp
13090 +am__depfiles_maybe = depfiles
13091 +DEP_FILES = ./$(DEPDIR)/bitvec.Po ./$(DEPDIR)/bookmark.Po \
13092 + ./$(DEPDIR)/cache.Po ./$(DEPDIR)/chain.Po \
13093 + ./$(DEPDIR)/colors.Po ./$(DEPDIR)/commands.Po \
13094 + ./$(DEPDIR)/cookies.Po ./$(DEPDIR)/dicache.Po \
13095 + ./$(DEPDIR)/dillo.Po ./$(DEPDIR)/dns.Po \
13096 + ./$(DEPDIR)/dw.Po ./$(DEPDIR)/dw_aligned_page.Po \
13097 + ./$(DEPDIR)/dw_bullet.Po ./$(DEPDIR)/dw_button.Po \
13098 + ./$(DEPDIR)/dw_container.Po \
13099 + ./$(DEPDIR)/dw_embed_gtk.Po \
13100 + ./$(DEPDIR)/dw_ext_iterator.Po \
13101 + ./$(DEPDIR)/dw_gtk_scrolled_frame.Po \
13102 + ./$(DEPDIR)/dw_gtk_scrolled_window.Po \
13103 + ./$(DEPDIR)/dw_gtk_viewport.Po \
13104 + ./$(DEPDIR)/dw_hruler.Po ./$(DEPDIR)/dw_image.Po \
13105 + ./$(DEPDIR)/dw_list_item.Po \
13106 + ./$(DEPDIR)/dw_marshal.Po ./$(DEPDIR)/dw_page.Po \
13107 + ./$(DEPDIR)/dw_style.Po ./$(DEPDIR)/dw_table.Po \
13108 + ./$(DEPDIR)/dw_tooltip.Po ./$(DEPDIR)/dw_widget.Po \
13109 + ./$(DEPDIR)/findtext.Po ./$(DEPDIR)/gif.Po \
13110 + ./$(DEPDIR)/history.Po ./$(DEPDIR)/html.Po \
13111 + ./$(DEPDIR)/image.Po ./$(DEPDIR)/interface.Po \
13112 + ./$(DEPDIR)/jpeg.Po ./$(DEPDIR)/klist.Po \
13113 + ./$(DEPDIR)/menu.Po ./$(DEPDIR)/misc.Po \
13114 + ./$(DEPDIR)/nav.Po ./$(DEPDIR)/plain.Po \
13115 + ./$(DEPDIR)/png.Po ./$(DEPDIR)/prefs.Po \
13116 + ./$(DEPDIR)/progressbar.Po ./$(DEPDIR)/url.Po \
13117 + ./$(DEPDIR)/web.Po
13118 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
13119 + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
13121 +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
13122 +CFLAGS = -g -O2 -D_REENTRANT -D_THREAD_SAFE -Wall -Waggregate-return -DENABLE_IPV6
13123 +DIST_SOURCES = $(dillo_SOURCES)
13125 +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
13126 + uninstall-info-recursive all-recursive install-data-recursive \
13127 + install-exec-recursive installdirs-recursive install-recursive \
13128 + uninstall-recursive check-recursive installcheck-recursive
13129 +DIST_COMMON = Makefile.am Makefile.in
13130 +DIST_SUBDIRS = $(SUBDIRS)
13131 +SOURCES = $(dillo_SOURCES)
13133 +all: all-recursive
13136 +.SUFFIXES: .c .o .obj
13137 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
13138 + cd $(top_srcdir) && \
13139 + $(AUTOMAKE) --gnu src/Makefile
13140 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
13141 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
13142 +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
13143 +install-binPROGRAMS: $(bin_PROGRAMS)
13144 + @$(NORMAL_INSTALL)
13145 + $(mkinstalldirs) $(DESTDIR)$(bindir)
13146 + @list='$(bin_PROGRAMS)'; for p in $$list; do \
13147 + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
13150 + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
13151 + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
13152 + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
13156 +uninstall-binPROGRAMS:
13157 + @$(NORMAL_UNINSTALL)
13158 + @list='$(bin_PROGRAMS)'; for p in $$list; do \
13159 + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
13160 + echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
13161 + rm -f $(DESTDIR)$(bindir)/$$f; \
13164 +clean-binPROGRAMS:
13165 + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
13166 +dillo$(EXEEXT): $(dillo_OBJECTS) $(dillo_DEPENDENCIES)
13167 + @rm -f dillo$(EXEEXT)
13168 + $(LINK) $(dillo_LDFLAGS) $(dillo_OBJECTS) $(dillo_LDADD) $(LIBS)
13170 +mostlyclean-compile:
13171 + -rm -f *.$(OBJEXT) core *.core
13173 +distclean-compile:
13176 +include ./$(DEPDIR)/bitvec.Po
13177 +include ./$(DEPDIR)/bookmark.Po
13178 +include ./$(DEPDIR)/cache.Po
13179 +include ./$(DEPDIR)/chain.Po
13180 +include ./$(DEPDIR)/colors.Po
13181 +include ./$(DEPDIR)/commands.Po
13182 +include ./$(DEPDIR)/cookies.Po
13183 +include ./$(DEPDIR)/dicache.Po
13184 +include ./$(DEPDIR)/dillo.Po
13185 +include ./$(DEPDIR)/dns.Po
13186 +include ./$(DEPDIR)/dw.Po
13187 +include ./$(DEPDIR)/dw_aligned_page.Po
13188 +include ./$(DEPDIR)/dw_bullet.Po
13189 +include ./$(DEPDIR)/dw_button.Po
13190 +include ./$(DEPDIR)/dw_container.Po
13191 +include ./$(DEPDIR)/dw_embed_gtk.Po
13192 +include ./$(DEPDIR)/dw_ext_iterator.Po
13193 +include ./$(DEPDIR)/dw_gtk_scrolled_frame.Po
13194 +include ./$(DEPDIR)/dw_gtk_scrolled_window.Po
13195 +include ./$(DEPDIR)/dw_gtk_viewport.Po
13196 +include ./$(DEPDIR)/dw_hruler.Po
13197 +include ./$(DEPDIR)/dw_image.Po
13198 +include ./$(DEPDIR)/dw_list_item.Po
13199 +include ./$(DEPDIR)/dw_marshal.Po
13200 +include ./$(DEPDIR)/dw_page.Po
13201 +include ./$(DEPDIR)/dw_style.Po
13202 +include ./$(DEPDIR)/dw_table.Po
13203 +include ./$(DEPDIR)/dw_tooltip.Po
13204 +include ./$(DEPDIR)/dw_widget.Po
13205 +include ./$(DEPDIR)/findtext.Po
13206 +include ./$(DEPDIR)/gif.Po
13207 +include ./$(DEPDIR)/history.Po
13208 +include ./$(DEPDIR)/html.Po
13209 +include ./$(DEPDIR)/image.Po
13210 +include ./$(DEPDIR)/interface.Po
13211 +include ./$(DEPDIR)/jpeg.Po
13212 +include ./$(DEPDIR)/klist.Po
13213 +include ./$(DEPDIR)/menu.Po
13214 +include ./$(DEPDIR)/misc.Po
13215 +include ./$(DEPDIR)/nav.Po
13216 +include ./$(DEPDIR)/plain.Po
13217 +include ./$(DEPDIR)/png.Po
13218 +include ./$(DEPDIR)/prefs.Po
13219 +include ./$(DEPDIR)/progressbar.Po
13220 +include ./$(DEPDIR)/url.Po
13221 +include ./$(DEPDIR)/web.Po
13224 + -rm -rf ./$(DEPDIR)
13227 + source='$<' object='$@' libtool=no \
13228 + depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
13229 + $(CCDEPMODE) $(depcomp) \
13230 + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
13233 + source='$<' object='$@' libtool=no \
13234 + depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
13235 + $(CCDEPMODE) $(depcomp) \
13236 + $(COMPILE) -c `cygpath -w $<`
13237 +CCDEPMODE = depmode=gcc3
13238 +uninstall-info-am:
13240 +# This directory's subdirectories are mostly independent; you can cd
13241 +# into them and run `make' without going through this Makefile.
13242 +# To change the values of `make' variables: instead of editing Makefiles,
13243 +# (1) if the variable is set in `config.status', edit `config.status'
13244 +# (which will cause the Makefiles to be regenerated when you run `make');
13245 +# (2) otherwise, pass the desired values on the `make' command line.
13246 +$(RECURSIVE_TARGETS):
13247 + @set fnord $$MAKEFLAGS; amf=$$2; \
13249 + target=`echo $@ | sed s/-recursive//`; \
13250 + list='$(SUBDIRS)'; for subdir in $$list; do \
13251 + echo "Making $$target in $$subdir"; \
13252 + if test "$$subdir" = "."; then \
13254 + local_target="$$target-am"; \
13256 + local_target="$$target"; \
13258 + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
13259 + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
13261 + if test "$$dot_seen" = "no"; then \
13262 + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
13263 + fi; test -z "$$fail"
13265 +mostlyclean-recursive clean-recursive distclean-recursive \
13266 +maintainer-clean-recursive:
13267 + @set fnord $$MAKEFLAGS; amf=$$2; \
13270 + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
13271 + *) list='$(SUBDIRS)' ;; \
13273 + rev=''; for subdir in $$list; do \
13274 + if test "$$subdir" = "."; then :; else \
13275 + rev="$$subdir $$rev"; \
13279 + target=`echo $@ | sed s/-recursive//`; \
13280 + for subdir in $$rev; do \
13281 + echo "Making $$target in $$subdir"; \
13282 + if test "$$subdir" = "."; then \
13283 + local_target="$$target-am"; \
13285 + local_target="$$target"; \
13287 + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
13288 + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
13289 + done && test -z "$$fail"
13291 + list='$(SUBDIRS)'; for subdir in $$list; do \
13292 + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
13300 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
13301 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
13302 + unique=`for i in $$list; do \
13303 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
13305 + $(AWK) ' { files[$$0] = 1; } \
13306 + END { for (i in files) print i; }'`; \
13307 + mkid -fID $$unique
13309 +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
13310 + $(TAGS_FILES) $(LISP)
13313 + list='$(SUBDIRS)'; for subdir in $$list; do \
13314 + if test "$$subdir" = .; then :; else \
13315 + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
13318 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
13319 + unique=`for i in $$list; do \
13320 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
13322 + $(AWK) ' { files[$$0] = 1; } \
13323 + END { for (i in files) print i; }'`; \
13324 + test -z "$(ETAGS_ARGS)$$tags$$unique" \
13325 + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
13329 + here=`$(am__cd) $(top_builddir) && pwd` \
13330 + && cd $(top_srcdir) \
13331 + && gtags -i $(GTAGS_ARGS) $$here
13334 + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
13335 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
13338 +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
13340 +distdir: $(DISTFILES)
13341 + @list='$(DISTFILES)'; for file in $$list; do \
13342 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
13343 + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
13344 + if test "$$dir" != "$$file" && test "$$dir" != "."; then \
13346 + $(mkinstalldirs) "$(distdir)$$dir"; \
13350 + if test -d $$d/$$file; then \
13351 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
13352 + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
13354 + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
13356 + test -f $(distdir)/$$file \
13357 + || cp -p $$d/$$file $(distdir)/$$file \
13361 + list='$(SUBDIRS)'; for subdir in $$list; do \
13362 + if test "$$subdir" = .; then :; else \
13363 + test -d $(distdir)/$$subdir \
13364 + || mkdir $(distdir)/$$subdir \
13366 + (cd $$subdir && \
13367 + $(MAKE) $(AM_MAKEFLAGS) \
13368 + top_distdir="$(top_distdir)" \
13369 + distdir=../$(distdir)/$$subdir \
13375 +check: check-recursive
13376 +all-am: Makefile $(PROGRAMS)
13377 +installdirs: installdirs-recursive
13379 + $(mkinstalldirs) $(DESTDIR)$(bindir)
13381 +install: install-recursive
13382 +install-exec: install-exec-recursive
13383 +install-data: install-data-recursive
13384 +uninstall: uninstall-recursive
13386 +install-am: all-am
13387 + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
13389 +installcheck: installcheck-recursive
13391 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
13392 + INSTALL_STRIP_FLAG=-s \
13393 + `test -z '$(STRIP)' || \
13394 + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
13395 +mostlyclean-generic:
13399 +distclean-generic:
13400 + -rm -f Makefile $(CONFIG_CLEAN_FILES)
13402 +maintainer-clean-generic:
13403 + @echo "This command is intended for maintainers to use"
13404 + @echo "it deletes files that may require special tools to rebuild."
13405 +clean: clean-recursive
13407 +clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
13409 +distclean: distclean-recursive
13411 +distclean-am: clean-am distclean-compile distclean-depend \
13412 + distclean-generic distclean-tags
13414 +dvi: dvi-recursive
13418 +info: info-recursive
13424 +install-exec-am: install-binPROGRAMS
13426 +install-info: install-info-recursive
13432 +maintainer-clean: maintainer-clean-recursive
13434 +maintainer-clean-am: distclean-am maintainer-clean-generic
13436 +mostlyclean: mostlyclean-recursive
13438 +mostlyclean-am: mostlyclean-compile mostlyclean-generic
13440 +uninstall-am: uninstall-binPROGRAMS uninstall-info-am
13442 +uninstall-info: uninstall-info-recursive
13444 +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
13445 + clean-binPROGRAMS clean-generic clean-recursive distclean \
13446 + distclean-compile distclean-depend distclean-generic \
13447 + distclean-recursive distclean-tags distdir dvi dvi-am \
13448 + dvi-recursive info info-am info-recursive install install-am \
13449 + install-binPROGRAMS install-data install-data-am \
13450 + install-data-recursive install-exec install-exec-am \
13451 + install-exec-recursive install-info install-info-am \
13452 + install-info-recursive install-man install-recursive \
13453 + install-strip installcheck installcheck-am installdirs \
13454 + installdirs-am installdirs-recursive maintainer-clean \
13455 + maintainer-clean-generic maintainer-clean-recursive mostlyclean \
13456 + mostlyclean-compile mostlyclean-generic mostlyclean-recursive \
13457 + tags tags-recursive uninstall uninstall-am \
13458 + uninstall-binPROGRAMS uninstall-info-am \
13459 + uninstall-info-recursive uninstall-recursive
13461 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
13462 +# Otherwise a system limit (for SysV at least) may be exceeded.
13464 diff -urN dillo-0.6.6/src/Makefile.am dillo2-0.6.6/src/Makefile.am
13465 --- dillo-0.6.6/src/Makefile.am 2002-05-27 15:27:14.000000000 -0600
13466 +++ dillo2-0.6.6/src/Makefile.am 2003-04-21 12:35:28.000000000 -0600
13467 @@ -25,12 +25,12 @@
13471 + dw_ext_iterator.h \
13472 + dw_ext_iterator.c \
13473 dw_gtk_scrolled_frame.c \
13474 dw_gtk_scrolled_frame.h \
13475 dw_gtk_scrolled_window.c \
13476 dw_gtk_scrolled_window.h \
13477 - dw_gtk_statuslabel.c \
13478 - dw_gtk_statuslabel.h \
13479 dw_gtk_viewport.c \
13480 dw_gtk_viewport.h \
13486 -EXTRA_DIST = pixmaps_old.h chg srch
13487 +EXTRA_DIST = pixmaps_old.h dw_marshal.sh chg srch
13488 diff -urN dillo-0.6.6/src/Makefile.in dillo2-0.6.6/src/Makefile.in
13489 --- dillo-0.6.6/src/Makefile.in 2002-05-29 15:02:56.000000000 -0600
13490 +++ dillo2-0.6.6/src/Makefile.in 2003-04-21 12:35:29.000000000 -0600
13492 -# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
13493 +# Makefile.in generated by automake 1.6.3 from Makefile.am.
13494 +# @configure_input@
13496 -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
13497 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
13498 +# Free Software Foundation, Inc.
13499 # This Makefile.in is free software; the Free Software Foundation
13500 # gives unlimited permission to copy and/or distribute it,
13501 # with or without modifications, as long as this notice is preserved.
13503 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13504 # PARTICULAR PURPOSE.
13513 includedir = @includedir@
13514 oldincludedir = /usr/include
13518 pkgdatadir = $(datadir)/@PACKAGE@
13519 pkglibdir = $(libdir)/@PACKAGE@
13520 pkgincludedir = $(includedir)/@PACKAGE@
13524 ACLOCAL = @ACLOCAL@
13525 @@ -45,142 +43,327 @@
13526 AUTOMAKE = @AUTOMAKE@
13527 AUTOHEADER = @AUTOHEADER@
13529 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
13530 INSTALL = @INSTALL@
13531 -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
13532 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
13533 INSTALL_DATA = @INSTALL_DATA@
13534 +install_sh_DATA = $(install_sh) -c -m 644
13535 +install_sh_PROGRAM = $(install_sh) -c
13536 +install_sh_SCRIPT = $(install_sh) -c
13537 INSTALL_SCRIPT = @INSTALL_SCRIPT@
13538 +INSTALL_HEADER = $(INSTALL_DATA)
13539 transform = @program_transform_name@
13544 NORMAL_UNINSTALL = :
13550 +PATH_SEPARATOR = @PATH_SEPARATOR@
13554 -GTK_CFLAGS = @GTK_CFLAGS@
13555 -GTK_CONFIG = @GTK_CONFIG@
13556 -GTK_LIBS = @GTK_LIBS@
13558 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
13559 LIBJPEG_LIB = @LIBJPEG_LIB@
13560 -MAKEINFO = @MAKEINFO@
13561 PACKAGE = @PACKAGE@
13562 +PKG_CONFIG = @PKG_CONFIG@
13565 VERSION = @VERSION@
13566 -datadir = @datadir@
13567 +am__include = @am__include@
13568 +am__quote = @am__quote@
13569 +install_sh = @install_sh@
13574 bin_PROGRAMS = dillo
13576 dillo_LDADD = IO/libDio.a @LIBJPEG_LIB@
13578 -dillo_SOURCES = acconfig.h chain.h chain.c commands.c commands.h cache.c cache.h debug.h dw.h dw.c dw_aligned_page.c dw_aligned_page.h dw_bullet.c dw_bullet.h dw_button.c dw_button.h dw_container.c dw_container.h dw_embed_gtk.c dw_embed_gtk.h dw_gtk_scrolled_frame.c dw_gtk_scrolled_frame.h dw_gtk_scrolled_window.c dw_gtk_scrolled_window.h dw_gtk_statuslabel.c dw_gtk_statuslabel.h dw_gtk_viewport.c dw_gtk_viewport.h dw_hruler.c dw_hruler.h dw_image.c dw_image.h dw_list_item.c dw_list_item.h dw_marshal.c dw_marshal.h dw_page.c dw_page.h dw_style.c dw_style.h dw_table.c dw_table.h dw_tooltip.c dw_tooltip.h dw_widget.c dw_widget.h findtext.c findtext.h web.c web.h progressbar.c progressbar.h dillo.c dillo.h bookmark.c bookmark.h browser.h dicache.c dicache.h dns.c dns.h gif.c jpeg.c png.c html.c html.h image.c image.h misc.c misc.h interface.h interface.c history.c history.h nav.c nav.h plain.c menu.c menu.h prefs.c prefs.h colors.c colors.h bitvec.c bitvec.h klist.c klist.h url.c url.h cookies.c cookies.h list.h pixmaps.h
13590 + dw_aligned_page.c \
13591 + dw_aligned_page.h \
13600 + dw_ext_iterator.h \
13601 + dw_ext_iterator.c \
13602 + dw_gtk_scrolled_frame.c \
13603 + dw_gtk_scrolled_frame.h \
13604 + dw_gtk_scrolled_window.c \
13605 + dw_gtk_scrolled_window.h \
13606 + dw_gtk_viewport.c \
13607 + dw_gtk_viewport.h \
13675 -EXTRA_DIST = pixmaps_old.h chg srch
13676 +EXTRA_DIST = pixmaps_old.h dw_marshal.sh chg srch
13678 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
13679 -CONFIG_HEADER = ../config.h
13680 -CONFIG_CLEAN_FILES =
13681 -PROGRAMS = $(bin_PROGRAMS)
13683 +CONFIG_HEADER = $(top_builddir)/config.h
13684 +CONFIG_CLEAN_FILES =
13685 +bin_PROGRAMS = dillo$(EXEEXT)
13686 +PROGRAMS = $(bin_PROGRAMS)
13688 +am_dillo_OBJECTS = chain.$(OBJEXT) commands.$(OBJEXT) cache.$(OBJEXT) \
13689 + dw.$(OBJEXT) dw_aligned_page.$(OBJEXT) dw_bullet.$(OBJEXT) \
13690 + dw_button.$(OBJEXT) dw_container.$(OBJEXT) \
13691 + dw_embed_gtk.$(OBJEXT) dw_ext_iterator.$(OBJEXT) \
13692 + dw_gtk_scrolled_frame.$(OBJEXT) \
13693 + dw_gtk_scrolled_window.$(OBJEXT) dw_gtk_viewport.$(OBJEXT) \
13694 + dw_hruler.$(OBJEXT) dw_image.$(OBJEXT) dw_list_item.$(OBJEXT) \
13695 + dw_marshal.$(OBJEXT) dw_page.$(OBJEXT) dw_style.$(OBJEXT) \
13696 + dw_table.$(OBJEXT) dw_tooltip.$(OBJEXT) dw_widget.$(OBJEXT) \
13697 + findtext.$(OBJEXT) web.$(OBJEXT) progressbar.$(OBJEXT) \
13698 + dillo.$(OBJEXT) bookmark.$(OBJEXT) dicache.$(OBJEXT) \
13699 + dns.$(OBJEXT) gif.$(OBJEXT) jpeg.$(OBJEXT) png.$(OBJEXT) \
13700 + html.$(OBJEXT) image.$(OBJEXT) misc.$(OBJEXT) \
13701 + interface.$(OBJEXT) history.$(OBJEXT) nav.$(OBJEXT) \
13702 + plain.$(OBJEXT) menu.$(OBJEXT) prefs.$(OBJEXT) colors.$(OBJEXT) \
13703 + bitvec.$(OBJEXT) klist.$(OBJEXT) url.$(OBJEXT) \
13704 + cookies.$(OBJEXT)
13705 +dillo_OBJECTS = $(am_dillo_OBJECTS)
13706 +dillo_DEPENDENCIES = IO/libDio.a
13709 -DEFS = @DEFS@ -I. -I$(srcdir) -I..
13711 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
13712 CPPFLAGS = @CPPFLAGS@
13713 LDFLAGS = @LDFLAGS@
13715 -dillo_OBJECTS = chain.o commands.o cache.o dw.o dw_aligned_page.o \
13716 -dw_bullet.o dw_button.o dw_container.o dw_embed_gtk.o \
13717 -dw_gtk_scrolled_frame.o dw_gtk_scrolled_window.o dw_gtk_statuslabel.o \
13718 -dw_gtk_viewport.o dw_hruler.o dw_image.o dw_list_item.o dw_marshal.o \
13719 -dw_page.o dw_style.o dw_table.o dw_tooltip.o dw_widget.o findtext.o \
13720 -web.o progressbar.o dillo.o bookmark.o dicache.o dns.o gif.o jpeg.o \
13721 -png.o html.o image.o misc.o interface.o history.o nav.o plain.o menu.o \
13722 -prefs.o colors.o bitvec.o klist.o url.o cookies.o
13723 -dillo_DEPENDENCIES = IO/libDio.a
13726 -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
13727 +depcomp = $(SHELL) $(top_srcdir)/depcomp
13728 +am__depfiles_maybe = depfiles
13729 +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bitvec.Po ./$(DEPDIR)/bookmark.Po \
13730 +@AMDEP_TRUE@ ./$(DEPDIR)/cache.Po ./$(DEPDIR)/chain.Po \
13731 +@AMDEP_TRUE@ ./$(DEPDIR)/colors.Po ./$(DEPDIR)/commands.Po \
13732 +@AMDEP_TRUE@ ./$(DEPDIR)/cookies.Po ./$(DEPDIR)/dicache.Po \
13733 +@AMDEP_TRUE@ ./$(DEPDIR)/dillo.Po ./$(DEPDIR)/dns.Po \
13734 +@AMDEP_TRUE@ ./$(DEPDIR)/dw.Po ./$(DEPDIR)/dw_aligned_page.Po \
13735 +@AMDEP_TRUE@ ./$(DEPDIR)/dw_bullet.Po ./$(DEPDIR)/dw_button.Po \
13736 +@AMDEP_TRUE@ ./$(DEPDIR)/dw_container.Po \
13737 +@AMDEP_TRUE@ ./$(DEPDIR)/dw_embed_gtk.Po \
13738 +@AMDEP_TRUE@ ./$(DEPDIR)/dw_ext_iterator.Po \
13739 +@AMDEP_TRUE@ ./$(DEPDIR)/dw_gtk_scrolled_frame.Po \
13740 +@AMDEP_TRUE@ ./$(DEPDIR)/dw_gtk_scrolled_window.Po \
13741 +@AMDEP_TRUE@ ./$(DEPDIR)/dw_gtk_viewport.Po \
13742 +@AMDEP_TRUE@ ./$(DEPDIR)/dw_hruler.Po ./$(DEPDIR)/dw_image.Po \
13743 +@AMDEP_TRUE@ ./$(DEPDIR)/dw_list_item.Po \
13744 +@AMDEP_TRUE@ ./$(DEPDIR)/dw_marshal.Po ./$(DEPDIR)/dw_page.Po \
13745 +@AMDEP_TRUE@ ./$(DEPDIR)/dw_style.Po ./$(DEPDIR)/dw_table.Po \
13746 +@AMDEP_TRUE@ ./$(DEPDIR)/dw_tooltip.Po ./$(DEPDIR)/dw_widget.Po \
13747 +@AMDEP_TRUE@ ./$(DEPDIR)/findtext.Po ./$(DEPDIR)/gif.Po \
13748 +@AMDEP_TRUE@ ./$(DEPDIR)/history.Po ./$(DEPDIR)/html.Po \
13749 +@AMDEP_TRUE@ ./$(DEPDIR)/image.Po ./$(DEPDIR)/interface.Po \
13750 +@AMDEP_TRUE@ ./$(DEPDIR)/jpeg.Po ./$(DEPDIR)/klist.Po \
13751 +@AMDEP_TRUE@ ./$(DEPDIR)/menu.Po ./$(DEPDIR)/misc.Po \
13752 +@AMDEP_TRUE@ ./$(DEPDIR)/nav.Po ./$(DEPDIR)/plain.Po \
13753 +@AMDEP_TRUE@ ./$(DEPDIR)/png.Po ./$(DEPDIR)/prefs.Po \
13754 +@AMDEP_TRUE@ ./$(DEPDIR)/progressbar.Po ./$(DEPDIR)/url.Po \
13755 +@AMDEP_TRUE@ ./$(DEPDIR)/web.Po
13756 +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
13757 + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
13759 -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
13760 -DIST_COMMON = Makefile.am Makefile.in
13763 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
13764 +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
13766 +DIST_SOURCES = $(dillo_SOURCES)
13770 -DEP_FILES = .deps/bitvec.P .deps/bookmark.P .deps/cache.P .deps/chain.P \
13771 -.deps/colors.P .deps/commands.P .deps/cookies.P .deps/dicache.P \
13772 -.deps/dillo.P .deps/dns.P .deps/dw.P .deps/dw_aligned_page.P \
13773 -.deps/dw_bullet.P .deps/dw_button.P .deps/dw_container.P \
13774 -.deps/dw_embed_gtk.P .deps/dw_gtk_scrolled_frame.P \
13775 -.deps/dw_gtk_scrolled_window.P .deps/dw_gtk_statuslabel.P \
13776 -.deps/dw_gtk_viewport.P .deps/dw_hruler.P .deps/dw_image.P \
13777 -.deps/dw_list_item.P .deps/dw_marshal.P .deps/dw_page.P \
13778 -.deps/dw_style.P .deps/dw_table.P .deps/dw_tooltip.P .deps/dw_widget.P \
13779 -.deps/findtext.P .deps/gif.P .deps/history.P .deps/html.P .deps/image.P \
13780 -.deps/interface.P .deps/jpeg.P .deps/klist.P .deps/menu.P .deps/misc.P \
13781 -.deps/nav.P .deps/plain.P .deps/png.P .deps/prefs.P .deps/progressbar.P \
13782 -.deps/url.P .deps/web.P
13783 +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
13784 + uninstall-info-recursive all-recursive install-data-recursive \
13785 + install-exec-recursive installdirs-recursive install-recursive \
13786 + uninstall-recursive check-recursive installcheck-recursive
13787 +DIST_COMMON = Makefile.am Makefile.in
13788 +DIST_SUBDIRS = $(SUBDIRS)
13789 SOURCES = $(dillo_SOURCES)
13790 -OBJECTS = $(dillo_OBJECTS)
13794 -.SUFFIXES: .S .c .o .s
13795 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
13796 - cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
13798 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
13799 - cd $(top_builddir) \
13800 - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
13802 +all: all-recursive
13804 -mostlyclean-binPROGRAMS:
13806 -clean-binPROGRAMS:
13807 - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
13809 -distclean-binPROGRAMS:
13811 -maintainer-clean-binPROGRAMS:
13814 +.SUFFIXES: .c .o .obj
13815 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
13816 + cd $(top_srcdir) && \
13817 + $(AUTOMAKE) --gnu src/Makefile
13818 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
13819 + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
13820 +binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
13821 install-binPROGRAMS: $(bin_PROGRAMS)
13823 $(mkinstalldirs) $(DESTDIR)$(bindir)
13824 @list='$(bin_PROGRAMS)'; for p in $$list; do \
13825 - if test -f $$p; then \
13826 - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
13827 - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
13828 + p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
13831 + f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
13832 + echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
13833 + $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
13837 uninstall-binPROGRAMS:
13838 @$(NORMAL_UNINSTALL)
13839 - list='$(bin_PROGRAMS)'; for p in $$list; do \
13840 - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
13841 + @list='$(bin_PROGRAMS)'; for p in $$list; do \
13842 + f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
13843 + echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
13844 + rm -f $(DESTDIR)$(bindir)/$$f; \
13852 +clean-binPROGRAMS:
13853 + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
13854 +dillo$(EXEEXT): $(dillo_OBJECTS) $(dillo_DEPENDENCIES)
13855 + @rm -f dillo$(EXEEXT)
13856 + $(LINK) $(dillo_LDFLAGS) $(dillo_OBJECTS) $(dillo_LDADD) $(LIBS)
13858 mostlyclean-compile:
13859 - -rm -f *.o core *.core
13862 + -rm -f *.$(OBJEXT) core *.core
13867 -maintainer-clean-compile:
13868 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitvec.Po@am__quote@
13869 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bookmark.Po@am__quote@
13870 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache.Po@am__quote@
13871 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chain.Po@am__quote@
13872 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colors.Po@am__quote@
13873 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commands.Po@am__quote@
13874 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cookies.Po@am__quote@
13875 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dicache.Po@am__quote@
13876 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dillo.Po@am__quote@
13877 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns.Po@am__quote@
13878 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw.Po@am__quote@
13879 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_aligned_page.Po@am__quote@
13880 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_bullet.Po@am__quote@
13881 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_button.Po@am__quote@
13882 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_container.Po@am__quote@
13883 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_embed_gtk.Po@am__quote@
13884 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_ext_iterator.Po@am__quote@
13885 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_gtk_scrolled_frame.Po@am__quote@
13886 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_gtk_scrolled_window.Po@am__quote@
13887 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_gtk_viewport.Po@am__quote@
13888 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_hruler.Po@am__quote@
13889 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_image.Po@am__quote@
13890 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_list_item.Po@am__quote@
13891 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_marshal.Po@am__quote@
13892 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_page.Po@am__quote@
13893 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_style.Po@am__quote@
13894 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_table.Po@am__quote@
13895 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_tooltip.Po@am__quote@
13896 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dw_widget.Po@am__quote@
13897 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/findtext.Po@am__quote@
13898 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif.Po@am__quote@
13899 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/history.Po@am__quote@
13900 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/html.Po@am__quote@
13901 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Po@am__quote@
13902 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interface.Po@am__quote@
13903 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpeg.Po@am__quote@
13904 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klist.Po@am__quote@
13905 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu.Po@am__quote@
13906 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
13907 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nav.Po@am__quote@
13908 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plain.Po@am__quote@
13909 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/png.Po@am__quote@
13910 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefs.Po@am__quote@
13911 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progressbar.Po@am__quote@
13912 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@
13913 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/web.Po@am__quote@
13915 -dillo: $(dillo_OBJECTS) $(dillo_DEPENDENCIES)
13917 - $(LINK) $(dillo_LDFLAGS) $(dillo_OBJECTS) $(dillo_LDADD) $(LIBS)
13919 + -rm -rf ./$(DEPDIR)
13922 +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
13923 +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
13924 +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
13925 + $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
13928 +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
13929 +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
13930 +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
13931 + $(COMPILE) -c `cygpath -w $<`
13932 +CCDEPMODE = @CCDEPMODE@
13933 +uninstall-info-am:
13935 # This directory's subdirectories are mostly independent; you can cd
13936 # into them and run `make' without going through this Makefile.
13937 @@ -188,13 +371,8 @@
13938 # (1) if the variable is set in `config.status', edit `config.status'
13939 # (which will cause the Makefiles to be regenerated when you run `make');
13940 # (2) otherwise, pass the desired values on the `make' command line.
13944 -all-recursive install-data-recursive install-exec-recursive \
13945 -installdirs-recursive install-recursive uninstall-recursive \
13946 -check-recursive installcheck-recursive info-recursive dvi-recursive:
13947 - @set fnord $(MAKEFLAGS); amf=$$2; \
13948 +$(RECURSIVE_TARGETS):
13949 + @set fnord $$MAKEFLAGS; amf=$$2; \
13951 target=`echo $@ | sed s/-recursive//`; \
13952 list='$(SUBDIRS)'; for subdir in $$list; do \
13953 @@ -214,13 +392,18 @@
13955 mostlyclean-recursive clean-recursive distclean-recursive \
13956 maintainer-clean-recursive:
13957 - @set fnord $(MAKEFLAGS); amf=$$2; \
13958 + @set fnord $$MAKEFLAGS; amf=$$2; \
13960 - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
13961 - rev="$$subdir $$rev"; \
13962 - test "$$subdir" = "." && dot_seen=yes; \
13964 + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
13965 + *) list='$(SUBDIRS)' ;; \
13967 + rev=''; for subdir in $$list; do \
13968 + if test "$$subdir" = "."; then :; else \
13969 + rev="$$subdir $$rev"; \
13972 - test "$$dot_seen" = "no" && rev=". $$rev"; \
13974 target=`echo $@ | sed s/-recursive//`; \
13975 for subdir in $$rev; do \
13976 echo "Making $$target in $$subdir"; \
13977 @@ -237,181 +420,171 @@
13978 test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
13986 -ID: $(HEADERS) $(SOURCES) $(LISP)
13987 - list='$(SOURCES) $(HEADERS)'; \
13988 - unique=`for i in $$list; do echo $$i; done | \
13989 - awk ' { files[$$0] = 1; } \
13990 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
13991 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
13992 + unique=`for i in $$list; do \
13993 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
13995 + $(AWK) ' { files[$$0] = 1; } \
13996 END { for (i in files) print i; }'`; \
13997 - here=`pwd` && cd $(srcdir) \
13998 - && mkid -f$$here/ID $$unique $(LISP)
13999 + mkid -fID $$unique
14001 -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
14002 +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
14003 + $(TAGS_FILES) $(LISP)
14006 list='$(SUBDIRS)'; for subdir in $$list; do \
14007 - if test "$$subdir" = .; then :; else \
14008 + if test "$$subdir" = .; then :; else \
14009 test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
14013 - list='$(SOURCES) $(HEADERS)'; \
14014 - unique=`for i in $$list; do echo $$i; done | \
14015 - awk ' { files[$$0] = 1; } \
14016 + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
14017 + unique=`for i in $$list; do \
14018 + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
14020 + $(AWK) ' { files[$$0] = 1; } \
14021 END { for (i in files) print i; }'`; \
14022 - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
14023 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
14028 + test -z "$(ETAGS_ARGS)$$tags$$unique" \
14029 + || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
14033 + here=`$(am__cd) $(top_builddir) && pwd` \
14034 + && cd $(top_srcdir) \
14035 + && gtags -i $(GTAGS_ARGS) $$here
14039 + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
14040 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
14042 -maintainer-clean-tags:
14044 -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
14048 +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
14050 distdir: $(DISTFILES)
14051 - here=`cd $(top_builddir) && pwd`; \
14052 - top_distdir=`cd $(top_distdir) && pwd`; \
14053 - distdir=`cd $(distdir) && pwd`; \
14054 - cd $(top_srcdir) \
14055 - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
14056 - @for file in $(DISTFILES); do \
14058 + @list='$(DISTFILES)'; for file in $$list; do \
14059 + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
14060 + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
14061 + if test "$$dir" != "$$file" && test "$$dir" != "."; then \
14063 + $(mkinstalldirs) "$(distdir)$$dir"; \
14067 if test -d $$d/$$file; then \
14068 - cp -pr $$d/$$file $(distdir)/$$file; \
14069 + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
14070 + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
14072 + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
14074 test -f $(distdir)/$$file \
14075 - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
14076 - || cp -p $$d/$$file $(distdir)/$$file || :; \
14077 + || cp -p $$d/$$file $(distdir)/$$file \
14081 - for subdir in $(SUBDIRS); do \
14082 + list='$(SUBDIRS)'; for subdir in $$list; do \
14083 if test "$$subdir" = .; then :; else \
14084 test -d $(distdir)/$$subdir \
14085 || mkdir $(distdir)/$$subdir \
14087 - chmod 777 $(distdir)/$$subdir; \
14088 - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
14089 + (cd $$subdir && \
14090 + $(MAKE) $(AM_MAKEFLAGS) \
14091 + top_distdir="$(top_distdir)" \
14092 + distdir=../$(distdir)/$$subdir \
14098 -DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
14100 --include $(DEP_FILES)
14102 -mostlyclean-depend:
14109 -maintainer-clean-depend:
14112 - @echo '$(COMPILE) -c $<'; \
14113 - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
14114 - @-cp .deps/$(*F).pp .deps/$(*F).P; \
14115 - tr ' ' '\012' < .deps/$(*F).pp \
14116 - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
14117 - >> .deps/$(*F).P; \
14118 - rm .deps/$(*F).pp
14121 - @echo '$(LTCOMPILE) -c $<'; \
14122 - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
14123 - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
14124 - < .deps/$(*F).pp > .deps/$(*F).P; \
14125 - tr ' ' '\012' < .deps/$(*F).pp \
14126 - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
14127 - >> .deps/$(*F).P; \
14128 - rm -f .deps/$(*F).pp
14130 -info: info-recursive
14132 -dvi: dvi-recursive
14134 check: check-recursive
14136 -installcheck: installcheck-recursive
14137 -install-exec-am: install-binPROGRAMS
14138 -install-exec: install-exec-recursive
14139 +all-am: Makefile $(PROGRAMS)
14140 +installdirs: installdirs-recursive
14142 + $(mkinstalldirs) $(DESTDIR)$(bindir)
14145 +install: install-recursive
14146 +install-exec: install-exec-recursive
14147 install-data: install-data-recursive
14148 +uninstall: uninstall-recursive
14151 @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
14152 -install: install-recursive
14153 -uninstall-am: uninstall-binPROGRAMS
14154 -uninstall: uninstall-recursive
14155 -all-am: Makefile $(PROGRAMS)
14156 -all-redirect: all-recursive
14158 - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
14159 -installdirs: installdirs-recursive
14161 - $(mkinstalldirs) $(DESTDIR)$(bindir)
14164 +installcheck: installcheck-recursive
14166 + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
14167 + INSTALL_STRIP_FLAG=-s \
14168 + `test -z '$(STRIP)' || \
14169 + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
14170 mostlyclean-generic:
14175 -rm -f Makefile $(CONFIG_CLEAN_FILES)
14176 - -rm -f config.cache config.log stamp-h stamp-h[0-9]*
14178 maintainer-clean-generic:
14179 -mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
14180 - mostlyclean-tags mostlyclean-depend mostlyclean-generic
14181 + @echo "This command is intended for maintainers to use"
14182 + @echo "it deletes files that may require special tools to rebuild."
14183 +clean: clean-recursive
14185 -mostlyclean: mostlyclean-recursive
14186 +clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
14188 -clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \
14189 - clean-generic mostlyclean-am
14190 +distclean: distclean-recursive
14192 -clean: clean-recursive
14193 +distclean-am: clean-am distclean-compile distclean-depend \
14194 + distclean-generic distclean-tags
14196 -distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \
14197 - distclean-depend distclean-generic clean-am
14198 +dvi: dvi-recursive
14200 -distclean: distclean-recursive
14203 -maintainer-clean-am: maintainer-clean-binPROGRAMS \
14204 - maintainer-clean-compile maintainer-clean-tags \
14205 - maintainer-clean-depend maintainer-clean-generic \
14207 - @echo "This command is intended for maintainers to use;"
14208 - @echo "it deletes files that may require special tools to rebuild."
14209 +info: info-recursive
14215 +install-exec-am: install-binPROGRAMS
14217 +install-info: install-info-recursive
14223 maintainer-clean: maintainer-clean-recursive
14225 -.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
14226 -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
14227 -mostlyclean-compile distclean-compile clean-compile \
14228 -maintainer-clean-compile install-data-recursive \
14229 -uninstall-data-recursive install-exec-recursive \
14230 -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
14231 -all-recursive check-recursive installcheck-recursive info-recursive \
14232 -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
14233 -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
14234 -distclean-tags clean-tags maintainer-clean-tags distdir \
14235 -mostlyclean-depend distclean-depend clean-depend \
14236 -maintainer-clean-depend info-am info dvi-am dvi check check-am \
14237 -installcheck-am installcheck install-exec-am install-exec \
14238 -install-data-am install-data install-am install uninstall-am uninstall \
14239 -all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
14240 -distclean-generic clean-generic maintainer-clean-generic clean \
14241 -mostlyclean distclean maintainer-clean
14242 +maintainer-clean-am: distclean-am maintainer-clean-generic
14244 +mostlyclean: mostlyclean-recursive
14246 +mostlyclean-am: mostlyclean-compile mostlyclean-generic
14248 +uninstall-am: uninstall-binPROGRAMS uninstall-info-am
14250 +uninstall-info: uninstall-info-recursive
14252 +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
14253 + clean-binPROGRAMS clean-generic clean-recursive distclean \
14254 + distclean-compile distclean-depend distclean-generic \
14255 + distclean-recursive distclean-tags distdir dvi dvi-am \
14256 + dvi-recursive info info-am info-recursive install install-am \
14257 + install-binPROGRAMS install-data install-data-am \
14258 + install-data-recursive install-exec install-exec-am \
14259 + install-exec-recursive install-info install-info-am \
14260 + install-info-recursive install-man install-recursive \
14261 + install-strip installcheck installcheck-am installdirs \
14262 + installdirs-am installdirs-recursive maintainer-clean \
14263 + maintainer-clean-generic maintainer-clean-recursive mostlyclean \
14264 + mostlyclean-compile mostlyclean-generic mostlyclean-recursive \
14265 + tags tags-recursive uninstall uninstall-am \
14266 + uninstall-binPROGRAMS uninstall-info-am \
14267 + uninstall-info-recursive uninstall-recursive
14269 # Tell versions [3.59,3.63) of GNU make to not export all variables.
14270 # Otherwise a system limit (for SysV at least) may be exceeded.
14271 diff -urN dillo-0.6.6/src/bookmark.c dillo2-0.6.6/src/bookmark.c
14272 --- dillo-0.6.6/src/bookmark.c 2002-04-09 19:04:54.000000000 -0600
14273 +++ dillo2-0.6.6/src/bookmark.c 2003-04-21 12:35:30.000000000 -0600
14274 @@ -93,13 +93,14 @@
14278 -static void Bookmarks_goto_bookmark(GtkWidget *widget, CallbackInfo *CbInfo)
14279 +static gboolean Bookmarks_goto_bookmark(GtkWidget *widget, CallbackInfo *CbInfo)
14281 if (CbInfo->index >= num_bookmarks) {
14282 g_warning("bookmark not found!\n");
14286 a_Nav_push(CbInfo->bw, bookmarks[CbInfo->index].url);
14291 @@ -117,8 +118,8 @@
14292 CbInfo->index = index;
14294 /* accelerator goes here */
14295 - gtk_signal_connect(GTK_OBJECT (menuitem), "activate",
14296 - (GtkSignalFunc)Bookmarks_goto_bookmark, CbInfo);
14297 + g_signal_connect(G_OBJECT (menuitem), "activate",
14298 + G_CALLBACK(Bookmarks_goto_bookmark), CbInfo);
14302 @@ -260,11 +261,12 @@
14304 static void Bookmarks_load_to_menu(FILE *fp)
14306 - gchar *title, *url_str;
14307 + gchar *title, *utf8_title, *url_str;
14311 GtkWidget *menuitem;
14312 + GError *err = NULL;
14316 @@ -284,13 +286,19 @@
14320 + /* Temporary solution, in future bookmarks.html should be UTF8 */
14321 + utf8_title = g_convert(title, -1, "utf8", "iso8859-1", NULL, NULL, &err);
14322 + if (err != NULL) g_warning ("Bookmarks_load_to_menu(): %s\n",
14326 url = a_Url_new(url_str, NULL, 0, 0);
14327 - menuitem = Bookmarks_insert(title, url);
14328 + menuitem = Bookmarks_insert(utf8_title, url);
14329 /* for (i = 0; i < num_bw; i++)
14330 * Bookmarks_add_to_menu(browser_window[i], menuitem); */
14331 Bookmarks_add_to_menu(browser_window[0], menuitem, i);
14334 + g_free(utf8_title);
14338 diff -urN dillo-0.6.6/src/browser.h dillo2-0.6.6/src/browser.h
14339 --- dillo-0.6.6/src/browser.h 2002-03-26 16:26:06.000000000 -0700
14340 +++ dillo2-0.6.6/src/browser.h 2003-04-21 12:35:30.000000000 -0600
14341 @@ -117,7 +117,7 @@
14342 gboolean nav_expecting;
14344 /* The tag for the idle function that sets button sensitivity. */
14345 - gint sens_idle_tag;
14346 + guint sens_idle_tag;
14350 diff -urN dillo-0.6.6/src/cache.c dillo2-0.6.6/src/cache.c
14351 --- dillo-0.6.6/src/cache.c 2002-04-09 19:23:56.000000000 -0600
14352 +++ dillo2-0.6.6/src/cache.c 2003-04-21 12:35:32.000000000 -0600
14355 const DilloUrl *Url; /* Cached Url. Url is used as a primary Key */
14356 const char *Type; /* MIME type string */
14358 GString *Header; /* HTTP header */
14359 const DilloUrl *Location; /* New URI for redirects */
14360 void *Data; /* Pointer to raw data */
14361 @@ -135,6 +136,7 @@
14362 NewClient->Key = ClientKey;
14363 NewClient->Url = Url;
14364 NewClient->Buf = NULL;
14365 + NewClient->Encoding = NULL;
14366 NewClient->Callback = Callback;
14367 NewClient->CbData = CbData;
14368 NewClient->Web = Web;
14369 @@ -184,6 +186,7 @@
14371 ClientQueue = g_slist_remove(ClientQueue, Client);
14372 a_Web_free(Client->Web);
14373 + g_free(Client->Encoding);
14377 @@ -198,6 +201,7 @@
14379 NewEntry->Url = a_Url_dup(Url);
14380 NewEntry->Type = NULL;
14381 + NewEntry->Encoding = NULL;
14382 NewEntry->Header = g_string_new("");
14383 NewEntry->Location = NULL;
14384 NewEntry->Data = NULL;
14385 @@ -239,6 +243,7 @@
14387 a_Url_free((DilloUrl *)entry->Url);
14388 g_free((gchar *)entry->Type);
14389 + g_free(entry->Encoding);
14390 g_string_free(entry->Header, TRUE);
14391 a_Url_free((DilloUrl *)entry->Location);
14392 g_free(entry->Data);
14393 @@ -651,6 +656,17 @@
14394 if ( (Type = Cache_parse_field(header, "Content-Type")) == NULL ) {
14395 DEBUG_HTTP_MSG("Server didn't send Content-Type in header.\n");
14396 Type = Cache_get_type_from_data(entry->Data, entry->ValidSize);
14401 + /* Look for a specified encoding */
14402 + if ((enc = strstr(Type, "charset="))) {
14403 + for (i = 8; enc[i] != '\0' && enc[i] != ';'; i++)
14406 + entry->Encoding = g_strndup(enc + 8, i - 8);
14409 entry->Type = Type;
14411 @@ -842,6 +858,10 @@
14412 EntryHasClients = TRUE;
14413 ClientWeb = Client->Web; /* It was a (void*) */
14415 + /* Pass on the encoding */
14416 + if (entry->Encoding && !Client->Encoding)
14417 + Client->Encoding = g_strdup(entry->Encoding);
14419 /* For root URLs, clear the "expecting for reply..." message */
14420 if (ClientWeb->flags & WEB_RootUrl && !(entry->Flags & CA_MsgErased)){
14421 a_Interface_msg(ClientWeb->bw, "");
14422 diff -urN dillo-0.6.6/src/cache.h dillo2-0.6.6/src/cache.h
14423 --- dillo-0.6.6/src/cache.h 2002-02-20 08:54:02.000000000 -0700
14424 +++ dillo2-0.6.6/src/cache.h 2003-04-21 12:35:33.000000000 -0600
14426 gint Key; /* Primary Key for this client */
14427 const DilloUrl *Url; /* Pointer to a cache entry Url */
14428 guchar *Buf; /* Pointer to cache-data */
14429 + char *Encoding; /* A charset encoding obtained from the header */
14430 guint BufSize; /* Valid size of cache-data */
14431 CA_Callback_t Callback; /* Client function */
14432 void *CbData; /* Client function data */
14433 diff -urN dillo-0.6.6/src/commands.c dillo2-0.6.6/src/commands.c
14434 --- dillo-0.6.6/src/commands.c 2002-04-09 19:04:54.000000000 -0600
14435 +++ dillo2-0.6.6/src/commands.c 2003-04-21 12:35:34.000000000 -0600
14437 void a_Commands_viewsource_callback (GtkWidget *widget, gpointer client_data)
14439 BrowserWindow *bw = (BrowserWindow *)client_data;
14441 - gint size, xsize, ysize;
14442 + gchar *buf, *utf8_buf;
14443 + gint size, xsize, ysize, written;
14444 GtkWidget *window, *box1, *button, *scrolled_window, *text;
14445 + GtkTextBuffer *buffer;
14446 + GError *err = NULL;
14448 if (bw->viewsource_window)
14449 gtk_widget_destroy (bw->viewsource_window);
14450 @@ -114,10 +116,6 @@
14451 gtk_widget_set_usize (window, xsize, ysize);
14452 gtk_window_set_policy (GTK_WINDOW(window), TRUE, TRUE, FALSE);
14454 - gtk_signal_connect (GTK_OBJECT (window), "destroy",
14455 - GTK_SIGNAL_FUNC(gtk_widget_destroyed),
14456 - &bw->viewsource_window);
14458 gtk_window_set_title (GTK_WINDOW (window), "View Source");
14459 gtk_container_border_width (GTK_CONTAINER (window), 0);
14461 @@ -132,20 +130,24 @@
14462 GTK_POLICY_ALWAYS);
14463 gtk_widget_show (scrolled_window);
14465 - text = gtk_text_new (NULL, NULL);
14466 - gtk_text_set_editable (GTK_TEXT (text), FALSE);
14467 + text = gtk_text_view_new ();
14468 + gtk_text_view_set_editable (GTK_TEXT_VIEW(text), FALSE);
14469 + gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW(text), GTK_WRAP_CHAR);
14470 gtk_container_add (GTK_CONTAINER (scrolled_window), text);
14471 gtk_widget_show (text);
14473 - gtk_text_freeze (GTK_TEXT (text));
14474 + buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
14475 buf = a_Cache_url_read(a_History_get_url(NAV_TOP(bw)), &size);
14476 - gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, buf, size);
14477 - gtk_text_thaw (GTK_TEXT (text));
14478 + utf8_buf = g_convert(buf, size, "utf8", "iso8859-1", NULL, &written,&err);
14479 + if (err != NULL) g_warning ("a_Commands_viewsource_callback(): %s\n",
14481 + gtk_text_buffer_set_text(buffer, utf8_buf, written);
14482 + g_free (utf8_buf);
14484 button = gtk_button_new_with_label ("close");
14485 - gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
14486 - GTK_SIGNAL_FUNC(gtk_widget_destroy),
14487 - GTK_OBJECT (window));
14488 + g_signal_connect_object (G_OBJECT (button), "clicked",
14489 + G_CALLBACK(gtk_widget_destroy),
14490 + G_OBJECT(window), G_CONNECT_SWAPPED);
14491 gtk_box_pack_start (GTK_BOX (box1), button, FALSE, FALSE, 0);
14492 GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
14493 gtk_widget_grab_default (button);
14494 @@ -211,7 +213,7 @@
14496 * Second handler for button-press-event in the toolbar
14498 -void a_Commands_navpress_callback(GtkWidget *widget,
14499 +gboolean a_Commands_navpress_callback(GtkWidget *widget,
14500 GdkEventButton *event,
14501 gpointer client_data)
14503 @@ -231,22 +233,24 @@
14504 bw->menu_popup.over_back = a_Menu_popup_history_new(bw, -1);
14505 gtk_menu_popup(GTK_MENU (bw->menu_popup.over_back), NULL, NULL,
14506 NULL, NULL, event->button, event->time);
14509 } else if (widget == bw->forw_button) {
14510 if (bw->menu_popup.over_forw)
14511 gtk_widget_destroy(bw->menu_popup.over_forw);
14512 bw->menu_popup.over_forw = a_Menu_popup_history_new(bw, +1);
14513 gtk_menu_popup(GTK_MENU (bw->menu_popup.over_forw), NULL, NULL,
14514 NULL, NULL, event->button, event->time);
14523 * Second handler for button-press-event in history menus.
14525 -void a_Commands_historypress_callback(GtkWidget *widget,
14526 +gboolean a_Commands_historypress_callback(GtkWidget *widget,
14527 GdkEventButton *event,
14528 gpointer client_data)
14530 @@ -256,15 +260,19 @@
14532 /* Open link in the same bw */
14533 a_Nav_jump_callback(widget, bw, 0);
14537 /* Open link in a new bw */
14538 a_Nav_jump_callback(widget, bw, 1);
14550 diff -urN dillo-0.6.6/src/commands.h dillo2-0.6.6/src/commands.h
14551 --- dillo-0.6.6/src/commands.h 2002-04-09 19:24:40.000000000 -0600
14552 +++ dillo2-0.6.6/src/commands.h 2003-04-21 12:35:34.000000000 -0600
14554 void a_Commands_findtext_callback (GtkWidget *widget, gpointer client_data);
14555 void a_Commands_print_callback (GtkWidget *widget, gpointer client_data);
14557 -void a_Commands_navpress_callback (
14558 +gboolean a_Commands_navpress_callback (
14559 GtkWidget *widget, GdkEventButton *event, gpointer client_data);
14560 -void a_Commands_historypress_callback(
14561 +gboolean a_Commands_historypress_callback(
14562 GtkWidget *widget, GdkEventButton *event, gpointer client_data);
14564 void a_Commands_back_callback (GtkWidget *widget, gpointer client_data);
14565 diff -urN dillo-0.6.6/src/cookies.c dillo2-0.6.6/src/cookies.c
14566 --- dillo-0.6.6/src/cookies.c 2002-05-27 14:47:49.000000000 -0600
14567 +++ dillo2-0.6.6/src/cookies.c 2003-04-21 12:35:37.000000000 -0600
14568 @@ -78,14 +78,13 @@
14569 static FILE *Cookies_fopen(const char *file, gchar *init_str);
14570 static CookieControlAction Cookies_control_check(const DilloUrl *url);
14571 static CookieControlAction Cookies_control_check_domain(const char *domain);
14572 -static void Cookie_control_init();
14573 +static int Cookie_control_init();
14574 static void Cookies_parse_ports(CookieData_t *cookie, const char *port_str);
14575 static char *Cookies_build_ports_str(CookieData_t *cookie);
14578 * Return a file pointer. If the file doesn't exist, try to create it,
14579 * with the optional 'init_str' as its content.
14580 - * This function is either successful or exits Dillo.
14582 static FILE *Cookies_fopen(const char *filename, gchar *init_str)
14584 @@ -124,6 +123,10 @@
14589 + * Initialize the cookies module
14590 + * (The 'disabled' variable is writable only within a_Cookies_init)
14592 void a_Cookies_init()
14594 CookieData_t *cookie;
14595 @@ -131,7 +134,14 @@
14597 char line[LINE_MAXLEN];
14599 - Cookie_control_init();
14600 + /* Default setting */
14603 + /* Read and parse the cookie control file (cookiesrc) */
14604 + if (Cookie_control_init() != 0) {
14605 + DEBUG_MSG(10, "Disabling cookies.\n");
14609 /* Get a stream for the cookies file */
14610 filename = a_Misc_prepend_user_home(".dillo/cookies");
14611 @@ -139,8 +149,7 @@
14614 if (!file_stream) {
14615 - /* Can't open the file, so we disable cookies */
14617 + DEBUG_MSG(10, "ERROR: Can't open ~/.dillo/cookies, disabling cookies\n");
14621 @@ -153,6 +162,8 @@
14625 + DEBUG_MSG(10, "Enabling cookies as from cookiesrc...\n");
14627 cookies = g_hash_table_new(g_str_hash, g_str_equal);
14629 /* Get all lines in the file */
14630 @@ -976,9 +987,13 @@
14634 - * Get the cookie control rules
14635 + * Get the cookie control rules (from cookiesrc).
14637 + * 0 = Parsed OK, with cookies enabled
14638 + * 1 = Parsed OK, with cookies disabled
14639 + * 2 = Can't open the control file
14641 -static void Cookie_control_init()
14642 +static int Cookie_control_init()
14646 @@ -987,6 +1002,7 @@
14647 char domain[LINE_MAXLEN];
14648 char rule[LINE_MAXLEN];
14650 + gboolean enabled = FALSE;
14652 /* Get a file pointer */
14653 filename = a_Misc_prepend_user_home(".dillo/cookiesrc");
14654 @@ -994,7 +1010,7 @@
14661 /* Get all lines in the file */
14662 while (!feof(stream)) {
14663 @@ -1045,10 +1061,15 @@
14664 a_List_add(ccontrol, num_ccontrol, num_ccontrol_max);
14665 ccontrol[num_ccontrol++] = cc;
14668 + if (cc.action != COOKIE_DENY)
14675 + return (enabled ? 0 : 1);
14679 diff -urN dillo-0.6.6/src/dillo.c dillo2-0.6.6/src/dillo.c
14680 --- dillo-0.6.6/src/dillo.c 2002-03-18 08:02:50.000000000 -0700
14681 +++ dillo2-0.6.6/src/dillo.c 2003-04-21 12:35:38.000000000 -0600
14686 -#include "dw_gtk_statuslabel.h"
14688 #include "history.h"
14689 #include "bookmark.h"
14691 * todo: implement a cleaner mechanism (in file.c) */
14692 signal(SIGPIPE, SIG_IGN);
14694 - g_print("Setting locale to %s\n", gtk_set_locale());
14695 gtk_init(&argc, &argv);
14698 diff -urN dillo-0.6.6/src/dns.c dillo2-0.6.6/src/dns.c
14699 --- dillo-0.6.6/src/dns.c 2002-02-14 12:17:08.000000000 -0700
14700 +++ dillo2-0.6.6/src/dns.c 2003-04-21 12:35:39.000000000 -0600
14702 gint channel; /* Index of this channel [0 based] */
14703 gboolean in_use; /* boolean to tell if server is doing a lookup */
14704 gboolean ip_ready; /* boolean: is IP lookup done? */
14705 - guint32 ip_addr; /* IP address */
14706 + GSList *addr_list; /* IP address */
14707 char *hostname; /* Adress to resolve */
14708 guint timeout_id; /* gtk timeout function ID */
14709 #ifdef G_DNS_THREADED
14713 char *hostname; /* host name for cache */
14714 - guint32 ip_addr; /* address of host */
14715 + GSList *addr_list; /* address of host */
14720 static gint dns_queue_size, dns_queue_size_max;
14721 /* A list for hostnames that haven't been solved */
14722 static GSList *PendingHosts = NULL;
14723 +static gboolean ipv6_enabled;
14726 /* ----------------------------------------------------------------------
14727 @@ -171,11 +172,11 @@
14729 * Add an IP/hostname pair to Dns-cache
14731 -static void Dns_cache_add(char *hostname, guint32 ip_addr)
14732 +static void Dns_cache_add(char *hostname, GSList *addr_list)
14734 a_List_add(dns_cache, dns_cache_size, dns_cache_size_max);
14735 dns_cache[dns_cache_size].hostname = g_strdup(hostname);
14736 - dns_cache[dns_cache_size].ip_addr = ip_addr;
14737 + dns_cache[dns_cache_size].addr_list = addr_list;
14739 DEBUG_MSG(1, "Cache objects: %d\n", dns_cache_size);
14741 @@ -204,13 +205,45 @@
14742 dns_server[i].channel = i;
14743 dns_server[i].in_use = FALSE;
14744 dns_server[i].ip_ready = FALSE;
14745 - dns_server[i].ip_addr = 0;
14746 + dns_server[i].addr_list = NULL;
14747 dns_server[i].hostname = NULL;
14748 dns_server[i].timeout_id = -1;
14749 #ifdef G_DNS_THREADED
14750 dns_server[i].th1 = (pthread_t) -1;
14754 +#ifdef ENABLE_IPV6
14756 + /* If the IPv6 address family is not available there is no point
14757 + wasting time trying to connect to v6 addresses. */
14758 + int fd = socket(AF_INET6, SOCK_STREAM, 0);
14761 + ipv6_enabled = TRUE;
14768 + * Allocate a host structure and add it to the list
14770 +static GSList *note_hosts(GSList *list, int af, struct hostent *host)
14773 + if (host->h_length > DILLO_ADDR_MAX)
14775 + for (i = 0; host->h_addr_list[i]; i++) {
14776 + DilloHost *dh = g_malloc(sizeof(DilloHost));
14777 + memset(dh, 0, sizeof(dh));
14779 + dh->alen = host->h_length;
14780 + memcpy(&dh->data[0], host->h_addr_list[i], host->h_length);
14781 + printf("adding address, length %d\n", host->h_length);
14782 + list = g_slist_append(list, dh);
14788 @@ -219,13 +252,13 @@
14789 static void *Dns_server(void *data)
14791 struct hostent *host;
14793 gint channel = GPOINTER_TO_INT(data);
14799 + GSList *hosts = NULL;
14801 #ifdef G_DNS_THREADED
14802 /* Set this thread to detached state */
14803 @@ -235,6 +268,14 @@
14804 DEBUG_MSG(3, "Dns_server: starting...\n ch: %d host: %s\n",
14805 channel, dns_server[channel].hostname);
14807 +#ifdef ENABLE_IPV6
14808 + if (ipv6_enabled) {
14809 + host = gethostbyname2(dns_server[channel].hostname, AF_INET6);
14811 + hosts = note_hosts(hosts, AF_INET6, host);
14816 host = gethostbyname_r(dns_server[channel].hostname, &sh, buff,
14817 sizeof(buff), &h_err);
14818 @@ -242,17 +283,13 @@
14819 host = gethostbyname(dns_server[channel].hostname);
14822 - if (host == NULL) {
14825 - memcpy(&ip_addr, host->h_addr_list[0], sizeof(ip_addr));
14826 - ip_addr = ntohl(ip_addr);
14829 + hosts = note_hosts(hosts, AF_INET, host);
14831 /* write hostname to client */
14832 - DEBUG_MSG(5, "Dns_server [%d]: %s is %x\n", channel,
14833 - dns_server[channel].hostname, ip_addr);
14834 - dns_server[channel].ip_addr = ip_addr;
14835 + DEBUG_MSG(5, "Dns_server [%d]: %s is %p\n", channel,
14836 + dns_server[channel].hostname, hosts);
14837 + dns_server[channel].addr_list = hosts;
14838 dns_server[channel].ip_ready = TRUE;
14840 return NULL; /* (avoids a compiler warning) */
14841 @@ -267,8 +304,8 @@
14842 static void Dns_blocking_server(void)
14844 struct hostent *host;
14847 + GSList *hosts = NULL;
14850 DEBUG_MSG(3, "Dns_blocking_server: starting...\n");
14851 @@ -278,17 +315,15 @@
14852 host = gethostbyname(dns_server[index].hostname);
14853 if (host == NULL) {
14854 DEBUG_MSG(3, "--> Dns_blocking_server: gethostbyname NULL return\n");
14857 DEBUG_MSG(3, "--> Dns_blocking_server - good return\n");
14858 - memcpy(&ip_addr, host->h_addr_list[0], sizeof(ip_addr));
14859 - ip_addr = ntohl(ip_addr);
14860 + hosts = note_hosts(hosts, AF_INET, host);
14863 /* write IP to server data channel */
14864 - DEBUG_MSG(3, "Dns_blocking_server: IP of %s is %x\n",
14865 - dns_server[index].hostname, ip_addr);
14866 - dns_server[index].ip_addr = ip_addr;
14867 + DEBUG_MSG(3, "Dns_blocking_server: IP of %s is %p\n",
14868 + dns_server[index].hostname, hosts);
14869 + dns_server[index].ip_addr = hosts;
14870 dns_server[index].ip_ready = TRUE;
14872 DEBUG_MSG(3, "Dns_blocking_server: leaving...\n");
14873 @@ -337,7 +372,7 @@
14875 /* if it hits already resolved, call the Callback inmediately. */
14876 if (i < dns_cache_size) {
14877 - a_Dns_ccc(OpSend, 1, Info, &dns_cache[i].ip_addr, NULL);
14878 + a_Dns_ccc(OpSend, 1, Info, dns_cache[i].addr_list, NULL);
14879 a_Dns_ccc(OpEnd, 1, Info, NULL, NULL);
14882 @@ -374,10 +409,10 @@
14883 for (i = 0; i < dns_queue_size; i++) {
14884 if (dns_queue[i].channel == channel) {
14885 Info = dns_queue[i].Info;
14886 - if ( srv->ip_addr == 0 ) {
14887 + if ( srv->addr_list == NULL ) {
14888 a_Dns_ccc(OpAbort, 1, Info, NULL, NULL);
14890 - a_Dns_ccc(OpSend, 1, Info, &srv->ip_addr, NULL);
14891 + a_Dns_ccc(OpSend, 1, Info, srv->addr_list, NULL);
14892 a_Dns_ccc(OpEnd, 1, Info, NULL, NULL);
14894 Dns_queue_remove(i);
14895 @@ -426,9 +461,9 @@
14896 DnsServer *srv = &dns_server[channel];
14898 if ( srv->ip_ready ){
14899 - if (srv->ip_addr != 0) {
14900 + if (srv->addr_list != NULL) {
14901 /* DNS succeeded, let's cache it */
14902 - Dns_cache_add(srv->hostname, srv->ip_addr);
14903 + Dns_cache_add(srv->hostname, srv->addr_list);
14905 Dns_serve_channel(channel);
14906 Dns_assign_channels();
14907 diff -urN dillo-0.6.6/src/dns.h dillo2-0.6.6/src/dns.h
14908 --- dillo-0.6.6/src/dns.h 2002-01-08 06:49:14.000000000 -0700
14909 +++ dillo2-0.6.6/src/dns.h 2003-04-21 12:35:39.000000000 -0600
14911 void a_Dns_freeall(void);
14912 void a_Dns_ccc(int Op, int Br, ChainLink *Info, void *Data, void *ExtraData);
14914 +#define DILLO_ADDR_MAX 16
14916 +typedef struct _DilloHost
14920 + char data[DILLO_ADDR_MAX];
14925 #endif /* __cplusplus */
14926 diff -urN dillo-0.6.6/src/dw_aligned_page.c dillo2-0.6.6/src/dw_aligned_page.c
14927 --- dillo-0.6.6/src/dw_aligned_page.c 2002-03-18 08:02:50.000000000 -0700
14928 +++ dillo2-0.6.6/src/dw_aligned_page.c 2003-04-21 12:35:40.000000000 -0600
14929 @@ -44,25 +44,27 @@
14931 * Standard Gtk+ function.
14933 -GtkType a_Dw_aligned_page_get_type (void)
14934 +GType a_Dw_aligned_page_get_type (void)
14936 - static GtkType type = 0;
14937 + static GType type = 0;
14940 - GtkTypeInfo info = {
14942 - sizeof (DwAlignedPage),
14943 + GTypeInfo info = {
14944 sizeof (DwAlignedPageClass),
14945 - (GtkClassInitFunc) Dw_aligned_page_class_init,
14946 - (GtkObjectInitFunc) Dw_aligned_page_init,
14947 - (GtkArgSetFunc) NULL,
14948 - (GtkArgGetFunc) NULL,
14949 - (GtkClassInitFunc) NULL
14950 + (GBaseInitFunc) NULL,
14951 + (GBaseFinalizeFunc) NULL,
14952 + (GClassInitFunc) Dw_aligned_page_class_init,
14953 + (GClassFinalizeFunc) NULL,
14954 + (gconstpointer) NULL,
14955 + sizeof (DwAlignedPage),
14957 + (GInstanceInitFunc) Dw_aligned_page_init,
14958 + (GTypeValueTable *) NULL
14961 - type = gtk_type_unique (DW_TYPE_PAGE, &info);
14962 + GTypeFlags flags = 0;
14963 + type = g_type_register_static(DW_TYPE_PAGE, "DwAlignedPage",
14971 DwAlignedPage *aligned_page = DW_ALIGNED_PAGE (object);
14973 if (aligned_page->list) {
14974 - if (aligned_page->list->num == 1) {
14975 + if (aligned_page->list->refcount == 1) {
14976 /* This is the last page in the array, so the list is removed. */
14977 g_free (aligned_page->list->pages);
14978 g_free (aligned_page->list->values);
14979 @@ -106,10 +108,11 @@
14981 aligned_page->list->pages[aligned_page->list_pos] = NULL;
14982 aligned_page->list->values[aligned_page->list_pos] = 0;
14983 + aligned_page->list->refcount--;
14987 - (* GTK_OBJECT_CLASS(parent_class)->destroy) (object);
14988 + GTK_OBJECT_CLASS(parent_class)->destroy (object);
14992 @@ -124,8 +127,9 @@
14993 DwAlignedPageList *list;
14995 if (ref_page == NULL) {
14996 - list = g_new(DwAlignedPageList, 1);
14997 + list = g_new (DwAlignedPageList, 1);
14999 + list->refcount = 0;
15000 list->pages = NULL;
15001 list->values = NULL;
15002 list->num_pages_max = 4;
15003 @@ -135,9 +139,10 @@
15004 list = ref_page->list;
15007 - a_List_add(list->pages, list->num, list->num_pages_max);
15008 + list->refcount++;
15009 + a_List_add (list->pages, list->num, list->num_pages_max);
15010 list->pages[list->num - 1] = aligned_page;
15011 - a_List_add(list->values, list->num, list->num_values_max);
15012 + a_List_add (list->values, list->num, list->num_values_max);
15013 list->values[list->num - 1] = 0;
15014 aligned_page->list = list;
15015 aligned_page->list_pos = list->num - 1;
15016 @@ -155,7 +160,7 @@
15019 if (aligned_page->list) {
15020 - klass = DW_ALIGNED_PAGE_CLASS (GTK_OBJECT(aligned_page)->klass);
15021 + klass = DW_ALIGNED_PAGE_CLASS(G_OBJECT_GET_CLASS(G_OBJECT(aligned_page)));
15022 aligned_page->list->values[aligned_page->list_pos] =
15023 klass->get_value (aligned_page);
15025 @@ -165,16 +170,17 @@
15026 aligned_page->list->max_value =
15027 aligned_page->list->values[aligned_page->list_pos];
15029 - for(i = 0; i < aligned_page->list->num; i++)
15030 + for (i = 0; i < aligned_page->list->num; i++)
15031 if (aligned_page->list->pages[i]) {
15032 - klass = DW_ALIGNED_PAGE_CLASS
15033 - (GTK_OBJECT(aligned_page->list->pages[i])->klass);
15034 + klass = DW_ALIGNED_PAGE_CLASS(G_OBJECT_GET_CLASS(
15035 + G_OBJECT(aligned_page->list->pages[i])));
15036 klass->set_max_value (aligned_page->list->pages[i],
15037 aligned_page->list->max_value);
15040 /* No change, apply old max_value only to this page. */
15041 - klass = DW_ALIGNED_PAGE_CLASS (GTK_OBJECT(aligned_page)->klass);
15042 + klass = DW_ALIGNED_PAGE_CLASS(G_OBJECT_GET_CLASS(
15043 + G_OBJECT(aligned_page)));
15044 klass->set_max_value (aligned_page, aligned_page->list->max_value);
15047 diff -urN dillo-0.6.6/src/dw_aligned_page.h dillo2-0.6.6/src/dw_aligned_page.h
15048 --- dillo-0.6.6/src/dw_aligned_page.h 2002-03-13 05:08:40.000000000 -0700
15049 +++ dillo2-0.6.6/src/dw_aligned_page.h 2003-04-21 12:35:40.000000000 -0600
15052 struct _DwAlignedPageList
15055 + gint num; /* The index of the last page added (minus one). */
15056 + gint refcount; /* The numbers of non-NULL pages, may be smaller than num.
15057 + * The distinction is necessary, because removing is
15058 + * simply done by assigning NULL. */
15059 DwAlignedPage **pages;
15061 gint num_pages_max;
15062 diff -urN dillo-0.6.6/src/dw_bullet.c dillo2-0.6.6/src/dw_bullet.c
15063 --- dillo-0.6.6/src/dw_bullet.c 2002-03-13 05:08:40.000000000 -0700
15064 +++ dillo2-0.6.6/src/dw_bullet.c 2003-04-21 12:35:40.000000000 -0600
15065 @@ -22,25 +22,27 @@
15066 GdkEventExpose *event);
15069 -GtkType a_Dw_bullet_get_type (void)
15070 +GType a_Dw_bullet_get_type (void)
15072 - static GtkType type = 0;
15073 + static GType type = 0;
15076 - GtkTypeInfo info = {
15078 - sizeof (DwBullet),
15079 + GTypeInfo info = {
15080 sizeof (DwBulletClass),
15081 - (GtkClassInitFunc) Dw_bullet_class_init,
15082 - (GtkObjectInitFunc) Dw_bullet_init,
15083 - (GtkArgSetFunc) NULL,
15084 - (GtkArgGetFunc) NULL,
15085 - (GtkClassInitFunc) NULL
15086 + (GBaseInitFunc) NULL,
15087 + (GBaseFinalizeFunc) NULL,
15088 + (GClassInitFunc) Dw_bullet_class_init,
15089 + (GClassFinalizeFunc) NULL,
15090 + (gconstpointer) NULL,
15091 + sizeof (DwBullet),
15093 + (GInstanceInitFunc) Dw_bullet_init,
15094 + (GTypeValueTable *) NULL
15097 - type = gtk_type_unique (DW_TYPE_WIDGET, &info);
15098 + GTypeFlags flags = 0;
15099 + type = g_type_register_static(DW_TYPE_WIDGET, "DwBullet",
15106 @@ -89,21 +91,21 @@
15110 - x = p_Dw_widget_x_world_to_viewport (widget, widget->allocation.x);
15111 - y = p_Dw_widget_y_world_to_viewport (widget, widget->allocation.y);
15112 + x = widget->allocation.x;
15113 + y = widget->allocation.y;
15114 gc = widget->style->color->gc;
15115 window = DW_WIDGET_WINDOW (widget);
15117 switch (DW_BULLET(widget)->type) {
15118 case DW_BULLET_DISC:
15119 - gdk_draw_arc(window, gc, TRUE, x + 2, y + 1, 4, 4, 0, 360 * 64);
15120 - gdk_draw_arc(window, gc, FALSE, x + 2, y + 1, 4, 4, 0, 360 * 64);
15121 + gdk_draw_arc (window, gc, TRUE, x + 2, y + 1, 4, 4, 0, 360 * 64);
15122 + gdk_draw_arc (window, gc, FALSE, x + 2, y + 1, 4, 4, 0, 360 * 64);
15124 case DW_BULLET_CIRCLE:
15125 - gdk_draw_arc(window, gc, FALSE, x + 1, y, 6, 6, 0, 360 * 64);
15126 + gdk_draw_arc (window, gc, FALSE, x + 1, y, 6, 6, 0, 360 * 64);
15128 case DW_BULLET_SQUARE:
15129 - gdk_draw_rectangle(window, gc, FALSE, x + 1, y, 6, 6);
15130 + gdk_draw_rectangle (window, gc, FALSE, x + 1, y, 6, 6);
15132 default: /* Should/could the numeric bullets be treated here ? */
15134 diff -urN dillo-0.6.6/src/dw_button.c dillo2-0.6.6/src/dw_button.c
15135 --- dillo-0.6.6/src/dw_button.c 2002-03-18 08:02:50.000000000 -0700
15136 +++ dillo2-0.6.6/src/dw_button.c 2003-04-21 12:35:41.000000000 -0600
15138 * This widget imitates the look and behavior of GtkButton.
15141 +#include <gtk/gtk.h>
15142 #include "dw_button.h"
15143 #include "dw_gtk_viewport.h"
15144 -#include <gtk/gtk.h>
15145 +#include "dw_marshal.h"
15147 static void Dw_button_init (DwButton *button);
15148 static void Dw_button_class_init (DwButtonClass *klass);
15150 DwCallback callback,
15151 gpointer callback_data);
15153 +static DwIterator* Dw_button_iterator (DwWidget *widget,
15155 +static gboolean Dw_button_iterator_next (DwIterator *it);
15156 +static DwIterator* Dw_button_iterator_clone (DwIterator *it);
15166 @@ -72,38 +80,50 @@
15168 * Return the type of DwButton
15170 -GtkType a_Dw_button_get_type (void)
15171 +GType a_Dw_button_get_type (void)
15173 - static GtkType type = 0;
15174 + static GType type = 0;
15177 - GtkTypeInfo info = {
15179 - sizeof (DwButton),
15180 + GTypeInfo info = {
15181 sizeof (DwButtonClass),
15182 - (GtkClassInitFunc) Dw_button_class_init,
15183 - (GtkObjectInitFunc) Dw_button_init,
15184 - (GtkArgSetFunc) NULL,
15185 - (GtkArgGetFunc) NULL,
15186 - (GtkClassInitFunc) NULL
15187 + (GBaseInitFunc) NULL,
15188 + (GBaseFinalizeFunc) NULL,
15189 + (GClassInitFunc) Dw_button_class_init,
15190 + (GClassFinalizeFunc) NULL,
15191 + (gconstpointer) NULL,
15192 + sizeof (DwButton),
15194 + (GInstanceInitFunc) Dw_button_init,
15195 + (GTypeValueTable *) NULL
15198 - type = gtk_type_unique (DW_TYPE_CONTAINER, &info);
15199 + GTypeFlags flags = 0;
15200 + type = g_type_register_static(DW_TYPE_CONTAINER, "DwButton",
15209 * Standard Gtk+ function.
15211 -DwWidget* a_Dw_button_new (void)
15213 - GtkObject *object;
15215 + * - "flags" is a mask for the window flags, it should be the mask the
15216 + * child uses (e.g. DW_USES_HINT for DwPage, 0 for DwImage). (Will
15217 + * hopefully be removed soon.)
15218 + * - When passing FALSE for "relief", the button will neither have a
15219 + * border, nor paint a background.
15221 +DwWidget* a_Dw_button_new (gint flags,
15224 + DwButton *button;
15226 + button = DW_BUTTON (gtk_object_new (DW_TYPE_BUTTON, NULL));
15227 + DW_WIDGET_SET_FLAGS (button, flags);
15228 + button->relief = relief;
15230 - object = gtk_object_new (DW_TYPE_BUTTON, NULL);
15231 - return DW_WIDGET (object);
15232 + return DW_WIDGET (button);
15236 @@ -112,7 +132,6 @@
15238 static void Dw_button_init (DwButton *button)
15240 - DW_WIDGET_SET_FLAGS (button, DW_USES_HINTS);
15241 button->child = NULL;
15242 button->in_button = FALSE;
15243 button->pressed = FALSE;
15244 @@ -134,13 +153,24 @@
15245 parent_class = gtk_type_class (DW_TYPE_CONTAINER);
15247 button_signals[CLICKED] =
15248 - gtk_signal_new ("clicked",
15249 - GTK_RUN_FIRST | GTK_RUN_ACTION,
15250 - object_class->type,
15251 - GTK_SIGNAL_OFFSET (DwButtonClass, clicked),
15252 - gtk_marshal_NONE__NONE,
15253 - GTK_TYPE_NONE, 0);
15254 - gtk_object_class_add_signals (object_class, button_signals, LAST_SIGNAL);
15255 + g_signal_new ("clicked",
15256 + G_TYPE_FROM_CLASS(object_class),
15257 + G_SIGNAL_RUN_FIRST,
15258 + G_STRUCT_OFFSET (DwButtonClass, clicked),
15261 + p_Dw_marshal_VOID__VOID,
15262 + G_TYPE_NONE, 0, NULL);
15263 + button_signals[CLICKED_AT] =
15264 + g_signal_new ("clicked_at",
15265 + G_TYPE_FROM_CLASS(object_class),
15266 + G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
15267 + G_STRUCT_OFFSET (DwButtonClass, clicked_at),
15270 + p_Dw_marshal_VOID__INT_INT,
15272 + 2, G_TYPE_INT, G_TYPE_INT);
15274 widget_class->size_request = Dw_button_size_request;
15275 widget_class->get_extremes = Dw_button_get_extremes;
15276 @@ -153,12 +183,14 @@
15277 widget_class->button_release_event = Dw_button_button_release;
15278 widget_class->enter_notify_event = Dw_button_enter_notify;
15279 widget_class->leave_notify_event = Dw_button_leave_notify;
15280 + widget_class->iterator = Dw_button_iterator;
15282 container_class->add = Dw_button_add;
15283 container_class->remove = Dw_button_remove;
15284 container_class->forall = Dw_button_forall;
15286 klass->clicked = NULL;
15287 + klass->clicked_at = NULL;
15291 @@ -170,19 +202,22 @@
15293 DwButton *button = DW_BUTTON (widget);
15294 DwRequisition child_requisition;
15295 - GtkStyleClass *styleclass = widget->viewport->style->klass;
15296 + GtkStyle *style = widget->viewport->style;
15298 - if (button->child)
15299 + if (button->child) {
15300 a_Dw_widget_size_request (button->child, &child_requisition);
15302 - child_requisition.width = 0;
15303 - child_requisition.ascent = 0;
15304 - child_requisition.descent = 0;
15305 + *requisition = child_requisition;
15307 + requisition->width = 0;
15308 + requisition->ascent = 0;
15309 + requisition->descent = 0;
15312 - requisition->width = child_requisition.width + 2 * styleclass->xthickness;
15313 - requisition->ascent = child_requisition.ascent + styleclass->ythickness;
15314 - requisition->descent = child_requisition.descent + styleclass->ythickness;
15315 + if (button->relief) {
15316 + requisition->width += 2 * style->xthickness;
15317 + requisition->ascent += style->ythickness;
15318 + requisition->descent += style->ythickness;
15323 @@ -194,17 +229,20 @@
15325 DwButton *button = DW_BUTTON (widget);
15326 DwExtremes child_extremes;
15327 - GtkStyleClass *styleclass = widget->viewport->style->klass;
15328 + GtkStyle *style = widget->viewport->style;
15330 - if (button->child)
15331 + if (button->child) {
15332 a_Dw_widget_get_extremes (button->child, &child_extremes);
15334 - child_extremes.min_width = 0;
15335 - child_extremes.max_width = 0;
15336 + *extremes = child_extremes;
15338 + extremes->min_width = 0;
15339 + extremes->max_width = 0;
15342 - extremes->min_width = child_extremes.min_width + 2 * styleclass->xthickness;
15343 - extremes->max_width = child_extremes.max_width + 2 * styleclass->xthickness;
15344 + if (button->relief) {
15345 + extremes->min_width += 2 * style->xthickness;
15346 + extremes->max_width += 2 * style->xthickness;
15351 @@ -216,14 +254,19 @@
15353 DwButton *button = DW_BUTTON (widget);
15354 DwAllocation child_allocation;
15355 - GtkStyleClass *styleclass = widget->viewport->style->klass;
15356 + GtkStyle *style = widget->viewport->style;
15358 if (button->child) {
15359 - child_allocation. x = allocation->x + styleclass->xthickness;
15360 - child_allocation. y = allocation->y + styleclass->ythickness;
15361 - child_allocation.width = allocation->width - 2 * styleclass->xthickness;
15362 - child_allocation.ascent = allocation->ascent - styleclass->ythickness;
15363 - child_allocation.descent = allocation->descent - styleclass->ythickness;
15364 + child_allocation = *allocation;
15366 + if (button->relief) {
15367 + child_allocation.x += style->xthickness;
15368 + child_allocation.y += style->ythickness;
15369 + child_allocation.width -= 2 * style->xthickness;
15370 + child_allocation.ascent -= style->ythickness;
15371 + child_allocation.descent -= style->ythickness;
15374 a_Dw_widget_size_allocate (button->child, &child_allocation);
15377 @@ -240,7 +283,8 @@
15379 a_Dw_widget_set_width
15381 - width - 2 * widget->viewport->style->klass->xthickness);
15382 + width - (button->relief ?
15383 + (2 * widget->viewport->style->xthickness) : 0));
15387 @@ -255,7 +299,8 @@
15389 a_Dw_widget_set_ascent
15391 - ascent - widget->viewport->style->klass->ythickness);
15392 + ascent - (button->relief ?
15393 + widget->viewport->style->ythickness : 0));
15397 @@ -270,7 +315,8 @@
15399 a_Dw_widget_set_descent
15401 - descent - widget->viewport->style->klass->ythickness);
15402 + descent - (button->relief ?
15403 + widget->viewport->style->ythickness : 0));
15407 @@ -287,40 +333,45 @@
15408 GdkRectangle gdk_area;
15409 DwRectangle child_area;
15411 - if (button->sensitive) {
15412 - if (button->in_button) {
15413 - if (button->pressed) {
15414 - state = GTK_STATE_ACTIVE;
15415 - shadow = GTK_SHADOW_IN;
15416 + if (button->relief) {
15417 + if (button->sensitive) {
15418 + if (button->in_button) {
15419 + if (button->pressed) {
15420 + state = GTK_STATE_ACTIVE;
15421 + shadow = GTK_SHADOW_IN;
15423 + state = GTK_STATE_PRELIGHT;
15424 + shadow = GTK_SHADOW_OUT;
15427 - state = GTK_STATE_PRELIGHT;
15428 + state = GTK_STATE_NORMAL;
15429 shadow = GTK_SHADOW_OUT;
15432 - state = GTK_STATE_NORMAL;
15433 + state = GTK_STATE_INSENSITIVE;
15434 shadow = GTK_SHADOW_OUT;
15437 - state = GTK_STATE_INSENSITIVE;
15438 - shadow = GTK_SHADOW_OUT;
15441 + p_Dw_widget_x_world_to_viewport (widget,
15442 + area->x + widget->allocation.x);
15444 + p_Dw_widget_y_world_to_viewport (widget,
15445 + area->y + widget->allocation.y);
15446 + gdk_area.width = area->width;
15447 + gdk_area.height = area->height;
15449 + gtk_paint_box (widget->viewport->style, DW_WIDGET_WINDOW (widget),
15450 + state, shadow, &gdk_area, widget->viewport,
15452 + p_Dw_widget_x_world_to_viewport (widget,
15453 + widget->allocation.x),
15454 + p_Dw_widget_y_world_to_viewport (widget,
15455 + widget->allocation.y),
15456 + widget->allocation.width,
15457 + widget->allocation.ascent + widget->allocation.descent);
15461 - p_Dw_widget_x_world_to_viewport (widget, area->x + widget->allocation.x);
15463 - p_Dw_widget_y_world_to_viewport (widget, area->y + widget->allocation.y);
15464 - gdk_area.width = area->width;
15465 - gdk_area.height = area->height;
15467 - gtk_paint_box (widget->viewport->style, DW_WIDGET_WINDOW (widget),
15468 - state, shadow, &gdk_area, widget->viewport, "buttondefault",
15469 - p_Dw_widget_x_world_to_viewport (widget,
15470 - widget->allocation.x),
15471 - p_Dw_widget_y_world_to_viewport (widget,
15472 - widget->allocation.y),
15473 - widget->allocation.width,
15474 - widget->allocation.ascent + widget->allocation.descent);
15477 if (button->child &&
15478 p_Dw_widget_intersect (button->child, area, &child_area))
15479 a_Dw_widget_draw (button->child, &child_area, event);
15480 @@ -338,7 +389,8 @@
15481 DwButton *button = DW_BUTTON (widget);
15483 button->pressed = TRUE;
15484 - p_Dw_widget_queue_draw (widget);
15485 + if (button->relief)
15486 + p_Dw_widget_queue_draw (widget);
15490 @@ -357,12 +409,40 @@
15491 * Dw). This results in a different behavior.
15493 DwButton *button = DW_BUTTON (widget);
15496 button->pressed = FALSE;
15497 - p_Dw_widget_queue_draw (widget);
15498 + if (button->relief)
15499 + p_Dw_widget_queue_draw (widget);
15501 - if (button->in_button && button->sensitive)
15502 - gtk_signal_emit (GTK_OBJECT (widget), button_signals[CLICKED]);
15503 + if (button->in_button && button->sensitive) {
15504 + /* simple "click" */
15505 + g_signal_emit (G_OBJECT (widget), button_signals[CLICKED], 0);
15507 + /* "clicked_at": like "clicked", but position is passed, relative
15508 + * to the child widget. */
15509 + if (button->child) {
15510 + cx = x + widget->allocation.x - button->child->allocation.x;
15511 + cy = y + widget->allocation.y - button->child->allocation.y;
15513 + /* If position is outside of the child, clip at the child
15517 + else if (cx > button->child->allocation.width - 1)
15518 + cx = button->child->allocation.width - 1;
15522 + else if (cy > (button->child->allocation.ascent +
15523 + button->child->allocation.descent - 1))
15524 + cy = (button->child->allocation.ascent +
15525 + button->child->allocation.descent - 1);
15527 + g_signal_emit (G_OBJECT (widget), button_signals[CLICKED_AT], 0,
15534 @@ -378,7 +458,8 @@
15535 DwButton *button = DW_BUTTON (widget);
15537 button->in_button = TRUE;
15538 - p_Dw_widget_queue_draw (widget);
15539 + if (button->relief)
15540 + p_Dw_widget_queue_draw (widget);
15544 @@ -392,9 +473,10 @@
15546 DwButton *button = DW_BUTTON (widget);
15548 - if(button->child == NULL || next_widget != button->child) {
15549 + if (button->child == NULL || next_widget != button->child) {
15550 button->in_button = FALSE;
15551 - p_Dw_widget_queue_draw (widget);
15552 + if (button->relief)
15553 + p_Dw_widget_queue_draw (widget);
15557 @@ -406,7 +488,7 @@
15558 static void Dw_button_add (DwContainer *container,
15561 - DwButton *button = DW_BUTTON(container);
15562 + DwButton *button = DW_BUTTON (container);
15564 g_return_if_fail (button->child == NULL);
15565 button->child = widget;
15566 @@ -420,7 +502,7 @@
15567 static void Dw_button_remove (DwContainer *container,
15570 - DwButton *button = DW_BUTTON(container);
15571 + DwButton *button = DW_BUTTON (container);
15573 g_return_if_fail (button->child != NULL);
15574 g_return_if_fail (widget == button->child);
15575 @@ -435,7 +517,7 @@
15576 DwCallback callback,
15577 gpointer callback_data)
15579 - DwButton *button = DW_BUTTON(container);
15580 + DwButton *button = DW_BUTTON (container);
15583 callback (button->child, callback_data);
15584 @@ -451,5 +533,43 @@
15585 gboolean sensitive)
15587 button->sensitive = sensitive;
15588 - p_Dw_widget_queue_draw (DW_WIDGET (button));
15589 + if (button->relief)
15590 + p_Dw_widget_queue_draw (DW_WIDGET (button));
15594 +static DwIterator *Dw_button_iterator (DwWidget *widget,
15597 + DwIterator *it = g_new (DwIterator, 1);
15598 + it->widget = widget;
15600 + it->content.type = DW_CONTENT_START;
15601 + it->next = Dw_button_iterator_next;
15602 + it->clone = Dw_button_iterator_clone;
15603 + it->free = p_Dw_iterator_free_std;
15608 +static gboolean Dw_button_iterator_next (DwIterator *it)
15610 + if (it->content.type == DW_CONTENT_START &&
15611 + (it->mask & DW_CONTENT_WIDGET) &&
15612 + DW_BUTTON(it->widget)->child) {
15613 + it->content.type = DW_CONTENT_WIDGET;
15614 + it->content.data.widget = DW_BUTTON(it->widget)->child;
15617 + it->content.type = DW_CONTENT_END;
15622 +static DwIterator* Dw_button_iterator_clone (DwIterator *it)
15624 + DwIterator *it2 = g_new (DwIterator, 1);
15629 diff -urN dillo-0.6.6/src/dw_button.h dillo2-0.6.6/src/dw_button.h
15630 --- dillo-0.6.6/src/dw_button.h 2002-03-18 08:02:50.000000000 -0700
15631 +++ dillo2-0.6.6/src/dw_button.h 2003-04-21 12:35:41.000000000 -0600
15633 DwContainer container;
15636 - gboolean in_button, pressed, sensitive;
15637 + gboolean relief, in_button, pressed, sensitive;
15641 @@ -38,12 +38,16 @@
15643 DwContainerClass parent_class;
15645 - void (*clicked) (DwButton *button);
15646 + void (*clicked) (DwButton *button);
15647 + void (*clicked_at) (DwButton *button,
15653 GtkType a_Dw_button_get_type (void);
15654 -DwWidget* a_Dw_button_new (void);
15655 +DwWidget* a_Dw_button_new (gint flags,
15656 + gboolean relief);
15657 void a_Dw_button_set_sensitive (DwButton *button,
15658 gboolean sensitive);
15660 diff -urN dillo-0.6.6/src/dw_container.c dillo2-0.6.6/src/dw_container.c
15661 --- dillo-0.6.6/src/dw_container.c 2001-12-22 13:51:08.000000000 -0700
15662 +++ dillo2-0.6.6/src/dw_container.c 2003-04-21 12:35:41.000000000 -0600
15663 @@ -21,25 +21,27 @@
15665 * Standard Gtk+ function
15667 -GtkType a_Dw_container_get_type (void)
15668 +GType a_Dw_container_get_type (void)
15670 - static GtkType type = 0;
15671 + static GType type = 0;
15674 - GtkTypeInfo info = {
15676 - sizeof (DwContainer),
15677 + GTypeInfo info = {
15678 sizeof (DwContainerClass),
15679 - (GtkClassInitFunc) Dw_container_class_init,
15680 - (GtkObjectInitFunc) Dw_container_init,
15681 - (GtkArgSetFunc) NULL,
15682 - (GtkArgGetFunc) NULL,
15683 - (GtkClassInitFunc) NULL
15684 + (GBaseInitFunc) NULL,
15685 + (GBaseFinalizeFunc) NULL,
15686 + (GClassInitFunc) Dw_container_class_init,
15687 + (GClassFinalizeFunc) NULL,
15688 + (gconstpointer) NULL,
15689 + sizeof (DwContainer),
15691 + (GInstanceInitFunc) Dw_container_init,
15692 + (GTypeValueTable *) NULL
15695 - type = gtk_type_unique (DW_TYPE_WIDGET, &info);
15696 + GTypeFlags flags = 0;
15697 + type = g_type_register_static(DW_TYPE_WIDGET, "DwContainer",
15704 @@ -94,21 +96,20 @@
15705 (DwCallback) gtk_object_destroy,
15708 - (* GTK_OBJECT_CLASS(parent_class)->destroy) (object);
15709 + GTK_OBJECT_CLASS(parent_class)->destroy (object);
15715 - * Add a widget in a "standard" way. Currently not used in dillo,
15716 - * perhaps never needed.
15717 + * Add a widget in a "standard" way.
15719 void a_Dw_container_add (DwContainer *container,
15722 DwContainerClass *klass;
15724 - klass = DW_CONTAINER_CLASS (GTK_OBJECT (container)->klass);
15725 + klass = DW_CONTAINER_CLASS (G_OBJECT_GET_CLASS (G_OBJECT (container)));
15727 (* (klass->add)) (container, child);
15729 @@ -122,10 +123,23 @@
15730 gpointer callback_data)
15732 DwContainerClass *klass;
15734 - klass = DW_CONTAINER_CLASS (GTK_OBJECT (container)->klass);
15736 + klass = DW_CONTAINER_CLASS(G_OBJECT_GET_CLASS(G_OBJECT(container)));
15738 (* (klass->forall)) (container, callback, callback_data);
15740 + /* The following code is handy for testing DwIterator: */
15745 + if ((it = a_Dw_widget_iterator (DW_WIDGET (container),
15746 + DW_CONTENT_WIDGET))) {
15747 + while (a_Dw_iterator_next(it))
15748 + callback (it->content.data.widget, callback_data);
15749 + a_Dw_iterator_free (it);
15755 @@ -138,7 +152,7 @@
15757 DwContainerClass *klass;
15759 - klass = DW_CONTAINER_CLASS (GTK_OBJECT (container)->klass);
15760 + klass = DW_CONTAINER_CLASS (G_OBJECT_GET_CLASS (G_OBJECT (container)));
15761 if (klass->findtext)
15762 return (* (klass->findtext)) (container, FP, KP, NewKey);
15764 @@ -153,7 +167,7 @@
15766 DwContainerClass *klass;
15768 - klass = DW_CONTAINER_CLASS (GTK_OBJECT (container)->klass);
15769 + klass = DW_CONTAINER_CLASS (G_OBJECT_GET_CLASS (G_OBJECT (container)));
15771 (* (klass->remove)) (container, child);
15773 diff -urN dillo-0.6.6/src/dw_embed_gtk.c dillo2-0.6.6/src/dw_embed_gtk.c
15774 --- dillo-0.6.6/src/dw_embed_gtk.c 2002-03-13 05:08:42.000000000 -0700
15775 +++ dillo2-0.6.6/src/dw_embed_gtk.c 2003-04-21 12:35:42.000000000 -0600
15776 @@ -17,32 +17,32 @@
15778 GdkEventExpose *event);
15780 -static void Dw_embed_gtk_remove_gtk (DwEmbedGtk *embed_gtk);
15782 static GtkWidgetClass *parent_class;
15785 * Standard Gtk+ function
15787 -GtkType a_Dw_embed_gtk_get_type (void)
15788 +GType a_Dw_embed_gtk_get_type (void)
15790 - static GtkType type = 0;
15791 + static GType type = 0;
15794 - GtkTypeInfo info = {
15796 - sizeof (DwEmbedGtk),
15797 + GTypeInfo info = {
15798 sizeof (DwEmbedGtkClass),
15799 - (GtkClassInitFunc) Dw_embed_gtk_class_init,
15800 - (GtkObjectInitFunc) Dw_embed_gtk_init,
15801 - (GtkArgSetFunc) NULL,
15802 - (GtkArgGetFunc) NULL,
15803 - (GtkClassInitFunc) NULL
15804 + (GBaseInitFunc) NULL,
15805 + (GBaseFinalizeFunc) NULL,
15806 + (GClassInitFunc) Dw_embed_gtk_class_init,
15807 + (GClassFinalizeFunc) NULL,
15808 + (gconstpointer) NULL,
15809 + sizeof (DwEmbedGtk),
15811 + (GInstanceInitFunc) Dw_embed_gtk_init,
15812 + (GTypeValueTable *) NULL
15815 - type = gtk_type_unique (DW_TYPE_WIDGET, &info);
15816 + GTypeFlags flags = 0;
15817 + type = g_type_register_static(DW_TYPE_WIDGET, "DwEmbedGtk",
15824 @@ -102,7 +102,7 @@
15825 if (embed_gtk->idle_id != -1)
15826 gtk_idle_remove (embed_gtk->idle_id);
15828 - (* GTK_OBJECT_CLASS(parent_class)->destroy) (object);
15829 + GTK_OBJECT_CLASS(parent_class)->destroy (object);
15833 @@ -206,10 +206,11 @@
15834 * This function is called when the embedded Gtk+ widget is destroyed.
15835 * Don't use this function directly!
15837 -static void Dw_embed_gtk_remove_gtk (DwEmbedGtk *embed_gtk)
15838 +static gboolean Dw_embed_gtk_remove_gtk (DwEmbedGtk *embed_gtk)
15840 embed_gtk->child = NULL;
15841 p_Dw_widget_queue_resize (DW_WIDGET (embed_gtk), 0, TRUE);
15846 @@ -218,7 +219,7 @@
15847 * will set the adjustments of the viewport.
15848 * Don't use this function directly!
15850 -static int Dw_embed_gtk_child_focus_in (DwEmbedGtk *embed_gtk)
15851 +static gboolean Dw_embed_gtk_child_focus_in (DwEmbedGtk *embed_gtk)
15855 @@ -227,8 +228,8 @@
15856 widget = DW_WIDGET (embed_gtk);
15857 layout = GTK_LAYOUT (widget->viewport);
15859 - vx = layout->xoffset;
15860 - vy = layout->yoffset;
15861 + vx = p_Dw_widget_x_viewport_to_world(widget, 0);
15862 + vy = p_Dw_widget_y_viewport_to_world(widget, 0);
15863 vw = GTK_WIDGET(layout)->allocation.width;
15864 vh = GTK_WIDGET(layout)->allocation.height;
15866 @@ -274,23 +275,20 @@
15867 /* This is to recognize size changes of the embedded Gtk+ widget,
15868 but this simple implementation causes too much page rewraps, so
15869 it is currently deactivated */
15870 - gtk_signal_connect_object (GTK_OBJECT (embed_gtk->child),
15872 - GTK_SIGNAL_FUNC (Dw_widget_queue_resize),
15873 - GTK_OBJECT (embed_gtk));
15874 + g_signal_connect_object (G_OBJECT (embed_gtk->child), "size_request",
15875 + G_CALLBACK(Dw_widget_queue_resize),
15876 + G_OBJECT (embed_gtk), 0);
15879 /* for setting the adjustments */
15880 - gtk_signal_connect_object (GTK_OBJECT (embed_gtk->child),
15881 - "focus_in_event",
15882 - GTK_SIGNAL_FUNC (Dw_embed_gtk_child_focus_in),
15883 - GTK_OBJECT (embed_gtk));
15884 + g_signal_connect_object(G_OBJECT (embed_gtk->child), "focus_in_event",
15885 + G_CALLBACK(Dw_embed_gtk_child_focus_in),
15886 + G_OBJECT (embed_gtk), G_CONNECT_SWAPPED);
15888 /* todo: An idea: use "remove" signal of DwGtkContainer instead. */
15889 - gtk_signal_connect_object (GTK_OBJECT (embed_gtk->child),
15891 - GTK_SIGNAL_FUNC (Dw_embed_gtk_remove_gtk),
15892 - GTK_OBJECT (embed_gtk));
15893 + g_signal_connect_object(G_OBJECT (embed_gtk->child), "destroy",
15894 + G_CALLBACK (Dw_embed_gtk_remove_gtk),
15895 + G_OBJECT (embed_gtk), G_CONNECT_SWAPPED);
15897 p_Dw_widget_queue_resize (DW_WIDGET (embed_gtk), 0, TRUE);
15899 diff -urN dillo-0.6.6/src/dw_ext_iterator.c dillo2-0.6.6/src/dw_ext_iterator.c
15900 --- dillo-0.6.6/src/dw_ext_iterator.c 1969-12-31 17:00:00.000000000 -0700
15901 +++ dillo2-0.6.6/src/dw_ext_iterator.c 2003-04-21 12:35:42.000000000 -0600
15904 + * File: dw_ext_iterator.c
15906 + * Copyright (C) 2002 Sebastian Geerken <S.Geerken@ping.de>
15908 + * This program is free software; you can redistribute it and/or modify
15909 + * it under the terms of the GNU General Public License as published by
15910 + * the Free Software Foundation; either version 2 of the License, or
15911 + * (at your option) any later version.
15915 + * DwExtIterator is an extension of DwIterator, which stores
15916 + * DwIterator's in a stack, for cases where recursions are not
15920 +#include "dw_ext_iterator.h"
15924 + * Create a new DwExtIterator from an existing DwIterator.
15925 + * The content of the return value will be the content of "it".
15927 + * (i) If you want to continue using "it", pass a_Dw_iterator_clone (it).
15928 + * (ii) The mask of "it" must include DW_CONTENT_WIDGET, but
15929 + * a_Dw_ext_iterator_next will never return widgets.
15931 +DwExtIterator* a_Dw_ext_iterator_new (DwIterator *it)
15933 + DwExtIterator *eit = g_new (DwExtIterator, 1);
15937 + eit->stack_top = 0;
15938 + /* If this widget has parents, we must construct appropiate
15939 + * iterators. TODO: There should be a faster way instead of
15940 + * iterating through the parent widgets. */
15941 + /* NOTE: This has not yet been tested fully! */
15942 + for (w = it->widget; w->parent != NULL; w = w->parent)
15943 + eit->stack_top++;
15944 + eit->stack_max = 4;
15945 + while (eit->stack_top >= eit->stack_max)
15946 + eit->stack_max <<= 1;
15948 + /* Construct the iterators. */
15949 + for (w = it->widget, sp = eit->stack_top - 1;
15950 + w->parent != NULL;
15951 + w = w->parent, sp--) {
15952 + eit->stack[sp] = a_Dw_widget_iterator (w->parent, it->mask);
15954 + while (!a_Dw_iterator_next(eit->stack[sp])) {
15955 + g_warning ("BUG in DwExtIterator!");
15958 + if (eit->stack[sp]->content.type == DW_CONTENT_WIDGET &&
15959 + eit->stack[sp]->content.data.widget == w)
15964 + eit->stack = g_new (DwIterator*, eit->stack_max);
15965 + eit->stack[eit->stack_top] = it;
15966 + eit->content = it->content;
15971 + * Move iterator forward and store content it. Returns TRUE on
15974 +gboolean a_Dw_ext_iterator_next (DwExtIterator *eit)
15976 + DwIterator *it = eit->stack[eit->stack_top];
15978 + if (a_Dw_iterator_next(it)) {
15979 + if (it->content.type == DW_CONTENT_WIDGET) {
15980 + /* Widget: new iterator on stack, to search in this widget. */
15981 + eit->stack_top++;
15982 + a_List_add (eit->stack, eit->stack_top, eit->stack_max);
15983 + eit->stack[eit->stack_top] =
15984 + a_Dw_widget_iterator (it->content.data.widget, it->mask);
15985 + return a_Dw_ext_iterator_next (eit);
15987 + /* Simply return the content of the iterartor. */
15988 + eit->content = it->content;
15992 + /* No more data in the top-most widget. */
15993 + if (eit->stack_top > 0) {
15994 + /* Pop iterator from stack, and move to next item in the old one. */
15995 + a_Dw_iterator_free (it);
15996 + eit->stack_top--;
15997 + return a_Dw_ext_iterator_next (eit);
15999 + /* Stack is empty. */
16005 + * Create an exact copy of the iterator, which then can be used
16006 + * independantly of the original one.
16008 +DwExtIterator* a_Dw_ext_iterator_clone (DwExtIterator *eit)
16011 + DwExtIterator *eit2 = g_new (DwExtIterator, 1);
16012 + eit2->stack_top = eit->stack_top;
16013 + eit2->stack_max = eit->stack_max;
16014 + eit2->content = eit->content;
16016 + eit2->stack = g_new (DwIterator*, eit2->stack_max);
16017 + for (i = 0; i < eit2->stack_top; i++)
16018 + eit2->stack[i] = a_Dw_iterator_clone (eit->stack[i]);
16024 + * Free memory of iterator.
16026 +void a_Dw_ext_iterator_free (DwExtIterator *eit)
16029 + for (i = 0; i < eit->stack_top; i++)
16030 + a_Dw_iterator_clone (eit->stack[i]);
16031 + g_free (eit->stack);
16034 diff -urN dillo-0.6.6/src/dw_ext_iterator.h dillo2-0.6.6/src/dw_ext_iterator.h
16035 --- dillo-0.6.6/src/dw_ext_iterator.h 1969-12-31 17:00:00.000000000 -0700
16036 +++ dillo2-0.6.6/src/dw_ext_iterator.h 2003-04-21 12:35:42.000000000 -0600
16038 +#ifndef __DW_EXT_ITERATOR_H__
16039 +#define __DW_EXT_ITERATOR_H__
16041 +#include "dw_widget.h"
16043 +#ifdef __cplusplus
16045 +#endif /* __cplusplus */
16047 +typedef struct _DwExtIterator
16049 + DwIterator **stack;
16053 + DwContent content;
16056 +DwExtIterator* a_Dw_ext_iterator_new (DwIterator *it);
16057 +gboolean a_Dw_ext_iterator_next (DwExtIterator *eit);
16058 +DwExtIterator* a_Dw_ext_iterator_clone (DwExtIterator *eit);
16059 +void a_Dw_ext_iterator_free (DwExtIterator *eit);
16061 +#ifdef __cplusplus
16063 +#endif /* __cplusplus */
16065 +#endif /* __DW_EXT_ITERATOR_H__ */
16066 diff -urN dillo-0.6.6/src/dw_gtk_scrolled_frame.c dillo2-0.6.6/src/dw_gtk_scrolled_frame.c
16067 --- dillo-0.6.6/src/dw_gtk_scrolled_frame.c 2002-04-30 10:27:51.000000000 -0600
16068 +++ dillo2-0.6.6/src/dw_gtk_scrolled_frame.c 2003-04-21 12:35:44.000000000 -0600
16071 #include <gtk/gtk.h>
16072 #include <gdk/gdkkeysyms.h>
16073 +#include <gdk/gdkx.h>
16074 #include "dw_gtk_scrolled_frame.h"
16075 +#include "dw_marshal.h"
16077 static GtkBinClass *parent_class = NULL;
16079 @@ -36,28 +38,21 @@
16080 GtkRequisition *requisition);
16081 static void Dw_gtk_scrolled_frame_size_allocate (GtkWidget *widget,
16082 GtkAllocation *allocation);
16083 -static void Dw_gtk_scrolled_frame_draw (GtkWidget *widget,
16084 - GdkRectangle *area);
16085 -static void Dw_gtk_scrolled_frame_draw_focus (GtkWidget *widget);
16086 -static gint Dw_gtk_scrolled_frame_expose (GtkWidget *widget,
16087 +static gboolean Dw_gtk_scrolled_frame_expose (GtkWidget *widget,
16088 GdkEventExpose *event);
16089 -static gint Dw_gtk_scrolled_frame_key_press (GtkWidget *widget,
16090 +static gboolean Dw_gtk_scrolled_frame_key_press (GtkWidget *widget,
16091 GdkEventKey *event);
16092 -static gint Dw_gtk_scrolled_frame_focus_in (GtkWidget *widget,
16093 - GdkEventFocus *event);
16094 -static gint Dw_gtk_scrolled_frame_focus_out (GtkWidget *widget,
16095 - GdkEventFocus *event);
16096 -static gint Dw_gtk_scrolled_frame_button_press (GtkWidget *widget,
16097 - GdkEventButton *event);
16098 -static gint Dw_gtk_scrolled_frame_button_release(GtkWidget *widget,
16099 - GdkEventButton *event);
16100 -static gint Dw_gtk_scrolled_frame_motion_notify (GtkWidget *widget,
16101 - GdkEventMotion *event);
16102 +static gboolean Dw_gtk_scrolled_frame_button_press (GtkWidget *widget,
16103 + GdkEventButton *event);
16104 +static gboolean Dw_gtk_scrolled_frame_button_release(GtkWidget *widget,
16105 + GdkEventButton *event);
16106 +static gboolean Dw_gtk_scrolled_frame_motion_notify (GtkWidget *widget,
16107 + GdkEventMotion *event);
16109 /* GtkContainer methods */
16110 static void Dw_gtk_scrolled_frame_add (GtkContainer *container,
16111 GtkWidget *widget);
16112 -static gint Dw_gtk_scrolled_frame_focus (GtkContainer *container,
16113 +static gboolean Dw_gtk_scrolled_frame_focus (GtkWidget *widget,
16114 GtkDirectionType direction);
16116 /* GtkDwScrolledFrame methods */
16117 @@ -95,25 +90,27 @@
16119 * Standard Gtk+ function
16121 -GtkType a_Dw_gtk_scrolled_frame_get_type (void)
16122 +GType a_Dw_gtk_scrolled_frame_get_type (void)
16124 - static GtkType type = 0;
16125 + static GType type = 0;
16128 - GtkTypeInfo info = {
16129 - "GtkDwScrolledFrame",
16130 - sizeof (GtkDwScrolledFrame),
16131 + GTypeInfo info = {
16132 sizeof (GtkDwScrolledFrameClass),
16133 - (GtkClassInitFunc) Dw_gtk_scrolled_frame_class_init,
16134 - (GtkObjectInitFunc) Dw_gtk_scrolled_frame_init,
16135 - (GtkArgSetFunc) NULL,
16136 - (GtkArgGetFunc) NULL,
16137 - (GtkClassInitFunc) NULL
16138 + (GBaseInitFunc) NULL,
16139 + (GBaseFinalizeFunc) NULL,
16140 + (GClassInitFunc) Dw_gtk_scrolled_frame_class_init,
16141 + (GClassFinalizeFunc) NULL,
16142 + (gconstpointer) NULL,
16143 + sizeof (GtkDwScrolledFrame),
16145 + (GInstanceInitFunc) Dw_gtk_scrolled_frame_init,
16146 + (GTypeValueTable *) NULL
16149 - type = gtk_type_unique (GTK_TYPE_BIN, &info);
16150 + GTypeFlags flags = 0;
16151 + type = g_type_register_static(GTK_TYPE_BIN, "GtkDwScrolledFrame",
16158 @@ -173,35 +170,36 @@
16159 container_class = (GtkContainerClass*) klass;
16161 frame_signals[SET_SCROLL_ADJUSTMENTS] =
16162 - gtk_signal_new ("set_scroll_adjustments",
16164 - object_class->type,
16165 - GTK_SIGNAL_OFFSET (GtkDwScrolledFrameClass,
16166 - set_scroll_adjustments),
16167 - gtk_marshal_NONE__POINTER_POINTER,
16168 - GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT,
16169 - GTK_TYPE_ADJUSTMENT);
16170 + g_signal_new ("set_scroll_adjustments",
16171 + G_TYPE_FROM_CLASS(object_class),
16172 + G_SIGNAL_RUN_LAST,
16173 + G_STRUCT_OFFSET (GtkDwScrolledFrameClass,
16174 + set_scroll_adjustments),
16177 + p_Dw_marshal_VOID__POINTER_POINTER,
16178 + GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT,
16179 + GTK_TYPE_ADJUSTMENT);
16180 widget_class->set_scroll_adjustments_signal =
16181 frame_signals[SET_SCROLL_ADJUSTMENTS];
16183 frame_signals[USER_HCHANGED] =
16184 - gtk_signal_new ("user_hchanged",
16185 - GTK_RUN_LAST | GTK_RUN_ACTION,
16186 - object_class->type,
16187 - GTK_SIGNAL_OFFSET (GtkDwScrolledFrameClass,
16189 - gtk_marshal_NONE__NONE,
16190 - GTK_TYPE_NONE, 0);
16191 + g_signal_new ("user_hchanged",
16192 + G_TYPE_FROM_CLASS(object_class),
16193 + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
16194 + G_STRUCT_OFFSET (GtkDwScrolledFrameClass, user_hchanged),
16197 + p_Dw_marshal_VOID__VOID,
16198 + GTK_TYPE_NONE, 0);
16199 frame_signals[USER_VCHANGED] =
16200 - gtk_signal_new ("user_vchanged",
16201 - GTK_RUN_LAST | GTK_RUN_ACTION,
16202 - object_class->type,
16203 - GTK_SIGNAL_OFFSET (GtkDwScrolledFrameClass,
16205 - gtk_marshal_NONE__NONE,
16206 - GTK_TYPE_NONE, 0);
16208 - gtk_object_class_add_signals (object_class, frame_signals, LAST_SIGNAL);
16209 + g_signal_new ("user_vchanged",
16210 + G_TYPE_FROM_CLASS(object_class),
16211 + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
16212 + G_STRUCT_OFFSET (GtkDwScrolledFrameClass, user_vchanged),
16215 + p_Dw_marshal_VOID__VOID,
16216 + GTK_TYPE_NONE, 0);
16218 object_class->destroy = Dw_gtk_scrolled_frame_destroy;
16220 @@ -209,21 +207,16 @@
16221 widget_class->unrealize = Dw_gtk_scrolled_frame_unrealize;
16222 widget_class->size_request = Dw_gtk_scrolled_frame_size_request;
16223 widget_class->size_allocate = Dw_gtk_scrolled_frame_size_allocate;
16224 - widget_class->draw_focus = Dw_gtk_scrolled_frame_draw_focus;
16225 - widget_class->draw = Dw_gtk_scrolled_frame_draw;
16226 widget_class->expose_event = Dw_gtk_scrolled_frame_expose;
16227 widget_class->key_press_event = Dw_gtk_scrolled_frame_key_press;
16228 - widget_class->focus_in_event = Dw_gtk_scrolled_frame_focus_in;
16229 - widget_class->focus_out_event = Dw_gtk_scrolled_frame_focus_out;
16230 + widget_class->focus = Dw_gtk_scrolled_frame_focus;
16231 widget_class->button_press_event = Dw_gtk_scrolled_frame_button_press;
16232 widget_class->button_release_event = Dw_gtk_scrolled_frame_button_release;
16233 widget_class->motion_notify_event = Dw_gtk_scrolled_frame_motion_notify;
16235 container_class->add = Dw_gtk_scrolled_frame_add;
16236 - container_class->focus = Dw_gtk_scrolled_frame_focus;
16238 - klass->set_scroll_adjustments =
16239 - Dw_gtk_scrolled_frame_set_scroll_adjustments;
16240 + klass->set_scroll_adjustments = Dw_gtk_scrolled_frame_set_scroll_adjustments;
16241 klass->user_hchanged = NULL;
16242 klass->user_vchanged = NULL;
16244 @@ -246,7 +239,7 @@
16245 if (frame->move_idle_id != -1)
16246 gtk_idle_remove (frame->move_idle_id);
16248 - (* GTK_OBJECT_CLASS(parent_class)->destroy) (object);
16249 + GTK_OBJECT_CLASS(parent_class)->destroy (object);
16253 @@ -286,6 +279,11 @@
16254 widget->style = gtk_style_attach (widget->style, widget->window);
16255 gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
16257 + /* evil workaround */
16258 + GTK_DW_SCROLLED_FRAME(widget)->vadjustment->step_increment = 10;
16259 + GTK_DW_SCROLLED_FRAME(widget)->hadjustment->step_increment = 10;
16260 + /* end evil workaround */
16262 GTK_DW_SCROLLED_FRAME(widget)->drag_cursor = gdk_cursor_new (GDK_FLEUR);
16265 @@ -321,11 +319,11 @@
16266 border_width = GTK_CONTAINER(widget)->border_width;
16268 child_allocation.width =
16269 - MAX (allocation->width - 2 * (widget->style->klass->xthickness +
16270 + MAX (allocation->width - 2 * (widget->style->xthickness +
16273 child_allocation.height =
16274 - MAX (allocation->height - 2 * (widget->style->klass->ythickness +
16275 + MAX (allocation->height - 2 * (widget->style->ythickness +
16278 child_allocation.x = (allocation->width - child_allocation.width) / 2;
16279 @@ -353,10 +351,10 @@
16280 gtk_widget_size_request (bin->child, &child_requisition);
16282 requisition->width =
16283 - child_requisition.width + 2 * (widget->style->klass->xthickness +
16284 + child_requisition.width + 2 * (widget->style->xthickness +
16286 requisition->height =
16287 - child_requisition.height + 2 * (widget->style->klass->ythickness +
16288 + child_requisition.height + 2 * (widget->style->ythickness +
16291 requisition->width = 100;
16292 @@ -385,7 +383,7 @@
16294 /* "text" is probably next to what we need */
16295 gtk_paint_focus (widget->style, widget->window,
16296 - area, widget, "text",
16297 + GTK_STATE_SELECTED, area, widget, "text",
16298 border_width, border_width,
16299 widget->allocation.width - 2 * border_width - 1,
16300 widget->allocation.height - 2 * border_width - 1);
16301 @@ -399,37 +397,15 @@
16307 * Standard Gtk+ function
16309 -static void Dw_gtk_scrolled_frame_draw_focus (GtkWidget *widget)
16310 +static gboolean Dw_gtk_scrolled_frame_expose (GtkWidget *widget,
16311 + GdkEventExpose *event)
16313 - Dw_gtk_scrolled_frame_paint_shadow (widget, NULL);
16315 + gboolean ret_val;
16319 - * Standard Gtk+ function
16321 -static void Dw_gtk_scrolled_frame_draw (GtkWidget *widget,
16322 - GdkRectangle *area)
16324 - (* (GTK_WIDGET_CLASS(parent_class)->draw)) (widget, area);
16325 - Dw_gtk_scrolled_frame_paint_shadow (widget, area);
16330 - * Standard Gtk+ function
16332 -static gint Dw_gtk_scrolled_frame_expose (GtkWidget *widget,
16333 - GdkEventExpose *event)
16338 - (* (GTK_WIDGET_CLASS(parent_class)->expose_event)) (widget, event);
16339 + ret_val = GTK_WIDGET_CLASS(parent_class)->expose_event (widget, event);
16340 Dw_gtk_scrolled_frame_paint_shadow (widget, &(event->area));
16343 @@ -439,77 +415,77 @@
16345 * Standard Gtk+ function
16347 -static gint Dw_gtk_scrolled_frame_key_press (GtkWidget *widget,
16348 - GdkEventKey *event)
16349 +static gboolean Dw_gtk_scrolled_frame_key_press (GtkWidget *widget,
16350 + GdkEventKey *event)
16352 - GtkContainer *container;
16353 GtkDwScrolledFrame *frame;
16355 - container = GTK_CONTAINER (widget);
16356 frame = GTK_DW_SCROLLED_FRAME (widget);
16358 switch (event->keyval) {
16360 - Dw_gtk_scrolled_frame_move_by(frame, 0,
16361 - - frame->vadjustment->step_increment);
16362 + Dw_gtk_scrolled_frame_move_by (frame, 0,
16363 + - frame->vadjustment->step_increment);
16367 - Dw_gtk_scrolled_frame_move_by(frame, 0,
16368 - + frame->vadjustment->step_increment);
16369 + Dw_gtk_scrolled_frame_move_by (frame, 0,
16370 + + frame->vadjustment->step_increment);
16374 - Dw_gtk_scrolled_frame_move_by(frame,
16375 - - frame->hadjustment->step_increment, 0);
16376 + Dw_gtk_scrolled_frame_move_by (frame,
16377 + - frame->hadjustment->step_increment, 0);
16381 - Dw_gtk_scrolled_frame_move_by(frame,
16382 - + frame->hadjustment->step_increment, 0);
16383 + Dw_gtk_scrolled_frame_move_by (frame,
16384 + + frame->hadjustment->step_increment, 0);
16388 if (event->state & GDK_SHIFT_MASK)
16389 - return gtk_container_focus (container, GTK_DIR_TAB_BACKWARD);
16390 + return gtk_widget_child_focus (widget, GTK_DIR_TAB_BACKWARD);
16392 - return gtk_container_focus (container, GTK_DIR_TAB_FORWARD);
16393 + return gtk_widget_child_focus (widget, GTK_DIR_TAB_FORWARD);
16395 case GDK_b: case GDK_B:
16396 - if (event->state & (GDK_MOD1_MASK | GDK_MOD2_MASK))
16397 + if (event->state & GDK_MOD1_MASK)
16401 if (event->state & GDK_CONTROL_MASK)
16402 - Dw_gtk_scrolled_frame_move_by(frame,
16403 - - frame->hadjustment->page_increment, 0);
16404 + Dw_gtk_scrolled_frame_move_by (frame,
16405 + - frame->hadjustment->page_increment,
16408 - Dw_gtk_scrolled_frame_move_by(frame, 0,
16409 - - frame->vadjustment->page_increment);
16410 + Dw_gtk_scrolled_frame_move_by (frame, 0,
16411 + - frame->vadjustment->page_increment);
16414 case GDK_Page_Down:
16416 if (event->state & GDK_CONTROL_MASK)
16417 - Dw_gtk_scrolled_frame_move_by(frame,
16418 - + frame->hadjustment->page_increment, 0);
16419 + Dw_gtk_scrolled_frame_move_by (frame,
16420 + + frame->hadjustment->page_increment,
16423 - Dw_gtk_scrolled_frame_move_by(frame, 0,
16424 - + frame->vadjustment->page_increment);
16425 + Dw_gtk_scrolled_frame_move_by (frame, 0,
16426 + + frame->vadjustment->page_increment);
16430 if (event->state & GDK_CONTROL_MASK)
16431 - Dw_gtk_scrolled_frame_move_x_to(frame, 0);
16432 + Dw_gtk_scrolled_frame_move_x_to (frame, 0);
16434 - Dw_gtk_scrolled_frame_move_y_to(frame, 0);
16435 + Dw_gtk_scrolled_frame_move_y_to (frame, 0);
16439 if (event->state & GDK_CONTROL_MASK)
16440 - Dw_gtk_scrolled_frame_move_x_to(frame, G_MAXFLOAT);
16441 + Dw_gtk_scrolled_frame_move_x_to (frame, G_MAXFLOAT);
16443 - Dw_gtk_scrolled_frame_move_y_to(frame, G_MAXFLOAT);
16444 + Dw_gtk_scrolled_frame_move_y_to (frame, G_MAXFLOAT);
16448 @@ -517,36 +493,11 @@
16454 - * Standard Gtk+ function
16456 -static gint Dw_gtk_scrolled_frame_focus_in (GtkWidget *widget,
16457 - GdkEventFocus *event)
16459 - GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
16460 - gtk_widget_draw_focus (widget);
16466 * Standard Gtk+ function
16468 -static gint Dw_gtk_scrolled_frame_focus_out (GtkWidget *widget,
16469 - GdkEventFocus *event)
16471 - GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
16472 - gtk_widget_draw_focus (widget);
16478 - * Standard Gtk+ function
16480 -static gint Dw_gtk_scrolled_frame_button_press (GtkWidget *widget,
16481 - GdkEventButton *event)
16482 +static gboolean Dw_gtk_scrolled_frame_button_press (GtkWidget *widget,
16483 + GdkEventButton *event)
16485 GtkDwScrolledFrame *frame;
16487 @@ -557,8 +508,8 @@
16488 frame = GTK_DW_SCROLLED_FRAME (widget);
16490 frame->button2_pressed = TRUE;
16491 - frame->start_lmx = event->x;
16492 - frame->start_lmy = event->y;
16493 + frame->start_lmx = event->x - frame->hadjustment->value;
16494 + frame->start_lmy = event->y - frame->vadjustment->value;
16496 gdk_pointer_grab (widget->window, FALSE,
16497 GDK_BUTTON_RELEASE_MASK | GDK_BUTTON2_MOTION_MASK,
16498 @@ -573,8 +524,8 @@
16500 * Standard Gtk+ function
16502 -static gint Dw_gtk_scrolled_frame_button_release (GtkWidget *widget,
16503 - GdkEventButton *event)
16504 +static gboolean Dw_gtk_scrolled_frame_button_release (GtkWidget *widget,
16505 + GdkEventButton *event)
16507 GTK_DW_SCROLLED_FRAME(widget)->button2_pressed = FALSE;
16508 gdk_pointer_ungrab (event->time);
16509 @@ -585,14 +536,22 @@
16511 * Standard Gtk+ function
16513 -static gint Dw_gtk_scrolled_frame_motion_notify (GtkWidget *widget,
16514 - GdkEventMotion *event)
16515 +static gboolean Dw_gtk_scrolled_frame_motion_notify (GtkWidget *widget,
16516 + GdkEventMotion *event)
16518 GtkDwScrolledFrame *frame = GTK_DW_SCROLLED_FRAME (widget);
16520 /* frame->button2_pressed makes sure that the button was pressed
16521 in the GtkDwScrolledFrame */
16522 if ((event->state & GDK_BUTTON2_MASK) && frame->button2_pressed) {
16523 + if (event->window == GTK_LAYOUT(GTK_BIN(frame)->child)->bin_window) {
16524 + /* Evil evil hack ... Sometimes event->window is
16525 + * viewport->bin_window and sometimes frame->window, former
16526 + * gets x and y in world coordinates and latter in viewport
16527 + * coordinates, really don't know why this happens -- Medar */
16528 + event->x -= frame->hadjustment->value;
16529 + event->y -= frame->vadjustment->value;
16531 Dw_gtk_scrolled_frame_move_by (frame,
16532 frame->start_lmx - event->x,
16533 frame->start_lmy - event->y);
16534 @@ -619,12 +578,12 @@
16536 GtkDwScrolledFrame *frame;
16538 - (* (GTK_CONTAINER_CLASS(parent_class)->add)) (container, widget);
16539 + GTK_CONTAINER_CLASS(parent_class)->add (container, widget);
16541 frame = GTK_DW_SCROLLED_FRAME (container);
16542 - if ( !gtk_widget_set_scroll_adjustments(
16543 + if ( !gtk_widget_set_scroll_adjustments (
16544 GTK_WIDGET (container), frame->hadjustment, frame->vadjustment) )
16545 - g_warning ("Dw_gtk_scrolled_frame_set_scroll_adjustments(): "
16546 + g_warning ("Dw_gtk_scrolled_frame_add(): "
16547 "child is non scrollable");
16550 @@ -632,8 +591,8 @@
16552 * Standard Gtk+ function
16554 -static gint Dw_gtk_scrolled_frame_focus (GtkContainer *container,
16555 - GtkDirectionType direction)
16556 +static gboolean Dw_gtk_scrolled_frame_focus (GtkWidget *widget,
16557 + GtkDirectionType direction)
16560 * This crashed if the child is not a container (what will never happen
16561 @@ -641,32 +600,33 @@
16563 GtkDwScrolledFrame *frame;
16565 - frame = GTK_DW_SCROLLED_FRAME (container);
16566 + frame = GTK_DW_SCROLLED_FRAME (widget);
16568 switch (direction) {
16569 case GTK_DIR_TAB_FORWARD:
16570 case GTK_DIR_RIGHT:
16572 - if (container->focus_child == NULL && !GTK_WIDGET_HAS_FOCUS (container)){
16573 + if (GTK_CONTAINER(widget)->focus_child == NULL &&
16574 + !GTK_WIDGET_HAS_FOCUS (widget)){
16575 /* no focus of the GtkDwScrolledFrame or a child widget -> focus */
16576 - gtk_widget_grab_focus (GTK_WIDGET (container));
16577 + gtk_widget_grab_focus (widget);
16580 /* deliver to child */
16581 - return gtk_container_focus (GTK_CONTAINER (GTK_BIN(container)->child),
16583 + return gtk_widget_child_focus (GTK_BIN(widget)->child,
16586 case GTK_DIR_TAB_BACKWARD:
16589 - if (GTK_WIDGET_HAS_FOCUS (container))
16590 + if (GTK_WIDGET_HAS_FOCUS (widget))
16591 /* will focus the widget "before" */
16594 - if (!gtk_container_focus (GTK_CONTAINER (GTK_BIN(container)->child),
16595 - GTK_DIR_TAB_BACKWARD))
16596 + if (!gtk_widget_child_focus (GTK_BIN(widget)->child,
16597 + GTK_DIR_TAB_BACKWARD))
16598 /* first child of the child unfocussed */
16599 - gtk_widget_grab_focus (GTK_WIDGET (container));
16600 + gtk_widget_grab_focus (widget);
16604 @@ -692,9 +652,9 @@
16605 * Standard Gtk+ function
16608 -Dw_gtk_scrolled_frame_set_scroll_adjustments(GtkDwScrolledFrame *frame,
16609 - GtkAdjustment *hadjustment,
16610 - GtkAdjustment *vadjustment)
16611 +Dw_gtk_scrolled_frame_set_scroll_adjustments (GtkDwScrolledFrame *frame,
16612 + GtkAdjustment *hadjustment,
16613 + GtkAdjustment *vadjustment)
16617 @@ -722,7 +682,7 @@
16619 * The idle function.
16621 -static gint Dw_gtk_scrolled_frame_move_idle (gpointer data)
16622 +static gboolean Dw_gtk_scrolled_frame_move_idle (gpointer data)
16624 GtkDwScrolledFrame *frame;
16626 @@ -733,12 +693,12 @@
16628 if (frame->moveto_x != frame->hadjustment->value) {
16629 gtk_adjustment_set_value (frame->hadjustment, frame->moveto_x);
16630 - gtk_signal_emit (GTK_OBJECT (frame), frame_signals[USER_HCHANGED]);
16631 + g_signal_emit (G_OBJECT (frame), frame_signals[USER_HCHANGED], 0);
16634 if (frame->moveto_y != frame->vadjustment->value) {
16635 gtk_adjustment_set_value (frame->vadjustment, frame->moveto_y);
16636 - gtk_signal_emit (GTK_OBJECT (frame), frame_signals[USER_VCHANGED]);
16637 + g_signal_emit (G_OBJECT (frame), frame_signals[USER_VCHANGED], 0);
16640 frame->move_idle_id = -1;
16641 @@ -815,6 +775,8 @@
16643 if (pos < adj->lower)
16645 + else if (adj->upper < adj->page_size)
16647 else if (pos > adj->upper - adj->page_size)
16648 return adj->upper - adj->page_size;
16650 diff -urN dillo-0.6.6/src/dw_gtk_scrolled_window.c dillo2-0.6.6/src/dw_gtk_scrolled_window.c
16651 --- dillo-0.6.6/src/dw_gtk_scrolled_window.c 2002-03-18 08:02:50.000000000 -0700
16652 +++ dillo2-0.6.6/src/dw_gtk_scrolled_window.c 2003-04-21 12:35:45.000000000 -0600
16653 @@ -25,32 +25,34 @@
16654 static void Dw_gtk_scrolled_window_size_allocate (GtkWidget *widget,
16655 GtkAllocation *allocation);
16657 -static void Dw_gtk_scrolled_window_changed1 (GtkDwScrolledWindow *scrolled);
16658 -static void Dw_gtk_scrolled_window_changed2 (GtkDwScrolledWindow *scrolled);
16659 +static gboolean Dw_gtk_scrolled_window_changed1 (GtkDwScrolledWindow *scrolled);
16660 +static gboolean Dw_gtk_scrolled_window_changed2 (GtkDwScrolledWindow *scrolled);
16664 * Standard Gtk+ function
16666 -GtkType a_Dw_gtk_scrolled_window_get_type (void)
16667 +GType a_Dw_gtk_scrolled_window_get_type (void)
16669 - static GtkType type = 0;
16670 + static GType type = 0;
16673 - GtkTypeInfo info = {
16674 - "GtkDwScrolledWindow",
16675 - sizeof (GtkDwScrolledWindow),
16676 + GTypeInfo info = {
16677 sizeof (GtkDwScrolledWindowClass),
16678 - (GtkClassInitFunc) Dw_gtk_scrolled_window_class_init,
16679 - (GtkObjectInitFunc) Dw_gtk_scrolled_window_init,
16680 - (GtkArgSetFunc) NULL,
16681 - (GtkArgGetFunc) NULL,
16682 - (GtkClassInitFunc) NULL
16683 + (GBaseInitFunc) NULL,
16684 + (GBaseFinalizeFunc) NULL,
16685 + (GClassInitFunc) Dw_gtk_scrolled_window_class_init,
16686 + (GClassFinalizeFunc) NULL,
16687 + (gconstpointer) NULL,
16688 + sizeof (GtkDwScrolledWindow),
16690 + (GInstanceInitFunc) Dw_gtk_scrolled_window_init,
16691 + (GTypeValueTable *) NULL
16694 - type = gtk_type_unique (GTK_TYPE_SCROLLED_WINDOW, &info);
16695 + GTypeFlags flags = 0;
16696 + type = g_type_register_static(GTK_TYPE_SCROLLED_WINDOW,
16697 + "GtkDwScrolledWindow", &info, flags);
16703 @@ -108,20 +110,20 @@
16704 * users could change the scrollbar adjustments. ...
16706 for (i = 0; i < sizeof (signals) / sizeof (signals[0]); i++) {
16707 - gtk_signal_connect_object
16708 - (GTK_OBJECT (GTK_SCROLLED_WINDOW(scrolled)->vscrollbar),
16709 - signals[i], GTK_SIGNAL_FUNC (Dw_gtk_scrolled_window_changed1),
16710 - GTK_OBJECT (scrolled));
16711 - gtk_signal_connect_object_after
16712 - (GTK_OBJECT (GTK_SCROLLED_WINDOW(scrolled)->vscrollbar),
16713 - signals[i], GTK_SIGNAL_FUNC (Dw_gtk_scrolled_window_changed2),
16714 - GTK_OBJECT (scrolled));
16715 + g_signal_connect_object
16716 + (G_OBJECT (GTK_SCROLLED_WINDOW(scrolled)->vscrollbar),
16717 + signals[i], G_CALLBACK(Dw_gtk_scrolled_window_changed1),
16718 + G_OBJECT (scrolled), G_CONNECT_SWAPPED);
16719 + g_signal_connect_object
16720 + (G_OBJECT (GTK_SCROLLED_WINDOW(scrolled)->vscrollbar),
16721 + signals[i], G_CALLBACK(Dw_gtk_scrolled_window_changed2),
16722 + G_OBJECT (scrolled), G_CONNECT_SWAPPED | G_CONNECT_AFTER);
16725 /* ... The GtkDwScrolledFrame has a signal for this. */
16726 - gtk_signal_connect_object (GTK_OBJECT (frame), "user_vchanged",
16727 - GTK_SIGNAL_FUNC (Dw_gtk_viewport_remove_anchor),
16728 - GTK_OBJECT (viewport));
16729 + g_signal_connect_object (G_OBJECT(frame), "user_vchanged",
16730 + G_CALLBACK(Dw_gtk_viewport_remove_anchor),
16731 + G_OBJECT (viewport), G_CONNECT_SWAPPED);
16733 /* This does not seem to work for GtkLayout's (see also dw_embed_gtk.c): */
16734 gtk_container_set_focus_hadjustment (GTK_CONTAINER (viewport),
16735 @@ -185,8 +187,10 @@
16737 viewport = GTK_BIN(GTK_BIN(scrolled)->child)->child;
16739 - if ((old_child = GTK_DW_VIEWPORT (viewport)->child))
16740 + if ((old_child = GTK_DW_VIEWPORT (viewport)->child)) {
16741 gtk_object_destroy (GTK_OBJECT (old_child));
16742 + GTK_DW_VIEWPORT (viewport)->child = NULL;
16745 a_Dw_gtk_viewport_add_dw (GTK_DW_VIEWPORT (viewport), widget);
16747 @@ -243,9 +247,10 @@
16748 * See also Dw_gtk_scrolled_window_init.
16749 * Called before possible change, save the old value.
16751 -static void Dw_gtk_scrolled_window_changed1 (GtkDwScrolledWindow *scrolled)
16752 +static gboolean Dw_gtk_scrolled_window_changed1 (GtkDwScrolledWindow *scrolled)
16754 scrolled->old_vadjustment_value = scrolled->vadjustment->value;
16759 @@ -253,7 +258,7 @@
16760 * See also Dw_gtk_scrolled_window_init.
16761 * Called after possible change, compare old and new values.
16763 -static void Dw_gtk_scrolled_window_changed2 (GtkDwScrolledWindow *scrolled)
16764 +static gboolean Dw_gtk_scrolled_window_changed2 (GtkDwScrolledWindow *scrolled)
16766 GtkWidget *viewport;
16768 @@ -261,4 +266,5 @@
16769 viewport = GTK_BIN(GTK_BIN(scrolled)->child)->child;
16770 Dw_gtk_viewport_remove_anchor (GTK_DW_VIEWPORT (viewport));
16774 diff -urN dillo-0.6.6/src/dw_gtk_scrolled_window.h dillo2-0.6.6/src/dw_gtk_scrolled_window.h
16775 --- dillo-0.6.6/src/dw_gtk_scrolled_window.h 2002-01-10 11:59:42.000000000 -0700
16776 +++ dillo2-0.6.6/src/dw_gtk_scrolled_window.h 2003-04-21 12:35:45.000000000 -0600
16781 -GtkType a_Dw_gtk_scrolled_window_get_type (void);
16782 +GType a_Dw_gtk_scrolled_window_get_type (void);
16783 GtkWidget* a_Dw_gtk_scrolled_window_new (void);
16784 void a_Dw_gtk_scrolled_window_set_dw (
16785 GtkDwScrolledWindow *scrolled, DwWidget *widget);
16786 diff -urN dillo-0.6.6/src/dw_gtk_viewport.c dillo2-0.6.6/src/dw_gtk_viewport.c
16787 --- dillo-0.6.6/src/dw_gtk_viewport.c 2002-03-13 05:08:43.000000000 -0700
16788 +++ dillo2-0.6.6/src/dw_gtk_viewport.c 2003-04-21 12:35:47.000000000 -0600
16789 @@ -25,47 +25,47 @@
16790 static void Dw_gtk_viewport_destroy (GtkObject *object);
16792 /* GtkWidget methods */
16793 -static void Dw_gtk_viewport_realize (GtkWidget *widget);
16794 -static void Dw_gtk_viewport_unrealize (GtkWidget *widget);
16795 -static void Dw_gtk_viewport_draw (GtkWidget *widget,
16796 - GdkRectangle *area);
16797 -static gint Dw_gtk_viewport_expose (GtkWidget *widget,
16798 - GdkEventExpose *event);
16799 -static gint Dw_gtk_viewport_button_press (GtkWidget *widget,
16800 - GdkEventButton *event);
16801 -static gint Dw_gtk_viewport_button_release(GtkWidget *widget,
16802 - GdkEventButton *event);
16803 -static gint Dw_gtk_viewport_motion_notify (GtkWidget *widget,
16804 - GdkEventMotion *event);
16805 -static gint Dw_gtk_viewport_enter_notify (GtkWidget *widget,
16806 - GdkEventCrossing *event);
16807 -static gint Dw_gtk_viewport_leave_notify (GtkWidget *widget,
16808 - GdkEventCrossing *event);
16809 -static void Dw_gtk_viewport_adj_changed (GtkAdjustment *adj,
16810 - GtkDwViewport *viewport);
16811 +static void Dw_gtk_viewport_realize (GtkWidget *widget);
16812 +static void Dw_gtk_viewport_unrealize (GtkWidget *widget);
16813 +static gboolean Dw_gtk_viewport_expose (GtkWidget *widget,
16814 + GdkEventExpose *event);
16815 +static gboolean Dw_gtk_viewport_button_press (GtkWidget *widget,
16816 + GdkEventButton *event);
16817 +static gboolean Dw_gtk_viewport_button_release (GtkWidget *widget,
16818 + GdkEventButton *event);
16819 +static gboolean Dw_gtk_viewport_motion_notify (GtkWidget *widget,
16820 + GdkEventMotion *event);
16821 +static gboolean Dw_gtk_viewport_enter_notify (GtkWidget *widget,
16822 + GdkEventCrossing *event);
16823 +static gboolean Dw_gtk_viewport_leave_notify (GtkWidget *widget,
16824 + GdkEventCrossing *event);
16825 +static gboolean Dw_gtk_viewport_adj_changed (GtkAdjustment *adj,
16826 + GtkDwViewport *viewport);
16829 * Standard Gtk+ function
16831 -GtkType a_Dw_gtk_viewport_get_type (void)
16832 +GType a_Dw_gtk_viewport_get_type (void)
16834 - static GtkType type = 0;
16835 + static GType type = 0;
16838 - GtkTypeInfo info = {
16840 - sizeof (GtkDwViewport),
16841 + GTypeInfo info = {
16842 sizeof (GtkDwViewportClass),
16843 - (GtkClassInitFunc) Dw_gtk_viewport_class_init,
16844 - (GtkObjectInitFunc) Dw_gtk_viewport_init,
16845 - (GtkArgSetFunc) NULL,
16846 - (GtkArgGetFunc) NULL,
16847 - (GtkClassInitFunc) NULL
16848 + (GBaseInitFunc) NULL,
16849 + (GBaseFinalizeFunc) NULL,
16850 + (GClassInitFunc) Dw_gtk_viewport_class_init,
16851 + (GClassFinalizeFunc) NULL,
16852 + (gconstpointer) NULL,
16853 + sizeof (GtkDwViewport),
16855 + (GInstanceInitFunc) Dw_gtk_viewport_init,
16856 + (GTypeValueTable *) NULL
16859 - type = gtk_type_unique (GTK_TYPE_LAYOUT, &info);
16860 + GTypeFlags flags = 0;
16861 + type = g_type_register_static(GTK_TYPE_LAYOUT,
16862 + "GtkDwViewport", &info, flags);
16868 @@ -87,12 +87,12 @@
16869 * however, for more general perposes, the signal function
16870 * "set_scroll_adjustments" had to be redefined.
16872 - gtk_signal_connect (GTK_OBJECT (hadjustment), "value_changed",
16873 - GTK_SIGNAL_FUNC (Dw_gtk_viewport_adj_changed),
16874 - (gpointer) widget);
16875 - gtk_signal_connect (GTK_OBJECT (vadjustment), "value_changed",
16876 - GTK_SIGNAL_FUNC (Dw_gtk_viewport_adj_changed),
16877 - (gpointer) widget);
16878 + g_signal_connect(G_OBJECT(hadjustment), "value_changed",
16879 + G_CALLBACK(Dw_gtk_viewport_adj_changed),
16881 + g_signal_connect(G_OBJECT(vadjustment), "value_changed",
16882 + G_CALLBACK(Dw_gtk_viewport_adj_changed),
16887 @@ -115,11 +115,9 @@
16888 Look at gtklayout.c */
16889 GTK_WIDGET_SET_FLAGS (viewport, GTK_APP_PAINTABLE);
16891 - viewport->back_pixmap = NULL;
16892 viewport->child = NULL;
16893 viewport->last_entered = NULL;
16894 viewport->resize_idle_id = -1;
16895 - viewport->back_pixmap = NULL;
16896 viewport->anchor = NULL;
16897 viewport->anchor_idle_id = -1;
16899 @@ -133,7 +131,7 @@
16900 GtkObjectClass *object_class;
16901 GtkWidgetClass *widget_class;
16903 - parent_class = gtk_type_class (gtk_layout_get_type ());
16904 + parent_class = gtk_type_class (GTK_TYPE_LAYOUT);
16906 object_class = (GtkObjectClass*) klass;
16907 widget_class = (GtkWidgetClass*) klass;
16908 @@ -142,7 +140,6 @@
16910 widget_class->realize = Dw_gtk_viewport_realize;
16911 widget_class->unrealize = Dw_gtk_viewport_unrealize;
16912 - widget_class->draw = Dw_gtk_viewport_draw;
16913 widget_class->expose_event = Dw_gtk_viewport_expose;
16914 widget_class->button_press_event = Dw_gtk_viewport_button_press;
16915 widget_class->button_release_event = Dw_gtk_viewport_button_release;
16916 @@ -167,18 +164,20 @@
16918 viewport = GTK_DW_VIEWPORT (object);
16920 - if (viewport->back_pixmap)
16921 - gdk_pixmap_unref (viewport->back_pixmap);
16922 - if (viewport->child)
16923 + if (viewport->child) {
16924 gtk_object_destroy (GTK_OBJECT (viewport->child));
16925 + viewport->child = NULL;
16927 if (viewport->resize_idle_id)
16928 gtk_idle_remove (viewport->resize_idle_id);
16929 - if (viewport->anchor)
16930 + if (viewport->anchor) {
16931 g_free (viewport->anchor);
16932 + viewport->anchor = NULL;
16934 if (viewport->anchor_idle_id != -1)
16935 gtk_idle_remove (viewport->anchor_idle_id);
16937 - (* GTK_OBJECT_CLASS(parent_class)->destroy) (object);
16938 + GTK_OBJECT_CLASS(parent_class)->destroy (object);
16942 @@ -195,7 +194,7 @@
16944 GtkDwViewport *viewport;
16946 - (* (GTK_WIDGET_CLASS(parent_class)->realize)) (widget);
16947 + GTK_WIDGET_CLASS(parent_class)->realize (widget);
16949 gdk_window_set_events (widget->window,
16950 gdk_window_get_events (widget->window)
16951 @@ -204,6 +203,13 @@
16952 | GDK_POINTER_MOTION_MASK
16953 | GDK_ENTER_NOTIFY_MASK
16954 | GDK_LEAVE_NOTIFY_MASK);
16955 + gdk_window_set_events (GTK_LAYOUT(widget)->bin_window,
16956 + gdk_window_get_events (GTK_LAYOUT(widget)->bin_window)
16957 + | GDK_BUTTON_PRESS_MASK
16958 + | GDK_BUTTON_RELEASE_MASK
16959 + | GDK_POINTER_MOTION_MASK
16960 + | GDK_ENTER_NOTIFY_MASK
16961 + | GDK_LEAVE_NOTIFY_MASK);
16963 viewport = GTK_DW_VIEWPORT (widget);
16964 if (viewport->child)
16965 @@ -220,7 +226,7 @@
16967 GtkDwViewport *viewport;
16969 - (* (GTK_WIDGET_CLASS(parent_class)->unrealize)) (widget);
16970 + GTK_WIDGET_CLASS(parent_class)->unrealize (widget);
16972 viewport = GTK_DW_VIEWPORT (widget);
16973 if (viewport->child)
16974 @@ -236,9 +242,8 @@
16975 GdkEventExpose *event)
16978 - DwRectangle parent_area, child_area, intersection;
16979 + DwRectangle child_area, intersection;
16980 GtkDwViewport *viewport;
16981 - gboolean new_back_pixmap;
16983 if (GTK_WIDGET_DRAWABLE (widget)) {
16984 layout = GTK_LAYOUT (widget);
16985 @@ -247,58 +252,20 @@
16986 DEBUG_MSG (2, "Drawing (%d, %d), %d x %d\n",
16987 area->x, area->y, area->width, area->height);
16989 - /* Make sure the backing pixmap is large enough. */
16990 if (viewport->child) {
16991 - if (viewport->back_pixmap)
16992 - new_back_pixmap =
16993 - (widget->allocation.width > viewport->back_width ||
16994 - widget->allocation.height > viewport->back_height);
16996 - new_back_pixmap = TRUE;
16998 - if (new_back_pixmap) {
16999 - if (viewport->back_pixmap)
17000 - gdk_pixmap_ref (viewport->back_pixmap);
17001 - viewport->back_pixmap = gdk_pixmap_new (widget->window,
17002 - widget->allocation.width,
17003 - widget->allocation.height,
17004 - viewport->depth);
17005 - viewport->back_width = widget->allocation.width;
17006 - viewport->back_height = widget->allocation.height;
17007 - DEBUG_MSG (1, " Creating new pixmap, size = %d x %d\n",
17008 - widget->allocation.width, widget->allocation.height);
17011 /* Draw top-level Dw widget. */
17013 - p_Dw_widget_x_viewport_to_world (viewport->child, area->x);
17015 - p_Dw_widget_y_viewport_to_world (viewport->child, area->y);
17016 - parent_area.width = area->width;
17017 - parent_area.height = area->height;
17019 child_area.x = viewport->child->allocation.x;
17020 child_area.y = viewport->child->allocation.y;
17021 child_area.width = viewport->child->allocation.width;
17022 child_area.height = (viewport->child->allocation.ascent +
17023 viewport->child->allocation.descent);
17025 - if (p_Dw_rectangle_intersect (&parent_area, &child_area,
17026 + if (p_Dw_rectangle_intersect ((DwRectangle *)area, &child_area,
17028 intersection.x -= viewport->child->allocation.x;
17029 intersection.y -= viewport->child->allocation.y;
17031 - /* "Clear" backing pixmap. */
17032 - gdk_draw_rectangle (viewport->back_pixmap,
17033 - viewport->child->style->background_color->gc,
17034 - TRUE, area->x, area->y,
17035 - area->width, area->height);
17036 - /* Widgets draw in backing pixmap. */
17037 a_Dw_widget_draw (viewport->child, &intersection, event);
17038 - /* Copy backing pixmap into window. */
17039 - gdk_draw_pixmap (layout->bin_window, widget->style->black_gc,
17040 - viewport->back_pixmap, area->x, area->y,
17041 - area->x, area->y, area->width, area->height);
17044 gdk_window_clear_area (layout->bin_window,
17045 @@ -310,48 +277,32 @@
17047 * Standard Gtk+ function
17049 -static void Dw_gtk_viewport_draw (GtkWidget *widget,
17050 - GdkRectangle *area)
17052 - Dw_gtk_viewport_paint (widget, area, NULL);
17053 - (* (GTK_WIDGET_CLASS(parent_class)->draw)) (widget, area);
17058 - * Standard Gtk+ function
17060 -static gint Dw_gtk_viewport_expose (GtkWidget *widget,
17061 - GdkEventExpose *event)
17062 +static gboolean Dw_gtk_viewport_expose (GtkWidget *widget,
17063 + GdkEventExpose *event)
17065 Dw_gtk_viewport_paint (widget, &(event->area), event);
17066 - return (* (GTK_WIDGET_CLASS(parent_class)->expose_event)) (widget, event);
17067 + return GTK_WIDGET_CLASS(parent_class)->expose_event (widget, event);
17072 * Handle the mouse event and deliver it to the Dw widget.
17073 - * Most is done in a_Dw_widget_mouse_event.
17074 + * Most is done in Dw_widget_mouse_event.
17076 -static gint Dw_gtk_viewport_mouse_event (GtkWidget *widget,
17080 +static gboolean Dw_gtk_viewport_mouse_event (GtkWidget *widget,
17081 + gint32 x, gint32 y,
17082 + GdkEventAny *event)
17084 GtkDwViewport *viewport;
17085 DwWidget *dw_widget;
17086 - gint32 world_x, world_y;
17088 - if (event == NULL || event->any.window == widget->window) {
17089 + if (event == NULL || event->window == widget->window ||
17090 + event->window == GTK_LAYOUT(widget)->bin_window) {
17091 viewport = GTK_DW_VIEWPORT (widget);
17092 if (viewport->child) {
17093 - world_x = x + gtk_layout_get_hadjustment(GTK_LAYOUT(viewport))->value;
17094 - world_y = y + gtk_layout_get_vadjustment(GTK_LAYOUT(viewport))->value;
17096 - Dw_gtk_viewport_widget_at_point (viewport, world_x, world_y);
17098 - return Dw_widget_mouse_event (dw_widget, widget,
17099 - world_x, world_y, event);
17100 + Dw_gtk_viewport_widget_at_point (viewport, x, y);
17101 + return Dw_widget_mouse_event (dw_widget, widget, x, y, event);
17105 @@ -362,37 +313,37 @@
17107 * Standard Gtk+ function
17109 -static gint Dw_gtk_viewport_button_press (GtkWidget *widget,
17110 - GdkEventButton *event)
17111 +static gboolean Dw_gtk_viewport_button_press (GtkWidget *widget,
17112 + GdkEventButton *event)
17114 return Dw_gtk_viewport_mouse_event (widget, event->x, event->y,
17115 - (GdkEvent*) event);
17116 + (GdkEventAny*) event);
17121 * Standard Gtk+ function
17123 -static gint Dw_gtk_viewport_button_release (GtkWidget *widget,
17124 - GdkEventButton *event)
17125 +static gboolean Dw_gtk_viewport_button_release (GtkWidget *widget,
17126 + GdkEventButton *event)
17128 return Dw_gtk_viewport_mouse_event (widget, event->x, event->y,
17129 - (GdkEvent*) event);
17130 + (GdkEventAny*) event);
17135 * Standard Gtk+ function
17137 -static gint Dw_gtk_viewport_motion_notify (GtkWidget *widget,
17138 - GdkEventMotion *event)
17139 +static gboolean Dw_gtk_viewport_motion_notify (GtkWidget *widget,
17140 + GdkEventMotion *event)
17142 GtkDwViewport *viewport = GTK_DW_VIEWPORT (widget);
17144 viewport->mouse_x = event->x;
17145 viewport->mouse_y = event->y;
17146 return Dw_gtk_viewport_mouse_event (widget, event->x, event->y,
17147 - (GdkEvent*) event);
17148 + (GdkEventAny*) event);
17152 @@ -421,11 +372,12 @@
17153 * This function is called when the viewport changes, and causes
17154 * motion_notify events to be simulated.
17156 -static void Dw_gtk_viewport_adj_changed (GtkAdjustment *adj,
17157 - GtkDwViewport *viewport)
17158 +static gboolean Dw_gtk_viewport_adj_changed (GtkAdjustment *adj,
17159 + GtkDwViewport *viewport)
17161 - Dw_gtk_viewport_mouse_event (GTK_WIDGET (viewport),
17162 - viewport->mouse_x, viewport->mouse_y, NULL);
17163 + return Dw_gtk_viewport_mouse_event (GTK_WIDGET (viewport),
17164 + viewport->mouse_x, viewport->mouse_y,
17168 /**********************
17169 @@ -545,8 +497,9 @@
17171 widget = GTK_WIDGET (viewport);
17172 scrolled = GTK_SCROLLED_WINDOW (widget->parent->parent);
17173 - space = GTK_SCROLLED_WINDOW_CLASS(GTK_OBJECT(scrolled)->klass)
17174 - ->scrollbar_spacing;
17175 + space = GTK_SCROLLED_WINDOW_CLASS(G_OBJECT_GET_CLASS(
17176 + G_OBJECT(scrolled)))->scrollbar_spacing;
17177 + if (space < 0) space = 3; /* Bad solution, check gtkscrolledwindow.c */
17178 border_width = GTK_CONTAINER(viewport)->border_width;
17180 gtk_widget_size_request (scrolled->vscrollbar, &bar_requisition);
17181 @@ -747,7 +700,7 @@
17182 g_hash_table_lookup_extended (widget->anchors_table, viewport->anchor,
17184 Dw_gtk_viewport_scroll_to (viewport,
17185 - GPOINTER_TO_INT(p) + widget->allocation.y);
17186 + GPOINTER_TO_INT (p) + widget->allocation.y);
17188 if (DW_IS_CONTAINER (widget))
17189 a_Dw_container_forall (DW_CONTAINER (widget),
17190 @@ -777,7 +730,7 @@
17191 Dw_gtk_viewport_remove_anchor (viewport);
17194 - viewport->anchor = g_strdup(anchor);
17195 + viewport->anchor = g_strdup (anchor);
17196 Dw_gtk_viewport_update_anchor (viewport);
17198 viewport->anchor = NULL;
17199 @@ -813,7 +766,7 @@
17201 * Remove anchor and idle function.
17203 -void Dw_gtk_viewport_remove_anchor (GtkDwViewport *viewport)
17204 +gboolean Dw_gtk_viewport_remove_anchor (GtkDwViewport *viewport)
17206 if (viewport->anchor) {
17207 g_free (viewport->anchor);
17208 @@ -824,4 +777,5 @@
17209 gtk_idle_remove (viewport->anchor_idle_id);
17210 viewport->anchor_idle_id = -1;
17214 diff -urN dillo-0.6.6/src/dw_gtk_viewport.h dillo2-0.6.6/src/dw_gtk_viewport.h
17215 --- dillo-0.6.6/src/dw_gtk_viewport.h 2001-12-22 13:51:08.000000000 -0700
17216 +++ dillo2-0.6.6/src/dw_gtk_viewport.h 2003-04-21 12:35:47.000000000 -0600
17221 - GdkPixmap *back_pixmap; /* backing pixmap for buffering */
17222 - gint back_width, back_height;
17227 void Dw_gtk_viewport_update_anchor (GtkDwViewport *viewport);
17228 void Dw_gtk_viewport_scroll_to (GtkDwViewport *viewport,
17230 -void Dw_gtk_viewport_remove_anchor (GtkDwViewport *viewport);
17231 +gboolean Dw_gtk_viewport_remove_anchor (GtkDwViewport *viewport);
17235 diff -urN dillo-0.6.6/src/dw_hruler.c dillo2-0.6.6/src/dw_hruler.c
17236 --- dillo-0.6.6/src/dw_hruler.c 2002-03-13 05:08:43.000000000 -0700
17237 +++ dillo2-0.6.6/src/dw_hruler.c 2003-04-21 12:35:48.000000000 -0600
17238 @@ -29,25 +29,27 @@
17239 GdkEventExpose *event);
17242 -GtkType a_Dw_hruler_get_type (void)
17243 +GType a_Dw_hruler_get_type (void)
17245 - static GtkType type = 0;
17246 + static GType type = 0;
17249 - GtkTypeInfo info = {
17251 - sizeof (DwHruler),
17252 + GTypeInfo info = {
17253 sizeof (DwHrulerClass),
17254 - (GtkClassInitFunc) Dw_hruler_class_init,
17255 - (GtkObjectInitFunc) Dw_hruler_init,
17256 - (GtkArgSetFunc) NULL,
17257 - (GtkArgGetFunc) NULL,
17258 - (GtkClassInitFunc) NULL
17259 + (GBaseInitFunc) NULL,
17260 + (GBaseFinalizeFunc) NULL,
17261 + (GClassInitFunc) Dw_hruler_class_init,
17262 + (GClassFinalizeFunc) NULL,
17263 + (gconstpointer) NULL,
17264 + sizeof (DwHruler),
17266 + (GInstanceInitFunc) Dw_hruler_init,
17267 + (GTypeValueTable *) NULL
17270 - type = gtk_type_unique (DW_TYPE_WIDGET, &info);
17271 + GTypeFlags flags = 0;
17272 + type = g_type_register_static(DW_TYPE_WIDGET,
17273 + "DwHruler", &info, flags);
17281 object_class = GTK_OBJECT_CLASS (klass);
17283 - widget_class = (DwWidgetClass*)klass;
17284 + widget_class = DW_WIDGET_CLASS (klass);
17285 widget_class->size_request = Dw_hruler_size_request;
17286 widget_class->draw = Dw_hruler_draw;
17288 diff -urN dillo-0.6.6/src/dw_image.c dillo2-0.6.6/src/dw_image.c
17289 --- dillo-0.6.6/src/dw_image.c 2002-04-09 18:56:26.000000000 -0600
17290 +++ dillo2-0.6.6/src/dw_image.c 2003-04-21 12:35:49.000000000 -0600
17291 @@ -88,25 +88,27 @@
17293 * Standard Gtk+ function.
17295 -GtkType a_Dw_image_get_type (void)
17296 +GType a_Dw_image_get_type (void)
17298 - static GtkType type = 0;
17299 + static GType type = 0;
17302 - GtkTypeInfo info = {
17304 - sizeof (DwImage),
17305 + GTypeInfo info = {
17306 sizeof (DwImageClass),
17307 - (GtkClassInitFunc) Dw_image_class_init,
17308 - (GtkObjectInitFunc) Dw_image_init,
17309 - (GtkArgSetFunc) NULL,
17310 - (GtkArgGetFunc) NULL,
17311 - (GtkClassInitFunc) NULL
17312 + (GBaseInitFunc) NULL,
17313 + (GBaseFinalizeFunc) NULL,
17314 + (GClassInitFunc) Dw_image_class_init,
17315 + (GClassFinalizeFunc) NULL,
17316 + (gconstpointer) NULL,
17317 + sizeof (DwImage),
17319 + (GInstanceInitFunc) Dw_image_init,
17320 + (GTypeValueTable *) NULL
17323 - type = gtk_type_unique (DW_TYPE_WIDGET, &info);
17324 + GTypeFlags flags = 0;
17325 + type = g_type_register_static(DW_TYPE_WIDGET,
17326 + "DwImage", &info, flags);
17332 @@ -119,8 +121,9 @@
17335 object = gtk_object_new (DW_TYPE_IMAGE, NULL);
17336 - if (alt && alt[0] && prefs.show_alt)
17337 + if (alt && alt[0] && prefs.show_alt) {
17338 DW_IMAGE(object)->alt_tooltip = a_Dw_tooltip_new (alt);
17340 return DW_WIDGET (object);
17343 @@ -154,41 +157,48 @@
17344 object_class->destroy = Dw_image_destroy;
17346 image_signals[LINK_ENTERED] =
17347 - gtk_signal_new ("link_entered",
17349 - object_class->type,
17350 - GTK_SIGNAL_OFFSET (DwImageClass, link_entered),
17351 - p_Dw_marshal_link_enter,
17353 - 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT);
17354 + g_signal_new ("link_entered",
17355 + G_TYPE_FROM_CLASS(object_class),
17356 + G_SIGNAL_RUN_FIRST,
17357 + G_STRUCT_OFFSET (DwImageClass, link_entered),
17360 + p_Dw_marshal_VOID__INT_INT_INT,
17362 + 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT);
17363 image_signals[LINK_PRESSED] =
17364 - gtk_signal_new ("link_pressed",
17366 - object_class->type,
17367 - GTK_SIGNAL_OFFSET (DwImageClass, link_pressed),
17368 - p_Dw_marshal_link_button,
17370 - 4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT,
17371 - GTK_TYPE_GDK_EVENT);
17372 + g_signal_new ("link_pressed",
17373 + G_TYPE_FROM_CLASS(object_class),
17374 + G_SIGNAL_RUN_FIRST,
17375 + G_STRUCT_OFFSET (DwImageClass, link_pressed),
17378 + p_Dw_marshal_VOID__INT_INT_INT_POINTER,
17380 + 4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT,
17382 image_signals[LINK_RELEASED] =
17383 - gtk_signal_new ("link_released",
17385 - object_class->type,
17386 - GTK_SIGNAL_OFFSET (DwImageClass, link_released),
17387 - p_Dw_marshal_link_button,
17389 - 4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT,
17390 - GTK_TYPE_GDK_EVENT);
17391 + g_signal_new ("link_released",
17392 + G_TYPE_FROM_CLASS(object_class),
17393 + G_SIGNAL_RUN_FIRST,
17394 + G_STRUCT_OFFSET (DwImageClass, link_released),
17397 + p_Dw_marshal_VOID__INT_INT_INT_POINTER,
17399 + 4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT,
17401 image_signals[LINK_CLICKED] =
17402 - gtk_signal_new ("link_clicked",
17404 - object_class->type,
17405 - GTK_SIGNAL_OFFSET (DwImageClass, link_clicked),
17406 - p_Dw_marshal_link_button,
17408 - 4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT,
17409 - GTK_TYPE_GDK_EVENT);
17410 - gtk_object_class_add_signals (object_class, image_signals, LAST_SIGNAL);
17411 + g_signal_new ("link_clicked",
17412 + G_TYPE_FROM_CLASS(object_class),
17413 + G_SIGNAL_RUN_FIRST,
17414 + G_STRUCT_OFFSET (DwImageClass, link_clicked),
17417 + p_Dw_marshal_VOID__INT_INT_INT_POINTER,
17419 + 4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT,
17422 widget_class = (DwWidgetClass*)klass;
17423 widget_class->size_request = Dw_image_size_request;
17424 @@ -214,11 +224,11 @@
17425 if (image->scaled_buffer)
17426 g_free (image->scaled_buffer);
17427 if (image->usemap_url)
17428 - a_Url_free(image->usemap_url);
17429 + a_Url_free (image->usemap_url);
17431 - a_Dicache_unref(image->url, image->version);
17432 + a_Dicache_unref (image->url, image->version);
17434 - (* GTK_OBJECT_CLASS(parent_class)->destroy) (object);
17435 + GTK_OBJECT_CLASS(parent_class)->destroy (object);
17439 @@ -231,11 +241,19 @@
17442 image = DW_IMAGE (widget);
17443 - requisition->width =
17444 - image->width + p_Dw_style_box_diff_width (widget->style);
17445 - requisition->ascent =
17446 - image->height + p_Dw_style_box_diff_height (widget->style);
17447 - requisition->descent = 0;
17448 + if (prefs.halfsize_images) {
17449 + requisition->width =
17450 + image->width/2 + p_Dw_style_box_diff_width (widget->style);
17451 + requisition->ascent =
17452 + image->height/2 + p_Dw_style_box_diff_height (widget->style);
17453 + requisition->descent = 0;
17455 + requisition->width =
17456 + image->width + p_Dw_style_box_diff_width (widget->style);
17457 + requisition->ascent =
17458 + image->height + p_Dw_style_box_diff_height (widget->style);
17459 + requisition->descent = 0;
17464 @@ -276,8 +294,8 @@
17465 DwImage *image = DW_IMAGE (widget);
17466 guchar *buffer, *bstart;
17468 - //g_print(">Area x=%d y=%d w=%d h=%d\n", area->x, area->y,
17469 - // area->width, area->height);
17470 + //g_print (">Area x=%d y=%d w=%d h=%d\n", area->x, area->y,
17471 + // area->width, area->height);
17473 p_Dw_widget_draw_widget_box (widget, area);
17475 @@ -290,8 +308,8 @@
17476 p_Dw_style_box_diff_height (widget->style);
17478 if (p_Dw_rectangle_intersect (area, &content, &intersection)) {
17479 - vx = p_Dw_widget_x_world_to_viewport (widget, widget->allocation.x);
17480 - vy = p_Dw_widget_y_world_to_viewport (widget, widget->allocation.y);
17481 + vx = widget->allocation.x;
17482 + vy = widget->allocation.y;
17483 gc = widget->style->color->gc;
17485 if (image->scaled_buffer)
17486 @@ -304,7 +322,7 @@
17487 content.width * (intersection.y -
17488 p_Dw_style_box_offset_y (widget->style)) );
17490 - gdk_draw_rgb_image(
17491 + gdk_draw_rgb_image (
17492 DW_WIDGET_WINDOW (widget), gc,
17493 vx + intersection.x, vy + intersection.y,
17494 intersection.width, intersection.height, GDK_RGB_DITHER_MAX,
17495 @@ -343,8 +361,8 @@
17497 if (image->hover_link != -1) {
17498 image->hover_link = -1;
17499 - gtk_signal_emit (GTK_OBJECT (widget), image_signals[LINK_ENTERED],
17501 + g_signal_emit (G_OBJECT (widget), image_signals[LINK_ENTERED], 0,
17506 @@ -365,8 +383,8 @@
17507 Dw_image_find_link (image, x, y, &image->pressed_link, &link_x, &link_y);
17509 if (image->pressed_link >= 0) {
17510 - gtk_signal_emit (GTK_OBJECT (widget), image_signals[LINK_PRESSED],
17511 - image->pressed_link, link_x, link_y, event);
17512 + g_signal_emit (G_OBJECT (widget), image_signals[LINK_PRESSED], 0,
17513 + image->pressed_link, link_x, link_y, event);
17517 @@ -389,11 +407,11 @@
17518 image->pressed_link = -1;
17520 if (link_released >= 0) {
17521 - gtk_signal_emit (GTK_OBJECT (widget), image_signals[LINK_RELEASED],
17522 - link_released, link_x, link_y, event);
17523 + g_signal_emit (G_OBJECT (widget), image_signals[LINK_RELEASED], 0,
17524 + link_released, link_x, link_y, event);
17525 if (link_pressed == link_released)
17526 - gtk_signal_emit (GTK_OBJECT (widget), image_signals[LINK_CLICKED],
17527 - link_released, link_x, link_y, event);
17528 + g_signal_emit (G_OBJECT (widget), image_signals[LINK_CLICKED], 0,
17529 + link_released, link_x, link_y, event);
17533 @@ -419,8 +437,8 @@
17535 /* In case of a ISMAP image, the signal has to be emitted always */
17536 if (link_x != -1 || link != link_old) {
17537 - gtk_signal_emit (GTK_OBJECT (widget), image_signals[LINK_ENTERED],
17538 - link, link_x, link_y);
17539 + g_signal_emit (G_OBJECT (widget), image_signals[LINK_ENTERED], 0,
17540 + link, link_x, link_y);
17543 return (link != -1);
17544 @@ -463,14 +481,14 @@
17546 * Set or resize a image.
17548 -void a_Dw_image_size(DwImage *image, gint width, gint height)
17549 +void a_Dw_image_size (DwImage *image, gint width, gint height)
17551 gint Resize = (image->width != width || image->height != height);
17553 image->width = width;
17554 image->height = height;
17556 - p_Dw_widget_queue_resize(DW_WIDGET (image), 0, TRUE);
17558 + p_Dw_widget_queue_resize (DW_WIDGET (image), 0, TRUE);
17561 /* if a_Dw_image_set_buffer has been called before */
17562 @@ -481,8 +499,8 @@
17563 * Called after the RGB line buffer has been copied into the full
17564 * image buffer. Uses for drawing and scaling.
17566 -void a_Dw_image_draw_row(DwImage *image,
17567 - gint Width, gint Height, gint x, gint y)
17568 +void a_Dw_image_draw_row (DwImage *image,
17569 + gint Width, gint Height, gint x, gint y)
17571 DwWidget *widget = DW_WIDGET (image);
17573 @@ -509,8 +527,8 @@
17575 * Set the widget buffer to reference the dicache entry buffer
17577 -void a_Dw_image_set_buffer(DwImage *image, guchar *ImageBuffer,
17578 - DilloUrl *url, gint version)
17579 +void a_Dw_image_set_buffer (DwImage *image, guchar *ImageBuffer,
17580 + DilloUrl *url, gint version)
17582 image->buffer = ImageBuffer;
17584 @@ -538,7 +556,7 @@
17585 image->map_list = map_list;
17587 if (image->usemap_url)
17588 - a_Url_free(image->usemap_url);
17589 + a_Url_free (image->usemap_url);
17590 image->usemap_url = usemap_url ? a_Url_dup (usemap_url) : NULL;
17593 @@ -649,11 +667,11 @@
17595 list->num_maps = 0;
17596 list->num_maps_max = 8;
17597 - list->maps = g_new(DwImageMap, list->num_maps_max);
17598 + list->maps = g_new (DwImageMap, list->num_maps_max);
17600 list->num_shapes = 0;
17601 list->num_shapes_max = 8;
17602 - list->shapes = g_new(DwImageMapShape, list->num_shapes_max);
17603 + list->shapes = g_new (DwImageMapShape, list->num_shapes_max);
17607 @@ -684,7 +702,7 @@
17611 - a_List_add(list->maps, list->num_maps, list->num_maps_max);
17612 + a_List_add (list->maps, list->num_maps, list->num_maps_max);
17613 list->maps[list->num_maps - 1].url = a_Url_dup (url);
17614 list->maps[list->num_maps - 1].start_shape = list->num_shapes;
17616 @@ -718,7 +736,7 @@
17618 if (correct_args) {
17619 list->num_shapes++;
17620 - a_List_add(list->shapes, list->num_shapes, list->num_shapes_max);
17621 + a_List_add (list->shapes, list->num_shapes, list->num_shapes_max);
17622 shape = &list->shapes[list->num_shapes - 1];
17623 shape->type = type;
17624 shape->link = link;
17625 diff -urN dillo-0.6.6/src/dw_image.h dillo2-0.6.6/src/dw_image.h
17626 --- dillo-0.6.6/src/dw_image.h 2001-12-22 13:51:08.000000000 -0700
17627 +++ dillo2-0.6.6/src/dw_image.h 2003-04-21 12:35:49.000000000 -0600
17632 + /* true width and height */
17636 diff -urN dillo-0.6.6/src/dw_list_item.c dillo2-0.6.6/src/dw_list_item.c
17637 --- dillo-0.6.6/src/dw_list_item.c 2002-03-18 08:02:50.000000000 -0700
17638 +++ dillo2-0.6.6/src/dw_list_item.c 2003-04-21 12:35:50.000000000 -0600
17639 @@ -21,25 +21,27 @@
17641 * Standard Gtk+ function.
17643 -GtkType a_Dw_list_item_get_type (void)
17644 +GType a_Dw_list_item_get_type (void)
17646 - static GtkType type = 0;
17647 + static GType type = 0;
17650 - GtkTypeInfo info = {
17652 - sizeof (DwListItem),
17653 + GTypeInfo info = {
17654 sizeof (DwListItemClass),
17655 - (GtkClassInitFunc) Dw_list_item_class_init,
17656 - (GtkObjectInitFunc) Dw_list_item_init,
17657 - (GtkArgSetFunc) NULL,
17658 - (GtkArgGetFunc) NULL,
17659 - (GtkClassInitFunc) NULL
17660 + (GBaseInitFunc) NULL,
17661 + (GBaseFinalizeFunc) NULL,
17662 + (GClassInitFunc) Dw_list_item_class_init,
17663 + (GClassFinalizeFunc) NULL,
17664 + (gconstpointer) NULL,
17665 + sizeof (DwListItem),
17667 + (GInstanceInitFunc) Dw_list_item_init,
17668 + (GTypeValueTable *) NULL
17671 - type = gtk_type_unique (DW_TYPE_ALIGNED_PAGE, &info);
17672 + GTypeFlags flags = 0;
17673 + type = g_type_register_static(DW_TYPE_ALIGNED_PAGE,
17674 + "DwListItem", &info, flags);
17682 DwWidget* a_Dw_list_item_new (DwListItem *ref_list_item)
17684 - GtkObject *object;
17687 - object = gtk_object_new (DW_TYPE_LIST_ITEM, NULL);
17688 + object = g_object_new (DW_TYPE_LIST_ITEM, NULL);
17689 p_Dw_aligned_page_set_ref_page (DW_ALIGNED_PAGE (object),
17690 (DwAlignedPage*)ref_list_item);
17691 return DW_WIDGET (object);
17692 diff -urN dillo-0.6.6/src/dw_marshal.c dillo2-0.6.6/src/dw_marshal.c
17693 --- dillo-0.6.6/src/dw_marshal.c 2002-03-13 05:08:45.000000000 -0700
17694 +++ dillo2-0.6.6/src/dw_marshal.c 2003-04-21 12:35:50.000000000 -0600
17696 -#include "dw_marshal.h"
17698 +#include <glib-object.h>
17700 -typedef void (*GtkSignal_NONE__INT_INT_INT) (GtkObject * object,
17701 - gint arg1, gint arg2,
17702 - gint arg3, gpointer user_data);
17704 -void p_Dw_marshal_NONE__INT_INT_INT (GtkObject * object,
17705 - GtkSignalFunc Func,
17706 - gpointer FuncData, GtkArg * args)
17707 +#ifdef G_ENABLE_DEBUG
17708 +#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
17709 +#define g_marshal_value_peek_char(v) g_value_get_char (v)
17710 +#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
17711 +#define g_marshal_value_peek_int(v) g_value_get_int (v)
17712 +#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
17713 +#define g_marshal_value_peek_long(v) g_value_get_long (v)
17714 +#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
17715 +#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
17716 +#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
17717 +#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
17718 +#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
17719 +#define g_marshal_value_peek_float(v) g_value_get_float (v)
17720 +#define g_marshal_value_peek_double(v) g_value_get_double (v)
17721 +#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
17722 +#define g_marshal_value_peek_param(v) g_value_get_param (v)
17723 +#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
17724 +#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
17725 +#define g_marshal_value_peek_object(v) g_value_get_object (v)
17726 +#else /* !G_ENABLE_DEBUG */
17727 +/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
17728 + * Do not access GValues directly in your code. Instead, use the
17729 + * g_value_get_*() functions
17731 +#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
17732 +#define g_marshal_value_peek_char(v) (v)->data[0].v_int
17733 +#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
17734 +#define g_marshal_value_peek_int(v) (v)->data[0].v_int
17735 +#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
17736 +#define g_marshal_value_peek_long(v) (v)->data[0].v_long
17737 +#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
17738 +#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
17739 +#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
17740 +#define g_marshal_value_peek_enum(v) (v)->data[0].v_int
17741 +#define g_marshal_value_peek_flags(v) (v)->data[0].v_uint
17742 +#define g_marshal_value_peek_float(v) (v)->data[0].v_float
17743 +#define g_marshal_value_peek_double(v) (v)->data[0].v_double
17744 +#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
17745 +#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
17746 +#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
17747 +#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
17748 +#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
17749 +#endif /* !G_ENABLE_DEBUG */
17752 +/* VOID:VOID (dw_marshal.list:25) */
17754 +/* VOID:POINTER (dw_marshal.list:26) */
17756 +/* VOID:POINTER,POINTER (dw_marshal.list:27) */
17758 +p_Dw_marshal_VOID__POINTER_POINTER (GClosure *closure,
17759 + GValue *return_value,
17760 + guint n_param_values,
17761 + const GValue *param_values,
17762 + gpointer invocation_hint,
17763 + gpointer marshal_data)
17765 - GtkSignal_NONE__INT_INT_INT rfunc;
17766 - rfunc = (GtkSignal_NONE__INT_INT_INT) Func;
17768 - GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[1]),
17769 - GTK_VALUE_INT (args[2]), FuncData);
17770 + typedef void (*GMarshalFunc_VOID__POINTER_POINTER) (gpointer data1,
17774 + register GMarshalFunc_VOID__POINTER_POINTER callback;
17775 + register GCClosure *cc = (GCClosure*) closure;
17776 + register gpointer data1, data2;
17778 + g_return_if_fail (n_param_values == 3);
17780 + if (G_CCLOSURE_SWAP_DATA (closure))
17782 + data1 = closure->data;
17783 + data2 = g_value_peek_pointer (param_values + 0);
17787 + data1 = g_value_peek_pointer (param_values + 0);
17788 + data2 = closure->data;
17790 + callback = (GMarshalFunc_VOID__POINTER_POINTER) (marshal_data ? marshal_data : cc->callback);
17793 + g_marshal_value_peek_pointer (param_values + 1),
17794 + g_marshal_value_peek_pointer (param_values + 2),
17798 +/* VOID:INT,INT (dw_marshal.list:28) */
17800 +p_Dw_marshal_VOID__INT_INT (GClosure *closure,
17801 + GValue *return_value,
17802 + guint n_param_values,
17803 + const GValue *param_values,
17804 + gpointer invocation_hint,
17805 + gpointer marshal_data)
17807 + typedef void (*GMarshalFunc_VOID__INT_INT) (gpointer data1,
17811 + register GMarshalFunc_VOID__INT_INT callback;
17812 + register GCClosure *cc = (GCClosure*) closure;
17813 + register gpointer data1, data2;
17815 + g_return_if_fail (n_param_values == 3);
17817 + if (G_CCLOSURE_SWAP_DATA (closure))
17819 + data1 = closure->data;
17820 + data2 = g_value_peek_pointer (param_values + 0);
17824 + data1 = g_value_peek_pointer (param_values + 0);
17825 + data2 = closure->data;
17827 + callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
17830 + g_marshal_value_peek_int (param_values + 1),
17831 + g_marshal_value_peek_int (param_values + 2),
17835 +/* VOID:INT,INT,INT (dw_marshal.list:29) */
17837 +p_Dw_marshal_VOID__INT_INT_INT (GClosure *closure,
17838 + GValue *return_value,
17839 + guint n_param_values,
17840 + const GValue *param_values,
17841 + gpointer invocation_hint,
17842 + gpointer marshal_data)
17844 + typedef void (*GMarshalFunc_VOID__INT_INT_INT) (gpointer data1,
17849 + register GMarshalFunc_VOID__INT_INT_INT callback;
17850 + register GCClosure *cc = (GCClosure*) closure;
17851 + register gpointer data1, data2;
17853 + g_return_if_fail (n_param_values == 4);
17855 + if (G_CCLOSURE_SWAP_DATA (closure))
17857 + data1 = closure->data;
17858 + data2 = g_value_peek_pointer (param_values + 0);
17862 + data1 = g_value_peek_pointer (param_values + 0);
17863 + data2 = closure->data;
17865 + callback = (GMarshalFunc_VOID__INT_INT_INT) (marshal_data ? marshal_data : cc->callback);
17868 + g_marshal_value_peek_int (param_values + 1),
17869 + g_marshal_value_peek_int (param_values + 2),
17870 + g_marshal_value_peek_int (param_values + 3),
17874 -typedef void (*GtkSignal_NONE__INT_INT_INT_POINTER) (GtkObject * object,
17875 - gint arg1, gint arg2,
17878 - gpointer user_data);
17880 -void p_Dw_marshal_NONE__INT_INT_INT_POINTER (GtkObject * object,
17881 - GtkSignalFunc Func,
17882 - gpointer FuncData, GtkArg * args)
17883 +/* VOID:INT,INT,INT,POINTER (dw_marshal.list:30) */
17885 +p_Dw_marshal_VOID__INT_INT_INT_POINTER (GClosure *closure,
17886 + GValue *return_value,
17887 + guint n_param_values,
17888 + const GValue *param_values,
17889 + gpointer invocation_hint,
17890 + gpointer marshal_data)
17892 - GtkSignal_NONE__INT_INT_INT_POINTER rfunc;
17893 - rfunc = (GtkSignal_NONE__INT_INT_INT_POINTER) Func;
17895 - GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[1]),
17896 - GTK_VALUE_INT (args[2]), GTK_VALUE_POINTER (args[3]), FuncData);
17897 + typedef void (*GMarshalFunc_VOID__INT_INT_INT_POINTER) (gpointer data1,
17903 + register GMarshalFunc_VOID__INT_INT_INT_POINTER callback;
17904 + register GCClosure *cc = (GCClosure*) closure;
17905 + register gpointer data1, data2;
17907 + g_return_if_fail (n_param_values == 5);
17909 + if (G_CCLOSURE_SWAP_DATA (closure))
17911 + data1 = closure->data;
17912 + data2 = g_value_peek_pointer (param_values + 0);
17916 + data1 = g_value_peek_pointer (param_values + 0);
17917 + data2 = closure->data;
17919 + callback = (GMarshalFunc_VOID__INT_INT_INT_POINTER) (marshal_data ? marshal_data : cc->callback);
17922 + g_marshal_value_peek_int (param_values + 1),
17923 + g_marshal_value_peek_int (param_values + 2),
17924 + g_marshal_value_peek_int (param_values + 3),
17925 + g_marshal_value_peek_pointer (param_values + 4),
17929 +/* VOID:UINT (dw_marshal.list:31) */
17931 +/* BOOL:UINT,UINT,POINTER (dw_marshal.list:33) */
17933 +p_Dw_marshal_BOOLEAN__UINT_UINT_POINTER (GClosure *closure,
17934 + GValue *return_value,
17935 + guint n_param_values,
17936 + const GValue *param_values,
17937 + gpointer invocation_hint,
17938 + gpointer marshal_data)
17940 + typedef gboolean (*GMarshalFunc_BOOLEAN__UINT_UINT_POINTER) (gpointer data1,
17945 + register GMarshalFunc_BOOLEAN__UINT_UINT_POINTER callback;
17946 + register GCClosure *cc = (GCClosure*) closure;
17947 + register gpointer data1, data2;
17948 + gboolean v_return;
17950 + g_return_if_fail (return_value != NULL);
17951 + g_return_if_fail (n_param_values == 4);
17953 + if (G_CCLOSURE_SWAP_DATA (closure))
17955 + data1 = closure->data;
17956 + data2 = g_value_peek_pointer (param_values + 0);
17960 + data1 = g_value_peek_pointer (param_values + 0);
17961 + data2 = closure->data;
17963 + callback = (GMarshalFunc_BOOLEAN__UINT_UINT_POINTER) (marshal_data ? marshal_data : cc->callback);
17965 + v_return = callback (data1,
17966 + g_marshal_value_peek_uint (param_values + 1),
17967 + g_marshal_value_peek_uint (param_values + 2),
17968 + g_marshal_value_peek_pointer (param_values + 3),
17971 + g_value_set_boolean (return_value, v_return);
17974 diff -urN dillo-0.6.6/src/dw_marshal.h dillo2-0.6.6/src/dw_marshal.h
17975 --- dillo-0.6.6/src/dw_marshal.h 2002-03-13 05:08:46.000000000 -0700
17976 +++ dillo2-0.6.6/src/dw_marshal.h 2003-04-21 12:35:50.000000000 -0600
17978 -#ifndef __DW_MARSHAL_H__
17979 -#define __DW_MARSHAL_H__
17981 -#include <gtk/gtktypeutils.h>
17982 -#include <gtk/gtkobject.h>
17983 +#ifndef __p_Dw_marshal_MARSHAL_H__
17984 +#define __p_Dw_marshal_MARSHAL_H__
17986 -void p_Dw_marshal_NONE__INT_INT_INT (GtkObject * object,
17987 - GtkSignalFunc Func,
17988 - gpointer FuncData, GtkArg * args);
17989 -void p_Dw_marshal_NONE__INT_INT_INT_POINTER (GtkObject * object,
17990 - GtkSignalFunc Func,
17991 - gpointer FuncData, GtkArg * args);
17994 - * Marshal fuctions for standard link signals.
17996 -#define p_Dw_marshal_link_enter p_Dw_marshal_NONE__INT_INT_INT
17997 -#define p_Dw_marshal_link_button p_Dw_marshal_NONE__INT_INT_INT_POINTER
17998 +#include <glib-object.h>
18002 +/* VOID:VOID (dw_marshal.list:25) */
18003 +#define p_Dw_marshal_VOID__VOID g_cclosure_marshal_VOID__VOID
18005 +/* VOID:POINTER (dw_marshal.list:26) */
18006 +#define p_Dw_marshal_VOID__POINTER g_cclosure_marshal_VOID__POINTER
18008 +/* VOID:POINTER,POINTER (dw_marshal.list:27) */
18009 +extern void p_Dw_marshal_VOID__POINTER_POINTER (GClosure *closure,
18010 + GValue *return_value,
18011 + guint n_param_values,
18012 + const GValue *param_values,
18013 + gpointer invocation_hint,
18014 + gpointer marshal_data);
18016 +/* VOID:INT,INT (dw_marshal.list:28) */
18017 +extern void p_Dw_marshal_VOID__INT_INT (GClosure *closure,
18018 + GValue *return_value,
18019 + guint n_param_values,
18020 + const GValue *param_values,
18021 + gpointer invocation_hint,
18022 + gpointer marshal_data);
18024 +/* VOID:INT,INT,INT (dw_marshal.list:29) */
18025 +extern void p_Dw_marshal_VOID__INT_INT_INT (GClosure *closure,
18026 + GValue *return_value,
18027 + guint n_param_values,
18028 + const GValue *param_values,
18029 + gpointer invocation_hint,
18030 + gpointer marshal_data);
18032 +/* VOID:INT,INT,INT,POINTER (dw_marshal.list:30) */
18033 +extern void p_Dw_marshal_VOID__INT_INT_INT_POINTER (GClosure *closure,
18034 + GValue *return_value,
18035 + guint n_param_values,
18036 + const GValue *param_values,
18037 + gpointer invocation_hint,
18038 + gpointer marshal_data);
18040 +/* VOID:UINT (dw_marshal.list:31) */
18041 +#define p_Dw_marshal_VOID__UINT g_cclosure_marshal_VOID__UINT
18043 +/* BOOL:UINT,UINT,POINTER (dw_marshal.list:33) */
18044 +extern void p_Dw_marshal_BOOLEAN__UINT_UINT_POINTER (GClosure *closure,
18045 + GValue *return_value,
18046 + guint n_param_values,
18047 + const GValue *param_values,
18048 + gpointer invocation_hint,
18049 + gpointer marshal_data);
18050 +#define p_Dw_marshal_BOOL__UINT_UINT_POINTER p_Dw_marshal_BOOLEAN__UINT_UINT_POINTER
18054 +#endif /* __p_Dw_marshal_MARSHAL_H__ */
18056 -#endif /* __DW_MARSHAL_H__ */
18057 diff -urN dillo-0.6.6/src/dw_marshal.list dillo2-0.6.6/src/dw_marshal.list
18058 --- dillo-0.6.6/src/dw_marshal.list 1969-12-31 17:00:00.000000000 -0700
18059 +++ dillo2-0.6.6/src/dw_marshal.list 2003-04-21 12:35:28.000000000 -0600
18061 +# see glib-genmarshal(1) for a detailed description of the file format,
18062 +# possible parameter types are:
18063 +# VOID indicates no return type, or no extra
18064 +# parameters. if VOID is used as the parameter
18065 +# list, no additional parameters may be present.
18066 +# BOOLEAN for boolean types (gboolean)
18067 +# CHAR for signed char types (gchar)
18068 +# UCHAR for unsigned char types (guchar)
18069 +# INT for signed integer types (gint)
18070 +# UINT for unsigned integer types (guint)
18071 +# LONG for signed long integer types (glong)
18072 +# ULONG for unsigned long integer types (gulong)
18073 +# ENUM for enumeration types (gint)
18074 +# FLAGS for flag enumeration types (guint)
18075 +# FLOAT for single-precision float types (gfloat)
18076 +# DOUBLE for double-precision float types (gdouble)
18077 +# STRING for string types (gchar*)
18078 +# BOXED for boxed (anonymous but reference counted) types (GBoxed*)
18079 +# POINTER for anonymous pointer types (gpointer)
18080 +# PARAM for GParamSpec or derived types (GParamSpec*)
18081 +# OBJECT for GObject or derived types (GObject*)
18082 +# NONE deprecated alias for VOID
18083 +# BOOL deprecated alias for BOOLEAN
18087 +VOID: POINTER, POINTER
18089 +VOID: INT, INT, INT
18090 +VOID: INT, INT, INT, POINTER
18093 +BOOL: UINT, UINT, POINTER
18094 diff -urN dillo-0.6.6/src/dw_marshal.sh dillo2-0.6.6/src/dw_marshal.sh
18095 --- dillo-0.6.6/src/dw_marshal.sh 1969-12-31 17:00:00.000000000 -0700
18096 +++ dillo2-0.6.6/src/dw_marshal.sh 2003-04-21 12:35:45.000000000 -0600
18100 +glib-genmarshal --body --stdinc --prefix=p_Dw_marshal dw_marshal.list > dw_marshal.c
18101 +glib-genmarshal --header --stdinc --prefix=p_Dw_marshal dw_marshal.list > dw_marshal.h
18102 diff -urN dillo-0.6.6/src/dw_page.c dillo2-0.6.6/src/dw_page.c
18103 --- dillo-0.6.6/src/dw_page.c 2002-04-05 08:18:17.000000000 -0700
18104 +++ dillo2-0.6.6/src/dw_page.c 2003-04-21 14:22:14.000000000 -0600
18105 @@ -53,19 +53,19 @@
18106 static void Dw_page_draw (DwWidget *page,
18108 GdkEventExpose *event);
18109 -static gint Dw_page_button_press (DwWidget *widget,
18110 +static gboolean Dw_page_button_press (DwWidget *widget,
18113 GdkEventButton *event);
18114 -static gint Dw_page_button_release (DwWidget *widget,
18115 +static gboolean Dw_page_button_release(DwWidget *widget,
18118 GdkEventButton *event);
18119 -static gint Dw_page_motion_notify (DwWidget *widget,
18120 +static gboolean Dw_page_motion_notify (DwWidget *widget,
18123 GdkEventMotion *event);
18124 -static gint Dw_page_leave_notify (DwWidget *widget,
18125 +static gboolean Dw_page_leave_notify (DwWidget *widget,
18126 DwWidget *next_widget,
18127 GdkEventMotion *event);
18129 @@ -77,10 +77,15 @@
18130 static void Dw_page_forall (DwContainer *container,
18131 DwCallback callback,
18132 gpointer callback_data);
18133 -static gint Dw_page_findtext (DwContainer *container,
18134 +static gboolean Dw_page_findtext (DwContainer *container,
18135 gpointer FP, gpointer KP,
18138 +static DwIterator* Dw_page_iterator (DwWidget *widget,
18140 +static gboolean Dw_page_iterator_next (DwIterator *it);
18141 +static DwIterator* Dw_page_iterator_clone (DwIterator *it);
18143 static void Dw_page_rewrap (DwPage *page);
18146 @@ -117,25 +122,27 @@
18148 * Return the type of DwPage
18150 -GtkType a_Dw_page_get_type (void)
18151 +GType a_Dw_page_get_type (void)
18153 - static GtkType type = 0;
18154 + static GType type = 0;
18157 - GtkTypeInfo info = {
18160 + GTypeInfo info = {
18161 sizeof (DwPageClass),
18162 - (GtkClassInitFunc) Dw_page_class_init,
18163 - (GtkObjectInitFunc) Dw_page_init,
18164 - (GtkArgSetFunc) NULL,
18165 - (GtkArgGetFunc) NULL,
18166 - (GtkClassInitFunc) NULL
18167 + (GBaseInitFunc) NULL,
18168 + (GBaseFinalizeFunc) NULL,
18169 + (GClassInitFunc) Dw_page_class_init,
18170 + (GClassFinalizeFunc) NULL,
18171 + (gconstpointer) NULL,
18174 + (GInstanceInitFunc) Dw_page_init,
18175 + (GTypeValueTable *) NULL
18178 - type = gtk_type_unique (DW_TYPE_CONTAINER, &info);
18179 + GTypeFlags flags = 0;
18180 + type = g_type_register_static(DW_TYPE_CONTAINER, "DwPage",
18187 @@ -189,6 +196,8 @@
18188 page->avail_width = 100;
18189 page->avail_ascent = 100;
18190 page->avail_descent = 0;
18192 + page->context = gdk_pango_context_get();
18196 @@ -211,41 +220,48 @@
18199 page_signals[LINK_ENTERED] =
18200 - gtk_signal_new ("link_entered",
18202 - object_class->type,
18203 - GTK_SIGNAL_OFFSET (DwPageClass, link_entered),
18204 - p_Dw_marshal_link_enter,
18206 - 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT);
18207 + g_signal_new ("link_entered",
18208 + G_TYPE_FROM_CLASS(object_class),
18209 + G_SIGNAL_RUN_FIRST,
18210 + G_STRUCT_OFFSET (DwPageClass, link_entered),
18213 + p_Dw_marshal_VOID__INT_INT_INT,
18215 + 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT);
18216 page_signals[LINK_PRESSED] =
18217 - gtk_signal_new ("link_pressed",
18219 - object_class->type,
18220 - GTK_SIGNAL_OFFSET (DwPageClass, link_pressed),
18221 - p_Dw_marshal_link_button,
18223 - 4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT,
18224 - GTK_TYPE_GDK_EVENT);
18225 + g_signal_new ("link_pressed",
18226 + G_TYPE_FROM_CLASS(object_class),
18227 + G_SIGNAL_RUN_FIRST,
18228 + G_STRUCT_OFFSET (DwPageClass, link_pressed),
18231 + p_Dw_marshal_VOID__INT_INT_INT_POINTER,
18233 + 4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT,
18235 page_signals[LINK_RELEASED] =
18236 - gtk_signal_new ("link_released",
18238 - object_class->type,
18239 - GTK_SIGNAL_OFFSET (DwPageClass, link_released),
18240 - p_Dw_marshal_link_button,
18242 - 4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT,
18243 - GTK_TYPE_GDK_EVENT);
18244 + g_signal_new ("link_released",
18245 + G_TYPE_FROM_CLASS(object_class),
18246 + G_SIGNAL_RUN_FIRST,
18247 + G_STRUCT_OFFSET (DwPageClass, link_released),
18250 + p_Dw_marshal_VOID__INT_INT_INT_POINTER,
18252 + 4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT,
18254 page_signals[LINK_CLICKED] =
18255 - gtk_signal_new ("link_clicked",
18257 - object_class->type,
18258 - GTK_SIGNAL_OFFSET (DwPageClass, link_clicked),
18259 - p_Dw_marshal_link_button,
18261 - 4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT,
18262 - GTK_TYPE_GDK_EVENT);
18263 - gtk_object_class_add_signals (object_class, page_signals, LAST_SIGNAL);
18264 + g_signal_new ("link_clicked",
18265 + G_TYPE_FROM_CLASS(object_class),
18266 + G_SIGNAL_RUN_FIRST,
18267 + G_STRUCT_OFFSET (DwPageClass, link_clicked),
18270 + p_Dw_marshal_VOID__INT_INT_INT_POINTER,
18272 + 4, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_INT,
18275 object_class->destroy = Dw_page_destroy;
18277 @@ -262,6 +278,7 @@
18278 widget_class->button_release_event = Dw_page_button_release;
18279 widget_class->motion_notify_event = Dw_page_motion_notify;
18280 widget_class->leave_notify_event = Dw_page_leave_notify;
18281 + widget_class->iterator = Dw_page_iterator;
18283 container_class->add = Dw_page_add;
18284 container_class->remove = Dw_page_remove;
18285 @@ -284,16 +301,16 @@
18289 - DEBUG_MSG(10, "Dw_page_destroy\n");
18290 + DEBUG_MSG (10, "Dw_page_destroy\n");
18292 for (i = 0; i < page->num_words; i++) {
18293 word = &page->words[i];
18294 - if (word->content_type == DW_PAGE_CONTENT_WIDGET)
18295 - gtk_object_unref(GTK_OBJECT(word->content.widget));
18296 - else if (word->content_type == DW_PAGE_CONTENT_TEXT)
18297 - g_free(word->content.text);
18298 - else if (word->content_type == DW_PAGE_CONTENT_ANCHOR)
18299 - g_free(word->content.anchor);
18300 + if (word->content.type == DW_CONTENT_WIDGET)
18301 + gtk_object_unref (GTK_OBJECT(word->content.data.widget));
18302 + else if (word->content.type == DW_CONTENT_TEXT) {
18303 + g_free(word->content.data.text.str);
18304 + } else if (word->content.type == DW_CONTENT_ANCHOR)
18305 + g_free (word->content.data.anchor);
18307 a_Dw_style_unref (word->style);
18308 a_Dw_style_unref (word->space_style);
18309 @@ -307,7 +324,7 @@
18310 page->num_words = 0;
18311 page->num_lines = 0;
18313 - (* GTK_OBJECT_CLASS(parent_class)->destroy) (object);
18314 + GTK_OBJECT_CLASS(parent_class)->destroy (object);
18318 @@ -325,7 +342,7 @@
18319 DwPageLine *last_line;
18322 - Dw_page_rewrap(page);
18323 + Dw_page_rewrap (page);
18325 if (page->num_lines > 0) {
18326 last_line = &page->lines[page->num_lines - 1];
18327 @@ -357,22 +374,24 @@
18328 static void Dw_page_get_word_extremes (DwPageWord *word,
18329 DwExtremes *extremes)
18331 - if (word->content_type == DW_PAGE_CONTENT_WIDGET) {
18332 - if (DW_WIDGET_USES_HINTS (word->content.widget))
18333 - a_Dw_widget_get_extremes (word->content.widget, extremes);
18334 + if (word->content.type == DW_CONTENT_WIDGET) {
18335 + if (DW_WIDGET_USES_HINTS (word->content.data.widget))
18336 + a_Dw_widget_get_extremes (word->content.data.widget, extremes);
18338 - if (DW_STYLE_IS_PERCENTAGE (word->content.widget->style->width)) {
18339 + if (DW_STYLE_IS_PERCENTAGE
18340 + (word->content.data.widget->style->width)) {
18341 extremes->min_width = 0;
18342 - if (DW_WIDGET_HAS_CONTENT (word->content.widget))
18343 + if (DW_WIDGET_HAS_CONTENT (word->content.data.widget))
18344 extremes->max_width = DW_INFINITY;
18346 extremes->max_width = 0;
18347 - } else if (DW_STYLE_IS_LENGTH (word->content.widget->style->width)) {
18348 + } else if (DW_STYLE_IS_LENGTH
18349 + (word->content.data.widget->style->width)) {
18350 extremes->min_width = extremes->max_width =
18351 - DW_STYLE_GET_LENGTH(word->content.widget->style->width,
18352 - word->style->font);
18353 + DW_STYLE_GET_LENGTH (word->content.data.widget->style->width,
18354 + word->style->font);
18356 - a_Dw_widget_get_extremes (word->content.widget, extremes);
18357 + a_Dw_widget_get_extremes (word->content.data.widget, extremes);
18360 extremes->min_width = word->size.width;
18361 @@ -449,21 +468,21 @@
18362 par_max += word_extremes.max_width + word->orig_space;
18364 DEBUG_MSG (1, " word \"%s\": max_width = %d\n",
18365 - word->content_type == DW_PAGE_CONTENT_TEXT ?
18366 + word->content.type == DW_CONTENT_TEXT ?
18367 word->content.text : "<no text>",
18368 word_extremes.max_width);
18371 if ( ( line->last_word > line->first_word &&
18372 - page->words[line->last_word - 1].content_type
18373 - == DW_PAGE_CONTENT_BREAK ) ||
18374 + page->words[line->last_word - 1].content.type
18375 + == DW_CONTENT_BREAK ) ||
18376 line_index == page->num_lines - 1 ) {
18377 word = &page->words[line->last_word - 1];
18378 par_max -= word->orig_space;
18380 DEBUG_MSG (2, " par_max = %d, after word %d (\"%s\")\n",
18381 par_max, line->last_word - 1,
18382 - word->content_type == DW_PAGE_CONTENT_TEXT ?
18383 + word->content.type == DW_CONTENT_TEXT ?
18384 word->content.text : "<no text>");
18386 if (extremes->max_width < par_max)
18387 @@ -508,13 +527,13 @@
18389 for (line_index = 0; line_index < page->num_lines; line_index++) {
18390 line = &(page->lines[line_index]);
18391 - x_cursor = Dw_page_line_total_x_offset(page, line);
18392 + x_cursor = Dw_page_line_total_x_offset (page, line);
18394 for (word_index = line->first_word; word_index < line->last_word;
18396 word = &(page->words[word_index]);
18398 - if (word->content_type == DW_PAGE_CONTENT_WIDGET) {
18399 + if (word->content.type == DW_CONTENT_WIDGET) {
18401 /* todo: justification within the line is done here! */
18402 child_allocation.x = x_cursor + allocation->x;
18403 @@ -527,7 +546,7 @@
18404 child_allocation.width = word->size.width;
18405 child_allocation.ascent = word->size.ascent;
18406 child_allocation.descent = word->size.descent;
18407 - a_Dw_widget_size_allocate (word->content.widget,
18408 + a_Dw_widget_size_allocate (word->content.data.widget,
18409 &child_allocation);
18412 @@ -550,7 +569,7 @@
18413 if (page->wrap_ref == -1)
18414 page->wrap_ref = ref;
18416 - page->wrap_ref = MIN(page->wrap_ref, ref);
18417 + page->wrap_ref = MIN (page->wrap_ref, ref);
18421 @@ -644,11 +663,11 @@
18423 page = DW_PAGE (container);
18425 - for(word_index = 0; word_index < page->num_words; word_index++) {
18426 + for (word_index = 0; word_index < page->num_words; word_index++) {
18427 word = &page->words[word_index];
18429 - if (word->content_type == DW_PAGE_CONTENT_WIDGET)
18430 - (*callback) (word->content.widget, callback_data);
18431 + if (word->content.type == DW_CONTENT_WIDGET)
18432 + (*callback) (word->content.data.widget, callback_data);
18436 @@ -667,7 +686,7 @@
18437 DwExtremes word_extremes;
18440 - page->avail_width - p_Dw_style_box_diff_width(widget->style)
18441 + page->avail_width - p_Dw_style_box_diff_width (widget->style)
18442 - page->inner_padding;
18443 if (prefs.limit_text_width &&
18444 avail_width > widget->viewport->allocation.width - 10)
18445 @@ -684,7 +703,7 @@
18447 if (page->num_words > 0) {
18448 last_word = &page->words[word_ind - 1];
18449 - if (last_word->content_type == DW_PAGE_CONTENT_BREAK) {
18450 + if (last_word->content.type == DW_CONTENT_BREAK) {
18451 /* last word is a break */
18454 @@ -740,7 +759,7 @@
18456 /* Add a new line. */
18458 - a_List_add(page->lines, page->num_lines, page->num_lines_max);
18459 + a_List_add (page->lines, page->num_lines, page->num_lines_max);
18461 last_line = &page->lines[page->num_lines - 1];
18463 @@ -804,8 +823,8 @@
18464 Dw_page_get_word_extremes (word, &word_extremes);
18465 last_space = (word_ind > 0) ? page->words[word_ind - 1].orig_space : 0;
18467 - if (word->content_type == DW_PAGE_CONTENT_BREAK)
18468 - last_line->break_space = MAX (word->content.break_space,
18469 + if (word->content.type == DW_CONTENT_BREAK)
18470 + last_line->break_space = MAX (word->content.data.break_space,
18471 last_line->break_space);
18473 page->last_line_width += word->size.width;
18474 @@ -824,7 +843,7 @@
18476 /* Finally, justify the line. Breaks are ignored, since the HTML
18477 * parser sometimes assignes the wrong style to them. (todo: ) */
18478 - if (word->content_type != DW_PAGE_CONTENT_BREAK) {
18479 + if (word->content.type != DW_CONTENT_BREAK) {
18480 switch (word->style->text_align) {
18481 case DW_STYLE_TEXT_ALIGN_LEFT:
18482 case DW_STYLE_TEXT_ALIGN_JUSTIFY: /* see some lines above */
18483 @@ -873,9 +892,9 @@
18484 gint32 avail_width, avail_ascent, avail_descent;
18487 - page->avail_width - p_Dw_style_box_diff_width(DW_WIDGET(page)->style);
18488 + page->avail_width - p_Dw_style_box_diff_width (DW_WIDGET(page)->style);
18490 - page->avail_ascent - p_Dw_style_box_diff_height(DW_WIDGET(page)->style);
18491 + page->avail_ascent - p_Dw_style_box_diff_height (DW_WIDGET(page)->style);
18492 avail_descent = page->avail_descent;
18494 if (DW_WIDGET_USES_HINTS (widget)) {
18495 @@ -901,7 +920,7 @@
18496 if (widget->style->height == DW_STYLE_UNDEF_LENGTH) {
18497 size->ascent = requisition.ascent;
18498 size->descent = requisition.descent;
18499 - } else if (DW_STYLE_IS_LENGTH (widget->style->width)) {
18500 + } else if (DW_STYLE_IS_LENGTH (widget->style->height)) {
18502 DW_STYLE_GET_LENGTH (widget->style->height, widget->style->font)
18503 + p_Dw_style_box_diff_height (widget->style);
18504 @@ -922,7 +941,7 @@
18505 * either when the viewport is resized, or when the size changes on one
18506 * of the child widgets.
18508 -static void Dw_page_rewrap(DwPage *page)
18509 +static void Dw_page_rewrap (DwPage *page)
18513 @@ -944,15 +963,16 @@
18514 for (; word_index < page->num_words; word_index++) {
18515 word = &page->words[word_index];
18517 - if (word->content_type == DW_PAGE_CONTENT_WIDGET)
18518 - Dw_page_calc_widget_size (page, word->content.widget, &word->size);
18519 - Dw_page_word_wrap(page, word_index);
18520 - if (word->content_type == DW_PAGE_CONTENT_WIDGET)
18521 - word->content.widget->parent_ref = page->num_lines - 1;
18523 - if ( word->content_type == DW_PAGE_CONTENT_ANCHOR ) {
18524 - p_Dw_widget_set_anchor(widget, word->content.anchor,
18525 - page->lines[page->num_lines - 1].top);
18526 + if (word->content.type == DW_CONTENT_WIDGET)
18527 + Dw_page_calc_widget_size (page, word->content.data.widget,
18529 + Dw_page_word_wrap (page, word_index);
18530 + if (word->content.type == DW_CONTENT_WIDGET)
18531 + word->content.data.widget->parent_ref = page->num_lines - 1;
18533 + if ( word->content.type == DW_CONTENT_ANCHOR ) {
18534 + p_Dw_widget_set_anchor (widget, word->content.data.anchor,
18535 + page->lines[page->num_lines - 1].top);
18539 @@ -987,90 +1007,116 @@
18541 widget = DW_WIDGET (page);
18542 window = DW_WIDGET_WINDOW (widget);
18544 - p_Dw_widget_x_world_to_viewport (widget,
18545 - widget->allocation.x +
18546 - Dw_page_line_total_x_offset(page,line));
18548 - p_Dw_widget_y_world_to_viewport (widget,
18549 - widget->allocation.y
18550 - + line->top + line->ascent);
18551 + x_cursor = widget->allocation.x + Dw_page_line_total_x_offset(page, line);
18552 + y_cursor = widget->allocation.y + line->top + line->ascent;
18554 for (word_index = line->first_word; word_index < line->last_word;
18556 word = &page->words[word_index];
18558 - switch (word->content_type) {
18559 - case DW_PAGE_CONTENT_TEXT:
18560 + switch (word->content.type) {
18561 + case DW_CONTENT_TEXT:
18562 /* Adjust the text baseline if the word is <SUP>-ed or <SUB>-ed */
18563 if (word->style->SubSup == TEXT_SUB)
18564 diff = word->size.ascent / 2;
18565 else if (word->style->SubSup == TEXT_SUP)
18566 diff -= word->size.ascent / 3;
18568 - gdk_draw_string(window,
18569 - word->style->font->font,
18570 - word->style->color->gc,
18573 - word->content.text);
18576 + PangoGlyphString *glyphs;
18577 + PangoAttrList *attr_list;
18578 + PangoAttribute *attr;
18581 + glyphs = pango_glyph_string_new();
18583 + attr_list = pango_attr_list_new();
18585 + attr = pango_attr_font_desc_new(word->style->font->font_desc);
18586 + attr->start_index = 0;
18587 + attr->end_index = 1;
18588 + pango_attr_list_insert(attr_list, attr);
18590 + len = strlen(word->content.data.text.str);
18592 + /* Shape the text into glyphs */
18593 + items = pango_itemize(page->context, word->content.data.text.str, 0, len, attr_list, NULL);
18594 + pango_shape(word->content.data.text.str, len, &(((PangoItem *)items->data)->analysis), glyphs);
18598 + GList *next = items->next;
18599 + pango_item_free (items->data);
18600 + g_list_free_1 (items);
18604 + gdk_draw_glyphs(window, word->style->color->gc,
18605 + word->content.data.text.font,
18606 + x_cursor, y_cursor + diff,
18609 + pango_attr_list_unref(attr_list);
18610 + pango_glyph_string_free(glyphs);
18614 if (word->style->uline)
18615 - gdk_draw_line(window,
18616 - word->style->color->gc,
18618 - y_cursor + 1 + diff,
18619 - x_cursor + word->size.width - 1,
18620 - y_cursor + 1 + diff);
18621 + gdk_draw_line (window,
18622 + word->style->color->gc,
18624 + y_cursor + 1 + diff,
18625 + x_cursor + word->size.width - 1,
18626 + y_cursor + 1 + diff);
18627 if (word_index + 1 < line->last_word && word->space_style->uline)
18628 - gdk_draw_line(window,
18629 - word->style->color->gc,
18630 - x_cursor + word->size.width,
18631 - y_cursor + 1 + diff,
18632 - x_cursor + word->size.width + word->eff_space - 1,
18633 - y_cursor + 1 + diff);
18634 + gdk_draw_line (window,
18635 + word->style->color->gc,
18636 + x_cursor + word->size.width,
18637 + y_cursor + 1 + diff,
18638 + x_cursor + word->size.width + word->eff_space - 1,
18639 + y_cursor + 1 + diff);
18641 /* strike-through */
18642 if (word->style->strike)
18643 - gdk_draw_line(window,
18644 - word->style->color->gc,
18646 - y_cursor - word->size.ascent / 2 + diff,
18647 - x_cursor + word->size.width - 1,
18648 - y_cursor - word->size.ascent / 2 + diff);
18649 + gdk_draw_line (window,
18650 + word->style->color->gc,
18652 + y_cursor - word->size.ascent / 2 + diff,
18653 + x_cursor + word->size.width - 1,
18654 + y_cursor - word->size.ascent / 2 + diff);
18655 if (word_index + 1 < line->last_word && word->space_style->strike)
18656 - gdk_draw_line(window,
18657 - word->style->color->gc,
18658 - x_cursor + word->size.width,
18659 - y_cursor - word->size.ascent / 2 + diff,
18660 - x_cursor + word->size.width + word->eff_space - 1,
18661 - y_cursor - word->size.ascent / 2 + diff);
18662 + gdk_draw_line (window,
18663 + word->style->color->gc,
18664 + x_cursor + word->size.width,
18665 + y_cursor - word->size.ascent / 2 + diff,
18666 + x_cursor + word->size.width + word->eff_space - 1,
18667 + y_cursor - word->size.ascent / 2 + diff);
18671 - case DW_PAGE_CONTENT_WIDGET:
18672 - child = word->content.widget;
18673 + case DW_CONTENT_WIDGET:
18674 + child = word->content.data.widget;
18675 if (p_Dw_widget_intersect (child, area, &child_area))
18676 a_Dw_widget_draw (child, &child_area, event);
18680 - case DW_PAGE_CONTENT_ANCHOR: case DW_PAGE_CONTENT_BREAK:
18681 + case DW_CONTENT_ANCHOR: case DW_CONTENT_BREAK:
18682 /* nothing - an anchor/break isn't seen */
18683 /* BUG: sometimes anchors have x_space;
18684 * we subtract that just in case --EG */
18685 x_cursor -= word->size.width + word->eff_space;
18687 /* Useful for testing: draw breaks. */
18688 - if (word->content_type == DW_PAGE_CONTENT_BREAK)
18689 + if (word->content.type == DW_CONTENT_BREAK)
18690 gdk_draw_rectangle (window, word->style->color->gc, TRUE,
18691 - Dw_widget_x_world_to_viewport(widget,
18692 + Dw_widget_x_world_to_viewport (widget,
18693 widget->allocation.x +
18694 Dw_page_line_total_x_offset(page, line)),
18695 y_cursor + line->descent,
18696 widget->allocation.width -
18697 - Dw_style_box_diff_width(widget->style),
18698 + Dw_style_box_diff_width (widget->style),
18699 word->content.break_space);
18702 @@ -1086,7 +1132,7 @@
18704 * Find the first line index that includes y, relative to top of widget.
18706 -static gint Dw_page_find_line_index(DwPage *page, gint y)
18707 +static gint Dw_page_find_line_index (DwPage *page, gint y)
18709 gint max_index = page->num_lines - 1;
18710 gint step, index, low = 0;
18711 @@ -1129,7 +1175,7 @@
18712 p_Dw_widget_draw_widget_box (widget, area);
18714 page = DW_PAGE (widget);
18715 - line_index = Dw_page_find_line_index(page, area->y);
18716 + line_index = Dw_page_find_line_index (page, area->y);
18718 for (; line_index < page->num_lines; line_index++) {
18719 line = &(page->lines[line_index]);
18720 @@ -1144,20 +1190,20 @@
18722 * Find a link given a coordinate location relative to the window
18724 -static gint Dw_page_find_link(DwPage *page, gint x, gint y)
18725 +static gint Dw_page_find_link (DwPage *page, gint x, gint y)
18727 gint line_index, word_index;
18728 gint x_cursor, last_x_cursor;
18732 - if ( (line_index = Dw_page_find_line_index(page, y)) >= page->num_lines )
18733 + if ( (line_index = Dw_page_find_line_index (page, y)) >= page->num_lines )
18735 line = &page->lines[line_index];
18736 if (line->top + line->ascent + line->descent <= y)
18739 - x_cursor = Dw_page_line_total_x_offset(page, line);
18740 + x_cursor = Dw_page_line_total_x_offset (page, line);
18741 for (word_index = line->first_word; word_index < line->last_word;
18743 word = &page->words[word_index];
18744 @@ -1174,22 +1220,20 @@
18746 * Standard Dw function.
18748 -static gint Dw_page_button_press (DwWidget *widget,
18751 - GdkEventButton *event)
18752 +static gboolean Dw_page_button_press (DwWidget *widget, gint32 x, gint32 y,
18753 + GdkEventButton *event)
18755 DwPage *page = DW_PAGE (widget);
18758 - g_print("Dw_page_button_press: button (%d, %d) +%d\n",
18759 - x, y, button->button);
18760 + g_print ("Dw_page_button_press: button (%d, %d) +%d\n",
18761 + x, y, event->button);
18764 - page->link_pressed = Dw_page_find_link(page, x, y);
18765 + page->link_pressed = Dw_page_find_link (page, x, y);
18766 if (page->link_pressed >= 0) {
18767 - gtk_signal_emit (GTK_OBJECT (widget), page_signals[LINK_PRESSED],
18768 - page->link_pressed, -1, -1, event);
18769 + g_signal_emit (G_OBJECT (widget), page_signals[LINK_PRESSED], 0,
18770 + page->link_pressed, -1, -1, event);
18774 @@ -1199,42 +1243,40 @@
18776 * Standard Dw function.
18778 -static gint Dw_page_button_release(DwWidget *widget,
18781 - GdkEventButton *event)
18782 +static gboolean Dw_page_button_release (DwWidget *widget, gint32 x, gint32 y,
18783 + GdkEventButton *event)
18785 DwPage *page = DW_PAGE (widget);
18786 gint link_pressed, link_released;
18789 - g_print("Dw_page_button_release: button (%d, %d) +%d\n",
18790 - x, y, event->button);
18791 + g_print ("Dw_page_button_release: button (%d, %d) +%d\n",
18792 + x, y, event->button);
18795 link_pressed = page->link_pressed;
18796 - link_released = Dw_page_find_link(page, x, y);
18797 + link_released = Dw_page_find_link (page, x, y);
18798 page->link_pressed = -1;
18800 if (link_released >= 0) {
18801 - gtk_signal_emit (GTK_OBJECT (widget), page_signals[LINK_RELEASED],
18802 - link_released, -1, -1, event);
18803 + g_signal_emit (G_OBJECT (widget), page_signals[LINK_RELEASED], 0,
18804 + link_released, -1, -1, event);
18806 if (link_pressed == link_released) {
18807 - gtk_signal_emit (GTK_OBJECT (widget), page_signals[LINK_CLICKED],
18808 - link_released, -1, -1, event);
18809 + g_signal_emit (G_OBJECT (widget), page_signals[LINK_CLICKED], 0,
18810 + link_released, -1, -1, event);
18822 * Standard Dw function.
18824 -static gint Dw_page_motion_notify (DwWidget *widget,
18825 +static gboolean Dw_page_motion_notify (DwWidget *widget,
18828 GdkEventMotion *event)
18829 @@ -1243,15 +1285,15 @@
18830 gint link, link_old;
18832 link_old = page->hover_link;
18833 - link = Dw_page_find_link(page, x, y);
18834 + link = Dw_page_find_link (page, x, y);
18835 page->hover_link = link;
18837 if (link != link_old) {
18838 - gtk_signal_emit (GTK_OBJECT (widget), page_signals[LINK_ENTERED],
18840 + g_signal_emit (G_OBJECT (widget), page_signals[LINK_ENTERED], 0,
18844 - return (link != -1);
18846 + return (link != -1);
18850 @@ -1266,8 +1308,8 @@
18852 if (page->hover_link != -1) {
18853 page->hover_link = -1;
18854 - gtk_signal_emit (GTK_OBJECT (widget), page_signals[LINK_ENTERED],
18856 + g_signal_emit (G_OBJECT (widget), page_signals[LINK_ENTERED], 0,
18861 @@ -1277,16 +1319,16 @@
18863 * Add a new word (text, widget etc.) to a page.
18865 -static DwPageWord *Dw_page_add_word(DwPage *page,
18870 +static DwPageWord *Dw_page_add_word (DwPage *page,
18879 - a_List_add(page->words, page->num_words, page->num_words_max);
18880 + a_List_add (page->words, page->num_words, page->num_words_max);
18882 word = &page->words[page->num_words - 1];
18883 word->size.width = width;
18884 @@ -1308,14 +1350,55 @@
18885 * Add a word to the page structure. Stashes the argument pointer in
18886 * the page data structure so that it will be deallocated on destroy.
18888 -void a_Dw_page_add_text(DwPage *page, char *text, DwStyle *style)
18889 +void a_Dw_page_add_text (DwPage *page, char *text, DwStyle *style)
18892 - gint width, ascent, descent;
18893 + gint width, ascent, descent, len;
18895 + PangoGlyphString *glyphs;
18896 + PangoRectangle rect;
18898 + PangoAttrList *attr_list;
18899 + PangoAttribute *attr;
18901 + if (*text == '\0')
18904 + if (!g_utf8_validate(text, -1, NULL)) {
18905 + g_warning("Invalid UTF-8\n");
18908 + glyphs = pango_glyph_string_new();
18909 + len = strlen(text);
18911 + attr_list = pango_attr_list_new();
18913 - width = gdk_string_width(style->font->font, text);
18914 - ascent = style->font->font->ascent;
18915 - descent = style->font->font->descent;
18916 + attr = pango_attr_font_desc_new(style->font->font_desc);
18917 + attr->start_index = 0;
18918 + attr->end_index = 1;
18919 + pango_attr_list_insert(attr_list, attr);
18921 + /* Shape the text into glyphs */
18922 + items = pango_itemize(page->context, text, 0, len, attr_list, NULL);
18923 + pango_shape(text, len, &(((PangoItem *)items->data)->analysis), glyphs);
18927 + GList *next = items->next;
18928 + pango_item_free (items->data);
18929 + g_list_free_1 (items);
18933 + font = pango_context_load_font(page->context, style->font->font_desc);
18935 + /* Get the sizes */
18936 + pango_glyph_string_extents(glyphs, font, NULL, &rect);
18937 + width = rect.width / PANGO_SCALE;
18938 + ascent = PANGO_ASCENT(rect) / PANGO_SCALE;
18939 + descent = PANGO_DESCENT(rect) / PANGO_SCALE;
18941 + pango_glyph_string_free(glyphs);
18943 /* In case of a sub or super script we increase the word's height and
18944 * potentially the line's height.
18945 @@ -1325,10 +1408,13 @@
18946 else if (style->SubSup == TEXT_SUP)
18947 ascent += (ascent / 3);
18949 - word = Dw_page_add_word(page, width, ascent, descent, style);
18950 - word->content_type = DW_PAGE_CONTENT_TEXT;
18951 - word->content.text = text;
18952 + word = Dw_page_add_word (page, width, ascent, descent, style);
18953 + word->content.type = DW_CONTENT_TEXT;
18954 + word->content.data.text.str = text;
18955 + word->content.data.text.font = font;
18956 Dw_page_word_wrap (page, page->num_words - 1);
18958 + pango_attr_list_unref(attr_list);
18962 @@ -1345,13 +1431,14 @@
18963 a_Dw_widget_set_style (widget, style);
18965 Dw_page_calc_widget_size (page, widget, &size);
18966 - word = Dw_page_add_word(page, size.width, size.ascent, size.descent, style);
18968 + Dw_page_add_word (page, size.width, size.ascent, size.descent, style);
18970 - word->content_type = DW_PAGE_CONTENT_WIDGET;
18971 - word->content.widget = widget;
18972 + word->content.type = DW_CONTENT_WIDGET;
18973 + word->content.data.widget = widget;
18975 Dw_page_word_wrap (page, page->num_words - 1);
18976 - word->content.widget->parent_ref = page->num_lines - 1;
18977 + word->content.data.widget->parent_ref = page->num_lines - 1;
18981 @@ -1359,24 +1446,24 @@
18982 * Add an anchor to the page. name is copied, so no strdup is neccessary for
18985 -void a_Dw_page_add_anchor(DwPage *page, const char *name, DwStyle *style)
18986 +void a_Dw_page_add_anchor (DwPage *page, const char *name, DwStyle *style)
18990 - word = Dw_page_add_word(page, 0, 0, 0, style);
18991 - word->content_type = DW_PAGE_CONTENT_ANCHOR;
18992 - word->content.anchor = g_strdup(name);
18993 + word = Dw_page_add_word (page, 0, 0, 0, style);
18994 + word->content.type = DW_CONTENT_ANCHOR;
18995 + word->content.data.anchor = g_strdup (name);
18996 Dw_page_word_wrap (page, page->num_words - 1);
18998 - p_Dw_widget_set_anchor(DW_WIDGET(page), word->content.anchor,
18999 - page->lines[page->num_lines - 1].top);
19000 + p_Dw_widget_set_anchor (DW_WIDGET(page), word->content.data.anchor,
19001 + page->lines[page->num_lines - 1].top);
19008 -void a_Dw_page_add_space(DwPage *page, DwStyle *style)
19009 +void a_Dw_page_add_space (DwPage *page, DwStyle *style)
19013 @@ -1400,7 +1487,7 @@
19015 * Cause a paragraph break
19017 -void a_Dw_page_add_parbreak(DwPage *page, gint space, DwStyle *style)
19018 +void a_Dw_page_add_parbreak (DwPage *page, gint space, DwStyle *style)
19020 DwPageWord *word, *word2;
19022 @@ -1421,25 +1508,25 @@
19023 way that the space is in any case visible. */
19025 /* Find the widget where to adjust the break_space. */
19026 - for (widget = DW_WIDGET(page);
19027 + for (widget = DW_WIDGET (page);
19028 widget->parent && DW_IS_PAGE (widget->parent);
19029 widget = widget->parent) {
19030 - page2 = DW_PAGE(widget->parent);
19031 + page2 = DW_PAGE (widget->parent);
19032 if (page2->list_item)
19033 - isfirst = (page2->words[1].content_type == DW_PAGE_CONTENT_WIDGET
19034 - && page2->words[1].content.widget == widget);
19035 + isfirst = (page2->words[1].content.type == DW_CONTENT_WIDGET
19036 + && page2->words[1].content.data.widget == widget);
19038 - isfirst = (page2->words[0].content_type == DW_PAGE_CONTENT_WIDGET
19039 - && page2->words[0].content.widget == widget);
19040 + isfirst = (page2->words[0].content.type == DW_CONTENT_WIDGET
19041 + && page2->words[0].content.data.widget == widget);
19043 /* The page we searched for has been found. */
19044 lineno = widget->parent_ref;
19046 (word2 = &page2->words[page2->lines[lineno - 1].first_word]) &&
19047 - word2->content_type == DW_PAGE_CONTENT_BREAK) {
19048 - if(word2->content.break_space < space) {
19049 - word2->content.break_space = space;
19050 - p_Dw_widget_queue_resize (DW_WIDGET(page2), lineno, FALSE);
19051 + word2->content.type == DW_CONTENT_BREAK) {
19052 + if (word2->content.data.break_space < space) {
19053 + word2->content.data.break_space = space;
19054 + p_Dw_widget_queue_resize (DW_WIDGET (page2), lineno, FALSE);
19055 page2->must_queue_resize = FALSE;
19058 @@ -1453,14 +1540,15 @@
19060 /* Another break before? */
19061 if ((word = &page->words[page->num_words - 1]) &&
19062 - word->content_type == DW_PAGE_CONTENT_BREAK) {
19063 - word->content.break_space = MAX (word->content.break_space, space);
19064 + word->content.type == DW_CONTENT_BREAK) {
19065 + word->content.data.break_space =
19066 + MAX (word->content.data.break_space, space);
19070 - word = Dw_page_add_word(page, 0, 0, 0, style);
19071 - word->content_type = DW_PAGE_CONTENT_BREAK;
19072 - word->content.break_space = space;
19073 + word = Dw_page_add_word (page, 0, 0, 0, style);
19074 + word->content.type = DW_CONTENT_BREAK;
19075 + word->content.data.break_space = space;
19076 Dw_page_word_wrap (page, page->num_words - 1);
19079 @@ -1471,10 +1559,11 @@
19083 - word = Dw_page_add_word(page, 0, style->font->font->ascent,
19084 - style->font->font->descent, style);
19085 - word->content_type = DW_PAGE_CONTENT_BREAK;
19086 - word->content.break_space = 0;
19087 + /* word = Dw_page_add_word (page, 0, style->font->font->ascent,
19088 + style->font->font->descent, style); */
19089 + word = Dw_page_add_word(page, 0, 0, 0, style);
19090 + word->content.type = DW_CONTENT_BREAK;
19091 + word->content.data.break_space = 0;
19092 word->style = style;
19093 //a_Dw_style_ref (style);
19094 Dw_page_word_wrap (page, page->num_words - 1);
19095 @@ -1504,7 +1593,7 @@
19096 void a_Dw_page_flush (DwPage *page)
19098 if (page->must_queue_resize) {
19099 - p_Dw_widget_queue_resize (DW_WIDGET(page), -1, TRUE);
19100 + p_Dw_widget_queue_resize (DW_WIDGET (page), -1, TRUE);
19101 page->must_queue_resize = FALSE;
19104 @@ -1514,9 +1603,9 @@
19105 * Find the text in the page.
19106 * (Standar DwContainer function) -- todo: move near forall
19108 -static gint Dw_page_findtext(DwContainer *container,
19109 - gpointer FP, gpointer KP,
19111 +static gboolean Dw_page_findtext (DwContainer *container,
19112 + gpointer FP, gpointer KP,
19117 @@ -1525,7 +1614,7 @@
19119 g_return_val_if_fail ((DW_WIDGET(page))->viewport != NULL, 0);
19120 if (!NewKey || !*NewKey)
19124 if ( !(F = *(FindData**)FP) )
19125 *(FindData **)FP = F = g_new0(FindData, 1);
19126 @@ -1555,17 +1644,17 @@
19128 for ( ; F->WordNum < page->num_words; F->WordNum++) {
19129 word = &page->words[F->WordNum];
19130 - if (word->content_type == DW_PAGE_CONTENT_TEXT &&
19131 - a_Findtext_compare(word->content.text, F->Key)) {
19132 + if (word->content.type == DW_CONTENT_TEXT &&
19133 + a_Findtext_compare(word->content.data.text.str, F->Key)) {
19134 F->State = F_GetPos;
19136 - } else if (word->content_type == DW_PAGE_CONTENT_WIDGET &&
19137 - DW_IS_CONTAINER (word->content.widget)) {
19138 + } else if (word->content.type == DW_CONTENT_WIDGET &&
19139 + DW_IS_CONTAINER (word->content.data.widget)) {
19140 if ( a_Dw_container_findtext(
19141 - DW_CONTAINER(word->content.widget),
19142 + DW_CONTAINER(word->content.data.widget),
19143 (gpointer)&F->next, (gpointer)F->Key, NewKey) ) {
19150 @@ -1585,17 +1674,58 @@
19151 a_Dw_widget_scroll_to(DW_WIDGET (page), F->Key->y_pos);
19152 //g_print(">>>[Wn %d]\n", F->WordNum);
19159 a_Findtext_key_free(F->Key);
19161 *(FindData **)FP = NULL;
19167 /* compiler happiness */
19173 +static DwIterator *Dw_page_iterator (DwWidget *widget,
19176 + DwIteratorInt *it = g_new (DwIteratorInt, 1);
19177 + it->it.widget = widget;
19178 + it->it.mask = mask;
19179 + it->it.content.type = DW_CONTENT_START;
19180 + it->it.next = Dw_page_iterator_next;
19181 + it->it.clone = Dw_page_iterator_clone;
19182 + it->it.free = p_Dw_iterator_free_std;
19184 + return (DwIterator*)it;
19187 +static gboolean Dw_page_iterator_next (DwIterator *it)
19189 + DwPage *page = DW_PAGE (it->widget);
19190 + DwIteratorInt *ii = (DwIteratorInt*)it;
19194 + if (ii->pos >= page->num_words) {
19195 + it->content.type = DW_CONTENT_END;
19198 + } while ((page->words[ii->pos].content.type & it->mask) == 0);
19200 + it->content = page->words[ii->pos].content;
19205 +static DwIterator* Dw_page_iterator_clone (DwIterator *it)
19207 + DwIteratorInt *it2 = g_new (DwIteratorInt, 1);
19208 + *it2 = *(DwIteratorInt*)it;
19209 + return (DwIterator*)it2;
19212 diff -urN dillo-0.6.6/src/dw_page.h dillo2-0.6.6/src/dw_page.h
19213 --- dillo-0.6.6/src/dw_page.h 2002-03-11 09:45:00.000000000 -0700
19214 +++ dillo2-0.6.6/src/dw_page.h 2003-04-21 12:35:55.000000000 -0600
19219 -#define DW_PAGE_CONTENT_TEXT 0
19220 -#define DW_PAGE_CONTENT_WIDGET 1
19221 -#define DW_PAGE_CONTENT_ANCHOR 2
19222 -#define DW_PAGE_CONTENT_BREAK 3
19224 struct _DwPageWord {
19225 /* todo: perhaps add a x_left? */
19227 gint32 eff_space; /* effective space, set by Dw_page_word_wrap,
19228 used for drawing etc. */
19230 - /* This is a variant record (i.e. it could point to a widget
19231 - * instead of just being text). */
19232 - gint content_type;
19235 - DwWidget *widget;
19237 - gint break_space;
19239 + DwContent content;
19242 DwStyle *space_style; /* initially the same as of the word, later
19245 /* The link under the button */
19248 + PangoContext *context;
19252 diff -urN dillo-0.6.6/src/dw_style.c dillo2-0.6.6/src/dw_style.c
19253 --- dillo-0.6.6/src/dw_style.c 2002-05-27 19:14:03.000000000 -0600
19254 +++ dillo2-0.6.6/src/dw_style.c 2003-04-21 12:35:56.000000000 -0600
19255 @@ -241,51 +241,36 @@
19257 static void Dw_style_font_realize (DwStyleFont *font, gboolean try_all)
19259 - char fontname[256], *ItalicChar;
19260 + PangoLayout *layout;
19262 - ItalicChar = prefs.use_oblique ? "o" : "i";
19263 - sprintf (fontname, "-*-%s-%s-%s-*-*-%d-*-75-75-*-*-iso8859-1",
19265 - font->bold ? "bold" : "medium",
19266 - font->italic ? ItalicChar : "r",
19268 - font->font = gdk_font_load(fontname);
19270 - if (font->font == NULL && font->italic) {
19271 - sprintf(fontname, "-*-%s-%s-%s-*-*-%d-*-75-75-*-*-iso8859-1",
19273 - font->bold ? "bold" : "medium",
19274 - (*ItalicChar == 'o') ? "i" : "o",
19276 - font->font = gdk_font_load(fontname);
19280 - if (font->font == NULL) {
19281 - /* Can't load the font - substitute the default instead. */
19284 - ("-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-iso8859-1");
19286 + font->font_desc = pango_font_description_new();
19288 - if (font->font == NULL) {
19289 - /* Try another platform-font that should be available. (iPaq) */
19292 - ("-misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1");
19294 + if (font->font_desc) {
19295 + pango_font_description_set_family(font->font_desc, font->name);
19297 - if (font->font == NULL) {
19298 - /* Can't load any suitable font! */
19299 - g_warning ("Can't load any ISO8859-1 font!?! :(");
19301 - gdk_font_load("-adobe-helvetica-*-*-*--*-*-*-*-*-*-*-*");
19302 + if(font->italic) {
19303 + pango_font_description_set_style(font->font_desc,
19304 + (prefs.use_oblique ?
19305 + PANGO_STYLE_OBLIQUE :
19306 + PANGO_STYLE_ITALIC));
19310 - if (font->font) {
19311 - font->space_width = gdk_char_width (font->font, ' ');
19312 - font->x_height = gdk_char_height (font->font, 'x');
19314 + pango_font_description_set_weight(font->font_desc, PANGO_WEIGHT_BOLD);
19316 + pango_font_description_set_size(font->font_desc,
19317 + PANGO_SCALE * font->size);
19319 + /* Get space width */
19320 + layout = pango_layout_new(gdk_pango_context_get());
19321 + pango_layout_set_font_description(layout, font->font_desc);
19322 + pango_layout_set_text(layout, " ", 1);
19323 + pango_layout_get_pixel_size(layout, &font->space_width, NULL);
19325 + /* Get x_height */
19326 + pango_layout_set_text(layout, "x", 1);
19327 + pango_layout_get_pixel_size(layout, NULL, &font->x_height);
19328 + g_object_unref(layout);
19332 @@ -300,7 +285,7 @@
19333 return (font1->size == font2->size &&
19334 EQUIV (font1->bold, font2->bold) &&
19335 EQUIV (font1->italic, font2->italic) &&
19336 - strcmp(font1->name, font2->name) == 0);
19337 + strcmp (font1->name, font2->name) == 0);
19341 @@ -347,7 +332,7 @@
19342 font->ref_count = 0;
19344 Dw_style_font_realize (font, try_all);
19345 - if (font->font) {
19346 + if (font->font_desc) {
19347 g_hash_table_insert (fonts_table, font, font);
19350 @@ -386,10 +371,10 @@
19351 char *comma, *list, *current;
19353 font_attrs2 = *font_attrs;
19354 - current = list = g_strdup(font_attrs->name);
19355 + current = list = g_strdup (font_attrs->name);
19357 while (current && (font == NULL)) {
19358 - comma = strchr(current, ',');
19359 + comma = strchr (current, ',');
19360 if (comma) *comma = 0;
19362 font_attrs2.name = current;
19363 @@ -425,7 +410,7 @@
19365 g_hash_table_remove (fonts_table, font);
19366 g_free (font->name);
19367 - gdk_font_unref (font->font);
19368 + pango_font_description_free(font->font_desc);
19372 @@ -642,7 +627,7 @@
19374 color->green = green;
19375 color->blue = blue;
19376 - gdk_color_alloc(gdk_window_get_colormap (window), color);
19377 + gdk_color_alloc (gdk_window_get_colormap (window), color);
19379 *gc = gdk_gc_new (window);
19380 gdk_gc_set_foreground (*gc, color);
19381 @@ -657,7 +642,7 @@
19383 DwStyleColor *color;
19385 - color = g_hash_table_lookup (colors_table, GINT_TO_POINTER(color_val));
19386 + color = g_hash_table_lookup (colors_table, GINT_TO_POINTER (color_val));
19387 if (color == NULL) {
19388 color = g_new (DwStyleColor, 1);
19389 color->ref_count = 0;
19390 @@ -665,7 +650,7 @@
19392 Dw_style_color_create (color_val, window,
19393 &color->color, &color->gc, 0);
19394 - g_hash_table_insert (colors_table, GINT_TO_POINTER(color_val), color);
19395 + g_hash_table_insert (colors_table, GINT_TO_POINTER (color_val), color);
19399 @@ -676,7 +661,7 @@
19401 static void Dw_style_color_remove (DwStyleColor *color)
19403 - g_hash_table_remove (colors_table, GINT_TO_POINTER(color->color_val));
19404 + g_hash_table_remove (colors_table, GINT_TO_POINTER (color->color_val));
19405 gdk_gc_destroy (color->gc);
19408 @@ -691,7 +676,8 @@
19410 DwStyleShadedColor *color;
19412 - color = g_hash_table_lookup(shaded_colors_table,GINT_TO_POINTER(color_val));
19414 + g_hash_table_lookup (shaded_colors_table, GINT_TO_POINTER (color_val));
19415 if (color == NULL) {
19416 color = g_new (DwStyleShadedColor, 1);
19417 color->ref_count = 0;
19418 @@ -704,7 +690,7 @@
19419 Dw_style_color_create (color_val, window,
19420 &color->color_light, &color->gc_light, +1);
19421 g_hash_table_insert (shaded_colors_table,
19422 - GINT_TO_POINTER(color_val), color);
19423 + GINT_TO_POINTER (color_val), color);
19427 @@ -715,7 +701,8 @@
19429 static void Dw_style_shaded_color_remove (DwStyleShadedColor *color)
19431 - g_hash_table_remove(shaded_colors_table, GINT_TO_POINTER(color->color_val));
19432 + g_hash_table_remove (shaded_colors_table,
19433 + GINT_TO_POINTER (color->color_val));
19434 gdk_gc_destroy (color->gc);
19435 gdk_gc_destroy (color->gc_dark);
19436 gdk_gc_destroy (color->gc_light);
19437 @@ -785,8 +772,6 @@
19439 void p_Dw_style_draw_border (GdkWindow *window,
19440 GdkRectangle *area,
19446 @@ -797,8 +782,8 @@
19447 GdkGC *top_gc, *right_gc, *bottom_gc, *left_gc;
19448 gint32 xb1, yb1, xb2, yb2, xp1, yp1, xp2, yp2;
19450 - xb1 = x + style->margin.left - vx;
19451 - yb1 = y + style->margin.top - vy;
19452 + xb1 = x + style->margin.left;
19453 + yb1 = y + style->margin.top;
19454 xb2 = xb1 + width - style->margin.left - style->margin.right;
19455 yb2 = yb1 + height - style->margin.top - style->margin.bottom;
19457 @@ -865,8 +850,6 @@
19459 void p_Dw_style_draw_background (GdkWindow *window,
19460 GdkRectangle *area,
19466 @@ -876,8 +859,8 @@
19467 DwRectangle dw_area, bg_area, intersection;
19469 if (style->background_color) {
19470 - dw_area.x = area->x + vx;
19471 - dw_area.y = area->y + vy;
19472 + dw_area.x = area->x;
19473 + dw_area.y = area->y;
19474 dw_area.width = area->width;
19475 dw_area.height = area->height;
19477 @@ -892,7 +875,7 @@
19479 if (p_Dw_rectangle_intersect (&dw_area, &bg_area, &intersection))
19480 gdk_draw_rectangle (window, style->background_color->gc, TRUE,
19481 - intersection.x - vx, intersection.y - vy,
19482 + intersection.x, intersection.y,
19483 intersection.width, intersection.height);
19486 diff -urN dillo-0.6.6/src/dw_style.h dillo2-0.6.6/src/dw_style.h
19487 --- dillo-0.6.6/src/dw_style.h 2002-04-05 08:18:19.000000000 -0700
19488 +++ dillo2-0.6.6/src/dw_style.h 2003-04-21 12:35:57.000000000 -0600
19490 #ifndef __DW_STYLE_H__
19491 #define __DW_STYLE_H__
19493 -#include <gdk/gdktypes.h>
19494 +#include <gdk/gdk.h>
19507 + PangoFontDescription *font_desc;
19512 @@ -168,8 +165,6 @@
19514 void p_Dw_style_draw_border (GdkWindow *window,
19515 GdkRectangle *area,
19521 @@ -177,8 +172,6 @@
19523 void p_Dw_style_draw_background (GdkWindow *window,
19524 GdkRectangle *area,
19530 diff -urN dillo-0.6.6/src/dw_table.c dillo2-0.6.6/src/dw_table.c
19531 --- dillo-0.6.6/src/dw_table.c 2002-03-28 11:06:40.000000000 -0700
19532 +++ dillo2-0.6.6/src/dw_table.c 2003-04-21 12:36:01.000000000 -0600
19534 gpointer FP, gpointer KP,
19537 +static DwIterator* Dw_table_iterator (DwWidget *widget,
19539 +static gboolean Dw_table_iterator_next (DwIterator *it);
19540 +static DwIterator* Dw_table_iterator_clone (DwIterator *it);
19543 static void Dw_table_realloc_children (DwTable *table);
19545 static void Dw_table_sub_create (DwTable *table);
19546 @@ -106,25 +112,27 @@
19548 * Standard Gtk+ function.
19550 -GtkType a_Dw_table_get_type (void)
19551 +GType a_Dw_table_get_type (void)
19553 - static GtkType type = 0;
19554 + static GType type = 0;
19557 - GtkTypeInfo info = {
19559 - sizeof (DwTable),
19560 + GTypeInfo info = {
19561 sizeof (DwTableClass),
19562 - (GtkClassInitFunc) Dw_table_class_init,
19563 - (GtkObjectInitFunc) Dw_table_init,
19564 - (GtkArgSetFunc) NULL,
19565 - (GtkArgGetFunc) NULL,
19566 - (GtkClassInitFunc) NULL
19567 + (GBaseInitFunc) NULL,
19568 + (GBaseFinalizeFunc) NULL,
19569 + (GClassInitFunc) Dw_table_class_init,
19570 + (GClassFinalizeFunc) NULL,
19571 + (gconstpointer) NULL,
19572 + sizeof (DwTable),
19574 + (GInstanceInitFunc) Dw_table_init,
19575 + (GTypeValueTable *) NULL
19578 - type = gtk_type_unique (DW_TYPE_CONTAINER, &info);
19579 + GTypeFlags flags = 0;
19580 + type = g_type_register_static(DW_TYPE_CONTAINER, "DwTable",
19587 @@ -197,6 +205,7 @@
19588 widget_class->set_ascent = Dw_table_set_ascent;
19589 widget_class->set_descent = Dw_table_set_descent;
19590 widget_class->draw = Dw_table_draw;
19591 + widget_class->iterator = Dw_table_iterator;
19593 container_class->add = Dw_table_add;
19594 container_class->remove = Dw_table_remove;
19595 @@ -233,7 +242,7 @@
19597 Dw_table_sub_free (table->sub);
19599 - (* GTK_OBJECT_CLASS(parent_class)->destroy) (object);
19600 + GTK_OBJECT_CLASS(parent_class)->destroy (object);
19604 @@ -508,7 +517,8 @@
19606 offx = p_Dw_style_box_offset_x (widget->style);
19607 offy = p_Dw_style_box_offset_y (widget->style);
19608 - width = widget->allocation.width - p_Dw_style_box_diff_width(widget->style);
19610 + widget->allocation.width - p_Dw_style_box_diff_width (widget->style);
19611 for (i = 0; i < table->num_rows; i++)
19612 if (table->row_style[i])
19613 p_Dw_widget_draw_box (widget, table->row_style[i], area,
19614 @@ -1070,7 +1080,7 @@
19615 if (sub->table->sub == sub) {
19616 /* Adjust width argument of the table (fixed, percentages
19617 later in the code). */
19618 - widget = DW_WIDGET(sub->table);
19619 + widget = DW_WIDGET (sub->table);
19620 if (DW_STYLE_IS_LENGTH (widget->style->width)) {
19621 col_width = DW_STYLE_GET_LENGTH (widget->style->width,
19622 widget->style->font);
19623 @@ -1232,7 +1242,7 @@
19625 sub->start_col, sub->end_col, width, total_width);
19627 - border_spacing = DW_WIDGET(sub->table)->style->border_spacing;
19628 + border_spacing = DW_WIDGET (sub->table)->style->border_spacing;
19629 diff = (sub->num_subs - 1) * border_spacing;
19630 avail_width = width - diff;
19632 @@ -1441,3 +1451,52 @@
19633 g_free (sub_extremes);
19638 +static DwIterator *Dw_table_iterator (DwWidget *widget,
19641 + DwIteratorInt *it = g_new (DwIteratorInt, 1);
19642 + it->it.widget = widget;
19643 + it->it.mask = mask;
19644 + it->it.content.type = DW_CONTENT_START;
19645 + it->it.next = Dw_table_iterator_next;
19646 + it->it.clone = Dw_table_iterator_clone;
19647 + it->it.free = p_Dw_iterator_free_std;
19649 + return (DwIterator*)it;
19652 +static gboolean Dw_table_iterator_next (DwIterator *it)
19654 + DwTable *table = DW_TABLE (it->widget);
19655 + DwIteratorInt *ii = (DwIteratorInt*)it;
19657 + /* tables only contain widgets: */
19658 + if ((it->mask & DW_CONTENT_WIDGET) == 0) {
19659 + it->content.type = DW_CONTENT_END;
19665 + if (ii->pos >= table->num_children) {
19666 + it->content.type = DW_CONTENT_END;
19669 + } while (table->children[ii->pos] == NULL ||
19670 + table->children[ii->pos]->type != DW_TABLE_CELL);
19672 + it->content.type = DW_CONTENT_WIDGET;
19673 + it->content.data.widget = table->children[ii->pos]->data.cell.widget;
19677 +static DwIterator* Dw_table_iterator_clone (DwIterator *it)
19679 + DwIteratorInt *it2 = g_new (DwIteratorInt, 1);
19680 + *it2 = *(DwIteratorInt*)it;
19681 + return (DwIterator*)it2;
19685 diff -urN dillo-0.6.6/src/dw_tooltip.c dillo2-0.6.6/src/dw_tooltip.c
19686 --- dillo-0.6.6/src/dw_tooltip.c 2001-12-22 13:51:09.000000000 -0700
19687 +++ dillo2-0.6.6/src/dw_tooltip.c 2003-04-21 12:36:01.000000000 -0600
19689 #include <gtk/gtk.h>
19690 #include "dw_tooltip.h"
19692 +/* The amount of space around the text, including the border. */
19695 +/* The difference between pointer position and upper left corner of the
19699 static gint Dw_tooltip_draw (DwTooltip *tooltip);
19703 void a_Dw_tooltip_on_enter (DwTooltip *tooltip)
19705 a_Dw_tooltip_on_leave (tooltip);
19706 - tooltip->timeout_id = gtk_timeout_add(500, (GtkFunction)Dw_tooltip_draw,
19708 + tooltip->timeout_id = gtk_timeout_add (500, (GtkFunction)Dw_tooltip_draw,
19713 @@ -60,12 +67,12 @@
19714 void a_Dw_tooltip_on_leave (DwTooltip *tooltip)
19716 if (tooltip->timeout_id != -1) {
19717 - gtk_timeout_remove(tooltip->timeout_id);
19718 + gtk_timeout_remove (tooltip->timeout_id);
19719 tooltip->timeout_id = -1;
19722 if (tooltip->window != NULL) {
19723 - gtk_widget_destroy(tooltip->window);
19724 + gtk_widget_destroy (tooltip->window);
19725 tooltip->window = NULL;
19728 @@ -80,36 +87,69 @@
19732 + * Connected to the expose_event signal
19734 +static gint Dw_tooltip_expose (GtkWidget *window)
19736 + gtk_widget_ensure_style (window);
19737 + gtk_paint_flat_box(window->style, window->window,
19738 + GTK_STATE_NORMAL, GTK_SHADOW_OUT,
19739 + NULL, GTK_WIDGET(window), "tooltip",
19745 * Draw the tooltip. Called as a timeout function.
19747 static gint Dw_tooltip_draw (DwTooltip *tooltip)
19750 - gint x, y, width, ascent, descent;
19752 - gdk_window_get_pointer (NULL, &x, &y, NULL);
19753 + GtkWidget *label;
19754 + gint x, y, px, py, screen_w, screen_h, ttw, tth;
19756 tooltip->window = gtk_window_new(GTK_WINDOW_POPUP);
19757 gtk_widget_set_app_paintable (tooltip->window, TRUE);
19758 gtk_widget_set_name (tooltip->window, "gtk-tooltips");
19759 - gtk_widget_ensure_style (tooltip->window);
19760 - style = tooltip->window->style;
19761 - width = gdk_string_width (style->font, tooltip->text);
19762 - ascent = style->font->ascent;
19763 - descent = style->font->descent;
19764 - gtk_widget_set_usize (tooltip->window, width + 8, ascent + descent + 8);
19766 - gtk_widget_popup(tooltip->window, x + 10, y + 10);
19767 - style = tooltip->window->style;
19768 - gtk_paint_flat_box(style, tooltip->window->window,
19769 - GTK_STATE_NORMAL, GTK_SHADOW_OUT,
19770 - NULL, GTK_WIDGET(tooltip->window), "tooltip",
19772 - gtk_paint_string(style, tooltip->window->window,
19773 - GTK_STATE_NORMAL,
19774 - NULL, GTK_WIDGET(tooltip->window), "tooltip",
19777 + gtk_container_set_border_width (GTK_CONTAINER (tooltip->window), PADDING);
19778 + g_signal_connect(G_OBJECT(tooltip->window), "expose_event",
19779 + G_CALLBACK(Dw_tooltip_expose), NULL);
19781 + label = gtk_label_new(tooltip->text);
19782 + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
19783 + gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
19784 + gtk_widget_show (label);
19786 + gtk_container_add (GTK_CONTAINER(tooltip->window), label);
19787 + /* Realize the window, so we can get it's size */
19788 + gtk_widget_realize (GTK_WIDGET(tooltip->window));
19790 + gdk_drawable_get_size (GDK_DRAWABLE (tooltip->window->window), &ttw, &tth);
19791 + gdk_window_get_pointer (NULL, &px, &py, NULL);
19795 + screen_w = gdk_screen_width();
19796 + screen_h = gdk_screen_height();
19798 + if (ttw >= screen_w)
19799 + /* If the width of a tooltips does not fit into the screen, put
19800 + * them at x = 0. (Yes, that's far from perfect ...) */
19802 + else if (x + ttw > screen_w)
19803 + /* If they would otherwise reach out of the screen, move them
19805 + x = screen_w - ttw;
19807 + /* The case that the height of a tooltip of the screen is greater
19808 + * that the screen height is ignored ;-) If the tooltip reaches
19809 + * out of the screen at the bottom, it is displayed *above* the
19810 + * pointer: to process events properly, it is necessary to keep
19811 + * the pointer out of the tooltip. */
19812 + if (y + tth > screen_h)
19813 + y = py - tth - DIFF;
19815 + gtk_window_move(GTK_WINDOW(tooltip->window), x, y);
19816 + gtk_widget_show(tooltip->window);
19818 tooltip->timeout_id = -1;
19820 diff -urN dillo-0.6.6/src/dw_widget.c dillo2-0.6.6/src/dw_widget.c
19821 --- dillo-0.6.6/src/dw_widget.c 2002-03-18 08:02:50.000000000 -0700
19822 +++ dillo2-0.6.6/src/dw_widget.c 2003-04-21 12:36:03.000000000 -0600
19823 @@ -13,11 +13,11 @@
19824 #include "dw_widget.h"
19825 #include "dw_container.h"
19826 #include "dw_gtk_viewport.h"
19827 +#include "dw_marshal.h"
19829 static void Dw_widget_init (DwWidget *widget);
19830 static void Dw_widget_class_init (DwWidgetClass *klass);
19832 -static void Dw_widget_shutdown (GtkObject *object);
19833 static void Dw_widget_destroy (GtkObject *object);
19835 static void Dw_widget_real_size_request (DwWidget *widget,
19836 @@ -86,25 +86,27 @@
19838 * Standard Gtk+ function
19840 -GtkType a_Dw_widget_get_type (void)
19841 +GType a_Dw_widget_get_type (void)
19843 - static GtkType type = 0;
19844 + static GType type = 0;
19847 - GtkTypeInfo info = {
19849 - sizeof (DwWidget),
19850 + GTypeInfo info = {
19851 sizeof (DwWidgetClass),
19852 - (GtkClassInitFunc) Dw_widget_class_init,
19853 - (GtkObjectInitFunc) Dw_widget_init,
19854 - (GtkArgSetFunc) NULL,
19855 - (GtkArgGetFunc) NULL,
19856 - (GtkClassInitFunc) NULL
19857 + (GBaseInitFunc) NULL,
19858 + (GBaseFinalizeFunc) NULL,
19859 + (GClassInitFunc) Dw_widget_class_init,
19860 + (GClassFinalizeFunc) NULL,
19861 + (gconstpointer) NULL,
19862 + sizeof (DwWidget),
19864 + (GInstanceInitFunc) Dw_widget_init,
19865 + (GTypeValueTable *) NULL
19868 - type = gtk_type_unique (GTK_TYPE_OBJECT, &info);
19869 + GTypeFlags flags = 0;
19870 + type = g_type_register_static(GTK_TYPE_OBJECT, "DwWidget",
19877 @@ -138,114 +140,129 @@
19879 GtkObjectClass *object_class;
19881 - parent_class = gtk_type_class (gtk_object_get_type ());
19882 + parent_class = gtk_type_class (GTK_TYPE_OBJECT);
19884 object_class = GTK_OBJECT_CLASS (klass);
19886 widget_signals[SIZE_REQUEST] =
19887 - gtk_signal_new ("size_request",
19889 - object_class->type,
19890 - GTK_SIGNAL_OFFSET (DwWidgetClass, size_request),
19891 - gtk_marshal_NONE__POINTER,
19893 - 1, GTK_TYPE_POINTER);
19894 + g_signal_new ("size_request",
19895 + G_TYPE_FROM_CLASS(object_class),
19896 + G_SIGNAL_RUN_FIRST,
19897 + G_STRUCT_OFFSET (DwWidgetClass, size_request),
19900 + p_Dw_marshal_VOID__POINTER,
19902 + 1, GTK_TYPE_POINTER);
19903 widget_signals[SIZE_ALLOCATE] =
19904 - gtk_signal_new ("size_allocate",
19906 - object_class->type,
19907 - GTK_SIGNAL_OFFSET (DwWidgetClass, size_allocate),
19908 - gtk_marshal_NONE__POINTER,
19910 - 1, GTK_TYPE_POINTER);
19911 + g_signal_new ("size_allocate",
19912 + G_TYPE_FROM_CLASS(object_class),
19913 + G_SIGNAL_RUN_FIRST,
19914 + G_STRUCT_OFFSET (DwWidgetClass, size_allocate),
19917 + p_Dw_marshal_VOID__POINTER,
19919 + 1, GTK_TYPE_POINTER);
19920 widget_signals[SET_WIDTH] =
19921 - gtk_signal_new ("set_width",
19923 - object_class->type,
19924 - GTK_SIGNAL_OFFSET (DwWidgetClass, set_width),
19925 - gtk_marshal_NONE__POINTER,
19927 - 1, GTK_TYPE_UINT);
19928 + g_signal_new ("set_width",
19929 + G_TYPE_FROM_CLASS(object_class),
19930 + G_SIGNAL_RUN_FIRST,
19931 + G_STRUCT_OFFSET (DwWidgetClass, set_width),
19934 + p_Dw_marshal_VOID__UINT,
19936 + 1, GTK_TYPE_UINT);
19937 widget_signals[SET_ASCENT] =
19938 - gtk_signal_new ("set_ascent",
19940 - object_class->type,
19941 - GTK_SIGNAL_OFFSET (DwWidgetClass, set_ascent),
19942 - gtk_marshal_NONE__POINTER,
19944 - 1, GTK_TYPE_UINT);
19945 + g_signal_new ("set_ascent",
19946 + G_TYPE_FROM_CLASS(object_class),
19947 + G_SIGNAL_RUN_FIRST,
19948 + G_STRUCT_OFFSET (DwWidgetClass, set_ascent),
19951 + p_Dw_marshal_VOID__UINT,
19953 + 1, GTK_TYPE_UINT);
19954 widget_signals[SET_DESCENT] =
19955 - gtk_signal_new ("set_descent",
19957 - object_class->type,
19958 - GTK_SIGNAL_OFFSET (DwWidgetClass, set_descent),
19959 - gtk_marshal_NONE__POINTER,
19961 - 1, GTK_TYPE_UINT);
19962 + g_signal_new ("set_descent",
19963 + G_TYPE_FROM_CLASS(object_class),
19964 + G_SIGNAL_RUN_FIRST,
19965 + G_STRUCT_OFFSET (DwWidgetClass, set_descent),
19968 + p_Dw_marshal_VOID__UINT,
19970 + 1, GTK_TYPE_UINT);
19971 widget_signals[DRAW] =
19972 - gtk_signal_new ("draw",
19974 - object_class->type,
19975 - GTK_SIGNAL_OFFSET (DwWidgetClass, draw),
19976 - gtk_marshal_NONE__POINTER,
19978 - 2, GTK_TYPE_POINTER, GTK_TYPE_GDK_EVENT);
19979 + g_signal_new ("draw",
19980 + G_TYPE_FROM_CLASS(object_class),
19981 + G_SIGNAL_RUN_FIRST,
19982 + G_STRUCT_OFFSET (DwWidgetClass, draw),
19985 + p_Dw_marshal_VOID__POINTER_POINTER,
19987 + 2, GTK_TYPE_POINTER, GDK_TYPE_EVENT);
19988 widget_signals[REALIZE] =
19989 - gtk_signal_new ("realize",
19991 - object_class->type,
19992 - GTK_SIGNAL_OFFSET (DwWidgetClass, realize),
19993 - gtk_marshal_NONE__NONE,
19994 - GTK_TYPE_NONE, 0);
19995 + g_signal_new ("realize",
19996 + G_TYPE_FROM_CLASS(object_class),
19997 + G_SIGNAL_RUN_FIRST,
19998 + G_STRUCT_OFFSET (DwWidgetClass, realize),
20001 + p_Dw_marshal_VOID__VOID,
20002 + GTK_TYPE_NONE, 0);
20003 widget_signals[UNREALIZE] =
20004 - gtk_signal_new ("unrealize",
20006 - object_class->type,
20007 - GTK_SIGNAL_OFFSET (DwWidgetClass, unrealize),
20008 - gtk_marshal_NONE__NONE,
20009 - GTK_TYPE_NONE, 0);
20010 - widget_signals[BUTTON_PRESS_EVENT] =
20011 - gtk_signal_new ("button_press_event",
20013 - object_class->type,
20014 - GTK_SIGNAL_OFFSET (DwWidgetClass, button_press_event),
20015 - gtk_marshal_BOOL__POINTER,
20017 - 3, GTK_TYPE_UINT, GTK_TYPE_UINT, GTK_TYPE_GDK_EVENT);
20018 - widget_signals[BUTTON_RELEASE_EVENT] =
20019 - gtk_signal_new ("button_release_event",
20021 - object_class->type,
20022 - GTK_SIGNAL_OFFSET (DwWidgetClass, button_release_event),
20023 - gtk_marshal_BOOL__POINTER,
20025 - 3, GTK_TYPE_UINT, GTK_TYPE_UINT, GTK_TYPE_GDK_EVENT);
20026 - widget_signals[MOTION_NOTIFY_EVENT] =
20027 - gtk_signal_new ("motion_notify_event",
20029 - object_class->type,
20030 - GTK_SIGNAL_OFFSET (DwWidgetClass, motion_notify_event),
20031 - gtk_marshal_BOOL__POINTER,
20033 - 3, GTK_TYPE_UINT, GTK_TYPE_UINT, GTK_TYPE_GDK_EVENT);
20034 - widget_signals[ENTER_NOTIFY_EVENT] =
20035 - gtk_signal_new ("enter_notify_event",
20037 - object_class->type,
20038 - GTK_SIGNAL_OFFSET (DwWidgetClass, enter_notify_event),
20039 - gtk_marshal_BOOL__POINTER,
20041 - 3, GTK_TYPE_UINT, GTK_TYPE_UINT, GTK_TYPE_GDK_EVENT);
20042 - widget_signals[LEAVE_NOTIFY_EVENT] =
20043 - gtk_signal_new ("leave_notify_event",
20045 - object_class->type,
20046 - GTK_SIGNAL_OFFSET (DwWidgetClass, leave_notify_event),
20047 - gtk_marshal_BOOL__POINTER,
20049 - 3, GTK_TYPE_UINT, GTK_TYPE_UINT, GTK_TYPE_GDK_EVENT);
20050 + g_signal_new ("unrealize",
20051 + G_TYPE_FROM_CLASS(object_class),
20052 + G_SIGNAL_RUN_FIRST,
20053 + G_STRUCT_OFFSET (DwWidgetClass, unrealize),
20056 + p_Dw_marshal_VOID__VOID,
20057 + GTK_TYPE_NONE, 0);
20058 + widget_signals[BUTTON_PRESS_EVENT] =
20059 + g_signal_new ("button_press_event",
20060 + G_TYPE_FROM_CLASS(object_class),
20061 + G_SIGNAL_RUN_LAST,
20062 + G_STRUCT_OFFSET (DwWidgetClass, button_press_event),
20065 + p_Dw_marshal_BOOL__UINT_UINT_POINTER,
20067 + 3, GTK_TYPE_UINT, GTK_TYPE_UINT, GDK_TYPE_EVENT);
20068 + widget_signals[BUTTON_RELEASE_EVENT] =
20069 + g_signal_new ("button_release_event",
20070 + G_TYPE_FROM_CLASS(object_class),
20071 + G_SIGNAL_RUN_LAST,
20072 + G_STRUCT_OFFSET (DwWidgetClass, button_release_event),
20075 + p_Dw_marshal_BOOL__UINT_UINT_POINTER,
20077 + 3, GTK_TYPE_UINT, GTK_TYPE_UINT, GDK_TYPE_EVENT);
20078 + widget_signals[MOTION_NOTIFY_EVENT] =
20079 + g_signal_new ("motion_notify_event",
20080 + G_TYPE_FROM_CLASS(object_class),
20081 + G_SIGNAL_RUN_LAST,
20082 + G_STRUCT_OFFSET (DwWidgetClass, motion_notify_event),
20085 + p_Dw_marshal_BOOL__UINT_UINT_POINTER,
20087 + 3, GTK_TYPE_UINT, GTK_TYPE_UINT, GDK_TYPE_EVENT);
20088 + widget_signals[LEAVE_NOTIFY_EVENT] =
20089 + g_signal_new ("leave_notify_event",
20090 + G_TYPE_FROM_CLASS(object_class),
20091 + G_SIGNAL_RUN_LAST,
20092 + G_STRUCT_OFFSET (DwWidgetClass, leave_notify_event),
20095 + p_Dw_marshal_BOOL__UINT_UINT_POINTER,
20097 + 3, GTK_TYPE_UINT, GTK_TYPE_UINT, GDK_TYPE_EVENT);
20099 - object_class->shutdown = Dw_widget_shutdown;
20100 object_class->destroy = Dw_widget_destroy;
20102 klass->size_request = Dw_widget_real_size_request;
20103 @@ -264,27 +281,7 @@
20104 klass->motion_notify_event = Dw_widget_real_motion_notify;
20105 klass->enter_notify_event = Dw_widget_real_enter_notify;
20106 klass->leave_notify_event = Dw_widget_real_leave_notify;
20112 - * Standard Gtk+ function
20114 -static void Dw_widget_shutdown (GtkObject *object)
20116 - DwWidget *widget;
20118 - widget = DW_WIDGET (object);
20120 - a_Dw_widget_unrealize (widget);
20122 - if (widget->parent)
20123 - Dw_container_remove (DW_CONTAINER (widget->parent), widget);
20125 - Dw_gtk_viewport_remove_dw (GTK_DW_VIEWPORT (widget->viewport));
20127 - parent_class->shutdown (object);
20128 + klass->iterator = NULL;
20132 @@ -296,7 +293,7 @@
20134 widget = DW_WIDGET (object);
20135 if (widget->anchors_table) {
20136 - g_hash_table_destroy(widget->anchors_table);
20137 + g_hash_table_destroy (widget->anchors_table);
20140 /* The widget the pointer is in? */
20141 @@ -318,7 +315,7 @@
20142 DwRequisition *requisition)
20144 g_warning ("DwWidget::size_request not implemented for `%s'",
20145 - gtk_type_name (GTK_OBJECT_TYPE (widget)));
20146 + g_type_name (GTK_OBJECT_TYPE (widget)));
20148 /* return random size to prevent crashes*/
20149 requisition->width = 50;
20150 @@ -484,8 +481,8 @@
20152 if (DW_WIDGET_NEEDS_RESIZE (widget)) {
20153 /* todo: check requisition == &(widget->requisition) and do what? */
20154 - gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SIZE_REQUEST],
20156 + g_signal_emit (G_OBJECT (widget), widget_signals[SIZE_REQUEST],
20158 widget->requisition = *requisition;
20159 DW_WIDGET_UNSET_FLAGS (widget, DW_NEEDS_RESIZE);
20161 @@ -501,7 +498,7 @@
20162 DwWidgetClass *klass;
20164 if (DW_WIDGET_EXTREMES_CHANGED (widget)) {
20165 - klass = DW_WIDGET_CLASS (GTK_OBJECT(widget)->klass);
20166 + klass = DW_WIDGET_GET_CLASS(widget);
20167 (* (klass->get_extremes)) (widget, extremes);
20168 widget->extremes = *extremes;
20169 DW_WIDGET_UNSET_FLAGS (widget, DW_EXTREMES_CHANGED);
20170 @@ -523,8 +520,8 @@
20171 allocation->ascent != widget->allocation.ascent ||
20172 allocation->descent != widget->allocation.descent) {
20174 - gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SIZE_ALLOCATE],
20176 + g_signal_emit (G_OBJECT (widget), widget_signals[SIZE_ALLOCATE], 0,
20178 widget->allocation = *allocation;
20181 @@ -535,21 +532,21 @@
20182 void a_Dw_widget_set_width (DwWidget *widget,
20185 - gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SET_WIDTH], width);
20186 + g_signal_emit (G_OBJECT (widget), widget_signals[SET_WIDTH], 0, width);
20190 void a_Dw_widget_set_ascent (DwWidget *widget,
20193 - gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SET_ASCENT], ascent);
20194 + g_signal_emit (G_OBJECT (widget), widget_signals[SET_ASCENT], 0, ascent);
20198 void a_Dw_widget_set_descent (DwWidget *widget,
20201 - gtk_signal_emit (GTK_OBJECT (widget), widget_signals[SET_DESCENT], descent);
20202 + g_signal_emit (G_OBJECT (widget), widget_signals[SET_DESCENT], 0, descent);
20206 @@ -557,15 +554,14 @@
20208 GdkEventExpose *event)
20210 - gtk_signal_emit (GTK_OBJECT (widget), widget_signals[DRAW],
20212 + g_signal_emit (G_OBJECT (widget), widget_signals[DRAW], 0, area, event);
20216 void a_Dw_widget_realize (DwWidget *widget)
20218 if (!DW_WIDGET_REALIZED (widget)) {
20219 - gtk_signal_emit (GTK_OBJECT (widget), widget_signals[REALIZE]);
20220 + g_signal_emit (G_OBJECT (widget), widget_signals[REALIZE], 0);
20221 DW_WIDGET_SET_FLAGS (widget, DW_REALIZED);
20223 if (DW_IS_CONTAINER (widget))
20224 @@ -576,8 +572,8 @@
20225 Dw_widget_update_cursor (widget);
20227 if (widget->parent == NULL && widget->style->background_color != NULL)
20228 - gdk_window_set_background(GTK_LAYOUT(widget->viewport)->bin_window,
20229 - &widget->style->background_color->color);
20230 + gdk_window_set_background (GTK_LAYOUT(widget->viewport)->bin_window,
20231 + &widget->style->background_color->color);
20235 @@ -586,7 +582,7 @@
20237 if (DW_WIDGET_REALIZED (widget)) {
20238 a_Dw_widget_set_cursor (widget, NULL);
20239 - gtk_signal_emit (GTK_OBJECT (widget), widget_signals[UNREALIZE]);
20240 + g_signal_emit (G_OBJECT (widget), widget_signals[UNREALIZE], 0);
20241 DW_WIDGET_UNSET_FLAGS (widget, DW_REALIZED);
20243 if (DW_IS_CONTAINER (widget))
20244 @@ -608,11 +604,11 @@
20245 * soon be the case when GDK_MOTION_NOTIFY events are simulated as a
20246 * result of viewport changes (bug #94)
20248 -gint Dw_widget_mouse_event (DwWidget *widget,
20249 - GtkWidget *viewwidget,
20253 +gboolean Dw_widget_mouse_event (DwWidget *widget,
20254 + GtkWidget *viewwidget,
20257 + GdkEventAny *event)
20259 /* todo: implement as signals */
20260 gint (*function)();
20261 @@ -642,30 +638,30 @@
20262 * viewport->last_entered => anchestor => (current) widget */
20264 if (viewport->last_entered)
20265 - for(w1 = viewport->last_entered; w1 != ancestor; w1 = w1->parent)
20266 + for (w1 = viewport->last_entered; w1 != ancestor; w1 = w1->parent)
20269 track_len++; /* for the ancestor */
20271 - for(w1 = widget; w1 != ancestor; w1 = w1->parent)
20272 + for (w1 = widget; w1 != ancestor; w1 = w1->parent)
20275 track = g_new (DwWidget*, track_len);
20277 if (viewport->last_entered)
20278 - for(w1 = viewport->last_entered; w1 != ancestor; w1 = w1->parent)
20279 + for (w1 = viewport->last_entered; w1 != ancestor; w1 = w1->parent)
20282 track[i++] = ancestor;
20285 - for(w1 = widget; w1 != ancestor; w1 = w1->parent)
20286 + for (w1 = widget; w1 != ancestor; w1 = w1->parent)
20290 /* Send events to all events on the track */
20291 for (i = 0; i < track_len; i++) {
20292 - klass = DW_WIDGET_CLASS (GTK_OBJECT(track[i])->klass);
20293 + klass = DW_WIDGET_GET_CLASS(track[i]);
20295 klass->enter_notify_event (track[i], track[i - 1],
20296 (GdkEventMotion*) event);
20297 @@ -683,7 +679,7 @@
20298 event_type = event ? event->type : GDK_MOTION_NOTIFY;
20301 - klass = DW_WIDGET_CLASS (GTK_OBJECT (widget)->klass);
20302 + klass = DW_WIDGET_GET_CLASS(widget);
20304 switch (event_type) {
20305 case GDK_BUTTON_PRESS:
20306 @@ -736,8 +732,8 @@
20307 if (widget->parent == NULL &&
20308 DW_WIDGET_REALIZED (widget) &&
20309 widget->style->background_color != NULL)
20310 - gdk_window_set_background(GTK_LAYOUT(widget->viewport)->bin_window,
20311 - &widget->style->background_color->color);
20312 + gdk_window_set_background (GTK_LAYOUT(widget->viewport)->bin_window,
20313 + &widget->style->background_color->color);
20317 @@ -801,6 +797,30 @@
20318 pos + widget->allocation.y);
20322 + * Retreive an iterator pointing before the first content element
20325 +DwIterator* a_Dw_widget_iterator (DwWidget *widget,
20328 + DwWidgetClass *klass = DW_WIDGET_GET_CLASS(widget);
20329 + if(klass->iterator)
20330 + return klass->iterator(widget, mask);
20338 +void p_Dw_iterator_free_std (DwIterator *it)
20348 @@ -908,8 +928,8 @@
20349 void p_Dw_widget_set_parent (DwWidget *widget,
20352 - gtk_object_ref(GTK_OBJECT (widget));
20353 - gtk_object_sink(GTK_OBJECT (widget));
20354 + gtk_object_ref (GTK_OBJECT (widget));
20355 + gtk_object_sink (GTK_OBJECT (widget));
20356 widget->parent = parent;
20357 widget->viewport = parent->viewport;
20358 /*widget->window = parent->window;*/
20359 @@ -981,34 +1001,28 @@
20360 * (of course) viewport coordinates, the return value is TRUE iff the
20361 * intersection is not empty.
20363 -static gboolean Dw_widget_intersect_viewport (DwWidget *widget,
20368 +static gboolean Dw_widget_intersect_viewport (DwWidget *widget, gint x, gint y,
20369 + gint width, gint height,
20370 GdkRectangle *gdk_intersection)
20372 - GtkLayout *layout;
20373 DwRectangle widget_area, viewport_area, intersection;
20375 g_return_val_if_fail (widget && widget->viewport, FALSE);
20377 - layout = GTK_LAYOUT (widget->viewport);
20379 widget_area.x = widget->allocation.x + x;
20380 widget_area.y = widget->allocation.y + y;
20381 widget_area.width = width;
20382 widget_area.height = height;
20384 - viewport_area.x = layout->xoffset;
20385 - viewport_area.y = layout->yoffset;
20386 + viewport_area.x = p_Dw_widget_x_viewport_to_world(widget, 0);
20387 + viewport_area.y = p_Dw_widget_y_viewport_to_world(widget, 0);
20388 viewport_area.width = widget->viewport->allocation.width;
20389 viewport_area.height = widget->viewport->allocation.height;
20391 if (p_Dw_rectangle_intersect (&widget_area, &viewport_area,
20393 - gdk_intersection->x = intersection.x - layout->xoffset;
20394 - gdk_intersection->y = intersection.y - layout->yoffset;
20395 + gdk_intersection->x = intersection.x;
20396 + gdk_intersection->y = intersection.y;
20397 gdk_intersection->width = intersection.width;
20398 gdk_intersection->height = intersection.height;
20400 @@ -1107,7 +1121,7 @@
20401 GtkDwViewport *viewport;
20402 DwWidgetClass *klass;
20404 - klass = (DwWidgetClass*)(((GtkObject*)widget)->klass);
20405 + klass = DW_WIDGET_GET_CLASS(widget);
20406 DW_WIDGET_SET_FLAGS (widget, DW_NEEDS_RESIZE);
20407 if (klass->mark_size_change)
20408 klass->mark_size_change (widget, ref);
20409 @@ -1121,7 +1135,7 @@
20410 for (widget2 = widget->parent, child = widget;
20412 child = widget2, widget2 = widget2->parent) {
20413 - klass = (DwWidgetClass*)(((GtkObject*)widget2)->klass);
20414 + klass = DW_WIDGET_GET_CLASS(widget2);
20415 DW_WIDGET_SET_FLAGS (widget2, DW_NEEDS_RESIZE);
20416 if (klass->mark_size_change)
20417 klass->mark_size_change (widget2, child->parent_ref);
20418 @@ -1150,10 +1164,10 @@
20419 void p_Dw_widget_set_anchor (DwWidget *widget, gchar *name, int pos)
20421 if (widget->anchors_table == NULL)
20422 - widget->anchors_table = g_hash_table_new(g_str_hash, g_str_equal);
20423 + widget->anchors_table = g_hash_table_new (g_str_hash, g_str_equal);
20425 - g_hash_table_insert(widget->anchors_table, name, GINT_TO_POINTER(pos));
20426 - Dw_gtk_viewport_update_anchor(GTK_DW_VIEWPORT (widget->viewport));
20427 + g_hash_table_insert (widget->anchors_table, name, GINT_TO_POINTER (pos));
20428 + Dw_gtk_viewport_update_anchor (GTK_DW_VIEWPORT (widget->viewport));
20432 @@ -1171,27 +1185,19 @@
20435 GdkRectangle gdk_area;
20438 - if (Dw_widget_intersect_viewport (widget, area->x, area->y,
20439 - area->width, area->height, &gdk_area)) {
20440 - vx = p_Dw_widget_x_viewport_to_world (widget, 0);
20441 - vy = p_Dw_widget_y_viewport_to_world (widget, 0);
20443 + if (Dw_widget_intersect_viewport (widget, x, y, width, height, &gdk_area)) {
20444 p_Dw_style_draw_border (DW_WIDGET_WINDOW (widget), &gdk_area,
20446 widget->allocation.x + x,
20447 widget->allocation.y + y,
20450 + width, height, style);
20452 - if (style->background_color)
20453 + if (style->background_color) {
20454 p_Dw_style_draw_background (DW_WIDGET_WINDOW (widget), &gdk_area,
20456 widget->allocation.x + x,
20457 widget->allocation.y + y,
20460 + width, height, style);
20465 @@ -1203,15 +1209,10 @@
20468 GdkRectangle gdk_area;
20471 - if (Dw_widget_intersect_viewport (widget, area->x, area->y,
20472 - area->width, area->height, &gdk_area)) {
20473 - vx = p_Dw_widget_x_viewport_to_world (widget, 0);
20474 - vy = p_Dw_widget_y_viewport_to_world (widget, 0);
20476 + if (Dw_widget_intersect_viewport (widget, area->x, area->y, area->width,
20477 + area->height, &gdk_area)) {
20478 p_Dw_style_draw_border (DW_WIDGET_WINDOW (widget), &gdk_area,
20480 widget->allocation.x,
20481 widget->allocation.y,
20482 widget->allocation.width,
20483 @@ -1228,14 +1229,14 @@
20484 * *not* necessary to draw the background if
20485 * widget->style->background_color is NULL (shining through).
20487 - if (widget->parent && widget->style->background_color)
20488 + if (widget->parent && widget->style->background_color) {
20489 p_Dw_style_draw_background (DW_WIDGET_WINDOW (widget), &gdk_area,
20491 widget->allocation.x,
20492 widget->allocation.y,
20493 widget->allocation.width,
20494 widget->allocation.ascent
20495 + widget->allocation.descent,
20500 diff -urN dillo-0.6.6/src/dw_widget.h dillo2-0.6.6/src/dw_widget.h
20501 --- dillo-0.6.6/src/dw_widget.h 2002-03-13 05:08:57.000000000 -0700
20502 +++ dillo2-0.6.6/src/dw_widget.h 2003-04-21 14:22:14.000000000 -0600
20504 #define DW_WIDGET(obj) GTK_CHECK_CAST (obj, DW_TYPE_WIDGET, DwWidget)
20505 #define DW_WIDGET_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, DW_TYPE_WIDGET, \
20507 +#define DW_WIDGET_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), DW_TYPE_WIDGET, DwWidgetClass))
20508 #define DW_IS_WIDGET(obj) GTK_CHECK_TYPE (obj, DW_TYPE_WIDGET)
20511 @@ -42,13 +43,28 @@
20512 #define DW_USES_HINTS (1 << 4)
20513 #define DW_HAS_CONTENT (1 << 5)
20515 -#define DW_WIDGET_WINDOW(widget) \
20516 - (((GtkDwViewport*)(widget)->viewport)->back_pixmap)
20518 +/* content types for iterator data */
20521 + DW_CONTENT_START = 0x01,
20522 + DW_CONTENT_END = 0x01,
20523 + DW_CONTENT_TEXT = 0x02,
20524 + DW_CONTENT_WIDGET = 0x04,
20525 + DW_CONTENT_ANCHOR = 0x08,
20526 + DW_CONTENT_BREAK = 0x10,
20527 + DW_CONTENT_ALL = 0xff
20530 +#define DW_WIDGET_WINDOW(widget) (((GtkLayout*)(widget)->viewport)->bin_window)
20532 typedef struct _DwRectangle DwRectangle;
20533 typedef struct _DwAllocation DwAllocation;
20534 typedef struct _DwRequisition DwRequisition;
20535 typedef struct _DwExtremes DwExtremes;
20536 +typedef struct _DwContent DwContent;
20537 +typedef struct _DwIterator DwIterator;
20538 +typedef struct _DwIteratorInt DwIteratorInt;
20540 typedef struct _DwWidget DwWidget;
20541 typedef struct _DwWidgetClass DwWidgetClass;
20542 @@ -89,6 +105,57 @@
20549 + DwContentType type;
20555 + DwWidget *widget;
20557 + gint break_space;
20561 +struct _DwIterator
20563 + DwWidget *widget;
20566 + /* the current data, after first call of next */
20567 + DwContent content;
20569 + /* for simplicity, static stuff is put into the structure */
20572 + * Move iterator forward and store content it. Returns TRUE on
20575 + gboolean (*next) (DwIterator*);
20578 + * Create an exact copy of the iterator, which then can be used
20579 + * independantly of the original one.
20581 + DwIterator* (*clone) (DwIterator*);
20584 + * Free memory of iterator.
20586 + void (*free) (DwIterator*);
20589 +/* This iterator type is quite commonly used. */
20590 +struct _DwIteratorInt
20600 @@ -172,6 +239,9 @@
20601 gint (*leave_notify_event) (DwWidget *widget,
20602 DwWidget *next_widget,
20603 GdkEventMotion *event);
20605 + DwIterator* (*iterator) (DwWidget*,
20610 @@ -205,6 +275,15 @@
20611 void a_Dw_widget_scroll_to (DwWidget *widget,
20615 +DwIterator* a_Dw_widget_iterator (DwWidget *widget,
20617 +#define a_Dw_iterator_next(it) ((it) ? (it)->next(it) : FALSE)
20618 +#define a_Dw_iterator_clone(it) ((it) ? (it)->clone(it) : NULL)
20619 +#define a_Dw_iterator_free(it) ((it) ? (it)->next(it) : (void)0)
20621 +void p_Dw_iterator_free_std (DwIterator *it);
20623 /* Only for Dw module */
20624 gint p_Dw_rectangle_intersect (DwRectangle *src1,
20626 @@ -228,7 +307,7 @@
20627 GtkWidget *viewwidget,
20630 - GdkEvent *event);
20631 + GdkEventAny *event);
20632 void p_Dw_widget_queue_draw (DwWidget *widget);
20633 void p_Dw_widget_queue_draw_area (DwWidget *widget,
20635 diff -urN dillo-0.6.6/src/html.c dillo2-0.6.6/src/html.c
20636 --- dillo-0.6.6/src/html.c 2002-05-26 10:36:41.000000000 -0600
20637 +++ dillo2-0.6.6/src/html.c 2003-04-21 12:36:16.000000000 -0600
20642 -//#define DEBUG_LEVEL 3
20643 +#define DEBUG_LEVEL 10
20646 typedef void (*TagFunct) (DilloHtml *Html, char *Tag, gint Tagsize);
20648 static void Html_callback(int Op, CacheClient_t *Client);
20649 static DilloHtml *Html_new(BrowserWindow *bw, const DilloUrl *url);
20650 static void Html_tag_open_input(DilloHtml *html, char *tag, gint tagsize);
20651 +static void Html_add_input(DilloHtmlForm *form,
20652 + DilloHtmlInputType type,
20653 + GtkWidget *widget,
20654 + const char *name,
20655 + const char *init_str,
20656 + DilloHtmlSelect *select,
20657 + gboolean init_val);
20658 +static gboolean Html_submit_form(GtkWidget *submit, DilloHtmlLB *html_lb,
20659 + gint click_x, gint click_y);
20660 +static gboolean Html_reset_form(GtkWidget *reset, DilloHtmlLB *html_lb);
20664 @@ -135,7 +145,7 @@
20666 * Free the memory used by the linkblock
20668 -static void Html_lb_free(void *lb)
20669 +static gboolean Html_lb_free(GtkWidget *widget, void *lb)
20672 DilloHtmlForm *form;
20673 @@ -173,6 +183,8 @@
20674 a_Dw_image_map_list_free(&html_lb->maps);
20682 @@ -194,7 +206,7 @@
20683 * Handle the status function generated by the dw scroller,
20684 * and show the url in the browser status-bar.
20686 -static void Html_handle_status(DwWidget *widget, gint link, gint x, gint y,
20687 +static gboolean Html_handle_status(DwWidget *widget, gint link, gint x, gint y,
20691 @@ -212,28 +224,32 @@
20692 a_Interface_msg(lb->bw, "");
20693 a_Dw_widget_set_cursor (widget, NULL);
20700 * Popup the link menu ("link_pressed" callback of the page)
20702 -static void Html_link_menu(DwWidget *widget, gint link, gint x, gint y,
20703 - GdkEventButton *event, DilloHtmlLB *lb)
20704 +static gboolean Html_link_menu(DwWidget *widget, gint link, gint x, gint y,
20705 + GdkEventButton *event, DilloHtmlLB *lb)
20707 if (event->button == 3) {
20708 Html_set_link_coordinates(lb, link, x, y);
20709 a_Menu_popup_set_url(lb->bw, lb->links[link]);
20710 gtk_menu_popup(GTK_MENU(lb->bw->menu_popup.over_link), NULL, NULL,
20711 NULL, NULL, event->button, event->time);
20719 * Activate a link ("link_clicked" callback of the page)
20721 -static void Html_link_clicked(DwWidget *widget, gint link, gint x, gint y,
20722 - GdkEventButton *event, DilloHtmlLB *lb)
20723 +static gboolean Html_link_clicked(DwWidget *widget, gint link, gint x, gint y,
20724 + GdkEventButton *event, DilloHtmlLB *lb)
20727 DwStyle *old_style, style_attrs;
20728 @@ -280,36 +296,35 @@
20731 /* end workaround */
20736 * Popup the page menu ("button_press_event" callback of the viewport)
20738 -static int Html_page_menu(GtkWidget *viewport, GdkEventButton *event,
20739 - BrowserWindow *bw)
20740 +static gboolean Html_page_menu(GtkWidget *viewport, GdkEventButton *event,
20741 + BrowserWindow *bw)
20743 if (event->button == 3) {
20744 a_Menu_popup_set_url(bw, a_History_get_url(NAV_TOP(bw)));
20745 gtk_menu_popup(GTK_MENU(bw->menu_popup.over_page), NULL, NULL,
20746 NULL, NULL, event->button, event->time);
20755 * Connect all signals of a page or an image.
20757 -static void Html_connect_signals(DilloHtml *html, GtkObject *widget)
20758 +static void Html_connect_signals(DilloHtml *html, GObject *object)
20760 - gtk_signal_connect (widget, "link_entered",
20761 - GTK_SIGNAL_FUNC(Html_handle_status),
20762 - (gpointer)html->linkblock);
20763 - gtk_signal_connect (widget, "link_pressed", GTK_SIGNAL_FUNC(Html_link_menu),
20764 - (gpointer)html->linkblock);
20765 - gtk_signal_connect (widget, "link_clicked",
20766 - GTK_SIGNAL_FUNC(Html_link_clicked),
20767 - (gpointer)html->linkblock);
20768 + g_signal_connect (object, "link_entered",
20769 + G_CALLBACK(Html_handle_status), html->linkblock);
20770 + g_signal_connect (object, "link_pressed",
20771 + G_CALLBACK(Html_link_menu), html->linkblock);
20772 + g_signal_connect (object, "link_clicked",
20773 + G_CALLBACK(Html_link_clicked), html->linkblock);
20777 @@ -452,7 +467,7 @@
20778 a_Dw_style_unref (style);
20780 /* Handle it when the user clicks on a link */
20781 - Html_connect_signals(html, GTK_OBJECT(page));
20782 + Html_connect_signals(html, G_OBJECT(page));
20786 @@ -528,16 +543,14 @@
20787 html->stack[0].table_cell_style = NULL;
20789 /* Handle it when the user clicks on a link */
20790 - Html_connect_signals(html, GTK_OBJECT(widget));
20791 + Html_connect_signals(html, G_OBJECT(widget));
20793 - gtk_signal_connect_while_alive (
20794 - GTK_OBJECT(GTK_BIN(html->bw->docwin)->child), "button_press_event",
20795 - GTK_SIGNAL_FUNC(Html_page_menu), (gpointer)html->bw, GTK_OBJECT (page));
20796 + g_signal_connect(G_OBJECT(GTK_BIN(html->bw->docwin)->child),
20797 + "button_press_event", G_CALLBACK(Html_page_menu), html->bw);
20799 /* Destroy the linkblock when the DwPage is destroyed */
20800 - gtk_signal_connect_object(GTK_OBJECT(page), "destroy",
20801 - GTK_SIGNAL_FUNC(Html_lb_free),
20802 - (gpointer)html->linkblock);
20803 + g_signal_connect(G_OBJECT(page), "destroy", G_CALLBACK(Html_lb_free),
20804 + html->linkblock);
20808 @@ -550,6 +563,10 @@
20809 html = g_new(DilloHtml, 1);
20811 html->Start_Ofs = 0;
20812 + html->utf8_offset = 0;
20813 + html->utf8_buf = g_string_new("");
20814 + html->Encoding = NULL;
20818 html->linkblock = Html_lb_new(bw, url);
20819 @@ -708,7 +725,7 @@
20820 /* Numeric token */
20821 base = (token[2] == 'x' || token[2] == 'X') ? 16 : 10;
20822 isocode = strtol(token + 2 + (base==16), NULL, base);
20823 - return (isocode > 0 && isocode <= 255) ? isocode : -1;
20824 + return isocode > 0 ? isocode : -1;
20826 /* Search for named entity */
20827 name = g_strndup(token + 1, eoe - token - 1);
20828 @@ -726,23 +743,41 @@
20830 static char *Html_parse_entities(gchar *token, gint toksize)
20833 - gint i, j, isocode;
20835 + gchar *new_str, *p;
20836 + gint i, isocode, len;
20840 if ( memchr(token, '&', toksize) == NULL )
20841 return g_strndup(token, toksize);
20843 - new_str = g_new(char, toksize + 1);
20844 - for (i = j = 0; i < toksize; i++) {
20845 - if (token[i] == '&' &&
20846 - (isocode = Html_parse_entity(token + i, toksize - i)) != -1) {
20847 - new_str[j++] = isocode;
20848 - while(token[++i] != ';');
20849 + /* Get length in characters, not in bytes */
20850 + len = g_utf8_strlen(token, toksize);
20852 + gstr = g_string_new("");
20855 + for (i = 0, p = token; i < len; i++) {
20856 + c = g_utf8_get_char(p);
20859 + (isocode = Html_parse_entity(p, len - i)) != -1) {
20860 + g_string_append_unichar(gstr, isocode);
20863 - new_str[j++] = token[i];
20864 + if (in_ent && c == ';')
20866 + else if (!in_ent)
20867 + g_string_append_unichar(gstr, c);
20870 + p = g_utf8_next_char(p);
20872 - new_str[j] = '\0';
20874 + new_str = gstr->str;
20875 + g_string_free(gstr, FALSE);
20880 @@ -934,8 +969,8 @@
20882 static void Html_eventually_pop_dw(DilloHtml *html)
20884 - if(html->dw != html->stack[html->stack_top].page) {
20885 - if(html->stack[html->stack_top].hand_over_break)
20886 + if (html->dw != html->stack[html->stack_top].page) {
20887 + if (html->stack[html->stack_top].hand_over_break)
20888 a_Dw_page_hand_over_break(DW_PAGE(html->dw),
20889 html->stack[(html)->stack_top].style);
20890 a_Dw_page_flush(DW_PAGE(html->dw));
20891 @@ -956,8 +991,8 @@
20892 g_free(html->stack[html->stack_top--].tag);
20893 Html_eventually_pop_dw(html);
20902 @@ -1024,7 +1059,7 @@
20906 - l = DW_STYLE_CREATE_LENGTH ((gint)v);
20907 + l = DW_STYLE_CREATE_LENGTH ((gint)(prefs.halfsize_images ? v/2 : v));
20911 @@ -1266,7 +1301,10 @@
20912 gint32 border = 0, cellspacing = 1, cellpadding = 2, bgcolor;
20915 - Html_par_push_tag(html, tag, tagsize);
20916 + Html_cleanup_tag(html, "p>");
20917 + Html_push_tag(html, tag, tagsize);
20918 + a_Dw_page_add_parbreak(DW_PAGE (html->dw), 0,
20919 + html->stack[(html)->stack_top].style);
20922 if ((attrbuf = Html_get_attr(html, tag, tagsize, "border")))
20923 @@ -1410,7 +1448,7 @@
20924 html->stack[html->stack_top].page = html->dw = col_page;
20926 /* Handle it when the user clicks on a link */
20927 - Html_connect_signals(html, GTK_OBJECT(col_page));
20928 + Html_connect_signals(html, G_OBJECT(col_page));
20932 @@ -1636,13 +1674,6 @@
20933 html->stack[(html)->stack_top].style);
20937 -/* For testing, should be removed soon. */
20938 -static void Html_tag_open_button_clicked(void)
20940 - g_print ("DwButton was clicked!\n");
20946 @@ -1654,6 +1685,12 @@
20948 DwStyle style_attrs, *style;
20949 DwWidget *button, *page;
20950 + DilloHtmlForm *form;
20951 + DilloHtmlLB *html_lb;
20952 + DilloHtmlInputType inp_type;
20953 + const gchar *attrbuf;
20954 + gchar *name, *value, *type;
20956 /* Render the button */
20957 Html_push_tag(html, tag, tagsize);
20958 style_attrs = *html->stack[html->stack_top].style;
20959 @@ -1662,7 +1699,7 @@
20960 a_Dw_style_box_set_val(&style_attrs.border_width, 0);
20961 a_Dw_style_box_set_val(&style_attrs.padding, 0);
20962 style = a_Dw_style_new (&style_attrs, html->bw->main_window->window);
20963 - button = a_Dw_button_new ();
20964 + button = a_Dw_button_new (DW_USES_HINTS, TRUE);
20966 a_Dw_page_add_parbreak (DW_PAGE (html->dw), 5, style);
20967 a_Dw_page_add_widget (DW_PAGE (html->dw), button, style);
20968 @@ -1677,24 +1714,50 @@
20969 a_Dw_container_add (DW_CONTAINER (button), page);
20970 a_Dw_style_box_set_val(&style_attrs.margin, 0);
20972 + a_Dw_button_set_sensitive (DW_BUTTON (button), FALSE);
20974 html->stack[html->stack_top].page = html->dw = page;
20976 /* Handle it when the user clicks on a link */
20977 - Html_connect_signals(html, GTK_OBJECT(page));
20978 + Html_connect_signals(html, G_OBJECT(page));
20980 + /* Connect it to the form */
20981 + html_lb = html->linkblock;
20982 + form = &(html_lb->forms[html_lb->num_forms - 1]);
20984 + type = (attrbuf = Html_get_attr(html, tag, tagsize, "type")) ?
20985 + g_strdup(attrbuf) : g_strdup("");
20986 + if (type == NULL)
20989 + if (strcmp(type, "submit") == 0) {
20990 + inp_type = DILLO_HTML_INPUT_BUTTON_SUBMIT;
20991 + g_signal_connect(G_OBJECT(button), "clicked",
20992 + G_CALLBACK(Html_submit_form), html_lb);
20993 + } else if (strcmp(type, "reset") == 0) {
20994 + inp_type = DILLO_HTML_INPUT_BUTTON_RESET;
20995 + g_signal_connect(G_OBJECT(button), "clicked",
20996 + G_CALLBACK(Html_reset_form), html_lb);
21000 - /* for testing: */
21001 - a_Dw_button_set_sensitive (DW_BUTTON (button), TRUE);
21002 - gtk_signal_connect(GTK_OBJECT(button), "clicked",
21003 - GTK_SIGNAL_FUNC(Html_tag_open_button_clicked), NULL);
21004 - /* todo: Connect it to the form */
21005 + value = (attrbuf = Html_get_attr(html, tag, tagsize, "value")) ?
21006 + g_strdup(attrbuf) : NULL;
21007 + name = (attrbuf = Html_get_attr(html, tag, tagsize, "name")) ?
21008 + g_strdup(attrbuf) : NULL;
21010 + Html_add_input(form, inp_type, (GtkWidget*)button, name, value,
21019 static void Html_tag_open_font(DilloHtml *html, char *tag, gint tagsize)
21022 DwStyle style_attrs, *old_style;
21023 - /*DwStyleFont font;*/
21024 const char *attrbuf;
21027 @@ -1713,22 +1776,18 @@
21032 if ((attrbuf = Html_get_attr(html, tag, tagsize, "face"))) {
21033 - font = *( style_attrs.font );
21034 + DwStyleFont font = *( style_attrs.font );
21035 font.name = attrbuf;
21036 style_attrs.font = a_Dw_style_font_new_from_list (&font);
21040 html->stack[html->stack_top].style =
21041 a_Dw_style_new (&style_attrs, html->bw->main_window->window);
21042 a_Dw_style_unref (old_style);
21046 Html_push_tag(html, tag, tagsize);
21051 @@ -1798,28 +1857,16 @@
21055 - * Create a new Image struct and request the image-url to the cache
21056 - * (If it either hits or misses, is not relevant here; that's up to the
21057 - * cache functions)
21058 + * Read image associated tag attributes,
21059 + * create new image and add it to the html page (if add is TRUE).
21061 -static void Html_tag_open_img(DilloHtml *html, char *tag, gint tagsize)
21062 +static DilloImage *Html_add_new_image(DilloHtml *html, char *tag,
21063 + gint tagsize, DwStyle *style_attrs,
21068 - DilloUrl *url, *usemap_url;
21070 - DwStyle style_attrs;
21071 char *width_ptr, *height_ptr, *alt_ptr;
21072 const char *attrbuf;
21073 - gint ClientKey, border;
21075 - if ( !(attrbuf = Html_get_attr(html, tag, tagsize, "src")) )
21078 - if (!(url = a_Url_new(attrbuf, URL_STR_(html->linkblock->base_url), 0, 0)))
21081 - page = DW_PAGE (html->dw);
21084 if ((attrbuf = Html_get_attr(html, tag, tagsize, "width")))
21085 @@ -1833,15 +1880,68 @@
21086 if ((attrbuf = Html_get_attr(html, tag, tagsize, "alt")))
21087 alt_ptr = g_strdup(attrbuf);
21089 + if ((width_ptr && !height_ptr) || (height_ptr && !width_ptr))
21090 + DEBUG_HTML_MSG("Image tag only sepecifies <%s>\n",
21091 + (width_ptr) ? "width" : "height");
21093 + /* Add a new image widget to this page */
21094 + if ((Image = a_Image_new(0, 0, alt_ptr,
21095 + html->stack[html->stack_top].current_bg_color)))
21097 + Html_add_widget(html, DW_WIDGET(Image->dw), width_ptr, height_ptr,
21100 + g_free(width_ptr);
21101 + g_free(height_ptr);
21107 + * Tell cache to retrieve image
21109 +static void Html_load_image(DilloHtml *html, DilloUrl *url, DilloImage *Image)
21113 + /* Fill a Web structure for the cache query */
21114 + Web = a_Web_new(url);
21115 + Web->bw = html->bw;
21116 + Web->Image = Image;
21117 + Web->flags |= WEB_Image;
21118 + /* Request image data from the cache */
21119 + if ((ClientKey = a_Cache_open_url(Web, NULL, NULL)) != 0) {
21120 + a_Interface_add_client(html->bw, ClientKey, 0);
21121 + a_Interface_add_url(html->bw, url, WEB_Image);
21126 + * Create a new Image struct and request the image-url to the cache
21127 + * (If it either hits or misses, is not relevant here; that's up to the
21128 + * cache functions)
21130 +static void Html_tag_open_img(DilloHtml *html, char *tag, gint tagsize)
21132 + DilloImage *Image;
21133 + DilloUrl *url, *usemap_url;
21135 + DwStyle style_attrs;
21136 + const char *attrbuf;
21139 + if (!(attrbuf = Html_get_attr(html, tag, tagsize, "src")) ||
21140 + !(url = a_Url_new(attrbuf, URL_STR(html->linkblock->base_url), 0, 0)))
21143 + page = DW_PAGE (html->dw);
21147 if ((attrbuf = Html_get_attr(html, tag, tagsize, "usemap")))
21148 /* todo: usemap URLs outside of the document are not used. */
21149 usemap_url = a_Url_new(attrbuf, URL_STR_(html->linkblock->base_url),0,0);
21151 - if ((width_ptr && !height_ptr) || (height_ptr && !width_ptr))
21152 - DEBUG_HTML_MSG("Image tag only sepecifies <%s>\n",
21153 - (width_ptr) ? "width" : "height");
21155 style_attrs = *html->stack[html->stack_top].style;
21157 if (html->stack[html->stack_top].style->link != -1 || usemap_url != NULL) {
21158 @@ -1866,12 +1966,8 @@
21159 a_Dw_style_box_set_val (&style_attrs.border_width, border);
21162 - /* Add a new image widget to this page */
21163 - Image = a_Image_new(0, 0, alt_ptr,
21164 - html->stack[html->stack_top].current_bg_color);
21165 - Html_add_widget(html, DW_WIDGET(Image->dw), width_ptr, height_ptr,
21167 - Html_connect_signals(html, GTK_OBJECT(Image->dw));
21168 + Image = Html_add_new_image(html, tag, tagsize, &style_attrs, TRUE);
21169 + Html_connect_signals(html, G_OBJECT(Image->dw));
21172 if (Html_get_attr(html, tag, tagsize, "ismap")) {
21173 @@ -1886,20 +1982,8 @@
21174 a_Url_free (usemap_url);
21177 - /* Fill a Web structure for the cache query */
21178 - Web = a_Web_new(url);
21179 - Web->bw = html->bw;
21180 - Web->Image = Image;
21181 - Web->flags |= WEB_Image;
21182 - /* Request image data from the cache */
21183 - if ((ClientKey = a_Cache_open_url(Web, NULL, NULL)) != 0) {
21184 - a_Interface_add_client(html->bw, ClientKey, 0);
21185 - a_Interface_add_url(html->bw, url, WEB_Image);
21187 + Html_load_image(html, url, Image);
21189 - g_free(width_ptr);
21190 - g_free(height_ptr);
21195 @@ -2430,8 +2514,12 @@
21196 /* Make buttons sensitive again */
21197 for (i = 0; i < form->num_inputs; i++) {
21198 if (form->inputs[i].type == DILLO_HTML_INPUT_SUBMIT ||
21199 - form->inputs[i].type == DILLO_HTML_INPUT_RESET) {
21200 + form->inputs[i].type == DILLO_HTML_INPUT_RESET) {
21201 gtk_widget_set_sensitive(form->inputs[i].widget, TRUE);
21202 + } else if (form->inputs[i].type == DILLO_HTML_INPUT_IMAGE ||
21203 + form->inputs[i].type == DILLO_HTML_INPUT_BUTTON_SUBMIT ||
21204 + form->inputs[i].type == DILLO_HTML_INPUT_BUTTON_RESET) {
21205 + a_Dw_button_set_sensitive(DW_BUTTON(form->inputs[i].widget), TRUE);
21209 @@ -2449,9 +2537,29 @@
21211 static void Html_tag_open_meta(DilloHtml *html, char *tag, gint tagsize)
21213 + const char *attrbuf;
21217 /* only valid inside HEAD */
21218 - if (html->InFlags & IN_HEAD)
21219 + if (!(html->InFlags & IN_HEAD))
21222 + /* Check for enoding */
21223 + if ((attrbuf = Html_get_attr(html, tag, tagsize, "http-equiv")) &&
21224 + g_strcasecmp(attrbuf, "content-type") == 0) {
21225 + if ((attrbuf = Html_get_attr(html, tag, tagsize, "content"))) {
21226 + if ((str = strstr(attrbuf, "charset="))) {
21227 + for (i = 8; str[i] != '\0' && str[i] != ';'; i++)
21230 + html->Encoding = g_strndup(str + 8, i - 8);
21231 + /* TODO: For this to work for multi-byte charsets, we have to
21232 + * reconvert the document and adjust the parser offset to the
21233 + * point just after this tag */
21240 @@ -2565,6 +2673,7 @@
21241 type == DILLO_HTML_INPUT_TEXTAREA) {
21242 form->num_entry_fields++;
21243 } else if (type == DILLO_HTML_INPUT_SUBMIT ||
21244 + type == DILLO_HTML_INPUT_BUTTON_SUBMIT ||
21245 type == DILLO_HTML_INPUT_IMAGE) {
21246 form->num_submit_buttons++;
21248 @@ -2597,7 +2706,7 @@
21249 * Reset all inputs in the form containing reset to their initial values.
21250 * In general, reset is the reset button for the form.
21252 -static void Html_reset_form(GtkWidget *reset, DilloHtmlLB *html_lb)
21253 +static gboolean Html_reset_form(GtkWidget *reset, DilloHtmlLB *html_lb)
21256 DilloHtmlForm *form;
21257 @@ -2607,6 +2716,8 @@
21258 for ( j = 0; j < form->num_inputs; j++)
21259 Html_reset_input(&(form->inputs[j]));
21266 @@ -2646,30 +2757,68 @@
21268 Html_append_input(GString *url, const char *name, const char *value)
21272 + GError *err = NULL;
21274 if (name != NULL) {
21275 - Html_urlencode_append(url, name);
21276 + /* Convert name and value to ISO-8859-1 */
21277 + iso_name = g_convert(name, -1, "iso8859-1", "utf8", NULL, NULL, &err);
21279 + g_warning ("Html_append_input(): %s\n", err->message);
21280 + g_error_free(err);
21284 + iso_value = g_convert(value, -1, "iso8859-1", "utf8", NULL, NULL, &err);
21286 + g_warning ("Html_append_input(): %s\n", err->message);
21287 + g_error_free(err);
21291 + Html_urlencode_append(url, iso_name);
21292 g_string_append_c(url, '=');
21293 - Html_urlencode_append(url, value);
21294 + Html_urlencode_append(url, iso_value);
21295 g_string_append_c(url, '&');
21300 + * Append a image button click position to an existing url.
21302 +static void Html_append_clickpos(GString *url, const char *name, int x, int y)
21305 + Html_urlencode_append(url, name);
21306 + g_string_sprintfa(url, ".x=%d&", x);
21307 + Html_urlencode_append(url, name);
21308 + g_string_sprintfa(url, ".y=%d&", y);
21310 + g_string_sprintfa(url, "x=%d&y=%d&", x, y);
21314 * Submit the form containing the submit input by making a new query URL
21315 * and sending it with a_Nav_push.
21317 + * click_x and click_y are used only by input images and are set only when
21318 + * called by Html_image_clicked. GTK+ does NOT give these arguments.
21320 -static void Html_submit_form(GtkWidget *submit, DilloHtmlLB *html_lb)
21321 +static gboolean Html_submit_form(GtkWidget *submit, DilloHtmlLB *html_lb,
21322 + gint click_x, gint click_y)
21324 gint i, input_index;
21325 DilloHtmlForm *form;
21326 DilloHtmlInput *input;
21328 gchar *url_str, *action_str, *p;
21329 + GtkTextBuffer *buffer = NULL;
21330 + GtkTextIter *start = NULL, *end = NULL;
21332 /* Search the form that generated the submit event */
21333 if ( (i = Html_find_form(submit, html_lb)) == -1 )
21337 form = &html_lb->forms[i];
21338 if ((form->method == DILLO_HTML_METHOD_GET) ||
21339 @@ -2716,14 +2865,23 @@
21342 case DILLO_HTML_INPUT_TEXTAREA:
21343 + buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(input->widget));
21344 + gtk_text_buffer_get_bounds(buffer, start, end);
21345 Html_append_input(DataStr, input->name,
21346 - gtk_editable_get_chars(GTK_EDITABLE (input->widget),0,-1));
21347 + gtk_text_buffer_get_text(buffer, start, end, FALSE));
21349 case DILLO_HTML_INPUT_INDEX:
21350 Html_urlencode_append(DataStr,
21351 gtk_entry_get_text(GTK_ENTRY(input->widget)));
21353 + case DILLO_HTML_INPUT_IMAGE:
21354 + if (input->widget == submit) {
21355 + Html_append_input(DataStr, input->name, input->init_str);
21356 + Html_append_clickpos(DataStr, input->name, click_x, click_y);
21359 case DILLO_HTML_INPUT_SUBMIT:
21360 + case DILLO_HTML_INPUT_BUTTON_SUBMIT:
21361 /* Only the button that triggered the submit. */
21362 if (input->widget == submit && form->num_submit_buttons > 0)
21363 Html_append_input(DataStr, input->name, input->init_str);
21364 @@ -2756,11 +2914,13 @@
21366 a_Nav_push(html_lb->bw, new_url);
21367 g_free(action_str);
21368 - g_string_free(DataStr, TRUE);
21369 a_Url_free(new_url);
21370 + g_string_free(DataStr, TRUE);
21372 g_print("Html_submit_form: Method unknown\n");
21379 @@ -2768,19 +2928,70 @@
21380 * Submit form if it has no submit button.
21381 * (Called by GTK+ when the user presses enter in a text entry within a form)
21383 -static void Html_enter_submit_form(GtkWidget *submit, DilloHtmlLB *html_lb)
21384 +static gboolean Html_enter_submit_form(GtkWidget *submit, DilloHtmlLB *html_lb)
21388 /* Search the form that generated the submit event */
21389 if ( (i = Html_find_form(submit, html_lb)) == -1 )
21393 /* Submit on enterpress when there's a single text-entry only,
21394 * or if the user set enter to always submit */
21395 if ((html_lb->forms[i].num_entry_fields == 1) ||
21396 prefs.enterpress_forces_submit)
21397 - Html_submit_form(submit, html_lb);
21398 + Html_submit_form(submit, html_lb, 1, 1);
21404 + * Call submit form, when input image has been clicked
21406 +static gboolean Html_image_clicked(DwWidget *widget, gint x, gint y,
21409 + g_print("Hallo! (%d, %d, %p)\n", x, y, lb);
21410 + Html_submit_form((GtkWidget*) widget, lb, x, y);
21415 + * Create input image for the form
21417 +static DwWidget *Html_input_image(DilloHtml *html, char *tag, gint tagsize,
21418 + DilloHtmlLB *html_lb, DilloUrl *action)
21420 + DilloImage *Image;
21421 + DwWidget *button;
21422 + DilloUrl *url = NULL;
21423 + DwStyle style_attrs;
21424 + const char *attrbuf;
21426 + if ((attrbuf = Html_get_attr(html, tag, tagsize, "src")) &&
21427 + (url = a_Url_new(attrbuf, URL_STR(html->linkblock->base_url), 0, 0))) {
21428 + button = a_Dw_button_new (0, FALSE);
21429 + a_Dw_page_add_widget (DW_PAGE (html->dw), button,
21430 + html->stack[html->stack_top].style);
21431 + g_signal_connect(G_OBJECT(button), "clicked_at",
21432 + G_CALLBACK(Html_image_clicked), html_lb);
21433 + a_Dw_button_set_sensitive(DW_BUTTON(button), FALSE);
21435 + /* create new image and add it to the button */
21436 + if ((Image = Html_add_new_image(html, tag, tagsize, &style_attrs,
21438 + a_Dw_widget_set_style(DW_WIDGET(Image->dw),
21439 + html->stack[html->stack_top].style);
21440 + a_Dw_container_add(DW_CONTAINER(button), DW_WIDGET(Image->dw));
21441 + Html_load_image(html, url, Image);
21447 + DEBUG_MSG(10, "Html_input_image: unable to create image submit.\n");
21453 @@ -2794,8 +3005,8 @@
21454 DwWidget *embed_gtk;
21455 GtkWidget *widget = NULL;
21457 - char *value, *name, *type, *init_str;
21458 - const char *attrbuf;
21459 + gchar *value, *name, *type, *init_str;
21460 + const gchar *attrbuf;
21461 gboolean init_val = FALSE;
21464 @@ -2854,28 +3065,24 @@
21465 init_str = g_strdup(Html_get_attr2(html, tag, tagsize, "value", 0));
21466 } else if (!g_strcasecmp(type, "submit")) {
21467 inp_type = DILLO_HTML_INPUT_SUBMIT;
21468 - init_str = (value) ? value : g_strdup("submit");
21469 + init_str = (value) ? value : g_strdup("Submit");
21470 widget = gtk_button_new_with_label(init_str);
21471 gtk_widget_set_sensitive(widget, FALSE); /* Until end of FORM! */
21472 - gtk_signal_connect(GTK_OBJECT(widget), "clicked",
21473 - GTK_SIGNAL_FUNC(Html_submit_form), html_lb);
21474 + g_signal_connect(G_OBJECT(widget), "clicked",
21475 + G_CALLBACK(Html_submit_form), html_lb);
21476 } else if (!g_strcasecmp(type, "reset")) {
21477 inp_type = DILLO_HTML_INPUT_RESET;
21478 init_str = (value) ? value : g_strdup("Reset");
21479 widget = gtk_button_new_with_label(init_str);
21480 gtk_widget_set_sensitive(widget, FALSE); /* Until end of FORM! */
21481 - gtk_signal_connect(GTK_OBJECT(widget), "clicked",
21482 - GTK_SIGNAL_FUNC(Html_reset_form), html_lb);
21483 + g_signal_connect(G_OBJECT(widget), "clicked",
21484 + G_CALLBACK(Html_reset_form), html_lb);
21485 } else if (!g_strcasecmp(type, "image")) {
21486 - /* todo: implement this as an image. It'd better be clickable too! =) */
21487 inp_type = DILLO_HTML_INPUT_IMAGE;
21488 - if ((attrbuf = Html_get_attr(html, tag, tagsize, "alt")))
21489 - widget = gtk_button_new_with_label(attrbuf);
21491 - widget = gtk_button_new_with_label("Submit");
21492 - gtk_signal_connect(GTK_OBJECT(widget), "clicked",
21493 - GTK_SIGNAL_FUNC(Html_submit_form), html_lb);
21494 - init_str = (value) ? value : NULL;
21495 + /* use a dw_image widget */
21496 + widget = (GtkWidget*) Html_input_image(html, tag, tagsize,
21497 + html_lb, form->action);
21498 + init_str = value;
21499 } else if (!g_strcasecmp(type, "file")) {
21500 /* todo: implement it! */
21501 inp_type = DILLO_HTML_INPUT_FILE;
21502 @@ -2893,25 +3100,24 @@
21503 widget = gtk_entry_new();
21505 init_str = (value) ? value : NULL;
21506 - gtk_signal_connect(GTK_OBJECT(widget), "activate",
21507 - GTK_SIGNAL_FUNC(Html_enter_submit_form),
21509 + g_signal_connect(G_OBJECT(widget), "activate",
21510 + G_CALLBACK(Html_enter_submit_form), html_lb);
21513 Html_add_input(form, inp_type, widget, name,
21514 (init_str) ? init_str : "", NULL, init_val);
21516 - if (widget != NULL) {
21517 + if (widget != NULL && inp_type != DILLO_HTML_INPUT_IMAGE) {
21518 if (inp_type == DILLO_HTML_INPUT_TEXT ||
21519 - inp_type == DILLO_HTML_INPUT_PASSWORD) {
21520 + inp_type == DILLO_HTML_INPUT_PASSWORD) {
21522 * The following is necessary, because gtk_entry_button_press
21523 * returns FALSE, so the event would be delivered to the
21524 * GtkDwScrolledFrame, which then would be focused, instead of
21527 - gtk_signal_connect_after(GTK_OBJECT(widget), "button_press_event",
21528 - GTK_SIGNAL_FUNC(gtk_true), NULL);
21529 + g_signal_connect_after(G_OBJECT(widget), "button_press_event",
21530 + G_CALLBACK(gtk_true), NULL);
21532 /* Readonly or not? */
21533 gtk_entry_set_editable(
21534 @@ -2921,7 +3127,8 @@
21535 /* Set width of the entry */
21536 if ((attrbuf = Html_get_attr(html, tag, tagsize, "size")))
21537 gtk_widget_set_usize(widget, strtol(attrbuf, NULL, 10) *
21538 - gdk_char_width(widget->style->font, '0'), 0);
21539 + gdk_char_width(gtk_style_get_font(
21540 + widget->style), '0'), 0);
21542 /* Maximum length of the text in the entry */
21543 if ((attrbuf = Html_get_attr(html, tag, tagsize, "maxlength")))
21544 @@ -2979,14 +3186,12 @@
21545 widget = gtk_entry_new();
21546 Html_add_input(form, DILLO_HTML_INPUT_INDEX,
21547 widget, NULL, NULL, NULL, FALSE);
21548 - gtk_signal_connect(GTK_OBJECT(widget), "activate",
21549 - GTK_SIGNAL_FUNC(Html_enter_submit_form),
21551 + g_signal_connect(G_OBJECT(widget), "activate",
21552 + G_CALLBACK(Html_enter_submit_form), html_lb);
21553 gtk_widget_show(widget);
21554 /* compare <input type=text> */
21555 - gtk_signal_connect_after(GTK_OBJECT(widget), "button_press_event",
21556 - GTK_SIGNAL_FUNC(gtk_true),
21558 + g_signal_connect_after(G_OBJECT(widget), "button_press_event",
21559 + G_CALLBACK(gtk_true), NULL);
21561 embed_gtk = a_Dw_embed_gtk_new();
21562 a_Dw_embed_gtk_add_gtk(DW_EMBED_GTK(embed_gtk), widget);
21563 @@ -3005,6 +3210,7 @@
21564 DilloHtmlLB *html_lb = html->linkblock;
21566 DilloHtmlForm *form;
21567 + GtkTextBuffer *buffer;
21569 if (!(html->InFlags & IN_FORM) ||
21570 !(html->InFlags & IN_TEXTAREA))
21571 @@ -3018,8 +3224,9 @@
21573 form = &(html_lb->forms[html_lb->num_forms - 1]);
21574 form->inputs[form->num_inputs - 1].init_str = str;
21575 - gtk_text_insert(GTK_TEXT(form->inputs[form->num_inputs - 1].widget),
21576 - NULL, NULL, NULL, str, -1);
21577 + buffer = gtk_text_view_get_buffer(
21578 + GTK_TEXT_VIEW(form->inputs[form->num_inputs - 1].widget));
21579 + gtk_text_buffer_set_text(buffer, str, -1);
21581 html->InFlags &= ~IN_TEXTAREA;
21582 Html_pop_tag(html, tag, tagsize);
21583 @@ -3033,8 +3240,7 @@
21585 DilloHtmlLB *html_lb;
21586 DilloHtmlForm *form;
21587 - GtkWidget *widget;
21588 - GtkWidget *scroll;
21589 + GtkWidget *widget, *scroll;
21590 DwWidget *embed_gtk;
21592 const char *attrbuf;
21593 @@ -3068,11 +3274,10 @@
21594 if ((attrbuf = Html_get_attr(html, tag, tagsize, "name")))
21595 name = g_strdup(attrbuf);
21597 - widget = gtk_text_new(NULL, NULL);
21598 + widget = gtk_text_view_new ();
21599 /* compare <input type=text> */
21600 - gtk_signal_connect_after(GTK_OBJECT(widget), "button_press_event",
21601 - GTK_SIGNAL_FUNC(gtk_true),
21603 + g_signal_connect_after(G_OBJECT(widget), "button_press_event",
21604 + G_CALLBACK(gtk_true), NULL);
21606 /* Calculate the width and height based on the cols and rows
21607 * todo: Get it right... Get the metrics from the font that will be used.
21608 @@ -3082,13 +3287,15 @@
21609 /* If the attribute readonly isn't specified we make the textarea
21610 * editable. If readonly is set we don't have to do anything.
21612 - if (!Html_get_attr(html, tag, tagsize, "readonly"))
21613 - gtk_text_set_editable(GTK_TEXT(widget), TRUE);
21614 + if (Html_get_attr(html, tag, tagsize, "readonly"))
21615 + gtk_text_view_set_editable (GTK_TEXT_VIEW(widget), FALSE);
21617 scroll = gtk_scrolled_window_new(NULL, NULL);
21618 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
21619 GTK_POLICY_AUTOMATIC,
21620 GTK_POLICY_AUTOMATIC);
21621 + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll),
21623 gtk_container_add(GTK_CONTAINER(scroll), widget);
21624 gtk_widget_show(widget);
21625 gtk_widget_show(scroll);
21626 @@ -3201,9 +3408,6 @@
21627 if ( select->options[select->num_options - 1].init_val )
21628 gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
21629 gtk_widget_show(menuitem);
21630 - gtk_signal_connect (GTK_OBJECT (menuitem), "select",
21631 - GTK_SIGNAL_FUNC (a_Interface_scroll_popup),
21633 } else if ( input->type == DILLO_HTML_INPUT_SEL_LIST ) {
21634 menuitem = gtk_list_item_new_with_label(html->Stash->str);
21635 select->options[select->num_options - 1].menuitem = menuitem;
21636 @@ -3530,7 +3734,7 @@
21637 {"style", Html_tag_open_style, Html_tag_close_style},
21638 {"sub", Html_tag_open_sub, Html_tag_close_default},
21639 {"sup", Html_tag_open_sup, Html_tag_close_default},
21640 - {"table", Html_tag_open_table, Html_tag_close_par},
21641 + {"table", Html_tag_open_table, Html_tag_close_div},
21643 {"td", Html_tag_open_td, Html_tag_close_default},
21644 {"textarea", Html_tag_open_textarea, Html_tag_close_textarea},
21645 @@ -3616,6 +3820,65 @@
21649 +static void Html_get_value(GString *Buf,
21652 + gboolean entities)
21654 + char *p = (char *) str;
21656 + gboolean in_ent = FALSE;
21660 + c = g_utf8_get_char(p);
21665 + p = g_utf8_next_char(p);
21669 + if ((delimiter == ' ' && (isspace(c) || c == '>')) || c == delimiter) {
21671 + } else if (c == '&' && entities) {
21672 + if ((isocode = Html_parse_entity(p, p - str /* FIXME */)) != -1) {
21673 + g_string_append_unichar(Buf, isocode);
21676 + g_string_append_unichar(Buf, c);
21678 + } else if (c == '\r' || c == '\t') {
21679 + g_string_append_c(Buf, ' ');
21680 + } else if (c == '\n') {
21683 + g_string_append_unichar(Buf, c);
21686 + p = g_utf8_next_char(p);
21690 +static int Html_skip_value(const char *str,
21693 + char *p = (char *) str;
21697 + c = g_utf8_get_char(p);
21699 + if ((delimiter == ' ' && isspace(c)) || c == delimiter || c == '>')
21702 + p = g_utf8_next_char(p);
21709 * Get attribute value for 'attrname' and return it.
21710 * Tags start with '<' and end with a '>' (Ex: "<P align=center>")
21711 @@ -3632,7 +3895,7 @@
21712 const char *attrname,
21713 DilloHtmlTagParsingFlags flags)
21715 - gint i, isocode, Found = 0, delimiter = 0, attr_pos = 0;
21716 + gint i, Found = 0, delimiter = 0, attr_pos = 0;
21717 GString *Buf = html->attr_data;
21718 DilloHtmlTagParsingState state = SEEK_ATTR_START;
21720 @@ -3676,27 +3939,12 @@
21724 - if ((delimiter == ' ' && isspace(tag[i])) || tag[i] == delimiter)
21725 - state = SEEK_TOKEN_START;
21726 + i += Html_skip_value(tag + i, delimiter);
21727 + state = SEEK_TOKEN_START;
21730 - if ((delimiter == ' ' && (isspace(tag[i]) || tag[i] == '>')) ||
21731 - tag[i] == delimiter) {
21732 - state = FINISHED;
21733 - } else if (tag[i] == '&' && (flags & HTML_ParseEntities)) {
21734 - if ((isocode = Html_parse_entity(tag+i, tagsize-i)) != -1) {
21735 - g_string_append_c(Buf, (gchar) isocode);
21736 - while(tag[++i] != ';');
21738 - g_string_append_c(Buf, tag[i]);
21740 - } else if (tag[i] == '\r' || tag[i] == '\t') {
21741 - g_string_append_c(Buf, ' ');
21742 - } else if (tag[i] == '\n') {
21745 - g_string_append_c(Buf, tag[i]);
21747 + Html_get_value(Buf, tag + i, delimiter, (flags & HTML_ParseEntities));
21748 + state = FINISHED;
21752 @@ -3739,10 +3987,10 @@
21753 DwStyle new_style_attrs, *style;
21755 new_style_attrs = *style_attrs;
21756 - new_style_attrs.width = width_str ?
21757 - Html_parse_length (width_str) : DW_STYLE_UNDEF_LENGTH;
21758 - new_style_attrs.height = height_str ?
21759 - Html_parse_length (height_str) : DW_STYLE_UNDEF_LENGTH;
21760 + new_style_attrs.width =
21761 + width_str ? Html_parse_length (width_str) : DW_STYLE_UNDEF_LENGTH;
21762 + new_style_attrs.height =
21763 + height_str ? Html_parse_length (height_str) : DW_STYLE_UNDEF_LENGTH;
21764 style = a_Dw_style_new (&new_style_attrs, (html)->bw->main_window->window);
21765 a_Dw_page_add_widget(DW_PAGE (html->dw), widget, style);
21766 a_Dw_style_unref (style);
21767 @@ -3759,11 +4007,67 @@
21769 static void Html_callback(int Op, CacheClient_t *Client)
21771 + DilloHtml *html = Client->CbData;
21772 + GError *err = NULL;
21774 + gsize bufsize, bytes_read;
21776 + /* Check if there was an encoding specified in the header. If not we
21777 + * use a default and hope for the best. */
21778 + if (!html->Encoding) {
21779 + if (Client->Encoding) {
21780 + html->Encoding = g_strdup(Client->Encoding);
21782 + /* Use default. TODO: make customisable */
21783 + html->Encoding = g_strdup("ISO-8859-1");
21787 + /* Convert to UTF-8 */
21788 + utf8_str = g_convert(Client->Buf + html->Start_Ofs,
21789 + Client->BufSize - html->Start_Ofs,
21790 + "UTF8", html->Encoding, &bytes_read, &bufsize, &err);
21793 + /* Something went wrong in the conversion process. */
21794 + switch (err->code) {
21795 + case G_CONVERT_ERROR_ILLEGAL_SEQUENCE:
21796 + /* The end of this chunk is inside of a multi-byte character. We
21797 + * use the bytes_read variable from the previous call to get it right*/
21798 + utf8_str = g_convert(Client->Buf + html->Start_Ofs, bytes_read,
21799 + "UTF8", html->Encoding, NULL, &bufsize, NULL);
21802 + g_warning("Conversion from %s to UTF-8 failed: %s\n", html->Encoding, err->message);
21803 + bufsize = bytes_read = Client->BufSize - html->Start_Ofs;
21804 + utf8_str = g_malloc (bufsize);
21805 + memcpy (utf8_str, Client->Buf + html->Start_Ofs, bufsize);
21808 + for (i = 0; i < bufsize; i++)
21810 + if (utf8_str[i] & 0x80)
21811 + utf8_str[i] = '?';
21817 + g_error_free(err);
21821 + g_string_append_len(html->utf8_buf, utf8_str, bufsize);
21822 + g_free(utf8_str);
21824 + /* Line up for the next chunk */
21825 + html->Start_Ofs += bytes_read;
21828 - Html_write(Client->CbData, Client->Buf, Client->BufSize, 1);
21829 - Html_close(Client->CbData, Client->Key);
21830 + Html_write(html, html->utf8_buf->str, html->utf8_buf->len, 1);
21831 + Html_close(html, Client->Key);
21833 - Html_write(Client->CbData, Client->Buf, Client->BufSize, 0);
21834 + Html_write(html, html->utf8_buf->str, html->utf8_buf->len, 0);
21838 @@ -3776,30 +4080,26 @@
21840 char completestr[32];
21841 gint token_start, buf_index;
21842 - char *buf = Buf + html->Start_Ofs;
21843 - gint bufsize = BufSize - html->Start_Ofs;
21844 + char *buf = Buf + html->utf8_offset;
21845 + guint bufsize = BufSize - html->utf8_offset;
21847 g_return_if_fail ( (page = DW_PAGE (html->dw)) != NULL );
21849 - buf = g_strndup(buf, bufsize);
21851 /* Now, 'buf' and 'bufsize' define a buffer aligned to start at a token
21852 * boundary. Iterate through tokens until end of buffer is reached. */
21854 - token_start = buf_index;
21855 + token_start = buf_index = 0;
21856 while (buf_index < bufsize) {
21857 - /* invariant: buf_index == bufsize || token_start == buf_index */
21859 if (html->stack[html->stack_top].parse_mode ==
21860 DILLO_HTML_PARSE_MODE_SCRIPT) {
21861 /* Non HTML code here, let's skip until closing tag */
21863 - buf_index += strcspn(buf + buf_index, "<");
21864 + buf_index += d_strcspn(buf + buf_index, "<");
21866 if (buf_index + 9 > bufsize)
21867 buf_index = bufsize;
21868 else if (strncmp(buf + buf_index, "</", 2) == 0 &&
21869 Html_match_tag(html->stack[html->stack_top].tag,
21870 - buf+buf_index+2, 7)) {
21871 + buf + buf_index + 2, 7)) {
21872 token_start = buf_index;
21875 @@ -3832,20 +4132,22 @@
21876 /* Tag: search end of tag (skipping over quoted strings) */
21877 while ( buf_index < bufsize ) {
21879 - buf_index += strcspn(buf + buf_index, ">\"'");
21880 + buf_index += d_strcspn(buf + buf_index, ">\"'");
21882 if ( (ch = buf[buf_index]) == '>' ) {
21884 } else if ( ch == '"' || ch == '\'' ) {
21885 /* Skip over quoted string */
21887 - buf_index += strcspn(buf + buf_index,
21888 - (ch == '"') ? "\">" : "'>");
21889 + buf_index += d_strcspn(buf + buf_index,
21890 + (ch == '"') ? "\">" : "'>");
21892 if ( buf[buf_index] == '>' ) {
21893 /* Unterminated string value? Let's look ahead and test:
21894 * (<: unterminated, closing-quote: terminated) */
21895 gint offset = buf_index + 1;
21896 - offset += strcspn(buf + offset,
21897 - (ch == '"') ? "\"<" : "'<");
21898 + offset += d_strcspn(buf + offset,
21899 + (ch == '"') ? "\"<" : "'<");
21900 if (buf[offset] == ch || !buf[offset]) {
21901 buf_index = offset;
21903 @@ -3865,7 +4167,7 @@
21905 /* A Word: search for whitespace or tag open */
21906 while (++buf_index < bufsize) {
21907 - buf_index += strcspn(buf + buf_index, " <\n\r\t\f\v");
21908 + buf_index += d_strcspn(buf + buf_index, " <\n\r\t\f\v");
21909 if ( buf[buf_index] == '<' && (ch = buf[buf_index + 1]) &&
21910 !isalpha(ch) && !strchr("/!?", ch))
21912 @@ -3880,16 +4182,15 @@
21916 - html->Start_Ofs += token_start;
21917 + html->utf8_offset += token_start;
21920 sprintf(completestr,"%s%.1f Kb", PBAR_PSTR(prefs.panel_size == 1),
21921 - (float)html->Start_Ofs/1024);
21922 + (float) html->utf8_offset / 1024);
21923 a_Progressbar_update(html->bw->progress, completestr, 1);
21926 a_Dw_page_flush(page);
21931 @@ -3910,6 +4211,8 @@
21933 g_string_free(html->Stash, TRUE);
21934 g_string_free(html->attr_data, TRUE);
21935 + g_string_free(html->utf8_buf, TRUE);
21936 + g_free(html->Encoding);
21938 /* Remove this client from our active list */
21939 a_Interface_close_client(html->bw, ClientKey);
21940 diff -urN dillo-0.6.6/src/html.h dillo2-0.6.6/src/html.h
21941 --- dillo-0.6.6/src/html.h 2002-05-26 09:09:02.000000000 -0600
21942 +++ dillo2-0.6.6/src/html.h 2003-04-21 12:36:17.000000000 -0600
21943 @@ -162,6 +162,8 @@
21944 DILLO_HTML_INPUT_HIDDEN,
21945 DILLO_HTML_INPUT_SUBMIT,
21946 DILLO_HTML_INPUT_RESET,
21947 + DILLO_HTML_INPUT_BUTTON_SUBMIT,
21948 + DILLO_HTML_INPUT_BUTTON_RESET,
21949 DILLO_HTML_INPUT_SELECT,
21950 DILLO_HTML_INPUT_SEL_LIST,
21951 DILLO_HTML_INPUT_TEXTAREA,
21952 @@ -183,7 +185,11 @@
21953 DwWidget *dw; /* this is duplicated in the stack (page) */
21955 DilloHtmlLB *linkblock;
21956 - size_t Start_Ofs;
21957 + size_t Start_Ofs; /* The offset in the cache data */
21959 + char *Encoding; /* The encoding set from the header or a META tag */
21960 + GString *utf8_buf; /* The UTF-8 converted data which the parser uses */
21961 + gsize utf8_offset; /* The offset in the above buffer */
21963 DilloHtmlState *stack;
21964 gint stack_top; /* Index to the top of the stack [0 based] */
21965 diff -urN dillo-0.6.6/src/image.c dillo2-0.6.6/src/image.c
21966 --- dillo-0.6.6/src/image.c 2002-03-04 10:04:21.000000000 -0700
21967 +++ dillo2-0.6.6/src/image.c 2003-04-21 12:36:17.000000000 -0600
21969 #include <string.h>
21972 +#include "prefs.h"
21976 diff -urN dillo-0.6.6/src/interface.c dillo2-0.6.6/src/interface.c
21977 --- dillo-0.6.6/src/interface.c 2002-04-11 13:53:49.000000000 -0600
21978 +++ dillo2-0.6.6/src/interface.c 2003-04-21 12:36:20.000000000 -0600
21980 #include "dw_widget.h"
21981 #include "dw_gtk_scrolled_window.h"
21982 #include "dw_gtk_viewport.h"
21983 -#include "dw_gtk_statuslabel.h"
21984 #include "dw_container.h"
21985 #include "progressbar.h"
21987 @@ -316,10 +315,11 @@
21989 * Clear a text entry
21991 -static void Interface_entry_clear(GtkEntry *entry)
21992 +static gboolean Interface_entry_clear(GtkEntry *entry)
21994 gtk_entry_set_text(GTK_ENTRY (entry), "");
21995 gtk_widget_grab_focus(GTK_WIDGET(entry));
22000 @@ -383,10 +383,9 @@
22002 /* location entry */
22003 bw->location = gtk_entry_new();
22004 - gtk_signal_connect(GTK_OBJECT(bw->location), "activate",
22005 - (GtkSignalFunc) a_Interface_entry_open_url, bw);
22006 - toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
22007 - gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
22008 + g_signal_connect(G_OBJECT(bw->location), "activate",
22009 + G_CALLBACK(a_Interface_entry_open_url), bw);
22010 + toolbar = gtk_toolbar_new();
22011 GTK_WIDGET_UNSET_FLAGS (toolbar, GTK_CAN_FOCUS);
22013 bw->clear_url_button = gtk_toolbar_append_item(
22014 @@ -394,9 +393,9 @@
22015 NULL, "Clear the url-box!", "Toolbar/New",
22016 Interface_pixmap_new(bw->main_window, s_new_xpm),
22018 - gtk_signal_connect_object(GTK_OBJECT(bw->clear_url_button), "clicked",
22019 - GTK_SIGNAL_FUNC (Interface_entry_clear),
22020 - GTK_OBJECT(bw->location));
22021 + g_signal_connect_object(G_OBJECT(bw->clear_url_button), "clicked",
22022 + G_CALLBACK(Interface_entry_clear),
22023 + G_OBJECT(bw->location), G_CONNECT_SWAPPED);
22025 gtk_box_pack_start(GTK_BOX(hbox), toolbar, FALSE, FALSE, 0);
22026 gtk_widget_show(toolbar);
22027 @@ -414,8 +413,7 @@
22028 GtkWidget *toolbar;
22029 gboolean s = prefs.small_icons;
22031 - toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
22032 - gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
22033 + toolbar = gtk_toolbar_new();
22036 bw->back_button = gtk_toolbar_append_item(
22037 @@ -424,12 +422,13 @@
22038 "Go to previous page", "Toolbar/Back",
22039 Interface_pixmap_new(bw->main_window,
22040 s ? s_left_xpm : left_xpm),
22041 - (GtkSignalFunc) a_Commands_back_callback, bw);
22042 + GTK_SIGNAL_FUNC(a_Commands_back_callback), bw);
22043 + gtk_button_set_relief(GTK_BUTTON(bw->back_button), GTK_RELIEF_NONE);
22044 gtk_widget_set_sensitive(bw->back_button, FALSE);
22045 Interface_set_button_accel(GTK_BUTTON(bw->back_button), "_,",
22047 - gtk_signal_connect(GTK_OBJECT(bw->back_button), "button-press-event",
22048 - GTK_SIGNAL_FUNC(a_Commands_navpress_callback), bw);
22049 + g_signal_connect(G_OBJECT(bw->back_button), "button_press_event",
22050 + G_CALLBACK(a_Commands_navpress_callback), bw);
22052 /* forward button */
22053 bw->forw_button = gtk_toolbar_append_item(
22054 @@ -438,12 +437,12 @@
22055 "Go to next page", "Toolbar/Forward",
22056 Interface_pixmap_new(bw->main_window,
22057 s ? s_right_xpm : right_xpm),
22058 - (GtkSignalFunc) a_Commands_forw_callback, bw);
22059 + GTK_SIGNAL_FUNC(a_Commands_forw_callback), bw);
22060 gtk_widget_set_sensitive(bw->forw_button, FALSE);
22061 Interface_set_button_accel(GTK_BUTTON(bw->forw_button), "_.",
22063 - gtk_signal_connect(GTK_OBJECT(bw->forw_button), "button-press-event",
22064 - GTK_SIGNAL_FUNC(a_Commands_navpress_callback), bw);
22065 + g_signal_connect(G_OBJECT(bw->forw_button), "button_press_event",
22066 + G_CALLBACK(a_Commands_navpress_callback), bw);
22069 bw->home_button = gtk_toolbar_append_item(
22070 @@ -452,9 +451,7 @@
22071 "Go to the Home page", "Toolbar/Home",
22072 Interface_pixmap_new(bw->main_window,
22073 s ? s_home_xpm : home_xpm),
22074 - (GtkSignalFunc) a_Commands_home_callback, bw);
22075 - gtk_signal_connect(GTK_OBJECT(bw->home_button), "button-press-event",
22076 - GTK_SIGNAL_FUNC(a_Commands_navpress_callback), bw);
22077 + GTK_SIGNAL_FUNC(a_Commands_home_callback), bw);
22079 /* reload button */
22080 bw->reload_button = gtk_toolbar_append_item(
22081 @@ -463,7 +460,7 @@
22082 "Reload this page", "Toolbar/Reload",
22083 Interface_pixmap_new(bw->main_window,
22084 s ? s_reload_xpm : reload_xpm),
22085 - (GtkSignalFunc) a_Commands_reload_callback, bw);
22086 + GTK_SIGNAL_FUNC(a_Commands_reload_callback), bw);
22089 bw->save_button = gtk_toolbar_append_item(
22090 @@ -472,7 +469,7 @@
22091 "Save this page", "Toolbar/Save",
22092 Interface_pixmap_new(bw->main_window,
22093 s ? s_save_xpm : save_xpm),
22094 - (GtkSignalFunc) a_Commands_save_callback, bw);
22095 + GTK_SIGNAL_FUNC(a_Commands_save_callback), bw);
22097 bw->stop_button = gtk_toolbar_append_item(
22098 GTK_TOOLBAR(toolbar),
22099 @@ -480,7 +477,7 @@
22100 "Stop the current transfer", "Toolbar/Stop",
22101 Interface_pixmap_new(bw->main_window,
22102 s ? s_stop_xpm : stop_xpm),
22103 - (GtkSignalFunc) a_Commands_stop_callback, bw);
22104 + GTK_SIGNAL_FUNC(a_Commands_stop_callback), bw);
22105 gtk_widget_set_sensitive(bw->stop_button, FALSE);
22107 gtk_widget_show(toolbar);
22108 @@ -552,7 +549,8 @@
22110 * Handler for mouse-clicks that don't belong to the viewport.
22112 -static int Interface_click_callback(BrowserWindow *bw, GdkEventButton *event)
22113 +static int Interface_click_callback(GtkWidget *widget, GdkEventButton *event,
22114 + BrowserWindow *bw)
22116 if (event->type == GDK_2BUTTON_PRESS && event->button == 1)
22117 a_Interface_toggle_panel(bw);
22118 @@ -584,10 +582,10 @@
22119 bw->main_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
22121 gtk_window_set_policy(GTK_WINDOW(bw->main_window), TRUE, TRUE, FALSE);
22122 - gtk_signal_connect(GTK_OBJECT(bw->main_window), "delete_event",
22123 - GTK_SIGNAL_FUNC(gtk_object_destroy), bw);
22124 - gtk_signal_connect(GTK_OBJECT(bw->main_window), "destroy",
22125 - GTK_SIGNAL_FUNC(Interface_quit), bw);
22126 + g_signal_connect(G_OBJECT(bw->main_window), "delete_event",
22127 + G_CALLBACK(gtk_object_destroy), bw);
22128 + g_signal_connect(G_OBJECT(bw->main_window), "destroy",
22129 + G_CALLBACK(Interface_quit), bw);
22130 gtk_container_border_width(GTK_CONTAINER(bw->main_window), 0);
22132 gtk_window_set_wmclass(GTK_WINDOW(bw->main_window), "dillo", "Dillo");
22133 @@ -649,7 +647,7 @@
22135 handlebox = gtk_handle_box_new();
22136 bw->PanelHandles = g_slist_append(bw->PanelHandles, handlebox);
22137 - gtk_container_border_width(GTK_CONTAINER(handlebox), 4);
22138 + gtk_container_border_width(GTK_CONTAINER(handlebox), 0);
22139 hbox = gtk_hbox_new(FALSE, 0);
22140 toolbar = Interface_toolbar_new(bw, 1);
22141 progbox = Interface_progressbox_new(bw, 1);
22142 @@ -662,6 +660,41 @@
22143 gtk_box_pack_start(GTK_BOX(box1), handlebox, FALSE, FALSE, 0);
22144 gtk_widget_show(handlebox);
22146 + } else if (prefs.panel_size == 4) {
22148 + handlebox = gtk_handle_box_new();
22149 + bw->PanelHandles = g_slist_append(bw->PanelHandles, handlebox);
22150 + hbox = gtk_hbox_new(FALSE, 0);
22151 + /* Control Buttons */
22152 + toolbar = Interface_toolbar_new(bw, 0);
22154 + menubar = a_Menu_mainbar_new(bw, 1);
22155 + /* Location entry */
22156 + locbox = Interface_locbar_new(bw);
22157 + /* progress bars */
22158 + progbox = Interface_progressbox_new(bw, 0);
22160 + gtk_box_pack_start(GTK_BOX(hbox), menubar, FALSE, FALSE, 0);
22161 + gtk_widget_show(menubar);
22162 + gtk_box_pack_start(GTK_BOX(hbox), toolbar, FALSE, FALSE, 0);
22163 + gtk_widget_show(toolbar);
22164 + gtk_container_add(GTK_CONTAINER(handlebox), hbox);
22165 + gtk_widget_show(hbox);
22166 + gtk_box_pack_start(GTK_BOX(box1), handlebox, FALSE, FALSE, 0);
22167 + gtk_widget_show(handlebox);
22169 + handlebox = gtk_handle_box_new();
22170 + hbox = gtk_hbox_new(FALSE, 0);
22171 + bw->PanelHandles = g_slist_append(bw->PanelHandles, handlebox);
22172 + gtk_box_pack_start(GTK_BOX(hbox), locbox, TRUE, TRUE, 0);
22173 + gtk_widget_show(locbox);
22174 + gtk_box_pack_start(GTK_BOX(hbox), progbox, FALSE, FALSE, 0);
22175 + gtk_widget_show(progbox);
22176 + gtk_container_add(GTK_CONTAINER(handlebox), hbox);
22177 + gtk_widget_show(hbox);
22178 + gtk_box_pack_start(GTK_BOX(box1), handlebox, FALSE, FALSE, 0);
22179 + gtk_widget_show(handlebox);
22182 handlebox = gtk_handle_box_new();
22183 bw->PanelHandles = g_slist_append(bw->PanelHandles, handlebox);
22184 @@ -673,7 +706,7 @@
22186 handlebox = gtk_handle_box_new();
22187 bw->PanelHandles = g_slist_append(bw->PanelHandles, handlebox);
22188 - gtk_container_border_width(GTK_CONTAINER(handlebox), 4);
22189 + gtk_container_border_width(GTK_CONTAINER(handlebox), 0);
22190 hbox = gtk_hbox_new(FALSE, 0);
22191 toolbar = Interface_toolbar_new(bw, 1);
22192 progbox = Interface_progressbox_new(bw, 1);
22193 @@ -705,15 +738,13 @@
22194 gtk_box_pack_start(GTK_BOX(box1), bw->docwin, TRUE, TRUE, 0);
22195 gtk_widget_show(bw->docwin);
22197 - gtk_signal_connect_object_after(GTK_OBJECT(GTK_BIN(bw->docwin)->child),
22198 - "button_press_event",
22199 - GTK_SIGNAL_FUNC(Interface_click_callback),
22201 + g_signal_connect(G_OBJECT(GTK_BIN(bw->docwin)->child), "button_press_event",
22202 + G_CALLBACK(Interface_click_callback), bw);
22204 gtk_widget_set_usize(bw->main_window, width, height);
22206 /* status widget */
22207 - bw->status = a_Dw_gtk_statuslabel_new("");
22208 + bw->status = gtk_label_new("");
22209 gtk_misc_set_alignment(GTK_MISC(bw->status), 0.0, 0.5);
22210 box2 = gtk_hbox_new(FALSE, 0);
22212 @@ -801,7 +832,7 @@
22214 gchar *a_Interface_get_location_text(BrowserWindow *bw)
22216 - return gtk_entry_get_text(GTK_ENTRY(bw->location));
22217 + return g_strdup(gtk_entry_get_text(GTK_ENTRY(bw->location)));
22221 @@ -833,10 +864,11 @@
22223 * Called from `destroy' callback in Interface_make_*_dialog
22225 -static void Interface_destroy_window(GtkWidget *widget, GtkWidget **window)
22226 +static gboolean Interface_destroy_window(GtkWidget *widget, GtkWidget **window)
22228 gtk_widget_destroy(*window);
22234 @@ -871,31 +903,29 @@
22236 Interface_make_choose_file_dialog(GtkWidget **DialogWindow,
22237 char *WmName, char *WmClass, char *WTitle,
22238 - GtkSignalFunc B1CallBack, void *B1CbData)
22239 + GCallback B1CallBack, void *B1CbData)
22241 *DialogWindow = gtk_file_selection_new(WTitle);
22242 gtk_window_set_modal(GTK_WINDOW(*DialogWindow), FALSE);
22243 gtk_window_set_wmclass(GTK_WINDOW(*DialogWindow), WmName, WmClass);
22245 gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(*DialogWindow));
22246 - gtk_signal_connect(
22247 - GTK_OBJECT(*DialogWindow),
22248 - "destroy", (GtkSignalFunc) Interface_destroy_window, DialogWindow);
22249 - gtk_signal_connect(
22250 - GTK_OBJECT(GTK_FILE_SELECTION(*DialogWindow)->ok_button),
22251 - "clicked", (GtkSignalFunc) B1CallBack, B1CbData);
22252 - gtk_signal_connect(
22253 - GTK_OBJECT(GTK_FILE_SELECTION (*DialogWindow)->cancel_button),
22254 - "clicked", (GtkSignalFunc) Interface_destroy_window, DialogWindow);
22255 + g_signal_connect(G_OBJECT(*DialogWindow), "destroy",
22256 + G_CALLBACK(Interface_destroy_window), DialogWindow);
22257 + g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(*DialogWindow)->ok_button),
22258 + "clicked", B1CallBack, B1CbData);
22259 + g_signal_connect(G_OBJECT(GTK_FILE_SELECTION (*DialogWindow)->cancel_button),
22260 + "clicked", G_CALLBACK(Interface_destroy_window),
22265 * Get the file URL from the widget and push it to the browser window.
22269 Interface_openfile_ok_callback(GtkWidget *widget, BrowserWindow *bw)
22274 GString *UrlStr = g_string_sized_new(1024);
22276 @@ -909,6 +939,8 @@
22279 gtk_widget_destroy(bw->openfile_dialog_window);
22285 @@ -916,7 +948,7 @@
22286 * The URL is not sent "as is", illegal chars are ripped out,
22287 * then it's fully parsed by a_Url_new().
22289 -void a_Interface_entry_open_url(GtkWidget *widget, BrowserWindow *bw)
22290 +gboolean a_Interface_entry_open_url(GtkWidget *widget, BrowserWindow *bw)
22292 gchar *text, *new_text, *p;
22294 @@ -924,7 +956,7 @@
22296 /* entry = { bw->location | bw->open_dialog_entry } */
22297 entry = GTK_ENTRY(widget == bw->location ? widget : bw->open_dialog_entry);
22298 - text = gtk_entry_get_text(entry);
22299 + text = g_strdup (gtk_entry_get_text(entry));
22301 DEBUG_MSG(1, "entry_open_url %s\n", text);
22303 @@ -948,6 +980,8 @@
22305 if (bw->open_dialog_window != NULL)
22306 gtk_widget_hide(bw->open_dialog_window);
22312 @@ -959,7 +993,7 @@
22313 Interface_make_choose_file_dialog(
22314 &(bw->openfile_dialog_window),
22315 "openfile_dialog", "Dillo", "Dillo: Open File",
22316 - (GtkSignalFunc) Interface_openfile_ok_callback, (void *)bw);
22317 + G_CALLBACK(Interface_openfile_ok_callback), (void *)bw);
22320 if (!GTK_WIDGET_VISIBLE(bw->openfile_dialog_window))
22321 @@ -974,16 +1008,16 @@
22323 Interface_make_dialog(GtkWidget **DialogWindow, char *WmName, char *WmClass,
22324 char *WTitle, GtkWidget **DialogEntry, char *EntryStr,
22325 - char *B1Label, GtkSignalFunc B1CallBack, void *B1CbData)
22326 + char *B1Label, GCallback B1CallBack, void *B1CbData)
22328 GtkWidget *button, *box1, *box2, *entry;
22330 - *DialogWindow = gtk_window_new(GTK_WINDOW_DIALOG);
22331 + *DialogWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
22332 gtk_window_set_wmclass(GTK_WINDOW(*DialogWindow), WmName, WmClass);
22333 gtk_window_set_position(GTK_WINDOW(*DialogWindow), GTK_WIN_POS_CENTER);
22334 gtk_window_set_title(GTK_WINDOW(*DialogWindow), WTitle);
22335 - gtk_signal_connect(GTK_OBJECT(*DialogWindow), "destroy",
22336 - (GtkSignalFunc) Interface_destroy_window, DialogWindow);
22337 + g_signal_connect(G_OBJECT(*DialogWindow), "destroy",
22338 + G_CALLBACK(Interface_destroy_window), DialogWindow);
22340 gtk_container_border_width(GTK_CONTAINER(*DialogWindow), 5);
22342 @@ -999,34 +1033,34 @@
22343 *DialogEntry = GTK_WIDGET(entry);
22344 gtk_widget_show(entry);
22346 - gtk_signal_connect(GTK_OBJECT(entry), "activate", B1CallBack, B1CbData);
22347 + g_signal_connect(G_OBJECT(entry), "activate", B1CallBack, B1CbData);
22349 box2 = gtk_hbox_new(TRUE, 5);
22350 gtk_box_pack_start(GTK_BOX(box1), box2, FALSE, FALSE, 0);
22351 gtk_widget_show(box2);
22353 button = gtk_button_new_with_label(B1Label);
22354 - gtk_signal_connect(GTK_OBJECT(button), "clicked", B1CallBack, B1CbData);
22355 + g_signal_connect(G_OBJECT(button), "clicked", B1CallBack, B1CbData);
22356 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
22357 gtk_box_pack_start(GTK_BOX(box2), button, FALSE, TRUE, 0);
22358 gtk_widget_grab_default(button);
22359 gtk_widget_show(button);
22360 - gtk_signal_connect_object(GTK_OBJECT(entry), "focus_in_event",
22361 - (GtkSignalFunc) gtk_widget_grab_default,
22362 - GTK_OBJECT(button));
22363 + g_signal_connect_object(G_OBJECT(entry), "focus_in_event",
22364 + G_CALLBACK(gtk_widget_grab_default),
22365 + G_OBJECT(button), G_CONNECT_SWAPPED);
22367 button = gtk_button_new_with_label("Clear");
22368 - gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
22369 - (GtkSignalFunc) Interface_entry_clear,
22370 - GTK_OBJECT(entry));
22371 + g_signal_connect_object(G_OBJECT(button), "clicked",
22372 + G_CALLBACK(Interface_entry_clear),
22373 + GTK_OBJECT(entry), G_CONNECT_SWAPPED);
22374 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
22375 gtk_box_pack_start(GTK_BOX(box2), button, FALSE, TRUE, 0);
22376 gtk_widget_show(button);
22378 button = gtk_button_new_with_label("Cancel");
22379 - gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
22380 - (GtkSignalFunc) gtk_widget_destroy,
22381 - GTK_OBJECT(*DialogWindow));
22382 + g_signal_connect_object(G_OBJECT(button), "clicked",
22383 + G_CALLBACK(gtk_widget_destroy),
22384 + G_OBJECT(*DialogWindow), G_CONNECT_SWAPPED);
22385 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
22386 gtk_box_pack_start(GTK_BOX(box2), button, FALSE, TRUE, 0);
22387 gtk_widget_show(button);
22388 @@ -1040,17 +1074,17 @@
22389 static void Interface_make_question_dialog(
22390 GtkWidget **DialogWindow, char *WmName, char *WmClass,
22391 char *WTitle, char *Question,
22392 - GtkSignalFunc OkCallback, void *OkCbData,
22393 - GtkSignalFunc CancelCallback, void *CancelCbData)
22394 + GCallback OkCallback, void *OkCbData,
22395 + GCallback CancelCallback, void *CancelCbData)
22397 GtkWidget *frame, *label, *button, *box1, *box2;
22399 - *DialogWindow = gtk_window_new(GTK_WINDOW_DIALOG);
22400 + *DialogWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
22401 gtk_window_set_wmclass(GTK_WINDOW(*DialogWindow), WmName, WmClass);
22402 gtk_window_set_title(GTK_WINDOW(*DialogWindow), WTitle);
22403 gtk_container_border_width(GTK_CONTAINER(*DialogWindow), 10);
22404 - gtk_signal_connect(GTK_OBJECT(*DialogWindow), "destroy",
22405 - (GtkSignalFunc) Interface_destroy_window, DialogWindow);
22406 + g_signal_connect(G_OBJECT(*DialogWindow), "destroy",
22407 + G_CALLBACK(Interface_destroy_window), DialogWindow);
22409 box1 = gtk_vbox_new(FALSE, 5);
22410 frame = gtk_frame_new(NULL);
22411 @@ -1065,17 +1099,17 @@
22413 box2 = gtk_hbox_new(TRUE, 5);
22414 button = gtk_button_new_with_label("OK");
22415 - gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
22416 - OkCallback, OkCbData);
22417 - gtk_signal_connect(GTK_OBJECT(button), "clicked",
22418 - (GtkSignalFunc) Interface_destroy_window, DialogWindow);
22419 + g_signal_connect(G_OBJECT(button), "clicked",
22420 + OkCallback, OkCbData);
22421 + g_signal_connect(G_OBJECT(button), "clicked",
22422 + G_CALLBACK(Interface_destroy_window), DialogWindow);
22423 gtk_widget_show(button);
22424 gtk_box_pack_start(GTK_BOX(box2), button, FALSE, TRUE, 0);
22425 button = gtk_button_new_with_label("Cancel");
22426 - gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
22427 - CancelCallback, CancelCbData);
22428 - gtk_signal_connect(GTK_OBJECT(button), "clicked",
22429 - (GtkSignalFunc) Interface_destroy_window, DialogWindow);
22430 + g_signal_connect(G_OBJECT(button), "clicked",
22431 + CancelCallback, CancelCbData);
22432 + g_signal_connect(G_OBJECT(button), "clicked",
22433 + G_CALLBACK(Interface_destroy_window), DialogWindow);
22434 gtk_widget_show(button);
22435 gtk_box_pack_start(GTK_BOX(box2), button, FALSE, TRUE, 0);
22436 gtk_box_pack_start(GTK_BOX(box1), box2, FALSE, FALSE, 0);
22437 @@ -1092,8 +1126,8 @@
22439 void a_Interface_question_dialog(
22440 BrowserWindow *bw, gchar *QuestionTxt,
22441 - GtkSignalFunc OkCallback, void *OkCbData,
22442 - GtkSignalFunc CancelCallback, void *CancelCbData)
22443 + GCallback OkCallback, void *OkCbData,
22444 + GCallback CancelCallback, void *CancelCbData)
22446 if (!bw->question_dialog_window) {
22447 Interface_make_question_dialog(&(bw->question_dialog_window),
22448 @@ -1113,7 +1147,7 @@
22449 Interface_make_dialog(&(bw->open_dialog_window),
22450 "open_dialog", "Dillo", "Dillo: Open URL",
22451 &(bw->open_dialog_entry), "",
22452 - "OK", (GtkSignalFunc) a_Interface_entry_open_url, (void *)bw);
22453 + "OK", G_CALLBACK(a_Interface_entry_open_url), (void *)bw);
22454 if (prefs.transient_dialogs)
22455 gtk_window_set_transient_for(GTK_WINDOW(bw->open_dialog_window),
22456 GTK_WINDOW(bw->main_window));
22457 @@ -1151,7 +1185,7 @@
22459 * Save current page to a local file
22461 -static void Interface_file_save_url(GtkWidget *widget, BrowserWindow *bw)
22462 +static gboolean Interface_file_save_url(GtkWidget *widget, BrowserWindow *bw)
22465 GtkFileSelection *choosefile;
22466 @@ -1175,6 +1209,8 @@
22469 gtk_widget_destroy(bw->save_dialog_window);
22475 @@ -1226,7 +1262,7 @@
22476 Interface_make_choose_file_dialog(
22477 &bw->save_dialog_window,
22478 "save_dialog", "Dillo", "Dillo: Save URL as File...",
22479 - (GtkSignalFunc) Interface_file_save_url, (void *)bw );
22480 + G_CALLBACK(Interface_file_save_url), (void *)bw );
22482 url = a_Url_new(a_Interface_get_location_text(bw), NULL, 0, 0);
22483 SuggestedName = Interface_make_save_name(url);
22484 @@ -1253,7 +1289,7 @@
22485 &bw->save_link_dialog_window,
22486 "save_link_dialog", "Dillo",
22487 "Dillo: Save link as File...",
22488 - (GtkSignalFunc) Interface_file_save_link,
22489 + G_CALLBACK(Interface_file_save_link),
22492 SuggestedName = Interface_make_save_name(a_Menu_popup_get_url(bw));
22493 @@ -1270,7 +1306,7 @@
22495 * Scroll to an occurence of a string in the open page
22497 -static void Interface_entry_search(GtkWidget *widget, BrowserWindow* bw)
22498 +static gboolean Interface_entry_search(GtkWidget *widget, BrowserWindow* bw)
22502 @@ -1281,6 +1317,8 @@
22503 a_Dw_container_findtext(DW_CONTAINER (Dw),
22504 &bw->findtext_data, NULL, string);
22511 @@ -1292,7 +1330,7 @@
22512 Interface_make_dialog(&(bw->findtext_dialog_window),
22513 "findtext_dialog", "Dillo", "Dillo: Find text in page",
22514 &(bw->findtext_dialog_entry), "",
22515 - "Find", (GtkSignalFunc) Interface_entry_search, (void *)bw);
22516 + "Find", G_CALLBACK(Interface_entry_search), (void *)bw);
22517 if (prefs.transient_dialogs)
22518 gtk_window_set_transient_for(GTK_WINDOW(bw->findtext_dialog_window),
22519 GTK_WINDOW(bw->main_window));
22520 @@ -1303,31 +1341,3 @@
22522 gdk_window_raise(bw->findtext_dialog_window->window);
22526 - * This signal callback adjusts the position of a menu.
22527 - * It's useful for very long menus.
22529 -void a_Interface_scroll_popup(GtkWidget *widget)
22533 - * 1) Scrolling menues should rather be the task of Gtk+. This is
22534 - * a hack, and I don't know if it does not break anything.
22535 - * 2) It could be improved, e.g. a timeout could be added for
22536 - * better mouse navigation.
22538 - int y, h, mx, my, sh;
22540 - y = widget->allocation.y;
22541 - h = widget->allocation.height;
22542 - gdk_window_get_geometry (widget->parent->parent->window,
22543 - &mx, &my, NULL, NULL, NULL);
22544 - sh = gdk_screen_height ();
22547 - gdk_window_move (widget->parent->parent->window, mx, - y + 1);
22548 - else if (y + my > sh - h)
22549 - gdk_window_move (widget->parent->parent->window, mx, sh - h - y - 1);
22552 diff -urN dillo-0.6.6/src/interface.h dillo2-0.6.6/src/interface.h
22553 --- dillo-0.6.6/src/interface.h 2002-01-10 11:59:42.000000000 -0700
22554 +++ dillo2-0.6.6/src/interface.h 2003-04-21 12:36:20.000000000 -0600
22555 @@ -26,14 +26,12 @@
22556 void a_Interface_set_location_text(BrowserWindow *bw, char *text);
22557 gchar *a_Interface_get_location_text(BrowserWindow *bw);
22558 void a_Interface_reset_progress_bars(BrowserWindow *bw);
22559 -void a_Interface_entry_open_url(GtkWidget *widget, BrowserWindow *bw);
22560 +gboolean a_Interface_entry_open_url(GtkWidget *widget, BrowserWindow *bw);
22561 void a_Interface_set_cursor(BrowserWindow *bw, GdkCursorType CursorType);
22562 BrowserWindow *a_Interface_browser_window_new(gint width, gint height);
22564 void a_Interface_set_button_sens(BrowserWindow *bw);
22566 -void a_Interface_scroll_popup(GtkWidget *widget);
22568 void a_Interface_question_dialog(
22569 BrowserWindow *bw, gchar *QuestionTxt,
22570 GtkSignalFunc OkCallback, void *OkCbData,
22571 diff -urN dillo-0.6.6/src/menu.c dillo2-0.6.6/src/menu.c
22572 --- dillo-0.6.6/src/menu.c 2002-04-09 19:04:54.000000000 -0600
22573 +++ dillo2-0.6.6/src/menu.c 2003-04-21 12:36:22.000000000 -0600
22575 menu = gtk_menu_new();
22576 menuitem = gtk_menu_item_new_with_label((char *) name);
22577 tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(menuitem)->child), name);
22578 - gtk_widget_add_accelerator(menuitem, "activate_item", bw->accel_group,
22579 - tmp_key, GDK_MOD1_MASK, 0);
22580 + //gtk_widget_add_accelerator(menuitem, "activate-item", bw->accel_group,
22581 + // tmp_key, GDK_MOD1_MASK, 0);
22583 if ( right_justify )
22584 gtk_menu_item_right_justify(GTK_MENU_ITEM(menuitem));
22585 @@ -73,17 +73,17 @@
22586 void (*callback) (GtkWidget *widget, void *data), void *data)
22588 GtkWidget *menuitem;
22589 - GtkAccelGroup *menu_accels;
22590 + //GtkAccelGroup *menu_accels;
22591 GdkModifierType accel_mods;
22595 menuitem = gtk_menu_item_new_with_label((char *) name);
22596 gtk_menu_append(GTK_MENU(menu), menuitem);
22597 - menu_accels = gtk_menu_ensure_uline_accel_group(GTK_MENU(menu));
22598 + //menu_accels = gtk_menu_ensure_uline_accel_group(GTK_MENU(menu));
22599 tmp_key = gtk_label_parse_uline(GTK_LABEL(GTK_BIN(menuitem)->child), name);
22600 - gtk_widget_add_accelerator(menuitem, "activate_item",
22601 - menu_accels, tmp_key, 0, 0);
22602 + //gtk_widget_add_accelerator(menuitem, "activate_item",
22603 + // menu_accels, tmp_key, 0, 0);
22604 gtk_widget_show(menuitem);
22606 if (accel != NULL) {
22608 accel_key, (guint)accel_mods, GTK_ACCEL_VISIBLE);
22610 if (callback != NULL)
22611 - gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
22612 - (GtkSignalFunc) callback, data);
22613 + g_signal_connect(G_OBJECT(menuitem), "activate",
22614 + G_CALLBACK(callback), data);
22618 @@ -265,21 +265,15 @@
22620 menu_item = Menu_add(menu, text->str, NULL, bw, NULL, NULL);
22621 /* attach the nav_stack index to the menu item */
22622 - gtk_object_set_data(GTK_OBJECT (menu_item), "nav_idx",
22623 - GINT_TO_POINTER(i));
22624 + g_object_set_data(G_OBJECT (menu_item), "nav_idx",
22625 + GINT_TO_POINTER(i));
22627 - gtk_signal_connect (
22628 - GTK_OBJECT (menu_item), "select",
22629 - GTK_SIGNAL_FUNC (a_Interface_scroll_popup), NULL);
22630 - gtk_signal_connect (
22631 - GTK_OBJECT (menu_item), "select",
22632 - GTK_SIGNAL_FUNC (a_Menu_popup_history_select_callback), bw);
22633 - gtk_signal_connect (
22634 - GTK_OBJECT (menu_item), "deselect",
22635 - GTK_SIGNAL_FUNC (a_Menu_popup_history_deselect_callback), bw);
22636 - gtk_signal_connect (
22637 - GTK_OBJECT (menu_item), "button-press-event",
22638 - GTK_SIGNAL_FUNC (a_Commands_historypress_callback), bw);
22639 + g_signal_connect (G_OBJECT(menu_item), "select",
22640 + G_CALLBACK(a_Menu_popup_history_select_callback), bw);
22641 + g_signal_connect (G_OBJECT(menu_item), "deselect",
22642 + G_CALLBACK(a_Menu_popup_history_deselect_callback), bw);
22643 + g_signal_connect (G_OBJECT(menu_item), "button-press-event",
22644 + G_CALLBACK(a_Commands_historypress_callback), bw);
22647 g_string_free(text, TRUE);
22648 @@ -305,11 +299,11 @@
22650 copy = Menu_add(menu, "Copy Link location", NULL, bw,
22651 a_Commands_set_selection_callback, bw);
22652 - gtk_signal_connect(GTK_OBJECT(copy), "selection_clear_event",
22653 + g_signal_connect(G_OBJECT(copy), "selection_clear_event",
22654 GTK_SIGNAL_FUNC(a_Commands_clear_selection_callback), NULL);
22655 gtk_selection_add_target(copy, GDK_SELECTION_PRIMARY,
22656 GDK_SELECTION_TYPE_STRING, 1);
22657 - gtk_signal_connect(GTK_OBJECT(copy), "selection_get",
22658 + g_signal_connect(G_OBJECT(copy), "selection_get",
22659 GTK_SIGNAL_FUNC(a_Commands_give_selection_callback), NULL);
22662 @@ -351,11 +345,6 @@
22664 gtk_menu_item_set_submenu(GTK_MENU_ITEM(bw->pagemarks_menuitem),
22665 bw->pagemarks_menu);
22667 - /* todo: add a scroller so one can access all menu entries,
22668 - * even if there's a lot of pagemarks. */
22669 - /* --EG: I haven't found a way to pass a scroller
22670 - * as widget for the submenu */
22674 @@ -374,8 +363,6 @@
22675 Menu_pagemarks_goto_pagemark, bw);
22676 sprintf(anchor, "#%ld", (glong)(bw->pagemarks_last));
22677 a_Dw_page_add_anchor(page, anchor, style);
22678 - gtk_signal_connect (GTK_OBJECT (bw->pagemarks_last), "select",
22679 - GTK_SIGNAL_FUNC (a_Interface_scroll_popup), NULL);
22680 sprintf(name, "dilloHeading%d", level);
22681 gtk_widget_set_name(bw->pagemarks_last, name);
22683 @@ -398,8 +385,10 @@
22684 g_string_truncate(text, 64);
22685 g_string_append(text, "...");
22688 gtk_label_set_text(GTK_LABEL (child), text->str);
22689 - g_string_free(text, 1);
22690 + g_string_free(text, TRUE);
22692 bw->pagemarks_last = NULL;
22695 diff -urN dillo-0.6.6/src/misc.c dillo2-0.6.6/src/misc.c
22696 --- dillo-0.6.6/src/misc.c 2002-03-20 09:38:43.000000000 -0700
22697 +++ dillo2-0.6.6/src/misc.c 2003-04-21 12:36:22.000000000 -0600
22703 + * UTF-8 aware implementation of strcspn.
22704 + * Returns the number of bytes that doesn't contain any of the ASCII
22705 + * characters in reject.
22707 +size_t a_Misc_strcspn(const char *str, const char *reject)
22709 + char *p = (char *) str;
22713 + len = strlen(reject);
22716 + c = g_utf8_get_char(p);
22718 + for (i = 0; i < len; i++)
22719 + if (c == reject[i])
22722 + p = g_utf8_next_char(p);
22727 diff -urN dillo-0.6.6/src/misc.h dillo2-0.6.6/src/misc.h
22728 --- dillo-0.6.6/src/misc.h 2002-03-20 09:38:43.000000000 -0700
22729 +++ dillo2-0.6.6/src/misc.h 2003-04-21 12:36:22.000000000 -0600
22731 char *a_Misc_stristr(char *src, char *str);
22732 char *a_Misc_expand_tabs(const char *str);
22733 gchar *a_Misc_strsep(char **orig, const char *delim);
22734 +size_t a_Misc_strcspn(const char *str, const char *reject);
22736 #define d_strsep a_Misc_strsep
22737 +#define d_strcspn a_Misc_strcspn
22739 #endif /* __MISC_H__ */
22741 diff -urN dillo-0.6.6/src/nav.c dillo2-0.6.6/src/nav.c
22742 --- dillo-0.6.6/src/nav.c 2002-04-09 19:10:16.000000000 -0600
22743 +++ dillo2-0.6.6/src/nav.c 2003-04-21 12:36:23.000000000 -0600
22744 @@ -343,7 +343,7 @@
22746 * Callback for reload confirmation
22748 -static void Nav_reload_confirmed(BrowserWindow *bw)
22749 +static gboolean Nav_reload_confirmed(BrowserWindow *bw)
22751 DEBUG_MSG(3, "Nav_reload_confirmed\n");
22752 if ( a_Nav_stack_size(bw) &&
22753 @@ -353,15 +353,17 @@
22754 bw->question_dialog_data = NULL;
22761 * Callback for reload refusal
22763 -static void Nav_reload_refused(BrowserWindow *bw)
22764 +static gboolean Nav_reload_refused(BrowserWindow *bw)
22766 DEBUG_MSG(3, "Nav_reload_refused\n");
22767 bw->question_dialog_data = NULL;
22772 @@ -397,12 +399,11 @@
22773 /* Attempt to repost data, let's confirm... */
22774 bw->question_dialog_data = (gpointer)url;
22775 a_Interface_question_dialog(bw, "Repost form data?",
22776 - Nav_reload_confirmed, bw,
22777 - Nav_reload_refused, bw);
22778 + G_CALLBACK(Nav_reload_confirmed), bw,
22779 + G_CALLBACK(Nav_reload_refused), bw);
22787 diff -urN dillo-0.6.6/src/pixmaps.h dillo2-0.6.6/src/pixmaps.h
22788 --- dillo-0.6.6/src/pixmaps.h 2002-01-15 07:52:16.000000000 -0700
22789 +++ dillo2-0.6.6/src/pixmaps.h 2003-04-21 12:36:24.000000000 -0600
22790 @@ -44,337 +44,429 @@
22793 static char * left_xpm[] = {
22796 -". c #000000000000",
22797 -"X c #9658A289BEFB",
22798 -"O c #FFFF9A690000",
22799 -"+ c #FFFFFFFF0000",
22800 -"@ c #FFFFFFFFFFFF",
22807 -" .XXXXX........ +OO+O ",
22808 -" .XXXXXXXXXXXXX. +OO+O ",
22809 -" .XXXXXXXXXXXXXX. +OO+O ",
22810 -" .XXXXXXXXXXXXXXX. +OO+O ",
22811 -" .XXXXXXXXXXXXXXX. +OO+O ",
22812 -" .XXXXXXXXXXXXXX. +OO+O ",
22813 -" .XXXXXXXXXXXXX. +OO+O ",
22814 -" .XXXXX........ +OO+O ",
22839 +" .*%%%%%%%%%#. ",
22840 +" .*%%%%%%%%%%@. ",
22841 +" +*%%%%%%%%%%%@. ",
22842 +" .#$#$$#$$$#$$$@. ",
22843 +" .&@@@@@@@@@@@&. ",
22844 +" .&@@@@@@@@@@&. ",
22845 +" .&@@&&&&&&&&. ",
22857 static char * right_xpm[] = {
22860 -". c #000000000000",
22861 -"X c #9658A289BEFB",
22862 -"O c #FFFF9A690000",
22863 -"+ c #FFFFFFFF0000",
22864 -"@ c #FFFFFFFFFFFF",
22871 -" O+OO+ ........XXXXX. ",
22872 -" O+OO+ .XXXXXXXXXXXXX. ",
22873 -" O+OO+ .XXXXXXXXXXXXXX. ",
22874 -" O+OO+ .XXXXXXXXXXXXXXX. ",
22875 -" O+OO+ .XXXXXXXXXXXXXXX. ",
22876 -" O+OO+ .XXXXXXXXXXXXXX. ",
22877 -" O+OO+ .XXXXXXXXXXXXX. ",
22878 -" O+OO+ ........XXXXX. ",
22903 +" .@@@@@@@@@@$+ ",
22904 +" .@@@@@@@@@@@$. ",
22905 +" .*@@@@@@@@*@@$. ",
22906 +" .$$$$$$$$$$&$$%. ",
22907 +" .&&#&#&#&&&&&%. ",
22908 +" .&&&&&&&&#&#%. ",
22909 +" .&######&&&%. ",
22921 static char * reload_xpm[] = {
22924 -". c #000000000000",
22925 -"X c #9658A289BEFB",
22926 -"O c #FFFF9A690000",
22927 -"+ c #FFFFFFFF0000",
22928 -"@ c #FFFFFFFFFFFF",
22931 -" ....X. .OOOO. ",
22932 -" .XXXXXX. .OOOOO. ",
22933 -" .XXXXXXXX....OOO. ",
22934 -" .XXXXXXXX. .OOO. ",
22935 -" .XXX...X. ...OOO... ",
22936 -" .XXX. .. .OOOOO. ",
22937 -" ..... . .OOO. ",
22940 -" .OOO. . ..... ",
22941 -" .OOOOO. .. .XXX. ",
22942 -" ...OOO... .X...XXX. ",
22943 -" .OOO. .XXXXXXXX. ",
22944 -" .OOO....XXXXXXXX. ",
22945 -" .OOOOO. .XXXXXX. ",
22946 -" .OOOO. .X.... ",
22964 +" +#********. .#&. ",
22965 +" .@**********. .#&. ",
22966 +" $%*#@@@###&. .%. ",
22967 +".#*@@@@@@@&. .%&. ",
22968 +".%%&&...&&. . .*@. ",
22969 +".*@&. .&. .. .%#. ",
22970 +".*&. .. .*. .%*@. ",
22971 +".#@. . .**...%*%@. ",
22972 +".&#. .********@&. ",
22973 +" .%. .%******%#@$. ",
22974 +" .&#. .%*******#@&. ",
22975 +" .&@. .@@#@@@@&&.. ",
22976 +" .. .@&@&&&&.. ",
22985 static char * home_xpm[] = {
22988 -". c #000000000000",
22989 -"X c #9658A289BEFB",
22990 -"O c #FFFF9A690000",
22991 -"+ c #FFFFFFFF0000",
22992 -"z c #0000FFFFFFFF",
22993 -"@ c #FFFFFFFFFFFF",
22994 -"I c #FFFF00000000",
22995 -"# c #FFFF0000FFFF",
23003 -" .............. ",
23004 -" ................ ",
23005 -" .....zzzzzzzz..... ",
23012 -" X .OOO.I#@.OO. ",
23013 -" XXXX.OOO.I#@.OO. XXX ",
23014 -" XXXXXX.OOO.I#@.OO.XXXXXX ",
23015 -"XXXXXXX............XXXXXXX"};
23032 +" ...%#+#++*%.. ",
23033 +" ..%@@+@*+*+#.. ",
23034 +" ..#@+@*+*+*+*%.. ",
23035 +" ..+++*+*+*+*+**#.. ",
23036 +" ..+++++++++.....##.. ",
23037 +" ....********.@+*.#.... ",
23038 +" .+*.....*.+**.%. ",
23039 +" .+*.@#&.*.+**.%. ",
23040 +" .#*.@$$.*.....%. ",
23041 +" ..*.@$..+@%%##.. ",
23042 +" ..*.@$$.*****+. ",
23043 +" .+.@$&.+++++#. ",
23044 +" .@.$$$.*****@. ",
23045 +" .................... . ",
23046 +" .@#@##%%%..###%%%. ",
23047 +" .. ......... ...... ",
23052 static char * save_xpm[] = {
23055 -". c #000000000000",
23056 -"X c #9658A289BEFB",
23057 -"O c #FFFF9A690000",
23058 -"+ c #FFFFFFFF0000",
23059 -"@ c #FFFFFFFFFFFF",
23061 -" .................... ",
23062 -" .XXXXXXXXXXXXXXXXXX. ",
23063 -" ...XXXXXXXXXXXXXXXX. ",
23064 -" .XX..............XX. ",
23065 -" .XX.@@@@@@@@@@@@.XX. ",
23066 -" .XX..............XX. ",
23067 -" .XX.@@@@@@@@@@@@.XX. ",
23068 -" .XX..............XX. ",
23069 -" .XX.@@@@@@@@@@@@.XX. ",
23070 -" .XX..............XX. ",
23071 -" .XXXXXXXXXXXXXXXXXX. ",
23072 -" .XXXXXXXXXXXXXXXXXX. ",
23073 -" .XXX...........XXXX. ",
23074 -" .XXX.OOOOOOOOOO.XXX. ",
23075 -" .XXX.O....OOOOO.XXX. ",
23076 -" .XXX.O. .OOOOO.XXX. ",
23077 -" .XXX.O. .OOOOO.XXX. ",
23078 -" .XXX.O. .OOOOO.XXX. ",
23079 -" .................. "};
23091 +" ................... ",
23092 +" .##+#######$##$##+#@. ",
23093 +" .#@+$$$&$$$$$$&&&+@+. ",
23094 +" .#@+$$&$$$&$&&&&&*@+. ",
23095 +" .#@+%%%%%%%%%%%%%+@+. ",
23096 +" .#@+%%%%%%%%%%%%%+@*. ",
23097 +" .#@+#############+@+. ",
23098 +" .#@+%%%%%%%%%%%%%+@*. ",
23099 +" .#@+%%%%%%%%%%%%%+@*. ",
23100 +" .#@+#############+@+. ",
23101 +" .#@+%%%%%%%%%%%%%+@*. ",
23102 +" .#@+++++++++++++++@*. ",
23103 +" .@@@@@@@@@@@@@@@@@@*. ",
23104 +" .#@+@**++++++++**@@*. ",
23105 +" .@@+*@#%#%%##@@+*+#*. ",
23106 +" .#+@*#%+**###@#*++@*. ",
23107 +" .#@+*#%+**#####*++#*. ",
23108 +" .@+@*#%***#@##%*++@*. ",
23109 +" .+@+*##***##%%%*++@*. ",
23110 +" .+++@#@####%#@*+*#*. ",
23111 +" .................. ",
23116 static char * stop_xpm[] = {
23119 -". c #000000000000",
23120 -"X c #9658A289BEFB",
23121 -"O c #FFFF9A690000",
23122 -"+ c #FFFFFFFF0000",
23123 -"@ c #FFFFFFFFFFFF",
23128 -" .XXXX.OO.XXXX. ",
23129 -" .XXXXX.OO.XXXXX. ",
23130 -" .XXXXXX.OO.XXXXXX. ",
23131 -" .XXXXXX.OO.XXXXXX. ",
23132 -" .XXXXXX.OO.XXXXXX. ",
23133 -" .XXXXXX.OO.XXXXXX. ",
23134 -" .XXXXXX.OO.XXXXXX. ",
23135 -" .XXXXXXX..XXXXXXX. ",
23136 -" .XXXXXXXXXXXXXXXX. ",
23137 -" .XXXXXXX..XXXXXXX. ",
23138 -" .XXXXX.OO.XXXXX. ",
23139 -" .XXXX.OO.XXXX. ",
23157 +" .&%%%*****&&$. ",
23158 +" .&%******&*&*&&. ",
23159 +" .&%%********&&&&$. ",
23160 +" $%********&&&&&&&$ ",
23161 +" @*%**&%&&**&%%&&&&&. ",
23162 +" &%***%++#&*%#+#*&&&$ ",
23163 +" .%****%+++#%+++#*&&&$. ",
23164 +" .%****&%++++++#*%&&$&. ",
23165 +" @%&*****%++++#%&&&&&$. ",
23166 +" @***&***%++++#*&&&&$$@ ",
23167 +" .%&&*&&%++++++#&&&&&$. ",
23168 +" .&&&&&%+++##+++#&&$$$. ",
23169 +" &&&&$%++#**#++#&&&$@ ",
23170 +" .*&&&$%#&&&&%#&&&$$@ ",
23171 +" $%&&&&*&&&&*&&&$$@ ",
23172 +" .$*&&&&&&&&&&&$$$. ",
23173 +" .$&&&&&&&$&$$$$. ",
23174 +" .$$&$&$&$$$$@. ",
23179 /* Small icons here */
23182 static char * s_left_xpm[] = {
23185 -". c #000000000000",
23186 -"X c #9658A289BEFB",
23187 -"o c #FFFF9A690000",
23188 -"O c #FFFFFFFF0000",
23193 -" .XXX...... oOo",
23194 -" .XXXXXXXXX. oOo",
23195 -" .XXXXXXXXXX. oOo",
23196 -".XXXXXXXXXXX. oOo",
23197 -" .XXXXXXXXXX. oOo",
23198 -" .XXXXXXXXX. oOo",
23199 -" .XXX...... oOo",
23221 +" &%+++++++++*. ",
23232 static char * s_right_xpm[] = {
23235 -". c #000000000000",
23236 -"X c #9658A289BEFB",
23237 -"o c #FFFF9A690000",
23238 -"O c #FFFFFFFF0000",
23243 -"oOo ......XXX. ",
23244 -"oOo .XXXXXXXXX. ",
23245 -"oOo .XXXXXXXXXX. ",
23246 -"oOo .XXXXXXXXXXX.",
23247 -"oOo .XXXXXXXXXX. ",
23248 -"oOo .XXXXXXXXX. ",
23249 -"oOo ......XXX. ",
23271 +" .**********#. ",
23282 static char * s_home_xpm[] = {
23285 -". c #9658A289BEFB",
23286 -"X c #000000000000",
23287 -"o c #FFFF0000FFFF",
23288 -"O c #FFFF9A690000",
23289 -"+ c #FFFF00000000",
23290 -"@ c #FFFFFFFFFFFF",
23297 -" XXXXXXXXXXXXX ",
23304 -" ...XOOXo@XOX....",
23305 -"....XXXXXXXXX...."};
23323 +" ...+++++*%*... ",
23329 +" %%##%%*.#%%*# ",
23330 +" %..#%#%# #%#% ",
23334 static char * s_reload_xpm[] = {
23337 -". c #000000000000",
23338 -"X c #9658A289BEFB",
23339 -"o c #FFFF9A690000",
23343 -" .XXXXXX. .oo. ",
23345 -" .XX. . .oooo. ",
23349 -" .oooo. . .XX. ",
23351 -" .oo. .XXXXXX. ",
23383 static char * s_save_xpm[] = {
23386 -". c #000000000000",
23387 -"X c #9658A289BEFB",
23388 -"o c #FFFFFFFFFFFF",
23389 -"O c #FFFF9A690000",
23390 -" ............... ",
23391 -" ..XXXXXXXXXXXX. ",
23392 -" .X...........X. ",
23393 -" .X.ooooooooo.X. ",
23394 -" .X...........X. ",
23395 -" .X.ooooooooo.X. ",
23396 -" .X...........X. ",
23397 -" .XXXXXXXXXXXXX. ",
23398 -" .XXXXXXXXXXXXX. ",
23399 -" .XX........XXX. ",
23400 -" .XX.OOOOOOO.XX. ",
23401 -" .XX.O...OOO.XX. ",
23402 -" .XX.O. .OOO.XX. ",
23403 -" ............. ",
23415 +" .............. ",
23416 +".&$**********$$.",
23417 +".$#%%%%%%%%%%#+.",
23418 +".$#$&&&&&&&&&#+.",
23419 +".$#$$$$$$$$$&@+.",
23420 +".$#$&&&&&&&$&#+.",
23421 +".$#$$$$$$#$#&@+.",
23422 +".$@&&&&&$&&$&@+.",
23423 +".$##$$#$$#$$#@+.",
23424 +".$###@@@@@@@@#+.",
23425 +".$#@#$#$&$@+@@+.",
23426 +".$#@$$.+$#$.+#+.",
23427 +".$#@#$++$$#++#+.",
23428 +".@@@$&.@#$#.@#+.",
23429 +" .++###@@+@++@+.",
23430 +" ............. "};
23433 static char * s_stop_xpm[] = {
23436 -". c #000000000000",
23437 -"X c #9658A289BEFB",
23438 -"o c #FFFF9A690000",
23443 -" .XXXX.o.XXXX. ",
23444 -" .XXXX.o.XXXX. ",
23445 -" .XXXX.o.XXXX. ",
23446 -" .XXXX.o.XXXX. ",
23447 -" .XXXXX.XXXXX. ",
23448 -" .XXXXXXXXXXX. ",
23449 -" .XXXXX.XXXXX. ",
23469 +" .&&&++&&#+&&%. ",
23470 +" .&&&++++++&&%. ",
23471 +" @&&&&++++&&&&. ",
23472 +" .&&&&++++&&&%. ",
23473 +" @&&&++##++&&%. ",
23474 +" .%&&$#&&++&&@@ ",
23482 static char * s_new_xpm[] = {
23485 -"X c #9658A289BEFB",
23509 +" .&&&&&&&#@@+. ",
23510 +" .&&&&&&&%*++. ",
23511 +" .&&&&&&&&&%$. ",
23512 +" .&&&&&&%&&&$. ",
23513 +" .&&&&%&&&&%$. ",
23514 +" .&&&&%&%%&&#. ",
23515 +" .&&%%%%&%%%$. ",
23516 +" .&&&&&%%&%%$. ",
23517 +" .&%%%%%&%%%#. ",
23518 +" .&&%%&%%%%%#. ",
23519 +" .&%%%%%%%%%#. ",
23520 +" .$$$###$###*. ",
23523 #endif /* __BITVEC_H__ */
23524 diff -urN dillo-0.6.6/src/pixmaps_old.h dillo2-0.6.6/src/pixmaps_old.h
23525 --- dillo-0.6.6/src/pixmaps_old.h 1969-12-31 17:00:00.000000000 -0700
23526 +++ dillo2-0.6.6/src/pixmaps_old.h 2003-04-21 12:36:24.000000000 -0600
23529 +static char * home_xpm[] = {
23542 +" +@#########+. ",
23543 +" +@###########+. ",
23544 +" +@#############+. ",
23545 +" @@#############@@ ",
23546 +" @###########. ",
23547 +" @###########. ",
23548 +" @####@@.####. ",
23549 +" @###@##+.###. ",
23550 +" @###@##+.###. ",
23551 +" @###@##+.###. ",
23552 +" @###@##+.###. ",
23553 +" @###@##+.###. ",
23554 +" @####@@@####. ",
23555 +" @@@@@@@@@@@+ "};
23557 +static char * leftarrow_xpm[] = {
23569 +" .+####+++++++ .....+ ...+",
23570 +" .+###########@ .####@ .##@",
23571 +" .+############@ .####@ .##@",
23572 +" .+#############@ .####@ .##@",
23573 +".+##############@ .####@ .##@",
23574 +"+.##############@ .####@ .##@",
23575 +" +.#############@ .####@ .##@",
23576 +" +.############@ .####@ .##@",
23577 +" +.###########@ .####@ .##@",
23578 +" +.####@@@@@@@ +@@@@@ +@@@",
23585 +static char * reload_xpm[] = {
23594 +" ....@+ +###@. ",
23595 +" .@@@@##+ +####@. ",
23596 +" .@#######++++##@. ",
23597 +" .@#######+ +##@. ",
23598 +" .@##+++#+ +++##@... ",
23599 +" .@##+ ++ +####@+ ",
23600 +" .++++ + +###+ ",
23603 +" +###+ + ++++. ",
23604 +" +@####+ ++ +##@. ",
23605 +" ...@##+++ +#+++##@. ",
23606 +" .@##+ +#######@. ",
23607 +" .@##++++#######@. ",
23608 +" .@####+ +#@@@@@. ",
23609 +" .@###+ +@.... ",
23613 +static char *rghtarrow_xpm[] = {
23625 +"...+ .....+ .......@@@@.+ ",
23626 +".@@$ .@@@@$ .@@@@@@@@@@@.+ ",
23627 +".@@$ .@@@@$ .@@@@@@@@@@@@.+ ",
23628 +".@@$ .@@@@$ .@@@@@@@@@@@@@.+ ",
23629 +".@@$ .@@@@$ .@@@@@@@@@@@@@@.+",
23630 +".@@$ .@@@@$ .@@@@@@@@@@@@@@+$",
23631 +".@@$ .@@@@$ .@@@@@@@@@@@@@+$ ",
23632 +".@@$ .@@@@$ .@@@@@@@@@@@@+$ ",
23633 +".@@$ .@@@@$ .@@@@@@@@@@@+$ ",
23634 +"+$$$ +$$$$$ +$$$$$$@@@@+$ ",
23641 +static char * stop_xpm[] = {
23650 +" +@@@@@..@@@@@. ",
23651 +" +@@@@@....@@@@@. ",
23652 +" +@@@@@@....@@@@@@. ",
23653 +" +@@@@@@@....@@@@@@@. ",
23654 +" +@@@@@@@....@@@@@@@. ",
23655 +" +@@@@@@@....@@@@@@@. ",
23656 +" +@@@@@@@....@@@@@@@. ",
23657 +" +@@@@@@@....@@@@@@@. ",
23658 +" +@@@@@@@....@@@@@@@. ",
23659 +" +@@@@@@@....@@@@@@@. ",
23660 +" +@@@@@@@@..@@@@@@@@. ",
23661 +" +@@@@@@@@@@@@@@@@. ",
23662 +" +@@@@@@..@@@@@@. ",
23663 +" +@@@@....@@@@. ",
23668 +static char * save_xpm[] = {
23674 +" ................... ",
23675 +" @@@@@@@@@@@@@@@@@@@+ ",
23676 +" @..@@@@@@@@@@@@@@@@+ ",
23677 +" @@@@++++++++++++@@@+ ",
23678 +" @@@@############@@@+ ",
23679 +" @@@@++++++++++++@@@+ ",
23680 +" @@@@############@@@+ ",
23681 +" @@@@++++++++++++@@@+ ",
23682 +" @@@@############@@@+ ",
23683 +" @@@@++++++++++++@@@+ ",
23684 +" @@@@@@@@@@@@@@@@@@@+ ",
23685 +" @@@@@@@@@@@@@@@@@@@+ ",
23686 +" @@@@@@@@@@@@@@@@@@@+ ",
23687 +" @@@@@##########@@@@+ ",
23688 +" @@@@@#++++#####@@@@+ ",
23689 +" @@@@@#+..+#####@@@@+ ",
23690 +" @@@@@#+..+#####@@@@+ ",
23691 +" @@@@@#+..+#####@@@@+ ",
23692 +" @@@@@@@@@@@@@@@@@@@ ",
23695 diff -urN dillo-0.6.6/src/plain.c dillo2-0.6.6/src/plain.c
23696 --- dillo-0.6.6/src/plain.c 2002-02-26 14:56:40.000000000 -0700
23697 +++ dillo2-0.6.6/src/plain.c 2003-04-21 13:58:57.000000000 -0600
23700 * Popup the page menu ("button_press_event" callback of the viewport)
23702 -static int Plain_page_menu(GtkWidget *viewport, GdkEventButton *event,
23703 +static gboolean Plain_page_menu(GtkWidget *viewport, GdkEventButton *event,
23706 if (event->button == 3) {
23708 //a_Dw_widget_set_style (plain->dw, plain->style);
23710 /* The context menu */
23711 - gtk_signal_connect_while_alive
23712 - (GTK_OBJECT(GTK_BIN(plain->bw->docwin)->child),"button_press_event",
23713 - GTK_SIGNAL_FUNC(Plain_page_menu), (gpointer)plain->bw,
23714 - GTK_OBJECT (page));
23715 + g_signal_connect (GTK_OBJECT(GTK_BIN(plain->bw->docwin)->child),
23716 + "button_press_event", GTK_SIGNAL_FUNC(Plain_page_menu),
23721 @@ -155,8 +154,11 @@
23722 static void Plain_write(DilloPlain *plain, void *Buf, gint BufSize, gint Eof)
23724 DwPage *page = (DwPage *)plain->dw;
23725 + GError *err = NULL;
23729 + char *tabs_expanded;
23730 gint i, len, MaxBytes;
23732 Start = (char*)Buf + plain->Start_Ofs;
23733 @@ -173,7 +175,19 @@
23736 data = g_strndup(Start + i - len, len);
23737 - a_Dw_page_add_text(page, a_Misc_expand_tabs(data), plain->style);
23738 + tabs_expanded = a_Misc_expand_tabs(data);
23739 + utf8_str = g_convert(tabs_expanded, -1, "UTF8", "ISO-8859-1",
23740 + NULL, NULL, &err);
23743 + g_warning("Plain_write(): %s\n", err->message);
23744 + g_error_free(err);
23747 + a_Dw_page_add_text(page, utf8_str, plain->style);
23750 + g_free(tabs_expanded);
23752 a_Dw_page_add_parbreak(page, 0, plain->style);
23753 if ( Start[i] == '\r' && Start[i + 1] == '\n' ) ++i;
23754 @@ -186,7 +200,19 @@
23755 plain->Start_Ofs += i - len;
23756 if ( Eof && len ) {
23757 data = g_strndup(Start + i - len, len);
23758 - a_Dw_page_add_text(page, a_Misc_expand_tabs(data), plain->style);
23759 + tabs_expanded = a_Misc_expand_tabs(data);
23760 + utf8_str = g_convert(tabs_expanded, -1, "UTF8", "ISO-8859-1",
23761 + NULL, NULL, &err);
23764 + g_warning("Plain_write(): %s\n", err->message);
23765 + g_error_free(err);
23768 + a_Dw_page_add_text(page, utf8_str, plain->style);
23771 + g_free(tabs_expanded);
23773 a_Dw_page_add_parbreak(page, 0, plain->style);
23774 plain->Start_Ofs += len;
23775 diff -urN dillo-0.6.6/src/prefs.c dillo2-0.6.6/src/prefs.c
23776 --- dillo-0.6.6/src/prefs.c 2002-04-03 09:31:46.000000000 -0700
23777 +++ dillo2-0.6.6/src/prefs.c 2003-04-21 12:36:27.000000000 -0600
23779 { "vw_fontname", DRC_TOKEN_VW_FONT },
23780 { "fw_fontname", DRC_TOKEN_FW_FONT },
23781 { "generate_submit", DRC_TOKEN_GENERATE_SUBMIT },
23782 - { "enterpress_forces_submit", DRC_TOKEN_ENTERPRESS_FORCES_SUBMIT }
23783 + { "enterpress_forces_submit", DRC_TOKEN_ENTERPRESS_FORCES_SUBMIT },
23784 + { "halfsize_images", DRC_TOKEN_HALFSIZE_IMAGES }
23787 static const guint n_symbols = sizeof (symbols) / sizeof (symbols[0]);
23788 @@ -156,6 +157,8 @@
23789 prefs.panel_size = 1;
23790 else if (!g_strcasecmp(scanner->value.v_string, "medium"))
23791 prefs.panel_size = 2;
23792 + else if (!g_strcasecmp(scanner->value.v_string, "stack"))
23793 + prefs.panel_size = 4;
23794 else /* default to "large" */
23795 prefs.panel_size = 3;
23797 @@ -226,6 +229,9 @@
23798 prefs.enterpress_forces_submit =
23799 (strcmp(scanner->value.v_string, "YES") == 0);
23801 + case DRC_TOKEN_HALFSIZE_IMAGES:
23802 + prefs.halfsize_images = (strcmp(scanner->value.v_string, "YES") == 0);
23805 break; /* Not reached */
23807 diff -urN dillo-0.6.6/src/prefs.h dillo2-0.6.6/src/prefs.h
23808 --- dillo-0.6.6/src/prefs.h 2002-04-03 09:31:46.000000000 -0700
23809 +++ dillo2-0.6.6/src/prefs.h 2003-04-21 12:36:27.000000000 -0600
23812 DRC_TOKEN_GENERATE_SUBMIT,
23813 DRC_TOKEN_ENTERPRESS_FORCES_SUBMIT,
23814 + DRC_TOKEN_HALFSIZE_IMAGES,
23817 } Dillo_Rc_TokenType;
23818 @@ -100,6 +101,7 @@
23819 gchar *fw_fontname;
23820 gboolean generate_submit;
23821 gboolean enterpress_forces_submit;
23822 + gboolean halfsize_images;
23826 diff -urN dillo-0.6.6/src/progressbar.c dillo2-0.6.6/src/progressbar.c
23827 --- dillo-0.6.6/src/progressbar.c 2001-05-17 19:31:15.000000000 -0600
23828 +++ dillo2-0.6.6/src/progressbar.c 2003-04-21 12:36:27.000000000 -0600
23831 GtkWidget* a_Progressbar_new(void)
23833 - return gtk_statusbar_new();
23834 + GtkWidget *frame = gtk_frame_new(NULL);
23835 + GtkWidget *label = gtk_label_new("");
23836 + gtk_container_add(GTK_CONTAINER(frame), label);
23837 + gtk_widget_show (label);
23845 * Again, for future preferences stuff
23847 gint a_Progressbar_set_font(GtkWidget *pbar, const char *font)
23851 (GtkCallback) gtk_widget_set_style, style);
23857 * Update the specified progress bar.
23858 @@ -70,14 +74,10 @@
23860 void a_Progressbar_update(GtkWidget *pbar, const char *updatestr, gint sens)
23864 gtk_widget_set_sensitive(pbar, (sens == 0) ? FALSE : TRUE);
23866 if ( updatestr != NULL ) {
23867 - context_id = gtk_statusbar_get_context_id(GTK_STATUSBAR(pbar), "text");
23868 - gtk_statusbar_pop(GTK_STATUSBAR(pbar), context_id);
23869 - gtk_statusbar_push(GTK_STATUSBAR(pbar), context_id, updatestr);
23870 + gtk_label_set_text (GTK_LABEL(GTK_BIN(pbar)->child), updatestr);
23874 diff -urN dillo-0.6.6/stamp-h2.in dillo2-0.6.6/stamp-h2.in
23875 --- dillo-0.6.6/stamp-h2.in 1969-12-31 17:00:00.000000000 -0700
23876 +++ dillo2-0.6.6/stamp-h2.in 2003-04-21 12:35:20.000000000 -0600