aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/dillo/dillo-0.8.6/dillo-i18n.diff
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/dillo/dillo-0.8.6/dillo-i18n.diff')
-rw-r--r--recipes/dillo/dillo-0.8.6/dillo-i18n.diff48036
1 files changed, 48036 insertions, 0 deletions
diff --git a/recipes/dillo/dillo-0.8.6/dillo-i18n.diff b/recipes/dillo/dillo-0.8.6/dillo-i18n.diff
new file mode 100644
index 0000000000..b9ef35933c
--- /dev/null
+++ b/recipes/dillo/dillo-0.8.6/dillo-i18n.diff
@@ -0,0 +1,48036 @@
+===============================
+ Dillo i18n patch by Kiyo
+===============================
+
+This is an unofficial i18n patch.
+Please see ChangeLog for details.
+Please do not ask a dillo team about this patch.
+
+The newest patch can get in http://teki.jpn.ph/pc/software/index-e.shtml
+If you found bug, please mail to webmaster@teki.jpn.ph.
+
+
+diff -pruN dillo-0.8.6/ABOUT-NLS dillo-0.8.6-i18n-misc-20060709/ABOUT-NLS
+--- dillo-0.8.6/ABOUT-NLS 1970-01-01 09:00:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/ABOUT-NLS 2006-05-16 01:21:07.000000000 +0900
+@@ -0,0 +1,432 @@
++Notes on the Free Translation Project
++*************************************
++
++ Free software is going international! The Free Translation Project
++is a way to get maintainers of free software, translators, and users all
++together, so that will gradually become able to speak many languages.
++A few packages already provide translations for their messages.
++
++ If you found this `ABOUT-NLS' file inside a distribution, you may
++assume that the distributed package does use GNU `gettext' internally,
++itself available at your nearest GNU archive site. But you do _not_
++need to install GNU `gettext' prior to configuring, installing or using
++this package with messages translated.
++
++ Installers will find here some useful hints. These notes also
++explain how users should proceed for getting the programs to use the
++available translations. They tell how people wanting to contribute and
++work at translations should contact the appropriate team.
++
++ When reporting bugs in the `intl/' directory or bugs which may be
++related to internationalization, you should tell about the version of
++`gettext' which is used. The information can be found in the
++`intl/VERSION' file, in internationalized packages.
++
++Quick configuration advice
++==========================
++
++ If you want to exploit the full power of internationalization, you
++should configure it using
++
++ ./configure --with-included-gettext
++
++to force usage of internationalizing routines provided within this
++package, despite the existence of internationalizing capabilities in the
++operating system where this package is being installed. So far, only
++the `gettext' implementation in the GNU C library version 2 provides as
++many features (such as locale alias, message inheritance, automatic
++charset conversion or plural form handling) as the implementation here.
++It is also not possible to offer this additional functionality on top
++of a `catgets' implementation. Future versions of GNU `gettext' will
++very likely convey even more functionality. So it might be a good idea
++to change to GNU `gettext' as soon as possible.
++
++ So you need _not_ provide this option if you are using GNU libc 2 or
++you have installed a recent copy of the GNU gettext package with the
++included `libintl'.
++
++INSTALL Matters
++===============
++
++ Some packages are "localizable" when properly installed; the
++programs they contain can be made to speak your own native language.
++Most such packages use GNU `gettext'. Other packages have their own
++ways to internationalization, predating GNU `gettext'.
++
++ By default, this package will be installed to allow translation of
++messages. It will automatically detect whether the system already
++provides the GNU `gettext' functions. If not, the GNU `gettext' own
++library will be used. This library is wholly contained within this
++package, usually in the `intl/' subdirectory, so prior installation of
++the GNU `gettext' package is _not_ required. Installers may use
++special options at configuration time for changing the default
++behaviour. The commands:
++
++ ./configure --with-included-gettext
++ ./configure --disable-nls
++
++will respectively bypass any pre-existing `gettext' to use the
++internationalizing routines provided within this package, or else,
++_totally_ disable translation of messages.
++
++ When you already have GNU `gettext' installed on your system and run
++configure without an option for your new package, `configure' will
++probably detect the previously built and installed `libintl.a' file and
++will decide to use this. This might be not what is desirable. You
++should use the more recent version of the GNU `gettext' library. I.e.
++if the file `intl/VERSION' shows that the library which comes with this
++package is more recent, you should use
++
++ ./configure --with-included-gettext
++
++to prevent auto-detection.
++
++ The configuration process will not test for the `catgets' function
++and therefore it will not be used. The reason is that even an
++emulation of `gettext' on top of `catgets' could not provide all the
++extensions of the GNU `gettext' library.
++
++ Internationalized packages have usually many `po/LL.po' files, where
++LL gives an ISO 639 two-letter code identifying the language. Unless
++translations have been forbidden at `configure' time by using the
++`--disable-nls' switch, all available translations are installed
++together with the package. However, the environment variable `LINGUAS'
++may be set, prior to configuration, to limit the installed set.
++`LINGUAS' should then contain a space separated list of two-letter
++codes, stating which languages are allowed.
++
++Using This Package
++==================
++
++ As a user, if your language has been installed for this package, you
++only have to set the `LANG' environment variable to the appropriate
++`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code,
++and `CC' is an ISO 3166 two-letter country code. For example, let's
++suppose that you speak German and live in Germany. At the shell
++prompt, merely execute `setenv LANG de_DE' (in `csh'),
++`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
++This can be done from your `.login' or `.profile' file, once and for
++all.
++
++ You might think that the country code specification is redundant.
++But in fact, some languages have dialects in different countries. For
++example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The
++country code serves to distinguish the dialects.
++
++ The locale naming convention of `LL_CC', with `LL' denoting the
++language and `CC' denoting the country, is the one use on systems based
++on GNU libc. On other systems, some variations of this scheme are
++used, such as `LL' or `LL_CC.ENCODING'. You can get the list of
++locales supported by your system for your country by running the command
++`locale -a | grep '^LL''.
++
++ Not all programs have translations for all languages. By default, an
++English message is shown in place of a nonexistent translation. If you
++understand other languages, you can set up a priority list of languages.
++This is done through a different environment variable, called
++`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG'
++for the purpose of message handling, but you still need to have `LANG'
++set to the primary language; this is required by other parts of the
++system libraries. For example, some Swedish users who would rather
++read translations in German than English for when Swedish is not
++available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
++
++ In the `LANGUAGE' environment variable, but not in the `LANG'
++environment variable, `LL_CC' combinations can be abbreviated as `LL'
++to denote the language's main dialect. For example, `de' is equivalent
++to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
++(Portuguese as spoken in Portugal) in this context.
++
++Translating Teams
++=================
++
++ For the Free Translation Project to be a success, we need interested
++people who like their own language and write it well, and who are also
++able to synergize with other translators speaking the same language.
++Each translation team has its own mailing list. The up-to-date list of
++teams can be found at the Free Translation Project's homepage,
++`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
++area.
++
++ If you'd like to volunteer to _work_ at translating messages, you
++should become a member of the translating team for your own language.
++The subscribing address is _not_ the same as the list itself, it has
++`-request' appended. For example, speakers of Swedish can send a
++message to `sv-request@li.org', having this message body:
++
++ subscribe
++
++ Keep in mind that team members are expected to participate
++_actively_ in translations, or at solving translational difficulties,
++rather than merely lurking around. If your team does not exist yet and
++you want to start one, or if you are unsure about what to do or how to
++get started, please write to `translation@iro.umontreal.ca' to reach the
++coordinator for all translator teams.
++
++ The English team is special. It works at improving and uniformizing
++the terminology in use. Proven linguistic skill are praised more than
++programming skill, here.
++
++Available Packages
++==================
++
++ Languages are not equally supported in all packages. The following
++matrix shows the current state of internationalization, as of July
++2002. The matrix shows, in regard of each package, for which languages
++PO files have been submitted to translation coordination, with a
++translation percentage of at least 50%.
++
++ Ready PO files be bg ca cs da de el en eo es et fi fr
++ +----------------------------------------+
++ a2ps | [] [] [] [] |
++ bash | [] [] [] [] |
++ bfd | [] [] |
++ binutils | [] [] |
++ bison | [] [] [] [] |
++ clisp | [] [] [] [] |
++ clisp | |
++ clisplow | |
++ cpio | [] [] [] [] |
++ darkstat | () |
++ diffutils | [] [] [] [] [] [] |
++ enscript | [] [] |
++ error | [] [] [] |
++ fetchmail | [] () [] [] [] () |
++ fileutils | [] [] [] [] [] |
++ findutils | [] [] [] [] [] [] |
++ flex | [] [] [] [] [] |
++ gas | [] [] |
++ gawk | [] [] [] |
++ gcal | [] [] |
++ gcc | [] [] |
++ gettext | [] [] [] [] [] |
++ gnupg | [] [] [] [] [] [] [] |
++ gprof | [] [] |
++ gpsdrive | () () () () () |
++ grep | [] [] [] [] [] [] [] |
++ gretl | [] |
++ gthumb | () () () |
++ hello | [] [] [] [] [] [] [] [] [] |
++ id-utils | [] [] [] |
++ indent | [] [] [] [] [] |
++ jpilot | () [] [] [] |
++ jwhois | [] [] |
++ kbd | [] [] [] |
++ ld | [] [] |
++ libc | [] [] [] [] [] [] [] |
++ libiconv | [] [] [] [] |
++ lifelines | () () |
++ lilypond | [] [] [] |
++ lingoteach | [] [] |
++ lingoteach_lessons| () () |
++ lynx | [] [] [] [] [] |
++ m4 | [] [] [] [] [] |
++ make | [] [] [] [] |
++ man-db | [] () () [] () () |
++ mysecretdiary | [] [] [] |
++ nano | [] () [] [] [] [] |
++ nano_1_0 | [] () [] [] [] [] |
++ opcodes | [] [] [] |
++ parted | [] [] [] [] [] |
++ ptx | [] [] [] [] [] [] [] |
++ python | |
++ recode | [] [] [] [] [] [] |
++ sed | [] [] [] [] [] [] [] [] [] |
++ sh-utils | [] [] [] [] |
++ sharutils | [] [] [] [] [] [] |
++ sketch | () [] () |
++ soundtracker | [] [] [] |
++ sp | [] |
++ tar | [] [] [] [] [] [] |
++ texinfo | [] [] [] [] [] |
++ textutils | [] [] [] [] [] |
++ util-linux | [] [] [] [] [] [] |
++ vorbis-tools | [] |
++ wastesedge | |
++ wdiff | [] [] [] [] [] [] |
++ wget | [] [] [] [] [] [] [] [] [] [] |
++ +----------------------------------------+
++ be bg ca cs da de el en eo es et fi fr
++ 0 2 19 10 30 44 9 1 12 45 16 3 53
++
++ gl he hr hu id it ja ko lv nb nl nn
++ +-------------------------------------+
++ a2ps | () () [] |
++ bash | [] |
++ bfd | [] |
++ binutils | [] |
++ bison | [] [] [] [] |
++ clisp | [] |
++ clisp | |
++ clisplow | |
++ cpio | [] [] [] [] |
++ darkstat | () |
++ diffutils | [] [] [] [] [] |
++ enscript | [] [] |
++ error | [] |
++ fetchmail | [] |
++ fileutils | [] [] [] |
++ findutils | [] [] [] [] [] [] [] [] |
++ flex | [] |
++ gas | |
++ gawk | [] |
++ gcal | |
++ gcc | [] |
++ gettext | [] [] |
++ gnupg | [] [] [] [] |
++ gprof | |
++ gpsdrive | [] () () |
++ grep | [] [] [] [] [] [] [] |
++ gretl | |
++ gthumb | () () |
++ hello | [] [] [] [] [] [] [] [] [] [] [] [] |
++ id-utils | [] [] |
++ indent | [] [] [] [] |
++ jpilot | () () |
++ jwhois | [] [] |
++ kbd | |
++ ld | |
++ libc | [] [] [] [] |
++ libiconv | [] [] [] |
++ lifelines | |
++ lilypond | [] [] |
++ lingoteach | [] |
++ lingoteach_lessons| |
++ lynx | [] [] [] [] |
++ m4 | [] [] [] [] |
++ make | [] [] [] [] [] [] |
++ man-db | () () |
++ mysecretdiary | [] |
++ nano | [] [] [] [] [] [] |
++ nano_1_0 | [] [] [] [] [] |
++ opcodes | [] [] |
++ parted | [] [] [] |
++ ptx | [] [] [] [] [] |
++ python | |
++ recode | [] [] [] |
++ sed | [] [] [] [] [] [] [] [] |
++ sh-utils | [] [] [] |
++ sharutils | [] [] [] |
++ sketch | () |
++ soundtracker | [] [] |
++ sp | |
++ tar | [] [] [] [] [] |
++ texinfo | [] [] [] |
++ textutils | [] [] [] |
++ util-linux | () [] |
++ vorbis-tools | |
++ wastesedge | |
++ wdiff | [] [] [] |
++ wget | [] [] [] [] [] [] |
++ +-------------------------------------+
++ gl he hr hu id it ja ko lv nb nl nn
++ 23 9 12 18 14 13 26 9 1 8 19 4
++
++ no pl pt pt_BR ru sk sl sv tr uk zh_TW
++ +----------------------------------------+
++ a2ps | () () () [] [] [] [] [] | 10
++ bash | [] | 6
++ bfd | [] [] | 5
++ binutils | [] [] | 5
++ bison | [] [] [] | 11
++ clisp | | 5
++ clisp | | 0
++ clisplow | | 0
++ cpio | [] [] [] [] | 12
++ darkstat | [] () | 1
++ diffutils | [] [] [] [] [] [] | 17
++ enscript | [] [] [] [] | 8
++ error | [] [] [] | 7
++ fetchmail | () () [] | 6
++ fileutils | [] [] [] [] [] | 13
++ findutils | [] [] [] [] [] [] [] | 21
++ flex | [] [] [] | 9
++ gas | [] | 3
++ gawk | [] [] | 6
++ gcal | [] [] | 4
++ gcc | [] | 4
++ gettext | [] [] [] [] [] [] | 13
++ gnupg | [] [] [] | 14
++ gprof | [] [] | 4
++ gpsdrive | [] [] () | 3
++ grep | [] [] [] [] | 18
++ gretl | | 1
++ gthumb | () () [] | 1
++ hello | [] [] [] [] [] [] [] | 28
++ id-utils | [] [] [] [] | 9
++ indent | [] [] [] [] [] | 14
++ jpilot | () () [] | 4
++ jwhois | [] () () [] [] | 7
++ kbd | [] [] | 5
++ ld | [] [] | 4
++ libc | [] [] [] [] [] [] | 17
++ libiconv | [] [] [] [] | 11
++ lifelines | [] | 1
++ lilypond | [] | 6
++ lingoteach | [] [] | 5
++ lingoteach_lessons| | 0
++ lynx | [] [] [] [] | 13
++ m4 | [] [] [] | 12
++ make | [] [] [] [] | 14
++ man-db | | 3
++ mysecretdiary | [] [] [] | 7
++ nano | [] [] [] [] | 15
++ nano_1_0 | [] [] [] [] | 14
++ opcodes | [] [] | 7
++ parted | [] [] [] | 11
++ ptx | [] [] [] [] [] [] [] | 19
++ python | | 0
++ recode | [] [] [] [] [] [] | 15
++ sed | [] [] [] [] [] [] | 23
++ sh-utils | [] | 8
++ sharutils | [] [] [] [] | 13
++ sketch | [] () [] | 4
++ soundtracker | [] | 6
++ sp | | 1
++ tar | [] [] [] [] [] [] [] | 18
++ texinfo | [] [] | 10
++ textutils | [] [] [] [] [] | 13
++ util-linux | [] [] [] | 10
++ vorbis-tools | [] | 2
++ wastesedge | | 0
++ wdiff | [] [] [] [] [] | 14
++ wget | [] [] [] [] [] [] [] [] | 24
++ +----------------------------------------+
++ 36 teams no pl pt pt_BR ru sk sl sv tr uk zh_TW
++ 67 domains 4 15 2 24 26 12 10 47 42 4 8 594
++
++ Some counters in the preceding matrix are higher than the number of
++visible blocks let us expect. This is because a few extra PO files are
++used for implementing regional variants of languages, or language
++dialects.
++
++ For a PO file in the matrix above to be effective, the package to
++which it applies should also have been internationalized and
++distributed as such by its maintainer. There might be an observable
++lag between the mere existence a PO file and its wide availability in a
++distribution.
++
++ If July 2002 seems to be old, you may fetch a more recent copy of
++this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date
++matrix with full percentage details can be found at
++`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
++
++Using `gettext' in new packages
++===============================
++
++ If you are writing a freely available program and want to
++internationalize it you are welcome to use GNU `gettext' in your
++package. Of course you have to respect the GNU Library General Public
++License which covers the use of the GNU `gettext' library. This means
++in particular that even non-free programs can use `libintl' as a shared
++library, whereas only free software can use `libintl' as a static
++library or use modified versions of `libintl'.
++
++ Once the sources are changed appropriately and the setup can handle
++to use of `gettext' the only thing missing are the translations. The
++Free Translation Project is also available for packages which are not
++developed inside the GNU project. Therefore the information given above
++applies also for every other Free Software Project. Contact
++`translation@iro.umontreal.ca' to make the `.pot' files available to
++the translation teams.
++
+diff -pruN dillo-0.8.6/AUTHORS dillo-0.8.6-i18n-misc-20060709/AUTHORS
+--- dillo-0.8.6/AUTHORS 2004-08-13 04:48:49.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/AUTHORS 2006-05-16 01:21:07.000000000 +0900
+@@ -35,6 +35,7 @@
+ * Adam Sampson
+ * Andreas Schweitzer
+ * Dominic Wong
++ * Kiyo
+ _________________________________________________________________
+
+ Web site logo:
+diff -pruN dillo-0.8.6/ChangeLog dillo-0.8.6-i18n-misc-20060709/ChangeLog
+--- dillo-0.8.6/ChangeLog 2006-04-27 01:06:54.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/ChangeLog 2006-07-09 00:53:02.000000000 +0900
+@@ -3,6 +3,13 @@ Dillo project
+ =============================================================================
+
+
++dillo-0.8.6-i18n-misc [??, 2006]
++
++ - * Applied 0.8.6 Changes to dillo-0.8.5-i18n-misc
++ * Some bug fixed.
++ Patches: Kiyo
++
++
+ dillo-0.8.6 [Apr 26, 2006]
+
+ - * Designed and implemented a dpi protocol library (libDpip.a in /dpip).
+@@ -52,6 +59,29 @@ dillo-0.8.6 [Apr 26, 2006]
+ Patch: Francis Daly
+
+
++dillo-0.8.5-i18n-misc [??, 2005]
++
++ - * Applied 0.8.5 Changes to dillo-0.8.4-i18n-misc
++ * Added dynamic font change system in a page unit.
++ * New-line processing is improved.
++ * Added send_referer option.
++ * Added the option which can specify config file.
++ * Two or more URLs are opened by tab.
++ * Added more checks for sane values in html.c.
++ * Fixed locale detection.
++ * Some bug fixed.
++ Patches: Kiyo
++ - * Fixed crash bug.
++ Patch: Richard Zidlicky
++ - * use an alternative rcfile from command line.
++ Patch: Tito
++ - * Fixed crash bug.
++ Patch: Christian Holland
++ - * Added Adblock.
++ * about:blank support.
++ Patches: Rudolf Polzer
++
++
+ dillo-0.8.5 [Jun 15, 2005]
+
+ - * Set "file:" to work as URI for current directory.
+@@ -65,6 +95,18 @@ dillo-0.8.5 [Jun 15, 2005]
+ Patches: Jorge Arellano
+
+
++dillo-0.8.4-i18n-misc [??, 2005]
++
++ - * Applied 0.8.4 Changes to dillo-0.8.3-i18n-misc
++ * Added more i18n.
++ * Some bug fixed.
++ Patch: Kiyo
++ - * Added Chinese Message Catalog.
++ po catalogs: Babyfai Cheung
++ - * cache-control
++ Patch:: madis
++
++
+ dillo-0.8.4 [Jan 11, 2005]
+
+ - * Fixed a possible attack (program abortion) by malicious web pages, which
+@@ -116,6 +158,15 @@ dillo-0.8.4 [Jan 11, 2005]
+ Patch: Tavis Ormandy
+
+
++dillo-0.8.3-i18n-misc [??, 2004]
++
++ - * Applied 0.8.3 Changes to dillo-0.8.2-i18n-misc
++ * Text Search in status bar
++ * Added more i18n.
++ * Some bug fixed.
++ Patch: Kiyo
++
++
+ dillo-0.8.3 [Oct 27, 2004]
+
+ - * Added a missing error handler for unreachable host in http.c.
+@@ -170,6 +221,12 @@ dillo-0.8.3 [Oct 27, 2004]
+ Patch: Bjrn Brill
+
+
++dillo-0.8.2-i18n-misc [??, 2004]
++
++ - * Applied 0.8.2 Changes to dillo-0.8.1-i18n-misc
++ Patch: Kiyo
++
++
+ dillo-0.8.2 [Jul 06, 2004]
+
+ - * Made PgUp/PgDn scroll by a full page, instead of a half (BUG#418).
+@@ -204,6 +261,12 @@ dillo-0.8.2 [Jul 06, 2004]
+ Patch: Diego Senz
+
+
++dillo-0.8.1-i18n-misc [??, 2004]
++
++ - * Applied 0.8.1 Changes to dillo-0.8.0-i18n-misc
++ Patch: Kiyo
++
++
+ dillo-0.8.1 [May 14, 2004]
+
+ - * Fixed dirent.h includes inside dpid.
+@@ -258,6 +321,13 @@ dillo-0.8.1 [May 14, 2004]
+ Patches: Jorge Arellano
+
+
++dillo-0.8.0-i18n-misc [??, 2004]
++
++ - * Applied 0.8.0 Changes to dillo-0.7.3-i18n-misc
++ * Fixed some bugs.
++ Patch: Kiyo
++
++
+ dillo-0.8.0 [Feb 08, 2004]
+
+ - * Added a right-mouse-button popup for images!
+@@ -391,9 +461,46 @@ dillo-0.8.0 [Feb 08, 2004]
+ - * Added the "-geometry" switch to the CLI.
+ Patch: Jorge Arellano, Jan Dittmer
+
++dillo-0.7.3-i18n-misc [Oct ??, 2003]
++
++ - * Xft support
++ * changed internal code that is processed by UTF-8
++ * charset automatic recognition support
++ * GUI setting tool
++ * Start-up URL specification support
++ * gzip compression transmission support
++ * SSL support
++ * BASIC authorization support
++ * Referer support
++ * User-Agent change support
++ * meta-refresh support(optional)
++ * "Character entity references" (like &#xnnnn;) support
++ * Gettextize
++ * multi byte char selection support
++ * Fixed scroll quantity
++ * Fixed tab, frame patch
++ * Change font setting code for i18n
++ * Add Search box
++ Patches: Kiyo(http://teki.jpn.ph/)
++ (These patches referred to --
++ Robert Thomson, Tor Andersson, Frank de lange, madis, Geoff Lane,
++ Lars Clausen, Jim Huang, Takubo, LJ, Sam Mason)
+
+ dillo-0.7.3 [Aug 03, 2003]
+
++ - * Implemented tabbed browsing, separated 'document' from 'interface' code
++ - Moved all document-specific code into DilloDoc (src/doc.c/h and
++ src/browser.h for definition of DilloDoc)
++ - Added tab browsing as an option (enabled by default, disable
++ with --disable-tabs configure option)
++ * Focus is on location bar on new empty window/tab
++ * Open new window on link-shift-click1, new tab on link-control-click1
++ - optionally open tab on link-click2 (pref tab_on_middle_click=YES)
++ * Implemented experimental frame and iframe support
++ - Added frame and iframe support as an option (enabled by default,
++ disable with --disable-frames configure option)
++ - Added support for named windows/frames (target= and name= parameters)
++ Patch: Frank de Lange
+ - * Some more selection goodies:
+ - Redesign of the selection state model, now the selection is preserved
+ as long as possible.
+diff -pruN dillo-0.8.6/Makefile.am dillo-0.8.6-i18n-misc-20060709/Makefile.am
+--- dillo-0.8.6/Makefile.am 2005-10-29 03:55:23.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/Makefile.am 2006-07-09 00:18:49.000000000 +0900
+@@ -1,5 +1,10 @@
+-SUBDIRS = doc dpip src dpid dpi
++AM_CPPFLAGS=-DDILLORC_SYS='"$(sysconfdir)/dillorc"' -DLOCALEDIR='"$(localedir)"'
+
+-EXTRA_DIST = ChangeLog.old dillorc install-dpi-local
++SUBDIRS = m4 doc dpip src dpid dpi config po
++
++EXTRA_DIST = config.rpath ChangeLog.old dillorc install-dpi-local autogen.sh bm-update
++bin_SCRIPTS = bm-update
+
+ sysconf_DATA = dillorc
++
++ACLOCAL_AMFLAGS = -I m4
+diff -pruN dillo-0.8.6/Makefile.in dillo-0.8.6-i18n-misc-20060709/Makefile.in
+--- dillo-0.8.6/Makefile.in 2006-04-27 01:07:27.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/Makefile.in 2006-07-09 00:26:09.000000000 +0900
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -21,6 +21,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = .
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -37,51 +38,6 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+- config.guess config.sub depcomp install-sh missing
+-subdir = .
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno configure.status.lineno
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+-am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+- *) f=$$p;; \
+- esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(sysconfdir)"
+-sysconfDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(sysconf_DATA)
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-distdir = $(PACKAGE)-$(VERSION)
+-top_distdir = $(distdir)
+-am__remove_distdir = \
+- { test ! -d $(distdir) \
+- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+- && rm -fr $(distdir); }; }
+-DIST_ARCHIVES = $(distdir).tar.gz
+-GZIP_ENV = --best
+-distuninstallcheck_listfiles = find . -type f -print
+-distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -111,6 +67,7 @@ EXEEXT = @EXEEXT@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_CONFIG = @GLIB_CONFIG@
+ GLIB_LIBS = @GLIB_LIBS@
++GMSGFMT = @GMSGFMT@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_CONFIG = @GTK_CONFIG@
+ GTK_LIBS = @GTK_LIBS@
+@@ -118,9 +75,12 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INTLLIBS = @INTLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
+ LIBFLTK_LIBS = @LIBFLTK_LIBS@
++LIBICONV = @LIBICONV@
++LIBINTL = @LIBINTL@
+ LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
+ LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
+ LIBJPEG_LIBS = @LIBJPEG_LIBS@
+@@ -132,8 +92,13 @@ LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
+ LIBS = @LIBS@
+ LIBSSL_LIBS = @LIBSSL_LIBS@
+ LIBZ_LIBS = @LIBZ_LIBS@
++LTLIBICONV = @LTLIBICONV@
++LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MSGFMT = @MSGFMT@
++MSGMERGE = @MSGMERGE@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -142,11 +107,16 @@ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++POSUB = @POSUB@
+ RANLIB = @RANLIB@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
++USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++XFT_CONFIG = @XFT_CONFIG@
++XGETTEXT = @XGETTEXT@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+@@ -158,8 +128,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TR
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -178,9 +146,9 @@ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -192,45 +160,56 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-SUBDIRS = doc dpip src dpid dpi
+-EXTRA_DIST = ChangeLog.old dillorc install-dpi-local
++AM_CPPFLAGS = -DDILLORC_SYS='"$(sysconfdir)/dillorc"' -DLOCALEDIR='"$(localedir)"'
++
++SUBDIRS = m4 doc dpip src dpid dpi config po
++
++EXTRA_DIST = config.rpath ChangeLog.old dillorc install-dpi-local autogen.sh bm-update
++bin_SCRIPTS = bm-update
++
+ sysconf_DATA = dillorc
++
++ACLOCAL_AMFLAGS = -I m4
++subdir = .
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = config.h
++CONFIG_CLEAN_FILES =
++SCRIPTS = $(bin_SCRIPTS)
++
++DIST_SOURCES =
++DATA = $(sysconf_DATA)
++
++
++RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
++ ps-recursive install-info-recursive uninstall-info-recursive \
++ all-recursive install-data-recursive install-exec-recursive \
++ installdirs-recursive install-recursive uninstall-recursive \
++ check-recursive installcheck-recursive
++DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \
++ ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS \
++ aclocal.m4 config.guess config.h.in config.rpath config.sub \
++ configure configure.in depcomp install-sh missing mkinstalldirs
++DIST_SUBDIRS = $(SUBDIRS)
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+ .SUFFIXES:
+-am--refresh:
+- @:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+- cd $(srcdir) && $(AUTOMAKE) --gnu \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
++
++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
++ configure.lineno
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- echo ' $(SHELL) ./config.status'; \
+- $(SHELL) ./config.status;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+- esac;
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
+
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ $(SHELL) ./config.status --recheck
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
++$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+ cd $(srcdir) && $(AUTOCONF)
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
++
++$(ACLOCAL_M4): configure.in m4/codeset.m4 m4/gettext.m4 m4/glibc21.m4 m4/iconv.m4 m4/intdiv0.m4 m4/intmax.m4 m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4 m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4 m4/longdouble.m4 m4/longlong.m4 m4/nls.m4 m4/po.m4 m4/printf-posix.m4 m4/progtest.m4 m4/signed.m4 m4/size_max.m4 m4/stdint_h.m4 m4/uintmax_t.m4 m4/ulonglong.m4 m4/wchar_t.m4 m4/wint_t.m4 m4/xsize.m4
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+ config.h: stamp-h1
+@@ -242,30 +221,51 @@ config.h: stamp-h1
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+-$(srcdir)/config.h.in: $(am__configure_deps)
++
++$(srcdir)/config.h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOHEADER)
+- rm -f stamp-h1
+- touch $@
++ touch $(srcdir)/config.h.in
+
+ distclean-hdr:
+ -rm -f config.h stamp-h1
++binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
++install-binSCRIPTS: $(bin_SCRIPTS)
++ @$(NORMAL_INSTALL)
++ $(mkinstalldirs) $(DESTDIR)$(bindir)
++ @list='$(bin_SCRIPTS)'; for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ if test -f $$d$$p; then \
++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
++ echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
++ $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
++ else :; fi; \
++ done
++
++uninstall-binSCRIPTS:
++ @$(NORMAL_UNINSTALL)
++ @list='$(bin_SCRIPTS)'; for p in $$list; do \
++ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
++ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++ rm -f $(DESTDIR)$(bindir)/$$f; \
++ done
+ uninstall-info-am:
++sysconfDATA_INSTALL = $(INSTALL_DATA)
+ install-sysconfDATA: $(sysconf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+ @list='$(sysconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
+- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
++ $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
+ done
+
+ uninstall-sysconfDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(sysconf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(sysconfdir)/$$f"; \
++ rm -f $(DESTDIR)$(sysconfdir)/$$f; \
+ done
+
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -275,13 +275,7 @@ uninstall-sysconfDATA:
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -293,7 +287,7 @@ $(RECURSIVE_TARGETS):
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -301,13 +295,7 @@ $(RECURSIVE_TARGETS):
+
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+- @failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
++ @set fnord $$MAKEFLAGS; amf=$$2; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+@@ -328,7 +316,7 @@ maintainer-clean-recursive:
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
++ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -339,6 +327,14 @@ ctags-recursive:
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -347,22 +343,19 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
++ if (etags --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+- empty_fix=.; \
+ else \
+ include_option=--include; \
+- empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
++ test -f $$subdir/TAGS && \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+@@ -372,11 +365,10 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -399,10 +391,24 @@ GTAGS:
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = .
++distdir = $(PACKAGE)-$(VERSION)
++
++am__remove_distdir = \
++ { test ! -d $(distdir) \
++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
++ && rm -fr $(distdir); }; }
++
++GZIP_ENV = --best
++distuninstallcheck_listfiles = find . -type f -print
++distcleancheck_listfiles = find . -type f -print
+
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+ mkdir $(distdir)
++ $(mkinstalldirs) $(distdir)/po
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+@@ -414,7 +420,7 @@ distdir: $(DISTFILES)
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -429,17 +435,15 @@ distdir: $(DISTFILES)
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ test -d $(distdir)/$$subdir \
++ || mkdir $(distdir)/$$subdir \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$(top_distdir)" \
++ distdir=../$(distdir)/$$subdir \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -450,46 +454,19 @@ distdir: $(DISTFILES)
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+ dist-gzip: distdir
+- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+- $(am__remove_distdir)
+-
+-dist-bzip2: distdir
+- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+- $(am__remove_distdir)
+-
+-dist-tarZ: distdir
+- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+- $(am__remove_distdir)
+-
+-dist-shar: distdir
+- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+- $(am__remove_distdir)
+-
+-dist-zip: distdir
+- -rm -f $(distdir).zip
+- zip -rq $(distdir).zip $(distdir)
++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+ dist dist-all: distdir
+- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+ # This target untars the dist file and tries a VPATH configuration. Then
+ # it guarantees that the distribution is self-contained by making another
+ # tarfile.
+ distcheck: dist
+- case '$(DIST_ARCHIVES)' in \
+- *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+- *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+- *.tar.Z*) \
+- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+- *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+- *.zip*) \
+- unzip $(distdir).zip ;;\
+- esac
++ $(am__remove_distdir)
++ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
+@@ -509,20 +486,19 @@ distcheck: dist
+ distuninstallcheck \
+ && chmod -R a-w "$$dc_install_base" \
+ && ({ \
+- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
++ (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+ } || { rm -rf "$$dc_destdir"; exit 1; }) \
+ && rm -rf "$$dc_destdir" \
+- && $(MAKE) $(AM_MAKEFLAGS) dist \
+- && rm -rf $(DIST_ARCHIVES) \
++ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
++ && rm -f $(distdir).tar.gz \
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ $(am__remove_distdir)
+- @(echo "$(distdir) archives ready for distribution: "; \
+- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
++ @echo "$(distdir).tar.gz is ready for distribution" | \
++ sed 'h;s/./=/g;p;x;p;x'
+ distuninstallcheck:
+ @cd $(distuninstallcheck_dir) \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+@@ -543,12 +519,11 @@ distcleancheck: distclean
+ exit 1; } >&2
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(DATA) config.h
++all-am: Makefile $(SCRIPTS) $(DATA) config.h
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(sysconfdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir)
++
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -568,7 +543,7 @@ mostlyclean-generic:
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -586,15 +561,13 @@ dvi: dvi-recursive
+
+ dvi-am:
+
+-html: html-recursive
+-
+ info: info-recursive
+
+ info-am:
+
+ install-data-am:
+
+-install-exec-am: install-sysconfDATA
++install-exec-am: install-binSCRIPTS install-sysconfDATA
+
+ install-info: install-info-recursive
+
+@@ -620,24 +593,28 @@ ps: ps-recursive
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-sysconfDATA
++uninstall-am: uninstall-binSCRIPTS uninstall-info-am \
++ uninstall-sysconfDATA
+
+ uninstall-info: uninstall-info-recursive
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+- check-am clean clean-generic clean-recursive ctags \
+- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
+- dist-tarZ dist-zip distcheck distclean distclean-generic \
+- distclean-hdr distclean-recursive distclean-tags \
+- distcleancheck distdir distuninstallcheck dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip install-sysconfDATA \
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
++ clean-generic clean-recursive ctags ctags-recursive dist \
++ dist-all dist-gzip distcheck distclean distclean-generic \
++ distclean-hdr distclean-recursive distclean-tags distcleancheck \
++ distdir distuninstallcheck dvi dvi-am dvi-recursive info \
++ info-am info-recursive install install-am install-binSCRIPTS \
++ install-data install-data-am install-data-recursive \
++ install-exec install-exec-am install-exec-recursive \
++ install-info install-info-am install-info-recursive install-man \
++ install-recursive install-strip install-sysconfDATA \
+ installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
++ installdirs-recursive maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am uninstall-info-am uninstall-sysconfDATA
++ mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
++ ps-recursive tags tags-recursive uninstall uninstall-am \
++ uninstall-binSCRIPTS uninstall-info-am uninstall-info-recursive \
++ uninstall-recursive uninstall-sysconfDATA
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -pruN dillo-0.8.6/README dillo-0.8.6-i18n-misc-20060709/README
+--- dillo-0.8.6/README 2006-03-25 01:00:18.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/README 2006-05-16 01:21:07.000000000 +0900
+@@ -1,3 +1,14 @@
++===============================
++ Dillo i18n patch by Kiyo
++===============================
++
++This is an unofficial i18n patch.
++Please see ChangeLog for details.
++Please do not ask a dillo team about this patch.
++
++The newest patch can get in http://teki.jpn.ph/pc/software/index-e.shtml
++If you found bug, please mail to webmaster@teki.jpn.ph.
++
+ =======
+ Dillo
+ =======
+@@ -116,3 +127,5 @@ gcc
+ Jorge.-
+ (jcid@dillo.org)
+ Mar 24, 2006
++
++
+diff -pruN dillo-0.8.6/aclocal.m4 dillo-0.8.6-i18n-misc-20060709/aclocal.m4
+--- dillo-0.8.6/aclocal.m4 2006-04-27 01:06:18.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/aclocal.m4 2006-05-16 01:21:07.000000000 +0900
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
++# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
++# Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -11,535 +11,496 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+
+-# Configure paths for GLIB
+-# Owen Taylor 97-11-3
++# Do all the work for Automake. -*- Autoconf -*-
+
+-dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
+-dnl gthread is specified in MODULES, pass to glib-config
+-dnl
+-AC_DEFUN(AM_PATH_GLIB,
+-[dnl
+-dnl Get the cflags and libraries from the glib-config script
+-dnl
+-AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
+- glib_config_prefix="$withval", glib_config_prefix="")
+-AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
+- glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
+-AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
+- , enable_glibtest=yes)
++# This macro actually does too much some checks are only needed if
++# your package does certain things. But this isn't really a big deal.
+
+- if test x$glib_config_exec_prefix != x ; then
+- glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
+- if test x${GLIB_CONFIG+set} != xset ; then
+- GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
+- fi
+- fi
+- if test x$glib_config_prefix != x ; then
+- glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
+- if test x${GLIB_CONFIG+set} != xset ; then
+- GLIB_CONFIG=$glib_config_prefix/bin/glib-config
+- fi
+- fi
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# Free Software Foundation, Inc.
+
+- for module in . $4
+- do
+- case "$module" in
+- gmodule)
+- glib_config_args="$glib_config_args gmodule"
+- ;;
+- gthread)
+- glib_config_args="$glib_config_args gthread"
+- ;;
+- esac
+- done
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+
+- AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
+- min_glib_version=ifelse([$1], ,0.99.7,$1)
+- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
+- no_glib=""
+- if test "$GLIB_CONFIG" = "no" ; then
+- no_glib=yes
+- else
+- GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
+- GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
+- glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+- if test "x$enable_glibtest" = "xyes" ; then
+- ac_save_CFLAGS="$CFLAGS"
+- ac_save_LIBS="$LIBS"
+- CFLAGS="$CFLAGS $GLIB_CFLAGS"
+- LIBS="$GLIB_LIBS $LIBS"
+-dnl
+-dnl Now check if the installed GLIB is sufficiently new. (Also sanity
+-dnl checks the results of glib-config to some extent
+-dnl
+- rm -f conf.glibtest
+- AC_TRY_RUN([
+-#include <glib.h>
+-#include <stdio.h>
+-#include <stdlib.h>
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
+
+-int
+-main ()
+-{
+- int major, minor, micro;
+- char *tmp_version;
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+
+- system ("touch conf.glibtest");
++# serial 10
+
+- /* HP/UX 9 (%@#!) writes to sscanf strings */
+- tmp_version = g_strdup("$min_glib_version");
+- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+- printf("%s, bad version string\n", "$min_glib_version");
+- exit(1);
+- }
++AC_PREREQ([2.54])
+
+- if ((glib_major_version != $glib_config_major_version) ||
+- (glib_minor_version != $glib_config_minor_version) ||
+- (glib_micro_version != $glib_config_micro_version))
+- {
+- printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
+- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
+- glib_major_version, glib_minor_version, glib_micro_version);
+- printf ("*** was found! If glib-config was correct, then it is best\n");
+- printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
+- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+- printf("*** required on your system.\n");
+- printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
+- printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
+- printf("*** before re-running configure\n");
+- }
+- else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
+- (glib_minor_version != GLIB_MINOR_VERSION) ||
+- (glib_micro_version != GLIB_MICRO_VERSION))
+- {
+- printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+- printf("*** library (version %d.%d.%d)\n",
+- glib_major_version, glib_minor_version, glib_micro_version);
+- }
+- else
+- {
+- if ((glib_major_version > major) ||
+- ((glib_major_version == major) && (glib_minor_version > minor)) ||
+- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
+- {
+- return 0;
+- }
+- else
+- {
+- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
+- glib_major_version, glib_minor_version, glib_micro_version);
+- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
+- major, minor, micro);
+- printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
+- printf("***\n");
+- printf("*** If you have already installed a sufficiently new version, this error\n");
+- printf("*** probably means that the wrong copy of the glib-config shell script is\n");
+- printf("*** being found. The easiest way to fix this is to remove the old version\n");
+- printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
+- printf("*** correct copy of glib-config. (In this case, you will have to\n");
+- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+- printf("*** so that the correct libraries are found at run-time))\n");
+- }
+- }
+- return 1;
+-}
+-],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+- CFLAGS="$ac_save_CFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- fi
+- if test "x$no_glib" = x ; then
+- AC_MSG_RESULT(yes)
+- ifelse([$2], , :, [$2])
++# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
++# the ones we care about.
++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
++
++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
++# AM_INIT_AUTOMAKE([OPTIONS])
++# -----------------------------------------------
++# The call with PACKAGE and VERSION arguments is the old style
++# call (pre autoconf-2.50), which is being phased out. PACKAGE
++# and VERSION should now be passed to AC_INIT and removed from
++# the call to AM_INIT_AUTOMAKE.
++# We support both call styles for the transition. After
++# the next Automake release, Autoconf can make the AC_INIT
++# arguments mandatory, and then we can depend on a new Autoconf
++# release and drop the old call support.
++AC_DEFUN([AM_INIT_AUTOMAKE],
++[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
++ AC_REQUIRE([AC_PROG_INSTALL])dnl
++# test to see if srcdir already configured
++if test "`cd $srcdir && pwd`" != "`pwd`" &&
++ test -f $srcdir/config.status; then
++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++fi
++
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++ if (cygpath --version) >/dev/null 2>/dev/null; then
++ CYGPATH_W='cygpath -w'
+ else
+- AC_MSG_RESULT(no)
+- if test "$GLIB_CONFIG" = "no" ; then
+- echo "*** The glib-config script installed by GLIB could not be found"
+- echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
+- echo "*** your path, or set the GLIB_CONFIG environment variable to the"
+- echo "*** full path to glib-config."
+- else
+- if test -f conf.glibtest ; then
+- :
+- else
+- echo "*** Could not run GLIB test program, checking why..."
+- CFLAGS="$CFLAGS $GLIB_CFLAGS"
+- LIBS="$LIBS $GLIB_LIBS"
+- AC_TRY_LINK([
+-#include <glib.h>
+-#include <stdio.h>
+-], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
+- [ echo "*** The test program compiled, but did not run. This usually means"
+- echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+- echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+- echo "*** to the installed location Also, make sure you have run ldconfig if that"
+- echo "*** is required on your system"
+- echo "***"
+- echo "*** If you have an old version installed, it is best to remove it, although"
+- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+- echo "***"
+- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+- echo "*** came with the system with the command"
+- echo "***"
+- echo "*** rpm --erase --nodeps gtk gtk-devel" ],
+- [ echo "*** The test program failed to compile or link. See the file config.log for the"
+- echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
+- echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
+- echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
+- CFLAGS="$ac_save_CFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- fi
+- GLIB_CFLAGS=""
+- GLIB_LIBS=""
+- ifelse([$3], , :, [$3])
++ CYGPATH_W=echo
+ fi
+- AC_SUBST(GLIB_CFLAGS)
+- AC_SUBST(GLIB_LIBS)
+- rm -f conf.glibtest
+-])
+-
+-# Configure paths for GTK+
+-# Owen Taylor 97-11-3
++fi
++AC_SUBST([CYGPATH_W])
+
+-dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+-dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+-dnl
+-AC_DEFUN(AM_PATH_GTK,
+-[dnl
+-dnl Get the cflags and libraries from the gtk-config script
+-dnl
+-AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
+- gtk_config_prefix="$withval", gtk_config_prefix="")
+-AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
+- gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
+-AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
+- , enable_gtktest=yes)
++# Define the identity of the package.
++dnl Distinguish between old-style and new-style calls.
++m4_ifval([$2],
++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++ AC_SUBST([PACKAGE], [$1])dnl
++ AC_SUBST([VERSION], [$2])],
++[_AM_SET_OPTIONS([$1])dnl
++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+- for module in . $4
+- do
+- case "$module" in
+- gthread)
+- gtk_config_args="$gtk_config_args gthread"
+- ;;
+- esac
+- done
++_AM_IF_OPTION([no-define],,
++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+- if test x$gtk_config_exec_prefix != x ; then
+- gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+- if test x${GTK_CONFIG+set} != xset ; then
+- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+- fi
+- fi
+- if test x$gtk_config_prefix != x ; then
+- gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+- if test x${GTK_CONFIG+set} != xset ; then
+- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+- fi
+- fi
++# Some tools Automake needs.
++AC_REQUIRE([AM_SANITY_CHECK])dnl
++AC_REQUIRE([AC_ARG_PROGRAM])dnl
++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
++AM_MISSING_PROG(AUTOCONF, autoconf)
++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
++AM_MISSING_PROG(AUTOHEADER, autoheader)
++AM_MISSING_PROG(MAKEINFO, makeinfo)
++AM_MISSING_PROG(AMTAR, tar)
++AM_PROG_INSTALL_SH
++AM_PROG_INSTALL_STRIP
++# We need awk for the "check" target. The system "awk" is bad on
++# some platforms.
++AC_REQUIRE([AC_PROG_AWK])dnl
++AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+
+- AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+- min_gtk_version=ifelse([$1], ,0.99.7,$1)
+- AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+- no_gtk=""
+- if test "$GTK_CONFIG" = "no" ; then
+- no_gtk=yes
+- else
+- GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+- GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
+- gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+- if test "x$enable_gtktest" = "xyes" ; then
+- ac_save_CFLAGS="$CFLAGS"
+- ac_save_LIBS="$LIBS"
+- CFLAGS="$CFLAGS $GTK_CFLAGS"
+- LIBS="$GTK_LIBS $LIBS"
+-dnl
+-dnl Now check if the installed GTK is sufficiently new. (Also sanity
+-dnl checks the results of gtk-config to some extent
+-dnl
+- rm -f conf.gtktest
+- AC_TRY_RUN([
+-#include <gtk/gtk.h>
+-#include <stdio.h>
+-#include <stdlib.h>
++_AM_IF_OPTION([no-dependencies],,
++[AC_PROVIDE_IFELSE([AC_PROG_CC],
++ [_AM_DEPENDENCIES(CC)],
++ [define([AC_PROG_CC],
++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_CXX],
++ [_AM_DEPENDENCIES(CXX)],
++ [define([AC_PROG_CXX],
++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++])
++])
+
+-int
+-main ()
+-{
+- int major, minor, micro;
+- char *tmp_version;
+
+- system ("touch conf.gtktest");
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated. The stamp files are numbered to have different names.
+
+- /* HP/UX 9 (%@#!) writes to sscanf strings */
+- tmp_version = g_strdup("$min_gtk_version");
+- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+- printf("%s, bad version string\n", "$min_gtk_version");
+- exit(1);
+- }
++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
++# loop where config.status creates the headers, so we can generate
++# our stamp files there.
++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
++[# Compute $1's index in $config_headers.
++_am_stamp_count=1
++for _am_header in $config_headers :; do
++ case $_am_header in
++ $1 | $1:* )
++ break ;;
++ * )
++ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++ esac
++done
++echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+
+- if ((gtk_major_version != $gtk_config_major_version) ||
+- (gtk_minor_version != $gtk_config_minor_version) ||
+- (gtk_micro_version != $gtk_config_micro_version))
+- {
+- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+- gtk_major_version, gtk_minor_version, gtk_micro_version);
+- printf ("*** was found! If gtk-config was correct, then it is best\n");
+- printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+- printf("*** required on your system.\n");
+- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
+- printf("*** before re-running configure\n");
+- }
+-#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+- else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+- (gtk_minor_version != GTK_MINOR_VERSION) ||
+- (gtk_micro_version != GTK_MICRO_VERSION))
+- {
+- printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+- printf("*** library (version %d.%d.%d)\n",
+- gtk_major_version, gtk_minor_version, gtk_micro_version);
+- }
+-#endif /* defined (GTK_MAJOR_VERSION) ... */
+- else
+- {
+- if ((gtk_major_version > major) ||
+- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+- {
+- return 0;
+- }
+- else
+- {
+- printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+- gtk_major_version, gtk_minor_version, gtk_micro_version);
+- printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+- major, minor, micro);
+- printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+- printf("***\n");
+- printf("*** If you have already installed a sufficiently new version, this error\n");
+- printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
+- printf("*** being found. The easiest way to fix this is to remove the old version\n");
+- printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+- printf("*** correct copy of gtk-config. (In this case, you will have to\n");
+- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+- printf("*** so that the correct libraries are found at run-time))\n");
+- }
+- }
+- return 1;
+-}
+-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+- CFLAGS="$ac_save_CFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- fi
+- if test "x$no_gtk" = x ; then
+- AC_MSG_RESULT(yes)
+- ifelse([$2], , :, [$2])
+- else
+- AC_MSG_RESULT(no)
+- if test "$GTK_CONFIG" = "no" ; then
+- echo "*** The gtk-config script installed by GTK could not be found"
+- echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+- echo "*** your path, or set the GTK_CONFIG environment variable to the"
+- echo "*** full path to gtk-config."
+- else
+- if test -f conf.gtktest ; then
+- :
+- else
+- echo "*** Could not run GTK test program, checking why..."
+- CFLAGS="$CFLAGS $GTK_CFLAGS"
+- LIBS="$LIBS $GTK_LIBS"
+- AC_TRY_LINK([
+-#include <gtk/gtk.h>
+-#include <stdio.h>
+-], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+- [ echo "*** The test program compiled, but did not run. This usually means"
+- echo "*** that the run-time linker is not finding GTK or finding the wrong"
+- echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+- echo "*** to the installed location Also, make sure you have run ldconfig if that"
+- echo "*** is required on your system"
+- echo "***"
+- echo "*** If you have an old version installed, it is best to remove it, although"
+- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+- echo "***"
+- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+- echo "*** came with the system with the command"
+- echo "***"
+- echo "*** rpm --erase --nodeps gtk gtk-devel" ],
+- [ echo "*** The test program failed to compile or link. See the file config.log for the"
+- echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+- echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
+- CFLAGS="$ac_save_CFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- fi
+- GTK_CFLAGS=""
+- GTK_LIBS=""
+- ifelse([$3], , :, [$3])
+- fi
+- AC_SUBST(GTK_CFLAGS)
+- AC_SUBST(GTK_LIBS)
+- rm -f conf.gtktest
+-])
++# Copyright 2002 Free Software Foundation, Inc.
+
+-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+
+ # AM_AUTOMAKE_VERSION(VERSION)
+ # ----------------------------
+ # Automake X.Y traces this macro to ensure aclocal.m4 has been
+ # generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
++AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
+
+ # AM_SET_CURRENT_AUTOMAKE_VERSION
+ # -------------------------------
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.5])])
++ [AM_AUTOMAKE_VERSION([1.7.9])])
+
+-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
++# Helper functions for option handling. -*- Autoconf -*-
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# Copyright 2001, 2002 Free Software Foundation, Inc.
+
+-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+-#
+-# Of course, Automake must honor this variable whenever it calls a
+-# tool from the auxiliary directory. The problem is that $srcdir (and
+-# therefore $ac_aux_dir as well) can be either absolute or relative,
+-# depending on how configure is run. This is pretty annoying, since
+-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+-# source directory, any form will work fine, but in subdirectories a
+-# relative path needs to be adjusted first.
+-#
+-# $ac_aux_dir/missing
+-# fails when called from a subdirectory if $ac_aux_dir is relative
+-# $top_srcdir/$ac_aux_dir/missing
+-# fails if $ac_aux_dir is absolute,
+-# fails when called from a subdirectory in a VPATH build with
+-# a relative $ac_aux_dir
+-#
+-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+-# are both prefixed by $srcdir. In an in-source build this is usually
+-# harmless because $srcdir is `.', but things will broke when you
+-# start a VPATH build or use an absolute $srcdir.
+-#
+-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+-# and then we would define $MISSING as
+-# MISSING="\${SHELL} $am_aux_dir/missing"
+-# This will work as long as MISSING is not called from configure, because
+-# unfortunately $(top_srcdir) has no meaning in configure.
+-# However there are other variables, like CC, which are often used in
+-# configure, and could therefore not use this "fixed" $ac_aux_dir.
+-#
+-# Another solution, used here, is to always expand $ac_aux_dir to an
+-# absolute PATH. The drawback is that using absolute paths prevent a
+-# configured tree to be moved without reconfiguration.
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+
+-AC_DEFUN([AM_AUX_DIR_EXPAND],
+-[dnl Rely on autoconf to set up CDPATH properly.
+-AC_PREREQ([2.50])dnl
+-# expand $ac_aux_dir to an absolute path
+-am_aux_dir=`cd $ac_aux_dir && pwd`
+-])
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+
++# serial 2
+
+-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++
++# _AM_SET_OPTION(NAME)
++# ------------------------------
++# Set option NAME. Presently that only means defining a flag for this option.
++AC_DEFUN([_AM_SET_OPTION],
++[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++
++# _AM_SET_OPTIONS(OPTIONS)
++# ----------------------------------
++# OPTIONS is a space-separated list of Automake options.
++AC_DEFUN([_AM_SET_OPTIONS],
++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++
++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
++# -------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++AC_DEFUN([_AM_IF_OPTION],
++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++
++#
++# Check to make sure that the build environment is sane.
++#
++
++# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 3
++
++# AM_SANITY_CHECK
++# ---------------
++AC_DEFUN([AM_SANITY_CHECK],
++[AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftest.file
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments. Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++ if test "$[*]" = "X"; then
++ # -L didn't work.
++ set X `ls -t $srcdir/configure conftest.file`
++ fi
++ rm -f conftest.file
++ if test "$[*]" != "X $srcdir/configure conftest.file" \
++ && test "$[*]" != "X conftest.file $srcdir/configure"; then
++
++ # If neither matched, then we have a broken ls. This can happen
++ # if, for instance, CONFIG_SHELL is bash and it inherits a
++ # broken ls alias from the environment. This has actually
++ # happened. Such a system could not be considered "sane".
++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
++alias in your environment])
++ fi
+
+-# serial 4
++ test "$[2]" = conftest.file
++ )
++then
++ # Ok.
++ :
++else
++ AC_MSG_ERROR([newly created file is older than distributed files!
++Check your system clock])
++fi
++AC_MSG_RESULT(yes)])
++
++# -*- Autoconf -*-
++
++
++# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+
+-# This was merged into AC_PROG_CC in Autoconf.
++# serial 3
++
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
+
+-AU_DEFUN([AM_PROG_CC_STDC],
+-[AC_PROG_CC
+-AC_DIAGNOSE([obsolete], [$0:
+- your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
+- `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when
+- you adjust the code. You can also remove the above call to
+- AC_PROG_CC if you already called it elsewhere.])
+-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
++
++# AM_MISSING_HAS_RUN
++# ------------------
++# Define MISSING if not defined so far and test if it supports --run.
++# If it does, set am_missing_run to use it, otherwise, to nothing.
++AC_DEFUN([AM_MISSING_HAS_RUN],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++ am_missing_run="$MISSING --run "
++else
++ am_missing_run=
++ AC_MSG_WARN([`missing' script is too old or missing])
++fi
+ ])
+-AU_DEFUN([fp_PROG_CC_STDC])
+
+-# AM_CONDITIONAL -*- Autoconf -*-
++# AM_AUX_DIR_EXPAND
+
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
++# Copyright 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
++# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+ #
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# Of course, Automake must honor this variable whenever it calls a
++# tool from the auxiliary directory. The problem is that $srcdir (and
++# therefore $ac_aux_dir as well) can be either absolute or relative,
++# depending on how configure is run. This is pretty annoying, since
++# it makes $ac_aux_dir quite unusable in subdirectories: in the top
++# source directory, any form will work fine, but in subdirectories a
++# relative path needs to be adjusted first.
++#
++# $ac_aux_dir/missing
++# fails when called from a subdirectory if $ac_aux_dir is relative
++# $top_srcdir/$ac_aux_dir/missing
++# fails if $ac_aux_dir is absolute,
++# fails when called from a subdirectory in a VPATH build with
++# a relative $ac_aux_dir
++#
++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
++# are both prefixed by $srcdir. In an in-source build this is usually
++# harmless because $srcdir is `.', but things will broke when you
++# start a VPATH build or use an absolute $srcdir.
++#
++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
++# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
++# and then we would define $MISSING as
++# MISSING="\${SHELL} $am_aux_dir/missing"
++# This will work as long as MISSING is not called from configure, because
++# unfortunately $(top_srcdir) has no meaning in configure.
++# However there are other variables, like CC, which are often used in
++# configure, and could therefore not use this "fixed" $ac_aux_dir.
++#
++# Another solution, used here, is to always expand $ac_aux_dir to an
++# absolute PATH. The drawback is that using absolute paths prevent a
++# configured tree to be moved without reconfiguration.
+
+-# serial 7
++# Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])
+
+-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+-# -------------------------------------
+-# Define a conditional.
+-AC_DEFUN([AM_CONDITIONAL],
+-[AC_PREREQ(2.52)dnl
+- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+-AC_SUBST([$1_TRUE])
+-AC_SUBST([$1_FALSE])
+-if $2; then
+- $1_TRUE=
+- $1_FALSE='#'
++AC_DEFUN([AM_AUX_DIR_EXPAND], [
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++])
++
++# AM_PROG_INSTALL_SH
++# ------------------
++# Define $install_sh.
++
++# Copyright 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++AC_DEFUN([AM_PROG_INSTALL_SH],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++install_sh=${install_sh-"$am_aux_dir/install-sh"}
++AC_SUBST(install_sh)])
++
++# AM_PROG_INSTALL_STRIP
++
++# Copyright 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# One issue with vendor `install' (even GNU) is that you can't
++# specify the program used to strip binaries. This is especially
++# annoying in cross-compiling environments, where the build's strip
++# is unlikely to handle the host's binaries.
++# Fortunately install-sh will honor a STRIPPROG variable, so we
++# always use install-sh in `make install-strip', and initialize
++# STRIPPROG with the value of the STRIP variable (set by the user).
++AC_DEFUN([AM_PROG_INSTALL_STRIP],
++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'. However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
++if test "$cross_compiling" != no; then
++ AC_CHECK_TOOL([STRIP], [strip], :)
++fi
++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++AC_SUBST([INSTALL_STRIP_PROGRAM])])
++
++# -*- Autoconf -*-
++# Copyright (C) 2003 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 1
++
++# Check whether the underlying file-system supports filenames
++# with a leading dot. For instance MS-DOS doesn't.
++AC_DEFUN([AM_SET_LEADING_DOT],
++[rm -rf .tst 2>/dev/null
++mkdir .tst 2>/dev/null
++if test -d .tst; then
++ am__leading_dot=.
+ else
+- $1_TRUE='#'
+- $1_FALSE=
++ am__leading_dot=_
+ fi
+-AC_CONFIG_COMMANDS_PRE(
+-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+- AC_MSG_ERROR([[conditional "$1" was never defined.
+-Usually this means the macro was only invoked conditionally.]])
+-fi])])
++rmdir .tst 2>/dev/null
++AC_SUBST([am__leading_dot])])
+
++# serial 5 -*- Autoconf -*-
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+
+-# serial 8
+
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -548,6 +509,7 @@ fi])])
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
++
+ # _AM_DEPENDENCIES(NAME)
+ # ----------------------
+ # See how the compiler implements dependency checking.
+@@ -606,9 +568,7 @@ AC_CACHE_CHECK([dependency style of $dep
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
++ : > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+@@ -636,14 +596,9 @@ AC_CACHE_CHECK([dependency style of $dep
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
+- # that says an option was ignored or not supported.
+- # When given -MP, icc 7.0 and 7.1 complain thusly:
+- # icc: Command line warning: ignoring option '-M'; no argument required
+- # The diagnosis changed in icc 8.0:
+- # icc: Command line remark: option '-MP' not supported
+- if (grep 'ignoring option' conftest.err ||
+- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++ # (even with -Werror). So we grep stderr for any message
++ # that says an option was ignored.
++ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+ am_cv_$1_dependencies_compiler_type=$depmode
+ break
+ fi
+@@ -677,8 +632,8 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}d
+ # ------------
+ AC_DEFUN([AM_DEP_TRACK],
+ [AC_ARG_ENABLE(dependency-tracking,
+-[ --disable-dependency-tracking speeds up one-time build
+- --enable-dependency-tracking do not reject slow dependency extractors])
++[ --disable-dependency-tracking Speeds up one-time builds
++ --enable-dependency-tracking Do not reject slow dependency extractors])
+ if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+@@ -687,16 +642,26 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_
+ AC_SUBST([AMDEPBACKSLASH])
+ ])
+
+-# Generate code to set up dependency tracking. -*- Autoconf -*-
++# Generate code to set up dependency tracking. -*- Autoconf -*-
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+
+-#serial 3
++#serial 2
+
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+@@ -715,21 +680,27 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
+ else
+ continue
+ fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
++ # Extract the definition of DEP_FILES from the Makefile without
++ # running `make'.
++ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+ test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ U=`sed -n -e '/^U = / s///p' < "$mf"`
++ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
++ # We invoke sed twice because it is the simplest approach to
++ # changing $(DEPDIR) to its actual value in the expansion.
++ for file in `sed -n -e '
++ /^DEP_FILES = .*\\\\$/ {
++ s/^DEP_FILES = //
++ :loop
++ s/\\\\$//
++ p
++ n
++ /\\\\$/ b loop
++ p
++ }
++ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+@@ -755,176 +726,26 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+ ])
+
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 8
+-
+-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
++# Check to see how 'make' treats includes. -*- Autoconf -*-
+
+-# Do all the work for Automake. -*- Autoconf -*-
++# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+
+-# serial 12
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+
+-# This macro actually does too much. Some checks are only needed if
+-# your package does certain things. But this isn't really a big deal.
+-
+-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+-# AM_INIT_AUTOMAKE([OPTIONS])
+-# -----------------------------------------------
+-# The call with PACKAGE and VERSION arguments is the old style
+-# call (pre autoconf-2.50), which is being phased out. PACKAGE
+-# and VERSION should now be passed to AC_INIT and removed from
+-# the call to AM_INIT_AUTOMAKE.
+-# We support both call styles for the transition. After
+-# the next Automake release, Autoconf can make the AC_INIT
+-# arguments mandatory, and then we can depend on a new Autoconf
+-# release and drop the old call support.
+-AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.58])dnl
+-dnl Autoconf wants to disallow AM_ names. We explicitly allow
+-dnl the ones we care about.
+-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+-AC_REQUIRE([AC_PROG_INSTALL])dnl
+-# test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+- test -f $srcdir/config.status; then
+- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+-fi
+-
+-# test whether we have cygpath
+-if test -z "$CYGPATH_W"; then
+- if (cygpath --version) >/dev/null 2>/dev/null; then
+- CYGPATH_W='cygpath -w'
+- else
+- CYGPATH_W=echo
+- fi
+-fi
+-AC_SUBST([CYGPATH_W])
+-
+-# Define the identity of the package.
+-dnl Distinguish between old-style and new-style calls.
+-m4_ifval([$2],
+-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+- AC_SUBST([PACKAGE], [$1])dnl
+- AC_SUBST([VERSION], [$2])],
+-[_AM_SET_OPTIONS([$1])dnl
+- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+-
+-_AM_IF_OPTION([no-define],,
+-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+-
+-# Some tools Automake needs.
+-AC_REQUIRE([AM_SANITY_CHECK])dnl
+-AC_REQUIRE([AC_ARG_PROGRAM])dnl
+-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+-AM_MISSING_PROG(AUTOCONF, autoconf)
+-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+-AM_MISSING_PROG(AUTOHEADER, autoheader)
+-AM_MISSING_PROG(MAKEINFO, makeinfo)
+-AM_PROG_INSTALL_SH
+-AM_PROG_INSTALL_STRIP
+-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+-# We need awk for the "check" target. The system "awk" is bad on
+-# some platforms.
+-AC_REQUIRE([AC_PROG_AWK])dnl
+-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+- [_AM_PROG_TAR([v7])])])
+-_AM_IF_OPTION([no-dependencies],,
+-[AC_PROVIDE_IFELSE([AC_PROG_CC],
+- [_AM_DEPENDENCIES(CC)],
+- [define([AC_PROG_CC],
+- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_CXX],
+- [_AM_DEPENDENCIES(CXX)],
+- [define([AC_PROG_CXX],
+- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+-])
+-])
+-
+-
+-# When config.status generates a header, we must update the stamp-h file.
+-# This file resides in the same directory as the config header
+-# that is generated. The stamp files are numbered to have different names.
+-
+-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+-# loop where config.status creates the headers, so we can generate
+-# our stamp files there.
+-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+-[# Compute $1's index in $config_headers.
+-_am_stamp_count=1
+-for _am_header in $config_headers :; do
+- case $_am_header in
+- $1 | $1:* )
+- break ;;
+- * )
+- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+- esac
+-done
+-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+-
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# AM_PROG_INSTALL_SH
+-# ------------------
+-# Define $install_sh.
+-AC_DEFUN([AM_PROG_INSTALL_SH],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+-AC_SUBST(install_sh)])
+-
+-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 2
+-
+-# Check whether the underlying file-system supports filenames
+-# with a leading dot. For instance MS-DOS doesn't.
+-AC_DEFUN([AM_SET_LEADING_DOT],
+-[rm -rf .tst 2>/dev/null
+-mkdir .tst 2>/dev/null
+-if test -d .tst; then
+- am__leading_dot=.
+-else
+- am__leading_dot=_
+-fi
+-rmdir .tst 2>/dev/null
+-AC_SUBST([am__leading_dot])])
+-
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
+-
+-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 3
++# serial 2
+
+ # AM_MAKE_INCLUDE()
+ # -----------------
+@@ -968,310 +789,2495 @@ AC_MSG_RESULT([$_am_result])
+ rm -f confinc confmf
+ ])
+
+-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
++# AM_CONDITIONAL -*- Autoconf -*-
+
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
+
+-# serial 4
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+
+-# AM_MISSING_PROG(NAME, PROGRAM)
+-# ------------------------------
+-AC_DEFUN([AM_MISSING_PROG],
+-[AC_REQUIRE([AM_MISSING_HAS_RUN])
+-$1=${$1-"${am_missing_run}$2"}
+-AC_SUBST($1)])
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+
++# serial 5
+
+-# AM_MISSING_HAS_RUN
+-# ------------------
+-# Define MISSING if not defined so far and test if it supports --run.
+-# If it does, set am_missing_run to use it, otherwise, to nothing.
+-AC_DEFUN([AM_MISSING_HAS_RUN],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+-# Use eval to expand $SHELL
+-if eval "$MISSING --run true"; then
+- am_missing_run="$MISSING --run "
++AC_PREREQ(2.52)
++
++# AM_CONDITIONAL(NAME, SHELL-CONDITION)
++# -------------------------------------
++# Define a conditional.
++AC_DEFUN([AM_CONDITIONAL],
++[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++AC_SUBST([$1_TRUE])
++AC_SUBST([$1_FALSE])
++if $2; then
++ $1_TRUE=
++ $1_FALSE='#'
+ else
+- am_missing_run=
+- AC_MSG_WARN([`missing' script is too old or missing])
++ $1_TRUE='#'
++ $1_FALSE=
+ fi
+-])
++AC_CONFIG_COMMANDS_PRE(
++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
++ AC_MSG_ERROR([conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.])
++fi])])
+
+-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+
+-# AM_PROG_MKDIR_P
+-# ---------------
+-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+-#
+-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+-# created by `make install' are always world readable, even if the
+-# installer happens to have an overly restrictive umask (e.g. 077).
+-# This was a mistake. There are at least two reasons why we must not
+-# use `-m 0755':
+-# - it causes special bits like SGID to be ignored,
+-# - it may be too restrictive (some setups expect 775 directories).
+-#
+-# Do not use -m 0755 and let people choose whatever they expect by
+-# setting umask.
+-#
+-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+-# Some implementations (such as Solaris 8's) are not thread-safe: if a
+-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+-# concurrently, both version can detect that a/ is missing, but only
+-# one can create it and the other will error out. Consequently we
+-# restrict ourselves to GNU make (using the --version option ensures
+-# this.)
+-AC_DEFUN([AM_PROG_MKDIR_P],
+-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+- # We used to keeping the `.' as first argument, in order to
+- # allow $(mkdir_p) to be used without argument. As in
+- # $(mkdir_p) $(somedir)
+- # where $(somedir) is conditionally defined. However this is wrong
+- # for two reasons:
+- # 1. if the package is installed by a user who cannot write `.'
+- # make install will fail,
+- # 2. the above comment should most certainly read
+- # $(mkdir_p) $(DESTDIR)$(somedir)
+- # so it does not work when $(somedir) is undefined and
+- # $(DESTDIR) is not.
+- # To support the latter case, we have to write
+- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+- # so the `.' trick is pointless.
+- mkdir_p='mkdir -p --'
++# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++AC_PREREQ([2.52])
++
++# serial 6
++
++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
++
++
++# Copyright 1996, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 2
++
++# @defmac AC_PROG_CC_STDC
++# @maindex PROG_CC_STDC
++# @ovindex CC
++# If the C compiler in not in ANSI C mode by default, try to add an option
++# to output variable @code{CC} to make it so. This macro tries various
++# options that select ANSI C on some system or another. It considers the
++# compiler to be in ANSI C mode if it handles function prototypes correctly.
++#
++# If you use this macro, you should check after calling it whether the C
++# compiler has been set to accept ANSI C; if not, the shell variable
++# @code{am_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source
++# code in ANSI C, you can make an un-ANSIfied copy of it by using the
++# program @code{ansi2knr}, which comes with Ghostscript.
++# @end defmac
++
++AC_DEFUN([AM_PROG_CC_STDC],
++[AC_REQUIRE([AC_PROG_CC])
++AC_BEFORE([$0], [AC_C_INLINE])
++AC_BEFORE([$0], [AC_C_CONST])
++dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require
++dnl a magic option to avoid problems with ANSI preprocessor commands
++dnl like #elif.
++dnl FIXME: can't do this because then AC_AIX won't work due to a
++dnl circular dependency.
++dnl AC_BEFORE([$0], [AC_PROG_CPP])
++AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C])
++AC_CACHE_VAL(am_cv_prog_cc_stdc,
++[am_cv_prog_cc_stdc=no
++ac_save_CC="$CC"
++# Don't try gcc -ansi; that turns off useful extensions and
++# breaks some systems' header files.
++# AIX -qlanglvl=ansi
++# Ultrix and OSF/1 -std1
++# HP-UX 10.20 and later -Ae
++# HP-UX older versions -Aa -D_HPUX_SOURCE
++# SVR4 -Xc -D__EXTENSIONS__
++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++ CC="$ac_save_CC $ac_arg"
++ AC_TRY_COMPILE(
++[#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++ char **p;
++ int i;
++{
++ return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++ char *s;
++ va_list v;
++ va_start (v,p);
++ s = g (p, va_arg (v,int));
++ va_end (v);
++ return s;
++}
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++], [
++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++],
++[am_cv_prog_cc_stdc="$ac_arg"; break])
++done
++CC="$ac_save_CC"
++])
++if test -z "$am_cv_prog_cc_stdc"; then
++ AC_MSG_RESULT([none needed])
+ else
+- # On NextStep and OpenStep, the `mkdir' command does not
+- # recognize any option. It will interpret all options as
+- # directories to create, and then abort because `.' already
+- # exists.
+- for d in ./-p ./--version;
+- do
+- test -d $d && rmdir $d
+- done
+- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+- if test -f "$ac_aux_dir/mkinstalldirs"; then
+- mkdir_p='$(mkinstalldirs)'
+- else
+- mkdir_p='$(install_sh) -d'
+- fi
++ AC_MSG_RESULT([$am_cv_prog_cc_stdc])
+ fi
+-AC_SUBST([mkdir_p])])
++case "x$am_cv_prog_cc_stdc" in
++ x|xno) ;;
++ *) CC="$CC $am_cv_prog_cc_stdc" ;;
++esac
++])
+
+-# Helper functions for option handling. -*- Autoconf -*-
++AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_STDC])
+
+-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# gettext.m4 serial 16 (gettext-0.11.4)
++dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++dnl
++dnl This file can can be used in projects which are not available under
++dnl the GNU General Public License or the GNU Library General Public
++dnl License but which still want to provide support for the GNU gettext
++dnl functionality.
++dnl Please note that the actual code of the GNU gettext library is covered
++dnl by the GNU Library General Public License, and the rest of the GNU
++dnl gettext package package is covered by the GNU General Public License.
++dnl They are *not* in the public domain.
++
++dnl Authors:
++dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
++dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002.
++
++dnl Macro to add for using GNU gettext.
++
++dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
++dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
++dnl default (if it is not specified or empty) is 'no-libtool'.
++dnl INTLSYMBOL should be 'external' for packages with no intl directory,
++dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
++dnl If INTLSYMBOL is 'use-libtool', then a libtool library
++dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
++dnl depending on --{enable,disable}-{shared,static} and on the presence of
++dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
++dnl $(top_builddir)/intl/libintl.a will be created.
++dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
++dnl implementations (in libc or libintl) without the ngettext() function
++dnl will be ignored. If NEEDSYMBOL is specified and is
++dnl 'need-formatstring-macros', then GNU gettext implementations that don't
++dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
++dnl INTLDIR is used to find the intl libraries. If empty,
++dnl the value `$(top_builddir)/intl/' is used.
++dnl
++dnl The result of the configuration is one of three cases:
++dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
++dnl and used.
++dnl Catalog format: GNU --> install in $(datadir)
++dnl Catalog extension: .mo after installation, .gmo in source tree
++dnl 2) GNU gettext has been found in the system's C library.
++dnl Catalog format: GNU --> install in $(datadir)
++dnl Catalog extension: .mo after installation, .gmo in source tree
++dnl 3) No internationalization, always use English msgid.
++dnl Catalog format: none
++dnl Catalog extension: none
++dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
++dnl The use of .gmo is historical (it was needed to avoid overwriting the
++dnl GNU format catalogs when building on a platform with an X/Open gettext),
++dnl but we keep it in order not to force irrelevant filename changes on the
++dnl maintainers.
++dnl
++AC_DEFUN([AM_GNU_GETTEXT],
++[
++ dnl Argument checking.
++ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
++ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
++])])])])])
++ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
++ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
++])])])])
++ define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
++ define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
++
++ AC_REQUIRE([AM_PO_SUBDIRS])dnl
++ ifelse(gt_included_intl, yes, [
++ AC_REQUIRE([AM_INTL_SUBDIR])dnl
++ ])
++
++ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
++ AC_REQUIRE([AC_LIB_RPATH])
++
++ dnl Sometimes libintl requires libiconv, so first search for libiconv.
++ dnl Ideally we would do this search only after the
++ dnl if test "$USE_NLS" = "yes"; then
++ dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
++ dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
++ dnl the configure script would need to contain the same shell code
++ dnl again, outside any 'if'. There are two solutions:
++ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
++ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
++ dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
++ dnl documented, we avoid it.
++ ifelse(gt_included_intl, yes, , [
++ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
++ ])
++
++ AC_MSG_CHECKING([whether NLS is requested])
++ dnl Default is enabled NLS
++ AC_ARG_ENABLE(nls,
++ [ --disable-nls do not use Native Language Support],
++ USE_NLS=$enableval, USE_NLS=yes)
++ AC_MSG_RESULT($USE_NLS)
++ AC_SUBST(USE_NLS)
++
++ ifelse(gt_included_intl, yes, [
++ BUILD_INCLUDED_LIBINTL=no
++ USE_INCLUDED_LIBINTL=no
++ ])
++ LIBINTL=
++ LTLIBINTL=
++ POSUB=
++
++ dnl If we use NLS figure out what method
++ if test "$USE_NLS" = "yes"; then
++ gt_use_preinstalled_gnugettext=no
++ ifelse(gt_included_intl, yes, [
++ AC_MSG_CHECKING([whether included gettext is requested])
++ AC_ARG_WITH(included-gettext,
++ [ --with-included-gettext use the GNU gettext library included here],
++ nls_cv_force_use_gnu_gettext=$withval,
++ nls_cv_force_use_gnu_gettext=no)
++ AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
++
++ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
++ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
++ ])
++ dnl User does not insist on using GNU NLS library. Figure out what
++ dnl to use. If GNU gettext is available we use this. Else we have
++ dnl to fall back to GNU NLS library.
++
++ dnl Add a version number to the cache macros.
++ define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
++ define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
++ define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
++
++ AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
++ [AC_TRY_LINK([#include <libintl.h>
++]ifelse([$2], [need-formatstring-macros],
++[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
++#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
++#endif
++changequote(,)dnl
++typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
++changequote([,])dnl
++], [])[extern int _nl_msg_cat_cntr;
++extern int *_nl_domain_bindings;],
++ [bindtextdomain ("", "");
++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
++ gt_cv_func_gnugettext_libc=yes,
++ gt_cv_func_gnugettext_libc=no)])
++
++ if test "$gt_cv_func_gnugettext_libc" != "yes"; then
++ dnl Sometimes libintl requires libiconv, so first search for libiconv.
++ ifelse(gt_included_intl, yes, , [
++ AM_ICONV_LINK
++ ])
++ dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
++ dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
++ dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
++ dnl even if libiconv doesn't exist.
++ AC_LIB_LINKFLAGS_BODY([intl])
++ AC_CACHE_CHECK([for GNU gettext in libintl],
++ gt_cv_func_gnugettext_libintl,
++ [gt_save_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS $INCINTL"
++ gt_save_LIBS="$LIBS"
++ LIBS="$LIBS $LIBINTL"
++ dnl Now see whether libintl exists and does not depend on libiconv.
++ AC_TRY_LINK([#include <libintl.h>
++]ifelse([$2], [need-formatstring-macros],
++[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
++#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
++#endif
++changequote(,)dnl
++typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
++changequote([,])dnl
++], [])[extern int _nl_msg_cat_cntr;
++extern
++#ifdef __cplusplus
++"C"
++#endif
++const char *_nl_expand_alias ();],
++ [bindtextdomain ("", "");
++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
++ gt_cv_func_gnugettext_libintl=yes,
++ gt_cv_func_gnugettext_libintl=no)
++ dnl Now see whether libintl exists and depends on libiconv.
++ if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
++ LIBS="$LIBS $LIBICONV"
++ AC_TRY_LINK([#include <libintl.h>
++]ifelse([$2], [need-formatstring-macros],
++[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
++#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
++#endif
++changequote(,)dnl
++typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
++changequote([,])dnl
++], [])[extern int _nl_msg_cat_cntr;
++extern
++#ifdef __cplusplus
++"C"
++#endif
++const char *_nl_expand_alias ();],
++ [bindtextdomain ("", "");
++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
++ [LIBINTL="$LIBINTL $LIBICONV"
++ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
++ gt_cv_func_gnugettext_libintl=yes
++ ])
++ fi
++ CPPFLAGS="$gt_save_CPPFLAGS"
++ LIBS="$gt_save_LIBS"])
++ fi
++
++ dnl If an already present or preinstalled GNU gettext() is found,
++ dnl use it. But if this macro is used in GNU gettext, and GNU
++ dnl gettext is already preinstalled in libintl, we update this
++ dnl libintl. (Cf. the install rule in intl/Makefile.in.)
++ if test "$gt_cv_func_gnugettext_libc" = "yes" \
++ || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
++ && test "$PACKAGE" != gettext; }; then
++ gt_use_preinstalled_gnugettext=yes
++ else
++ dnl Reset the values set by searching for libintl.
++ LIBINTL=
++ LTLIBINTL=
++ INCINTL=
++ fi
++
++ ifelse(gt_included_intl, yes, [
++ if test "$gt_use_preinstalled_gnugettext" != "yes"; then
++ dnl GNU gettext is not found in the C library.
++ dnl Fall back on included GNU gettext library.
++ nls_cv_use_gnu_gettext=yes
++ fi
++ fi
+
+-# serial 3
++ if test "$nls_cv_use_gnu_gettext" = "yes"; then
++ dnl Mark actions used to generate GNU NLS library.
++ INTLOBJS="\$(GETTOBJS)"
++ BUILD_INCLUDED_LIBINTL=yes
++ USE_INCLUDED_LIBINTL=yes
++ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
++ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
++ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
++ fi
+
+-# _AM_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++ if test "$gt_use_preinstalled_gnugettext" = "yes" \
++ || test "$nls_cv_use_gnu_gettext" = "yes"; then
++ dnl Mark actions to use GNU gettext tools.
++ CATOBJEXT=.gmo
++ fi
++ ])
+
+-# _AM_SET_OPTION(NAME)
+-# ------------------------------
+-# Set option NAME. Presently that only means defining a flag for this option.
+-AC_DEFUN([_AM_SET_OPTION],
+-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++ if test "$gt_use_preinstalled_gnugettext" = "yes" \
++ || test "$nls_cv_use_gnu_gettext" = "yes"; then
++ AC_DEFINE(ENABLE_NLS, 1,
++ [Define to 1 if translation of program messages to the user's native language
++ is requested.])
++ else
++ USE_NLS=no
++ fi
++ fi
+
+-# _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
+-# OPTIONS is a space-separated list of Automake options.
+-AC_DEFUN([_AM_SET_OPTIONS],
+-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++ if test "$USE_NLS" = "yes"; then
+
+-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+-# -------------------------------------------
+-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+-AC_DEFUN([_AM_IF_OPTION],
+-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
++ if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
++ AC_MSG_CHECKING([how to link with libintl])
++ AC_MSG_RESULT([$LIBINTL])
++ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
++ fi
+
+-# Check to make sure that the build environment is sane. -*- Autoconf -*-
++ dnl For backward compatibility. Some packages may be using this.
++ AC_DEFINE(HAVE_GETTEXT, 1,
++ [Define if the GNU gettext() function is already present or preinstalled.])
++ AC_DEFINE(HAVE_DCGETTEXT, 1,
++ [Define if the GNU dcgettext() function is already present or preinstalled.])
++ fi
+
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ dnl We need to process the po/ directory.
++ POSUB=po
++ fi
+
+-# serial 4
++ ifelse(gt_included_intl, yes, [
++ dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
++ dnl to 'yes' because some of the testsuite requires it.
++ if test "$PACKAGE" = gettext; then
++ BUILD_INCLUDED_LIBINTL=yes
++ fi
+
+-# AM_SANITY_CHECK
+-# ---------------
+-AC_DEFUN([AM_SANITY_CHECK],
+-[AC_MSG_CHECKING([whether build environment is sane])
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+-# Do `set' in a subshell so we don't clobber the current shell's
+-# arguments. Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-if (
+- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+- if test "$[*]" = "X"; then
+- # -L didn't work.
+- set X `ls -t $srcdir/configure conftest.file`
+- fi
+- rm -f conftest.file
+- if test "$[*]" != "X $srcdir/configure conftest.file" \
+- && test "$[*]" != "X conftest.file $srcdir/configure"; then
++ dnl Make all variables we use known to autoconf.
++ AC_SUBST(BUILD_INCLUDED_LIBINTL)
++ AC_SUBST(USE_INCLUDED_LIBINTL)
++ AC_SUBST(CATOBJEXT)
++ AC_SUBST(INTLOBJS)
++
++ dnl For backward compatibility. Some configure.ins may be using this.
++ nls_cv_header_intl=
++ nls_cv_header_libgt=
++
++ dnl For backward compatibility. Some Makefiles may be using this.
++ DATADIRNAME=share
++ AC_SUBST(DATADIRNAME)
++
++ dnl For backward compatibility. Some Makefiles may be using this.
++ INSTOBJEXT=.mo
++ AC_SUBST(INSTOBJEXT)
++
++ dnl For backward compatibility. Some Makefiles may be using this.
++ GENCAT=gencat
++ AC_SUBST(GENCAT)
++
++ dnl Enable libtool support if the surrounding package wishes it.
++ INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
++ AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
++ ])
++
++ dnl For backward compatibility. Some Makefiles may be using this.
++ INTLLIBS="$LIBINTL"
++ AC_SUBST(INTLLIBS)
++
++ dnl Make all documented variables known to autoconf.
++ AC_SUBST(LIBINTL)
++ AC_SUBST(LTLIBINTL)
++ AC_SUBST(POSUB)
++])
+
+- # If neither matched, then we have a broken ls. This can happen
+- # if, for instance, CONFIG_SHELL is bash and it inherits a
+- # broken ls alias from the environment. This has actually
+- # happened. Such a system could not be considered "sane".
+- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+-alias in your environment])
+- fi
+
+- test "$[2]" = conftest.file
+- )
+-then
+- # Ok.
+- :
+-else
+- AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
+-fi
+-AC_MSG_RESULT(yes)])
++dnl Checks for all prerequisites of the po subdirectory,
++dnl except for USE_NLS.
++AC_DEFUN([AM_PO_SUBDIRS],
++[
++ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++ AC_REQUIRE([AC_PROG_INSTALL])dnl
++ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
++
++ dnl Perform the following tests also if --disable-nls has been given,
++ dnl because they are needed for "make dist" to work.
++
++ dnl Search for GNU msgfmt in the PATH.
++ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
++ dnl The second test excludes FreeBSD msgfmt.
++ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
++ [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
++ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
++ :)
++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++
++ dnl Search for GNU xgettext 0.11 or newer in the PATH.
++ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
++ dnl The second test excludes FreeBSD xgettext.
++ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
++ [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
++ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
++ :)
++ dnl Remove leftover from FreeBSD xgettext call.
++ rm -f messages.po
++
++ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
++ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
++ [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
++
++ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
++ dnl Test whether we really found GNU msgfmt.
++ if test "$GMSGFMT" != ":"; then
++ dnl If it is no GNU msgfmt we define it as : so that the
++ dnl Makefiles still can work.
++ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
++ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
++ : ;
++ else
++ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
++ AC_MSG_RESULT(
++ [found $GMSGFMT program is not GNU msgfmt; ignore it])
++ GMSGFMT=":"
++ fi
++ fi
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
++ dnl Test whether we really found GNU xgettext.
++ if test "$XGETTEXT" != ":"; then
++ dnl If it is no GNU xgettext we define it as : so that the
++ dnl Makefiles still can work.
++ if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
++ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
++ : ;
++ else
++ AC_MSG_RESULT(
++ [found xgettext program is not GNU xgettext; ignore it])
++ XGETTEXT=":"
++ fi
++ dnl Remove leftover from FreeBSD xgettext call.
++ rm -f messages.po
++ fi
+
+-# AM_PROG_INSTALL_STRIP
+-# ---------------------
+-# One issue with vendor `install' (even GNU) is that you can't
+-# specify the program used to strip binaries. This is especially
+-# annoying in cross-compiling environments, where the build's strip
+-# is unlikely to handle the host's binaries.
+-# Fortunately install-sh will honor a STRIPPROG variable, so we
+-# always use install-sh in `make install-strip', and initialize
+-# STRIPPROG with the value of the STRIP variable (set by the user).
+-AC_DEFUN([AM_PROG_INSTALL_STRIP],
+-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'. However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+-if test "$cross_compiling" != no; then
+- AC_CHECK_TOOL([STRIP], [strip], :)
+-fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+-AC_SUBST([INSTALL_STRIP_PROGRAM])])
++ AC_OUTPUT_COMMANDS([
++ for ac_file in $CONFIG_FILES; do
++ # Support "outfile[:infile[:infile...]]"
++ case "$ac_file" in
++ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
++ esac
++ # PO directories have a Makefile.in generated from Makefile.in.in.
++ case "$ac_file" in */Makefile.in)
++ # Adjust a relative srcdir.
++ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
++ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
++ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
++ # In autoconf-2.13 it is called $ac_given_srcdir.
++ # In autoconf-2.50 it is called $srcdir.
++ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
++ case "$ac_given_srcdir" in
++ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
++ /*) top_srcdir="$ac_given_srcdir" ;;
++ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
++ esac
++ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
++ rm -f "$ac_dir/POTFILES"
++ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
++ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
++ # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
++ # on $ac_dir but don't depend on user-specified configuration
++ # parameters.
++ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
++ # The LINGUAS file contains the set of available languages.
++ if test -n "$ALL_LINGUAS"; then
++ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
++ fi
++ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
++ # Hide the ALL_LINGUAS assigment from automake.
++ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
++ fi
++ case "$ac_given_srcdir" in
++ .) srcdirpre= ;;
++ *) srcdirpre='$(srcdir)/' ;;
++ esac
++ POFILES=
++ GMOFILES=
++ UPDATEPOFILES=
++ DUMMYPOFILES=
++ for lang in $ALL_LINGUAS; do
++ POFILES="$POFILES $srcdirpre$lang.po"
++ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
++ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
++ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
++ done
++ # CATALOGS depends on both $ac_dir and the user's LINGUAS
++ # environment variable.
++ INST_LINGUAS=
++ if test -n "$ALL_LINGUAS"; then
++ for presentlang in $ALL_LINGUAS; do
++ useit=no
++ if test "%UNSET%" != "$LINGUAS"; then
++ desiredlanguages="$LINGUAS"
++ else
++ desiredlanguages="$ALL_LINGUAS"
++ fi
++ for desiredlang in $desiredlanguages; do
++ # Use the presentlang catalog if desiredlang is
++ # a. equal to presentlang, or
++ # b. a variant of presentlang (because in this case,
++ # presentlang can be used as a fallback for messages
++ # which are not translated in the desiredlang catalog).
++ case "$desiredlang" in
++ "$presentlang"*) useit=yes;;
++ esac
++ done
++ if test $useit = yes; then
++ INST_LINGUAS="$INST_LINGUAS $presentlang"
++ fi
++ done
++ fi
++ CATALOGS=
++ if test -n "$INST_LINGUAS"; then
++ for lang in $INST_LINGUAS; do
++ CATALOGS="$CATALOGS $lang.gmo"
++ done
++ fi
++ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
++ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
++ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
++ if test -f "$f"; then
++ case "$f" in
++ *.orig | *.bak | *~) ;;
++ *) cat "$f" >> "$ac_dir/Makefile" ;;
++ esac
++ fi
++ done
++ fi
++ ;;
++ esac
++ done],
++ [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
++ # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
++ # from automake.
++ eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
++ # Capture the value of LINGUAS because we need it to compute CATALOGS.
++ LINGUAS="${LINGUAS-%UNSET%}"
++ ])
++])
+
+-# Check how to create a tarball. -*- Autoconf -*-
+
+-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++dnl Checks for all prerequisites of the intl subdirectory,
++dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
++dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
++AC_DEFUN([AM_INTL_SUBDIR],
++[
++ AC_REQUIRE([AC_PROG_INSTALL])dnl
++ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
++ AC_REQUIRE([AC_PROG_CC])dnl
++ AC_REQUIRE([AC_CANONICAL_HOST])dnl
++ AC_REQUIRE([AC_PROG_RANLIB])dnl
++ AC_REQUIRE([AC_ISC_POSIX])dnl
++ AC_REQUIRE([AC_HEADER_STDC])dnl
++ AC_REQUIRE([AC_C_CONST])dnl
++ AC_REQUIRE([AC_C_INLINE])dnl
++ AC_REQUIRE([AC_TYPE_OFF_T])dnl
++ AC_REQUIRE([AC_TYPE_SIZE_T])dnl
++ AC_REQUIRE([AC_FUNC_ALLOCA])dnl
++ AC_REQUIRE([AC_FUNC_MMAP])dnl
++ AC_REQUIRE([jm_GLIBC21])dnl
++ AC_REQUIRE([gt_INTDIV0])dnl
++ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
++ AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
++ AC_REQUIRE([gt_INTTYPES_PRI])dnl
++
++ AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
++stdlib.h string.h unistd.h sys/param.h])
++ AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
++geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
++strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
++
++ AM_ICONV
++ AM_LANGINFO_CODESET
++ if test $ac_cv_header_locale_h = yes; then
++ AM_LC_MESSAGES
++ fi
+
+-# serial 2
++ dnl intl/plural.c is generated from intl/plural.y. It requires bison,
++ dnl because plural.y uses bison specific features. It requires at least
++ dnl bison-1.26 because earlier versions generate a plural.c that doesn't
++ dnl compile.
++ dnl bison is only needed for the maintainer (who touches plural.y). But in
++ dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
++ dnl the rule in general Makefile. Now, some people carelessly touch the
++ dnl files or have a broken "make" program, hence the plural.c rule will
++ dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
++ dnl present or too old.
++ AC_CHECK_PROGS([INTLBISON], [bison])
++ if test -z "$INTLBISON"; then
++ ac_verc_fail=yes
++ else
++ dnl Found it, now check the version.
++ AC_MSG_CHECKING([version of bison])
++changequote(<<,>>)dnl
++ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
++ case $ac_prog_version in
++ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
++ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
++changequote([,])dnl
++ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
++ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
++ esac
++ AC_MSG_RESULT([$ac_prog_version])
++ fi
++ if test $ac_verc_fail = yes; then
++ INTLBISON=:
++ fi
++])
+
+-# _AM_PROG_TAR(FORMAT)
+-# --------------------
+-# Check how to create a tarball in format FORMAT.
+-# FORMAT should be one of `v7', `ustar', or `pax'.
+-#
+-# Substitute a variable $(am__tar) that is a command
+-# writing to stdout a FORMAT-tarball containing the directory
+-# $tardir.
+-# tardir=directory && $(am__tar) > result.tar
+-#
+-# Substitute a variable $(am__untar) that extract such
+-# a tarball read from stdin.
+-# $(am__untar) < result.tar
+-AC_DEFUN([_AM_PROG_TAR],
+-[# Always define AMTAR for backward compatibility.
+-AM_MISSING_PROG([AMTAR], [tar])
+-m4_if([$1], [v7],
+- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+- [m4_case([$1], [ustar],, [pax],,
+- [m4_fatal([Unknown tar format])])
+-AC_MSG_CHECKING([how to create a $1 tar archive])
+-# Loop over all known methods to create a tar archive until one works.
+-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+-# Do not fold the above two line into one, because Tru64 sh and
+-# Solaris sh will not grok spaces in the rhs of `-'.
+-for _am_tool in $_am_tools
+-do
+- case $_am_tool in
+- gnutar)
+- for _am_tar in tar gnutar gtar;
+- do
+- AM_RUN_LOG([$_am_tar --version]) && break
++
++AC_DEFUN([AM_MKINSTALLDIRS],
++[
++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
++ dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
++ dnl Try to locate is.
++ MKINSTALLDIRS=
++ if test -n "$ac_aux_dir"; then
++ case "$ac_aux_dir" in
++ /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
++ *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
++ esac
++ fi
++ if test -z "$MKINSTALLDIRS"; then
++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++ fi
++ AC_SUBST(MKINSTALLDIRS)
++])
++
++
++dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
++AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
++
++# lib-prefix.m4 serial 1 (gettext-0.11)
++dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++dnl From Bruno Haible.
++
++dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
++dnl to access previously installed libraries. The basic assumption is that
++dnl a user will want packages to use other packages he previously installed
++dnl with the same --prefix option.
++dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
++dnl libraries, but is otherwise very convenient.
++AC_DEFUN([AC_LIB_PREFIX],
++[
++ AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
++ AC_REQUIRE([AC_PROG_CC])
++ AC_REQUIRE([AC_CANONICAL_HOST])
++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
++ dnl By default, look in $includedir and $libdir.
++ use_additional=yes
++ AC_LIB_WITH_FINAL_PREFIX([
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++ ])
++ AC_ARG_WITH([lib-prefix],
++[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
++ --without-lib-prefix don't search for libraries in includedir and libdir],
++[
++ if test "X$withval" = "Xno"; then
++ use_additional=no
++ else
++ if test "X$withval" = "X"; then
++ AC_LIB_WITH_FINAL_PREFIX([
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++ ])
++ else
++ additional_includedir="$withval/include"
++ additional_libdir="$withval/lib"
++ fi
++ fi
++])
++ if test $use_additional = yes; then
++ dnl Potentially add $additional_includedir to $CPPFLAGS.
++ dnl But don't add it
++ dnl 1. if it's the standard /usr/include,
++ dnl 2. if it's already present in $CPPFLAGS,
++ dnl 3. if it's /usr/local/include and we are using GCC on Linux,
++ dnl 4. if it doesn't exist as a directory.
++ if test "X$additional_includedir" != "X/usr/include"; then
++ haveit=
++ for x in $CPPFLAGS; do
++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
++ if test "X$x" = "X-I$additional_includedir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test "X$additional_includedir" = "X/usr/local/include"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux*) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ if test -d "$additional_includedir"; then
++ dnl Really add $additional_includedir to $CPPFLAGS.
++ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
++ fi
++ fi
++ fi
++ fi
++ dnl Potentially add $additional_libdir to $LDFLAGS.
++ dnl But don't add it
++ dnl 1. if it's the standard /usr/lib,
++ dnl 2. if it's already present in $LDFLAGS,
++ dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
++ dnl 4. if it doesn't exist as a directory.
++ if test "X$additional_libdir" != "X/usr/lib"; then
++ haveit=
++ for x in $LDFLAGS; do
++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test "X$additional_libdir" = "X/usr/local/lib"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux*) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ dnl Really add $additional_libdir to $LDFLAGS.
++ LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
++ fi
++ fi
++ fi
++ fi
++ fi
++])
++
++dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
++dnl acl_final_exec_prefix, containing the values to which $prefix and
++dnl $exec_prefix will expand at the end of the configure script.
++AC_DEFUN([AC_LIB_PREPARE_PREFIX],
++[
++ dnl Unfortunately, prefix and exec_prefix get only finally determined
++ dnl at the end of configure.
++ if test "X$prefix" = "XNONE"; then
++ acl_final_prefix="$ac_default_prefix"
++ else
++ acl_final_prefix="$prefix"
++ fi
++ if test "X$exec_prefix" = "XNONE"; then
++ acl_final_exec_prefix='${prefix}'
++ else
++ acl_final_exec_prefix="$exec_prefix"
++ fi
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
++ prefix="$acl_save_prefix"
++])
++
++dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
++dnl variables prefix and exec_prefix bound to the values they will have
++dnl at the end of the configure script.
++AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
++[
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ $1
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++])
++
++# lib-link.m4 serial 3 (gettext-0.11.3)
++dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++dnl From Bruno Haible.
++
++dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
++dnl the libraries corresponding to explicit and implicit dependencies.
++dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
++dnl augments the CPPFLAGS variable.
++AC_DEFUN([AC_LIB_LINKFLAGS],
++[
++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
++ AC_REQUIRE([AC_LIB_RPATH])
++ define([Name],[translit([$1],[./-], [___])])
++ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
++ AC_LIB_LINKFLAGS_BODY([$1], [$2])
++ ac_cv_lib[]Name[]_libs="$LIB[]NAME"
++ ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
++ ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
++ ])
++ LIB[]NAME="$ac_cv_lib[]Name[]_libs"
++ LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
++ INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
++ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
++ AC_SUBST([LIB]NAME)
++ AC_SUBST([LTLIB]NAME)
++ dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
++ dnl results of this search when this library appears as a dependency.
++ HAVE_LIB[]NAME=yes
++ undefine([Name])
++ undefine([NAME])
++])
++
++dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
++dnl searches for libname and the libraries corresponding to explicit and
++dnl implicit dependencies, together with the specified include files and
++dnl the ability to compile and link the specified testcode. If found, it
++dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
++dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
++dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
++dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
++AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
++[
++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
++ AC_REQUIRE([AC_LIB_RPATH])
++ define([Name],[translit([$1],[./-], [___])])
++ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++
++ dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
++ dnl accordingly.
++ AC_LIB_LINKFLAGS_BODY([$1], [$2])
++
++ dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
++ dnl because if the user has installed lib[]Name and not disabled its use
++ dnl via --without-lib[]Name-prefix, he wants to use it.
++ ac_save_CPPFLAGS="$CPPFLAGS"
++ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
++
++ AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
++ ac_save_LIBS="$LIBS"
++ LIBS="$LIBS $LIB[]NAME"
++ AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
++ LIBS="$ac_save_LIBS"
++ ])
++ if test "$ac_cv_lib[]Name" = yes; then
++ HAVE_LIB[]NAME=yes
++ AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
++ AC_MSG_CHECKING([how to link with lib[]$1])
++ AC_MSG_RESULT([$LIB[]NAME])
++ else
++ HAVE_LIB[]NAME=no
++ dnl If $LIB[]NAME didn't lead to a usable library, we don't need
++ dnl $INC[]NAME either.
++ CPPFLAGS="$ac_save_CPPFLAGS"
++ LIB[]NAME=
++ LTLIB[]NAME=
++ fi
++ AC_SUBST([HAVE_LIB]NAME)
++ AC_SUBST([LIB]NAME)
++ AC_SUBST([LTLIB]NAME)
++ undefine([Name])
++ undefine([NAME])
++])
++
++dnl Determine the platform dependent parameters needed to use rpath:
++dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
++dnl hardcode_direct, hardcode_minus_L,
++dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
++AC_DEFUN([AC_LIB_RPATH],
++[
++ AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
++ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
++ AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
++ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
++ AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
++ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
++ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
++ . ./conftest.sh
++ rm -f ./conftest.sh
++ acl_cv_rpath=done
++ ])
++ wl="$acl_cv_wl"
++ libext="$acl_cv_libext"
++ shlibext="$acl_cv_shlibext"
++ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
++ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
++ hardcode_direct="$acl_cv_hardcode_direct"
++ hardcode_minus_L="$acl_cv_hardcode_minus_L"
++ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
++ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
++ dnl Determine whether the user wants rpath handling at all.
++ AC_ARG_ENABLE(rpath,
++ [ --disable-rpath do not hardcode runtime library paths],
++ :, enable_rpath=yes)
++])
++
++dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
++dnl the libraries corresponding to explicit and implicit dependencies.
++dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
++AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
++[
++ define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
++ [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
++ dnl By default, look in $includedir and $libdir.
++ use_additional=yes
++ AC_LIB_WITH_FINAL_PREFIX([
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++ ])
++ AC_ARG_WITH([lib$1-prefix],
++[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
++ --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
++[
++ if test "X$withval" = "Xno"; then
++ use_additional=no
++ else
++ if test "X$withval" = "X"; then
++ AC_LIB_WITH_FINAL_PREFIX([
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++ ])
++ else
++ additional_includedir="$withval/include"
++ additional_libdir="$withval/lib"
++ fi
++ fi
++])
++ dnl Search the library and its dependencies in $additional_libdir and
++ dnl $LDFLAGS. Using breadth-first-seach.
++ LIB[]NAME=
++ LTLIB[]NAME=
++ INC[]NAME=
++ rpathdirs=
++ ltrpathdirs=
++ names_already_handled=
++ names_next_round='$1 $2'
++ while test -n "$names_next_round"; do
++ names_this_round="$names_next_round"
++ names_next_round=
++ for name in $names_this_round; do
++ already_handled=
++ for n in $names_already_handled; do
++ if test "$n" = "$name"; then
++ already_handled=yes
++ break
++ fi
++ done
++ if test -z "$already_handled"; then
++ names_already_handled="$names_already_handled $name"
++ dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
++ dnl or AC_LIB_HAVE_LINKFLAGS call.
++ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
++ eval value=\"\$HAVE_LIB$uppername\"
++ if test -n "$value"; then
++ if test "$value" = yes; then
++ eval value=\"\$LIB$uppername\"
++ test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
++ eval value=\"\$LTLIB$uppername\"
++ test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
++ else
++ dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
++ dnl that this library doesn't exist. So just drop it.
++ :
++ fi
++ else
++ dnl Search the library lib$name in $additional_libdir and $LDFLAGS
++ dnl and the already constructed $LIBNAME/$LTLIBNAME.
++ found_dir=
++ found_la=
++ found_so=
++ found_a=
++ if test $use_additional = yes; then
++ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
++ found_dir="$additional_libdir"
++ found_so="$additional_libdir/lib$name.$shlibext"
++ if test -f "$additional_libdir/lib$name.la"; then
++ found_la="$additional_libdir/lib$name.la"
++ fi
++ else
++ if test -f "$additional_libdir/lib$name.$libext"; then
++ found_dir="$additional_libdir"
++ found_a="$additional_libdir/lib$name.$libext"
++ if test -f "$additional_libdir/lib$name.la"; then
++ found_la="$additional_libdir/lib$name.la"
++ fi
++ fi
++ fi
++ fi
++ if test "X$found_dir" = "X"; then
++ for x in $LDFLAGS $LTLIB[]NAME; do
++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
++ case "$x" in
++ -L*)
++ dir=`echo "X$x" | sed -e 's/^X-L//'`
++ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
++ found_dir="$dir"
++ found_so="$dir/lib$name.$shlibext"
++ if test -f "$dir/lib$name.la"; then
++ found_la="$dir/lib$name.la"
++ fi
++ else
++ if test -f "$dir/lib$name.$libext"; then
++ found_dir="$dir"
++ found_a="$dir/lib$name.$libext"
++ if test -f "$dir/lib$name.la"; then
++ found_la="$dir/lib$name.la"
++ fi
++ fi
++ fi
++ ;;
++ esac
++ if test "X$found_dir" != "X"; then
++ break
++ fi
++ done
++ fi
++ if test "X$found_dir" != "X"; then
++ dnl Found the library.
++ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
++ if test "X$found_so" != "X"; then
++ dnl Linking with a shared library. We attempt to hardcode its
++ dnl directory into the executable's runpath, unless it's the
++ dnl standard /usr/lib.
++ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
++ dnl No hardcoding is needed.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
++ else
++ dnl Use an explicit option to hardcode DIR into the resulting
++ dnl binary.
++ dnl Potentially add DIR to ltrpathdirs.
++ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
++ haveit=
++ for x in $ltrpathdirs; do
++ if test "X$x" = "X$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ ltrpathdirs="$ltrpathdirs $found_dir"
++ fi
++ dnl The hardcoding into $LIBNAME is system dependent.
++ if test "$hardcode_direct" = yes; then
++ dnl Using DIR/libNAME.so during linking hardcodes DIR into the
++ dnl resulting binary.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
++ else
++ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
++ dnl Use an explicit option to hardcode DIR into the resulting
++ dnl binary.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
++ dnl Potentially add DIR to rpathdirs.
++ dnl The rpathdirs will be appended to $LIBNAME at the end.
++ haveit=
++ for x in $rpathdirs; do
++ if test "X$x" = "X$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ rpathdirs="$rpathdirs $found_dir"
++ fi
++ else
++ dnl Rely on "-L$found_dir".
++ dnl But don't add it if it's already contained in the LDFLAGS
++ dnl or the already constructed $LIBNAME
++ haveit=
++ for x in $LDFLAGS $LIB[]NAME; do
++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
++ if test "X$x" = "X-L$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
++ fi
++ if test "$hardcode_minus_L" != no; then
++ dnl FIXME: Not sure whether we should use
++ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
++ dnl here.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
++ else
++ dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
++ dnl here, because this doesn't fit in flags passed to the
++ dnl compiler. So give up. No hardcoding. This affects only
++ dnl very old systems.
++ dnl FIXME: Not sure whether we should use
++ dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
++ dnl here.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
++ fi
++ fi
++ fi
++ fi
++ else
++ if test "X$found_a" != "X"; then
++ dnl Linking with a static library.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
++ else
++ dnl We shouldn't come here, but anyway it's good to have a
++ dnl fallback.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
++ fi
++ fi
++ dnl Assume the include files are nearby.
++ additional_includedir=
++ case "$found_dir" in
++ */lib | */lib/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
++ additional_includedir="$basedir/include"
++ ;;
++ esac
++ if test "X$additional_includedir" != "X"; then
++ dnl Potentially add $additional_includedir to $INCNAME.
++ dnl But don't add it
++ dnl 1. if it's the standard /usr/include,
++ dnl 2. if it's /usr/local/include and we are using GCC on Linux,
++ dnl 3. if it's already present in $CPPFLAGS or the already
++ dnl constructed $INCNAME,
++ dnl 4. if it doesn't exist as a directory.
++ if test "X$additional_includedir" != "X/usr/include"; then
++ haveit=
++ if test "X$additional_includedir" = "X/usr/local/include"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux*) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ for x in $CPPFLAGS $INC[]NAME; do
++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
++ if test "X$x" = "X-I$additional_includedir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_includedir"; then
++ dnl Really add $additional_includedir to $INCNAME.
++ INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
++ fi
++ fi
++ fi
++ fi
++ fi
++ dnl Look for dependencies.
++ if test -n "$found_la"; then
++ dnl Read the .la file. It defines the variables
++ dnl dlname, library_names, old_library, dependency_libs, current,
++ dnl age, revision, installed, dlopen, dlpreopen, libdir.
++ save_libdir="$libdir"
++ case "$found_la" in
++ */* | *\\*) . "$found_la" ;;
++ *) . "./$found_la" ;;
++ esac
++ libdir="$save_libdir"
++ dnl We use only dependency_libs.
++ for dep in $dependency_libs; do
++ case "$dep" in
++ -L*)
++ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
++ dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
++ dnl But don't add it
++ dnl 1. if it's the standard /usr/lib,
++ dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
++ dnl 3. if it's already present in $LDFLAGS or the already
++ dnl constructed $LIBNAME,
++ dnl 4. if it doesn't exist as a directory.
++ if test "X$additional_libdir" != "X/usr/lib"; then
++ haveit=
++ if test "X$additional_libdir" = "X/usr/local/lib"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux*) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ haveit=
++ for x in $LDFLAGS $LIB[]NAME; do
++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ dnl Really add $additional_libdir to $LIBNAME.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
++ fi
++ fi
++ haveit=
++ for x in $LDFLAGS $LTLIB[]NAME; do
++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ dnl Really add $additional_libdir to $LTLIBNAME.
++ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
++ fi
++ fi
++ fi
++ fi
++ ;;
++ -R*)
++ dir=`echo "X$dep" | sed -e 's/^X-R//'`
++ if test "$enable_rpath" != no; then
++ dnl Potentially add DIR to rpathdirs.
++ dnl The rpathdirs will be appended to $LIBNAME at the end.
++ haveit=
++ for x in $rpathdirs; do
++ if test "X$x" = "X$dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ rpathdirs="$rpathdirs $dir"
++ fi
++ dnl Potentially add DIR to ltrpathdirs.
++ dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
++ haveit=
++ for x in $ltrpathdirs; do
++ if test "X$x" = "X$dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ ltrpathdirs="$ltrpathdirs $dir"
++ fi
++ fi
++ ;;
++ -l*)
++ dnl Handle this in the next round.
++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
++ ;;
++ *.la)
++ dnl Handle this in the next round. Throw away the .la's
++ dnl directory; it is already contained in a preceding -L
++ dnl option.
++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
++ ;;
++ *)
++ dnl Most likely an immediate library name.
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
++ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
++ ;;
++ esac
++ done
++ fi
++ else
++ dnl Didn't find the library; assume it is in the system directories
++ dnl known to the linker and runtime loader. (All the system
++ dnl directories known to the linker should also be known to the
++ dnl runtime loader, otherwise the system is severely misconfigured.)
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
++ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
++ fi
++ fi
++ fi
+ done
+- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+- am__untar="$_am_tar -xf -"
+- ;;
+- plaintar)
+- # Must skip GNU tar: if it does not support --format= it doesn't create
+- # ustar tarball either.
+- (tar --version) >/dev/null 2>&1 && continue
+- am__tar='tar chf - "$$tardir"'
+- am__tar_='tar chf - "$tardir"'
+- am__untar='tar xf -'
+- ;;
+- pax)
+- am__tar='pax -L -x $1 -w "$$tardir"'
+- am__tar_='pax -L -x $1 -w "$tardir"'
+- am__untar='pax -r'
+- ;;
+- cpio)
+- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+- am__untar='cpio -i -H $1 -d'
++ done
++ if test "X$rpathdirs" != "X"; then
++ if test -n "$hardcode_libdir_separator"; then
++ dnl Weird platform: only the last -rpath option counts, the user must
++ dnl pass all path elements in one option. We can arrange that for a
++ dnl single library, but not when more than one $LIBNAMEs are used.
++ alldirs=
++ for found_dir in $rpathdirs; do
++ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
++ done
++ dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
++ acl_save_libdir="$libdir"
++ libdir="$alldirs"
++ eval flag=\"$hardcode_libdir_flag_spec\"
++ libdir="$acl_save_libdir"
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
++ else
++ dnl The -rpath options are cumulative.
++ for found_dir in $rpathdirs; do
++ acl_save_libdir="$libdir"
++ libdir="$found_dir"
++ eval flag=\"$hardcode_libdir_flag_spec\"
++ libdir="$acl_save_libdir"
++ LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
++ done
++ fi
++ fi
++ if test "X$ltrpathdirs" != "X"; then
++ dnl When using libtool, the option that works for both libraries and
++ dnl executables is -R. The -R options are cumulative.
++ for found_dir in $ltrpathdirs; do
++ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
++ done
++ fi
++])
++
++dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
++dnl unless already present in VAR.
++dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
++dnl contains two or three consecutive elements that belong together.
++AC_DEFUN([AC_LIB_APPENDTOVAR],
++[
++ for element in [$2]; do
++ haveit=
++ for x in $[$1]; do
++ AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
++ if test "X$x" = "X$element"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ [$1]="${[$1]}${[$1]:+ }$element"
++ fi
++ done
++])
++
++# lib-ld.m4 serial 1 (gettext-0.11)
++dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++dnl Subroutines of libtool.m4,
++dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
++dnl with libtool.m4.
++
++dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
++AC_DEFUN([AC_LIB_PROG_LD_GNU],
++[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++ acl_cv_prog_gnu_ld=yes
++else
++ acl_cv_prog_gnu_ld=no
++fi])
++with_gnu_ld=$acl_cv_prog_gnu_ld
++])
++
++dnl From libtool-1.4. Sets the variable LD.
++AC_DEFUN([AC_LIB_PROG_LD],
++[AC_ARG_WITH(gnu-ld,
++[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
++test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++ac_prog=ld
++if test "$GCC" = yes; then
++ # Check if gcc -print-prog-name=ld gives a path.
++ AC_MSG_CHECKING([for ld used by GCC])
++ case $host in
++ *-*-mingw*)
++ # gcc leaves a trailing carriage return which upsets mingw
++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++ *)
++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++ esac
++ case $ac_prog in
++ # Accept absolute paths.
++ [[\\/]* | [A-Za-z]:[\\/]*)]
++ [re_direlt='/[^/][^/]*/\.\./']
++ # Canonicalize the path of ld
++ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++ done
++ test -z "$LD" && LD="$ac_prog"
++ ;;
++ "")
++ # If it fails, then pretend we aren't using GCC.
++ ac_prog=ld
+ ;;
+- none)
+- am__tar=false
+- am__tar_=false
+- am__untar=false
++ *)
++ # If it is relative, then search for the first ld in PATH.
++ with_gnu_ld=unknown
+ ;;
+ esac
++elif test "$with_gnu_ld" = yes; then
++ AC_MSG_CHECKING([for GNU ld])
++else
++ AC_MSG_CHECKING([for non-GNU ld])
++fi
++AC_CACHE_VAL(acl_cv_path_LD,
++[if test -z "$LD"; then
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
++ for ac_dir in $PATH; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++ acl_cv_path_LD="$ac_dir/$ac_prog"
++ # Check to see if the program is GNU ld. I'd rather use --version,
++ # but apparently some GNU ld's only accept -v.
++ # Break only if it was the GNU/non-GNU ld that we prefer.
++ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
++ test "$with_gnu_ld" != no && break
++ else
++ test "$with_gnu_ld" != yes && break
++ fi
++ fi
++ done
++ IFS="$ac_save_ifs"
++else
++ acl_cv_path_LD="$LD" # Let the user override the test with a path.
++fi])
++LD="$acl_cv_path_LD"
++if test -n "$LD"; then
++ AC_MSG_RESULT($LD)
++else
++ AC_MSG_RESULT(no)
++fi
++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
++AC_LIB_PROG_LD_GNU
++])
+
+- # If the value was cached, stop now. We just wanted to have am__tar
+- # and am__untar set.
+- test -n "${am_cv_prog_tar_$1}" && break
++# iconv.m4 serial AM4 (gettext-0.11.3)
++dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++dnl From Bruno Haible.
++
++AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
++[
++ dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
++ AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
++ AC_REQUIRE([AC_LIB_RPATH])
++
++ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
++ dnl accordingly.
++ AC_LIB_LINKFLAGS_BODY([iconv])
++])
+
+- # tar/untar a dummy directory, and stop if the command works
+- rm -rf conftest.dir
+- mkdir conftest.dir
+- echo GrepMe > conftest.dir/file
+- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+- rm -rf conftest.dir
+- if test -s conftest.tar; then
+- AM_RUN_LOG([$am__untar <conftest.tar])
+- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
++AC_DEFUN([AM_ICONV_LINK],
++[
++ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
++ dnl those with the standalone portable GNU libiconv installed).
++
++ dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
++ dnl accordingly.
++ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
++
++ dnl Add $INCICONV to CPPFLAGS before performing the following checks,
++ dnl because if the user has installed libiconv and not disabled its use
++ dnl via --without-libiconv-prefix, he wants to use it. The first
++ dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
++ am_save_CPPFLAGS="$CPPFLAGS"
++ AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
++
++ AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
++ am_cv_func_iconv="no, consider installing GNU libiconv"
++ am_cv_lib_iconv=no
++ AC_TRY_LINK([#include <stdlib.h>
++#include <iconv.h>],
++ [iconv_t cd = iconv_open("","");
++ iconv(cd,NULL,NULL,NULL,NULL);
++ iconv_close(cd);],
++ am_cv_func_iconv=yes)
++ if test "$am_cv_func_iconv" != yes; then
++ am_save_LIBS="$LIBS"
++ LIBS="$LIBS $LIBICONV"
++ AC_TRY_LINK([#include <stdlib.h>
++#include <iconv.h>],
++ [iconv_t cd = iconv_open("","");
++ iconv(cd,NULL,NULL,NULL,NULL);
++ iconv_close(cd);],
++ am_cv_lib_iconv=yes
++ am_cv_func_iconv=yes)
++ LIBS="$am_save_LIBS"
++ fi
++ ])
++ if test "$am_cv_func_iconv" = yes; then
++ AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+ fi
+-done
+-rm -rf conftest.dir
++ if test "$am_cv_lib_iconv" = yes; then
++ AC_MSG_CHECKING([how to link with libiconv])
++ AC_MSG_RESULT([$LIBICONV])
++ else
++ dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
++ dnl either.
++ CPPFLAGS="$am_save_CPPFLAGS"
++ LIBICONV=
++ LTLIBICONV=
++ fi
++ AC_SUBST(LIBICONV)
++ AC_SUBST(LTLIBICONV)
++])
++
++AC_DEFUN([AM_ICONV],
++[
++ AM_ICONV_LINK
++ if test "$am_cv_func_iconv" = yes; then
++ AC_MSG_CHECKING([for iconv declaration])
++ AC_CACHE_VAL(am_cv_proto_iconv, [
++ AC_TRY_COMPILE([
++#include <stdlib.h>
++#include <iconv.h>
++extern
++#ifdef __cplusplus
++"C"
++#endif
++#if defined(__STDC__) || defined(__cplusplus)
++size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
++#else
++size_t iconv();
++#endif
++], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
++ am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
++ am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
++ AC_MSG_RESULT([$]{ac_t:-
++ }[$]am_cv_proto_iconv)
++ AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
++ [Define as const if the declaration of iconv() needs const.])
++ fi
++])
++
++# progtest.m4 serial 2 (gettext-0.10.40)
++dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++dnl
++dnl This file can can be used in projects which are not available under
++dnl the GNU General Public License or the GNU Library General Public
++dnl License but which still want to provide support for the GNU gettext
++dnl functionality.
++dnl Please note that the actual code of the GNU gettext library is covered
++dnl by the GNU Library General Public License, and the rest of the GNU
++dnl gettext package package is covered by the GNU General Public License.
++dnl They are *not* in the public domain.
++
++dnl Authors:
++dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
++
++# Search path for a program which passes the given test.
++
++dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
++AC_DEFUN([AM_PATH_PROG_WITH_TEST],
++[# Extract the first word of "$2", so it can be a program name with args.
++set dummy $2; ac_word=[$]2
++AC_MSG_CHECKING([for $ac_word])
++AC_CACHE_VAL(ac_cv_path_$1,
++[case "[$]$1" in
++ /*)
++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in ifelse([$5], , $PATH, [$5]); do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ if [$3]; then
++ ac_cv_path_$1="$ac_dir/$ac_word"
++ break
++ fi
++ fi
++ done
++ IFS="$ac_save_ifs"
++dnl If no 4th arg is given, leave the cache variable unset,
++dnl so AC_PATH_PROGS will keep looking.
++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
++])dnl
++ ;;
++esac])dnl
++$1="$ac_cv_path_$1"
++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
++ AC_MSG_RESULT([$]$1)
++else
++ AC_MSG_RESULT(no)
++fi
++AC_SUBST($1)dnl
++])
++
++# isc-posix.m4 serial 2 (gettext-0.11.2)
++dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
++
++# This test replaces the one in autoconf.
++# Currently this macro should have the same name as the autoconf macro
++# because gettext's gettext.m4 (distributed in the automake package)
++# still uses it. Otherwise, the use in gettext.m4 makes autoheader
++# give these diagnostics:
++# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
++# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
++
++undefine([AC_ISC_POSIX])
++
++AC_DEFUN([AC_ISC_POSIX],
++ [
++ dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
++ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
++ ]
++)
++
++# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
++dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++# Test for the GNU C Library, version 2.1 or newer.
++# From Bruno Haible.
++
++AC_DEFUN([jm_GLIBC21],
++ [
++ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
++ ac_cv_gnu_library_2_1,
++ [AC_EGREP_CPP([Lucky GNU user],
++ [
++#include <features.h>
++#ifdef __GNU_LIBRARY__
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
++ Lucky GNU user
++ #endif
++#endif
++ ],
++ ac_cv_gnu_library_2_1=yes,
++ ac_cv_gnu_library_2_1=no)
++ ]
++ )
++ AC_SUBST(GLIBC21)
++ GLIBC21="$ac_cv_gnu_library_2_1"
++ ]
++)
++
++# intdiv0.m4 serial 1 (gettext-0.11.3)
++dnl Copyright (C) 2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++dnl From Bruno Haible.
++
++AC_DEFUN([gt_INTDIV0],
++[
++ AC_REQUIRE([AC_PROG_CC])dnl
++ AC_REQUIRE([AC_CANONICAL_HOST])dnl
++
++ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
++ gt_cv_int_divbyzero_sigfpe,
++ [
++ AC_TRY_RUN([
++#include <stdlib.h>
++#include <signal.h>
++
++static void
++#ifdef __cplusplus
++sigfpe_handler (int sig)
++#else
++sigfpe_handler (sig) int sig;
++#endif
++{
++ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */
++ exit (sig != SIGFPE);
++}
++
++int x = 1;
++int y = 0;
++int z;
++int nan;
++
++int main ()
++{
++ signal (SIGFPE, sigfpe_handler);
++/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */
++#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
++ signal (SIGTRAP, sigfpe_handler);
++#endif
++/* Linux/SPARC yields signal SIGILL. */
++#if defined (__sparc__) && defined (__linux__)
++ signal (SIGILL, sigfpe_handler);
++#endif
++
++ z = x / y;
++ nan = y / y;
++ exit (1);
++}
++], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
++ [
++ # Guess based on the CPU.
++ case "$host_cpu" in
++ alpha* | i[34567]86 | m68k | s390*)
++ gt_cv_int_divbyzero_sigfpe="guessing yes";;
++ *)
++ gt_cv_int_divbyzero_sigfpe="guessing no";;
++ esac
++ ])
++ ])
++ case "$gt_cv_int_divbyzero_sigfpe" in
++ *yes) value=1;;
++ *) value=0;;
++ esac
++ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
++ [Define if integer division by zero raises signal SIGFPE.])
++])
++
++# uintmax_t.m4 serial 6 (gettext-0.11)
++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++dnl From Paul Eggert.
++
++AC_PREREQ(2.13)
++
++# Define uintmax_t to `unsigned long' or `unsigned long long'
++# if <inttypes.h> does not exist.
++
++AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
++[
++ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
++ AC_REQUIRE([jm_AC_HEADER_STDINT_H])
++ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
++ AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
++ test $ac_cv_type_unsigned_long_long = yes \
++ && ac_type='unsigned long long' \
++ || ac_type='unsigned long'
++ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
++ [Define to unsigned long or unsigned long long
++ if <inttypes.h> and <stdint.h> don't define.])
++ fi
++])
++
++# inttypes_h.m4 serial 4 (gettext-0.11.4)
++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++dnl From Paul Eggert.
++
++# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
++# doesn't clash with <sys/types.h>, and declares uintmax_t.
++
++AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
++[
++ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
++ [AC_TRY_COMPILE(
++ [#include <sys/types.h>
++#include <inttypes.h>],
++ [uintmax_t i = (uintmax_t) -1;],
++ jm_ac_cv_header_inttypes_h=yes,
++ jm_ac_cv_header_inttypes_h=no)])
++ if test $jm_ac_cv_header_inttypes_h = yes; then
++ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
++[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
++ and declares uintmax_t. ])
++ fi
++])
++
++# stdint_h.m4 serial 2 (gettext-0.11.4)
++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++dnl From Paul Eggert.
++
++# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
++# doesn't clash with <sys/types.h>, and declares uintmax_t.
++
++AC_DEFUN([jm_AC_HEADER_STDINT_H],
++[
++ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
++ [AC_TRY_COMPILE(
++ [#include <sys/types.h>
++#include <stdint.h>],
++ [uintmax_t i = (uintmax_t) -1;],
++ jm_ac_cv_header_stdint_h=yes,
++ jm_ac_cv_header_stdint_h=no)])
++ if test $jm_ac_cv_header_stdint_h = yes; then
++ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
++[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
++ and declares uintmax_t. ])
++ fi
++])
++
++# ulonglong.m4 serial 3
++dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++dnl From Paul Eggert.
++
++# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
++
++AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
++[
++ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
++ [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
++ [unsigned long long ullmax = (unsigned long long) -1;
++ return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
++ ac_cv_type_unsigned_long_long=yes,
++ ac_cv_type_unsigned_long_long=no)])
++ if test $ac_cv_type_unsigned_long_long = yes; then
++ AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
++ [Define if you have the 'unsigned long long' type.])
++ fi
++])
++
++# inttypes.m4 serial 1 (gettext-0.11.4)
++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++dnl From Paul Eggert.
++
++# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
++# <sys/types.h>.
++
++AC_DEFUN([gt_HEADER_INTTYPES_H],
++[
++ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
++ [
++ AC_TRY_COMPILE(
++ [#include <sys/types.h>
++#include <inttypes.h>],
++ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
++ ])
++ if test $gt_cv_header_inttypes_h = yes; then
++ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
++ [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
++ fi
++])
++
++# inttypes-pri.m4 serial 1 (gettext-0.11.4)
++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++dnl From Bruno Haible.
++
++# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
++# macros to non-string values. This is the case on AIX 4.3.3.
++
++AC_DEFUN([gt_INTTYPES_PRI],
++[
++ AC_REQUIRE([gt_HEADER_INTTYPES_H])
++ if test $gt_cv_header_inttypes_h = yes; then
++ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
++ gt_cv_inttypes_pri_broken,
++ [
++ AC_TRY_COMPILE([#include <inttypes.h>
++#ifdef PRId32
++char *p = PRId32;
++#endif
++], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
++ ])
++ fi
++ if test "$gt_cv_inttypes_pri_broken" = yes; then
++ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
++ [Define if <inttypes.h> exists and defines unusable PRI* macros.])
++ fi
++])
++
++# codeset.m4 serial AM1 (gettext-0.10.40)
++dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++
++dnl From Bruno Haible.
++
++AC_DEFUN([AM_LANGINFO_CODESET],
++[
++ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
++ [AC_TRY_LINK([#include <langinfo.h>],
++ [char* cs = nl_langinfo(CODESET);],
++ am_cv_langinfo_codeset=yes,
++ am_cv_langinfo_codeset=no)
++ ])
++ if test $am_cv_langinfo_codeset = yes; then
++ AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
++ [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
++ fi
++])
++
++# lcmessage.m4 serial 3 (gettext-0.11.3)
++dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
++dnl This file is free software, distributed under the terms of the GNU
++dnl General Public License. As a special exception to the GNU General
++dnl Public License, this file may be distributed as part of a program
++dnl that contains a configuration script generated by Autoconf, under
++dnl the same distribution terms as the rest of that program.
++dnl
++dnl This file can can be used in projects which are not available under
++dnl the GNU General Public License or the GNU Library General Public
++dnl License but which still want to provide support for the GNU gettext
++dnl functionality.
++dnl Please note that the actual code of the GNU gettext library is covered
++dnl by the GNU Library General Public License, and the rest of the GNU
++dnl gettext package package is covered by the GNU General Public License.
++dnl They are *not* in the public domain.
++
++dnl Authors:
++dnl Ulrich Drepper <drepper@cygnus.com>, 1995.
++
++# Check whether LC_MESSAGES is available in <locale.h>.
++
++AC_DEFUN([AM_LC_MESSAGES],
++[
++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
++ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
++ if test $am_cv_val_LC_MESSAGES = yes; then
++ AC_DEFINE(HAVE_LC_MESSAGES, 1,
++ [Define if your <locale.h> file defines LC_MESSAGES.])
++ fi
++])
++
++# Configure paths for GLIB
++# Owen Taylor 97-11-3
++
++dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
++dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or
++dnl gthread is specified in MODULES, pass to glib-config
++dnl
++AC_DEFUN([AM_PATH_GLIB],
++[dnl
++dnl Get the cflags and libraries from the glib-config script
++dnl
++AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)],
++ glib_config_prefix="$withval", glib_config_prefix="")
++AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)],
++ glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
++AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program],
++ , enable_glibtest=yes)
++
++ if test x$glib_config_exec_prefix != x ; then
++ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
++ if test x${GLIB_CONFIG+set} != xset ; then
++ GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
++ fi
++ fi
++ if test x$glib_config_prefix != x ; then
++ glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
++ if test x${GLIB_CONFIG+set} != xset ; then
++ GLIB_CONFIG=$glib_config_prefix/bin/glib-config
++ fi
++ fi
++
++ for module in . $4
++ do
++ case "$module" in
++ gmodule)
++ glib_config_args="$glib_config_args gmodule"
++ ;;
++ gthread)
++ glib_config_args="$glib_config_args gthread"
++ ;;
++ esac
++ done
+
+-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+-AC_SUBST([am__tar])
+-AC_SUBST([am__untar])
+-]) # _AM_PROG_TAR
++ AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
++ min_glib_version=ifelse([$1], ,0.99.7,$1)
++ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
++ no_glib=""
++ if test "$GLIB_CONFIG" = "no" ; then
++ no_glib=yes
++ else
++ GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
++ GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
++ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ if test "x$enable_glibtest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $GLIB_CFLAGS"
++ LIBS="$GLIB_LIBS $LIBS"
++dnl
++dnl Now check if the installed GLIB is sufficiently new. (Also sanity
++dnl checks the results of glib-config to some extent
++dnl
++ rm -f conf.glibtest
++ AC_TRY_RUN([
++#include <glib.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++int
++main ()
++{
++ int major, minor, micro;
++ char *tmp_version;
++
++ system ("touch conf.glibtest");
++
++ /* HP/UX 9 (%@#!) writes to sscanf strings */
++ tmp_version = g_strdup("$min_glib_version");
++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++ printf("%s, bad version string\n", "$min_glib_version");
++ exit(1);
++ }
++
++ if ((glib_major_version != $glib_config_major_version) ||
++ (glib_minor_version != $glib_config_minor_version) ||
++ (glib_micro_version != $glib_config_micro_version))
++ {
++ printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
++ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
++ glib_major_version, glib_minor_version, glib_micro_version);
++ printf ("*** was found! If glib-config was correct, then it is best\n");
++ printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++ printf("*** required on your system.\n");
++ printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
++ printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
++ printf("*** before re-running configure\n");
++ }
++ else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
++ (glib_minor_version != GLIB_MINOR_VERSION) ||
++ (glib_micro_version != GLIB_MICRO_VERSION))
++ {
++ printf("*** GLIB header files (version %d.%d.%d) do not match\n",
++ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
++ printf("*** library (version %d.%d.%d)\n",
++ glib_major_version, glib_minor_version, glib_micro_version);
++ }
++ else
++ {
++ if ((glib_major_version > major) ||
++ ((glib_major_version == major) && (glib_minor_version > minor)) ||
++ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
++ {
++ return 0;
++ }
++ else
++ {
++ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
++ glib_major_version, glib_minor_version, glib_micro_version);
++ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
++ major, minor, micro);
++ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
++ printf("***\n");
++ printf("*** If you have already installed a sufficiently new version, this error\n");
++ printf("*** probably means that the wrong copy of the glib-config shell script is\n");
++ printf("*** being found. The easiest way to fix this is to remove the old version\n");
++ printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
++ printf("*** correct copy of glib-config. (In this case, you will have to\n");
++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++ printf("*** so that the correct libraries are found at run-time))\n");
++ }
++ }
++ return 1;
++}
++],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ if test "x$no_glib" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test "$GLIB_CONFIG" = "no" ; then
++ echo "*** The glib-config script installed by GLIB could not be found"
++ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or set the GLIB_CONFIG environment variable to the"
++ echo "*** full path to glib-config."
++ else
++ if test -f conf.glibtest ; then
++ :
++ else
++ echo "*** Could not run GLIB test program, checking why..."
++ CFLAGS="$CFLAGS $GLIB_CFLAGS"
++ LIBS="$LIBS $GLIB_LIBS"
++ AC_TRY_LINK([
++#include <glib.h>
++#include <stdio.h>
++], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding GLIB or finding the wrong"
++ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++ echo "***"
++ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
++ echo "*** came with the system with the command"
++ echo "***"
++ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
++ echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
++ echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ GLIB_CFLAGS=""
++ GLIB_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
++ AC_SUBST(GLIB_CFLAGS)
++ AC_SUBST(GLIB_LIBS)
++ rm -f conf.glibtest
++])
++
++# Configure paths for GTK+
++# Owen Taylor 97-11-3
++
++dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
++dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
++dnl
++AC_DEFUN([AM_PATH_GTK],
++[dnl
++dnl Get the cflags and libraries from the gtk-config script
++dnl
++AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
++ gtk_config_prefix="$withval", gtk_config_prefix="")
++AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
++ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
++AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
++ , enable_gtktest=yes)
++
++ for module in . $4
++ do
++ case "$module" in
++ gthread)
++ gtk_config_args="$gtk_config_args gthread"
++ ;;
++ esac
++ done
++
++ if test x$gtk_config_exec_prefix != x ; then
++ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
++ if test x${GTK_CONFIG+set} != xset ; then
++ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
++ fi
++ fi
++ if test x$gtk_config_prefix != x ; then
++ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
++ if test x${GTK_CONFIG+set} != xset ; then
++ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
++ fi
++ fi
++
++ AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
++ min_gtk_version=ifelse([$1], ,0.99.7,$1)
++ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
++ no_gtk=""
++ if test "$GTK_CONFIG" = "no" ; then
++ no_gtk=yes
++ else
++ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
++ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
++ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++ if test "x$enable_gtktest" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $GTK_CFLAGS"
++ LIBS="$GTK_LIBS $LIBS"
++dnl
++dnl Now check if the installed GTK is sufficiently new. (Also sanity
++dnl checks the results of gtk-config to some extent
++dnl
++ rm -f conf.gtktest
++ AC_TRY_RUN([
++#include <gtk/gtk.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++int
++main ()
++{
++ int major, minor, micro;
++ char *tmp_version;
++
++ system ("touch conf.gtktest");
++
++ /* HP/UX 9 (%@#!) writes to sscanf strings */
++ tmp_version = g_strdup("$min_gtk_version");
++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++ printf("%s, bad version string\n", "$min_gtk_version");
++ exit(1);
++ }
++
++ if ((gtk_major_version != $gtk_config_major_version) ||
++ (gtk_minor_version != $gtk_config_minor_version) ||
++ (gtk_micro_version != $gtk_config_micro_version))
++ {
++ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
++ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
++ gtk_major_version, gtk_minor_version, gtk_micro_version);
++ printf ("*** was found! If gtk-config was correct, then it is best\n");
++ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
++ printf("*** required on your system.\n");
++ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
++ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
++ printf("*** before re-running configure\n");
++ }
++#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
++ else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
++ (gtk_minor_version != GTK_MINOR_VERSION) ||
++ (gtk_micro_version != GTK_MICRO_VERSION))
++ {
++ printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
++ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
++ printf("*** library (version %d.%d.%d)\n",
++ gtk_major_version, gtk_minor_version, gtk_micro_version);
++ }
++#endif /* defined (GTK_MAJOR_VERSION) ... */
++ else
++ {
++ if ((gtk_major_version > major) ||
++ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
++ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
++ {
++ return 0;
++ }
++ else
++ {
++ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
++ gtk_major_version, gtk_minor_version, gtk_micro_version);
++ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
++ major, minor, micro);
++ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
++ printf("***\n");
++ printf("*** If you have already installed a sufficiently new version, this error\n");
++ printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
++ printf("*** being found. The easiest way to fix this is to remove the old version\n");
++ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
++ printf("*** correct copy of gtk-config. (In this case, you will have to\n");
++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
++ printf("*** so that the correct libraries are found at run-time))\n");
++ }
++ }
++ return 1;
++}
++],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ if test "x$no_gtk" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test "$GTK_CONFIG" = "no" ; then
++ echo "*** The gtk-config script installed by GTK could not be found"
++ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or set the GTK_CONFIG environment variable to the"
++ echo "*** full path to gtk-config."
++ else
++ if test -f conf.gtktest ; then
++ :
++ else
++ echo "*** Could not run GTK test program, checking why..."
++ CFLAGS="$CFLAGS $GTK_CFLAGS"
++ LIBS="$LIBS $GTK_LIBS"
++ AC_TRY_LINK([
++#include <gtk/gtk.h>
++#include <stdio.h>
++], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding GTK or finding the wrong"
++ echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
++ echo "***"
++ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
++ echo "*** came with the system with the command"
++ echo "***"
++ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means GTK was incorrectly installed"
++ echo "*** or that you have moved GTK since it was installed. In the latter case, you"
++ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ GTK_CFLAGS=""
++ GTK_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
++ AC_SUBST(GTK_CFLAGS)
++ AC_SUBST(GTK_LIBS)
++ rm -f conf.gtktest
++])
+
+diff -pruN dillo-0.8.6/autogen.sh dillo-0.8.6-i18n-misc-20060709/autogen.sh
+--- dillo-0.8.6/autogen.sh 1970-01-01 09:00:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/autogen.sh 2006-05-16 01:21:07.000000000 +0900
+@@ -0,0 +1,58 @@
++#!/bin/sh
++#
++# Script to generate configure&make stuff
++#
++
++#-----------------------------------------------------
++# If defined, get these programs from the environment
++#
++: ${ACLOCAL:=aclocal}
++: ${AUTOHEADER:=autoheader}
++: ${AUTOCONF:=autoconf}
++: ${AUTOMAKE:=automake}
++
++#-------------------------
++# Required binaries check
++#
++check_bin_file(){
++ which $1 > /dev/null 2>&1
++ if [ $? = 0 ]; then
++ return 0
++ else
++ return 1
++ fi
++}
++
++#------
++# Main
++#
++clear
++ERR="no"
++for cmd in "$ACLOCAL" "$AUTOHEADER" "$AUTOCONF" "$AUTOMAKE"
++do
++ if check_bin_file "$cmd"
++ then
++ echo -e "$cmd \tfound"
++ else
++ echo -e "$cmd \tNOT found"
++ ERR="yes"
++ fi
++done
++
++if test $ERR = "yes"
++then
++ echo
++ echo "ERROR: to run this program you need the following installed"
++ echo " $ACLOCAL $AUTOHEADER $AUTOCONF $AUTOMAKE"
++ echo
++ exit 1
++fi
++
++echo "[Checks passed]"
++echo "Generating..."
++
++"$ACLOCAL"
++"$AUTOHEADER"
++"$AUTOCONF"
++"$AUTOMAKE" -a -c
++
+diff -pruN dillo-0.8.6/bm-update dillo-0.8.6-i18n-misc-20060709/bm-update
+--- dillo-0.8.6/bm-update 1970-01-01 09:00:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/bm-update 2006-07-09 00:32:51.000000000 +0900
+@@ -0,0 +1,54 @@
++#!/bin/sh
++SED=`which sed`
++if test "x$SED" = "x"; then
++ echo "ERROR: sed not found"
++ exit
++fi
++ICONV=`which iconv`
++if test "x$ICONV" = "x"; then
++ echo "ERROR: iconv not found"
++ exit
++fi
++
++CONVTEST=`LANG=C iconv -f UTF-8 -t UTF-8 ~/.dillo/bm.txt -o ~/.dillo/bm.txt.update 2>&1| sed -e "s/.*illegal.*/illegal/g"`
++
++rm -f ~/.dillo/bm.txt.update
++if test "x$CONVTEST" = "xillegal"; then
++ echo "bookmark needs update."
++else
++ echo "already updated.(or no bookmark)"
++ exit
++fi
++
++CHARSET=`locale | grep "LC_CTYPE.*\." | sed -e "s/^.*\.//g" -e "s/\"//g"`
++if test "x$CHARSET" = "x"; then
++ CHARSET="iso88591"
++fi
++
++case $CHARSET in
++ iso885915@euro)
++ CHARSET="iso885915"
++ ;;
++ koi8t)
++ CHARSET="koi8-t"
++ ;;
++ utf8*)
++ CHARSET="utf8"
++ ;;
++esac
++
++CONVTEST=`LANG=C iconv -f $CHARSET -t UTF-8 ~/.dillo/bm.txt -o ~/.dillo/bm.txt.update 2>&1| sed -e "s/.*illegal.*/illegal/g"`
++
++if test "x$CONVTEST" = "xillegal"; then
++ rm -f ~/.dillo/bm.txt.update
++ echo "** WARNING **: bookmark was broken!"
++ for i in `cat ~/.dillo/bm.txt|sed -e "s/ /\\\\\\\\s/g"`; do
++ echo $i|sed -e "s/\\\\s/ /g" |LANG=C iconv -f $CHARSET -t UTF-8 2>&1 >> ~/.dillo/bm.txt.update | sed -e "s/.*illegal.*/\\n/g" >> ~/.dillo/bm.txt.update;
++ done
++else
++ echo "update success!"
++fi
++
++mv -f ~/.dillo/bm.txt ~/.dillo/bm.txt.old
++mv -f ~/.dillo/bm.txt.update ~/.dillo/bm.txt
++echo "backup old bookmark as ~/.dillo/bm.txt.old"
+diff -pruN dillo-0.8.6/config/Makefile.am dillo-0.8.6-i18n-misc-20060709/config/Makefile.am
+--- dillo-0.8.6/config/Makefile.am 1970-01-01 09:00:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/config/Makefile.am 2006-05-16 01:21:15.000000000 +0900
+@@ -0,0 +1,13 @@
++AM_CPPFLAGS=-DDILLORC_SYS='"$(sysconfdir)/dillorc"' @GTK_CFLAGS@ -DLOCALEDIR='"$(localedir)"'
++
++bin_PROGRAMS = dillocfg
++
++dillocfg_LDADD = @GTK_LIBS@
++dillocfg_SOURCES = dillocfg.c \
++ dillocfg.h \
++ dillocfg_option.c \
++ dillocfg_option.h \
++ dillocfg_token.h \
++ dillocfg_token.c
++
++#EXTRA_DIST = dillocfg.tcl
+diff -pruN dillo-0.8.6/config/Makefile.in dillo-0.8.6-i18n-misc-20060709/config/Makefile.in
+--- dillo-0.8.6/config/Makefile.in 1970-01-01 09:00:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/config/Makefile.in 2006-05-16 01:21:15.000000000 +0900
+@@ -0,0 +1,450 @@
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
++# @configure_input@
++
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
++
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++target_triplet = @target@
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DLGUI_FALSE = @DLGUI_FALSE@
++DLGUI_TRUE = @DLGUI_TRUE@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++GLIB_CFLAGS = @GLIB_CFLAGS@
++GLIB_CONFIG = @GLIB_CONFIG@
++GLIB_LIBS = @GLIB_LIBS@
++GMSGFMT = @GMSGFMT@
++GTK_CFLAGS = @GTK_CFLAGS@
++GTK_CONFIG = @GTK_CONFIG@
++GTK_LIBS = @GTK_LIBS@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INTLLIBS = @INTLLIBS@
++LDFLAGS = @LDFLAGS@
++LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
++LIBFLTK_LIBS = @LIBFLTK_LIBS@
++LIBICONV = @LIBICONV@
++LIBINTL = @LIBINTL@
++LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
++LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
++LIBJPEG_LIBS = @LIBJPEG_LIBS@
++LIBOBJS = @LIBOBJS@
++LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
++LIBPNG_LIBS = @LIBPNG_LIBS@
++LIBPTHREAD_LDFLAGS = @LIBPTHREAD_LDFLAGS@
++LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
++LIBS = @LIBS@
++LIBSSL_LIBS = @LIBSSL_LIBS@
++LIBZ_LIBS = @LIBZ_LIBS@
++LTLIBICONV = @LTLIBICONV@
++LTLIBINTL = @LTLIBINTL@
++LTLIBOBJS = @LTLIBOBJS@
++MAKEINFO = @MAKEINFO@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MSGFMT = @MSGFMT@
++MSGMERGE = @MSGMERGE@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++POSUB = @POSUB@
++RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++USE_NLS = @USE_NLS@
++VERSION = @VERSION@
++XFT_CONFIG = @XFT_CONFIG@
++XGETTEXT = @XGETTEXT@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_RANLIB = @ac_ct_RANLIB@
++ac_ct_STRIP = @ac_ct_STRIP@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target = @target@
++target_alias = @target_alias@
++target_cpu = @target_cpu@
++target_os = @target_os@
++target_vendor = @target_vendor@
++AM_CPPFLAGS = -DDILLORC_SYS='"$(sysconfdir)/dillorc"' @GTK_CFLAGS@ -DLOCALEDIR='"$(localedir)"'
++
++bin_PROGRAMS = dillocfg
++
++dillocfg_LDADD = @GTK_LIBS@
++dillocfg_SOURCES = dillocfg.c \
++ dillocfg.h \
++ dillocfg_option.c \
++ dillocfg_option.h \
++ dillocfg_token.h \
++ dillocfg_token.c
++
++subdir = config
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++bin_PROGRAMS = dillocfg$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS)
++
++am_dillocfg_OBJECTS = dillocfg.$(OBJEXT) dillocfg_option.$(OBJEXT) \
++ dillocfg_token.$(OBJEXT)
++dillocfg_OBJECTS = $(am_dillocfg_OBJECTS)
++dillocfg_DEPENDENCIES =
++dillocfg_LDFLAGS =
++
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dillocfg.Po \
++@AMDEP_TRUE@ ./$(DEPDIR)/dillocfg_option.Po \
++@AMDEP_TRUE@ ./$(DEPDIR)/dillocfg_token.Po
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(dillocfg_SOURCES)
++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
++SOURCES = $(dillocfg_SOURCES)
++
++all: all-am
++
++.SUFFIXES:
++.SUFFIXES: .c .o .obj
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --gnu config/Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
++install-binPROGRAMS: $(bin_PROGRAMS)
++ @$(NORMAL_INSTALL)
++ $(mkinstalldirs) $(DESTDIR)$(bindir)
++ @list='$(bin_PROGRAMS)'; for p in $$list; do \
++ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++ if test -f $$p \
++ ; then \
++ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
++ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
++ else :; fi; \
++ done
++
++uninstall-binPROGRAMS:
++ @$(NORMAL_UNINSTALL)
++ @list='$(bin_PROGRAMS)'; for p in $$list; do \
++ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
++ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++ rm -f $(DESTDIR)$(bindir)/$$f; \
++ done
++
++clean-binPROGRAMS:
++ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
++dillocfg$(EXEEXT): $(dillocfg_OBJECTS) $(dillocfg_DEPENDENCIES)
++ @rm -f dillocfg$(EXEEXT)
++ $(LINK) $(dillocfg_LDFLAGS) $(dillocfg_OBJECTS) $(dillocfg_LDADD) $(LIBS)
++
++mostlyclean-compile:
++ -rm -f *.$(OBJEXT) core *.core
++
++distclean-compile:
++ -rm -f *.tab.c
++
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dillocfg.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dillocfg_option.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dillocfg_token.Po@am__quote@
++
++.c.o:
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++@am__fastdepCC_TRUE@ fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
++
++.c.obj:
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++@am__fastdepCC_TRUE@ fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
++uninstall-info-am:
++
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ mkid -fID $$unique
++
++TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ tags=; \
++ here=`pwd`; \
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique
++
++ctags: CTAGS
++CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ tags=; \
++ here=`pwd`; \
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) ' { files[$$0] = 1; } \
++ END { for (i in files) print i; }'`; \
++ test -z "$(CTAGS_ARGS)$$tags$$unique" \
++ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++ $$tags $$unique
++
++GTAGS:
++ here=`$(am__cd) $(top_builddir) && pwd` \
++ && cd $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) $$here
++
++distclean-tags:
++ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
++
++distdir: $(DISTFILES)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
++ if test -d $$d/$$file; then \
++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ fi; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ else \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
++ || exit 1; \
++ fi; \
++ done
++check-am: all-am
++check: check-am
++all-am: Makefile $(PROGRAMS)
++
++installdirs:
++ $(mkinstalldirs) $(DESTDIR)$(bindir)
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++ -rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++ @echo "This command is intended for maintainers to use"
++ @echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
++
++distclean: distclean-am
++ -rm -rf ./$(DEPDIR)
++ -rm -f Makefile
++distclean-am: clean-am distclean-compile distclean-generic \
++ distclean-tags
++
++dvi: dvi-am
++
++dvi-am:
++
++info: info-am
++
++info-am:
++
++install-data-am:
++
++install-exec-am: install-binPROGRAMS
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++ -rm -rf ./$(DEPDIR)
++ -rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-binPROGRAMS uninstall-info-am
++
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
++ clean-generic ctags distclean distclean-compile \
++ distclean-generic distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-binPROGRAMS install-data \
++ install-data-am install-exec install-exec-am install-info \
++ install-info-am install-man install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
++ uninstall-am uninstall-binPROGRAMS uninstall-info-am
++
++
++#EXTRA_DIST = dillocfg.tcl
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+diff -pruN dillo-0.8.6/config/dillocfg.c dillo-0.8.6-i18n-misc-20060709/config/dillocfg.c
+--- dillo-0.8.6/config/dillocfg.c 1970-01-01 09:00:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/config/dillocfg.c 2006-05-16 01:21:15.000000000 +0900
+@@ -0,0 +1,482 @@
++/*
++ * File: dillocfg-gtk.c
++ *
++ * Copyright (C) 2003 Kiyo <kiyo@teki.jpn.ph>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <ctype.h>
++#include <string.h>
++#include <locale.h>
++#include <gtk/gtk.h>
++
++#include "../config.h"
++#include "../src/intl.h"
++#include "dillocfg.h"
++#include "dillocfg_option.h"
++#include "dillocfg_token.h"
++
++static gboolean modified_ = FALSE;
++
++#define IS_LINE_END(c) (c == '\0' || c == '#')
++#define SKIPSPACE(buf, i) while (!IS_LINE_END(buf[i]) && isspace(buf[i])) i++
++
++DillocfgWin *DillocfgWin_new();
++void DillocfgWin_init(DillocfgWin *d, gboolean use_default);
++void DillocfgWin_free(GtkWidget *widget, DillocfgWin *d);
++void DillocfgWin_callback_reset(GtkButton *button, gpointer user_data);
++void DillocfgWin_callback_reload(GtkButton *button, gpointer user_data);
++void DillocfgWin_callback_save(GtkButton *button, gpointer user_data);
++DillocfgInterface *DillocfgInterface_new(DillocfgWin *w, const gchar *label);
++DillocfgFont *DillocfgFont_new(DillocfgWin *w, const gchar *label);
++DillocfgColor *DillocfgColor_new(DillocfgWin *w, const gchar *label);
++DillocfgNetwork *DillocfgNetwork_new(DillocfgWin *w, const gchar *label);
++#ifndef DISABLE_TABS
++DillocfgTab *DillocfgTab_new(DillocfgWin *w, const gchar *label);
++#endif
++DillocfgOther *DillocfgOther_new(DillocfgWin *w, const gchar *label);
++DillocfgCookie *DillocfgCookie_new(DillocfgWin *w, const gchar *label);
++void ReadUserconfig(DillocfgWin *d);
++void WriteUserconfig(DillocfgWin *d);
++
++/****************************** M A I N ********************************/
++int main(int argc, char **argv) {
++ DillocfgWin *dialog;
++
++#ifdef ENABLE_NLS
++ /* set locale */
++ gtk_set_locale();
++ /* Initialize Gettext */
++ bindtextdomain (PACKAGE, LOCALEDIR);
++ textdomain (PACKAGE);
++#endif
++ /* Initialize GUI and parse GTK related args */
++ gtk_init(&argc, &argv);
++ gdk_rgb_init();
++
++ dialog = DillocfgWin_new();
++ ReadUserconfig(dialog);
++
++ /* Start the GTK+ cycle */
++ gtk_main();
++
++ //g_print("Dillocfg:normal exit\n");
++ gtk_exit (0);
++ return 0;
++}
++
++DillocfgWin *DillocfgWin_new() {
++ DillocfgWin *d = g_new(DillocfgWin, 1);
++ GtkWidget *dialog_main = gtk_window_new(GTK_WINDOW_TOPLEVEL);//DIALOG);
++ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
++ GtkWidget *button_hbox = gtk_hbox_new(FALSE, 0);
++ GtkWidget *button_reset = gtk_button_new_with_label(_("Reset"));
++ GtkWidget *button_reload = gtk_button_new_with_label(_("Reload"));
++ GtkWidget *button_save = gtk_button_new_with_label(_("Save"));
++ GtkWidget *button_quit = gtk_button_new_with_label(_("Quit"));
++
++ gtk_window_set_title(GTK_WINDOW(dialog_main), _("Dillo Preferences"));
++ gtk_window_set_policy(GTK_WINDOW(dialog_main), TRUE, TRUE, FALSE);
++ gtk_signal_connect(GTK_OBJECT(dialog_main), "delete_event",
++ GTK_SIGNAL_FUNC(gtk_widget_destroy), d);
++ gtk_signal_connect(GTK_OBJECT(dialog_main), "destroy",
++ GTK_SIGNAL_FUNC(DillocfgWin_free), d);
++ gtk_window_set_wmclass(GTK_WINDOW(dialog_main), "dillocfg", _("Dillo Preferences"));
++ gtk_widget_set_usize(dialog_main, WIDTH, HEIGHT);
++
++ d->notebook = gtk_notebook_new();
++ gtk_notebook_set_homogeneous_tabs(GTK_NOTEBOOK(d->notebook), FALSE);
++ gtk_container_add(GTK_CONTAINER(dialog_main), vbox);
++ gtk_container_add(GTK_CONTAINER(vbox), d->notebook);
++ gtk_signal_connect(GTK_OBJECT(button_reset), "clicked",
++ GTK_SIGNAL_FUNC(DillocfgWin_callback_reset), d);
++ gtk_signal_connect(GTK_OBJECT(button_reload), "clicked",
++ GTK_SIGNAL_FUNC(DillocfgWin_callback_reload), d);
++ gtk_signal_connect(GTK_OBJECT(button_save), "clicked",
++ GTK_SIGNAL_FUNC(DillocfgWin_callback_save), d);
++ gtk_signal_connect(GTK_OBJECT(button_quit), "clicked",
++ GTK_SIGNAL_FUNC(DillocfgWin_free), d);
++ gtk_box_set_spacing(GTK_BOX(button_hbox), 5);
++ gtk_container_add(GTK_CONTAINER(button_hbox), button_reset);
++ gtk_container_add(GTK_CONTAINER(button_hbox), button_reload);
++ gtk_container_add(GTK_CONTAINER(button_hbox), button_save);
++ gtk_container_add(GTK_CONTAINER(button_hbox), button_quit);
++ gtk_box_pack_end(GTK_BOX(vbox), button_hbox, FALSE, FALSE, 5);
++
++ d->list = NULL;
++ d->interface = DillocfgInterface_new(d, _("Interface"));
++ d->font = DillocfgFont_new(d, _(" Font "));
++ d->color = DillocfgColor_new(d, _(" Color "));
++ d->network = DillocfgNetwork_new(d, _(" Network "));
++#ifndef DISABLE_TABS
++ d->tab = DillocfgTab_new(d, _(" Tab "));
++#endif
++ d->cookie = NULL;//DillocfgCookie_new(d, _(" Cookie "));
++ d->other = DillocfgOther_new(d, _(" Other "));
++
++ gtk_widget_show_all(dialog_main);
++ return d;
++}
++
++void DillocfgWin_init(DillocfgWin *d, gboolean use_default) {
++ g_list_foreach(d->list, (GFunc)Option_init, (gpointer)use_default);
++}
++
++void DillocfgWin_free(GtkWidget *widget, DillocfgWin *d) {
++ g_list_foreach(d->list, (GFunc)Option_free, (gpointer)&d->list);
++ g_free(d->interface);
++ g_free(d->font);
++ g_free(d->color);
++ g_free(d->network);
++#ifndef DISABLE_TABS
++ g_free(d->tab);
++#endif
++ g_free(d->cookie);
++ g_free(d->other);
++ g_list_free(d->list);
++ g_free(d);
++ gtk_main_quit();
++}
++
++#ifndef DISABLE_TABS
++DillocfgTab *DillocfgTab_new(DillocfgWin *w, const gchar *label) {
++ DillocfgTab *t = g_new(DillocfgTab, 1);
++ gint x, y;
++ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
++ GtkWidget *table = gtk_table_new(4, 2, FALSE);
++ GtkWidget *table2 = gtk_table_new(2, 1, FALSE);
++
++ gtk_table_set_homogeneous(GTK_TABLE(table), TRUE);
++ gtk_table_set_homogeneous(GTK_TABLE(table2), TRUE);
++ gtk_container_add(GTK_CONTAINER(vbox), table);
++ gtk_container_add(GTK_CONTAINER(vbox), table2);
++ x = 0; y = 0;
++ t->tab_bar_homogeneous = Option_new(TOKEN_TAB_BAR_HOMOGENEOUS, &w->list, table, x, y++);
++ t->tab_bar_scroller = Option_new(TOKEN_TAB_BAR_SCROLLER, &w->list, table, x, y++);
++ t->tab_bar_show_fullscreen = Option_new(TOKEN_TAB_BAR_SHOW_FULLSCREEN, &w->list, table, x, y++);
++ t->tab_close_middle_click = Option_new(TOKEN_TAB_CLOSE_MIDDLE_CLICK, &w->list, table, x, y++);
++ x++; y = 0;
++ t->tab_bar_show_single_tab = Option_new(TOKEN_TAB_BAR_SHOW_SINGLE_TAB, &w->list, table, x, y++);
++ t->tab_instead_of_window = Option_new(TOKEN_TAB_INSTEAD_OF_WINDOW, &w->list, table, x, y++);
++ t->tab_load_in_background = Option_new(TOKEN_TAB_LOAD_IN_BACKGROUND, &w->list, table, x, y++);
++ t->tab_title_compress
++ = Option_new(TOKEN_TAB_TITLE_COMPRESS, &w->list, table, x, y++);
++ x = 0; y = 0;
++ t->compress_vowels = Option_new(TOKEN_COMPRESS_VOWELS, &w->list, table2, x, y++);
++ t->compress_common_prefixes = Option_new(TOKEN_COMPRESS_COMMON_PREFIXES, &w->list, table2, x, y++);
++ gtk_notebook_append_page(GTK_NOTEBOOK(w->notebook), vbox, gtk_label_new(label));
++ return t;
++}
++
++#endif
++
++DillocfgOther *DillocfgOther_new(DillocfgWin *w, const gchar *label) {
++ DillocfgOther *g = g_new(DillocfgOther, 1);
++ gint x, y;
++ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
++ GtkWidget *table = gtk_table_new(9, 1, FALSE);
++
++ gtk_table_set_homogeneous(GTK_TABLE(table), TRUE);
++ gtk_container_add(GTK_CONTAINER(vbox), table);
++ x = 0; y = 0;
++ g->w3c_plus_heuristics
++ = Option_new(TOKEN_W3C_PLUS_HEURISTICS, &w->list, table, x, y++);
++ g->use_dicache = Option_new(TOKEN_USE_DICACHE, &w->list, table, x, y++);
++ g->focus_location_on_new
++ = Option_new(TOKEN_FOCUS_LOCATION_ON_NEW, &w->list, table, x, y++);
++ g->enterpress_forces_submit
++ = Option_new(TOKEN_ENTERPRESS_FORCES_SUBMIT, &w->list, table, x, y++);
++ g->generate_submit = Option_new(TOKEN_GENERATE_SUBMIT, &w->list, table, x, y++);
++ g->limit_text_width = Option_new(TOKEN_LIMIT_TEXT_WIDTH, &w->list, table, x, y++);
++ g->search_url = Option_new(TOKEN_SEARCH_URL, &w->list, table, x, y++);
++ g->search_charset = Option_new(TOKEN_SEARCH_CHARSET, &w->list, table, x, y++);
++ g->accept_language = Option_new(TOKEN_ACCEPT_LANGUAGE, &w->list, table, x, y++);
++ g->show_msg = Option_new(TOKEN_SHOW_MSG, &w->list, table, x, y++);
++ g->show_extra_warnings = Option_new(TOKEN_SHOW_EXTRA_WARNINGS, &w->list, table, x, y++);
++ gtk_notebook_append_page(GTK_NOTEBOOK(w->notebook), vbox, gtk_label_new(label));
++ return g;
++}
++
++DillocfgInterface *DillocfgInterface_new(DillocfgWin *w, const gchar *label) {
++ DillocfgInterface *di = g_new(DillocfgInterface, 1);
++ gint x, y;
++ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
++ GtkWidget *table = gtk_table_new(10, 2, FALSE);
++
++ gtk_table_set_homogeneous (GTK_TABLE(table), FALSE);
++ gtk_container_add(GTK_CONTAINER(vbox), table);
++ x = 0; y = 0;
++ di->geometry = Option_new(TOKEN_GEOMETRY, &w->list, table, x, y++);
++ di->panel_size = Option_new(TOKEN_PANEL_SIZE, &w->list, table, x, y++);
++ di->show_back = Option_new(TOKEN_SHOW_BACK, &w->list, table, x, y++);
++ di->show_forw = Option_new(TOKEN_SHOW_FORW, &w->list, table, x, y++);
++ di->show_bookmarks = Option_new(TOKEN_SHOW_BOOKMARKS, &w->list, table, x, y++);
++ di->show_clear_url = Option_new(TOKEN_SHOW_CLEAR_URL, &w->list, table, x, y++);
++ di->show_home = Option_new(TOKEN_SHOW_HOME, &w->list, table, x, y++);
++ di->show_menubar = Option_new(TOKEN_SHOW_MENUBAR, &w->list, table, x, y++);
++ di->show_progress_box = Option_new(TOKEN_SHOW_PROGRESS_BOX, &w->list, table, x, y++);
++ di->show_reload = Option_new(TOKEN_SHOW_RELOAD, &w->list, table, x, y++);
++ x++; y = 0;
++ di->show_save = Option_new(TOKEN_SHOW_SAVE, &w->list, table, x, y++);
++ di->show_stop = Option_new(TOKEN_SHOW_STOP, &w->list, table, x, y++);
++ di->show_tooltip = Option_new(TOKEN_SHOW_TOOLTIP, &w->list, table, x, y++);
++ di->show_url = Option_new(TOKEN_SHOW_URL, &w->list, table, x, y++);
++ di->show_search = Option_new(TOKEN_SHOW_SEARCH, &w->list, table, x, y++);
++ di->small_icons = Option_new(TOKEN_SMALL_ICONS, &w->list, table, x, y++);
++ di->fullwindow_start = Option_new(TOKEN_FULLWINDOW_START, &w->list, table, x, y++);
++ di->transient_dialogs = Option_new(TOKEN_TRANSIENT_DIALOGS, &w->list, table, x, y++);
++ di->popup_dialogs = Option_new(TOKEN_POPUP_DIALOGS, &w->list, table, x, y++);
++ di->show_popup_navigation = Option_new(TOKEN_SHOW_POPUP_NAVIGATION, &w->list, table, x, y++);
++ gtk_notebook_append_page(GTK_NOTEBOOK(w->notebook), vbox, gtk_label_new(label));
++ return di;
++}
++
++DillocfgFont *DillocfgFont_new(DillocfgWin *w, const gchar *label) {
++ DillocfgFont *r = g_new(DillocfgFont, 1);
++ gint x, y;
++ GtkWidget *vbox = gtk_vbox_new(FALSE, 5);
++ GtkWidget *table = gtk_table_new(4, 1, FALSE);
++ GtkWidget *table2 = gtk_table_new(1, 2, FALSE);
++
++ gtk_table_set_homogeneous (GTK_TABLE(table), TRUE);
++ gtk_table_set_row_spacings(GTK_TABLE(table), 5);
++ gtk_table_set_homogeneous (GTK_TABLE(table2), TRUE);
++ //gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, FALSE, 5);
++ //gtk_box_pack_start(GTK_BOX(vbox), table2, TRUE, FALSE, 5);
++ gtk_container_add(GTK_CONTAINER(vbox), table);
++ gtk_container_add(GTK_CONTAINER(vbox), table2);
++ x=0; y=0;
++#ifdef DISABLE_ANTI_ALIAS
++ r->vw_fontname = Option_new(TOKEN_VW_FONT, &w->list, table, x, y++);
++#else
++ r->vw_aafontname = Option_new(TOKEN_VW_AAFONT, &w->list, table, x, y++);
++#endif
++#ifdef DISABLE_ANTI_ALIAS
++ r->fw_fontname = Option_new(TOKEN_FW_FONT, &w->list, table, x, y++);
++#else
++ r->fw_aafontname = Option_new(TOKEN_FW_AAFONT, &w->list, table, x, y++);
++#endif
++ r->font_sizes = Option_new(TOKEN_FONT_SIZES, &w->list, table, x, y++);
++ r->font_factor = Option_new(TOKEN_FONT_FACTOR, &w->list, table, x, y++);
++ x=0; y=0;
++ r->use_oblique = Option_new(TOKEN_USE_OBLIQUE, &w->list, table2, x, y++);
++ x++; y=0;
++ r->limit_font_decoration = Option_new(TOKEN_LIMIT_FONT_DECORATION, &w->list, table2, x, y++);
++
++ gtk_notebook_append_page(GTK_NOTEBOOK(w->notebook), vbox, gtk_label_new(label));
++ return r;
++}
++
++DillocfgColor *DillocfgColor_new(DillocfgWin *w, const gchar *label) {
++ DillocfgColor *c = g_new(DillocfgColor, 1);
++ gint x, y;
++ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
++ GtkWidget *table = gtk_table_new(3, 1, FALSE);
++ GtkWidget *table2 = gtk_table_new(2, 2, TRUE);
++
++ gtk_table_set_homogeneous (GTK_TABLE(table), TRUE);
++ gtk_table_set_homogeneous (GTK_TABLE(table2), FALSE);
++ gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 5);
++ gtk_box_pack_start(GTK_BOX(vbox), table2, FALSE, FALSE, 5);
++ x = 0; y = 0;
++ c->force_my_colors = Option_new(TOKEN_FORCE_MY_COLORS, &w->list, table, x, y++);
++ c->contrast_visited_color
++ = Option_new(TOKEN_CONTRAST_VISITED_COLOR, &w->list, table, x, y++);
++ c->allow_white_bg = Option_new(TOKEN_ALLOW_WHITE_BG, &w->list, table, x, y++);
++ x = 0; y = 0;
++ c->link_color = Option_new(TOKEN_LINK_COLOR, &w->list, table2, x, y++);
++ c->bg_color = Option_new(TOKEN_BG_COLOR, &w->list, table2, x, y++);
++ x++; y = 0;
++ c->visited_color = Option_new(TOKEN_VISITED_COLOR, &w->list, table2, x, y++);
++ c->text_color = Option_new(TOKEN_TEXT_COLOR, &w->list, table2, x, y++);
++
++ gtk_notebook_append_page(GTK_NOTEBOOK(w->notebook), vbox, gtk_label_new(label));
++ return c;
++}
++
++DillocfgNetwork *DillocfgNetwork_new(DillocfgWin *w, const gchar *label) {
++ DillocfgNetwork *n = g_new(DillocfgNetwork, 1);
++ gint x, y;
++ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
++ GtkWidget *table = gtk_table_new(10, 2, FALSE);
++
++ gtk_container_add(GTK_CONTAINER(vbox), table);
++ x = 0; y = 0;
++ n->user_agent = Option_new(TOKEN_USER_AGENT, &w->list, table, x, y++);
++ n->home = Option_new(TOKEN_HOME, &w->list, table, x, y++);
++ n->start_page = Option_new(TOKEN_START_PAGE, &w->list, table, x, y++);;
++ n->http_proxy = Option_new(TOKEN_PROXY, &w->list, table, x, y++);;
++ n->http_proxyuser = Option_new(TOKEN_PROXYUSER, &w->list, table, x, y++);;
++ n->no_proxy = Option_new(TOKEN_NOPROXY, &w->list, table, x, y++);;
++ n->send_referer = Option_new(TOKEN_SEND_REFERER, &w->list, table, x, y++);;
++ gtk_notebook_append_page(GTK_NOTEBOOK(w->notebook), vbox, gtk_label_new(label));
++ return n;
++}
++
++DillocfgCookie *DillocfgCookie_new(DillocfgWin *w, const gchar *label) {
++ DillocfgCookie *c = g_new(DillocfgCookie, 1);
++ gint x, y;
++ GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
++ GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
++ GtkWidget *table = gtk_table_new(1, 1, TRUE);
++ GtkWidget *clist = gtk_clist_new(2);
++ GtkWidget *add_btn= gtk_button_new_with_label(_("Add"));
++ GtkWidget *del_btn= gtk_button_new_with_label(_("Delete"));
++ gtk_table_set_homogeneous(GTK_TABLE(table), TRUE);
++ gtk_container_add(GTK_CONTAINER(hbox), add_btn);
++ gtk_container_add(GTK_CONTAINER(hbox), del_btn);
++ x = 0; y = 0;
++ c->cookie_default = Option_new(TOKEN_COOKIE_DEFAULT, &w->list, table, x, y++);
++ gtk_clist_set_column_title(GTK_CLIST(clist), 0, _("Address"));
++ gtk_clist_set_column_title(GTK_CLIST(clist), 1, _("Rule"));
++ gtk_clist_column_titles_show(GTK_CLIST(clist));
++ gtk_clist_set_column_width(GTK_CLIST(clist), 0, 200);
++ /*
++ gtk_clist_insert(GTK_CLIST(clist), 1, NULL);
++ gtk_clist_set_text(GTK_CLIST(clist), 0, 0, "DEFAULT");
++ gtk_clist_set_text(GTK_CLIST(clist), 0, 1, "ACCEPT");
++ */
++ gtk_widget_set_usize(table, 320, 32);
++ gtk_box_pack_start(GTK_BOX(vbox), clist, TRUE, TRUE, 10);
++ gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 10);
++ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 10);
++ //gtk_table_attach_defaults(GTK_TABLE(table), clist, x, x + 1, y, y + 1);
++ gtk_notebook_append_page(GTK_NOTEBOOK(w->notebook), vbox, gtk_label_new(label));
++ return c;
++}
++
++#define BUFSIZE 4096
++void ReadUserconfig(DillocfgWin *d) {
++ FILE *usercfg, *usercookiecfg;
++ gchar *filepass = g_strconcat(g_get_home_dir(), "/", USER_CFG, NULL);
++ char buf[BUFSIZE], name[BUFSIZE], value[BUFSIZE];
++ gchar *locale = g_strdup (setlocale (LC_NUMERIC, NULL));;
++
++ setlocale (LC_NUMERIC, "C");
++ if (!(usercfg = fopen(filepass, "r"))) {
++ g_print(_("Read failed <%s>\n"), filepass);
++ return;
++ }
++ g_free(filepass);
++ filepass = g_strconcat(g_get_home_dir(), "/", USER_COOKIE_CFG, NULL);
++ if (!(usercookiecfg = fopen(filepass, "r"))) {
++ g_print(_("Read failed <%s>\n"), filepass);
++ return;
++ }
++ g_free(filepass);
++
++ /* First, set default data. */
++ DillocfgWin_init(d, TRUE);
++
++ /* Read dillorc. */
++ while (fgets(buf, BUFSIZE, usercfg)) {
++ /* Parse name and value. */
++ int i = 0, j = 0, k = 0;
++ guint token;
++ SKIPSPACE(buf, i);
++ if (buf[i] == '#') continue;
++ SKIPSPACE(buf, i);
++ while (!IS_LINE_END(buf[i]) && buf[i] != '=' && !isspace(buf[i]))
++ name[j++] = buf[i++];
++ name[j] = '\0';
++ SKIPSPACE(buf, i);
++ if (buf[i++] != '=') continue;
++ SKIPSPACE(buf, i);
++ if (buf[i] == '"') {
++ i++;
++ while (!IS_LINE_END(buf[i]) && buf[i] != '"') value[k++] = buf[i++];
++ } else
++ while (!IS_LINE_END(buf[i]) && !isspace(buf[i])) value[k++] = buf[i++];
++ value[k] = '\0';
++ if (strlen(value) == 0) continue;
++ token = name2token(name);
++ /* Set value */
++ Option_set(get_token_object(token), value);
++ }
++
++ /* Read cookiesrc */
++ while (fgets(buf, BUFSIZE, usercookiecfg)) {
++ /* Parse name and value. */
++ int i = 0, j = 0, k = 0;
++ guint token;
++ SKIPSPACE(buf, i);
++ if (buf[i] == '#') continue;
++ SKIPSPACE(buf, i);
++ while (!IS_LINE_END(buf[i]) && !isspace(buf[i])) name[j++] = buf[i++];
++ name[j] = '\0';
++ SKIPSPACE(buf, i);
++ while (!IS_LINE_END(buf[i]) && !isspace(buf[i])) value[k++] = buf[i++];
++ value[k] = '\0';
++ if (strlen(value) == 0) continue;
++ if (strcmp(name, "DEFAULT") == 0)
++ token = TOKEN_COOKIE_DEFAULT;
++ else
++ token = TOKEN_COOKIE;
++ /* Set value */
++ Option_set(get_token_object(token), value);
++ }
++ fclose(usercfg);
++ fclose(usercookiecfg);
++ setlocale(LC_NUMERIC, locale);
++ DillocfgWin_init(d, FALSE);
++ g_free (locale);
++}
++
++void DillocfgWin_callback_reset(GtkButton *button, gpointer user_data) {
++ DillocfgWin *d = (DillocfgWin *)user_data;
++ DillocfgWin_init(d, TRUE);
++ modified_ = TRUE;
++}
++
++void DillocfgWin_callback_reload(GtkButton *button, gpointer user_data) {
++ DillocfgWin *d = (DillocfgWin *)user_data;
++ ReadUserconfig(d);
++ modified_ = FALSE;
++}
++
++void WriteUserconfig(DillocfgWin *d) {
++ FILE *usercfg;
++ //FILE *usercookiecfg;
++ GList *list;
++ gchar *filepass = g_strconcat(g_get_home_dir(), "/", USER_CFG, NULL);
++
++ if (!(usercfg = fopen(filepass, "w"))) {
++ g_print(_("can't write <%s>\n"), filepass);
++ return;
++ }
++ g_free(filepass);
++ fprintf(usercfg, "#This file is written by Dillocfg\n");
++#if 0
++ filepass = g_strconcat(g_get_home_dir(), "/", USER_COOKIE_CFG, NULL);
++ if (!(usercookiecfg = fopen(filepass, "w"))) {
++ g_print(_("can't write <%s>\n"), filepass);
++ fclose(usercfg);
++ return;
++ }
++ g_free(filepass);
++ fprintf(usercookiecfg, "#This file is written by Dillocfg\n");
++#endif
++ for (list = g_list_first(d->list); list; list = g_list_next(list)) {
++ Option *o = (Option *)list->data;
++ if (get_token_type(o->base.token) == COOKIE)
++ ;//Option_get(o, usercookiecfg);
++ else
++ Option_get(o, usercfg);
++ }
++ fclose(usercfg);
++ //fclose(usercookiecfg);
++}
++
++void DillocfgWin_callback_save(GtkButton *button, gpointer user_data) {
++ DillocfgWin *d = (DillocfgWin *)user_data;
++ WriteUserconfig(d);
++ modified_ = FALSE;
++}
++
++/* vim: set ts=3 sw=3 sts=3 expandtab:*/
+diff -pruN dillo-0.8.6/config/dillocfg.h dillo-0.8.6-i18n-misc-20060709/config/dillocfg.h
+--- dillo-0.8.6/config/dillocfg.h 1970-01-01 09:00:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/config/dillocfg.h 2006-05-16 01:21:16.000000000 +0900
+@@ -0,0 +1,126 @@
++#ifndef __DILLOCFG_GTK_H__
++#define __DILLOCFG_GTK_H__
++
++#include <gtk/gtk.h>
++
++#include "../config.h"
++#include "dillocfg_option.h"
++
++#define WIDTH 640
++#define HEIGHT 370
++#define USER_CFG ".dillo/dillorc"
++#define USER_COOKIE_CFG ".dillo/cookiesrc"
++
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
++#ifndef DISABLE_TABS
++ typedef struct {
++ Option *tab_bar_homogeneous;
++ Option *tab_bar_scroller;
++ Option *tab_bar_show_fullscreen;
++ Option *tab_bar_show_single_tab;
++ Option *tab_instead_of_window;
++ Option *tab_load_in_background;
++ Option *tab_close_middle_click;
++ Option *compress_vowels;
++ Option *compress_common_prefixes;
++ Option *tab_title_compress;
++ } DillocfgTab;
++#endif
++
++ typedef struct {
++ Option *w3c_plus_heuristics;
++ Option *use_dicache;
++ Option *focus_location_on_new;
++ Option *enterpress_forces_submit;
++ Option *limit_text_width;
++ Option *generate_submit;
++ Option *search_url;
++ Option *search_charset;
++ Option *accept_language;
++ Option *show_msg;
++ Option *show_extra_warnings;
++ } DillocfgOther;
++
++ typedef struct {
++ Option *geometry;
++ Option *panel_size;
++ Option *show_back;
++ Option *show_bookmarks;
++ Option *show_clear_url;
++ Option *show_forw;
++ Option *show_home;
++ Option *show_menubar;
++ Option *show_popup_navigation;
++ Option *show_progress_box;
++ Option *show_reload;
++ Option *show_save;
++ Option *show_stop;
++ Option *show_tooltip;
++ Option *show_url;
++ Option *show_search;
++ Option *small_icons;
++ Option *fullwindow_start;
++ Option *transient_dialogs;
++ Option *popup_dialogs;
++ } DillocfgInterface;
++
++ typedef struct {
++ Option *font_sizes;
++ Option *font_factor;
++ Option *vw_fontname;
++ Option *fw_fontname;
++ Option *vw_aafontname;
++ Option *fw_aafontname;
++ Option *use_oblique;
++ Option *limit_font_decoration;
++ } DillocfgFont;
++
++ typedef struct {
++ Option *force_my_colors;
++ Option *contrast_visited_color;
++ Option *allow_white_bg;
++ Option *link_color;
++ Option *bg_color;
++ Option *visited_color;
++ Option *text_color;
++ } DillocfgColor;
++
++ typedef struct {
++ Option *user_agent;
++ Option *home;
++ Option *start_page;
++ Option *http_proxy;
++ Option *http_proxyuser;
++ Option *no_proxy;
++ Option *send_referer;
++ } DillocfgNetwork;
++
++ typedef struct {
++ Option *cookie_default;
++ } DillocfgCookie;
++
++ typedef struct {
++ GtkWidget *notebook;
++ GList *list;
++ DillocfgInterface *interface;
++ DillocfgFont *font;
++ DillocfgColor *color;
++ DillocfgNetwork *network;
++#ifndef DISABLE_TABS
++ DillocfgTab *tab;
++#endif
++ DillocfgCookie *cookie;
++ DillocfgOther *other;
++ } DillocfgWin;
++
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
++
++#endif /* __DILLOCFG_GTK_H__ */
++
++/* vim: set ts=3 sw=3 sts=3 expandtab:*/
+diff -pruN dillo-0.8.6/config/dillocfg_option.c dillo-0.8.6-i18n-misc-20060709/config/dillocfg_option.c
+--- dillo-0.8.6/config/dillocfg_option.c 1970-01-01 09:00:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/config/dillocfg_option.c 2006-05-16 01:21:16.000000000 +0900
+@@ -0,0 +1,688 @@
++/*
++ * File: dillocfg-gtk_option.c
++ *
++ * Copyright (C) 2003 Kiyo <kiyo@teki.jpn.ph>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <ctype.h>
++#include <string.h>
++#include <gtk/gtk.h>
++
++#include "../config.h"
++#include "../src/intl.h"
++#include "dillocfg_option.h"
++#include "dillocfg_token.h"
++
++/* Private class. */
++typedef struct {
++ OptionBase base;
++ GtkWidget *button;
++ gboolean value;
++ gboolean default_value;
++} CheckOption;
++
++typedef struct {
++ OptionBase base;
++ GtkWidget *hbox;
++ GtkWidget *entry;
++ gchar *value;
++ gchar *default_value;
++ gboolean allow_space;
++} EntryOption;
++
++typedef struct {
++ OptionBase base;
++ GtkWidget *hbox;
++ GtkWidget *combo;
++ gchar *value;
++ gchar *default_value;
++} ComboOption;
++
++typedef ComboOption FontOption;
++
++typedef struct {
++ OptionBase base;
++ GtkWidget *hbox;
++ GtkWidget *option_menu;
++ gchar **items;
++ gint value;
++ gint default_value;
++} SelectOption;
++
++typedef struct {
++ OptionBase base;
++ GtkWidget *hbox;
++ GtkWidget *label;
++ GdkImage *image;
++ GtkWidget *button_image;
++ GtkWidget *dialog;
++ GdkColor *value;
++ GdkColor *default_value;
++} ColorOption;
++
++typedef struct {
++ OptionBase base;
++ GtkWidget *hbox;
++ GtkWidget *button;
++ double value;
++ double default_value;
++ gboolean is_integer;
++} SpinOption;
++
++typedef struct {
++ gint x;
++ gint y;
++} Geometry;
++
++typedef struct {
++ OptionBase base;
++ GtkWidget *hbox;
++ GtkWidget *button;
++ GtkWidget *button2;
++ Geometry value;
++ Geometry default_value;
++} GeometryOption;
++
++CheckOption *CheckOption_new(guint token,
++ GtkWidget *table, gint x, gint y);
++void CheckOption_init(CheckOption *o, gboolean use_default);
++void CheckOption_set(CheckOption *o, gchar *value);
++gchar *CheckOption_get(CheckOption *o);
++void CheckOption_free(CheckOption *o);
++
++EntryOption *EntryOption_new(guint token,
++ GtkWidget *table, gint x, gint y);
++void EntryOption_init(EntryOption *o, gboolean use_default);
++void EntryOption_set(EntryOption *o, gchar *value);
++gchar *EntryOption_get(EntryOption *o);
++void EntryOption_free(EntryOption *o);
++
++ComboOption *ComboOption_new(guint token,
++ GtkWidget *table, gint x, gint y);
++void ComboOption_init(ComboOption *o, gboolean use_default);
++void ComboOption_set(ComboOption *o, gchar *value);
++gchar *ComboOption_get(ComboOption *o);
++void ComboOption_free(ComboOption *o);
++
++FontOption *FontOption_new(guint token,
++ GtkWidget *table, gint x, gint y);
++
++SelectOption *SelectOption_new(guint token,
++ GtkWidget *table, gint x, gint y);
++void SelectOption_init(SelectOption *o, gboolean use_default);
++void SelectOption_set(SelectOption *o, gchar *value);
++gchar *SelectOption_get(SelectOption *o);
++void SelectOption_free(SelectOption *o);
++
++ColorOption *ColorOption_new(guint token,
++ GtkWidget *table, gint x, gint y);
++void ColorOption_init(ColorOption *o, gboolean use_default);
++void ColorOption_set(ColorOption *o, gchar *value);
++gchar *ColorOption_get(ColorOption *o);
++void ColorOption_free(ColorOption *o);
++
++SpinOption *SpinOption_new(guint token,
++ GtkWidget *table, gint x, gint y);
++void SpinOption_init(SpinOption *o, gboolean use_default);
++void SpinOption_set(SpinOption *o, gchar *value);
++gchar *SpinOption_get(SpinOption *o);
++void SpinOption_free(SpinOption *o);
++
++GeometryOption *GeometryOption_new(guint token,
++ GtkWidget *table, gint x, gint y);
++void GeometryOption_init(GeometryOption *o, gboolean use_default);
++void GeometryOption_set(GeometryOption *o, gchar *value);
++gchar *GeometryOption_get(GeometryOption *o);
++void GeometryOption_free(SpinOption *o);
++
++
++Option *Option_new(guint token, GList **list,
++ GtkWidget *table, gint x, gint y) {
++ guint type = get_token_type(token);
++ Option *o;
++ switch (type) {
++ case CHECK_OPTION:
++ o = (Option *)CheckOption_new(token, table, x, y);
++ break;
++ case ENTRY_OPTION:
++ o = (Option *)EntryOption_new(token, table, x, y);
++ break;
++ case COMBO_OPTION:
++ o = (Option *)ComboOption_new(token, table, x, y);
++ break;
++ case FONT_OPTION:
++ o = (Option *)FontOption_new(token, table, x, y);
++ break;
++ case SELECT_OPTION:
++ case COOKIE:
++ o = (Option *)SelectOption_new(token, table, x, y);
++ break;
++ case COLOR_OPTION:
++ o = (Option *)ColorOption_new(token, table, x, y);
++ break;
++ case SPIN_OPTION:
++ o = (Option *)SpinOption_new (token, table, x, y);
++ break;
++ case GEOMETRY_OPTION:
++ o = (Option *)GeometryOption_new(token, table, x, y);
++ break;
++ default:
++ o = (Option *)NULL;
++ }
++ set_token_object(token, o);
++ *list = g_list_append(*list, o);
++ return o;
++}
++
++void Option_init(Option *o, gboolean use_default) {
++ return ((o) ? o->base.init(o, use_default) : NULL);
++}
++
++void Option_set(Option *o, gchar *value) {
++ return ((o) ? o->base.set(o, value) : NULL);
++}
++
++gchar *Option_get(Option *o, FILE *fp) {
++ if (!o) return NULL;
++ if (fp && o->base.get(o)) fprintf(fp, "%s\n", o->base.get(o));
++ return ((o) ? o->base.get(o) : NULL);
++}
++
++void Option_free(Option *o, GList **list) {
++ return ((o) ? o->base.free(o) : NULL);
++}
++
++CheckOption *CheckOption_new(guint token, GtkWidget *table, gint x, gint y) {
++ CheckOption *o = g_new(CheckOption, 1);
++
++ o->base.token = token;
++ o->base.init = CheckOption_init;
++ o->base.set = CheckOption_set;
++ o->base.get = CheckOption_get;
++ o->base.free = CheckOption_free;
++ o->button = gtk_check_button_new_with_label(_(get_token_label(token)));
++ o->base.set(o, (gchar *)get_token_value(token));
++ o->default_value = o->value;
++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(o->button), o->value);
++ gtk_table_attach_defaults(GTK_TABLE(table), o->button, x, x + 1, y, y + 1);
++ return o;
++}
++
++void CheckOption_init(CheckOption *o, gboolean use_default) {
++ if (use_default) o->value = o->default_value;
++ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(o->button), o->value);
++}
++
++void CheckOption_set(CheckOption *o, gchar *value) {
++ if (value)
++ o->value = (strcmp(value, "YES") == 0);
++}
++
++gchar *CheckOption_get(CheckOption *o) {
++ return g_strdup_printf("%s=%s", get_token_name(o->base.token),
++ (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(o->button)))
++ ? "YES" : "NO");
++}
++
++void CheckOption_free(CheckOption *o) {
++ g_free(o);
++}
++
++EntryOption *EntryOption_new(guint token,
++ GtkWidget *table, gint x, gint y) {
++ EntryOption *o = g_new(EntryOption, 1);
++ GtkWidget *label = gtk_label_new(_(get_token_label(token)));
++
++ o->base.token = token;
++ o->base.init = EntryOption_init;
++ o->base.set = EntryOption_set;
++ o->base.get = EntryOption_get;
++ o->base.free = EntryOption_free;
++ o->hbox = gtk_hbox_new(FALSE, 0);
++ o->entry = gtk_entry_new();
++ o->value = NULL;
++ o->base.set(o, (gchar *)get_token_value(token));
++ o->default_value = g_strdup(o->value);
++ o->allow_space = (gboolean)get_token_option(token);
++ //gtk_box_set_homogeneous(GTK_BOX(o->hbox), TRUE);
++ gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
++ if (o->value) gtk_entry_set_text(GTK_ENTRY(o->entry), o->value);
++ gtk_box_pack_start(GTK_BOX(o->hbox), label, FALSE, FALSE, 10);
++ gtk_box_pack_end(GTK_BOX(o->hbox), o->entry, TRUE, TRUE, 5);
++ gtk_table_attach_defaults(GTK_TABLE(table), o->hbox, x, x + 1, y, y + 1);
++ return o;
++}
++
++void EntryOption_init(EntryOption *o, gboolean use_default) {
++ if (use_default) {
++ g_free(o->value);
++ o->value = g_strdup(o->default_value);
++ }
++ if (o->value) gtk_entry_set_text(GTK_ENTRY(o->entry), o->value);
++}
++
++void EntryOption_set(EntryOption *o, gchar *value) {
++ g_free(o->value);
++ o->value = g_strdup(value);
++}
++
++gchar *EntryOption_get(EntryOption *o) {
++ gchar *format;
++ gchar *value = gtk_entry_get_text(GTK_ENTRY(o->entry));
++
++ if (!value) return NULL;
++ if (strcmp(value, "") == 0) return NULL;
++ if (o->allow_space) format = "%s=\"%s\"";
++ else format = "%s=%s";
++ return g_strdup_printf(format, get_token_name(o->base.token),
++ value);
++}
++
++void EntryOption_free(EntryOption *o) {
++ g_free(o);
++}
++
++ComboOption *ComboOption_new(guint token, GtkWidget *table, gint x, gint y) {
++ ComboOption *o = g_new(ComboOption, 1);
++ GList *list = NULL;
++ gchar **items = NULL;
++ gint i;
++
++ o->base.token = token;
++ o->base.init = ComboOption_init;
++ o->base.set = ComboOption_set;
++ o->base.get = ComboOption_get;
++ o->base.free = ComboOption_free;
++ o->hbox = gtk_hbox_new(FALSE, 0);
++ o->combo = gtk_combo_new();
++ items = (gchar **)get_token_option(token);
++ for (i = 0; items[i]; i++)
++ list = g_list_append(list, items[i]);
++ o->value = NULL;
++ gtk_combo_set_popdown_strings(GTK_COMBO(o->combo), list);
++ g_free(list);
++ o->base.set(o, (gchar *)get_token_value(token));
++ o->default_value = g_strdup(o->value);
++ if (o->value) gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (o->combo)->entry), o->value);
++ gtk_box_pack_start(GTK_BOX(o->hbox),
++ gtk_label_new(_(get_token_label(token))), FALSE, FALSE, 5);
++ gtk_box_pack_start(GTK_BOX(o->hbox), o->combo, TRUE, TRUE, 5);
++ gtk_table_attach_defaults(GTK_TABLE(table), o->hbox, x, x + 1, y, y + 1);
++ return o;
++}
++
++void ComboOption_init(ComboOption *o, gboolean use_default) {
++ if (use_default) {
++ g_free(o->value);
++ o->value = g_strdup(o->default_value);
++ }
++ if (o->value) gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (o->combo)->entry), o->value);
++}
++
++void ComboOption_set(ComboOption *o, gchar *value) {
++ g_free(o->value);
++ o->value = g_strdup(value);
++}
++
++gchar *ComboOption_get(ComboOption *o) {
++ gchar *value = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO (o->combo)->entry));
++
++ if (!value) return NULL;
++ if (strcmp(value, "") == 0) return NULL;
++ return g_strdup_printf("%s=\"%s\"", get_token_name(o->base.token),
++ value);
++}
++
++void ComboOption_free(ComboOption *o) {
++ g_free(o);
++}
++
++/* FontOption class extends ComboOption. */
++FontOption *FontOption_new(guint token, GtkWidget *table, gint x, gint y) {
++ FontOption *o = g_new(FontOption, 1);
++ GList *list = NULL;
++#define MAX_FONT_NAME 1024
++ gchar buf[MAX_FONT_NAME]; //max font name
++ FILE *fp;
++
++ o->base.token = token;
++ o->base.init = ComboOption_init;
++ o->base.set = ComboOption_set;
++ o->base.get = ComboOption_get;
++ o->base.free = ComboOption_free;
++ o->hbox = gtk_hbox_new(FALSE, 0);
++ o->combo = gtk_combo_new();
++#ifdef DISABLE_ANTI_ALIAS
++ fp = popen("xlsfonts -fn \"-*-*\"|cut -d \"-\" -f 2-3|sort|uniq", "r");
++ list = g_list_append(list, "*-*");
++ list = g_list_append(list, "*-gothic");
++#else
++ fp = popen("fc-list|sed \"s/[:|,]/\\n#/g\"|grep -v \"^#\"|sort|uniq", "r");
++ list = g_list_append(list, "serif");
++ list = g_list_append(list, "sans-serif");
++ list = g_list_append(list, "monospace");
++#endif
++ while(fgets(buf, MAX_FONT_NAME, fp)) {
++ g_strchomp(buf);
++ list = g_list_append(list, g_strdup(buf));
++ }
++ pclose(fp);
++ o->value = NULL;
++ if (list) gtk_combo_set_popdown_strings(GTK_COMBO(o->combo), list);
++ g_list_free(list);
++ o->base.set(o, (gchar *)get_token_value(token));
++ o->default_value = g_strdup(o->value);
++ if (o->value) gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (o->combo)->entry), o->value);
++ gtk_box_pack_start(GTK_BOX(o->hbox),
++ gtk_label_new(_(get_token_label(token))), FALSE, FALSE, 5);
++ gtk_box_pack_start(GTK_BOX(o->hbox), o->combo, TRUE, TRUE, 5);
++ gtk_table_attach_defaults(GTK_TABLE(table), o->hbox, x, x + 1, y, y + 1);
++ return o;
++}
++
++SelectOption *SelectOption_new(guint token, GtkWidget *table, gint x, gint y) {
++ SelectOption *o = g_new(SelectOption, 1);
++ GtkWidget *menu = gtk_menu_new ();
++ gint i;
++
++ o->base.token = token;
++ o->base.init = SelectOption_init;
++ o->base.set = SelectOption_set;
++ o->base.get = SelectOption_get;
++ o->base.free = SelectOption_free;
++ o->hbox = gtk_hbox_new(FALSE, 0);
++ o->option_menu = gtk_option_menu_new();
++ o->items = (gchar **)get_token_option(token);
++ for (i = 0; o->items[i]; i++)
++ gtk_menu_append(GTK_MENU(menu),
++ gtk_menu_item_new_with_label(o->items[i]));
++ gtk_option_menu_set_menu (GTK_OPTION_MENU(o->option_menu), menu);
++ o->base.set(o, (gchar *)get_token_value(token));
++ o->default_value = o->value;
++ gtk_option_menu_set_history(GTK_OPTION_MENU(o->option_menu), o->value);
++ gtk_box_pack_start(GTK_BOX(o->hbox),
++ gtk_label_new(_(get_token_label(token))), FALSE, FALSE, 5);
++ gtk_box_pack_start(GTK_BOX(o->hbox), o->option_menu, TRUE, TRUE, 5);
++ gtk_table_attach_defaults(GTK_TABLE(table), o->hbox, x, x + 1, y, y + 1);
++ return o;
++}
++
++void SelectOption_init(SelectOption *o, gboolean use_default) {
++ if (use_default) o->value = o->default_value;
++ gtk_option_menu_set_history (GTK_OPTION_MENU(o->option_menu), o->value);
++}
++
++void SelectOption_set(SelectOption *o, gchar *value) {
++ gint i;
++ for (i = 0; o->items[i]; i++)
++ if (!g_strcasecmp(value, o->items[i]))
++ o->value = i;
++}
++
++gchar *SelectOption_get(SelectOption *o) {
++ GtkWidget *menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(o->option_menu));
++ /* always null...
++ gchar *str = NULL;
++ GtkWidget *item = gtk_menu_get_active(GTK_MENU(menu));
++ GtkWidget *label = GTK_BIN(GTK_MENU_ITEM(item))->child;
++ if(!label) str = g_strdup("");
++ else gtk_label_get(GTK_LABEL(label), &str);
++ */
++ gint i = g_list_index(GTK_MENU_SHELL(menu)->children,
++ GTK_OPTION_MENU(o->option_menu)->menu_item);
++ gchar *format = (get_token_type(o->base.token) == COOKIE) ? "%s %s" : "%s=\"%s\"";
++ return g_strdup_printf(format, get_token_name(o->base.token), o->items[i]);
++}
++
++void SelectOption_free(SelectOption *o) {
++ g_free(o);
++}
++
++void change_color_GdkColor(const double *color, GdkColor* o) {
++ o->red = color[0] * 65535;
++ o->green = color[1] * 65535;
++ o->blue = color[2] * 65535;
++}
++
++void change_color_double(const GdkColor* o, double *color) {
++ color[0] = o->red / (double)65535;
++ color[1] = o->green / (double)65535;
++ color[2] = o->blue / (double)65535;
++}
++
++void ColorDialog_ok(GtkButton *button, gpointer user_data) {
++ ColorOption *o = (ColorOption *)user_data;
++ double color[4];
++ gtk_color_selection_get_color(
++ GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(o->dialog)->colorsel),
++ color);
++ change_color_GdkColor(color, o->value);
++ ColorOption_init(o, FALSE);
++ gtk_widget_destroy(o->dialog);
++}
++
++void ColorDialog_cancel(GtkButton *button, gpointer user_data) {
++ ColorOption *o = (ColorOption *)user_data;
++ gtk_widget_destroy(o->dialog);
++}
++
++void ColorOption_clicked(GtkButton *button, gpointer user_data) {
++ ColorOption *o = (ColorOption *)user_data;
++ gchar *title;
++ double color[4];
++ gtk_label_get(GTK_LABEL(o->label), &title);
++ change_color_double(o->value, color);
++ o->dialog = gtk_color_selection_dialog_new(title);
++ gtk_color_selection_set_color(
++ GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(o->dialog)->colorsel),
++ color);
++ gtk_signal_connect(
++ GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(o->dialog)->ok_button),
++ "clicked", GTK_SIGNAL_FUNC(ColorDialog_ok), o);
++ gtk_signal_connect(
++ GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(o->dialog)->cancel_button),
++ "clicked", GTK_SIGNAL_FUNC(ColorDialog_cancel), o);
++ gtk_widget_hide(GTK_COLOR_SELECTION_DIALOG(o->dialog)->help_button);
++ gtk_widget_show(o->dialog);
++}
++
++#define PREVIEW_SIZE 48
++ColorOption *ColorOption_new(guint token,
++ GtkWidget *table, gint x, gint y) {
++ ColorOption *o = g_new(ColorOption, 1);
++ GtkWidget *button = gtk_button_new();
++
++ o->base.token = token;
++ o->base.init = ColorOption_init;
++ o->base.set = ColorOption_set;
++ o->base.get = ColorOption_get;
++ o->base.free = ColorOption_free;
++ o->hbox = gtk_hbox_new(FALSE, 0);
++ o->label = gtk_label_new(_(get_token_label(token)));
++ o->image = gdk_image_new(GDK_IMAGE_NORMAL,
++ gdk_visual_get_system(), PREVIEW_SIZE, PREVIEW_SIZE);
++ o->button_image = gtk_image_new(o->image, NULL);
++ o->value = g_new(GdkColor, 1);
++ o->base.set(o, (gchar *)get_token_value(token));
++ o->default_value = g_new(GdkColor, 1);
++ o->default_value = gdk_color_copy(o->value);
++ gtk_signal_connect(GTK_OBJECT(button), "clicked",
++ GTK_SIGNAL_FUNC(ColorOption_clicked), o);
++ gtk_container_add(GTK_CONTAINER(button), o->button_image);
++ //gtk_box_set_homogeneous(GTK_BOX(o->hbox), TRUE);
++ gtk_label_set_justify (GTK_LABEL(o->label), GTK_JUSTIFY_LEFT);
++ gtk_box_pack_start(GTK_BOX(o->hbox), button, FALSE, FALSE, 10);
++ gtk_box_pack_start(GTK_BOX(o->hbox), o->label, FALSE, FALSE, 10);
++ gtk_table_attach_defaults(GTK_TABLE(table), o->hbox, x, x + 1, y, y + 1);
++ return o;
++}
++
++guint32 change_color(GdkColor *o) {
++ gdk_colormap_alloc_color(gdk_colormap_get_system(),
++ o, TRUE, TRUE);
++ return o->pixel;
++}
++
++void ColorOption_init(ColorOption *o, gboolean use_default) {
++ int i, j;
++ if (use_default) o->value = gdk_color_copy(o->default_value);
++ for (i = 0; i < PREVIEW_SIZE; i++)
++ for (j = 0; j < PREVIEW_SIZE; j++)
++ gdk_image_put_pixel(o->image, i, j, change_color(o->value));
++ gtk_image_set(GTK_IMAGE(o->button_image), o->image, NULL);
++}
++
++void ColorOption_set(ColorOption *o, gchar *value) {
++ guint32 i;
++ if (strlen(value) != 8) return;
++ if (value[0] != '0' || value[1] != 'x') return;
++ sscanf(value, "0x%x", &i);
++ o->value->red = (i&0x00FF0000) >> 8;
++ o->value->green = (i&0x0000FF00);
++ o->value->blue = (i&0x000000FF) << 8;
++}
++
++gchar *ColorOption_get(ColorOption *o) {
++ return g_strdup_printf("%s=0x%.2x%.2x%.2x",
++ get_token_name(o->base.token),
++ o->value->red >> 8,
++ o->value->green >> 8,
++ o->value->blue >> 8);
++}
++
++void ColorOption_free(ColorOption *o) {
++ gdk_image_destroy (o->image);
++ g_free(o);
++}
++
++SpinOption *SpinOption_new(guint token,
++ GtkWidget *table, gint x, gint y) {
++ SpinOption *o = g_new(SpinOption, 1);
++ OptionAdjustment_t *opt = (OptionAdjustment_t *)get_token_option(token);
++
++ o->base.token = token;
++ o->base.init = SpinOption_init;
++ o->base.set = SpinOption_set;
++ o->base.get = SpinOption_get;
++ o->base.free = SpinOption_free;
++ o->hbox = gtk_hbox_new(FALSE, 0);
++ o->button = gtk_spin_button_new(
++ (GtkAdjustment *)gtk_adjustment_new(0,
++ opt->lower,
++ opt->upper,
++ opt->increment,
++ opt->increment,
++ opt->increment),
++ opt->increment, opt->digits);
++ o->base.set(o, (gchar *)get_token_value(token));
++ o->default_value = o->value;
++ o->is_integer = (opt->digits == 0);
++ gtk_box_pack_start(GTK_BOX(o->hbox),
++ gtk_label_new(_(get_token_label(token))), FALSE, FALSE, 10);
++ gtk_box_pack_start(GTK_BOX(o->hbox), o->button, FALSE, FALSE, 10);
++ gtk_table_attach_defaults(GTK_TABLE(table), o->hbox, x, x + 1, y, y + 1);
++ return o;
++}
++
++void SpinOption_init(SpinOption *o, gboolean use_default) {
++ if (use_default) o->value = o->default_value;
++ gtk_spin_button_set_value(GTK_SPIN_BUTTON(o->button), o->value);
++}
++
++void SpinOption_set(SpinOption *o, gchar *value) {
++ if (o->is_integer)
++ o->value = strtol(value, NULL, 0);
++ else
++ o->value = strtod(value, NULL);
++}
++
++ gchar *SpinOption_get(SpinOption *o) {
++ if (o->is_integer)
++ return g_strdup_printf("%s=%d", get_token_name(o->base.token),
++ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(o->button)));
++ else {
++ gchar *float_str = g_strdup_printf("%s=%f",
++ get_token_name(o->base.token),
++ gtk_spin_button_get_value_as_float(GTK_SPIN_BUTTON(o->button)));
++ if (strchr(float_str, ','))
++ strchr(float_str, ',')[0] = '.';
++ return float_str;
++ }
++ }
++
++void SpinOption_free(SpinOption *o) {
++ g_free(o);
++}
++
++GeometryOption *GeometryOption_new(guint token,
++ GtkWidget *table, gint x, gint y) {
++ GeometryOption *o = g_new(GeometryOption, 1);
++ OptionAdjustment_t *opt = (OptionAdjustment_t *)get_token_option(token);
++
++ o->base.token = token;
++ o->base.init = GeometryOption_init;
++ o->base.set = GeometryOption_set;
++ o->base.get = GeometryOption_get;
++ o->base.free = GeometryOption_free;
++ o->hbox = gtk_hbox_new(FALSE, 0);
++ o->button = gtk_spin_button_new(
++ (GtkAdjustment *)gtk_adjustment_new(0,
++ opt->lower,
++ opt->upper,
++ opt->increment,
++ opt->increment,
++ opt->increment),
++ opt->increment, 0);
++ o->button2 = gtk_spin_button_new(
++ (GtkAdjustment *)gtk_adjustment_new(0,
++ opt->lower,
++ opt->upper,
++ opt->increment,
++ opt->increment,
++ opt->increment),
++ opt->increment, 0);
++ o->base.set(o, (gchar *)get_token_value(token));
++ o->default_value = o->value;
++ gtk_box_pack_start(GTK_BOX(o->hbox),
++ gtk_label_new(_(get_token_label(token))), FALSE, FALSE, 10);
++ gtk_box_pack_start(GTK_BOX(o->hbox), o->button, FALSE, FALSE, 10);
++ gtk_box_pack_start(GTK_BOX(o->hbox), gtk_label_new("X"), FALSE, FALSE, 0);
++ gtk_box_pack_start(GTK_BOX(o->hbox), o->button2, FALSE, FALSE, 10);
++ gtk_table_attach_defaults(GTK_TABLE(table), o->hbox, x, x + 1, y, y + 1);
++ return o;
++}
++
++void GeometryOption_init(GeometryOption *o, gboolean use_default) {
++ if(use_default) o->value = o->default_value;
++ gtk_spin_button_set_value(GTK_SPIN_BUTTON(o->button), o->value.x);
++ gtk_spin_button_set_value(GTK_SPIN_BUTTON(o->button2), o->value.y);
++}
++
++void GeometryOption_set(GeometryOption *o, gchar *value) {
++ gchar *ptr;
++
++ if ((ptr = strchr(value, 'x'))) {
++ o->value.x = atoi(value);
++ o->value.y = atoi(++ptr);
++ }
++}
++
++gchar *GeometryOption_get(GeometryOption *o) {
++ return g_strdup_printf("%s=%dx%d", get_token_name(o->base.token),
++ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(o->button)),
++ gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(o->button2)));
++}
++
++void GeometryOption_free(SpinOption *o) {
++ g_free(o);
++}
++
++
++/* vim: set ts=3 sw=3 sts=3 expandtab:*/
+diff -pruN dillo-0.8.6/config/dillocfg_option.h dillo-0.8.6-i18n-misc-20060709/config/dillocfg_option.h
+--- dillo-0.8.6/config/dillocfg_option.h 1970-01-01 09:00:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/config/dillocfg_option.h 2006-05-16 01:21:16.000000000 +0900
+@@ -0,0 +1,57 @@
++#ifndef __DILLOCFG_GTK_OPTION_H__
++#define __DILLOCFG_GTK_OPTION_H__
++
++#include <stdio.h>
++#include <gtk/gtk.h>
++
++#include "../config.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
++ typedef enum {
++ CHECK_OPTION = 0,
++ ENTRY_OPTION,
++ COMBO_OPTION,
++ FONT_OPTION,
++ SELECT_OPTION,
++ COLOR_OPTION,
++ SPIN_OPTION,
++ GEOMETRY_OPTION,
++ COOKIE
++ } OptionType;
++
++ typedef struct {
++ guint token;
++ void (*init)();
++ void (*set)();
++ gchar *(*get)();
++ void (*free)();
++ } OptionBase;
++
++ typedef struct {
++ OptionBase base;
++ } Option;
++
++ typedef struct {
++ gfloat lower;
++ gfloat upper;
++ gfloat increment;
++ guint digits;
++ } OptionAdjustment_t;
++
++ Option *Option_new(guint token, GList **list, GtkWidget *table, gint x, gint y);
++ void Option_init(Option *o, gboolean use_default);
++ void Option_set(Option *o, gchar *value);
++ gchar *Option_get(Option *o, FILE *fp);
++ void Option_free(Option *o, GList **list);
++
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
++
++#endif /* __DILLOCFG_GTK_OPTION_H__ */
++
++/* vim: set ts=3 sw=3 sts=3 expandtab:*/
+diff -pruN dillo-0.8.6/config/dillocfg_token.c dillo-0.8.6-i18n-misc-20060709/config/dillocfg_token.c
+--- dillo-0.8.6/config/dillocfg_token.c 1970-01-01 09:00:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/config/dillocfg_token.c 2006-05-16 01:21:16.000000000 +0900
+@@ -0,0 +1,635 @@
++/*
++ * File: dillocfg-gtk_token.c
++ *
++ * Copyright (C) 2003 Kiyo <kiyo@teki.jpn.ph>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++
++#include <string.h>
++#include <gtk/gtk.h>
++
++#include "../config.h"
++#include "../src/intl.h"
++#include "dillocfg_token.h"
++#include "dillocfg_option.h"
++
++static const OptionAdjustment_t font_factor_option = {0.1, 20, 0.1, 1};
++static const OptionAdjustment_t geometry_option = {1, 65535, 1, 0};
++static const gchar *panel_sizes[] = {"tiny", "small", "medium", "large", NULL};
++static const gchar *user_agents[] = {
++ "Dillo/%v",
++ "Mozilla/3.0 (compatible;) Dillo/%v",
++ "Mozilla/4.0 (compatible; MSIE 4.0;) Dillo/%v",
++ "Mozilla/4.0 (Macintosh; U; PPC Mac OS X; ja-jp) Dillo/%v",
++ "DoCoMo/1.0/x505i (Dillo/%v)",
++ "J-PHONE/4.2/J-x53 (Dillo/%v)",
++ "KDDI-x24 UP.Browser/6.0.x.x (GUI) MMP/1.1 (Dillo/%v)",
++ NULL
++};
++static const gchar *cookie_rules[] = {
++ "ACCEPT_SESSION",
++ "DENY",
++ "ACCEPT",
++ NULL
++};
++
++/* symbol array */
++static struct {
++ const gchar *name;
++ const gchar *label;
++ const guint token;
++ const guint type;
++ const gchar *value;
++ const gpointer option;
++ Option *object;
++
++} symbols[] = {
++ { "null",
++ "null",
++ 0,
++ -1,
++ NULL,
++ (const gpointer)NULL,
++ NULL
++ },
++ { "geometry",
++ N_("Window Size"),
++ TOKEN_GEOMETRY,
++ GEOMETRY_OPTION,
++ "640x550",
++ (const gpointer)&geometry_option,
++ NULL
++ },
++ { "http_proxy",
++ N_("HTTP Proxy"),
++ TOKEN_PROXY,
++ ENTRY_OPTION,
++ "",
++ (const gpointer)TRUE,
++ NULL
++ },
++ { "http_proxyuser",
++ N_("HTTP Proxy User"),
++ TOKEN_PROXYUSER,
++ ENTRY_OPTION,
++ "",
++ (const gpointer)FALSE,
++ NULL
++ },
++ { "no_proxy",
++ N_("NO Proxy"),
++ TOKEN_NOPROXY,
++ ENTRY_OPTION,
++ "",
++ (const gpointer)TRUE,
++ NULL
++ },
++ { "user_agent",
++ N_("User-Agent"),
++ TOKEN_USER_AGENT,
++ SELECT_OPTION,
++ "Dillo/%v",
++ (const gpointer)&user_agents,
++ NULL
++ },
++ { "send_referer",
++ N_("Send referer header"),
++ TOKEN_SEND_REFERER,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "link_color",
++ N_("Link color"),
++ TOKEN_LINK_COLOR,
++ COLOR_OPTION,
++ "0x0000ff",
++ NULL,
++ NULL
++ },
++ { "visited_color",
++ N_("Visited color"),
++ TOKEN_VISITED_COLOR,
++ COLOR_OPTION,
++ "0xa020f0",
++ NULL,
++ NULL
++ },
++ { "bg_color",
++ N_("BackGround color"),
++ TOKEN_BG_COLOR,
++ COLOR_OPTION,
++ "0xffffff",
++ NULL,
++ NULL
++ },
++ { "allow_white_bg",
++ N_("Allow white bg"),
++ TOKEN_ALLOW_WHITE_BG,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "force_my_colors",
++ N_("Force my colors"),
++ TOKEN_FORCE_MY_COLORS,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "contrast_visited_color",
++ N_("Contrast visited color"),
++ TOKEN_CONTRAST_VISITED_COLOR,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "text_color",
++ N_("Text color"),
++ TOKEN_TEXT_COLOR,
++ COLOR_OPTION,
++ "0x000000",
++ NULL,
++ NULL
++ },
++ { "use_oblique",
++ N_("Use oblique"),
++ TOKEN_USE_OBLIQUE,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "start_page",
++ N_("Start Page"),
++ TOKEN_START_PAGE,
++ ENTRY_OPTION,
++ "about:splash",
++ (const gpointer)TRUE,
++ NULL
++ },
++ { "home",
++ N_("HOMEPAGE"),
++ TOKEN_HOME,
++ ENTRY_OPTION,
++ "http://www.google.com/",
++ (const gpointer)TRUE,
++ NULL
++ },
++ { "search_url",
++ N_("Search-engine's URL"),
++ TOKEN_SEARCH_URL,
++ ENTRY_OPTION,
++ "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s",
++ (const gpointer)TRUE,
++ NULL
++ },
++ { "search_charset",
++ N_("Search-engine's charset"),
++ TOKEN_SEARCH_CHARSET,
++ ENTRY_OPTION,
++ "UTF-8",
++ (const gpointer)FALSE,
++ NULL
++ },
++ { "show_tooltip",
++ N_("Show Tooltip"),
++ TOKEN_SHOW_TOOLTIP,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "panel_size",
++ N_("Panel Size"),
++ TOKEN_PANEL_SIZE,
++ SELECT_OPTION,
++ "tiny",
++ (const gpointer)&panel_sizes,
++ NULL
++ },
++ { "small_icons",
++ N_("Small icons"),
++ TOKEN_SMALL_ICONS,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "limit_text_width",
++ N_("Limit text width"),
++ TOKEN_LIMIT_TEXT_WIDTH,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "limit_font_decoration",
++ N_("Limit font decoration"),
++ TOKEN_LIMIT_FONT_DECORATION,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "font_factor",
++ N_("Font factor"),
++ TOKEN_FONT_FACTOR,
++ SPIN_OPTION,
++ "1.0",
++ (const gpointer)&font_factor_option,
++ NULL
++ },
++ { "font_sizes",
++ N_("Font Sizes"),
++ TOKEN_FONT_SIZES,
++ ENTRY_OPTION,
++ "10 12 14 16 18 20",
++ (const gpointer)TRUE,
++ NULL
++ },
++ { "w3c_plus_heuristics",
++ N_("W3C+heuristics"),
++ TOKEN_W3C_PLUS_HEURISTICS,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "use_dicache",
++ N_("Use dicache"),
++ TOKEN_USE_DICACHE,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "show_back",
++ N_("Show Back"),
++ TOKEN_SHOW_BACK,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "show_forw",
++ N_("Show Forw"),
++ TOKEN_SHOW_FORW,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "show_home",
++ N_("Show Home"),
++ TOKEN_SHOW_HOME,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "show_reload",
++ N_("Show Reload"),
++ TOKEN_SHOW_RELOAD,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "show_save",
++ N_("Show Save"),
++ TOKEN_SHOW_SAVE,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "show_stop",
++ N_("Show Stop"),
++ TOKEN_SHOW_STOP,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "show_bookmarks",
++ N_("Show Bookmarks"),
++ TOKEN_SHOW_BOOKMARKS,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "show_menubar",
++ N_("Show Menubar"),
++ TOKEN_SHOW_MENUBAR,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "show_clear_url",
++ N_("Show ClearURL"),
++ TOKEN_SHOW_CLEAR_URL,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "show_url",
++ N_("Show URL box"),
++ TOKEN_SHOW_URL,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "show_search",
++ N_("Show Web Search"),
++ TOKEN_SHOW_SEARCH,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "show_progress_box",
++ N_("Show Progress box"),
++ TOKEN_SHOW_PROGRESS_BOX,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "show_popup_navigation",
++ N_("Show Popup navigation"),
++ TOKEN_SHOW_POPUP_NAVIGATION,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "fullwindow_start",
++ N_("Fullwindow start"),
++ TOKEN_FULLWINDOW_START,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "transient_dialogs",
++ N_("Transient dialogs"),
++ TOKEN_TRANSIENT_DIALOGS,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "popup_dialogs",
++ N_("Popup dialogs"),
++ TOKEN_POPUP_DIALOGS,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "vw_aafontname",
++ N_("vw_aafontname"),
++ TOKEN_VW_AAFONT,
++ FONT_OPTION,
++ "*",
++ (const gpointer)TRUE,
++ NULL
++ },
++ { "fw_aafontname",
++ N_("fw_aafontname"),
++ TOKEN_FW_AAFONT,
++ FONT_OPTION,
++ "*",
++ (const gpointer)TRUE,
++ NULL
++ },
++ { "vw_fontname",
++ N_("vw_fontname"),
++ TOKEN_VW_FONT,
++ FONT_OPTION,
++ "*-gothic",
++ (const gpointer)TRUE,
++ NULL
++ },
++ { "fw_fontname",
++ N_("fw_fontname"),
++ TOKEN_FW_FONT,
++ FONT_OPTION,
++ "*-gothic",
++ (const gpointer)TRUE,
++ NULL
++ },
++ { "generate_submit",
++ N_("Generate submit"),
++ TOKEN_GENERATE_SUBMIT,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "enterpress_forces_submit",
++ N_("Enterpress forces submit"),
++ TOKEN_ENTERPRESS_FORCES_SUBMIT,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "show_msg",
++ N_("Show debugging messsages"),
++ TOKEN_SHOW_MSG,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "show_extra_warnings",
++ N_("Show Extra Warnings"),
++ TOKEN_SHOW_EXTRA_WARNINGS,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "focus_location_on_new",
++ N_("Focus location on new"),
++ TOKEN_FOCUS_LOCATION_ON_NEW,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "accept_language",
++ N_("Accept Language"),
++ TOKEN_ACCEPT_LANGUAGE,
++ ENTRY_OPTION,
++ "en-us",
++ (const gpointer)TRUE,
++ NULL
++ },
++ { "accept_language",
++ N_("Accept Language"),
++ TOKEN_ACCEPT_LANGUAGE,
++ ENTRY_OPTION,
++ "en-us, ja",
++ (const gpointer)TRUE,
++ NULL
++ },
++#ifndef DISABLE_TABS
++ { "tab_load_in_background",
++ N_("Tab load in background"),
++ TOKEN_TAB_LOAD_IN_BACKGROUND,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "tab_close_middle_click",
++ N_("Tab close middle click"),
++ TOKEN_TAB_CLOSE_MIDDLE_CLICK,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "tab_instead_of_window",
++ N_("Tab instead of window"),
++ TOKEN_TAB_INSTEAD_OF_WINDOW,
++ CHECK_OPTION,
++ "YES",
++ FALSE,
++ NULL
++ },
++ { "tab_bar_show_fullscreen",
++ N_("Tab bar show fullscreen"),
++ TOKEN_TAB_BAR_SHOW_FULLSCREEN,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "tab_bar_show_single_tab",
++ N_("Tab bar show single tab"),
++ TOKEN_TAB_BAR_SHOW_SINGLE_TAB,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "tab_bar_scroller",
++ N_("Tab bar scroller"),
++ TOKEN_TAB_BAR_SCROLLER,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "tab_bar_homogeneous",
++ N_("Tab bar homogeneous"),
++ TOKEN_TAB_BAR_HOMOGENEOUS,
++ CHECK_OPTION,
++ "YES",
++ NULL,
++ NULL
++ },
++ { "tab_title_compress",
++ N_("Tab title compress"),
++ TOKEN_TAB_TITLE_COMPRESS,
++ CHECK_OPTION,
++ "NO",
++ NULL,
++ NULL
++ },
++ { "compress_vowels",
++ N_("Compress vowels"),
++ TOKEN_COMPRESS_VOWELS,
++ ENTRY_OPTION,
++ "aeiouyAEIOUY",
++ (const gpointer)TRUE,
++ NULL
++ },
++ { "compress_common_prefixes",
++ N_("Compress_common_prefixes"),
++ TOKEN_COMPRESS_COMMON_PREFIXES,
++ ENTRY_OPTION,
++ "index of ;re: ;fwd: ;www.;welcome to ;the ",
++ (const gpointer)TRUE,
++ NULL
++ },
++#endif /* !DISABLE_TABS */
++ { "DEFAULT",
++ N_("Default"),
++ TOKEN_COOKIE_DEFAULT,
++ COOKIE,
++ "ACCEPT_SESSION",
++ (const gpointer)&cookie_rules,
++ NULL
++ },
++ { NULL,
++ NULL,
++ TOKEN_COOKIE,
++ COOKIE,
++ "ACCEPT_SESSION",
++ (const gpointer)&cookie_rules,
++ NULL
++ },
++
++};
++
++
++static guint token2num(guint tkn) {
++ gint i;
++ for (i = 0; i < N_TOKENS && symbols[i].token != tkn; i++);
++ return i;
++}
++
++guint name2token(const gchar *name) {
++ gint i;
++ for (i = 0; i < N_TOKENS; i++)
++ if (symbols[i].name && strcmp(symbols[i].name, name) == 0)
++ return (const guint)symbols[i].token;
++ return 0;
++}
++
++const gchar *get_token_name(guint tkn) {
++ return symbols[token2num(tkn)].name;
++}
++
++const gchar *get_token_label(guint tkn) {
++ return symbols[token2num(tkn)].label;
++}
++
++guint get_token_type(guint tkn) {
++ return symbols[token2num(tkn)].type;
++}
++
++gpointer get_token_value(guint tkn) {
++ return (const gpointer)symbols[token2num(tkn)].value;
++}
++
++gpointer get_token_option(guint tkn) {
++ return symbols[token2num(tkn)].option;
++}
++
++void set_token_object(guint tkn, Option *obj) {
++ symbols[token2num(tkn)].object = obj;
++}
++
++Option *get_token_object(guint tkn) {
++ return symbols[token2num(tkn)].object;
++}
++
++/* vim: set ts=3 sw=3 sts=3 expandtab:*/
+diff -pruN dillo-0.8.6/config/dillocfg_token.h dillo-0.8.6-i18n-misc-20060709/config/dillocfg_token.h
+--- dillo-0.8.6/config/dillocfg_token.h 1970-01-01 09:00:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/config/dillocfg_token.h 2006-05-16 01:21:16.000000000 +0900
+@@ -0,0 +1,103 @@
++#ifndef __DILLOCFG_GTK_TOKEN_H__
++#define __DILLOCFG_GTK_TOKEN_H__
++
++#include <gtk/gtk.h>
++
++#include "../config.h"
++#include "dillocfg_option.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++ /* define enumeration values to be returned for specific symbols */
++ typedef enum {
++ TOKEN_NULL = 0,
++ TOKEN_GEOMETRY,
++ TOKEN_PROXY,
++ TOKEN_PROXYUSER,
++ TOKEN_NOPROXY,
++ TOKEN_USER_AGENT,
++ TOKEN_SEND_REFERER,
++ TOKEN_LINK_COLOR,
++ TOKEN_VISITED_COLOR,
++ TOKEN_BG_COLOR,
++ TOKEN_ALLOW_WHITE_BG,
++ TOKEN_FORCE_MY_COLORS,
++ TOKEN_CONTRAST_VISITED_COLOR,
++ TOKEN_TEXT_COLOR,
++ TOKEN_USE_OBLIQUE,
++ TOKEN_START_PAGE,
++ TOKEN_HOME,
++ TOKEN_SEARCH_URL,
++ TOKEN_SEARCH_CHARSET,
++ TOKEN_PANEL_SIZE,
++ TOKEN_SMALL_ICONS,
++ TOKEN_FONT_FACTOR,
++ TOKEN_FONT_SIZES,
++ TOKEN_SHOW_TOOLTIP,
++ TOKEN_LIMIT_TEXT_WIDTH,
++ TOKEN_LIMIT_FONT_DECORATION,
++ TOKEN_W3C_PLUS_HEURISTICS,
++ TOKEN_USE_DICACHE,
++ TOKEN_SHOW_BACK,
++ TOKEN_SHOW_FORW,
++ TOKEN_SHOW_HOME,
++ TOKEN_SHOW_RELOAD,
++ TOKEN_SHOW_SAVE,
++ TOKEN_SHOW_STOP,
++ TOKEN_SHOW_BOOKMARKS,
++ TOKEN_SHOW_MENUBAR,
++ TOKEN_SHOW_CLEAR_URL,
++ TOKEN_SHOW_URL,
++ TOKEN_SHOW_SEARCH,
++ TOKEN_SHOW_PROGRESS_BOX,
++ TOKEN_SHOW_POPUP_NAVIGATION,
++ TOKEN_FULLWINDOW_START,
++ TOKEN_TRANSIENT_DIALOGS,
++ TOKEN_POPUP_DIALOGS,
++ TOKEN_FW_FONT,
++ TOKEN_VW_FONT,
++ TOKEN_FW_AAFONT,
++ TOKEN_VW_AAFONT,
++ TOKEN_GENERATE_SUBMIT,
++ TOKEN_ENTERPRESS_FORCES_SUBMIT,
++ TOKEN_SHOW_MSG,
++ TOKEN_SHOW_EXTRA_WARNINGS,
++ TOKEN_FOCUS_LOCATION_ON_NEW,
++ TOKEN_ACCEPT_LANGUAGE,
++#ifndef DISABLE_TABS
++ TOKEN_TAB_LOAD_IN_BACKGROUND,
++ TOKEN_TAB_INSTEAD_OF_WINDOW,
++ TOKEN_TAB_BAR_SHOW_FULLSCREEN,
++ TOKEN_TAB_BAR_SHOW_SINGLE_TAB,
++ TOKEN_TAB_BAR_SCROLLER,
++ TOKEN_TAB_BAR_HOMOGENEOUS,
++ TOKEN_TAB_TITLE_COMPRESS,
++ TOKEN_TAB_CLOSE_MIDDLE_CLICK,
++ TOKEN_COMPRESS_VOWELS,
++ TOKEN_COMPRESS_COMMON_PREFIXES,
++#endif /* !DISABLE_TABS */
++ TOKEN_COOKIE_DEFAULT,
++ TOKEN_COOKIE,
++
++ TOKEN_LAST
++ } TokenType;
++#define N_TOKENS TOKEN_LAST
++
++ guint name2token(const gchar *name);
++ const gchar *get_token_name(guint tkn);
++ const gchar *get_token_label(guint tkn);
++ guint get_token_type(guint tkn);
++ gpointer get_token_value(guint tkn);
++ gpointer get_token_option(guint tkn);
++ Option *get_token_object(guint tkn);
++ void set_token_object(guint tkn, Option *obj);
++
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
++
++#endif /* __DILLOCFG_GTK_TOKEN_H__ */
++
++/* vim: set ts=3 sw=3 sts=3 expandtab:*/
+diff -pruN dillo-0.8.6/config.guess dillo-0.8.6-i18n-misc-20060709/config.guess
+--- dillo-0.8.6/config.guess 2005-03-22 16:17:05.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/config.guess 2006-05-16 01:21:07.000000000 +0900
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+-timestamp='2005-02-10'
++timestamp='2004-03-12'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -53,7 +53,7 @@ version="\
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+ Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+@@ -106,7 +106,6 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdi
+ : ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+ dummy=$tmp/dummy ;
+ tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+@@ -203,15 +202,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
++ arc:OpenBSD:*:*)
++ echo mipsel-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
+ cats:OpenBSD:*:*)
+ echo arm-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ hp300:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+- luna88k:OpenBSD:*:*)
+- echo m88k-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+ mac68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+@@ -227,12 +226,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ mvmeppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
++ pegasos:OpenBSD:*:*)
++ echo powerpc-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
++ pmax:OpenBSD:*:*)
++ echo mipsel-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
+ sgi:OpenBSD:*:*)
+- echo mips64-unknown-openbsd${UNAME_RELEASE}
++ echo mipseb-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sun3:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
++ wgrisc:OpenBSD:*:*)
++ echo mipsel-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+@@ -245,6 +253,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit 0 ;;
++ *:MicroBSD:*:*)
++ echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
++ exit 0 ;;
+ alpha:OSF1:*:*)
+ case $UNAME_RELEASE in
+ *4.0)
+@@ -319,9 +330,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+ exit 0 ;;
+- *:z/VM:*:*)
+- echo s390-ibm-zvmoe
+- exit 0 ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit 0 ;;
+@@ -342,10 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ NILE*:*:*:dcosx)
+ echo pyramid-pyramid-svr4
+ exit 0 ;;
+- DRS?6000:unix:4.0:6*)
+- echo sparc-icl-nx6
+- exit 0 ;;
+- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
++ DRS?6000:UNIX_SV:4.2*:7*)
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7 && exit 0 ;;
+ esac ;;
+@@ -755,7 +760,7 @@ EOF
+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ *:UNICOS/mp:*:*)
+- echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++ echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+@@ -778,7 +783,21 @@ EOF
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ *:FreeBSD:*:*)
+- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++ # Determine whether the default compiler uses glibc.
++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
++ #include <features.h>
++ #if __GLIBC__ >= 2
++ LIBC=gnu
++ #else
++ LIBC=
++ #endif
++EOF
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
++ # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
++ # FreeBSD's kernel, but not the complete OS.
++ case ${LIBC} in gnu) kernel_only='k' ;; esac
++ echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+ exit 0 ;;
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+@@ -789,8 +808,8 @@ EOF
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit 0 ;;
+- x86:Interix*:[34]*)
+- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
++ x86:Interix*:3*)
++ echo i586-pc-interix3
+ exit 0 ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+@@ -804,9 +823,6 @@ EOF
+ i*:UWIN*:*)
+ echo ${UNAME_MACHINE}-pc-uwin
+ exit 0 ;;
+- amd64:CYGWIN*:*:*)
+- echo x86_64-unknown-cygwin
+- exit 0 ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit 0 ;;
+@@ -827,15 +843,6 @@ EOF
+ arm*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+- cris:Linux:*:*)
+- echo cris-axis-linux-gnu
+- exit 0 ;;
+- crisv32:Linux:*:*)
+- echo crisv32-axis-linux-gnu
+- exit 0 ;;
+- frv:Linux:*:*)
+- echo frv-unknown-linux-gnu
+- exit 0 ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+@@ -917,9 +924,6 @@ EOF
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit 0 ;;
+- sh64*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
+- exit 0 ;;
+ sh*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+@@ -977,9 +981,6 @@ EOF
+ LIBC=gnuaout
+ #endif
+ #endif
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+@@ -1082,9 +1083,9 @@ EOF
+ M680?0:D-NIX:5.3:*)
+ echo m68k-diab-dnix
+ exit 0 ;;
+- M68*:*:R3V[5678]*:*)
++ M68*:*:R3V[567]*:*)
+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+ OS_REL=''
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+@@ -1182,10 +1183,9 @@ EOF
+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+ *:Darwin:*:*)
+- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+- case $UNAME_PROCESSOR in
++ case `uname -p` in
+ *86) UNAME_PROCESSOR=i686 ;;
+- unknown) UNAME_PROCESSOR=powerpc ;;
++ powerpc) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ exit 0 ;;
+@@ -1200,9 +1200,6 @@ EOF
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+ exit 0 ;;
+- NSE-?:NONSTOP_KERNEL:*:*)
+- echo nse-tandem-nsk${UNAME_RELEASE}
+- exit 0 ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
+@@ -1250,16 +1247,6 @@ EOF
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit 0 ;;
+- *:*VMS:*:*)
+- UNAME_MACHINE=`(uname -p) 2>/dev/null`
+- case "${UNAME_MACHINE}" in
+- A*) echo alpha-dec-vms && exit 0 ;;
+- I*) echo ia64-dec-vms && exit 0 ;;
+- V*) echo vax-dec-vms && exit 0 ;;
+- esac ;;
+- *:XENIX:*:SysV)
+- echo i386-pc-xenix
+- exit 0 ;;
+ esac
+
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+diff -pruN dillo-0.8.6/config.h.in dillo-0.8.6-i18n-misc-20060709/config.h.in
+--- dillo-0.8.6/config.h.in 2006-04-27 01:06:37.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/config.h.in 2006-05-16 01:21:07.000000000 +0900
+@@ -1,23 +1,40 @@
+ /* config.h.in. Generated from configure.in by autoheader. */
+
++/* Enable SSL Processing */
++#undef DILLO_SSL
++
+ /* Enable GIF images */
+ #undef ENABLE_GIF
+
+ /* Enable JPEG images */
+ #undef ENABLE_JPEG
+
++/* Define to 1 if translation of program messages to the user's native
++ language is requested. */
++#undef ENABLE_NLS
++
+ /* Enable PNG images */
+ #undef ENABLE_PNG
+
+ /* Enable SSL support */
+ #undef ENABLE_SSL
+
++/* Define if the GNU dcgettext() function is already present or preinstalled.
++ */
++#undef HAVE_DCGETTEXT
++
+ /* Define to 1 if you have the <fcntl.h> header file. */
+ #undef HAVE_FCNTL_H
+
+ /* Define to 1 if you have the `gethostbyname' function. */
+ #undef HAVE_GETHOSTBYNAME
+
++/* Define if the GNU gettext() function is already present or preinstalled. */
++#undef HAVE_GETTEXT
++
++/* Define if you have the iconv() function. */
++#undef HAVE_ICONV
++
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+
+@@ -30,9 +47,18 @@
+ /* Define to 1 if you have the `socket' library (-lsocket). */
+ #undef HAVE_LIBSOCKET
+
++/* Define to 1 if you have the `ssl' library (-lssl). */
++#undef HAVE_LIBSSL
++
+ /* Define to 1 if you have the <memory.h> header file. */
+ #undef HAVE_MEMORY_H
+
++/* Define to 1 if you have the <openssl/err.h> header file. */
++#undef HAVE_OPENSSL_ERR_H
++
++/* Define to 1 if you have the <openssl/ssl.h> header file. */
++#undef HAVE_OPENSSL_SSL_H
++
+ /* Define to 1 if you have the <png.h> header file. */
+ #undef HAVE_PNG_H
+
+diff -pruN dillo-0.8.6/config.rpath dillo-0.8.6-i18n-misc-20060709/config.rpath
+--- dillo-0.8.6/config.rpath 1970-01-01 09:00:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/config.rpath 2006-05-16 01:21:07.000000000 +0900
+@@ -0,0 +1,513 @@
++#! /bin/sh
++# Output a system dependent set of variables, describing how to set the
++# run time search path of shared libraries in an executable.
++#
++# Copyright 1996-2002 Free Software Foundation, Inc.
++# Taken from GNU libtool, 2001
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++#
++# The first argument passed to this file is the canonical host specification,
++# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
++# or
++# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
++# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
++# should be set by the caller.
++#
++# The set of defined variables is at the end of this script.
++
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++libext=a
++shlibext=
++
++host="$1"
++host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++wl=
++if test "$GCC" = yes; then
++ wl='-Wl,'
++else
++ case "$host_os" in
++ aix3* | aix4* | aix5*)
++ wl='-Wl,'
++ ;;
++ hpux9* | hpux10* | hpux11*)
++ wl='-Wl,'
++ ;;
++ irix5* | irix6*)
++ wl='-Wl,'
++ ;;
++ linux*)
++ echo '__INTEL_COMPILER' > conftest.$ac_ext
++ if $CC -E conftest.$ac_ext >/dev/null | grep __INTEL_COMPILER >/dev/null
++ then
++ :
++ else
++ # Intel icc
++ wl='-Qoption,ld,'
++ fi
++ ;;
++ osf3* | osf4* | osf5*)
++ wl='-Wl,'
++ ;;
++ solaris*)
++ wl='-Wl,'
++ ;;
++ sunos4*)
++ wl='-Qoption ld '
++ ;;
++ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ if test "x$host_vendor" = xsni; then
++ wl='-LD'
++ else
++ wl='-Wl,'
++ fi
++ ;;
++ esac
++fi
++
++hardcode_libdir_flag_spec=
++hardcode_libdir_separator=
++hardcode_direct=no
++hardcode_minus_L=no
++
++case "$host_os" in
++ cygwin* | mingw* | pw32*)
++ # FIXME: the MSVC++ port hasn't been tested in a loooong time
++ # When not using gcc, we currently assume that we are using
++ # Microsoft Visual C++.
++ if test "$GCC" != yes; then
++ with_gnu_ld=no
++ fi
++ ;;
++ openbsd*)
++ with_gnu_ld=no
++ ;;
++esac
++
++ld_shlibs=yes
++if test "$with_gnu_ld" = yes; then
++ case "$host_os" in
++ aix3* | aix4* | aix5*)
++ # On AIX, the GNU linker is very broken
++ ld_shlibs=no
++ ;;
++ amigaos*)
++ hardcode_libdir_flag_spec='-L$libdir'
++ hardcode_minus_L=yes
++ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++ # that the semantics of dynamic libraries on AmigaOS, at least up
++ # to version 4, is to share data among multiple programs linked
++ # with the same dynamic library. Since this doesn't match the
++ # behavior of shared libraries on other platforms, we can use
++ # them.
++ ld_shlibs=no
++ ;;
++ beos*)
++ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++ :
++ else
++ ld_shlibs=no
++ fi
++ ;;
++ cygwin* | mingw* | pw32*)
++ # hardcode_libdir_flag_spec is actually meaningless, as there is
++ # no search path for DLLs.
++ hardcode_libdir_flag_spec='-L$libdir'
++ ;;
++ solaris* | sysv5*)
++ if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
++ ld_shlibs=no
++ elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++ :
++ else
++ ld_shlibs=no
++ fi
++ ;;
++ sunos4*)
++ hardcode_direct=yes
++ ;;
++ *)
++ if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++ :
++ else
++ ld_shlibs=no
++ fi
++ ;;
++ esac
++ if test "$ld_shlibs" = yes; then
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++ fi
++else
++ case "$host_os" in
++ aix3*)
++ # Note: this linker hardcodes the directories in LIBPATH if there
++ # are no directories specified by -L.
++ hardcode_minus_L=yes
++ if test "$GCC" = yes; then
++ # Neither direct hardcoding nor static linking is supported with a
++ # broken collect2.
++ hardcode_direct=unsupported
++ fi
++ ;;
++ aix4* | aix5*)
++ if test "$host_cpu" = ia64; then
++ # On IA64, the linker does run time linking by default, so we don't
++ # have to do anything special.
++ aix_use_runtimelinking=no
++ else
++ aix_use_runtimelinking=no
++ # Test if we are trying to use run time linking or normal
++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++ # need to do runtime linking.
++ case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ for ld_flag in $LDFLAGS; do
++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++ aix_use_runtimelinking=yes
++ break
++ fi
++ done
++ esac
++ fi
++ hardcode_direct=yes
++ hardcode_libdir_separator=':'
++ if test "$GCC" = yes; then
++ case $host_os in aix4.[012]|aix4.[012].*)
++ collect2name=`${CC} -print-prog-name=collect2`
++ if test -f "$collect2name" && \
++ strings "$collect2name" | grep resolve_lib_name >/dev/null
++ then
++ # We have reworked collect2
++ hardcode_direct=yes
++ else
++ # We have old collect2
++ hardcode_direct=unsupported
++ hardcode_minus_L=yes
++ hardcode_libdir_flag_spec='-L$libdir'
++ hardcode_libdir_separator=
++ fi
++ esac
++ fi
++ if test "$aix_use_runtimelinking" = yes; then
++ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
++ else
++ if test "$host_cpu" = ia64; then
++ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++ else
++ hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
++ fi
++ fi
++ ;;
++ amigaos*)
++ hardcode_libdir_flag_spec='-L$libdir'
++ hardcode_minus_L=yes
++ # see comment about different semantics on the GNU ld section
++ ld_shlibs=no
++ ;;
++ cygwin* | mingw* | pw32*)
++ # When not using gcc, we currently assume that we are using
++ # Microsoft Visual C++.
++ # hardcode_libdir_flag_spec is actually meaningless, as there is
++ # no search path for DLLs.
++ hardcode_libdir_flag_spec=' '
++ libext=lib
++ ;;
++ darwin* | rhapsody*)
++ hardcode_direct=yes
++ ;;
++ freebsd1*)
++ ld_shlibs=no
++ ;;
++ freebsd2.2*)
++ hardcode_libdir_flag_spec='-R$libdir'
++ hardcode_direct=yes
++ ;;
++ freebsd2*)
++ hardcode_direct=yes
++ hardcode_minus_L=yes
++ ;;
++ freebsd*)
++ hardcode_libdir_flag_spec='-R$libdir'
++ hardcode_direct=yes
++ ;;
++ hpux9* | hpux10* | hpux11*)
++ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++ hardcode_libdir_separator=:
++ hardcode_direct=yes
++ hardcode_minus_L=yes # Not in the search PATH, but as the default
++ # location of the library.
++ ;;
++ irix5* | irix6*)
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++ hardcode_libdir_separator=:
++ ;;
++ netbsd*)
++ hardcode_libdir_flag_spec='-R$libdir'
++ hardcode_direct=yes
++ ;;
++ newsos6)
++ hardcode_direct=yes
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++ hardcode_libdir_separator=:
++ ;;
++ openbsd*)
++ hardcode_direct=yes
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ else
++ case "$host_os" in
++ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++ hardcode_libdir_flag_spec='-R$libdir'
++ ;;
++ *)
++ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
++ ;;
++ os2*)
++ hardcode_libdir_flag_spec='-L$libdir'
++ hardcode_minus_L=yes
++ ;;
++ osf3*)
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++ hardcode_libdir_separator=:
++ ;;
++ osf4* | osf5*)
++ if test "$GCC" = yes; then
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++ else
++ # Both cc and cxx compiler support -rpath directly
++ hardcode_libdir_flag_spec='-rpath $libdir'
++ fi
++ hardcode_libdir_separator=:
++ ;;
++ sco3.2v5*)
++ ;;
++ solaris*)
++ hardcode_libdir_flag_spec='-R$libdir'
++ ;;
++ sunos4*)
++ hardcode_libdir_flag_spec='-L$libdir'
++ hardcode_direct=yes
++ hardcode_minus_L=yes
++ ;;
++ sysv4)
++ if test "x$host_vendor" = xsno; then
++ hardcode_direct=yes # is this really true???
++ else
++ hardcode_direct=no # Motorola manual says yes, but my tests say they lie
++ fi
++ ;;
++ sysv4.3*)
++ ;;
++ sysv5*)
++ hardcode_libdir_flag_spec=
++ ;;
++ uts4*)
++ hardcode_libdir_flag_spec='-L$libdir'
++ ;;
++ dgux*)
++ hardcode_libdir_flag_spec='-L$libdir'
++ ;;
++ sysv4*MP*)
++ if test -d /usr/nec; then
++ ld_shlibs=yes
++ fi
++ ;;
++ sysv4.2uw2*)
++ hardcode_direct=yes
++ hardcode_minus_L=no
++ ;;
++ sysv5uw7* | unixware7*)
++ ;;
++ *)
++ ld_shlibs=no
++ ;;
++ esac
++fi
++
++# Check dynamic linker characteristics
++libname_spec='lib$name'
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++case "$host_os" in
++ aix3*)
++ shlibext=so
++ ;;
++ aix4* | aix5*)
++ shlibext=so
++ ;;
++ amigaos*)
++ shlibext=ixlibrary
++ ;;
++ beos*)
++ shlibext=so
++ ;;
++ bsdi4*)
++ shlibext=so
++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++ ;;
++ cygwin* | mingw* | pw32*)
++ case $GCC,$host_os in
++ yes,cygwin*)
++ shlibext=dll.a
++ ;;
++ yes,mingw*)
++ shlibext=dll
++ sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
++ ;;
++ yes,pw32*)
++ shlibext=dll
++ ;;
++ *)
++ shlibext=dll
++ ;;
++ esac
++ ;;
++ darwin* | rhapsody*)
++ shlibext=dylib
++ ;;
++ freebsd1*)
++ ;;
++ freebsd*)
++ shlibext=so
++ ;;
++ gnu*)
++ shlibext=so
++ ;;
++ hpux9* | hpux10* | hpux11*)
++ shlibext=sl
++ ;;
++ irix5* | irix6*)
++ shlibext=so
++ case "$host_os" in
++ irix5*)
++ libsuff= shlibsuff=
++ ;;
++ *)
++ case $LD in
++ *-32|*"-32 ") libsuff= shlibsuff= ;;
++ *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 ;;
++ *-64|*"-64 ") libsuff=64 shlibsuff=64 ;;
++ *) libsuff= shlibsuff= ;;
++ esac
++ ;;
++ esac
++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++ ;;
++ linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
++ ;;
++ linux-gnu*)
++ shlibext=so
++ ;;
++ netbsd*)
++ shlibext=so
++ ;;
++ newsos6)
++ shlibext=so
++ ;;
++ openbsd*)
++ shlibext=so
++ ;;
++ os2*)
++ libname_spec='$name'
++ shlibext=dll
++ ;;
++ osf3* | osf4* | osf5*)
++ shlibext=so
++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++ ;;
++ sco3.2v5*)
++ shlibext=so
++ ;;
++ solaris*)
++ shlibext=so
++ ;;
++ sunos4*)
++ shlibext=so
++ ;;
++ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ shlibext=so
++ case "$host_vendor" in
++ motorola)
++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++ ;;
++ esac
++ ;;
++ uts4*)
++ shlibext=so
++ ;;
++ dgux*)
++ shlibext=so
++ ;;
++ sysv4*MP*)
++ if test -d /usr/nec; then
++ shlibext=so
++ fi
++ ;;
++esac
++
++sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
++escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
++escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
++escaped_sys_lib_search_path_spec=`echo "X$sys_lib_search_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
++escaped_sys_lib_dlsearch_path_spec=`echo "X$sys_lib_dlsearch_path_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
++
++sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
++
++# How to pass a linker flag through the compiler.
++wl="$escaped_wl"
++
++# Static library suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally "so").
++shlibext="$shlibext"
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator="$hardcode_libdir_separator"
++
++# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct="$hardcode_direct"
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L="$hardcode_minus_L"
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec="$escaped_sys_lib_search_path_spec"
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec="$escaped_sys_lib_dlsearch_path_spec"
++
++EOF
+diff -pruN dillo-0.8.6/config.sub dillo-0.8.6-i18n-misc-20060709/config.sub
+--- dillo-0.8.6/config.sub 2005-03-22 16:17:05.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/config.sub 2006-05-16 01:21:07.000000000 +0900
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+-timestamp='2005-02-10'
++timestamp='2004-03-12'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -70,7 +70,7 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+ Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+@@ -145,7 +145,7 @@ case $os in
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+- -apple | -axis | -knuth | -cray)
++ -apple | -axis)
+ os=
+ basic_machine=$1
+ ;;
+@@ -237,7 +237,7 @@ case $basic_machine in
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
++ | m32r | m32rle | m68000 | m68k | m88k | mcore \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+@@ -264,10 +264,10 @@ case $basic_machine in
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+ | strongarm \
+- | tahoe | thumb | tic4x | tic80 | tron \
++ | tahoe | thumb | tic80 | tron \
+ | v850 | v850e \
+ | we32k \
+- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
++ | x86 | xscale | xstormy16 | xtensa \
+ | z8k)
+ basic_machine=$basic_machine-unknown
+ ;;
+@@ -300,7 +300,7 @@ case $basic_machine in
+ | avr-* \
+ | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+- | clipper-* | craynv-* | cydra-* \
++ | clipper-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | elxsi-* \
+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+@@ -310,7 +310,7 @@ case $basic_machine in
+ | ip2k-* | iq2000-* \
+ | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* \
++ | m88110-* | m88k-* | mcore-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+@@ -326,9 +326,8 @@ case $basic_machine in
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipstx39-* | mipstx39el-* \
+- | mmix-* \
+ | msp430-* \
+- | none-* | np1-* | ns16k-* | ns32k-* \
++ | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+@@ -343,8 +342,8 @@ case $basic_machine in
+ | tron-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+- | xstormy16-* | xtensa-* \
++ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
++ | xtensa-* \
+ | ymp-* \
+ | z8k-*)
+ ;;
+@@ -446,10 +445,6 @@ case $basic_machine in
+ basic_machine=j90-cray
+ os=-unicos
+ ;;
+- craynv)
+- basic_machine=craynv-cray
+- os=-unicosmp
+- ;;
+ cr16c)
+ basic_machine=cr16c-unknown
+ os=-elf
+@@ -457,9 +452,6 @@ case $basic_machine in
+ crds | unos)
+ basic_machine=m68k-crds
+ ;;
+- crisv32 | crisv32-* | etraxfs*)
+- basic_machine=crisv32-axis
+- ;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
+@@ -489,10 +481,6 @@ case $basic_machine in
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
+- djgpp)
+- basic_machine=i586-pc
+- os=-msdosdjgpp
+- ;;
+ dpx20 | dpx20-*)
+ basic_machine=rs6000-bull
+ os=-bosx
+@@ -671,6 +659,10 @@ case $basic_machine in
+ mips3*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ ;;
++ mmix*)
++ basic_machine=mmix-knuth
++ os=-mmixware
++ ;;
+ monitor)
+ basic_machine=m68k-rom68k
+ os=-coff
+@@ -751,6 +743,10 @@ case $basic_machine in
+ np1)
+ basic_machine=np1-gould
+ ;;
++ nv1)
++ basic_machine=nv1-cray
++ os=-unicosmp
++ ;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
+@@ -797,24 +793,18 @@ case $basic_machine in
+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
+ basic_machine=i686-pc
+ ;;
+- pentiumii | pentium2 | pentiumiii | pentium3)
++ pentiumii | pentium2)
+ basic_machine=i686-pc
+ ;;
+- pentium4)
+- basic_machine=i786-pc
+- ;;
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
++ pentiumii-* | pentium2-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+- pentium4-*)
+- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+- ;;
+ pn)
+ basic_machine=pn-gould
+ ;;
+@@ -873,10 +863,6 @@ case $basic_machine in
+ sb1el)
+ basic_machine=mipsisa64sb1el-unknown
+ ;;
+- sei)
+- basic_machine=mips-sei
+- os=-seiux
+- ;;
+ sequent)
+ basic_machine=i386-sequent
+ ;;
+@@ -884,9 +870,6 @@ case $basic_machine in
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
+- sh64)
+- basic_machine=sh64-unknown
+- ;;
+ sparclite-wrs | simso-wrs)
+ basic_machine=sparclite-wrs
+ os=-vxworks
+@@ -961,6 +944,10 @@ case $basic_machine in
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
++ tic4x | c4x*)
++ basic_machine=tic4x-unknown
++ os=-coff
++ ;;
+ tic54x | c54x*)
+ basic_machine=tic54x-unknown
+ os=-coff
+@@ -1033,10 +1020,6 @@ case $basic_machine in
+ basic_machine=hppa1.1-winbond
+ os=-proelf
+ ;;
+- xbox)
+- basic_machine=i686-pc
+- os=-mingw32
+- ;;
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
+@@ -1067,9 +1050,6 @@ case $basic_machine in
+ romp)
+ basic_machine=romp-ibm
+ ;;
+- mmix)
+- basic_machine=mmix-knuth
+- ;;
+ rs6000)
+ basic_machine=rs6000-ibm
+ ;;
+@@ -1202,9 +1182,6 @@ case $os in
+ -mac*)
+ os=`echo $os | sed -e 's|mac|macos|'`
+ ;;
+- -linux-dietlibc)
+- os=-linux-dietlibc
+- ;;
+ -linux*)
+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ ;;
+@@ -1305,9 +1282,6 @@ case $os in
+ -kaos*)
+ os=-kaos
+ ;;
+- -zvmoe)
+- os=-zvmoe
+- ;;
+ -none)
+ ;;
+ *)
+@@ -1339,9 +1313,6 @@ case $basic_machine in
+ arm*-semi)
+ os=-aout
+ ;;
+- c4x-* | tic4x-*)
+- os=-coff
+- ;;
+ # This must come before the *-dec entry.
+ pdp10-*)
+ os=-tops20
+@@ -1388,9 +1359,6 @@ case $basic_machine in
+ *-ibm)
+ os=-aix
+ ;;
+- *-knuth)
+- os=-mmixware
+- ;;
+ *-wec)
+ os=-proelf
+ ;;
+diff -pruN dillo-0.8.6/configure dillo-0.8.6-i18n-misc-20060709/configure
+--- dillo-0.8.6/configure 2006-04-27 01:06:45.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/configure 2006-05-16 01:21:07.000000000 +0900
+@@ -309,7 +309,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+
+-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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DLGUI_TRUE DLGUI_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS EGREP LIBJPEG_LIBS LIBJPEG_LDFLAGS LIBJPEG_CPPFLAGS LIBPNG_LIBS LIBPNG_CFLAGS LIBZ_LIBS LIBSSL_LIBS LIBPTHREAD_LIBS LIBPTHREAD_LDFLAGS LIBFLTK_CXXFLAGS LIBFLTK_LIBS src doc bin util lib LIBOBJS LTLIBOBJS'
++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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot DLGUI_TRUE DLGUI_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB localedir GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS EGREP XFT_CONFIG PKG_CONFIG LIBJPEG_LIBS LIBJPEG_LDFLAGS LIBJPEG_CPPFLAGS LIBPNG_LIBS LIBPNG_CFLAGS LIBZ_LIBS LIBSSL_LIBS LIBPTHREAD_LIBS LIBPTHREAD_LDFLAGS LIBFLTK_CXXFLAGS LIBFLTK_LIBS src doc bin util lib LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+
+ # Initialize some variables set by options.
+@@ -862,6 +862,8 @@ Optional Features:
+ --enable-gprof Try to compile and run with profiling enabled
+ --enable-insure Try to compile and run with Insure++
+ --enable-ansi Try to compile and run with ANSI flags
++ --disable-tabs Don't compile support for tabs
++ --disable-anti-alias Don't compile support for anti-alias
+ --enable-ipv6 Build with support for IPv6
+ --enable-rtfl Build with rtfl messages
+ --disable-cookies Don't compile support for cookies
+@@ -871,8 +873,11 @@ Optional Features:
+ --disable-ssl Disable ssl features (eg. https)
+ --disable-dlgui Disable FLTK2 GUI for downloads
+ --disable-threaded-dns Disable the advantage of a reentrant resolver library
+- --disable-dependency-tracking speeds up one-time build
+- --enable-dependency-tracking do not reject slow dependency extractors
++ --enable-meta-refresh Allow meta refresh
++ --disable-dependency-tracking Speeds up one-time builds
++ --enable-dependency-tracking Do not reject slow dependency extractors
++ --disable-rpath do not hardcode runtime library paths
++ --disable-nls do not use Native Language Support
+ --disable-glibtest Do not try to compile and run a test GLIB program
+ --disable-gtktest Do not try to compile and run a test GTK program
+
+@@ -881,6 +886,11 @@ Optional Packages:
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-jpeg-lib=DIR Specify where to find libjpeg
+ --with-jpeg-inc=DIR Specify where to find libjpeg's headers
++ --with-gnu-ld assume the C compiler uses GNU ld default=no
++ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib
++ --without-libiconv-prefix don't search for libiconv in includedir and libdir
++ --with-libintl-prefix=DIR search for libintl in DIR/include and DIR/lib
++ --without-libintl-prefix don't search for libintl in includedir and libdir
+ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)
+ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)
+ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)
+@@ -1444,7 +1454,7 @@ test -n "$target_alias" &&
+ NONENONEs,x,x, &&
+ program_prefix=${target_alias}-
+
+-am__api_version="1.9"
++am__api_version="1.7"
+ # Find a good install program. We prefer a C program (faster),
+ # so one script is as good as another. But avoid the broken or
+ # incompatible versions:
+@@ -1582,6 +1592,7 @@ _ACEOF
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+ rm conftest.sed
+
++
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+
+@@ -1595,39 +1606,6 @@ else
+ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+
+-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+- # We used to keeping the `.' as first argument, in order to
+- # allow $(mkdir_p) to be used without argument. As in
+- # $(mkdir_p) $(somedir)
+- # where $(somedir) is conditionally defined. However this is wrong
+- # for two reasons:
+- # 1. if the package is installed by a user who cannot write `.'
+- # make install will fail,
+- # 2. the above comment should most certainly read
+- # $(mkdir_p) $(DESTDIR)$(somedir)
+- # so it does not work when $(somedir) is undefined and
+- # $(DESTDIR) is not.
+- # To support the latter case, we have to write
+- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+- # so the `.' trick is pointless.
+- mkdir_p='mkdir -p --'
+-else
+- # On NextStep and OpenStep, the `mkdir' command does not
+- # recognize any option. It will interpret all options as
+- # directories to create, and then abort because `.' already
+- # exists.
+- for d in ./-p ./--version;
+- do
+- test -d $d && rmdir $d
+- done
+- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+- if test -f "$ac_aux_dir/mkinstalldirs"; then
+- mkdir_p='$(mkinstalldirs)'
+- else
+- mkdir_p='$(install_sh) -d'
+- fi
+-fi
+-
+ for ac_prog in gawk mawk nawk awk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -1706,7 +1684,7 @@ else
+ fi
+ rmdir .tst 2>/dev/null
+
+-# test to see if srcdir already configured
++ # test to see if srcdir already configured
+ if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+@@ -1726,7 +1704,7 @@ fi
+
+ # Define the identity of the package.
+ PACKAGE=dillo
+- VERSION=0.8.6
++ VERSION=0.8.6-i18n-misc
+
+
+ cat >>confdefs.h <<_ACEOF
+@@ -1754,6 +1732,9 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
+
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
++
++AMTAR=${AMTAR-"${am_missing_run}tar"}
++
+ install_sh=${install_sh-"$am_aux_dir/install-sh"}
+
+ # Installed binaries are usually stripped using `strip' when the user
+@@ -1846,13 +1827,6 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
+
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+-# Always define AMTAR for backward compatibility.
+-
+-AMTAR=${AMTAR-"${am_missing_run}tar"}
+-
+-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+-
+-
+
+
+
+@@ -1901,6 +1875,20 @@ if test "${enable_ansi+set}" = set; then
+ else
+ enable_ansi=no
+ fi;
++# Check whether --enable-tabs or --disable-tabs was given.
++if test "${enable_tabs+set}" = set; then
++ enableval="$enable_tabs"
++
++else
++ enable_tabs=yes
++fi;
++# Check whether --enable-anti_alias or --disable-anti_alias was given.
++if test "${enable_anti_alias+set}" = set; then
++ enableval="$enable_anti_alias"
++
++else
++ enable_anti_alias=yes
++fi;
+ # Check whether --enable-ipv6 or --disable-ipv6 was given.
+ if test "${enable_ipv6+set}" = set; then
+ enableval="$enable_ipv6"
+@@ -1909,7 +1897,9 @@ fi;
+ # Check whether --enable-rtfl or --disable-rtfl was given.
+ if test "${enable_rtfl+set}" = set; then
+ enableval="$enable_rtfl"
+- enable_rtfl=yes
++
++else
++ enable_rtfl=no
+ fi;
+ # Check whether --enable-cookies or --disable-cookies was given.
+ if test "${enable_cookies+set}" = set; then
+@@ -1970,6 +1960,13 @@ else
+ DLGUI_FALSE=
+ fi
+
++# Check whether --enable-meta_refresh or --disable-meta_refresh was given.
++if test "${enable_meta_refresh+set}" = set; then
++ enableval="$enable_meta_refresh"
++
++else
++ enable_meta_refresh=no
++fi;
+
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -3007,9 +3004,7 @@ else
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
++ : > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+@@ -3037,14 +3032,9 @@ else
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
+- # that says an option was ignored or not supported.
+- # When given -MP, icc 7.0 and 7.1 complain thusly:
+- # icc: Command line warning: ignoring option '-M'; no argument required
+- # The diagnosis changed in icc 8.0:
+- # icc: Command line remark: option '-MP' not supported
+- if (grep 'ignoring option' conftest.err ||
+- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++ # (even with -Werror). So we grep stderr for any message
++ # that says an option was ignored.
++ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
+@@ -3075,101 +3065,128 @@ else
+ fi
+
+
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
++
++
++
++
++echo "$as_me:$LINENO: checking for ${CC-cc} option to accept ANSI C" >&5
++echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
++if test "${am_cv_prog_cc_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
++ am_cv_prog_cc_stdc=no
++ac_save_CC="$CC"
++# Don't try gcc -ansi; that turns off useful extensions and
++# breaks some systems' header files.
++# AIX -qlanglvl=ansi
++# Ultrix and OSF/1 -std1
++# HP-UX 10.20 and later -Ae
++# HP-UX older versions -Aa -D_HPUX_SOURCE
++# SVR4 -Xc -D__EXTENSIONS__
++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_CC="${ac_tool_prefix}gcc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
++ CC="$ac_save_CC $ac_arg"
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++ char **p;
++ int i;
++{
++ return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++ char *s;
++ va_list v;
++ va_start (v,p);
++ s = g (p, va_arg (v,int));
++ va_end (v);
++ return s;
++}
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
+
+-fi
+-fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++int
++main ()
++{
++
++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ am_cv_prog_cc_stdc="$ac_arg"; break
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+-if test -z "$ac_cv_prog_CC"; then
+- ac_ct_CC=$CC
+- # Extract the first word of "gcc", so it can be a program name with args.
+-set dummy gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_CC="gcc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
++CC="$ac_save_CC"
+
+ fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+
+- CC=$ac_ct_CC
++if test -z "$am_cv_prog_cc_stdc"; then
++ echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6
+ else
+- CC="$ac_cv_prog_CC"
++ echo "$as_me:$LINENO: result: $am_cv_prog_cc_stdc" >&5
++echo "${ECHO_T}$am_cv_prog_cc_stdc" >&6
+ fi
++case "x$am_cv_prog_cc_stdc" in
++ x|xno) ;;
++ *) CC="$CC $am_cv_prog_cc_stdc" ;;
++esac
+
+-if test -z "$CC"; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}cc; ac_word=$2
++if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
++ if test -n "$RANLIB"; then
++ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -3178,7 +3195,7 @@ do
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_CC="${ac_tool_prefix}cc"
++ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -3187,27 +3204,27 @@ done
+
+ fi
+ fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++ echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+ fi
+-if test -z "$ac_cv_prog_CC"; then
+- ac_ct_CC=$CC
+- # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
++if test -z "$ac_cv_prog_RANLIB"; then
++ ac_ct_RANLIB=$RANLIB
++ # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++ if test -n "$ac_ct_RANLIB"; then
++ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -3216,97 +3233,281 @@ do
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_CC="cc"
++ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+
++ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+ fi
+ fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++ echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+- CC=$ac_ct_CC
++ RANLIB=$ac_ct_RANLIB
+ else
+- CC="$ac_cv_prog_CC"
++ RANLIB="$ac_cv_prog_RANLIB"
+ fi
+
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++ CPP=
+ fi
+-if test -z "$CC"; then
+- # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test -z "$CPP"; then
++ if test "${ac_cv_prog_CPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+- ac_prog_rejected=no
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+- ac_prog_rejected=yes
+- continue
+- fi
+- ac_cv_prog_CC="cc"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
++ # Double quotes because CPP needs to be expanded
++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++ do
++ ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++ # Use a header file that comes with gcc, so configuring glibc
++ # with a fresh cross-compiler works.
++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ # <limits.h> exists even on freestanding compilers.
++ # On the NeXT, cc -E runs the code through the compiler's parser,
++ # not just through cpp. "Syntax error" is here to catch this case.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null; then
++ if test -s conftest.err; then
++ ac_cpp_err=$ac_c_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++ else
++ ac_cpp_err=
+ fi
++else
++ ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++ :
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++ # OK, works on sane cases. Now check whether non-existent headers
++ # can be detected and how.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null; then
++ if test -s conftest.err; then
++ ac_cpp_err=$ac_c_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++ else
++ ac_cpp_err=
++ fi
++else
++ ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++ # Broken: success on invalid input.
++continue
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
+ done
+-done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++ break
++fi
+
+-if test $ac_prog_rejected = yes; then
+- # We found a bogon in the path, so make sure we never use it.
+- set dummy $ac_cv_prog_CC
+- shift
+- if test $# != 0; then
+- # We chose a different compiler from the bogus one.
+- # However, it has the same basename, so the bogon will be chosen
+- # first if we set CC to just the basename; use the full file name.
+- shift
+- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
++ done
++ ac_cv_prog_CPP=$CPP
++
++fi
++ CPP=$ac_cv_prog_CPP
++else
++ ac_cv_prog_CPP=$CPP
++fi
++echo "$as_me:$LINENO: result: $CPP" >&5
++echo "${ECHO_T}$CPP" >&6
++ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++ # Use a header file that comes with gcc, so configuring glibc
++ # with a fresh cross-compiler works.
++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ # <limits.h> exists even on freestanding compilers.
++ # On the NeXT, cc -E runs the code through the compiler's parser,
++ # not just through cpp. "Syntax error" is here to catch this case.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null; then
++ if test -s conftest.err; then
++ ac_cpp_err=$ac_c_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++ else
++ ac_cpp_err=
+ fi
++else
++ ac_cpp_err=yes
+ fi
++if test -z "$ac_cpp_err"; then
++ :
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Broken: fails on valid input.
++continue
+ fi
++rm -f conftest.err conftest.$ac_ext
++
++ # OK, works on sane cases. Now check whether non-existent headers
++ # can be detected and how.
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null; then
++ if test -s conftest.err; then
++ ac_cpp_err=$ac_c_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++ else
++ ac_cpp_err=
++ fi
++else
++ ac_cpp_err=yes
+ fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++if test -z "$ac_cpp_err"; then
++ # Broken: success on invalid input.
++continue
+ else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ # Passes both tests.
++ac_preproc_ok=:
++break
+ fi
++rm -f conftest.err conftest.$ac_ext
+
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++ :
++else
++ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++ { (exit 1); exit 1; }; }
+ fi
+-if test -z "$CC"; then
+- if test -n "$ac_tool_prefix"; then
+- for ac_prog in cl
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++ac_ext=cc
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++ for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$CC"; then
+- ac_cv_prog_CC="$CC" # Let the user override the test.
++ if test -n "$CXX"; then
++ ac_cv_prog_CXX="$CXX" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -3315,7 +3516,7 @@ do
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
++ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -3324,31 +3525,31 @@ done
+
+ fi
+ fi
+-CC=$ac_cv_prog_CC
+-if test -n "$CC"; then
+- echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++CXX=$ac_cv_prog_CXX
++if test -n "$CXX"; then
++ echo "$as_me:$LINENO: result: $CXX" >&5
++echo "${ECHO_T}$CXX" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+- test -n "$CC" && break
++ test -n "$CXX" && break
+ done
+ fi
+-if test -z "$CC"; then
+- ac_ct_CC=$CC
+- for ac_prog in cl
++if test -z "$CXX"; then
++ ac_ct_CXX=$CXX
++ for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$ac_ct_CC"; then
+- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
++ if test -n "$ac_ct_CXX"; then
++ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -3357,7 +3558,7 @@ do
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_CC="$ac_prog"
++ ac_cv_prog_ac_ct_CXX="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -3366,33 +3567,26 @@ done
+
+ fi
+ fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
++if test -n "$ac_ct_CXX"; then
++ echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
++echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+- test -n "$ac_ct_CC" && break
++ test -n "$ac_ct_CXX" && break
+ done
++test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
+
+- CC=$ac_ct_CC
+-fi
+-
++ CXX=$ac_ct_CXX
+ fi
+
+
+-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
+-
+ # Provide some information about the compiler.
+ echo "$as_me:$LINENO:" \
+- "checking for C compiler version" >&5
++ "checking for C++ compiler version" >&5
+ ac_compiler=`set X $ac_compile; echo $2`
+ { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
+@@ -3410,9 +3604,9 @@ ac_compiler=`set X $ac_compile; echo $2`
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
++echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
++if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -3427,189 +3621,13 @@ main ()
+ {
+ #ifndef __GNUC__
+ choke me
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_compiler_gnu=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_compiler_gnu=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_cv_c_compiler_gnu=$ac_compiler_gnu
+-
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+-GCC=`test $ac_compiler_gnu = yes && echo yes`
+-ac_test_CFLAGS=${CFLAGS+set}
+-ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_g+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_prog_cc_g=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_prog_cc_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+-if test "$ac_test_CFLAGS" = set; then
+- CFLAGS=$ac_save_CFLAGS
+-elif test $ac_cv_prog_cc_g = yes; then
+- if test "$GCC" = yes; then
+- CFLAGS="-g -O2"
+- else
+- CFLAGS="-g"
+- fi
+-else
+- if test "$GCC" = yes; then
+- CFLAGS="-O2"
+- else
+- CFLAGS=
+- fi
+-fi
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_cv_prog_cc_stdc=no
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+- char **p;
+- int i;
+-{
+- return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+- char *s;
+- va_list v;
+- va_start (v,p);
+- s = g (p, va_arg (v,int));
+- va_end (v);
+- return s;
+-}
+-
+-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+- function prototypes and stuff, but not '\xHH' hex character constants.
+- These don't provoke an error unfortunately, instead are silently treated
+- as 'x'. The following induces an error, until -std1 is added to get
+- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+- array size at least. It's necessary to write '\x00'==0 to get something
+- that's true only with -std1. */
+-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+-
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+-int
+-main ()
+-{
+-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
++#endif
++
+ ;
+ return 0;
+ }
+ _ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX -qlanglvl=ansi
+-# Ultrix and OSF/1 -std1
+-# HP-UX 10.20 and later -Ae
+-# HP-UX older versions -Aa -D_HPUX_SOURCE
+-# SVR4 -Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+- CC="$ac_save_CC $ac_arg"
+- rm -f conftest.$ac_objext
++rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+@@ -3618,7 +3636,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
++ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+@@ -3631,38 +3649,42 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_prog_cc_stdc=$ac_arg
+-break
++ ac_compiler_gnu=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++ac_compiler_gnu=no
+ fi
+-rm -f conftest.err conftest.$ac_objext
+-done
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-CC=$ac_save_CC
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+ fi
++echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
++GXX=`test $ac_compiler_gnu = yes && echo yes`
++ac_test_CXXFLAGS=${CXXFLAGS+set}
++ac_save_CXXFLAGS=$CXXFLAGS
++CXXFLAGS="-g"
++echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
++echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_cxx_g+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
+
+-case "x$ac_cv_prog_cc_stdc" in
+- x|xno)
+- echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
+- *)
+- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+- CC="$CC $ac_cv_prog_cc_stdc" ;;
+-esac
++int
++main ()
++{
+
+-# Some people use a C++ compiler to compile C. Since we use `exit',
+-# in C++ we need to declare it. In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
+-cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+- choke me
+-#endif
++ ;
++ return 0;
++}
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -3673,7 +3695,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
++ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+@@ -3686,7 +3708,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- for ac_declaration in \
++ ac_cv_prog_cxx_g=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_cxx_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
++if test "$ac_test_CXXFLAGS" = set; then
++ CXXFLAGS=$ac_save_CXXFLAGS
++elif test $ac_cv_prog_cxx_g = yes; then
++ if test "$GXX" = yes; then
++ CXXFLAGS="-g -O2"
++ else
++ CXXFLAGS="-g"
++ fi
++else
++ if test "$GXX" = yes; then
++ CXXFLAGS="-O2"
++ else
++ CXXFLAGS=
++ fi
++fi
++for ac_declaration in \
+ '' \
+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
+ 'extern "C" void std::exit (int); using std::exit;' \
+@@ -3719,7 +3767,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
++ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+@@ -3764,7 +3812,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
++ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+@@ -3792,23 +3840,17 @@ if test -n "$ac_declaration"; then
+ echo '#endif' >>confdefs.h
+ fi
+
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-depcc="$CC" am_compiler_list=
++depcc="$CXX" am_compiler_list=
+
+ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+ echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
++if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -3830,7 +3872,7 @@ else
+ # directory.
+ mkdir sub
+
+- am_cv_CC_dependencies_compiler_type=none
++ am_cv_CXX_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+@@ -3845,9 +3887,7 @@ else
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
++ : > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+@@ -3875,15 +3915,10 @@ else
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
+- # that says an option was ignored or not supported.
+- # When given -MP, icc 7.0 and 7.1 complain thusly:
+- # icc: Command line warning: ignoring option '-M'; no argument required
+- # The diagnosis changed in icc 8.0:
+- # icc: Command line remark: option '-MP' not supported
+- if (grep 'ignoring option' conftest.err ||
+- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+- am_cv_CC_dependencies_compiler_type=$depmode
++ # (even with -Werror). So we grep stderr for any message
++ # that says an option was ignored.
++ if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
++ am_cv_CXX_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+@@ -3892,807 +3927,1684 @@ else
+ cd ..
+ rm -rf conftest.dir
+ else
+- am_cv_CC_dependencies_compiler_type=none
++ am_cv_CXX_dependencies_compiler_type=none
+ fi
+
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
++echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
++CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+- am__fastdepCC_TRUE=
+- am__fastdepCC_FALSE='#'
++ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
++ am__fastdepCXX_TRUE=
++ am__fastdepCXX_FALSE='#'
+ else
+- am__fastdepCC_TRUE='#'
+- am__fastdepCC_FALSE=
++ am__fastdepCXX_TRUE='#'
++ am__fastdepCXX_FALSE=
+ fi
+
+
+
+-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
++ALL_LINGUAS="ja zh_CN zh_TW"
+
+-if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++ MKINSTALLDIRS=
++ if test -n "$ac_aux_dir"; then
++ case "$ac_aux_dir" in
++ /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
++ *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
++ esac
++ fi
++ if test -z "$MKINSTALLDIRS"; then
++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++ fi
++
++
++
++
++
++ # Extract the first word of "msgfmt", so it can be a program name with args.
++set dummy msgfmt; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$RANLIB"; then
+- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++ case "$MSGFMT" in
++ /*)
++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
++ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
++ ac_cv_path_MSGFMT="$ac_dir/$ac_word"
++ break
++ fi
++ fi
++ done
++ IFS="$ac_save_ifs"
++ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
++ ;;
++esac
++fi
++MSGFMT="$ac_cv_path_MSGFMT"
++if test "$MSGFMT" != ":"; then
++ echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++ # Extract the first word of "gmsgfmt", so it can be a program name with args.
++set dummy gmsgfmt; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_GMSGFMT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $GMSGFMT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+
++ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
++ ;;
++esac
+ fi
+-fi
+-RANLIB=$ac_cv_prog_RANLIB
+-if test -n "$RANLIB"; then
+- echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
++GMSGFMT=$ac_cv_path_GMSGFMT
++
++if test -n "$GMSGFMT"; then
++ echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++echo "${ECHO_T}$GMSGFMT" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
++
++ # Extract the first word of "xgettext", so it can be a program name with args.
++set dummy xgettext; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_XGETTEXT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case "$XGETTEXT" in
++ /*)
++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
++ (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
++ ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
++ break
++ fi
++ fi
++ done
++ IFS="$ac_save_ifs"
++ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
++ ;;
++esac
+ fi
+-if test -z "$ac_cv_prog_RANLIB"; then
+- ac_ct_RANLIB=$RANLIB
+- # Extract the first word of "ranlib", so it can be a program name with args.
+-set dummy ranlib; ac_word=$2
++XGETTEXT="$ac_cv_path_XGETTEXT"
++if test "$XGETTEXT" != ":"; then
++ echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6
++else
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++ rm -f messages.po
++
++ # Extract the first word of "msgmerge", so it can be a program name with args.
++set dummy msgmerge; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
++if test "${ac_cv_path_MSGMERGE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- if test -n "$ac_ct_RANLIB"; then
+- ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
++ case "$MSGMERGE" in
++ /*)
++ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in $PATH; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
++ ac_cv_path_MSGMERGE="$ac_dir/$ac_word"
++ break
++ fi
++ fi
++ done
++ IFS="$ac_save_ifs"
++ test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
++ ;;
++esac
++fi
++MSGMERGE="$ac_cv_path_MSGMERGE"
++if test "$MSGMERGE" != ":"; then
++ echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++echo "${ECHO_T}$MSGMERGE" >&6
+ else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_RANLIB="ranlib"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++
++ if test "$GMSGFMT" != ":"; then
++ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
++ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
++ : ;
++ else
++ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
++ echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
++echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
++ GMSGFMT=":"
++ fi
+ fi
+-done
+-done
+
+- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
++ if test "$XGETTEXT" != ":"; then
++ if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
++ (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
++ : ;
++ else
++ echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
++echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
++ XGETTEXT=":"
++ fi
++ rm -f messages.po
++ fi
++
++ ac_config_commands="$ac_config_commands default-1"
++
++
++
++ if test "X$prefix" = "XNONE"; then
++ acl_final_prefix="$ac_default_prefix"
++ else
++ acl_final_prefix="$prefix"
++ fi
++ if test "X$exec_prefix" = "XNONE"; then
++ acl_final_exec_prefix='${prefix}'
++ else
++ acl_final_exec_prefix="$exec_prefix"
++ fi
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
++ prefix="$acl_save_prefix"
++
++
++# Check whether --with-gnu-ld or --without-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++ withval="$with_gnu_ld"
++ test "$withval" = no || with_gnu_ld=yes
++else
++ with_gnu_ld=no
++fi;
++ac_prog=ld
++if test "$GCC" = yes; then
++ # Check if gcc -print-prog-name=ld gives a path.
++ echo "$as_me:$LINENO: checking for ld used by GCC" >&5
++echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
++ case $host in
++ *-*-mingw*)
++ # gcc leaves a trailing carriage return which upsets mingw
++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++ *)
++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++ esac
++ case $ac_prog in
++ # Accept absolute paths.
++ [\\/]* | [A-Za-z]:[\\/]*)
++ re_direlt='/[^/][^/]*/\.\./'
++ # Canonicalize the path of ld
++ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
++ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++ done
++ test -z "$LD" && LD="$ac_prog"
++ ;;
++ "")
++ # If it fails, then pretend we aren't using GCC.
++ ac_prog=ld
++ ;;
++ *)
++ # If it is relative, then search for the first ld in PATH.
++ with_gnu_ld=unknown
++ ;;
++ esac
++elif test "$with_gnu_ld" = yes; then
++ echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++else
++ echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++fi
++if test "${acl_cv_path_LD+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -z "$LD"; then
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
++ for ac_dir in $PATH; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++ acl_cv_path_LD="$ac_dir/$ac_prog"
++ # Check to see if the program is GNU ld. I'd rather use --version,
++ # but apparently some GNU ld's only accept -v.
++ # Break only if it was the GNU/non-GNU ld that we prefer.
++ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
++ test "$with_gnu_ld" != no && break
++ else
++ test "$with_gnu_ld" != yes && break
++ fi
++ fi
++ done
++ IFS="$ac_save_ifs"
++else
++ acl_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi
+ fi
+-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+-if test -n "$ac_ct_RANLIB"; then
+- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
++
++LD="$acl_cv_path_LD"
++if test -n "$LD"; then
++ echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+-
+- RANLIB=$ac_ct_RANLIB
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++ { (exit 1); exit 1; }; }
++echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++if test "${acl_cv_prog_gnu_ld+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- RANLIB="$ac_cv_prog_RANLIB"
++ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++ acl_cv_prog_gnu_ld=yes
++else
++ acl_cv_prog_gnu_ld=no
+ fi
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+-# On Suns, sometimes $CPP names a directory.
+-if test -n "$CPP" && test -d "$CPP"; then
+- CPP=
+ fi
+-if test -z "$CPP"; then
+- if test "${ac_cv_prog_CPP+set}" = set; then
++echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
++with_gnu_ld=$acl_cv_prog_gnu_ld
++
++
++
++ echo "$as_me:$LINENO: checking for shared library run path origin" >&5
++echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
++if test "${acl_cv_rpath+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- # Double quotes because CPP needs to be expanded
+- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+- do
+- ac_preproc_ok=false
+-for ac_c_preproc_warn_flag in '' yes
+-do
+- # Use a header file that comes with gcc, so configuring glibc
+- # with a fresh cross-compiler works.
+- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- # <limits.h> exists even on freestanding compilers.
+- # On the NeXT, cc -E runs the code through the compiler's parser,
+- # not just through cpp. "Syntax error" is here to catch this case.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+- Syntax error
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
++
++ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
++ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
++ . ./conftest.sh
++ rm -f ./conftest.sh
++ acl_cv_rpath=done
++
+ fi
+-if test -z "$ac_cpp_err"; then
++echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
++echo "${ECHO_T}$acl_cv_rpath" >&6
++ wl="$acl_cv_wl"
++ libext="$acl_cv_libext"
++ shlibext="$acl_cv_shlibext"
++ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
++ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
++ hardcode_direct="$acl_cv_hardcode_direct"
++ hardcode_minus_L="$acl_cv_hardcode_minus_L"
++ sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
++ sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
++ # Check whether --enable-rpath or --disable-rpath was given.
++if test "${enable_rpath+set}" = set; then
++ enableval="$enable_rpath"
+ :
+ else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ enable_rpath=yes
++fi;
+
+- # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_ext
+
+- # OK, works on sane cases. Now check whether non-existent headers
+- # can be detected and how.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
++
++
++
++
++
++ use_additional=yes
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++
++# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
++if test "${with_libiconv_prefix+set}" = set; then
++ withval="$with_libiconv_prefix"
++
++ if test "X$withval" = "Xno"; then
++ use_additional=no
++ else
++ if test "X$withval" = "X"; then
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ else
++ additional_includedir="$withval/include"
++ additional_libdir="$withval/lib"
++ fi
++ fi
++
++fi;
++ LIBICONV=
++ LTLIBICONV=
++ INCICONV=
++ rpathdirs=
++ ltrpathdirs=
++ names_already_handled=
++ names_next_round='iconv '
++ while test -n "$names_next_round"; do
++ names_this_round="$names_next_round"
++ names_next_round=
++ for name in $names_this_round; do
++ already_handled=
++ for n in $names_already_handled; do
++ if test "$n" = "$name"; then
++ already_handled=yes
++ break
++ fi
++ done
++ if test -z "$already_handled"; then
++ names_already_handled="$names_already_handled $name"
++ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
++ eval value=\"\$HAVE_LIB$uppername\"
++ if test -n "$value"; then
++ if test "$value" = yes; then
++ eval value=\"\$LIB$uppername\"
++ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
++ eval value=\"\$LTLIB$uppername\"
++ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
++ else
++ :
++ fi
++ else
++ found_dir=
++ found_la=
++ found_so=
++ found_a=
++ if test $use_additional = yes; then
++ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
++ found_dir="$additional_libdir"
++ found_so="$additional_libdir/lib$name.$shlibext"
++ if test -f "$additional_libdir/lib$name.la"; then
++ found_la="$additional_libdir/lib$name.la"
++ fi
++ else
++ if test -f "$additional_libdir/lib$name.$libext"; then
++ found_dir="$additional_libdir"
++ found_a="$additional_libdir/lib$name.$libext"
++ if test -f "$additional_libdir/lib$name.la"; then
++ found_la="$additional_libdir/lib$name.la"
++ fi
++ fi
++ fi
++ fi
++ if test "X$found_dir" = "X"; then
++ for x in $LDFLAGS $LTLIBICONV; do
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ case "$x" in
++ -L*)
++ dir=`echo "X$x" | sed -e 's/^X-L//'`
++ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
++ found_dir="$dir"
++ found_so="$dir/lib$name.$shlibext"
++ if test -f "$dir/lib$name.la"; then
++ found_la="$dir/lib$name.la"
++ fi
++ else
++ if test -f "$dir/lib$name.$libext"; then
++ found_dir="$dir"
++ found_a="$dir/lib$name.$libext"
++ if test -f "$dir/lib$name.la"; then
++ found_la="$dir/lib$name.la"
++ fi
++ fi
++ fi
++ ;;
++ esac
++ if test "X$found_dir" != "X"; then
++ break
++ fi
++ done
++ fi
++ if test "X$found_dir" != "X"; then
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
++ if test "X$found_so" != "X"; then
++ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
++ else
++ haveit=
++ for x in $ltrpathdirs; do
++ if test "X$x" = "X$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ ltrpathdirs="$ltrpathdirs $found_dir"
++ fi
++ if test "$hardcode_direct" = yes; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
++ else
++ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
++ haveit=
++ for x in $rpathdirs; do
++ if test "X$x" = "X$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ rpathdirs="$rpathdirs $found_dir"
++ fi
++ else
++ haveit=
++ for x in $LDFLAGS $LIBICONV; do
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ if test "X$x" = "X-L$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
++ fi
++ if test "$hardcode_minus_L" != no; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
++ else
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
++ fi
++ fi
++ fi
++ fi
++ else
++ if test "X$found_a" != "X"; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
++ else
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
++ fi
++ fi
++ additional_includedir=
++ case "$found_dir" in
++ */lib | */lib/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
++ additional_includedir="$basedir/include"
++ ;;
++ esac
++ if test "X$additional_includedir" != "X"; then
++ if test "X$additional_includedir" != "X/usr/include"; then
++ haveit=
++ if test "X$additional_includedir" = "X/usr/local/include"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux*) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ for x in $CPPFLAGS $INCICONV; do
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ if test "X$x" = "X-I$additional_includedir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_includedir"; then
++ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
++ fi
++ fi
++ fi
++ fi
++ fi
++ if test -n "$found_la"; then
++ save_libdir="$libdir"
++ case "$found_la" in
++ */* | *\\*) . "$found_la" ;;
++ *) . "./$found_la" ;;
++ esac
++ libdir="$save_libdir"
++ for dep in $dependency_libs; do
++ case "$dep" in
++ -L*)
++ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
++ if test "X$additional_libdir" != "X/usr/lib"; then
++ haveit=
++ if test "X$additional_libdir" = "X/usr/local/lib"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux*) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ haveit=
++ for x in $LDFLAGS $LIBICONV; do
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
++ fi
++ fi
++ haveit=
++ for x in $LDFLAGS $LTLIBICONV; do
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
++ fi
++ fi
++ fi
++ fi
++ ;;
++ -R*)
++ dir=`echo "X$dep" | sed -e 's/^X-R//'`
++ if test "$enable_rpath" != no; then
++ haveit=
++ for x in $rpathdirs; do
++ if test "X$x" = "X$dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ rpathdirs="$rpathdirs $dir"
++ fi
++ haveit=
++ for x in $ltrpathdirs; do
++ if test "X$x" = "X$dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ ltrpathdirs="$ltrpathdirs $dir"
++ fi
++ fi
++ ;;
++ -l*)
++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
++ ;;
++ *.la)
++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
++ ;;
++ *)
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
++ ;;
++ esac
++ done
++ fi
++ else
++ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
++ fi
++ fi
++ fi
++ done
++ done
++ if test "X$rpathdirs" != "X"; then
++ if test -n "$hardcode_libdir_separator"; then
++ alldirs=
++ for found_dir in $rpathdirs; do
++ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
++ done
++ acl_save_libdir="$libdir"
++ libdir="$alldirs"
++ eval flag=\"$hardcode_libdir_flag_spec\"
++ libdir="$acl_save_libdir"
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
++ else
++ for found_dir in $rpathdirs; do
++ acl_save_libdir="$libdir"
++ libdir="$found_dir"
++ eval flag=\"$hardcode_libdir_flag_spec\"
++ libdir="$acl_save_libdir"
++ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
++ done
++ fi
+ fi
++ if test "X$ltrpathdirs" != "X"; then
++ for found_dir in $ltrpathdirs; do
++ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
++ done
++ fi
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ echo "$as_me:$LINENO: checking whether NLS is requested" >&5
++echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
++ # Check whether --enable-nls or --disable-nls was given.
++if test "${enable_nls+set}" = set; then
++ enableval="$enable_nls"
++ USE_NLS=$enableval
+ else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- # Broken: success on invalid input.
+-continue
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ USE_NLS=yes
++fi;
++ echo "$as_me:$LINENO: result: $USE_NLS" >&5
++echo "${ECHO_T}$USE_NLS" >&6
+
+- # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.$ac_ext
+
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
+- break
+-fi
+
+- done
+- ac_cv_prog_CPP=$CPP
++ LIBINTL=
++ LTLIBINTL=
++ POSUB=
+
+-fi
+- CPP=$ac_cv_prog_CPP
++ if test "$USE_NLS" = "yes"; then
++ gt_use_preinstalled_gnugettext=no
++
++
++
++
++
++
++ echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
++echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
++if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_prog_CPP=$CPP
+-fi
+-echo "$as_me:$LINENO: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6
+-ac_preproc_ok=false
+-for ac_c_preproc_warn_flag in '' yes
+-do
+- # Use a header file that comes with gcc, so configuring glibc
+- # with a fresh cross-compiler works.
+- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- # <limits.h> exists even on freestanding compilers.
+- # On the NeXT, cc -E runs the code through the compiler's parser,
+- # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+- Syntax error
++#include <libintl.h>
++extern int _nl_msg_cat_cntr;
++extern int *_nl_domain_bindings;
++int
++main ()
++{
++bindtextdomain ("", "");
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
++ ;
++ return 0;
++}
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- :
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-
+- # OK, works on sane cases. Now check whether non-existent headers
+- # can be detected and how.
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
+ ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null; then
+- if test -s conftest.err; then
+- ac_cpp_err=$ac_c_preproc_warn_flag
+- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+- else
+- ac_cpp_err=
+- fi
+-else
+- ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
+- # Broken: success on invalid input.
+-continue
++ (exit $ac_status); }; }; then
++ gt_cv_func_gnugettext1_libc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- # Passes both tests.
+-ac_preproc_ok=:
+-break
++gt_cv_func_gnugettext1_libc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
+-
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
+- :
+-else
+- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+- { (exit 1); exit 1; }; }
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
++echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
++echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
+
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++ if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
+
+-ac_ext=cc
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-if test -n "$ac_tool_prefix"; then
+- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+- do
+- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_CXX+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$CXX"; then
+- ac_cv_prog_CXX="$CXX" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+
+-fi
+-fi
+-CXX=$ac_cv_prog_CXX
+-if test -n "$CXX"; then
+- echo "$as_me:$LINENO: result: $CXX" >&5
+-echo "${ECHO_T}$CXX" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+
+- test -n "$CXX" && break
+- done
+-fi
+-if test -z "$CXX"; then
+- ac_ct_CXX=$CXX
+- for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$ac_ct_CXX"; then
+- ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+- ac_cv_prog_ac_ct_CXX="$ac_prog"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+
+-fi
+-fi
+-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+-if test -n "$ac_ct_CXX"; then
+- echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+-echo "${ECHO_T}$ac_ct_CXX" >&6
+-else
+- echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+
+- test -n "$ac_ct_CXX" && break
+-done
+-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
++ am_save_CPPFLAGS="$CPPFLAGS"
+
+- CXX=$ac_ct_CXX
+-fi
++ for element in $INCICONV; do
++ haveit=
++ for x in $CPPFLAGS; do
+
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
+
+-# Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+- "checking for C++ compiler version" >&5
+-ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+- (eval $ac_compiler --version </dev/null >&5) 2>&5
++ if test "X$x" = "X$element"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
++ fi
++ done
++
++
++ echo "$as_me:$LINENO: checking for iconv" >&5
++echo $ECHO_N "checking for iconv... $ECHO_C" >&6
++if test "${am_cv_func_iconv+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++ am_cv_func_iconv="no, consider installing GNU libiconv"
++ am_cv_lib_iconv=no
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <stdlib.h>
++#include <iconv.h>
++int
++main ()
++{
++iconv_t cd = iconv_open("","");
++ iconv(cd,NULL,NULL,NULL,NULL);
++ iconv_close(cd);
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+- (eval $ac_compiler -v </dev/null >&5) 2>&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+- (eval $ac_compiler -V </dev/null >&5) 2>&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }
+-
+-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
+-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
++ (exit $ac_status); }; }; then
++ am_cv_func_iconv=yes
+ else
+- cat >conftest.$ac_ext <<_ACEOF
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ if test "$am_cv_func_iconv" != yes; then
++ am_save_LIBS="$LIBS"
++ LIBS="$LIBS $LIBICONV"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-
++#include <stdlib.h>
++#include <iconv.h>
+ int
+ main ()
+ {
+-#ifndef __GNUC__
+- choke me
+-#endif
+-
++iconv_t cd = iconv_open("","");
++ iconv(cd,NULL,NULL,NULL,NULL);
++ iconv_close(cd);
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
++ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_compiler_gnu=yes
++ am_cv_lib_iconv=yes
++ am_cv_func_iconv=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_compiler_gnu=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ LIBS="$am_save_LIBS"
++ fi
++
++fi
++echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
++echo "${ECHO_T}$am_cv_func_iconv" >&6
++ if test "$am_cv_func_iconv" = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_ICONV 1
++_ACEOF
++
++ fi
++ if test "$am_cv_lib_iconv" = yes; then
++ echo "$as_me:$LINENO: checking how to link with libiconv" >&5
++echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
++ echo "$as_me:$LINENO: result: $LIBICONV" >&5
++echo "${ECHO_T}$LIBICONV" >&6
++ else
++ CPPFLAGS="$am_save_CPPFLAGS"
++ LIBICONV=
++ LTLIBICONV=
++ fi
++
++
++
++
++
++
++ use_additional=yes
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++
++# Check whether --with-libintl-prefix or --without-libintl-prefix was given.
++if test "${with_libintl_prefix+set}" = set; then
++ withval="$with_libintl_prefix"
++
++ if test "X$withval" = "Xno"; then
++ use_additional=no
++ else
++ if test "X$withval" = "X"; then
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++
++ eval additional_includedir=\"$includedir\"
++ eval additional_libdir=\"$libdir\"
++
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ else
++ additional_includedir="$withval/include"
++ additional_libdir="$withval/lib"
++ fi
++ fi
++
++fi;
++ LIBINTL=
++ LTLIBINTL=
++ INCINTL=
++ rpathdirs=
++ ltrpathdirs=
++ names_already_handled=
++ names_next_round='intl '
++ while test -n "$names_next_round"; do
++ names_this_round="$names_next_round"
++ names_next_round=
++ for name in $names_this_round; do
++ already_handled=
++ for n in $names_already_handled; do
++ if test "$n" = "$name"; then
++ already_handled=yes
++ break
++ fi
++ done
++ if test -z "$already_handled"; then
++ names_already_handled="$names_already_handled $name"
++ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
++ eval value=\"\$HAVE_LIB$uppername\"
++ if test -n "$value"; then
++ if test "$value" = yes; then
++ eval value=\"\$LIB$uppername\"
++ test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value"
++ eval value=\"\$LTLIB$uppername\"
++ test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value"
++ else
++ :
++ fi
++ else
++ found_dir=
++ found_la=
++ found_so=
++ found_a=
++ if test $use_additional = yes; then
++ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
++ found_dir="$additional_libdir"
++ found_so="$additional_libdir/lib$name.$shlibext"
++ if test -f "$additional_libdir/lib$name.la"; then
++ found_la="$additional_libdir/lib$name.la"
++ fi
++ else
++ if test -f "$additional_libdir/lib$name.$libext"; then
++ found_dir="$additional_libdir"
++ found_a="$additional_libdir/lib$name.$libext"
++ if test -f "$additional_libdir/lib$name.la"; then
++ found_la="$additional_libdir/lib$name.la"
++ fi
++ fi
++ fi
++ fi
++ if test "X$found_dir" = "X"; then
++ for x in $LDFLAGS $LTLIBINTL; do
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ case "$x" in
++ -L*)
++ dir=`echo "X$x" | sed -e 's/^X-L//'`
++ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
++ found_dir="$dir"
++ found_so="$dir/lib$name.$shlibext"
++ if test -f "$dir/lib$name.la"; then
++ found_la="$dir/lib$name.la"
++ fi
++ else
++ if test -f "$dir/lib$name.$libext"; then
++ found_dir="$dir"
++ found_a="$dir/lib$name.$libext"
++ if test -f "$dir/lib$name.la"; then
++ found_la="$dir/lib$name.la"
++ fi
++ fi
++ fi
++ ;;
++ esac
++ if test "X$found_dir" != "X"; then
++ break
++ fi
++ done
++ fi
++ if test "X$found_dir" != "X"; then
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
++ if test "X$found_so" != "X"; then
++ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ else
++ haveit=
++ for x in $ltrpathdirs; do
++ if test "X$x" = "X$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ ltrpathdirs="$ltrpathdirs $found_dir"
++ fi
++ if test "$hardcode_direct" = yes; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ else
++ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ haveit=
++ for x in $rpathdirs; do
++ if test "X$x" = "X$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ rpathdirs="$rpathdirs $found_dir"
++ fi
++ else
++ haveit=
++ for x in $LDFLAGS $LIBINTL; do
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ if test "X$x" = "X-L$found_dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
++ fi
++ if test "$hardcode_minus_L" != no; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
++ else
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
++ fi
++ fi
++ fi
++ fi
++ else
++ if test "X$found_a" != "X"; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a"
++ else
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name"
++ fi
++ fi
++ additional_includedir=
++ case "$found_dir" in
++ */lib | */lib/)
++ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
++ additional_includedir="$basedir/include"
++ ;;
++ esac
++ if test "X$additional_includedir" != "X"; then
++ if test "X$additional_includedir" != "X/usr/include"; then
++ haveit=
++ if test "X$additional_includedir" = "X/usr/local/include"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux*) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ for x in $CPPFLAGS $INCINTL; do
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ if test "X$x" = "X-I$additional_includedir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_includedir"; then
++ INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir"
++ fi
++ fi
++ fi
++ fi
++ fi
++ if test -n "$found_la"; then
++ save_libdir="$libdir"
++ case "$found_la" in
++ */* | *\\*) . "$found_la" ;;
++ *) . "./$found_la" ;;
++ esac
++ libdir="$save_libdir"
++ for dep in $dependency_libs; do
++ case "$dep" in
++ -L*)
++ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
++ if test "X$additional_libdir" != "X/usr/lib"; then
++ haveit=
++ if test "X$additional_libdir" = "X/usr/local/lib"; then
++ if test -n "$GCC"; then
++ case $host_os in
++ linux*) haveit=yes;;
++ esac
++ fi
++ fi
++ if test -z "$haveit"; then
++ haveit=
++ for x in $LDFLAGS $LIBINTL; do
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
++ fi
++ fi
++ haveit=
++ for x in $LDFLAGS $LTLIBINTL; do
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ if test "X$x" = "X-L$additional_libdir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ if test -d "$additional_libdir"; then
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
++ fi
++ fi
++ fi
++ fi
++ ;;
++ -R*)
++ dir=`echo "X$dep" | sed -e 's/^X-R//'`
++ if test "$enable_rpath" != no; then
++ haveit=
++ for x in $rpathdirs; do
++ if test "X$x" = "X$dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ rpathdirs="$rpathdirs $dir"
++ fi
++ haveit=
++ for x in $ltrpathdirs; do
++ if test "X$x" = "X$dir"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ ltrpathdirs="$ltrpathdirs $dir"
++ fi
++ fi
++ ;;
++ -l*)
++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
++ ;;
++ *.la)
++ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
++ ;;
++ *)
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$dep"
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep"
++ ;;
++ esac
++ done
++ fi
++ else
++ LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name"
++ fi
++ fi
++ fi
++ done
++ done
++ if test "X$rpathdirs" != "X"; then
++ if test -n "$hardcode_libdir_separator"; then
++ alldirs=
++ for found_dir in $rpathdirs; do
++ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
++ done
++ acl_save_libdir="$libdir"
++ libdir="$alldirs"
++ eval flag=\"$hardcode_libdir_flag_spec\"
++ libdir="$acl_save_libdir"
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
++ else
++ for found_dir in $rpathdirs; do
++ acl_save_libdir="$libdir"
++ libdir="$found_dir"
++ eval flag=\"$hardcode_libdir_flag_spec\"
++ libdir="$acl_save_libdir"
++ LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
++ done
++ fi
++ fi
++ if test "X$ltrpathdirs" != "X"; then
++ for found_dir in $ltrpathdirs; do
++ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir"
++ done
++ fi
+
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
+-GXX=`test $ac_compiler_gnu = yes && echo yes`
+-ac_test_CXXFLAGS=${CXXFLAGS+set}
+-ac_save_CXXFLAGS=$CXXFLAGS
+-CXXFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+-if test "${ac_cv_prog_cxx_g+set}" = set; then
++ echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
++echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
++if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
++ gt_save_CPPFLAGS="$CPPFLAGS"
++ CPPFLAGS="$CPPFLAGS $INCINTL"
++ gt_save_LIBS="$LIBS"
++ LIBS="$LIBS $LIBINTL"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-
++#include <libintl.h>
++extern int _nl_msg_cat_cntr;
++extern
++#ifdef __cplusplus
++"C"
++#endif
++const char *_nl_expand_alias ();
+ int
+ main ()
+ {
+-
++bindtextdomain ("", "");
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
++ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_prog_cxx_g=yes
++ gt_cv_func_gnugettext1_libintl=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_prog_cxx_g=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++gt_cv_func_gnugettext1_libintl=no
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
+-if test "$ac_test_CXXFLAGS" = set; then
+- CXXFLAGS=$ac_save_CXXFLAGS
+-elif test $ac_cv_prog_cxx_g = yes; then
+- if test "$GXX" = yes; then
+- CXXFLAGS="-g -O2"
+- else
+- CXXFLAGS="-g"
+- fi
+-else
+- if test "$GXX" = yes; then
+- CXXFLAGS="-O2"
+- else
+- CXXFLAGS=
+- fi
+-fi
+-for ac_declaration in \
+- '' \
+- 'extern "C" void std::exit (int) throw (); using std::exit;' \
+- 'extern "C" void std::exit (int); using std::exit;' \
+- 'extern "C" void exit (int) throw ();' \
+- 'extern "C" void exit (int);' \
+- 'void exit (int);'
+-do
+- cat >conftest.$ac_ext <<_ACEOF
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
++ LIBS="$LIBS $LIBICONV"
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_declaration
+-#include <stdlib.h>
++#include <libintl.h>
++extern int _nl_msg_cat_cntr;
++extern
++#ifdef __cplusplus
++"C"
++#endif
++const char *_nl_expand_alias ();
+ int
+ main ()
+ {
+-exit (42);
++bindtextdomain ("", "");
++return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
++ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- :
++ LIBINTL="$LIBINTL $LIBICONV"
++ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
++ gt_cv_func_gnugettext1_libintl=yes
++
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-continue
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+- cat >conftest.$ac_ext <<_ACEOF
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++ fi
++ CPPFLAGS="$gt_save_CPPFLAGS"
++ LIBS="$gt_save_LIBS"
++fi
++echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
++echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
++ fi
++
++ if test "$gt_cv_func_gnugettext1_libc" = "yes" \
++ || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
++ && test "$PACKAGE" != gettext; }; then
++ gt_use_preinstalled_gnugettext=yes
++ else
++ LIBINTL=
++ LTLIBINTL=
++ INCINTL=
++ fi
++
++
++
++ if test "$gt_use_preinstalled_gnugettext" = "yes" \
++ || test "$nls_cv_use_gnu_gettext" = "yes"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define ENABLE_NLS 1
++_ACEOF
++
++ else
++ USE_NLS=no
++ fi
++ fi
++
++ if test "$USE_NLS" = "yes"; then
++
++ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
++ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
++ echo "$as_me:$LINENO: checking how to link with libintl" >&5
++echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
++ echo "$as_me:$LINENO: result: $LIBINTL" >&5
++echo "${ECHO_T}$LIBINTL" >&6
++
++ for element in $INCINTL; do
++ haveit=
++ for x in $CPPFLAGS; do
++
++ acl_save_prefix="$prefix"
++ prefix="$acl_final_prefix"
++ acl_save_exec_prefix="$exec_prefix"
++ exec_prefix="$acl_final_exec_prefix"
++ eval x=\"$x\"
++ exec_prefix="$acl_save_exec_prefix"
++ prefix="$acl_save_prefix"
++
++ if test "X$x" = "X$element"; then
++ haveit=yes
++ break
++ fi
++ done
++ if test -z "$haveit"; then
++ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
++ fi
++ done
++
++ fi
++
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GETTEXT 1
++_ACEOF
++
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_DCGETTEXT 1
++_ACEOF
++
++ fi
++
++ POSUB=po
++ fi
++
++
++
++ INTLLIBS="$LIBINTL"
++
++
++
++
++
++
++LDFLAGS="$LDFLAGS $INTLLIBS"
++echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
++echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6
++if test "${ac_cv_lib_iconv_iconv+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-liconv $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-$ac_declaration
++
++/* Override any gcc2 internal prototype to avoid an error. */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char iconv ();
+ int
+ main ()
+ {
+-exit (42);
++iconv ();
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- (eval $ac_compile) 2>conftest.er1
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag"
++ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+- { ac_try='test -s conftest.$ac_objext'
++ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- break
++ ac_cv_lib_iconv_iconv=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++ac_cv_lib_iconv_iconv=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+- echo '#ifdef __cplusplus' >>confdefs.h
+- echo $ac_declaration >>confdefs.h
+- echo '#endif' >>confdefs.h
+-fi
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-depcc="$CXX" am_compiler_list=
+-
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+- # We make a subdir and do the tests there. Otherwise we can end up
+- # making bogus files that we don't know about and never remove. For
+- # instance it was reported that on HP-UX the gcc test will end up
+- # making a dummy file named `D' -- because `-MD' means `put the output
+- # in D'.
+- mkdir conftest.dir
+- # Copy depcomp to subdir because otherwise we won't find it if we're
+- # using a relative directory.
+- cp "$am_depcomp" conftest.dir
+- cd conftest.dir
+- # We will build objects and dependencies in a subdirectory because
+- # it helps to detect inapplicable dependency modes. For instance
+- # both Tru64's cc and ICC support -MD to output dependencies as a
+- # side effect of compilation, but ICC will put the dependencies in
+- # the current directory while Tru64 will put them in the object
+- # directory.
+- mkdir sub
+-
+- am_cv_CXX_dependencies_compiler_type=none
+- if test "$am_compiler_list" = ""; then
+- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+- fi
+- for depmode in $am_compiler_list; do
+- # Setup a source with many dependencies, because some compilers
+- # like to wrap large dependency lists on column 80 (with \), and
+- # we should not choose a depcomp mode which is confused by this.
+- #
+- # We need to recreate these files for each test, as the compiler may
+- # overwrite some of them when testing with obscure command lines.
+- # This happens at least with the AIX C compiler.
+- : > sub/conftest.c
+- for i in 1 2 3 4 5 6; do
+- echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
+- done
+- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+-
+- case $depmode in
+- nosideeffect)
+- # after this tag, mechanisms are not by side-effect, so they'll
+- # only be used when explicitly requested
+- if test "x$enable_dependency_tracking" = xyes; then
+- continue
+- else
+- break
+- fi
+- ;;
+- none) break ;;
+- esac
+- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+- # mode. It turns out that the SunPro C++ compiler does not properly
+- # handle `-M -o', and we need to detect this.
+- if depmode=$depmode \
+- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+- >/dev/null 2>conftest.err &&
+- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+- # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
+- # that says an option was ignored or not supported.
+- # When given -MP, icc 7.0 and 7.1 complain thusly:
+- # icc: Command line warning: ignoring option '-M'; no argument required
+- # The diagnosis changed in icc 8.0:
+- # icc: Command line remark: option '-MP' not supported
+- if (grep 'ignoring option' conftest.err ||
+- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+- am_cv_CXX_dependencies_compiler_type=$depmode
+- break
+- fi
+- fi
+- done
+-
+- cd ..
+- rm -rf conftest.dir
+-else
+- am_cv_CXX_dependencies_compiler_type=none
+-fi
+-
+-fi
+-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
+-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+-
+-
+-
+-if
+- test "x$enable_dependency_tracking" != xno \
+- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+- am__fastdepCXX_TRUE=
+- am__fastdepCXX_FALSE='#'
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5
++echo "${ECHO_T}$ac_cv_lib_iconv_iconv" >&6
++if test $ac_cv_lib_iconv_iconv = yes; then
++ haslibiconv=yes
+ else
+- am__fastdepCXX_TRUE='#'
+- am__fastdepCXX_FALSE=
++ haslibiconv=no
+ fi
+
++if test "x$haslibiconv" = "xyes"; then
++ LDFLAGS="$LDFLAGS $LIBICONV"
++fi
++localedir='${prefix}/share/locale'
+
+
+ if test "`$CPP -v < /dev/null 2>&1 | grep '/usr/local/include' 2>&1`" = ""; then
+@@ -4701,7 +5613,6 @@ if test "`$CPP -v < /dev/null 2>&1 | gre
+ fi
+
+
+-
+ for ac_func in gethostbyname
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+@@ -6290,6 +7201,11 @@ fi
+
+
+
++ if test -e /usr/include/jpeglib.h || test -e /usr/local/include/jpeglib.h
++ then
++ jpeg_ok=yes
++ fi
++
+ if test "x$jpeg_ok" = "xyes"; then
+ old_libs="$LIBS"
+ echo "$as_me:$LINENO: checking for jpeg_destroy_decompress in -ljpeg" >&5
+@@ -6387,7 +7303,6 @@ _ACEOF
+
+ fi
+
+-if test "x$enable_png" = "xyes"; then
+ if test "${ac_cv_header_zlib_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for zlib.h" >&5
+ echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6
+@@ -6614,7 +7529,6 @@ fi
+ { echo "$as_me:$LINENO: WARNING: *** No libz found. Disabling PNG images ***" >&5
+ echo "$as_me: WARNING: *** No libz found. Disabling PNG images ***" >&2;}
+ fi
+-fi
+
+ if test "x$enable_png" = "xyes" && test "x$libz_ok" = "xyes"; then
+ echo "$as_me:$LINENO: checking for libpng-config" >&5
+@@ -6807,21 +7721,269 @@ if test `eval echo '${'$as_ac_Header'}'`
+ _ACEOF
+ png_ok=yes && break
+ else
+- png_ok=no
++ png_ok=no
++fi
++
++done
++
++
++ if test "x$png_ok" = "xyes"; then
++ old_libs="$LIBS"
++ echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
++echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
++if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lpng $LIBZ_LIBS -lm $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++/* Override any gcc2 internal prototype to avoid an error. */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++ builtin and then its argument prototype would still apply. */
++char png_check_sig ();
++int
++main ()
++{
++png_check_sig ();
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++ (eval $ac_link) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest$ac_exeext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_cv_lib_png_png_check_sig=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_png_png_check_sig=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
++echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
++if test $ac_cv_lib_png_png_check_sig = yes; then
++ png_ok=yes
++else
++ png_ok=no
++fi
++
++ LIBS="$old_libs"
++
++ if test "x$png_ok" = "xyes"; then
++ LIBPNG_LIBS="-lpng -lm"
++ fi
++ fi
++
++ if test "x$png_ok" = "xno"; then
++ { echo "$as_me:$LINENO: WARNING: *** No libpng found. Disabling PNG images ***" >&5
++echo "$as_me: WARNING: *** No libpng found. Disabling PNG images ***" >&2;}
++ fi
++ fi
++fi
++
++if test "x$png_ok" = "xyes"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define ENABLE_PNG
++_ACEOF
++
++fi
++
++if test "x$enable_gif" = "xyes"; then
++
++cat >>confdefs.h <<\_ACEOF
++#define ENABLE_GIF
++_ACEOF
++
++fi
++
++if test "x$enable_ssl" = "xyes"; then
++ if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
++ echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
++echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6
++if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
++echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6
++else
++ # Is the header compilable?
++echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5
++echo $ECHO_N "checking openssl/ssl.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++#include <openssl/ssl.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++ (eval $ac_compile) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } &&
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; } &&
++ { ac_try='test -s conftest.$ac_objext'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++ (eval $ac_try) 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
++ ac_header_compiler=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5
++echo $ECHO_N "checking openssl/ssl.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++#include <openssl/ssl.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } >/dev/null; then
++ if test -s conftest.err; then
++ ac_cpp_err=$ac_c_preproc_warn_flag
++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++ else
++ ac_cpp_err=
++ fi
++else
++ ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++ ac_header_preproc=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6
++
++# So? What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++ yes:no: )
++ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&2;}
++ ac_header_preproc=yes
++ ;;
++ no:yes:* )
++ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: openssl/ssl.h: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: openssl/ssl.h: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&2;}
++ (
++ cat <<\_ASBOX
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists. ##
++## ------------------------------------------ ##
++_ASBOX
++ ) |
++ sed "s/^/$as_me: WARNING: /" >&2
++ ;;
++esac
++echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
++echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6
++if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_cv_header_openssl_ssl_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
++echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6
++
++fi
++if test $ac_cv_header_openssl_ssl_h = yes; then
++ ssl_ok=yes
++else
++ ssl_ok=no
+ fi
+
+-done
+
+
+- if test "x$png_ok" = "xyes"; then
+- old_libs="$LIBS"
+- echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
+-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
+-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
++ if test "x$ssl_ok" = "xyes"; then
++ old_libs="$LIBS"
++ echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5
++echo $ECHO_N "checking for SSL_library_init in -lssl... $ECHO_C" >&6
++if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng $LIBZ_LIBS -lm $LIBS"
++LIBS="-lssl -lcrypto $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -6835,11 +7997,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char png_check_sig ();
++char SSL_library_init ();
+ int
+ main ()
+ {
+-png_check_sig ();
++SSL_library_init ();
+ ;
+ return 0;
+ }
+@@ -6866,68 +8028,62 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_lib_png_png_check_sig=yes
++ ac_cv_lib_ssl_SSL_library_init=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_png_png_check_sig=no
++ac_cv_lib_ssl_SSL_library_init=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
+-echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
+-if test $ac_cv_lib_png_png_check_sig = yes; then
+- png_ok=yes
++echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5
++echo "${ECHO_T}$ac_cv_lib_ssl_SSL_library_init" >&6
++if test $ac_cv_lib_ssl_SSL_library_init = yes; then
++ ssl_ok=yes
+ else
+- png_ok=no
++ ssl_ok=no
+ fi
+
+- LIBS="$old_libs"
+-
+- if test "x$png_ok" = "xyes"; then
+- LIBPNG_LIBS="-lpng -lm"
+- fi
+- fi
++ LIBS="$old_libs"
++ fi
+
+- if test "x$png_ok" = "xno"; then
+- { echo "$as_me:$LINENO: WARNING: *** No libpng found. Disabling PNG images ***" >&5
+-echo "$as_me: WARNING: *** No libpng found. Disabling PNG images ***" >&2;}
+- fi
++ if test "x$ssl_ok" = "xyes"; then
++ LIBSSL_LIBS="-lcrypto -lssl"
++ else
++ { echo "$as_me:$LINENO: WARNING: *** No libssl found. Disabling ssl support.***" >&5
++echo "$as_me: WARNING: *** No libssl found. Disabling ssl support.***" >&2;}
+ fi
+ fi
+
+-if test "x$png_ok" = "xyes"; then
++if test "x$ssl_ok" = "xyes"; then
+
+ cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_PNG
++#define ENABLE_SSL
+ _ACEOF
+
+ fi
+
+-if test "x$enable_gif" = "xyes"; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_GIF
+-_ACEOF
++if test "x$enable_ssl" = "xyes" ; then
+
+-fi
+
+-if test "x$enable_ssl" = "xyes"; then
+- if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
+- echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
+-echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6
+-if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
++for ac_header in openssl/ssl.h openssl/err.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ else
+ # Is the header compilable?
+-echo "$as_me:$LINENO: checking openssl/ssl.h usability" >&5
+-echo $ECHO_N "checking openssl/ssl.h usability... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -6935,7 +8091,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+-#include <openssl/ssl.h>
++#include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -6971,15 +8127,15 @@ echo "$as_me:$LINENO: result: $ac_header
+ echo "${ECHO_T}$ac_header_compiler" >&6
+
+ # Is the header present?
+-echo "$as_me:$LINENO: checking openssl/ssl.h presence" >&5
+-echo $ECHO_N "checking openssl/ssl.h presence... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-#include <openssl/ssl.h>
++#include <$ac_header>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -7013,25 +8169,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: openssl/ssl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: openssl/ssl.h: proceeding with the compiler's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: openssl/ssl.h: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: openssl/ssl.h: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: openssl/ssl.h: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: openssl/ssl.h: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: openssl/ssl.h: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: openssl/ssl.h: in the future, the compiler will take precedence" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+ ## ------------------------------------------ ##
+@@ -7042,34 +8198,34 @@ _ASBOX
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+-echo "$as_me:$LINENO: checking for openssl/ssl.h" >&5
+-echo $ECHO_N "checking for openssl/ssl.h... $ECHO_C" >&6
+-if test "${ac_cv_header_openssl_ssl_h+set}" = set; then
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- ac_cv_header_openssl_ssl_h=$ac_header_preproc
++ eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_openssl_ssl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_openssl_ssl_h" >&6
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+ fi
+-if test $ac_cv_header_openssl_ssl_h = yes; then
+- ssl_ok=yes
+-else
+- ssl_ok=no
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
+ fi
+
++done
+
+
+- if test "x$ssl_ok" = "xyes"; then
+- old_libs="$LIBS"
+- echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5
+-echo $ECHO_N "checking for SSL_library_init in -lssl... $ECHO_C" >&6
+-if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then
++echo "$as_me:$LINENO: checking for SSL_connect in -lssl" >&5
++echo $ECHO_N "checking for SSL_connect in -lssl... $ECHO_C" >&6
++if test "${ac_cv_lib_ssl_SSL_connect+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lssl -lcrypto $LIBS"
++LIBS="-lssl $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -7083,11 +8239,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char SSL_library_init ();
++char SSL_connect ();
+ int
+ main ()
+ {
+-SSL_library_init ();
++SSL_connect ();
+ ;
+ return 0;
+ }
+@@ -7114,45 +8270,42 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_lib_ssl_SSL_library_init=yes
++ ac_cv_lib_ssl_SSL_connect=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_ssl_SSL_library_init=no
++ac_cv_lib_ssl_SSL_connect=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_library_init" >&5
+-echo "${ECHO_T}$ac_cv_lib_ssl_SSL_library_init" >&6
+-if test $ac_cv_lib_ssl_SSL_library_init = yes; then
+- ssl_ok=yes
+-else
+- ssl_ok=no
+-fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_connect" >&5
++echo "${ECHO_T}$ac_cv_lib_ssl_SSL_connect" >&6
++if test $ac_cv_lib_ssl_SSL_connect = yes; then
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBSSL 1
++_ACEOF
+
+- LIBS="$old_libs"
+- fi
++ LIBS="-lssl $LIBS"
+
+- if test "x$ssl_ok" = "xyes"; then
+- LIBSSL_LIBS="-lcrypto -lssl"
+- else
+- { echo "$as_me:$LINENO: WARNING: *** No libssl found. Disabling ssl support.***" >&5
+-echo "$as_me: WARNING: *** No libssl found. Disabling ssl support.***" >&2;}
+- fi
++else
++ enable_ssl="no"
+ fi
+
+-if test "x$ssl_ok" = "xyes"; then
++ if test "x$enable_ssl" = "xno" ; then
++ { echo "$as_me:$LINENO: WARNING: *** No libssl found. Disabling ssl. ***" >&5
++echo "$as_me: WARNING: *** No libssl found. Disabling ssl. ***" >&2;}
++ else
+
+ cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_SSL
++#define DILLO_SSL 1
+ _ACEOF
+
++ fi
+ fi
+
+-
+ if test -z "$LIBPTHREAD_LIBS"; then
+ case $target in
+ *-*-linux*|*-*-solaris*)
+@@ -7839,6 +8992,132 @@ echo "$as_me: WARNING: *** Try setting L
+ ;;
+ esac
+
++if test "x$enable_tabs" = "xno" ; then
++ CFLAGS="$CFLAGS -DDISABLE_TABS"
++fi
++if test "x$enable_anti_alias" = "xno" ; then
++ CFLAGS="$CFLAGS -DDISABLE_ANTI_ALIAS"
++else
++ # Extract the first word of "xft-config", so it can be a program name with args.
++set dummy xft-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_XFT_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $XFT_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_XFT_CONFIG="$XFT_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_dummy="$PATH:/usr/local/bin"
++for as_dir in $as_dummy
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_XFT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++
++ test -z "$ac_cv_path_XFT_CONFIG" && ac_cv_path_XFT_CONFIG="no"
++ ;;
++esac
++fi
++XFT_CONFIG=$ac_cv_path_XFT_CONFIG
++
++if test -n "$XFT_CONFIG"; then
++ echo "$as_me:$LINENO: result: $XFT_CONFIG" >&5
++echo "${ECHO_T}$XFT_CONFIG" >&6
++else
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++ if test "$XFT_CONFIG" = "no" ; then
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_dummy="$PATH:/usr/local/bin"
++for as_dir in $as_dummy
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++ ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++
++if test -n "$PKG_CONFIG"; then
++ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++echo "${ECHO_T}$PKG_CONFIG" >&6
++else
++ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++ if test "$PKG_CONFIG" = "no" ; then
++ if test -d "/usr/include/freetype2" ; then
++ CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
++ elif test -d "/usr/include/freetype1" ; then
++ CPPFLAGS="$CPPFLAGS -I/usr/include/freetype1"
++ fi
++ if test -e "/usr/X11R6/include/X11/Xft/Xft.h" ; then
++ echo "$as_me:$LINENO: checking checking for Xft" >&5
++echo $ECHO_N "checking checking for Xft... $ECHO_C" >&6
++ if test -e "/usr/X11R6/lib/libXft.so.2" ; then
++ echo "$as_me:$LINENO: result: Xft2" >&5
++echo "${ECHO_T}Xft2" >&6
++ LIBS="/usr/X11R6/lib/libXft.so.2 $LIBS"
++ elif test -e "/usr/lib/libXft.so.2" ; then
++ echo "$as_me:$LINENO: result: Xft2" >&5
++echo "${ECHO_T}Xft2" >&6
++ LIBS="/usr/lib/libXft.so.2 $LIBS"
++ else
++ echo "$as_me:$LINENO: result: Xft" >&5
++echo "${ECHO_T}Xft" >&6
++ LIBS="-lXft $LIBS"
++ fi
++ else
++ { echo "$as_me:$LINENO: WARNING: *** Xft not found. Disabling anti-alias.***" >&5
++echo "$as_me: WARNING: *** Xft not found. Disabling anti-alias.***" >&2;}
++ enable_anti_alias="no"
++ CFLAGS="$CFLAGS -DDISABLE_ANTI_ALIAS"
++ fi
++ else
++ CFLAGS="$CFLAGS `$PKG_CONFIG xft --cflags`"
++ LDFLAGS="$LDFLAGS `$PKG_CONFIG xft --libs`"
++ fi
++ else
++ CFLAGS="$CFLAGS `$XFT_CONFIG --cflags`"
++ LDFLAGS="$LDFLAGS `$XFT_CONFIG --libs`"
++ fi
++fi
+ if test "x$enable_cookies" = "xno" ; then
+ CFLAGS="$CFLAGS -DDISABLE_COOKIES"
+ fi
+@@ -7861,6 +9140,9 @@ fi
+ if test "x$enable_threaded_dns" = "xyes" ; then
+ CFLAGS="$CFLAGS -DD_DNS_THREADED"
+ fi
++if test "x$enable_meta_refresh" = "xyes" ; then
++ CFLAGS="$CFLAGS -DENABLE_META_REFRESH"
++fi
+
+ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+@@ -8225,7 +9507,7 @@ fi
+
+
+
+- ac_config_files="$ac_config_files Makefile dpip/Makefile dpid/Makefile dpi/Makefile doc/Makefile src/Makefile src/IO/Makefile"
++ ac_config_files="$ac_config_files Makefile dpip/Makefile dpid/Makefile dpi/Makefile doc/Makefile config/Makefile src/Makefile src/IO/Makefile po/Makefile.in m4/Makefile"
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure
+@@ -8338,13 +9620,6 @@ echo "$as_me: error: conditional \"am__f
+ Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -8786,6 +10061,13 @@ cat >>$CONFIG_STATUS <<_ACEOF
+ #
+
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
++# Capture the value of obsolete $ALL_LINGUAS because we need it to compute
++ # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
++ # from automake.
++ eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
++ # Capture the value of LINGUAS because we need it to compute CATALOGS.
++ LINGUAS="${LINGUAS-%UNSET%}"
++
+
+ _ACEOF
+
+@@ -8801,9 +10083,13 @@ do
+ "dpid/Makefile" ) CONFIG_FILES="$CONFIG_FILES dpid/Makefile" ;;
+ "dpi/Makefile" ) CONFIG_FILES="$CONFIG_FILES dpi/Makefile" ;;
+ "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
++ "config/Makefile" ) CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
+ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "src/IO/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/IO/Makefile" ;;
++ "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
++ "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
+ "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++ "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+@@ -8913,17 +10199,14 @@ s,@AUTOCONF@,$AUTOCONF,;t t
+ s,@AUTOMAKE@,$AUTOMAKE,;t t
+ s,@AUTOHEADER@,$AUTOHEADER,;t t
+ s,@MAKEINFO@,$MAKEINFO,;t t
++s,@AMTAR@,$AMTAR,;t t
+ s,@install_sh@,$install_sh,;t t
+ s,@STRIP@,$STRIP,;t t
+ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+ s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+-s,@mkdir_p@,$mkdir_p,;t t
+ s,@AWK@,$AWK,;t t
+ s,@SET_MAKE@,$SET_MAKE,;t t
+ s,@am__leading_dot@,$am__leading_dot,;t t
+-s,@AMTAR@,$AMTAR,;t t
+-s,@am__tar@,$am__tar,;t t
+-s,@am__untar@,$am__untar,;t t
+ s,@DLGUI_TRUE@,$DLGUI_TRUE,;t t
+ s,@DLGUI_FALSE@,$DLGUI_FALSE,;t t
+ s,@CC@,$CC,;t t
+@@ -8951,6 +10234,19 @@ s,@ac_ct_CXX@,$ac_ct_CXX,;t t
+ s,@CXXDEPMODE@,$CXXDEPMODE,;t t
+ s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
+ s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
++s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
++s,@MSGFMT@,$MSGFMT,;t t
++s,@GMSGFMT@,$GMSGFMT,;t t
++s,@XGETTEXT@,$XGETTEXT,;t t
++s,@MSGMERGE@,$MSGMERGE,;t t
++s,@USE_NLS@,$USE_NLS,;t t
++s,@LIBICONV@,$LIBICONV,;t t
++s,@LTLIBICONV@,$LTLIBICONV,;t t
++s,@INTLLIBS@,$INTLLIBS,;t t
++s,@LIBINTL@,$LIBINTL,;t t
++s,@LTLIBINTL@,$LTLIBINTL,;t t
++s,@POSUB@,$POSUB,;t t
++s,@localedir@,$localedir,;t t
+ s,@GLIB_CONFIG@,$GLIB_CONFIG,;t t
+ s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
+ s,@GLIB_LIBS@,$GLIB_LIBS,;t t
+@@ -8958,6 +10254,8 @@ s,@GTK_CONFIG@,$GTK_CONFIG,;t t
+ s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
+ s,@GTK_LIBS@,$GTK_LIBS,;t t
+ s,@EGREP@,$EGREP,;t t
++s,@XFT_CONFIG@,$XFT_CONFIG,;t t
++s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@LIBJPEG_LIBS@,$LIBJPEG_LIBS,;t t
+ s,@LIBJPEG_LDFLAGS@,$LIBJPEG_LDFLAGS,;t t
+ s,@LIBJPEG_CPPFLAGS@,$LIBJPEG_CPPFLAGS,;t t
+@@ -9598,21 +10896,27 @@ echo X"$mf" |
+ else
+ continue
+ fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
++ # Extract the definition of DEP_FILES from the Makefile without
++ # running `make'.
++ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+ test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ U=`sed -n -e '/^U = / s///p' < "$mf"`
++ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
++ # We invoke sed twice because it is the simplest approach to
++ # changing $(DEPDIR) to its actual value in the expansion.
++ for file in `sed -n -e '
++ /^DEP_FILES = .*\\\\$/ {
++ s/^DEP_FILES = //
++ :loop
++ s/\\\\$//
++ p
++ n
++ /\\\\$/ b loop
++ p
++ }
++ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+@@ -9658,6 +10962,102 @@ echo "$as_me: error: cannot create direc
+ done
+ done
+ ;;
++ default-1 )
++ for ac_file in $CONFIG_FILES; do
++ # Support "outfile[:infile[:infile...]]"
++ case "$ac_file" in
++ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
++ esac
++ # PO directories have a Makefile.in generated from Makefile.in.in.
++ case "$ac_file" in */Makefile.in)
++ # Adjust a relative srcdir.
++ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
++ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
++ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
++ # In autoconf-2.13 it is called $ac_given_srcdir.
++ # In autoconf-2.50 it is called $srcdir.
++ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
++ case "$ac_given_srcdir" in
++ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
++ /*) top_srcdir="$ac_given_srcdir" ;;
++ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
++ esac
++ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
++ rm -f "$ac_dir/POTFILES"
++ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
++ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
++ # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
++ # on $ac_dir but don't depend on user-specified configuration
++ # parameters.
++ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
++ # The LINGUAS file contains the set of available languages.
++ if test -n "$ALL_LINGUAS"; then
++ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
++ fi
++ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
++ # Hide the ALL_LINGUAS assigment from automake.
++ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
++ fi
++ case "$ac_given_srcdir" in
++ .) srcdirpre= ;;
++ *) srcdirpre='$(srcdir)/' ;;
++ esac
++ POFILES=
++ GMOFILES=
++ UPDATEPOFILES=
++ DUMMYPOFILES=
++ for lang in $ALL_LINGUAS; do
++ POFILES="$POFILES $srcdirpre$lang.po"
++ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
++ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
++ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
++ done
++ # CATALOGS depends on both $ac_dir and the user's LINGUAS
++ # environment variable.
++ INST_LINGUAS=
++ if test -n "$ALL_LINGUAS"; then
++ for presentlang in $ALL_LINGUAS; do
++ useit=no
++ if test "%UNSET%" != "$LINGUAS"; then
++ desiredlanguages="$LINGUAS"
++ else
++ desiredlanguages="$ALL_LINGUAS"
++ fi
++ for desiredlang in $desiredlanguages; do
++ # Use the presentlang catalog if desiredlang is
++ # a. equal to presentlang, or
++ # b. a variant of presentlang (because in this case,
++ # presentlang can be used as a fallback for messages
++ # which are not translated in the desiredlang catalog).
++ case "$desiredlang" in
++ "$presentlang"*) useit=yes;;
++ esac
++ done
++ if test $useit = yes; then
++ INST_LINGUAS="$INST_LINGUAS $presentlang"
++ fi
++ done
++ fi
++ CATALOGS=
++ if test -n "$INST_LINGUAS"; then
++ for lang in $INST_LINGUAS; do
++ CATALOGS="$CATALOGS $lang.gmo"
++ done
++ fi
++ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
++ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
++ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
++ if test -f "$f"; then
++ case "$f" in
++ *.orig | *.bak | *~) ;;
++ *) cat "$f" >> "$ac_dir/Makefile" ;;
++ esac
++ fi
++ done
++ fi
++ ;;
++ esac
++ done ;;
+ esac
+ done
+ _ACEOF
+@@ -9692,3 +11092,19 @@ if test "$no_create" != yes; then
+ fi
+
+
++echo ""
++echo "Finished configure:"
++echo " tabs: $enable_tabs";
++echo " cookies: $enable_cookies";
++echo " anti-alias: $enable_anti_alias";
++echo " ssl: $enable_ssl";
++echo " meta refresh: $enable_meta_refresh";
++echo " efence: $enable_efence";
++echo " gprof: $enable_gprof";
++echo " insure: $enable_insure";
++echo " rftl: $enable_rtfl";
++echo " prefix: $prefix";
++
++echo ""
++echo "Run configure --help for explanation of these options,"
++echo "otherwise type 'make' to build Dillo."
+diff -pruN dillo-0.8.6/configure.in dillo-0.8.6-i18n-misc-20060709/configure.in
+--- dillo-0.8.6/configure.in 2006-04-27 01:05:29.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/configure.in 2006-05-16 01:21:07.000000000 +0900
+@@ -5,7 +5,7 @@ AC_INIT(src/dillo.c)
+ dnl Detect the canonical host and target build environment
+ AC_CANONICAL_SYSTEM
+
+-AM_INIT_AUTOMAKE(dillo, 0.8.6)
++AM_INIT_AUTOMAKE(dillo, 0.8.6-i18n-misc)
+ AM_CONFIG_HEADER(config.h)
+
+ dnl Options
+@@ -21,8 +21,13 @@ AC_ARG_ENABLE(insure, [ --enable-insure
+ , enable_insure=no)
+ AC_ARG_ENABLE(ansi, [ --enable-ansi Try to compile and run with ANSI flags],
+ , enable_ansi=no)
++AC_ARG_ENABLE(tabs, [ --disable-tabs Don't compile support for tabs],
++ , enable_tabs=yes)
++AC_ARG_ENABLE(anti_alias,[ --disable-anti-alias Don't compile support for anti-alias],
++ , enable_anti_alias=yes)
+ AC_ARG_ENABLE(ipv6, [ --enable-ipv6 Build with support for IPv6], , )
+-AC_ARG_ENABLE(rtfl, [ --enable-rtfl Build with rtfl messages], enable_rtfl=yes)
++AC_ARG_ENABLE(rtfl, [ --enable-rtfl Build with rtfl messages],
++ , enable_rtfl=no)
+ AC_ARG_ENABLE(cookies,[ --disable-cookies Don't compile support for cookies],
+ , enable_cookies=yes)
+ AC_ARG_ENABLE(png, [ --disable-png Disable support for PNG images],
+@@ -38,6 +43,8 @@ AC_ARG_ENABLE(dlgui, [ --disable-dlgui
+ AC_ARG_ENABLE(threaded-dns,[ --disable-threaded-dns Disable the advantage of a reentrant resolver library],
+ enable_threaded_dns=$enableval, enable_threaded_dns=yes)
+ AM_CONDITIONAL(DLGUI, test x$enable_dlgui = xyes)
++AC_ARG_ENABLE(meta_refresh, [ --enable-meta-refresh Allow meta refresh],
++ , enable_meta_refresh=no)
+
+ AC_PROG_CC
+ AM_PROG_CC_STDC
+@@ -46,6 +53,20 @@ AC_PROG_CPP
+ AC_PROG_CXX
+
+ dnl --------------------------------------
++dnl Check for Gettext
++dnl --------------------------------------
++dnl
++ALL_LINGUAS="ja zh_CN zh_TW"
++AM_GNU_GETTEXT([external])
++LDFLAGS="$LDFLAGS $INTLLIBS"
++AC_CHECK_LIB(iconv, iconv, haslibiconv=yes, haslibiconv=no)
++if test "x$haslibiconv" = "xyes"; then
++ LDFLAGS="$LDFLAGS $LIBICONV"
++fi
++localedir='${prefix}/share/locale'
++AC_SUBST(localedir)
++
++dnl --------------------------------------
+ dnl Check whether to add /usr/local or not
+ dnl (this is somewhat a religious problem)
+ dnl --------------------------------------
+@@ -128,6 +149,11 @@ dnl
+ if test "x$enable_jpeg" = "xyes"; then
+ AC_CHECK_HEADER(jpeglib.h, jpeg_ok=yes, jpeg_ok=no)
+
++ if test -e /usr/include/jpeglib.h || test -e /usr/local/include/jpeglib.h
++ then
++ jpeg_ok=yes
++ fi
++
+ if test "x$jpeg_ok" = "xyes"; then
+ old_libs="$LIBS"
+ AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, jpeg_ok=yes, jpeg_ok=no)
+@@ -155,7 +181,7 @@ dnl ------------------------------
+ dnl Test for zlib (libpng uses it)
+ dnl ------------------------------
+ dnl
+-if test "x$enable_png" = "xyes"; then
++dnl if test "x$enable_png" = "xyes"; then
+ AC_CHECK_HEADER(zlib.h, libz_ok=yes, libz_ok=no)
+
+ if test "x$libz_ok" = "xyes"; then
+@@ -169,7 +195,7 @@ if test "x$enable_png" = "xyes"; then
+ else
+ AC_MSG_WARN([*** No libz found. Disabling PNG images ***])
+ fi
+-fi
++dnl fi
+
+ dnl ---------------
+ dnl Test for libpng
+@@ -267,6 +293,19 @@ if test "x$ssl_ok" = "xyes"; then
+ AC_DEFINE([ENABLE_SSL], [], [Enable SSL support])
+ fi
+
++dnl ----------------------
++dnl Test for libssl
++dnl ----------------------
++dnl
++if test "x$enable_ssl" = "xyes" ; then
++ AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h)
++ AC_CHECK_LIB(ssl, SSL_connect, , enable_ssl="no")
++ if test "x$enable_ssl" = "xno" ; then
++ AC_MSG_WARN(*** No libssl found. Disabling ssl. ***)
++ else
++ AC_DEFINE(DILLO_SSL, 1, [Enable SSL Processing])
++ fi
++fi
+
+ dnl ----------------------
+ dnl Test for POSIX threads
+@@ -351,6 +390,47 @@ dnl --------------------
+ dnl Command line options
+ dnl --------------------
+ dnl
++if test "x$enable_tabs" = "xno" ; then
++ CFLAGS="$CFLAGS -DDISABLE_TABS"
++fi
++if test "x$enable_anti_alias" = "xno" ; then
++ CFLAGS="$CFLAGS -DDISABLE_ANTI_ALIAS"
++else
++ AC_PATH_PROG(XFT_CONFIG, xft-config, no, $PATH:/usr/local/bin)
++ if test "$XFT_CONFIG" = "no" ; then
++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no, $PATH:/usr/local/bin)
++ if test "$PKG_CONFIG" = "no" ; then
++ if test -d "/usr/include/freetype2" ; then
++ CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
++ elif test -d "/usr/include/freetype1" ; then
++ CPPFLAGS="$CPPFLAGS -I/usr/include/freetype1"
++ fi
++ if test -e "/usr/X11R6/include/X11/Xft/Xft.h" ; then
++ AC_MSG_CHECKING(checking for Xft)
++ if test -e "/usr/X11R6/lib/libXft.so.2" ; then
++ AC_MSG_RESULT(Xft2)
++ LIBS="/usr/X11R6/lib/libXft.so.2 $LIBS"
++ elif test -e "/usr/lib/libXft.so.2" ; then
++ AC_MSG_RESULT(Xft2)
++ LIBS="/usr/lib/libXft.so.2 $LIBS"
++ else
++ AC_MSG_RESULT(Xft)
++ LIBS="-lXft $LIBS"
++ fi
++ else
++ AC_MSG_WARN(*** Xft not found. Disabling anti-alias.***)
++ enable_anti_alias="no"
++ CFLAGS="$CFLAGS -DDISABLE_ANTI_ALIAS"
++ fi
++ else
++ CFLAGS="$CFLAGS `$PKG_CONFIG xft --cflags`"
++ LDFLAGS="$LDFLAGS `$PKG_CONFIG xft --libs`"
++ fi
++ else
++ CFLAGS="$CFLAGS `$XFT_CONFIG --cflags`"
++ LDFLAGS="$LDFLAGS `$XFT_CONFIG --libs`"
++ fi
++fi
+ if test "x$enable_cookies" = "xno" ; then
+ CFLAGS="$CFLAGS -DDISABLE_COOKIES"
+ fi
+@@ -373,7 +453,10 @@ fi
+ if test "x$enable_threaded_dns" = "xyes" ; then
+ CFLAGS="$CFLAGS -DD_DNS_THREADED"
+ fi
+-
++if test "x$enable_meta_refresh" = "xyes" ; then
++ CFLAGS="$CFLAGS -DENABLE_META_REFRESH"
++fi
++
+ dnl -----------------------
+ dnl Checks for header files
+ dnl -----------------------
+@@ -429,5 +512,25 @@ AC_SUBST(LIBFLTK_LIBS)
+ AC_SUBST(datadir)
+ AC_SUBST(src doc bin util lib)
+
+-AC_OUTPUT(Makefile dpip/Makefile dpid/Makefile dpi/Makefile doc/Makefile src/Makefile src/IO/Makefile)
++AC_OUTPUT(Makefile dpip/Makefile dpid/Makefile dpi/Makefile doc/Makefile config/Makefile src/Makefile src/IO/Makefile po/Makefile.in m4/Makefile)
+
++dnl ----------------------
++dnl Show configure summary
++dnl ----------------------
++echo ""
++echo "Finished configure:"
++echo " tabs: $enable_tabs";
++echo " cookies: $enable_cookies";
++echo " anti-alias: $enable_anti_alias";
++echo " ssl: $enable_ssl";
++echo " meta refresh: $enable_meta_refresh";
++dnl echo " ipv6: $enable_ipv6";
++echo " efence: $enable_efence";
++echo " gprof: $enable_gprof";
++echo " insure: $enable_insure";
++echo " rftl: $enable_rtfl";
++echo " prefix: $prefix";
++
++echo ""
++echo "Run configure --help for explanation of these options,"
++echo "otherwise type 'make' to build Dillo."
+diff -pruN dillo-0.8.6/depcomp dillo-0.8.6-i18n-misc-20060709/depcomp
+--- dillo-0.8.6/depcomp 2005-03-22 16:17:05.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/depcomp 2006-05-16 01:21:07.000000000 +0900
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+
+-scriptversion=2005-02-09.22
++scriptversion=2004-04-25.13
+
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -43,18 +43,17 @@ Environment variables:
+ depmode Dependency tracking mode.
+ source Source file read by `PROGRAMS ARGS'.
+ object Object file output by `PROGRAMS ARGS'.
+- DEPDIR directory where to store dependencies.
+ depfile Dependency file to output.
+ tmpdepfile Temporary file to use when outputing dependencies.
+ libtool Whether libtool is used (yes/no).
+
+ Report bugs to <bug-automake@gnu.org>.
+ EOF
+- exit $?
++ exit 0
+ ;;
+ -v | --v*)
+ echo "depcomp $scriptversion"
+- exit $?
++ exit 0
+ ;;
+ esac
+
+@@ -62,10 +61,18 @@ if test -z "$depmode" || test -z "$sourc
+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
+ exit 1
+ fi
++# `libtool' can also be set to `yes' or `no'.
++
++if test -z "$depfile"; then
++ base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
++ dir=`echo "$object" | sed 's,/.*$,/,'`
++ if test "$dir" = "$object"; then
++ dir=
++ fi
++ # FIXME: should be _deps on DOS.
++ depfile="$dir.deps/$base"
++fi
+
+-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+-depfile=${depfile-`echo "$object" |
+- sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+ rm -f "$tmpdepfile"
+@@ -197,25 +204,19 @@ sgi)
+
+ aix)
+ # The C for AIX Compiler uses -M and outputs the dependencies
+- # in a .u file. In older versions, this file always lives in the
+- # current directory. Also, the AIX compiler puts `$object:' at the
+- # start of each line; $object doesn't have directory information.
+- # Version 6 uses the directory in both cases.
+- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
++ # in a .u file. This file always lives in the current directory.
++ # Also, the AIX compiler puts `$object:' at the start of each line;
++ # $object doesn't have directory information.
++ stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+ tmpdepfile="$stripped.u"
++ outname="$stripped.o"
+ if test "$libtool" = yes; then
+ "$@" -Wc,-M
+ else
+ "$@" -M
+ fi
+- stat=$?
+-
+- if test -f "$tmpdepfile"; then :
+- else
+- stripped=`echo "$stripped" | sed 's,^.*/,,'`
+- tmpdepfile="$stripped.u"
+- fi
+
++ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+@@ -223,7 +224,6 @@ aix)
+ fi
+
+ if test -f "$tmpdepfile"; then
+- outname="$stripped.o"
+ # Each line is of the form `foo.o: dependent.h'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+@@ -239,9 +239,11 @@ aix)
+ ;;
+
+ icc)
+- # Intel's C compiler understands `-MD -MF file'. However on
++ # Must come before tru64.
++
++ # Intel's C compiler understands `-MD -MF file'. However
+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+- # ICC 7.0 will fill foo.d with something like
++ # will fill foo.d with something like
+ # foo.o: sub/foo.c
+ # foo.o: sub/foo.h
+ # which is wrong. We want:
+@@ -249,12 +251,6 @@ icc)
+ # sub/foo.o: sub/foo.h
+ # sub/foo.c:
+ # sub/foo.h:
+- # ICC 7.1 will output
+- # foo.o: sub/foo.c sub/foo.h
+- # and will wrap long lines using \ :
+- # foo.o: sub/foo.c ... \
+- # sub/foo.h ... \
+- # ...
+
+ "$@" -MD -MF "$tmpdepfile"
+ stat=$?
+@@ -264,15 +260,11 @@ icc)
+ exit $stat
+ fi
+ rm -f "$depfile"
+- # Each line is of the form `foo.o: dependent.h',
+- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
++ # Each line is of the form `foo.o: dependent.h'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+- # Some versions of the HPUX 10.20 sed can't process this invocation
+- # correctly. Breaking it into two sed invocations is a workaround.
+- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+- sed -e 's/$/ :/' >> "$depfile"
++ sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
++ sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+@@ -287,47 +279,37 @@ tru64)
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+ if test "$libtool" = yes; then
+- # With Tru64 cc, shared objects can also be used to make a
+- # static library. This mecanism is used in libtool 1.4 series to
+- # handle both shared and static libraries in a single compilation.
+- # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+- #
+- # With libtool 1.5 this exception was removed, and libtool now
+- # generates 2 separate objects for the 2 libraries. These two
+- # compilations output dependencies in in $dir.libs/$base.o.d and
+- # in $dir$base.o.d. We have to check for both files, because
+- # one of the two compilations can be disabled. We should prefer
+- # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+- # automatically cleaned when .libs/ is deleted, while ignoring
+- # the former would cause a distcleancheck panic.
+- tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
+- tmpdepfile2=$dir$base.o.d # libtool 1.5
+- tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
+- tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
++ # Dependencies are output in .lo.d with libtool 1.4.
++ # They are output in .o.d with libtool 1.5.
++ tmpdepfile1="$dir.libs/$base.lo.d"
++ tmpdepfile2="$dir.libs/$base.o.d"
++ tmpdepfile3="$dir.libs/$base.d"
+ "$@" -Wc,-MD
+ else
+- tmpdepfile1=$dir$base.o.d
+- tmpdepfile2=$dir$base.d
+- tmpdepfile3=$dir$base.d
+- tmpdepfile4=$dir$base.d
++ tmpdepfile1="$dir$base.o.d"
++ tmpdepfile2="$dir$base.d"
++ tmpdepfile3="$dir$base.d"
+ "$@" -MD
+ fi
+
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
++ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ exit $stat
+ fi
+
+- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+- do
+- test -f "$tmpdepfile" && break
+- done
++ if test -f "$tmpdepfile1"; then
++ tmpdepfile="$tmpdepfile1"
++ elif test -f "$tmpdepfile2"; then
++ tmpdepfile="$tmpdepfile2"
++ else
++ tmpdepfile="$tmpdepfile3"
++ fi
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+- # That's a tab and a space in the [].
+- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++ # That's a space and a tab in the [].
++ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+@@ -340,7 +322,7 @@ tru64)
+
+ dashmstdout)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the preprocessed file to stdout, regardless of -o.
++ # always write the proprocessed file to stdout, regardless of -o.
+ "$@" || exit $?
+
+ # Remove the call to Libtool.
+@@ -436,7 +418,7 @@ makedepend)
+
+ cpp)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the preprocessed file to stdout.
++ # always write the proprocessed file to stdout.
+ "$@" || exit $?
+
+ # Remove the call to Libtool.
+@@ -478,7 +460,7 @@ cpp)
+
+ msvisualcpp)
+ # Important note: in order to support this mode, a compiler *must*
+- # always write the preprocessed file to stdout, regardless of -o,
++ # always write the proprocessed file to stdout, regardless of -o,
+ # because we must use -o when running libtool.
+ "$@" || exit $?
+ IFS=" "
+diff -pruN dillo-0.8.6/dillorc dillo-0.8.6-i18n-misc-20060709/dillorc
+--- dillo-0.8.6/dillorc 2005-01-13 22:30:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dillorc 2006-05-16 01:21:07.000000000 +0900
+@@ -3,7 +3,6 @@
+ # Copy this file to ~/.dillo/dillorc and edit to your taste.
+ # Lines that start with a '#' are comments.
+
+-
+ #-------------------------------------------------------------------------
+ # FIRST SECTION :)
+ #-------------------------------------------------------------------------
+@@ -22,18 +21,29 @@ use_dicache=NO
+
+ # Fontname for variable width rendering (most of the text).
+ # - some fonts may slow down rendering, some others not!
+-# - try to tune a fontname/font_factor combination.
+-# Ex. {helvetica, lucida, times, "new century schoolbook", utopia, ...}
+-vw_fontname=helvetica
++# - try to tune a fontname/font_sizes combination.
++# format is "fndry-fmly" (fndry and fmly is XLFD's item.)
++# Ex. {"*-*", "*-gothic", "misc-fixed" ...}
++vw_fontname="*-gothic"
+
+ # Fontname for fixed width rendering (mainly <pre> quoted text)
+-fw_fontname=courier
++fw_fontname="*-gothic"
++
++# If Anti-Alias is enable, These options will be applied.
++# format is the same as family of Xft.
++# Ex. {"sans-serif", "monospace" ...}
++vw_aafontname="*"
++fw_aafontname="*"
++
++# Fontsizes
++# The 3rd value is used for plain text
++# font_sizes="10 12 14 16 18 20"
+
+ # All fontsizes are scaled by this value (default is 1.0)
+ #font_factor=1.2
+
+ # If you prefer oblique over italic fonts, uncoment next line
+-#use_oblique=YES
++use_oblique=NO
+
+ # Show tooltip popup for images?
+ # Note: We use the "title" attribute and not "alt".
+@@ -68,10 +78,16 @@ home="http://www.dillo.org/"
+
+ # Set search url to use with the search dialog.
+ # %s is replaced with urlencoded keywords, and %% by '%'.
+-search_url="http://www.google.com/search?q=%s"
++search_url="http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s"
++#search_url="http://www.google.co.jp/search?ie=UTF-8&oe=UTF-8&q=%s"
++#search_url="http://www.excite.co.jp/dictionary/english_japanese/?match=beginswith&dictionary=NEW_EJJE&search=%s"
+ #search_url="http://search.lycos.com/default.asp?query=%s"
+ #search_url="http://www.alltheweb.com/search?cat=web&query=%s"
+
++# Search engine's charset
++#search_charset=EUC-JP
++search_charset=UTF-8
++
+ # Set the proxy information for http
+ #http_proxy=http://localhost:8080/
+
+@@ -84,6 +100,12 @@ search_url="http://www.google.com/search
+ #no_proxy = ".mynet.com"
+ #no_proxy = ".mynet.com .other.net .foo.bar.org"
+
++# Set the User-Agent
++# (%v = Version)
++#user_agent = "Dillo/%v"
++
++# Disable sending referer header
++#send_referer=NO
+
+ #-------------------------------------------------------------------------
+ # COLORS SECTION
+@@ -94,7 +116,8 @@ search_url="http://www.google.com/search
+ # Set the background color
+ # bg_color=gray
+ # bg_color=0xd6d6c0
+-bg_color=0xdcd1ba
++#bg_color=0xdcd1ba
++bg_color=white
+
+ # Set the text color
+ text_color=black
+@@ -123,8 +146,8 @@ contrast_visited_color=YES
+ # small : very nice! (it's "medium" without icon titles)
+ # medium : nice!
+ # large : Traditional
+-panel_size=medium
+-small_icons=NO
++panel_size=tiny
++small_icons=YES
+
+ # Here you can choose to hide some widgets of the dillo panel...
+ #show_back=NO
+@@ -137,16 +160,69 @@ small_icons=NO
+ #show_menubar=NO
+ #show_clear_url=NO
+ #show_url=NO
+-#show_search=NO
++#show_search=YES
+ #show_progress_box=NO
+
++# Show or hide navigation controls (back, forward, etc) in popup menu...
++show_popup_navigation=YES
++
+ # Start dillo windows with a hidden panel?
+ fullwindow_start=NO
+
++# Use popup dialogs (YES/NO, default YES). Disable this to use the status
++# bar and location bar instead of popup dialogs for several functions
++popup_dialogs=NO
++
+ # Enabling this will restrain OpenUrl and FindText, but may be required
+ # for the ION window manager.
+ transient_dialogs=NO
+
++# Forcus location bar on new window.
++# focus_location_on_new=YES
++
++# Enabling this will make 'load link in new tab' be executed in the
++# background, leaving the focus on the current tab
++tab_load_in_background=YES
++
++# Enabling this will open a new tab (instead of a new window)
++# on link-middle-click (button 2) and for the "_blank" url target
++tab_instead_of_window=YES
++
++# Show the tab bar (sometimes called the 'gutter') even when there is
++# only a single tab (document) loaded in the browser window?
++# tab_bar_show_single_tab=NO
++
++# Show the tab bar even in full screen mode?
++# tab_bar_show_fullscreen=NO
++
++# Make all tabs the same width?
++# tab_bar_homogeneous=YES
++
++# When there are more tabs than fit on the tab bar, add scrolling arrows
++# to the tab bar.
++# tab_bar_scroller=NO
++
++# Enabling this will close a tab by middle click
++# tab_close_middle_click=YES
++
++# Compress titles in tabs by removing vowels? If this is set to NO,
++# tabs will be shortened instead. This is what it looks like:
++#
++# Normal Compressed Shortened
++# The Quick Brown Fox Th Qck Brwn Fx The Q...Fox
++# tab_title_compress=YES
++
++# This defines which vowels are considered 'expendable' by the tab
++# title compression algorithm. The tab title will be shortened by
++# removing characters matching this pattern, starting from the end
++# of the tab title. Adjust this to taste or language if needed.
++# compress_vowels="aeiouyAEIOUY"
++
++# A semicolon-separated string of common prefixes. The compression
++# algorithm begins by trying to discard anything from the title
++# which matches this pattern.
++# compress_common_prefixes="index of ;re: ;fwd: ;www.;welcome to ;the "
++
+ # When filling forms, our default behaviour is to submit on enterpress,
+ # but only when there's a single text entry (to avoid incomplete submits).
+ # OTOH, if you have to fill the same form lots of times, you may find
+@@ -156,7 +232,7 @@ enterpress_forces_submit=NO
+ # Some forms lack a submit button, and dillo can generate a custom one
+ # internally. Unfortunately there's no guarantee for it to work. :(
+ # (my experience is that forms that lack a submit rely on Javascript)
+-generate_submit=NO
++generate_submit=YES
+
+ #-------------------------------------------------------------------------
+ # DEBUG MESSAGES SECTION
+diff -pruN dillo-0.8.6/doc/Adblock.txt dillo-0.8.6-i18n-misc-20060709/doc/Adblock.txt
+--- dillo-0.8.6/doc/Adblock.txt 1970-01-01 09:00:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/doc/Adblock.txt 2006-05-16 01:21:08.000000000 +0900
+@@ -0,0 +1,9 @@
++==================
++ Adblock in Dillo
++==================
++compatible with Firefox Adblock.
++
++~/.dillo/adblock.txt contains a list of URLs.
++Please add URL which you want to disregard to it.
++it ignores any lines starting with [
++(not that they would have a chance to match anyway).
+diff -pruN dillo-0.8.6/doc/Makefile.am dillo-0.8.6-i18n-misc-20060709/doc/Makefile.am
+--- dillo-0.8.6/doc/Makefile.am 2003-08-09 04:25:19.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/doc/Makefile.am 2006-05-16 01:21:08.000000000 +0900
+@@ -1,4 +1,5 @@
+ EXTRA_DIST = \
++ Adblock.txt \
+ Cache.txt \
+ Cookies.txt \
+ Dillo.txt \
+diff -pruN dillo-0.8.6/doc/Makefile.in dillo-0.8.6-i18n-misc-20060709/doc/Makefile.in
+--- dillo-0.8.6/doc/Makefile.in 2006-04-27 01:07:11.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/doc/Makefile.in 2006-05-16 01:21:08.000000000 +0900
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,6 +13,7 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
++
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -20,6 +21,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -36,18 +38,6 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-subdir = doc
+-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-SOURCES =
+-DIST_SOURCES =
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -77,6 +67,7 @@ EXEEXT = @EXEEXT@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_CONFIG = @GLIB_CONFIG@
+ GLIB_LIBS = @GLIB_LIBS@
++GMSGFMT = @GMSGFMT@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_CONFIG = @GTK_CONFIG@
+ GTK_LIBS = @GTK_LIBS@
+@@ -84,9 +75,12 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INTLLIBS = @INTLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
+ LIBFLTK_LIBS = @LIBFLTK_LIBS@
++LIBICONV = @LIBICONV@
++LIBINTL = @LIBINTL@
+ LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
+ LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
+ LIBJPEG_LIBS = @LIBJPEG_LIBS@
+@@ -98,8 +92,13 @@ LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
+ LIBS = @LIBS@
+ LIBSSL_LIBS = @LIBSSL_LIBS@
+ LIBZ_LIBS = @LIBZ_LIBS@
++LTLIBICONV = @LTLIBICONV@
++LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MSGFMT = @MSGFMT@
++MSGMERGE = @MSGMERGE@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,11 +107,16 @@ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++POSUB = @POSUB@
+ RANLIB = @RANLIB@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
++USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++XFT_CONFIG = @XFT_CONFIG@
++XGETTEXT = @XGETTEXT@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+@@ -124,8 +128,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TR
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -144,9 +146,9 @@ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -159,6 +161,7 @@ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ EXTRA_DIST = \
++ Adblock.txt \
+ Cache.txt \
+ Cookies.txt \
+ Dillo.txt \
+@@ -176,38 +179,21 @@ EXTRA_DIST = \
+ Dpid.txt \
+ README
+
++subdir = doc
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++DIST_SOURCES =
++DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am
+ all: all-am
+
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+ uninstall-info-am:
+ tags: TAGS
+ TAGS:
+@@ -215,6 +201,10 @@ TAGS:
+ ctags: CTAGS
+ CTAGS:
+
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -228,7 +218,7 @@ distdir: $(DISTFILES)
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -246,6 +236,7 @@ distdir: $(DISTFILES)
+ check-am: all-am
+ check: check-am
+ all-am: Makefile
++
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -266,7 +257,7 @@ mostlyclean-generic:
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -283,8 +274,6 @@ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -318,8 +307,8 @@ ps-am:
+ uninstall-am: uninstall-info-am
+
+ .PHONY: all all-am check check-am clean clean-generic distclean \
+- distclean-generic distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-exec \
++ distclean-generic distdir dvi dvi-am info info-am install \
++ install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+diff -pruN dillo-0.8.6/doc/README dillo-0.8.6-i18n-misc-20060709/doc/README
+--- dillo-0.8.6/doc/README 2003-08-09 04:25:19.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/doc/README 2006-05-16 01:21:07.000000000 +0900
+@@ -18,8 +18,6 @@
+ DwPage.txt Dillo Widget page (shortly) Incomplete
+ DwStyle.txt Styles of Dillo Widgets Pending
+ DwTable.txt Tables in dillo Current
+- Selection.txt Selections, and link activation Current (?)
+- Cookies.txt Explains how to enable cookies Current
+ Dpid.txt Dillo plugin daemon Current
+ --------------------------------------------------------------------------
+ [This documents cover dillo's internal working. They're NOT a user manual]
+diff -pruN dillo-0.8.6/dpi/Makefile.am dillo-0.8.6-i18n-misc-20060709/dpi/Makefile.am
+--- dillo-0.8.6/dpi/Makefile.am 2006-01-04 05:16:10.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dpi/Makefile.am 2006-05-16 01:21:15.000000000 +0900
+@@ -1,3 +1,4 @@
++AM_CPPFLAGS=-DLOCALEDIR='"$(localedir)"'
+ AM_CFLAGS = @GLIB_CFLAGS@
+ AM_CXXFLAGS = @GLIB_CFLAGS@
+
+diff -pruN dillo-0.8.6/dpi/Makefile.in dillo-0.8.6-i18n-misc-20060709/dpi/Makefile.in
+--- dillo-0.8.6/dpi/Makefile.in 2006-04-27 01:07:15.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dpi/Makefile.in 2006-05-16 01:21:15.000000000 +0900
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,8 +14,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(bookmarks_dpi_SOURCES) $(cookies_dpi_SOURCES) $(datauri_filter_dpi_SOURCES) $(downloads_dpi_SOURCES) $(file_dpi_SOURCES) $(ftp_filter_dpi_SOURCES) $(hello_filter_dpi_SOURCES) $(https_filter_dpi_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -23,6 +21,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,93 +38,6 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-bookmarks_PROGRAMS = bookmarks.dpi$(EXEEXT)
+-downloads_PROGRAMS = downloads.dpi$(EXEEXT)
+-ftp_PROGRAMS = ftp.filter.dpi$(EXEEXT)
+-https_PROGRAMS = https.filter.dpi$(EXEEXT)
+-hello_PROGRAMS = hello.filter.dpi$(EXEEXT)
+-file_PROGRAMS = file.dpi$(EXEEXT)
+-cookies_PROGRAMS = cookies.dpi$(EXEEXT)
+-datauri_PROGRAMS = datauri.filter.dpi$(EXEEXT)
+-subdir = dpi
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bookmarksdir)" \
+- "$(DESTDIR)$(cookiesdir)" "$(DESTDIR)$(datauridir)" \
+- "$(DESTDIR)$(downloadsdir)" "$(DESTDIR)$(filedir)" \
+- "$(DESTDIR)$(ftpdir)" "$(DESTDIR)$(hellodir)" \
+- "$(DESTDIR)$(httpsdir)"
+-bookmarksPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-cookiesPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-datauriPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-downloadsPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-filePROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-ftpPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-helloPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-httpsPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bookmarks_PROGRAMS) $(cookies_PROGRAMS) \
+- $(datauri_PROGRAMS) $(downloads_PROGRAMS) $(file_PROGRAMS) \
+- $(ftp_PROGRAMS) $(hello_PROGRAMS) $(https_PROGRAMS)
+-am_bookmarks_dpi_OBJECTS = bookmarks.$(OBJEXT) dpiutil.$(OBJEXT)
+-bookmarks_dpi_OBJECTS = $(am_bookmarks_dpi_OBJECTS)
+-bookmarks_dpi_DEPENDENCIES = ../dpip/libDpip.a
+-am_cookies_dpi_OBJECTS = cookies.$(OBJEXT) dpiutil.$(OBJEXT)
+-cookies_dpi_OBJECTS = $(am_cookies_dpi_OBJECTS)
+-cookies_dpi_DEPENDENCIES = ../dpip/libDpip.a
+-am_datauri_filter_dpi_OBJECTS = datauri.$(OBJEXT) dpiutil.$(OBJEXT)
+-datauri_filter_dpi_OBJECTS = $(am_datauri_filter_dpi_OBJECTS)
+-datauri_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
+-am__downloads_dpi_SOURCES_DIST = downloads-old.c dpiutil.c dpiutil.h \
+- downloads.cc
+-@DLGUI_FALSE@am_downloads_dpi_OBJECTS = downloads-old.$(OBJEXT) \
+-@DLGUI_FALSE@ dpiutil.$(OBJEXT)
+-@DLGUI_TRUE@am_downloads_dpi_OBJECTS = downloads.$(OBJEXT) \
+-@DLGUI_TRUE@ dpiutil.$(OBJEXT)
+-downloads_dpi_OBJECTS = $(am_downloads_dpi_OBJECTS)
+-@DLGUI_FALSE@downloads_dpi_DEPENDENCIES = ../dpip/libDpip.a
+-@DLGUI_TRUE@downloads_dpi_DEPENDENCIES = ../dpip/libDpip.a
+-am_file_dpi_OBJECTS = file.$(OBJEXT) dpiutil.$(OBJEXT)
+-file_dpi_OBJECTS = $(am_file_dpi_OBJECTS)
+-file_dpi_DEPENDENCIES = ../dpip/libDpip.a
+-am_ftp_filter_dpi_OBJECTS = ftp.$(OBJEXT) dpiutil.$(OBJEXT)
+-ftp_filter_dpi_OBJECTS = $(am_ftp_filter_dpi_OBJECTS)
+-ftp_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
+-am_hello_filter_dpi_OBJECTS = hello.$(OBJEXT) dpiutil.$(OBJEXT)
+-hello_filter_dpi_OBJECTS = $(am_hello_filter_dpi_OBJECTS)
+-hello_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
+-am_https_filter_dpi_OBJECTS = https.$(OBJEXT) dpiutil.$(OBJEXT)
+-https_filter_dpi_OBJECTS = $(am_https_filter_dpi_OBJECTS)
+-https_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-CXXLD = $(CXX)
+-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+- -o $@
+-SOURCES = $(bookmarks_dpi_SOURCES) $(cookies_dpi_SOURCES) \
+- $(datauri_filter_dpi_SOURCES) $(downloads_dpi_SOURCES) \
+- $(file_dpi_SOURCES) $(ftp_filter_dpi_SOURCES) \
+- $(hello_filter_dpi_SOURCES) $(https_filter_dpi_SOURCES)
+-DIST_SOURCES = $(bookmarks_dpi_SOURCES) $(cookies_dpi_SOURCES) \
+- $(datauri_filter_dpi_SOURCES) \
+- $(am__downloads_dpi_SOURCES_DIST) $(file_dpi_SOURCES) \
+- $(ftp_filter_dpi_SOURCES) $(hello_filter_dpi_SOURCES) \
+- $(https_filter_dpi_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -155,6 +67,7 @@ EXEEXT = @EXEEXT@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_CONFIG = @GLIB_CONFIG@
+ GLIB_LIBS = @GLIB_LIBS@
++GMSGFMT = @GMSGFMT@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_CONFIG = @GTK_CONFIG@
+ GTK_LIBS = @GTK_LIBS@
+@@ -162,9 +75,12 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INTLLIBS = @INTLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
+ LIBFLTK_LIBS = @LIBFLTK_LIBS@
++LIBICONV = @LIBICONV@
++LIBINTL = @LIBINTL@
+ LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
+ LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
+ LIBJPEG_LIBS = @LIBJPEG_LIBS@
+@@ -176,8 +92,13 @@ LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
+ LIBS = @LIBS@
+ LIBSSL_LIBS = @LIBSSL_LIBS@
+ LIBZ_LIBS = @LIBZ_LIBS@
++LTLIBICONV = @LTLIBICONV@
++LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MSGFMT = @MSGFMT@
++MSGMERGE = @MSGMERGE@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -186,11 +107,16 @@ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++POSUB = @POSUB@
+ RANLIB = @RANLIB@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
++USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++XFT_CONFIG = @XFT_CONFIG@
++XGETTEXT = @XGETTEXT@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+@@ -202,8 +128,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TR
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -222,9 +146,9 @@ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -236,8 +160,10 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++AM_CPPFLAGS = -DLOCALEDIR='"$(localedir)"'
+ AM_CFLAGS = @GLIB_CFLAGS@
+ AM_CXXFLAGS = @GLIB_CFLAGS@
++
+ bookmarksdir = $(libdir)/dillo/dpi/bookmarks
+ downloadsdir = $(libdir)/dillo/dpi/downloads
+ ftpdir = $(libdir)/dillo/dpi/ftp
+@@ -246,68 +172,135 @@ hellodir = $(libdir)/dillo/dpi/hello
+ filedir = $(libdir)/dillo/dpi/file
+ cookiesdir = $(libdir)/dillo/dpi/cookies
+ datauridir = $(libdir)/dillo/dpi/datauri
++bookmarks_PROGRAMS = bookmarks.dpi
++downloads_PROGRAMS = downloads.dpi
++ftp_PROGRAMS = ftp.filter.dpi
++https_PROGRAMS = https.filter.dpi
++hello_PROGRAMS = hello.filter.dpi
++file_PROGRAMS = file.dpi
++cookies_PROGRAMS = cookies.dpi
++datauri_PROGRAMS = datauri.filter.dpi
++
+ bookmarks_dpi_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
+-@DLGUI_FALSE@downloads_dpi_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
+ @DLGUI_TRUE@downloads_dpi_LDADD = @GLIB_LIBS@ @LIBFLTK_LIBS@ ../dpip/libDpip.a
++@DLGUI_FALSE@downloads_dpi_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
+ ftp_filter_dpi_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
+ https_filter_dpi_LDADD = @GLIB_LIBS@ @LIBSSL_LIBS@ ../dpip/libDpip.a
+ hello_filter_dpi_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
+ file_dpi_LDADD = @GLIB_LIBS@ @LIBPTHREAD_LIBS@ ../dpip/libDpip.a
+ cookies_dpi_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
+ datauri_filter_dpi_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
++
+ file_dpi_LDFLAGS = @LIBPTHREAD_LDFLAGS@
++
+ bookmarks_dpi_SOURCES = bookmarks.c dpiutil.c dpiutil.h
+-@DLGUI_FALSE@downloads_dpi_SOURCES = downloads-old.c dpiutil.c dpiutil.h
+ @DLGUI_TRUE@downloads_dpi_SOURCES = downloads.cc dpiutil.c dpiutil.h
++@DLGUI_FALSE@downloads_dpi_SOURCES = downloads-old.c dpiutil.c dpiutil.h
+ ftp_filter_dpi_SOURCES = ftp.c dpiutil.c dpiutil.h
+ https_filter_dpi_SOURCES = https.c dpiutil.c dpiutil.h
+ hello_filter_dpi_SOURCES = hello.c dpiutil.c dpiutil.h
+ file_dpi_SOURCES = file.c dpiutil.c dpiutil.h
+ cookies_dpi_SOURCES = cookies.c dpiutil.c dpiutil.h
+ datauri_filter_dpi_SOURCES = datauri.c dpiutil.c dpiutil.h
++subdir = dpi
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++bookmarks_PROGRAMS = bookmarks.dpi$(EXEEXT)
++cookies_PROGRAMS = cookies.dpi$(EXEEXT)
++datauri_PROGRAMS = datauri.filter.dpi$(EXEEXT)
++downloads_PROGRAMS = downloads.dpi$(EXEEXT)
++file_PROGRAMS = file.dpi$(EXEEXT)
++ftp_PROGRAMS = ftp.filter.dpi$(EXEEXT)
++hello_PROGRAMS = hello.filter.dpi$(EXEEXT)
++https_PROGRAMS = https.filter.dpi$(EXEEXT)
++PROGRAMS = $(bookmarks_PROGRAMS) $(cookies_PROGRAMS) $(datauri_PROGRAMS) \
++ $(downloads_PROGRAMS) $(file_PROGRAMS) $(ftp_PROGRAMS) \
++ $(hello_PROGRAMS) $(https_PROGRAMS)
++
++am_bookmarks_dpi_OBJECTS = bookmarks.$(OBJEXT) dpiutil.$(OBJEXT)
++bookmarks_dpi_OBJECTS = $(am_bookmarks_dpi_OBJECTS)
++bookmarks_dpi_DEPENDENCIES = ../dpip/libDpip.a
++bookmarks_dpi_LDFLAGS =
++am_cookies_dpi_OBJECTS = cookies.$(OBJEXT) dpiutil.$(OBJEXT)
++cookies_dpi_OBJECTS = $(am_cookies_dpi_OBJECTS)
++cookies_dpi_DEPENDENCIES = ../dpip/libDpip.a
++cookies_dpi_LDFLAGS =
++am_datauri_filter_dpi_OBJECTS = datauri.$(OBJEXT) dpiutil.$(OBJEXT)
++datauri_filter_dpi_OBJECTS = $(am_datauri_filter_dpi_OBJECTS)
++datauri_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
++datauri_filter_dpi_LDFLAGS =
++am__downloads_dpi_SOURCES_DIST = downloads.cc dpiutil.c dpiutil.h \
++ downloads-old.c
++@DLGUI_TRUE@am_downloads_dpi_OBJECTS = downloads.$(OBJEXT) \
++@DLGUI_TRUE@ dpiutil.$(OBJEXT)
++@DLGUI_FALSE@am_downloads_dpi_OBJECTS = downloads-old.$(OBJEXT) \
++@DLGUI_FALSE@ dpiutil.$(OBJEXT)
++downloads_dpi_OBJECTS = $(am_downloads_dpi_OBJECTS)
++@DLGUI_TRUE@downloads_dpi_DEPENDENCIES = ../dpip/libDpip.a
++@DLGUI_FALSE@downloads_dpi_DEPENDENCIES = ../dpip/libDpip.a
++downloads_dpi_LDFLAGS =
++am_file_dpi_OBJECTS = file.$(OBJEXT) dpiutil.$(OBJEXT)
++file_dpi_OBJECTS = $(am_file_dpi_OBJECTS)
++file_dpi_DEPENDENCIES = ../dpip/libDpip.a
++am_ftp_filter_dpi_OBJECTS = ftp.$(OBJEXT) dpiutil.$(OBJEXT)
++ftp_filter_dpi_OBJECTS = $(am_ftp_filter_dpi_OBJECTS)
++ftp_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
++ftp_filter_dpi_LDFLAGS =
++am_hello_filter_dpi_OBJECTS = hello.$(OBJEXT) dpiutil.$(OBJEXT)
++hello_filter_dpi_OBJECTS = $(am_hello_filter_dpi_OBJECTS)
++hello_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
++hello_filter_dpi_LDFLAGS =
++am_https_filter_dpi_OBJECTS = https.$(OBJEXT) dpiutil.$(OBJEXT)
++https_filter_dpi_OBJECTS = $(am_https_filter_dpi_OBJECTS)
++https_filter_dpi_DEPENDENCIES = ../dpip/libDpip.a
++https_filter_dpi_LDFLAGS =
++
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bookmarks.Po ./$(DEPDIR)/cookies.Po \
++@AMDEP_TRUE@ ./$(DEPDIR)/datauri.Po ./$(DEPDIR)/downloads-old.Po \
++@AMDEP_TRUE@ ./$(DEPDIR)/downloads.Po ./$(DEPDIR)/dpiutil.Po \
++@AMDEP_TRUE@ ./$(DEPDIR)/file.Po ./$(DEPDIR)/ftp.Po \
++@AMDEP_TRUE@ ./$(DEPDIR)/hello.Po ./$(DEPDIR)/https.Po
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++CXXLD = $(CXX)
++CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
++ -o $@
++DIST_SOURCES = $(bookmarks_dpi_SOURCES) $(cookies_dpi_SOURCES) \
++ $(datauri_filter_dpi_SOURCES) $(am__downloads_dpi_SOURCES_DIST) \
++ $(file_dpi_SOURCES) $(ftp_filter_dpi_SOURCES) \
++ $(hello_filter_dpi_SOURCES) $(https_filter_dpi_SOURCES)
++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
++SOURCES = $(bookmarks_dpi_SOURCES) $(cookies_dpi_SOURCES) $(datauri_filter_dpi_SOURCES) $(downloads_dpi_SOURCES) $(file_dpi_SOURCES) $(ftp_filter_dpi_SOURCES) $(hello_filter_dpi_SOURCES) $(https_filter_dpi_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .cc .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dpi/Makefile'; \
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu dpi/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++bookmarksPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-bookmarksPROGRAMS: $(bookmarks_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bookmarksdir)" || $(mkdir_p) "$(DESTDIR)$(bookmarksdir)"
++ $(mkinstalldirs) $(DESTDIR)$(bookmarksdir)
+ @list='$(bookmarks_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(bookmarksPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bookmarksdir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(bookmarksPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bookmarksdir)/$$f" || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(bookmarksPROGRAMS_INSTALL) $$p $(DESTDIR)$(bookmarksdir)/$$f"; \
++ $(INSTALL_PROGRAM_ENV) $(bookmarksPROGRAMS_INSTALL) $$p $(DESTDIR)$(bookmarksdir)/$$f || exit 1; \
+ else :; fi; \
+ done
+
+@@ -315,22 +308,23 @@ uninstall-bookmarksPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bookmarks_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " rm -f '$(DESTDIR)$(bookmarksdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(bookmarksdir)/$$f"; \
++ echo " rm -f $(DESTDIR)$(bookmarksdir)/$$f"; \
++ rm -f $(DESTDIR)$(bookmarksdir)/$$f; \
+ done
+
+ clean-bookmarksPROGRAMS:
+ -test -z "$(bookmarks_PROGRAMS)" || rm -f $(bookmarks_PROGRAMS)
++cookiesPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-cookiesPROGRAMS: $(cookies_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(cookiesdir)" || $(mkdir_p) "$(DESTDIR)$(cookiesdir)"
++ $(mkinstalldirs) $(DESTDIR)$(cookiesdir)
+ @list='$(cookies_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(cookiesPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(cookiesdir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(cookiesPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(cookiesdir)/$$f" || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(cookiesPROGRAMS_INSTALL) $$p $(DESTDIR)$(cookiesdir)/$$f"; \
++ $(INSTALL_PROGRAM_ENV) $(cookiesPROGRAMS_INSTALL) $$p $(DESTDIR)$(cookiesdir)/$$f || exit 1; \
+ else :; fi; \
+ done
+
+@@ -338,22 +332,23 @@ uninstall-cookiesPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(cookies_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " rm -f '$(DESTDIR)$(cookiesdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(cookiesdir)/$$f"; \
++ echo " rm -f $(DESTDIR)$(cookiesdir)/$$f"; \
++ rm -f $(DESTDIR)$(cookiesdir)/$$f; \
+ done
+
+ clean-cookiesPROGRAMS:
+ -test -z "$(cookies_PROGRAMS)" || rm -f $(cookies_PROGRAMS)
++datauriPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-datauriPROGRAMS: $(datauri_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(datauridir)" || $(mkdir_p) "$(DESTDIR)$(datauridir)"
++ $(mkinstalldirs) $(DESTDIR)$(datauridir)
+ @list='$(datauri_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(datauriPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(datauridir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(datauriPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(datauridir)/$$f" || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(datauriPROGRAMS_INSTALL) $$p $(DESTDIR)$(datauridir)/$$f"; \
++ $(INSTALL_PROGRAM_ENV) $(datauriPROGRAMS_INSTALL) $$p $(DESTDIR)$(datauridir)/$$f || exit 1; \
+ else :; fi; \
+ done
+
+@@ -361,22 +356,23 @@ uninstall-datauriPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(datauri_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " rm -f '$(DESTDIR)$(datauridir)/$$f'"; \
+- rm -f "$(DESTDIR)$(datauridir)/$$f"; \
++ echo " rm -f $(DESTDIR)$(datauridir)/$$f"; \
++ rm -f $(DESTDIR)$(datauridir)/$$f; \
+ done
+
+ clean-datauriPROGRAMS:
+ -test -z "$(datauri_PROGRAMS)" || rm -f $(datauri_PROGRAMS)
++downloadsPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-downloadsPROGRAMS: $(downloads_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(downloadsdir)" || $(mkdir_p) "$(DESTDIR)$(downloadsdir)"
++ $(mkinstalldirs) $(DESTDIR)$(downloadsdir)
+ @list='$(downloads_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(downloadsPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(downloadsdir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(downloadsPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(downloadsdir)/$$f" || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(downloadsPROGRAMS_INSTALL) $$p $(DESTDIR)$(downloadsdir)/$$f"; \
++ $(INSTALL_PROGRAM_ENV) $(downloadsPROGRAMS_INSTALL) $$p $(DESTDIR)$(downloadsdir)/$$f || exit 1; \
+ else :; fi; \
+ done
+
+@@ -384,22 +380,23 @@ uninstall-downloadsPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(downloads_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " rm -f '$(DESTDIR)$(downloadsdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(downloadsdir)/$$f"; \
++ echo " rm -f $(DESTDIR)$(downloadsdir)/$$f"; \
++ rm -f $(DESTDIR)$(downloadsdir)/$$f; \
+ done
+
+ clean-downloadsPROGRAMS:
+ -test -z "$(downloads_PROGRAMS)" || rm -f $(downloads_PROGRAMS)
++filePROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-filePROGRAMS: $(file_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(filedir)" || $(mkdir_p) "$(DESTDIR)$(filedir)"
++ $(mkinstalldirs) $(DESTDIR)$(filedir)
+ @list='$(file_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(filePROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(filedir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(filePROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(filedir)/$$f" || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(filePROGRAMS_INSTALL) $$p $(DESTDIR)$(filedir)/$$f"; \
++ $(INSTALL_PROGRAM_ENV) $(filePROGRAMS_INSTALL) $$p $(DESTDIR)$(filedir)/$$f || exit 1; \
+ else :; fi; \
+ done
+
+@@ -407,22 +404,23 @@ uninstall-filePROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(file_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " rm -f '$(DESTDIR)$(filedir)/$$f'"; \
+- rm -f "$(DESTDIR)$(filedir)/$$f"; \
++ echo " rm -f $(DESTDIR)$(filedir)/$$f"; \
++ rm -f $(DESTDIR)$(filedir)/$$f; \
+ done
+
+ clean-filePROGRAMS:
+ -test -z "$(file_PROGRAMS)" || rm -f $(file_PROGRAMS)
++ftpPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-ftpPROGRAMS: $(ftp_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(ftpdir)" || $(mkdir_p) "$(DESTDIR)$(ftpdir)"
++ $(mkinstalldirs) $(DESTDIR)$(ftpdir)
+ @list='$(ftp_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(ftpPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(ftpdir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(ftpPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(ftpdir)/$$f" || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(ftpPROGRAMS_INSTALL) $$p $(DESTDIR)$(ftpdir)/$$f"; \
++ $(INSTALL_PROGRAM_ENV) $(ftpPROGRAMS_INSTALL) $$p $(DESTDIR)$(ftpdir)/$$f || exit 1; \
+ else :; fi; \
+ done
+
+@@ -430,22 +428,23 @@ uninstall-ftpPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(ftp_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " rm -f '$(DESTDIR)$(ftpdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(ftpdir)/$$f"; \
++ echo " rm -f $(DESTDIR)$(ftpdir)/$$f"; \
++ rm -f $(DESTDIR)$(ftpdir)/$$f; \
+ done
+
+ clean-ftpPROGRAMS:
+ -test -z "$(ftp_PROGRAMS)" || rm -f $(ftp_PROGRAMS)
++helloPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-helloPROGRAMS: $(hello_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(hellodir)" || $(mkdir_p) "$(DESTDIR)$(hellodir)"
++ $(mkinstalldirs) $(DESTDIR)$(hellodir)
+ @list='$(hello_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(helloPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(hellodir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(helloPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(hellodir)/$$f" || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(helloPROGRAMS_INSTALL) $$p $(DESTDIR)$(hellodir)/$$f"; \
++ $(INSTALL_PROGRAM_ENV) $(helloPROGRAMS_INSTALL) $$p $(DESTDIR)$(hellodir)/$$f || exit 1; \
+ else :; fi; \
+ done
+
+@@ -453,22 +452,23 @@ uninstall-helloPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(hello_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " rm -f '$(DESTDIR)$(hellodir)/$$f'"; \
+- rm -f "$(DESTDIR)$(hellodir)/$$f"; \
++ echo " rm -f $(DESTDIR)$(hellodir)/$$f"; \
++ rm -f $(DESTDIR)$(hellodir)/$$f; \
+ done
+
+ clean-helloPROGRAMS:
+ -test -z "$(hello_PROGRAMS)" || rm -f $(hello_PROGRAMS)
++httpsPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-httpsPROGRAMS: $(https_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(httpsdir)" || $(mkdir_p) "$(DESTDIR)$(httpsdir)"
++ $(mkinstalldirs) $(DESTDIR)$(httpsdir)
+ @list='$(https_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(httpsPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(httpsdir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(httpsPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(httpsdir)/$$f" || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(httpsPROGRAMS_INSTALL) $$p $(DESTDIR)$(httpsdir)/$$f"; \
++ $(INSTALL_PROGRAM_ENV) $(httpsPROGRAMS_INSTALL) $$p $(DESTDIR)$(httpsdir)/$$f || exit 1; \
+ else :; fi; \
+ done
+
+@@ -476,8 +476,8 @@ uninstall-httpsPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(https_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " rm -f '$(DESTDIR)$(httpsdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(httpsdir)/$$f"; \
++ echo " rm -f $(DESTDIR)$(httpsdir)/$$f"; \
++ rm -f $(DESTDIR)$(httpsdir)/$$f; \
+ done
+
+ clean-httpsPROGRAMS:
+@@ -508,7 +508,7 @@ https.filter.dpi$(EXEEXT): $(https_filte
+ $(LINK) $(https_filter_dpi_LDFLAGS) $(https_filter_dpi_OBJECTS) $(https_filter_dpi_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -525,34 +525,58 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/https.Po@am__quote@
+
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++@am__fastdepCC_TRUE@ fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++@am__fastdepCC_TRUE@ fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+
+ .cc.o:
+-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
++@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++@am__fastdepCXX_TRUE@ fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .cc.obj:
+-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
++@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
++@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++@am__fastdepCXX_TRUE@ fi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -561,7 +585,6 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -573,11 +596,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -600,6 +622,10 @@ GTAGS:
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -613,7 +639,7 @@ distdir: $(DISTFILES)
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -631,10 +657,9 @@ distdir: $(DISTFILES)
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(PROGRAMS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(bookmarksdir)" "$(DESTDIR)$(cookiesdir)" "$(DESTDIR)$(datauridir)" "$(DESTDIR)$(downloadsdir)" "$(DESTDIR)$(filedir)" "$(DESTDIR)$(ftpdir)" "$(DESTDIR)$(hellodir)" "$(DESTDIR)$(httpsdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(bookmarksdir) $(DESTDIR)$(cookiesdir) $(DESTDIR)$(datauridir) $(DESTDIR)$(downloadsdir) $(DESTDIR)$(filedir) $(DESTDIR)$(ftpdir) $(DESTDIR)$(hellodir) $(DESTDIR)$(httpsdir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -654,7 +679,7 @@ mostlyclean-generic:
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -676,8 +701,6 @@ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -724,7 +747,7 @@ uninstall-am: uninstall-bookmarksPROGRAM
+ clean-filePROGRAMS clean-ftpPROGRAMS clean-generic \
+ clean-helloPROGRAMS clean-httpsPROGRAMS ctags distclean \
+ distclean-compile distclean-generic distclean-tags distdir dvi \
+- dvi-am html html-am info info-am install install-am \
++ dvi-am info info-am install install-am \
+ install-bookmarksPROGRAMS install-cookiesPROGRAMS install-data \
+ install-data-am install-datauriPROGRAMS \
+ install-downloadsPROGRAMS install-exec install-exec-am \
+diff -pruN dillo-0.8.6/dpi/bookmarks.c dillo-0.8.6-i18n-misc-20060709/dpi/bookmarks.c
+--- dillo-0.8.6/dpi/bookmarks.c 2006-01-21 10:27:22.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dpi/bookmarks.c 2006-07-08 21:17:17.000000000 +0900
+@@ -19,6 +19,7 @@
+ * final '>' of a tag.
+ */
+
++#include <config.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
+@@ -38,6 +39,7 @@
+ #include "dpiutil.h"
+
+ #include <glib.h>
++#include "src/intl.h"
+
+ /* This one is tricky, some sources state it should include the byte
+ * for the terminating NULL, and others say it shouldn't. */
+@@ -71,7 +73,7 @@ typedef struct {
+ /*
+ * Local data
+ */
+-static char *Header = "Content-type: text/html\n\n";
++static char *Header = "Content-type: text/html charset=UTF-8\n\n";
+ static char *BmFile = NULL;
+ static time_t BmFileTimeStamp = 0;
+ static GSList *B_bms = NULL;
+@@ -91,7 +93,7 @@ static int MODIFY_PAGE_NUM = 1;
+ /* -- HTML templates ------------------------------------------------------- */
+
+ char *mainpage_header =
+-DOCTYPE
++N_("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
+ "<html>\n"
+ "<head>\n"
+ "<title>Bookmarks</title>\n"
+@@ -107,10 +109,10 @@ DOCTYPE
+ " </td></tr>\n"
+ " </table></td></tr>\n"
+ "</table>\n"
+-"<br>\n";
++"<br>\n");
+
+ char *modifypage_header =
+-DOCTYPE
++N_("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
+ "<html>\n"
+ "<head>\n"
+ "<title>Bookmarks</title>\n"
+@@ -143,25 +145,25 @@ DOCTYPE
+ " <td width='100%'></td>\n"
+ " </tr>\n"
+ " </table></td></tr>\n"
+-"</table>\n";
++"</table>\n");
+
+ char *mainpage_sections_header =
+-"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
++N_("<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
+ " <tr valign='top'>\n"
+ " <td>\n"
+ " <table bgcolor='#b4b4b4' border='2' cellpadding='4' cellspacing='1'>\n"
+ " <tr><td>\n"
+ " <table width='100%' bgcolor='#b4b4b4'>\n"
+-" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n";
++" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n");
+
+ char *modifypage_sections_header =
+-"<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
++N_("<table border='1' cellpadding='0' cellspacing='20' width='100%'>\n"
+ " <tr valign='top'>\n"
+ " <td>\n"
+ " <table bgcolor='#b4b4b4' border='1'>\n"
+ " <tr><td>\n"
+ " <table width='100%' bgcolor='#b4b4b4'>\n"
+-" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n";
++" <tr><td><small>Sections:</small></td></tr></table></td></tr>\n");
+
+ char *mainpage_sections_item =
+ " <tr><td align='center'>\n"
+@@ -192,7 +194,7 @@ char *mainpage_section_card_header =
+ " <a name='s%d'></a>\n"
+ " <table bgcolor='#bfbfbf' width='100%%' cellspacing='2'>\n"
+ " <tr>\n"
+-" <td bgcolor='#bf0c0c'><font color='white'><b>\n"
++" <td bgcolor='#bf0c0c' width='100%%'><font color='white'><b>\n"
+ " &nbsp;&nbsp;&nbsp;%s&nbsp;&nbsp;&nbsp;</b></font></td>\n"
+ " <td bgcolor='white' width='100%%'>&nbsp;</td></tr>\n";
+
+@@ -200,7 +202,7 @@ char *modifypage_section_card_header =
+ " <a name='s%d'></a>\n"
+ " <table bgcolor='#bfbfbf' width='100%%' cellspacing='2'>\n"
+ " <tr>\n"
+-" <td bgcolor='#bf0c0c'><font color='white'><b>\n"
++" <td bgcolor='#bf0c0c' width='100%%'><font color='white'><b>\n"
+ " &nbsp;&nbsp;&nbsp;%s&nbsp;&nbsp;&nbsp;</b></font></td>\n"
+ " <td bgcolor='white' width='100%%'>&nbsp;</td></tr>\n";
+
+@@ -238,7 +240,7 @@ char *modifypage_footer =
+
+ /* ------------------------------------------------------------------------- */
+ char *modifypage_add_section_page =
+-DOCTYPE
++N_("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
+ "<html>\n"
+ "<head>\n"
+ "<title>Bookmarks</title>\n"
+@@ -274,11 +276,11 @@ DOCTYPE
+ "</form>\n"
+ "</body>\n"
+ "</html>\n"
+-"\n";
++"\n");
+
+ /* ------------------------------------------------------------------------- */
+ char *modifypage_update_header =
+-DOCTYPE
++N_("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
+ "<html>\n"
+ "<head>\n"
+ "<title>Bookmarks</title>\n"
+@@ -292,7 +294,7 @@ DOCTYPE
+ "</table>\n"
+ "<br>\n"
+ "<form>\n"
+-"<input type='hidden' name='operation' value='modify2'>\n";
++"<input type='hidden' name='operation' value='modify2'>\n");
+
+ char *modifypage_update_title =
+ "<table border='1' width='100%%'>\n"
+@@ -305,7 +307,7 @@ char *modifypage_update_item_header =
+ "<table width='100%' cellpadding='10'>\n";
+
+ char *modifypage_update_item =
+-"<tr><td>\n"
++N_("<tr><td>\n"
+ " <table width='100%%' bgcolor='teal'>\n"
+ " <tr>\n"
+ " <td>Title:</td>\n"
+@@ -315,33 +317,33 @@ char *modifypage_update_item =
+ " <td>URL:</td>\n"
+ " <td>%s</td></tr>\n"
+ " </table>\n"
+-" </td></tr>\n";
++" </td></tr>\n");
+
+ char *modifypage_update_item2 =
+-"<tr><td>\n"
++N_("<tr><td>\n"
+ " <table width='100%%' bgcolor='teal'>\n"
+ " <tr>\n"
+ " <td>Title:</td>\n"
+ " <td><input type='text' name='s%d' size='64'\n"
+ " value='%s'></td></tr>\n"
+ " </table>\n"
+-" </td></tr>\n";
++" </td></tr>\n");
+
+ char *modifypage_update_item_footer =
+ "</table>\n";
+
+ char *modifypage_update_footer =
+-"<table width='100%' cellpadding='4' border='0'>\n"
++N_("<table width='100%' cellpadding='4' border='0'>\n"
+ "<tr><td bgcolor='#a0a0a0'>\n"
+ " <input type='submit' name='submit' value='submit.'></td></tr>\n"
+ "</table>\n"
+ "</form>\n"
+ "</body>\n"
+-"</html>\n";
++"</html>\n");
+
+ /* ------------------------------------------------------------------------- */
+ char *modifypage_add_url =
+-DOCTYPE
++N_("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
+ "<html>\n"
+ "<head>\n"
+ "<title>Bookmarks</title>\n"
+@@ -379,7 +381,7 @@ DOCTYPE
+ "</table>\n"
+ "</form>\n"
+ "</body>\n"
+-"</html>\n";
++"</html>\n");
+
+
+ /* ------------------------------------------------------------------------- */
+@@ -686,7 +688,7 @@ static void Bms_normalize(void)
+
+ /* we need at least one section */
+ if (!B_secs)
+- Bms_sec_add("Unclassified");
++ Bms_sec_add(_("Unclassified"));
+
+ /* make correlative section numbers */
+ n = 0;
+@@ -719,7 +721,7 @@ static void Bms_check_import(void)
+ {
+ gchar *OldBmFile;
+ char *cmd1 =
+- "echo \":s0: Unclassified\" > %s";
++ _("echo \":s0: Unclassified\" > %s");
+ char *cmd2 =
+ "grep -i \"href\" %s | "
+ "sed -e 's/<li><A HREF=\"/s0 /' -e 's/\">/ /' -e 's/<.*$//' >> %s";
+@@ -781,7 +783,7 @@ static int Bms_load(void)
+ Bms_sec_add(title);
+
+ } else {
+- g_print("Syntax error in bookmarks file:\n %s", buf);
++ g_print(_("Syntax error in bookmarks file:\n %s"), buf);
+ }
+ g_free(buf);
+ }
+@@ -893,7 +895,7 @@ static int Bms_save(void)
+ static int Bmsrv_add_bm(SockHandler *sh, char *url, char *title)
+ {
+ char *u_title;
+- char *msg="Added bookmark!";
++ char *msg=_("Added bookmark!");
+ int section = 0;
+
+ /* Add in memory */
+@@ -942,7 +944,7 @@ static int Bmsrv_send_reload_request(Soc
+ {
+ gint st;
+ char *d_cmd;
+-
++
+ d_cmd = a_Dpip_build_cmd("cmd=%s url=%s", "reload_request", url);
+ st = sock_handler_write_str(sh, d_cmd, 1) ? 1 : 0;
+ g_free(d_cmd);
+@@ -965,11 +967,11 @@ static int Bmsrv_send_modify_page(SockHa
+ gstr = g_string_new("");
+
+ /* send modify page header */
+- if (sock_handler_write_str(sh, modifypage_header, 0))
++ if (sock_handler_write_str(sh, _(modifypage_header), 0))
+ return 1;
+
+ /* write sections header */
+- if (sock_handler_write_str(sh, modifypage_sections_header, 0))
++ if (sock_handler_write_str(sh, _(modifypage_sections_header), 0))
+ return 1;
+ /* write sections */
+ for (list1 = B_secs; list1; list1 = list1->next) {
+@@ -993,7 +995,7 @@ static int Bmsrv_send_modify_page(SockHa
+
+ /* send card header */
+ l_title = make_one_line_str(sec_node->title);
+- g_string_sprintf(gstr, modifypage_section_card_header,
++ g_string_sprintf(gstr, _(modifypage_section_card_header),
+ sec_node->section, l_title);
+ g_free(l_title);
+ if (sock_handler_write_str(sh, gstr->str, 0))
+@@ -1029,7 +1031,7 @@ static int Bmsrv_send_modify_page(SockHa
+ static int Bmsrv_send_modify_page_add_section(SockHandler *sh)
+ {
+ /* send modify page2 */
+- if (sock_handler_write_str(sh, modifypage_add_section_page, 1))
++ if (sock_handler_write_str(sh, _(modifypage_add_section_page), 1))
+ return 1;
+
+ return 2;
+@@ -1041,7 +1043,7 @@ static int Bmsrv_send_modify_page_add_se
+ */
+ static int Bmsrv_send_modify_page_add_url(SockHandler *sh)
+ {
+- if (sock_handler_write_str(sh, modifypage_add_url, 1))
++ if (sock_handler_write_str(sh, _(modifypage_add_url), 1))
+ return 1;
+ return 2;
+ }
+@@ -1075,14 +1077,14 @@ static int Bmsrv_send_modify_update(Sock
+ }
+
+ /* send HTML here */
+- if (sock_handler_write_str(sh, modifypage_update_header, 0))
++ if (sock_handler_write_str(sh, _(modifypage_update_header), 0))
+ return 1;
+
+ /* Count number of marked urls and sections */
+ Bmsrv_count_urls_and_sections(url1, &n_sec, &n_url);
+
+ if (n_sec) {
+- g_string_sprintf(gstr, modifypage_update_title, "Update&nbsp;sections:");
++ g_string_sprintf(gstr, modifypage_update_title, _("Update&nbsp;sections:"));
+ sock_handler_write_str(sh, gstr->str, 0);
+ sock_handler_write_str(sh, modifypage_update_item_header, 0);
+ /* send items here */
+@@ -1092,7 +1094,7 @@ static int Bmsrv_send_modify_update(Sock
+ if (q[2+i] == '=') {
+ key = strtol(q + 2, NULL, 10);
+ if ((sec_node = Bms_get_sec(key))) {
+- g_string_sprintf(gstr, modifypage_update_item2,
++ g_string_sprintf(gstr, _(modifypage_update_item2),
+ sec_node->section, sec_node->title);
+ sock_handler_write_str(sh, gstr->str, 0);
+ }
+@@ -1102,7 +1104,7 @@ static int Bmsrv_send_modify_update(Sock
+ }
+
+ if (n_url) {
+- g_string_sprintf(gstr, modifypage_update_title, "Update&nbsp;titles:");
++ g_string_sprintf(gstr, modifypage_update_title, _("Update&nbsp;titles:"));
+ sock_handler_write_str(sh, gstr->str, 0);
+ sock_handler_write_str(sh, modifypage_update_item_header, 0);
+ /* send items here */
+@@ -1112,7 +1114,7 @@ static int Bmsrv_send_modify_update(Sock
+ if (q[4+i] == '=') {
+ key = strtol(q + 4, NULL, 10);
+ bm_node = Bms_get(key);
+- g_string_sprintf(gstr, modifypage_update_item,
++ g_string_sprintf(gstr, _(modifypage_update_item),
+ bm_node->key, bm_node->title, bm_node->url);
+ sock_handler_write_str(sh, gstr->str, 0);
+ }
+@@ -1120,7 +1122,7 @@ static int Bmsrv_send_modify_update(Sock
+ sock_handler_write_str(sh, modifypage_update_item_footer, 0);
+ }
+
+- sock_handler_write_str(sh, modifypage_update_footer, 1);
++ sock_handler_write_str(sh, _(modifypage_update_footer), 1);
+
+ return 2;
+ }
+@@ -1399,22 +1401,22 @@ static int Bmsrv_check_modify_request(So
+ if (strstr(p, "operation=delete&")) {
+ if (n_url || n_sec)
+ return 0;
+- msg = "Delete: you must mark what to delete!";
++ msg = _("Delete: you must mark what to delete!");
+
+ } else if (strstr(url, "operation=move&")) {
+ if (n_url && n_sec)
+ return 0;
+ else if (n_url)
+- msg = "Move: you must mark a target section!";
++ msg = _("Move: you must mark a target section!");
+ else if (n_sec)
+- msg = "Move: can not move a section (yet).";
++ msg = _("Move: can not move a section (yet).");
+ else
+- msg = "Move: you must mark some urls, and a target section!";
++ msg = _("Move: you must mark some urls, and a target section!");
+
+ } else if (strstr(url, "operation=modify&")) {
+ if (n_url || n_sec)
+ return 0;
+- msg = "Modify: you must mark what to update!";
++ msg = _("Modify: you must mark what to update!");
+
+ } else if (strstr(url, "operation=modify2&")) {
+ /* nothing to check here */
+@@ -1431,17 +1433,17 @@ static int Bmsrv_check_modify_request(So
+ } else if (strstr(url, "operation=add_url&")) {
+ if (n_sec <= 1)
+ return 0;
+- msg = "Add url: only one target section is allowed!";
++ msg = _("Add url: only one target section is allowed!");
+
+ } else if (strstr(url, "operation=add_url2&")) {
+ /* nothing to check here */
+ return 0;
+
+ } else if (strstr(url, "operation=none&")) {
+- msg = "No operation, just do nothing!";
++ msg = _("No operation, just do nothing!");
+
+ } else {
+- msg = "Sorry, not implemented yet.";
++ msg = _("Sorry, not implemented yet.");
+ }
+
+ Bmsrv_dpi_send_status_msg(sh, msg);
+@@ -1529,11 +1531,11 @@ static int send_bm_page(SockHandler *sh)
+ if (!gstr)
+ gstr = g_string_new("");
+
+- if (sock_handler_write_str(sh, mainpage_header, 0))
++ if (sock_handler_write_str(sh, _(mainpage_header), 0))
+ return 1;
+
+ /* write sections header */
+- if (sock_handler_write_str(sh, mainpage_sections_header, 0))
++ if (sock_handler_write_str(sh, _(mainpage_sections_header), 0))
+ return 1;
+ /* write sections */
+ for (list1 = B_secs; list1; list1 = list1->next) {
+@@ -1557,7 +1559,7 @@ static int send_bm_page(SockHandler *sh)
+
+ /* send card header */
+ l_title = make_one_line_str(sec_node->title);
+- g_string_sprintf(gstr, mainpage_section_card_header,
++ g_string_sprintf(gstr, _(mainpage_section_card_header),
+ sec_node->section, l_title);
+ g_free(l_title);
+ if (sock_handler_write_str(sh, gstr->str, 0))
+@@ -1609,7 +1611,7 @@ static int Bmsrv_parse_buf(SockHandler *
+
+ if (!(p = strchr(Buf, '>'))) {
+ /* Haven't got a full tag */
+- g_print("Haven't got a full tag!\n");
++ g_print(_("Haven't got a full tag!\n"));
+ return 1;
+ }
+
+@@ -1648,7 +1650,7 @@ static int Bmsrv_parse_buf(SockHandler *
+ title = a_Dpip_get_attr(Buf, BufSize, "title");
+ if (strlen(title) == 0) {
+ g_free(title);
+- title = g_strdup("(Untitled)");
++ title = g_strdup(_("(Untitled)"));
+ }
+ if (url && title)
+ Bmsrv_add_bm(sh, url, title);
+@@ -1685,8 +1687,8 @@ static int Bmsrv_parse_buf(SockHandler *
+ st = send_bm_page(sh);
+ if (st != 0) {
+ char *err =
+- DOCTYPE
+- "<HTML><body> Error on the bookmarks server...</body></html>";
++ _("<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n"
++ "<HTML><body> Error on the bookmarks server...</body></html>");
+ if (sock_handler_write(sh, err, strlen(err), 1) != 0) {
+ return 1;
+ }
+@@ -1727,6 +1729,14 @@ int main (void) {
+ int code;
+ SockHandler *sh;
+
++ /* Initialize Gettext */
++#ifdef ENABLE_NLS
++ setlocale(LC_ALL, "");
++ bindtextdomain (PACKAGE, LOCALEDIR);
++ bind_textdomain_codeset (PACKAGE, "UTF-8");
++ textdomain (PACKAGE);
++#endif
++
+ /* Arrange the cleanup function for terminations via exit() */
+ atexit(cleanup);
+
+@@ -1740,7 +1750,7 @@ int main (void) {
+
+ BmFile = g_strconcat(g_get_home_dir(), "/", ".dillo/bm.txt", NULL);
+
+- g_print("bookmarks.dpi (v.13): accepting connections...\n");
++ //g_print(_("bookmarks.dpi (v.13): accepting connections...\n"));
+
+ /* some OSes may need this... */
+ address_size = sizeof(struct sockaddr_un);
+@@ -1768,6 +1778,7 @@ int main (void) {
+ break;
+ }
+
++ //g_print("Closing SockHandler\n");
+ sock_handler_close(sh);
+ sock_handler_free(sh);
+
+diff -pruN dillo-0.8.6/dpi/cookies.c dillo-0.8.6-i18n-misc-20060709/dpi/cookies.c
+--- dillo-0.8.6/dpi/cookies.c 2006-02-15 22:27:27.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dpi/cookies.c 2006-05-16 01:21:15.000000000 +0900
+@@ -187,7 +187,7 @@ static FILE *Cookies_fopen(const char *f
+ write(fd, init_str, strlen(init_str));
+ close(fd);
+
+- MSG("Created file: %s\n", filename);
++ _MSG("Created file: %s\n", filename);
+ F_in = Cookies_fopen(filename, NULL);
+ } else {
+ MSG("Could not create file: %s!\n", filename);
+@@ -263,7 +263,7 @@ void Cookies_init()
+ return;
+ }
+
+- MSG("Enabling cookies as from cookiesrc...\n");
++ _MSG("Enabling cookies as from cookiesrc...\n");
+
+ cookies = g_hash_table_new(g_str_hash, g_str_equal);
+
+@@ -574,7 +574,7 @@ static time_t Cookies_create_timestamp(c
+ (minutes * 60) +
+ seconds);
+
+- MSG("Expires in %ld seconds, at %s",
++ _MSG("Expires in %ld seconds, at %s",
+ (long)ret - time(NULL), ctime(&ret));
+
+ return ret;
+@@ -717,7 +717,7 @@ static char *Cookies_parse_attr(char **c
+ {
+ char *str = *cookie_str;
+ guint i, end = 0;
+- gboolean got_attr = FALSE;
++ gboolean got_attr = FALSE, have_value = TRUE;;
+
+ for (i = 0; ; i++) {
+ switch (str[i]) {
+@@ -726,6 +726,10 @@ static char *Cookies_parse_attr(char **c
+ case '=':
+ case ';':
+ got_attr = TRUE;
++ if(str[i] == '=' && str[i+1] == ';'){
++ _MSG("no value\n");
++ have_value = FALSE;
++ }
+ if (end == 0)
+ end = i;
+ break;
+@@ -741,6 +745,7 @@ static char *Cookies_parse_attr(char **c
+ /* fall through! */
+ default:
+ if (got_attr) {
++ if(!have_value) i--;
+ *cookie_str = str + i;
+ return g_strndup(str, end);
+ }
+@@ -762,6 +767,11 @@ static char *Cookies_parse_value(char **
+ guint i, end;
+ char *str = *cookie_str;
+
++ if (str[0] == ';') {
++ cookie_str += 1;
++ return strdup("");
++ }
++
+ for (i = end = 0; !end; ++i) {
+ switch (str[i]) {
+ case ' ':
+@@ -880,7 +890,7 @@ static CookieData_t *Cookies_parse_one(g
+ }
+ } else if (g_strcasecmp(attr, "Expires") == 0) {
+ if (!max_age && !discard) {
+- MSG("Old netscape-style cookie...\n");
++ _MSG("Old netscape-style cookie...\n");
+ value = Cookies_parse_value(&str, TRUE, FALSE);
+ if (value) {
+ cookie->expires_at = Cookies_create_timestamp(value);
+@@ -1225,7 +1235,7 @@ static int Cookie_control_init(void)
+
+ /* Get a file pointer */
+ filename = g_strconcat(g_get_home_dir(), "/", ".dillo/cookiesrc", NULL);
+- stream = Cookies_fopen(filename, "DEFAULT DENY\n");
++ stream = Cookies_fopen(filename, "DEFAULT ACCEPT\n");
+ g_free(filename);
+
+ if (!stream)
+@@ -1341,7 +1351,7 @@ static int srv_parse_buf(SockHandler *sh
+
+ if (cmd && strcmp(cmd, "DpiBye") == 0) {
+ g_free(cmd);
+- MSG("Cookies dpi (pid %d): Got DpiBye.\n", (gint)getpid());
++ _MSG("Cookies dpi (pid %d): Got DpiBye.\n", (gint)getpid());
+ exit(0);
+
+ } else if (cmd && strcmp(cmd, "set_cookie") == 0) {
+@@ -1398,7 +1408,7 @@ static int srv_parse_buf(SockHandler *sh
+ static void cleanup(void)
+ {
+ Cookies_freeall();
+- MSG("cleanup\n");
++ _MSG("cleanup\n");
+ /* no more cleanup required */
+ }
+
+@@ -1434,7 +1444,7 @@ int main (void) {
+ signal (SIGTERM, SIG_IGN);
+
+ Cookies_init();
+- MSG("(v.1) accepting connections...\n");
++ _MSG("(v.1) accepting connections...\n");
+
+ if (disabled)
+ exit(1);
+diff -pruN dillo-0.8.6/dpi/dpiutil.c dillo-0.8.6-i18n-misc-20060709/dpi/dpiutil.c
+--- dillo-0.8.6/dpi/dpiutil.c 2006-01-21 05:06:55.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dpi/dpiutil.c 2006-05-16 01:21:15.000000000 +0900
+@@ -95,8 +95,8 @@ gchar *Unescape_html_str(const gchar *st
+ if (!g_strncasecmp(str + i, unsafe_rep[k], unsafe_rep_len[k])) {
+ i += unsafe_rep_len[k] - 1;
+ break;
+- }
+- }
++ }
++ }
+ u_str[j++] = (k < 5) ? unsafe_chars[k] : str[i];
+ } else {
+ u_str[j++] = str[i];
+@@ -139,7 +139,7 @@ char *Filter_smtp_hack(char *url)
+
+ /*
+ * Create and initialize the SockHandler structure
+- */
++ */
+ SockHandler *sock_handler_new(int fd_in, int fd_out, int flush_sz)
+ {
+ SockHandler *sh = g_new(SockHandler, 1);
+@@ -232,7 +232,7 @@ gchar *sock_handler_read(SockHandler *sh
+ do
+ st = read(sh->fd_in, buf, 16384);
+ while (st < 0 && errno == EINTR);
+-
++
+ if (st == -1)
+ perror("[sock_handler_read]");
+
+diff -pruN dillo-0.8.6/dpi/file.c dillo-0.8.6-i18n-misc-20060709/dpi/file.c
+--- dillo-0.8.6/dpi/file.c 2006-04-12 02:50:23.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dpi/file.c 2006-05-16 01:21:15.000000000 +0900
+@@ -525,7 +525,7 @@ static const char *File_content_type(con
+ /*
+ * Try to stat the file and determine if it's readable.
+ */
+-static void File_get(ClientInfo *Client, const char *filename,
++static void File_get(ClientInfo *Client, const char *filename,
+ const char *orig_url)
+ {
+ int res;
+@@ -545,7 +545,7 @@ static void File_get(ClientInfo *Client,
+
+ if (res == FILE_NOT_FOUND) {
+ msg = g_strdup_printf("%s Not Found: %s",
+- S_ISDIR(sb.st_mode) ? "Directory" : "File", filename);
++ S_ISDIR(sb.st_mode) ? "Directory" : "File", filename);
+ } else if (res == FILE_NO_ACCESS) {
+ msg = g_strdup_printf("Access denied to %s: %s",
+ S_ISDIR(sb.st_mode) ? "Directory" : "File", filename);
+@@ -715,7 +715,7 @@ static char *File_normalize_path(const c
+ if (str[1] == '\0' || str[1] == '/') {
+ /* User wants the CWD */
+ basename = g_get_current_dir();
+- str++;
++ str++;
+ } else if (str[1] == '.') {
+ /* One level down from the CWD */
+ char *tmp1 = g_get_current_dir();
+@@ -941,11 +941,11 @@ int main(void)
+
+ /* Arrange the cleanup function for abnormal terminations */
+ if (signal (SIGINT, termination_handler) == SIG_IGN)
+- signal (SIGINT, SIG_IGN);
++ signal (SIGINT, SIG_IGN);
+ if (signal (SIGHUP, termination_handler) == SIG_IGN)
+- signal (SIGHUP, SIG_IGN);
++ signal (SIGHUP, SIG_IGN);
+ if (signal (SIGTERM, termination_handler) == SIG_IGN)
+- signal (SIGTERM, SIG_IGN);
++ signal (SIGTERM, SIG_IGN);
+
+ MSG("(v.1) accepting connections...\n");
+
+@@ -972,7 +972,7 @@ int main(void)
+ accept(STDIN_FILENO, (struct sockaddr *)&spun, &address_size);
+
+ if (temp_sock_descriptor == -1) {
+- perror("[accept]");
++ perror("[accept]");
+ break;
+ }
+
+diff -pruN dillo-0.8.6/dpi/ftp.c dillo-0.8.6-i18n-misc-20060709/dpi/ftp.c
+--- dillo-0.8.6/dpi/ftp.c 2006-04-04 21:48:45.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dpi/ftp.c 2006-05-16 01:21:15.000000000 +0900
+@@ -248,7 +248,7 @@ static gint try_ftp_transfer(gchar *url)
+ }
+
+ if (!aborted)
+- sock_handler_write(sh, buf, n, 0);
++ sock_handler_write(sh, buf, n, 0);
+ }
+
+ return nb;
+diff -pruN dillo-0.8.6/dpi/hello.c dillo-0.8.6-i18n-misc-20060709/dpi/hello.c
+--- dillo-0.8.6/dpi/hello.c 2006-01-18 00:21:53.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dpi/hello.c 2006-05-16 01:21:15.000000000 +0900
+@@ -131,7 +131,7 @@ int main(void)
+ /* Read/Write */
+ while ((n = fread (buf, 1, 4096, in_stream)) > 0) {
+ sock_handler_write(sh, buf, n, 0);
+- }
++ }
+
+ sock_handler_printf(sh, 0, "</pre>\n");
+
+diff -pruN dillo-0.8.6/dpi/https.c dillo-0.8.6-i18n-misc-20060709/dpi/https.c
+--- dillo-0.8.6/dpi/https.c 2006-03-25 00:52:23.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dpi/https.c 2006-05-16 01:21:15.000000000 +0900
+@@ -134,7 +134,7 @@ static void yes_ssl_support(void)
+ /*Insufficient entropy. Deal with it?*/
+ g_printerr("Insufficient random entropy\n");
+ }
+-
++
+ /*Create context and SSL object*/
+ if (exit_error == 0){
+ ssl_context = SSL_CTX_new(SSLv23_client_method());
+@@ -171,7 +171,7 @@ static void yes_ssl_support(void)
+ }
+
+ if (exit_error == 0){
+- /* Need to do the following if we want to deal with all
++ /* Need to do the following if we want to deal with all
+ * possible ciphers
+ */
+ SSL_set_cipher_list(ssl_connection, "ALL");
+@@ -268,7 +268,7 @@ static void yes_ssl_support(void)
+ }
+
+ /*
+- * The following function attempts to open up a connection to the
++ * The following function attempts to open up a connection to the
+ * remote server and return the file descriptor number of the
+ * socket. Returns -1 in the event of an error
+ */
+@@ -302,7 +302,7 @@ static int get_network_connection(gchar
+ } else {
+ url_look_up = url + url_offset;
+ }
+-
++
+ root_url = g_strdup(url_look_up);
+ hp=gethostbyname(url_look_up);
+
+@@ -331,7 +331,7 @@ static int get_network_connection(gchar
+ }
+
+
+-/* This function is run only when the certificate cannot
++/* This function is run only when the certificate cannot
+ * be completely trusted. This will notify the user and
+ * allow the user to decide what to do. It may save the
+ * certificate to the user's .dillo directory if it is
+@@ -363,7 +363,7 @@ static int handle_certificate_problem(SS
+
+ /*Read the user's response*/
+ response_number = dialog_get_answer_number();
+-
++
+ /*Abort on anything but "Continue"*/
+ if (response_number == 1){
+ retval = 0;
+@@ -423,8 +423,8 @@ static int handle_certificate_problem(SS
+ d_cmd = a_Dpip_build_cmd(
+ "cmd=%s msg=%s alt1=%s alt2=%s",
+ "dialog",
+- "The issuer for the remote certificate cannot be found\n"
+- "The authenticity of the remote certificate cannot be trusted",
++ "The issuer for the remote certificate cannot be found\n"
++ "The authenticity of the remote certificate cannot be trusted",
+ "Continue", "Cancel");
+ sock_handler_write_str(sh, d_cmd, 1);
+ g_free(d_cmd);
+@@ -684,7 +684,7 @@ static void no_ssl_support(void)
+ /*---------------------------------------------------------------------------*/
+ int main(void)
+ {
+- /* Initialize the SockHandler for this filter dpi */
++ /* Initialize the SockHandler for this filter dpi */
+ sh = sock_handler_new(STDIN_FILENO, STDOUT_FILENO, 8*1024);
+
+ #ifdef ENABLE_SSL
+diff -pruN dillo-0.8.6/dpid/Makefile.am dillo-0.8.6-i18n-misc-20060709/dpid/Makefile.am
+--- dillo-0.8.6/dpid/Makefile.am 2005-05-08 04:28:00.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dpid/Makefile.am 2006-05-16 01:21:14.000000000 +0900
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS=-DDPIDRC_SYS='"$(sysconfdir)/dpidrc"'
++AM_CPPFLAGS=-DDPIDRC_SYS='"$(sysconfdir)/dpidrc"' -DLOCALEDIR='"$(localedir)"'
+ AM_CFLAGS = @GLIB_CFLAGS@
+
+ bin_PROGRAMS = dpid
+diff -pruN dillo-0.8.6/dpid/Makefile.in dillo-0.8.6-i18n-misc-20060709/dpid/Makefile.in
+--- dillo-0.8.6/dpid/Makefile.in 2006-04-27 01:07:18.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dpid/Makefile.in 2006-05-16 01:21:14.000000000 +0900
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,9 +14,6 @@
+
+ @SET_MAKE@
+
+-
+-SOURCES = $(dpid_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -24,6 +21,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -40,38 +38,6 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-bin_PROGRAMS = dpid$(EXEEXT)
+-subdir = dpid
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
+-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
+-am_dpid_OBJECTS = dpi.$(OBJEXT) dpi_service.$(OBJEXT) \
+- dpi_socket_dir.$(OBJEXT) dpid.$(OBJEXT) dpid_common.$(OBJEXT) \
+- main.$(OBJEXT) misc_new.$(OBJEXT)
+-dpid_OBJECTS = $(am_dpid_OBJECTS)
+-dpid_DEPENDENCIES = ../dpip/libDpip.a
+-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+-SCRIPTS = $(bin_SCRIPTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(dpid_SOURCES)
+-DIST_SOURCES = $(dpid_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -101,6 +67,7 @@ EXEEXT = @EXEEXT@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_CONFIG = @GLIB_CONFIG@
+ GLIB_LIBS = @GLIB_LIBS@
++GMSGFMT = @GMSGFMT@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_CONFIG = @GTK_CONFIG@
+ GTK_LIBS = @GTK_LIBS@
+@@ -108,9 +75,12 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INTLLIBS = @INTLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
+ LIBFLTK_LIBS = @LIBFLTK_LIBS@
++LIBICONV = @LIBICONV@
++LIBINTL = @LIBINTL@
+ LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
+ LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
+ LIBJPEG_LIBS = @LIBJPEG_LIBS@
+@@ -122,8 +92,13 @@ LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
+ LIBS = @LIBS@
+ LIBSSL_LIBS = @LIBSSL_LIBS@
+ LIBZ_LIBS = @LIBZ_LIBS@
++LTLIBICONV = @LTLIBICONV@
++LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MSGFMT = @MSGFMT@
++MSGMERGE = @MSGMERGE@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -132,11 +107,16 @@ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++POSUB = @POSUB@
+ RANLIB = @RANLIB@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
++USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++XFT_CONFIG = @XFT_CONFIG@
++XGETTEXT = @XGETTEXT@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+@@ -148,8 +128,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TR
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -168,9 +146,9 @@ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -182,11 +160,15 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-AM_CPPFLAGS = -DDPIDRC_SYS='"$(sysconfdir)/dpidrc"'
++AM_CPPFLAGS = -DDPIDRC_SYS='"$(sysconfdir)/dpidrc"' -DLOCALEDIR='"$(localedir)"'
+ AM_CFLAGS = @GLIB_CFLAGS@
++
++bin_PROGRAMS = dpid
+ dpid_LDADD = @GLIB_LIBS@ ../dpip/libDpip.a
++
+ EXTRA_DIST = dpidc
+ bin_SCRIPTS = dpidc
++
+ dpid_SOURCES = \
+ dpi.h \
+ dpi_service.h \
+@@ -202,49 +184,58 @@ dpid_SOURCES = \
+ main.c \
+ misc_new.c
+
++subdir = dpid
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++bin_PROGRAMS = dpid$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS)
++
++am_dpid_OBJECTS = dpi.$(OBJEXT) dpi_service.$(OBJEXT) \
++ dpi_socket_dir.$(OBJEXT) dpid.$(OBJEXT) dpid_common.$(OBJEXT) \
++ main.$(OBJEXT) misc_new.$(OBJEXT)
++dpid_OBJECTS = $(am_dpid_OBJECTS)
++dpid_DEPENDENCIES = ../dpip/libDpip.a
++dpid_LDFLAGS =
++SCRIPTS = $(bin_SCRIPTS)
++
++
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dpi.Po ./$(DEPDIR)/dpi_service.Po \
++@AMDEP_TRUE@ ./$(DEPDIR)/dpi_socket_dir.Po ./$(DEPDIR)/dpid.Po \
++@AMDEP_TRUE@ ./$(DEPDIR)/dpid_common.Po ./$(DEPDIR)/main.Po \
++@AMDEP_TRUE@ ./$(DEPDIR)/misc_new.Po
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(dpid_SOURCES)
++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO
++SOURCES = $(dpid_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dpid/Makefile'; \
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu dpid/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++ $(mkinstalldirs) $(DESTDIR)$(bindir)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ ; then \
+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
++ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+ else :; fi; \
+ done
+
+@@ -252,8 +243,8 @@ uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+- rm -f "$(DESTDIR)$(bindir)/$$f"; \
++ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++ rm -f $(DESTDIR)$(bindir)/$$f; \
+ done
+
+ clean-binPROGRAMS:
+@@ -261,15 +252,16 @@ clean-binPROGRAMS:
+ dpid$(EXEEXT): $(dpid_OBJECTS) $(dpid_DEPENDENCIES)
+ @rm -f dpid$(EXEEXT)
+ $(LINK) $(dpid_LDFLAGS) $(dpid_OBJECTS) $(dpid_LDADD) $(LIBS)
++binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++ $(mkinstalldirs) $(DESTDIR)$(bindir)
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+- echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+- $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
++ echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
++ $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
+ else :; fi; \
+ done
+
+@@ -277,12 +269,12 @@ uninstall-binSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+- rm -f "$(DESTDIR)$(bindir)/$$f"; \
++ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
++ rm -f $(DESTDIR)$(bindir)/$$f; \
+ done
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -296,20 +288,36 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc_new.Po@am__quote@
+
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++@am__fastdepCC_TRUE@ fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++@am__fastdepCC_TRUE@ fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -318,7 +326,6 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -330,11 +337,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -357,6 +363,10 @@ GTAGS:
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -370,7 +380,7 @@ distdir: $(DISTFILES)
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -388,10 +398,9 @@ distdir: $(DISTFILES)
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(PROGRAMS) $(SCRIPTS)
++
+ installdirs:
+- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+- done
++ $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir)
+ install: install-am
+ install-exec: install-exec-am
+ install-data: install-data-am
+@@ -411,7 +420,7 @@ mostlyclean-generic:
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -430,8 +439,6 @@ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -468,8 +475,8 @@ uninstall-am: uninstall-binPROGRAMS unin
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic ctags distclean distclean-compile \
+- distclean-generic distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-binPROGRAMS \
++ distclean-generic distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-binPROGRAMS \
+ install-binSCRIPTS install-data install-data-am \
+ install-data-local install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+diff -pruN dillo-0.8.6/dpid/dpi_socket_dir.c dillo-0.8.6-i18n-misc-20060709/dpid/dpi_socket_dir.c
+--- dillo-0.8.6/dpid/dpi_socket_dir.c 2005-10-28 01:19:53.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dpid/dpi_socket_dir.c 2006-05-16 01:21:14.000000000 +0900
+@@ -23,6 +23,7 @@
+ #include <errno.h>
+ #include "dpid_common.h"
+ #include "dpi.h"
++#include "../src/intl.h"
+ #include "misc_new.h"
+ #include "dpi_socket_dir.h" /* for function prototypes */
+
+@@ -102,16 +103,16 @@ char *init_sockdir(char *dpi_socket_dir)
+
+ if ((sockdir = a_Dpi_rd_dpi_socket_dir(dpi_socket_dir)) == NULL) {
+ fprintf(stderr, "debug_msg - init_sockdir: ");
+- fprintf(stderr, "The dpi_socket_dir file does not exist\n");
++ fprintf(stderr, _("The dpi_socket_dir file does not exist\n"));
+ } else {
+ if ((dir_ok = tst_dir(sockdir)) == 1) {
+ fprintf(stderr,
+- "debug_msg - init_sockdir: The socket directory ");
+- fprintf(stderr, "%s exists and is OK\n", sockdir);
++ _("debug_msg - init_sockdir: The socket directory "));
++ fprintf(stderr, _("%s exists and is OK\n"), sockdir);
+ } else {
+ fprintf(stderr,
+- "debug_msg - init_sockdir: The socket directory ");
+- fprintf(stderr, "%s does not exist or is not a directory\n",
++ _("debug_msg - init_sockdir: The socket directory "));
++ fprintf(stderr, _("%s does not exist or is not a directory\n"),
+ sockdir);
+ g_free(sockdir);
+ }
+@@ -120,10 +121,10 @@ char *init_sockdir(char *dpi_socket_dir)
+ sockdir = mk_sockdir();
+ if (sockdir == NULL) {
+ ERRMSG("init_sockdir", "mk_sockdir", 0);
+- fprintf(stderr, " - Failed to create dpi socket directory\n");
++ fprintf(stderr, _(" - Failed to create dpi socket directory\n"));
+ } else if ((w_dpi_socket_dir(dpi_socket_dir, sockdir)) == -1) {
+ ERRMSG("init_sockdir", "w_dpi_socket_dir", 0);
+- fprintf(stderr, " - failed to save %s\n", sockdir);
++ fprintf(stderr, _(" - failed to save %s\n"), sockdir);
+ g_free(sockdir);
+ sockdir = NULL;
+ }
+diff -pruN dillo-0.8.6/dpid/main.c dillo-0.8.6-i18n-misc-20060709/dpid/main.c
+--- dillo-0.8.6/dpid/main.c 2006-01-03 03:34:18.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dpid/main.c 2006-05-16 01:21:14.000000000 +0900
+@@ -22,6 +22,9 @@
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <glib.h>
++#include <locale.h>
++#include "config.h"
++#include "../src/intl.h"
+ #include "dpid_common.h"
+ #include "dpid.h"
+ #include "dpi.h"
+@@ -53,14 +56,14 @@ static int start_filter_plugin(struct dp
+ dup2(STDIN_FILENO, old_stdin);
+ if (dup2(newsock, STDIN_FILENO) == -1) {
+ ERRMSG("start_plugin", "dup2", errno);
+- fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
++ fprintf(stderr, _("ERROR in child proc for %s\n"), dpi_attr.path);
+ exit(1);
+ }
+
+ dup2(STDOUT_FILENO, old_stdout);
+ if (dup2(newsock, STDOUT_FILENO) == -1) {
+ ERRMSG("start_plugin", "dup2", errno);
+- fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
++ fprintf(stderr, _("ERROR in child proc for %s\n"), dpi_attr.path);
+ exit(1);
+ }
+ if ((pid = fork()) == -1) {
+@@ -71,7 +74,7 @@ static int start_filter_plugin(struct dp
+ /* Child, start plugin */
+ if (execl(dpi_attr.path, dpi_attr.path, NULL) == -1) {
+ ERRMSG("start_plugin", "execl", errno);
+- fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
++ fprintf(stderr, _("ERROR in child proc for %s\n"), dpi_attr.path);
+ exit(1);
+ }
+ }
+@@ -79,7 +82,7 @@ static int start_filter_plugin(struct dp
+ /* Parent, Close sockets fix stdio and return pid */
+ if (a_Misc_close_fd(newsock) == -1) {
+ ERRMSG("start_plugin", "close", errno);
+- fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
++ fprintf(stderr, _("ERROR in child proc for %s\n"), dpi_attr.path);
+ exit(1);
+ }
+ a_Misc_close_fd(STDIN_FILENO);
+@@ -93,17 +96,17 @@ static void start_server_plugin(struct d
+ {
+ if (dup2(dpi_attr.socket, STDIN_FILENO) == -1) {
+ ERRMSG("start_plugin", "dup2", errno);
+- fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
++ fprintf(stderr, _("ERROR in child proc for %s\n"), dpi_attr.path);
+ exit(1);
+ }
+ if (a_Misc_close_fd(dpi_attr.socket) == -1) {
+ ERRMSG("start_plugin", "close", errno);
+- fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
++ fprintf(stderr, _("ERROR in child proc for %s\n"), dpi_attr.path);
+ exit(1);
+ }
+ if (execl(dpi_attr.path, dpi_attr.path, NULL) == -1) {
+ ERRMSG("start_plugin", "execl", errno);
+- fprintf(stderr, "ERROR in child proc for %s\n", dpi_attr.path);
++ fprintf(stderr, _("ERROR in child proc for %s\n"), dpi_attr.path);
+ exit(1);
+ }
+ }
+@@ -152,7 +155,7 @@ static int get_command(int sock, char *d
+ int COMMAND;
+
+ if (dpi_tag == NULL) {
+- ERRMSG("get_command", "dpid tag is NULL\n", 0);
++ //ERRMSG("get_command", _("dpid tag is NULL\n"), 0);
+ return (-1);
+ }
+
+@@ -160,7 +163,7 @@ static int get_command(int sock, char *d
+
+ if (cmd == NULL) {
+ ERRMSG("get_command", "a_Dpip_get_attr", 0);
+- fprintf(stderr, ": dpid failed to parse cmd in %s\n", dpi_tag);
++ fprintf(stderr, _(": dpid failed to parse cmd in %s\n"), dpi_tag);
+ d_cmd = a_Dpip_build_cmd("cmd=%s msg=%s",
+ "DpiError", "Failed to parse request");
+ (void) CKD_WRITE(sock, d_cmd);
+@@ -227,6 +230,11 @@ int main(void)
+ sigset_t mask_none;
+ fd_set selected_set;
+
++ /* Initialize Gettext */
++ setlocale(LC_ALL, "");
++ bindtextdomain (PACKAGE, LOCALEDIR);
++ textdomain (PACKAGE);
++
+ dpi_attr_list = NULL;
+ /* daemon(0,0); */ /* Use 0,1 for feedback */
+ /* todo: call setsid() ?? */
+@@ -254,7 +262,7 @@ int main(void)
+ dirname = a_Dpi_sockdir_file();
+ if ((sockdir = init_sockdir(dirname)) == NULL) {
+ ERRMSG("main", "init_sockdir", 0);
+- fprintf(stderr, "Failed to create socket directory\n");
++ fprintf(stderr, _("Failed to create socket directory\n"));
+ exit(1);
+ }
+
+@@ -264,12 +272,12 @@ int main(void)
+ if ((numsocks = init_srs_socket(sockdir)) == -1) {
+ switch (dpi_errno) {
+ case dpid_srs_addrinuse:
+- fprintf(stderr, "dpid refuses to start, possibly because:\n");
+- fprintf(stderr, "\t1) An instance of dpid is already running.\n");
+- fprintf(stderr, "\t2) A previous dpid didn't clean up on exit.\n");
++ fprintf(stderr, _("dpid refuses to start, possibly because:\n"));
++ fprintf(stderr, _("\t1) An instance of dpid is already running.\n"));
++ fprintf(stderr, _("\t2) A previous dpid didn't clean up on exit.\n"));
+ exit(1);
+ default:
+- ERRMSG("main", "init_srs_sockets failed\n", 0);
++ ERRMSG("main", _("init_srs_sockets failed\n"), 0);
+ exit(1);
+ }
+ }
+@@ -283,7 +291,7 @@ int main(void)
+ (void) sigemptyset(&mask_none);
+ (void) sigprocmask(SIG_SETMASK, &mask_none, NULL);
+
+- printf("dpid started\n");
++ printf(_("dpid started\n"));
+ /* Start main loop */
+ while (1) {
+ do {
+@@ -329,8 +337,8 @@ int main(void)
+ sock = accept(srs, (struct sockaddr *) &clnt_addr, &csz);
+ if (sock == -1) {
+ ERRMSG("main", "accept", errno);
+- fprintf(stderr, "accept on srs socket failed\n");
+- fprintf(stderr, "service pending connections, and continue\n");
++ fprintf(stderr, _("accept on srs socket failed\n"));
++ fprintf(stderr, _("service pending connections, and continue\n"));
+ } else {
+ int command;
+
+@@ -359,7 +367,7 @@ int main(void)
+ break;
+ }
+ case -1:
+- ERRMSG("main", "get_command failed\n", 0);
++ //ERRMSG("main", _("get_command failed\n"), 0);
+ break;
+ }
+ if (req)
+diff -pruN dillo-0.8.6/dpip/Makefile.in dillo-0.8.6-i18n-misc-20060709/dpip/Makefile.in
+--- dillo-0.8.6/dpip/Makefile.in 2006-04-27 01:07:20.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/dpip/Makefile.in 2006-05-16 01:21:08.000000000 +0900
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.7.9 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
++# Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,8 +14,6 @@
+
+ @SET_MAKE@
+
+-SOURCES = $(libDpip_a_SOURCES)
+-
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+@@ -23,6 +21,7 @@ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
++
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+@@ -39,34 +38,6 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-subdir = dpip
+-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+- $(ACLOCAL_M4)
+-mkinstalldirs = $(install_sh) -d
+-CONFIG_HEADER = $(top_builddir)/config.h
+-CONFIG_CLEAN_FILES =
+-LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
+-ARFLAGS = cru
+-libDpip_a_AR = $(AR) $(ARFLAGS)
+-libDpip_a_LIBADD =
+-am_libDpip_a_OBJECTS = dpip.$(OBJEXT)
+-libDpip_a_OBJECTS = $(am_libDpip_a_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+-depcomp = $(SHELL) $(top_srcdir)/depcomp
+-am__depfiles_maybe = depfiles
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(libDpip_a_SOURCES)
+-DIST_SOURCES = $(libDpip_a_SOURCES)
+-ETAGS = etags
+-CTAGS = ctags
+-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
+@@ -96,6 +67,7 @@ EXEEXT = @EXEEXT@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_CONFIG = @GLIB_CONFIG@
+ GLIB_LIBS = @GLIB_LIBS@
++GMSGFMT = @GMSGFMT@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_CONFIG = @GTK_CONFIG@
+ GTK_LIBS = @GTK_LIBS@
+@@ -103,9 +75,12 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++INTLLIBS = @INTLLIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBFLTK_CXXFLAGS = @LIBFLTK_CXXFLAGS@
+ LIBFLTK_LIBS = @LIBFLTK_LIBS@
++LIBICONV = @LIBICONV@
++LIBINTL = @LIBINTL@
+ LIBJPEG_CPPFLAGS = @LIBJPEG_CPPFLAGS@
+ LIBJPEG_LDFLAGS = @LIBJPEG_LDFLAGS@
+ LIBJPEG_LIBS = @LIBJPEG_LIBS@
+@@ -117,8 +92,13 @@ LIBPTHREAD_LIBS = @LIBPTHREAD_LIBS@
+ LIBS = @LIBS@
+ LIBSSL_LIBS = @LIBSSL_LIBS@
+ LIBZ_LIBS = @LIBZ_LIBS@
++LTLIBICONV = @LTLIBICONV@
++LTLIBINTL = @LTLIBINTL@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
++MKINSTALLDIRS = @MKINSTALLDIRS@
++MSGFMT = @MSGFMT@
++MSGMERGE = @MSGMERGE@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -127,11 +107,16 @@ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++POSUB = @POSUB@
+ RANLIB = @RANLIB@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
++USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
++XFT_CONFIG = @XFT_CONFIG@
++XGETTEXT = @XGETTEXT@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+@@ -143,8 +128,6 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TR
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+-am__tar = @am__tar@
+-am__untar = @am__untar@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+@@ -163,9 +146,9 @@ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+-mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+@@ -179,44 +162,48 @@ target_os = @target_os@
+ target_vendor = @target_vendor@
+ AM_CFLAGS = @GLIB_CFLAGS@
+ AM_LIBS = @GLIB_LIBS@
++
+ noinst_LIBRARIES = libDpip.a
++
+ libDpip_a_SOURCES = \
+ dpip.h \
+ dpip.c
+
++subdir = dpip
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++LIBRARIES = $(noinst_LIBRARIES)
++
++libDpip_a_AR = $(AR) cru
++libDpip_a_LIBADD =
++am_libDpip_a_OBJECTS = dpip.$(OBJEXT)
++libDpip_a_OBJECTS = $(am_libDpip_a_OBJECTS)
++
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dpip.Po
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++DIST_SOURCES = $(libDpip_a_SOURCES)
++DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
++SOURCES = $(libDpip_a_SOURCES)
++
+ all: all-am
+
+ .SUFFIXES:
+ .SUFFIXES: .c .o .obj
+-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+- @for dep in $?; do \
+- case '$(am__configure_deps)' in \
+- *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
+- exit 1;; \
+- esac; \
+- done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu dpip/Makefile'; \
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu dpip/Makefile
+-.PRECIOUS: Makefile
+-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+- @case '$?' in \
+- *config.status*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+- *) \
+- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+- esac;
+-
+-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-
+-$(top_srcdir)/configure: $(am__configure_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
++
++AR = ar
+
+ clean-noinstLIBRARIES:
+ -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+@@ -226,7 +213,7 @@ libDpip.a: $(libDpip_a_OBJECTS) $(libDpi
+ $(RANLIB) libDpip.a
+
+ mostlyclean-compile:
+- -rm -f *.$(OBJEXT)
++ -rm -f *.$(OBJEXT) core *.core
+
+ distclean-compile:
+ -rm -f *.tab.c
+@@ -234,20 +221,36 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dpip.Po@am__quote@
+
+ .c.o:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++@am__fastdepCC_TRUE@ fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+ .c.obj:
+-@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
++@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
++@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
++@am__fastdepCC_TRUE@ fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+ uninstall-info-am:
+
++ETAGS = etags
++ETAGSFLAGS =
++
++CTAGS = ctags
++CTAGSFLAGS =
++
++tags: TAGS
++
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -256,7 +259,6 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+-tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -268,11 +270,10 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
+- fi
++ test -z "$(ETAGS_ARGS)$$tags$$unique" \
++ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$tags $$unique
++
+ ctags: CTAGS
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+@@ -295,6 +296,10 @@ GTAGS:
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++
++top_distdir = ..
++distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+@@ -308,7 +313,7 @@ distdir: $(DISTFILES)
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
++ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+@@ -326,6 +331,7 @@ distdir: $(DISTFILES)
+ check-am: all-am
+ check: check-am
+ all-am: Makefile $(LIBRARIES)
++
+ installdirs:
+ install: install-am
+ install-exec: install-exec-am
+@@ -346,7 +352,7 @@ mostlyclean-generic:
+ clean-generic:
+
+ distclean-generic:
+- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -rm -f $(CONFIG_CLEAN_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -365,8 +371,6 @@ dvi: dvi-am
+
+ dvi-am:
+
+-html: html-am
+-
+ info: info-am
+
+ info-am:
+@@ -402,14 +406,13 @@ uninstall-am: uninstall-info-am
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES ctags distclean distclean-compile \
+- distclean-generic distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
+- installcheck-am installdirs maintainer-clean \
+- maintainer-clean-generic mostlyclean mostlyclean-compile \
+- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-info-am
++ distclean-generic distclean-tags distdir dvi dvi-am info \
++ info-am install install-am install-data install-data-am \
++ install-exec install-exec-am install-info install-info-am \
++ install-man install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
++ ps ps-am tags uninstall uninstall-am uninstall-info-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -pruN dillo-0.8.6/install-sh dillo-0.8.6-i18n-misc-20060709/install-sh
+--- dillo-0.8.6/install-sh 2005-03-22 16:17:05.000000000 +0900
++++ dillo-0.8.6-i18n-misc-20060709/install-sh 2006-05-16 01:21:07.000000000 +0900
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+
+-scriptversion=2005-02-02.21
++scriptversion=2004-04-01.17
+
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -58,6 +58,9 @@ stripprog="${STRIPPROG-strip}"
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+
++transformbasename=
++transform_arg=
++instcmd="$mvprog"
+ chmodcmd="$chmodprog 0755"
+ chowncmd=
+ chgrpcmd=
+@@ -67,27 +70,23 @@ mvcmd="$mvprog"
+ src=
+ dst=
+ dir_arg=
+-dstarg=
+-no_target_directory=
+
+-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
+ or: $0 [OPTION]... SRCFILES... DIRECTORY
+- or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+- or: $0 [OPTION]... -d DIRECTORIES...
++ or: $0 -d DIRECTORIES...
+
+-In the 1st form, copy SRCFILE to DSTFILE.
+-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+-In the 4th, create DIRECTORIES.
++In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
++In the second, create the directory path DIR.
+
+ Options:
+--c (ignored)
++-b=TRANSFORMBASENAME
++-c copy source (using $cpprog) instead of moving (using $mvprog).
+ -d create directories instead of installing files.
+--g GROUP $chgrpprog installed files to GROUP.
+--m MODE $chmodprog installed files to MODE.
+--o USER $chownprog installed files to USER.
+--s $stripprog installed files.
+--t DIRECTORY install into DIRECTORY.
+--T report an error if DSTFILE is a directory.
++-g GROUP $chgrp installed files to GROUP.
++-m MODE $chmod installed files to MODE.
++-o USER $chown installed files to USER.
++-s strip installed files (using $stripprog).
++-t=TRANSFORM
+ --help display this help and exit.
+ --version display version info and exit.
+
+@@ -97,7 +96,12 @@ Environment variables override the defau
+
+ while test -n "$1"; do
+ case $1 in
+- -c) shift
++ -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
++ shift
++ continue;;
++
++ -c) instcmd=$cpprog
++ shift
+ continue;;
+
+ -d) dir_arg=true
+@@ -109,7 +113,7 @@ while test -n "$1"; do
+ shift
+ continue;;
+
+- --help) echo "$usage"; exit $?;;
++ --help) echo "$usage"; exit 0;;
+
+ -m) chmodcmd="$chmodprog $2"
+ shift
+@@ -125,20 +129,14 @@ while test -n "$1"; do
+ shift
+ continue;;
+
+- -t) dstarg=$2
+- shift
+- shift
+- continue;;
+-
+- -T) no_target_directory=true
+- shift
+- continue;;
++ -t=*) transformarg=`echo $1 | sed 's/-t=//'`
++ shift
++ continue;;
+
+- --version) echo "$0 $scriptversion"; exit $?;;
++ --version) echo "$0 $scriptversion"; exit 0;;
+
+ *) # When -d is used, all remaining arguments are directories to create.
+- # When -t is used, the destination is already specified.
+- test -n "$dir_arg$dstarg" && break
++ test -n "$dir_arg" && break
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+@@ -176,13 +174,13 @@ do
+ src=
+
+ if test -d "$dst"; then
+- mkdircmd=:
++ instcmd=:
+ chmodcmd=
+ else
+- mkdircmd=$mkdirprog
++ instcmd=$mkdirprog
+ fi
+ else
+- # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
++ # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+ if test ! -f "$src" && test ! -d "$src"; then
+@@ -204,16 +202,12 @@ do
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+ if test -d "$dst"; then
+- if test -n "$no_target_directory"; then
+- echo "$0: $dstarg: Is a directory" >&2
+- exit 1
+- fi
+ dst=$dst/`basename "$src"`
+ fi
+ fi
+
+ # This sed command emulates the dirname command.
+- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
++ dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+ # Make sure that the destination directory exists.
+
+@@ -226,8 +220,7 @@ do
+ oIFS=$IFS
+ # Some sh's can't handle IFS=/ for some reason.
+ IFS='%'
+- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+- shift
++ set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+ IFS=$oIFS
+
+ pathcomp=
+@@ -236,42 +229,51 @@ do
+ pathcomp=$pathcomp$1
+ shift
+ if test ! -d "$pathcomp"; then
+- $mkdirprog "$pathcomp"
++ $mkdirprog "$pathcomp" || lasterr=$?
+ # mkdir can fail with a `File exist' error in case several
+ # install-sh are creating the directory concurrently. This
+ # is OK.
+- test -d "$pathcomp" || exit
++ test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
+ fi
+ pathcomp=$pathcomp/
+ done
+ fi
+
+ if test -n "$dir_arg"; then
+- $doit $mkdircmd "$dst" \
++ $doit $instcmd "$dst" \
+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+ else
+- dstfile=`basename "$dst"`
++ # If we're going to rename the final executable, determine the name now.
++ if test -z "$transformarg"; then
+