Fix handling of double vertical bar (\'d8) in GCIDE database.
* modules/gcide/idxgcide.l: Allow for \'d8 between and .
Ignore it elsewhere.
* modules/gcide/tests/Makefile.am: Add new tests.
* modules/gcide/tests/def02.at: New file.
* modules/gcide/tests/def03.at: New file.
* modules/gcide/tests/def04.at: New file.
* modules/gcide/tests/def05.at: New file.
* modules/gcide/tests/dict/CIDE.A: Add double bar to a headword.
* modules/gcide/tests/testsuite.at: Include new tests.
2012-01-26 Sergey Poznyakoff
Update .gitignore.
Remove a stray file.
Add Emacs mode markers and keywords to test cases.
Fixes in gcide indexing algorithm. Add module tests.
* modules/gcide/gcide.c (run_idxgcide): Fix idxgcide invocation.
* modules/gcide/idx.c (gcide_idx_file_close): Avoid coredump on
NULL argument.
* modules/gcide/idxgcide.l (i): Rename to letno. All uses updated.
(flush_headwords): Update headword_position even if headword is empty.
(yywrap): Call flush_headwords; reset headword_position to 0.
(main): Remove unnecessary call to flush_headwords, now that is handled
by yywrap.
* modules/gcide/tests/Makefile.am: Add new tests.
* modules/gcide/tests/atlocal.in (PATH): Update.
(DICTDIR,IDXDIR): New variables.
* modules/gcide/tests/all.at: New testcase.
* modules/gcide/tests/autoidx.at: New testcase.
* modules/gcide/tests/def00.at: New testcase.
* modules/gcide/tests/def01.at: New testcase.
* modules/gcide/tests/define.at: New testcase.
* modules/gcide/tests/exact.at: New testcase.
* modules/gcide/tests/idx.at: New testcase.
* modules/gcide/tests/prefix.at: New testcase.
* modules/gcide/tests/testsuite.at: Include new tests.
* modules/gcide/tests/dicod.cfin: New file.
* modules/gcide/tests/dict/CIDE.A: New file.
* modules/gcide/tests/dict/CIDE.B: New file.
* modules/gcide/tests/dict/CIDE.C: New file.
* modules/gcide/tests/dict/CIDE.D: New file.
* modules/gcide/tests/dict/CIDE.E: New file.
* modules/gcide/tests/dict/CIDE.F: New file.
* modules/gcide/tests/dict/CIDE.G: New file.
* modules/gcide/tests/dict/CIDE.H: New file.
* modules/gcide/tests/dict/CIDE.I: New file.
* modules/gcide/tests/dict/CIDE.J: New file.
* modules/gcide/tests/dict/CIDE.K: New file.
* modules/gcide/tests/dict/CIDE.L: New file.
* modules/gcide/tests/dict/CIDE.M: New file.
* modules/gcide/tests/dict/CIDE.N: New file.
* modules/gcide/tests/dict/CIDE.O: New file.
* modules/gcide/tests/dict/CIDE.P: New file.
* modules/gcide/tests/dict/CIDE.Q: New file.
* modules/gcide/tests/dict/CIDE.R: New file.
* modules/gcide/tests/dict/CIDE.S: New file.
* modules/gcide/tests/dict/CIDE.T: New file.
* modules/gcide/tests/dict/CIDE.U: New file.
* modules/gcide/tests/dict/CIDE.V: New file.
* modules/gcide/tests/dict/CIDE.W: New file.
* modules/gcide/tests/dict/CIDE.X: New file.
* modules/gcide/tests/dict/CIDE.Y: New file.
* modules/gcide/tests/dict/CIDE.Z: New file.
* dicod/gsasl.c (callback): Comment out spurious diagnostics.
Test gcide markup and Greek transliteration.
* configure.ac: Configure gcide tests.
* modules/gcide/tests/.gitignore: Update.
* modules/gcide/tests/Makefile.am: Add test cases.
* modules/gcide/tests/atlocal.in: New file.
* modules/gcide/tests/degcide.c: Change command line handling.
Use the same output algorithm as in gcide.c
* modules/gcide/tests/greek.at: New file.
* modules/gcide/tests/markup.at: New file.
* modules/gcide/tests/nopr.at: New file.
* modules/gcide/tests/testsuite.at: New file.
* dicod/cmdline.opt: Minor change.
2012-01-25 Sergey Poznyakoff
gcide: add an option to suppress blocks.
* modules/gcide/ent.c: Recognize : New member.
(gcide_init_db): New option "suppress-pr"
(GOF_IGNORE): New flag.
(GOF_AS): Change constant.
(print_text): Suppress text output if GOF_IGNORE is set.
Set it if is encountered and GCIDE_NOPR flag is set.
(output_def): Initialize clos.flags with the value from db->flags.
* doc/dico.texi: Update.
Minor fix.
Update NEWS.
Update the docs.
Test built-in strategies.
* modules/outline/tests/Makefile.am (TESTSUITE_AT): Add new test files.
* modules/outline/tests/testsuite.at: Inlcude new tests.
* modules/outline/tests/dlev.at: New file.
* modules/outline/tests/dnlev.at: New file.
* modules/outline/tests/nlev.at: New file.
* modules/outline/tests/re.at: New file.
* modules/outline/tests/regexp.at: New file.
* modules/outline/tests/soundex.at: New file.
Add tests for the strategies "word", "substr" and "all".
Update auxiliary files.
Remove top-level tests dir.
* Makefile.am: Remove tests.
* configure.ac: Likewise.
* examples/Makefile.am: Add glossary.scm
* tests/glossary.scm: Move to examples
* tests/.gitignore: Remove.
* tests/Makefile.am: Remove.
* tests/dicod.cfin: Remove.
Add python module test.
* configure.ac: Configure python testdir.
* examples/Makefile.am: Add new files.
* tests/example.text: Move to examples/numerals-cz.txt
* tests/example.py: Move to examples/textdict.py
* modules/python/Makefile.am (SUBDIRS): Add tests.
* modules/python/tests/Makefile.am: New file.
* modules/python/tests/atlocal.in: New file.
* modules/python/tests/define.at: New file.
* modules/python/tests/dicod.cfin: New file.
* modules/python/tests/exact.at: New file.
* modules/python/tests/lev.at: New file.
* modules/python/tests/prefix.at: New file.
* modules/python/tests/showdb.at: New file.
* modules/python/tests/showinfo.at: New file.
* modules/python/tests/showlang.at: New file.
* modules/python/tests/testsuite.at: New file.
Add Levenshtein strategy tests.
* modules/guile/tests/Makefile.am: Add lev.at
* modules/guile/tests/lev.at: New file.
* modules/guile/tests/testsuite.at: Include lev.at
* modules/outline/tests/Makefile.am: Add lev.at
* modules/outline/tests/lev.at: New file.
* modules/outline/tests/testsuite.at: Add lev.at
Add guile tests.
* configure.ac: Configure guile tests.
* examples/listdict.scm: Minor change.
* modules/guile/Makefile.am (SUBDIR): Add tests.
* modules/guile/tests/.gitignore: New file.
* modules/guile/tests/Makefile.am: New file.
* modules/guile/tests/define.at: New file.
* modules/guile/tests/dicod.cfin: New file.
* modules/guile/tests/exact.at: New file.
* modules/guile/tests/prefix.at: New file.
* modules/guile/tests/showdb.at: New file.
* modules/guile/tests/showinfo.at: New file.
* modules/guile/tests/showlang.at: New file.
* modules/guile/tests/suffix.at: New file.
* modules/guile/tests/testsuite.at: New file.
Add outline tests.
* Makefile.am (SUBDIRS): Add examples.
* am/testdir.m4: New file.
* configure.ac: Configure examples/Makefile.am and outline test dir.
* tests/devils.out: Move to examples/devdict.out.
* tests/example.scm: Move to examples/listdict.scm.
* tests/example.db: Move to examples/numerals-pl.ldb
* examples/Makefile.am: New file.
* include/Makefile.am (noinst_HEADERS): Add testsuite.inc
* include/testsuite.inc: New file.
* lib/tests/Makefile.am: Minor change.
* lib/tests/atlocal.in: Likewise.
* modules/outline/Makefile.am (SUBDIRS): Add tests.
* modules/outline/tests/.gitignore: New file.
* modules/outline/tests/Makefile.am: New file.
* modules/outline/tests/atlocal.in: New file.
* modules/outline/tests/define.at: New file.
* modules/outline/tests/dicod.cfin: New file.
* modules/outline/tests/exact.at: New file.
* modules/outline/tests/prefix.at: New file.
* modules/outline/tests/showdb.at: New file.
* modules/outline/tests/showinfo.at: New file.
* modules/outline/tests/showlang.at: New file.
* modules/outline/tests/testsuite.at: New file.
Add tests for list operations.
* include/dico/list.h (dico_list_push): Push to the list tail.
* lib/list.c (dico_list_pop): Pop from the tail.
* lib/tests/.gitignore: Update.
* lib/tests/Makefile.am (noinst_PROGRAMS): Add listop.
(TESTSUITE_AT): Add list.at
* lib/tests/itrsh.c: New file.
* lib/tests/itrsh.h: New file.
* lib/tests/list.at: New file.
* lib/tests/listop.c: New file.
* lib/tests/testsuite.at: Inlcude list.at
2012-01-24 Sergey Poznyakoff
Improvements in gcide and wordnet modules.
* modules/gcide/gcide.c (print_text): Translate tag to {...}.
* modules/wordnet/wordnet.c (WNDB_MERGE_DEFS): New define.
(wndb) : New member.
(wn_option) : Change signature.
(wn_init_db): New boolean option merge-defs instructs module to
merge all available definitions into one.
(wn_output_result,wn_result_count): Handle WNDB_MERGE_DEFS flag.
Bugfix
* lib/list.c (dico_list_pop): Fix return from uninitialized variable.
Cleanup in wordnet code.
2012-01-23 Sergey Poznyakoff
Start writing a testsuite.
* configure.ac: Add lib/tests.
* include/dico/utf8.h (utf8_toupper,utf8_tolower): Change signature.
* lib/Makefile.am (SUBDIRS): New variable.
* lib/utf8.c (utf8_strncasecmp): Fix boundary control.
(utf8_wc_strncmp,utf8_wc_strncasecmp): Likewise.
(utf8_toupper,utf8_tolower): Change signature.
* lib/tests/.gitignore: New file.
* lib/tests/Makefile.am: New file.
* lib/tests/atlocal.in: New file.
* lib/tests/strcasecmp.at: New file.
* lib/tests/strlen.at: New file.
* lib/tests/strncasecmp.at: New file.
* lib/tests/testsuite.at: New file.
* lib/tests/tolower.at: New file.
* lib/tests/toupper.at: New file.
* lib/tests/utf8.c: New file.
* lib/tests/wcstrcasecmp.at: New file.
* lib/tests/wcstrchr.at: New file.
* lib/tests/wcstrcmp.at: New file.
* lib/tests/wcstrncasecmp.at: New file.
* lib/tests/wcstrncmp.at: New file.
* lib/tests/wcstrstr.at: New file.
* tests/levtest.c: move to lib/tests/levtest.c
* lib/tests/dlev00.at: New file.
* lib/tests/dlev01.at: New file.
* lib/tests/lev00.at: New file.
* lib/tests/lev01.at: New file.
Add new utf8 functions.
* lib/utf8.c (utf8_wc_strncmp,utf8_wc_strncasecmp): New functions.
* include/dico/utf8.h: Update.
Provide default selectors for "exact", "prefix" and "suffix" strategies
* dicod/dicod.c: Provide default selectors for "exact","prefix"
and "suffix" strategies.
* modules/dict.org/dictorg.c (_match_simple): Take matcher as
argument.
(mod_match): Use default strategy mapper only if the module does not
provide such strategy.
* modules/outline/outline.c: Likewise.
* modules/wordnet/wordnet.c: Likewise.
2012-01-22 Sergey Poznyakoff
wordnet: change processing of defines.
* modules/wordnet/wordnet.c (wndb) : Remove.
: New members.
(wn_free_db): Free wndb->optv.
(wn_option): New struct.
(wn_optlist): New variable.
(wn_init_db): Change option parsing.
(defn): New struct.
(result): Rewrite. All uses changed.
(wn_create_match_result): Take a pointer to struct wndb as argument.
(wn_is_defined): New function.
(wn_foreach_db): Rewrite. Change signature. All uses changed.
(wn_define): Rewrite.
(format_defn): New function.
(format_synset): Remove.
(wn_output_result): Rewrite result_define part.
Improve dico_list API.
* include/dico/list.h (dico_iterator_remove_current): void.
* lib/list.c (dico_iterator_remove_current): Change return type.
Call _dico_list_remove_item to do the job.
(_dico_list_remove_item): New static.
(_dico_list_remove): Call _dico_list_remove_item.
2012-01-21 Sergey Poznyakoff
Add wordnet module.
* configure.ac: New option --with-wordnet.
* modules/Makefile.am [WORDNET_COND] (WORDNET_DIR): New variable.
(SUBDIRS): Add WORDNET_DIR.
* modules/wordnet/Makefile.am: New file.
* modules/wordnet/wordnet.c: New file.
Fix dico_list_insert_sorted.
* lib/list.c (_dico_list_insert_sorted): Fix coredump.
If flags are set and the matching item is already in the list, return
EEXIST.
2012-01-20 Sergey Poznyakoff
gcide: support tags.
2012-01-19 Sergey Poznyakoff
Update the docs.
Assorted fixes.
* dicod/main.c (main): Call dicod_log_setup after config_parse, so that
configuration settings take effect.
* modules/gcide/idxgcide-cli.opt: --dry-run implies --verbose.
2012-01-18 Sergey Poznyakoff
Bugfixes.
* dicod/Makefile.am: Restore incdir.
* dicod/server.c (open_sockets): Fix default sockaddr initialization.
gcide: Fix umlauts, remove CRs.
* modules/gcide/ent.c: Fix umlauts ("xum", not "xuml")
* modules/gcide/markup.l: Remove CRs.
Bugfix
* modules/gcide/gcide.c (gcide_output_result): Fix match output.
Improve idxgcide command line interface.
* modules/gcide/.gitignore: Update.
* modules/gcide/Makefile.am (idxgcide_SOURCES): Add idxgcide-cli.h
Build it from idxgcide-cli.opt.
(idxgcide_LDADD): Add libgnu and libxdico.
* modules/gcide/idxgcide-cli.opt: New file.
* modules/gcide/idxgcide.l: Include idxgcide-cli.h, use
get_options for command line parsing.
* po/POTFILES.in: Add files from modules/gcide.
Improve greek transliterator.
* configure.ac: Build modules/gcide/tests/Makefile.
* modules/gcide/Makefile.am (SUBDIRS): Add tests.
* modules/gcide/ent.c: Add digamma.
* modules/gcide/gcide.c (print_text): Fix output of quotes.
* modules/gcide/grk.c: Add more sequences.
* modules/gcide/markup.l: Fix handling of comments.
* modules/gcide/degcide.c: Move to tests.
* modules/gcide/greek.c: Likewise.
* modules/gcide/tests/exgrk.c: New file.
Convert Greek transliteration back to Greek. Remove markup when printing definitions.
* modules/gcide/Makefile.am (libgcide_la_SOURCES): Add grk.c
(noinst_PROGRAMS): Add greek.
* modules/gcide/ent.c: Fix a typo.
* modules/gcide/gcide.c (output_def): Convert markup to plain text.
* modules/gcide/gcide.h (gcide_grk_to_utf8): New proto.
* modules/gcide/grk.c: New file.
* modules/gcide/greek.c: New file.
* modules/gcide/markup.l: Preserve ["*'] in tags.
Implement GCIDE markup parser.
* lib/list.c (dico_list_pop): Return NULL if the list is empty.
* modules/gcide/Makefile.am (libgcide_la_SOURCES): Add markup.l
* modules/gcide/degcide.c: New file.
* modules/gcide/markup.l: New file.
* modules/gcide/gcide.h: Include dico.h
(gcide_content_type): New enum.
(gcide_tag,gcide_parse_tree): New structs.
(gcide_markup_debug): New extern.
(gcide_markup_parse,gcide_parse_tree_free)
(gcide_parse_tree_inorder): New functions.
2012-01-17 Sergey Poznyakoff
Allow simple-statement form for load-module.
* dicod/main.c (load_module_cb): Accept simple statement form with
string or list as argument.
* NEWS: Document new usage.
* doc/dico.texi: Likewise.
* tests/dicod.cfin: Use new syntax.
* README: Update.
gcide: handle entities in headwords.
* modules/gcide/ent.c: Bugfixes.
* modules/gcide/idxgcide.l: Handle <../ entities in headwords.
Report unknown entities.
gcide: support alternative headwords.
* modules/gcide/idxgcide.l (endtag): New variable.
(headword): Remove global.
(flush_headwords): Initialize headword.
(BEGIN_HEADWORD): New macro.
: Handle asp and altname tags.
(main): Call flush_headwords unconditionally.
2012-01-16 Sergey Poznyakoff
Add GCIDE support.
* configure.ac (AC_CONFIG_FILES): Add modules/gcide/Makefile.
* modules/Makefile.am (SUBDIRS): Add gcide.
* modules/gcide/.gitignore: New file.
* modules/gcide/Makefile.am: New file.
* modules/gcide/gcide.c: New file.
* modules/gcide/gcide.h: New file.
* modules/gcide/idx.c: New file.
* modules/gcide/idxgcide.l: New file.
* modules/gcide/webchr.c: New file.
* modules/gcide/ent.c: New file.
* modules/template.c: Bugfixes.
2012-01-14 Sergey Poznyakoff
Updates.
* THANKS: Update.
* modules/template.c: Add result_headers method.
* modules/template.scm: Likewise.
2012-01-13 Sergey Poznyakoff
Assorted fixes.
* modules/ldap/ldap.c (_dico_ldap_expand_user): Use wordsplit.
* grecs: Upgrade.
* doc/dico.texi: Update.
2012-01-10 Sergey Poznyakoff
Minor change.
* dicod/main.c (config_parse): Exit if grecs_error_count is gt 0.
Minor change
Raise version number to 2.1.90; Other housekeeping.
* NEWS: Raise version number.
* configure.ac: Likewise.
* doc/Makefile.am (check-options): Fix second regexp.
* doc/dico.texi: Use @WRITEME to mark empty nodes.
* doc/rendition.texi: Delete (complements 50c7e46c).
Use wordsplit instead of dico_argcv.
* dico/autologin.c (parse_autologin): Rewrite using wordsplit.
* dico/dico-priv.h: Include wordsplit.h
* dicod/dicod.h: Likewise.
* dico/saslauth.c (get_implemented_mechs): Use wordsplit.
* dico/shell.c (_command_completion): Likewise.
* dicod/gsasl.c (register_sasl): Likewise.
* dicod/loader.c (dicod_load_module): Likewise.
* dicod/main.c (set_dict_handler): Likewise.
* modules/guile/guile.c (guile_load): Likewise.
* modules/ldap/ldap.c (db_open): Likewise.
* modules/guile/Makefile.am (INCLUDES): Add @GRECS_INCLUDES@
* modules/ldap/Makefile.am: Likewise.
* modules/outline/Makefile.am: Likewise.
* modules/outline/outline.c (outline_lang): Likewise.
Incorporate Grecs into libdico.
* grecs: Update.
* configure.ac (GRECS_SETUP): Use the "shared" option.
* lib/Makefile.am (libdico_la_LIBADD): Incorporate libgrecs
* dico/Makefile.am (LDADD): Remove @GRECS_LDADD@.
* dicod/Makefile.am: Likewise.
Minor changes.
* grecs: Update.
* po/POTFILES.in: Update.
Install pp-setup from Grecs.
* configure.ac (GRECS_SETUP): Use std-pp-setup option.
* dicod/Makefile.am: Remove pp-setup.
* dicod/pp-setup: Remove.
2012-01-09 Sergey Poznyakoff
Use Grecs instead of the built-in configuration parser.
Grecs is a convenience library for parsing sructured configuration files.
It derived from the dicod and wydawca parsers in 2009. It has already
reached stable status and is now used by quite a few other projects.
* .gitmodules: Add Grecs
* Makefile.am: Likewise.
* configure.ac: Likewise.
* dico/Makefile.am (LDADD,INCLUDES): Add Grecs.
* dico/cmdline.opt (OPTIONS_BEGIN): Rewrite.
* dicod/Makefile.am (dicod_SOURCES): Remove pp.c, config-format.c,
config-gram.y and config-lex.l. Add lint.c
* dicod/acl.c: Use Grecs.
* dicod/alias.c (alias): Remove const.
: Change type.
(alias_install): Allocate kw.
* dicod/cmdline.opt (OPTIONS_BEGIN): Rewrite.
* dicod/config-format.c: Remove.
* dicod/config-gram.y: Remove.
* dicod/config-lex.l: Remove.
* dicod/lint.c: New file.
* dicod/dicod.h: Remove configuration parser types and definitions.
* dicod/gsasl.c (cmp_names): List contains now pointers to strings.
* dicod/loader.c (_add_load_dir): Likewise.
* dicod/main.c: Rewrite configuration parser using Grecs.
* dicod/server.c (open_sockets): Operate on grecs_sockaddr structs.
* gnulib.modules (gitlog-to-changelog): Remove.
* include/appi18n.h: Redefine _ and N_ only if necessary.
* utils/Makefile.am (EXTRA_DIST): Remove getopt.m4
* utils/getopt.m4: Remove.
* README-hacking: Update.
Implement "word" matching strategy.
* configure.ac: Build modules/word/Makefile.
* modules/Makefile.am (SUBDIRS): Add word.
* modules/word/Makefile.am: New file.
* modules/word/word.c: New file.
* doc/dico.texi: Document new module.
Move UTF-8 tokenizer to libdico.
* lib/tokenize.c: Rewrite.
* lib/xtkn.c: New file.
* lib/Makefile.am (libdico_la_SOURCES): Add tokenize.c
(libxdico_a_SOURCES): Remove tokenize.c, add xtkn.c.
* include/dico.h: Include dico/tokenize.h
* include/dico/tokenize.h: New file.
* include/dico/Makefile.am (pkginclude_HEADERS): Add tokenize.h
* include/xdico.h: Remove xdico tokenizer interface.
(xdico_tokenize_string): New proto.
* dico/connect.c (_result_parse_def): Use new tokenizer.
* dico/shell.c (parse_script_file): Likewise.
* dicod/dicod.c (dicod_loop): Likewise.
* dicod/config-lex.l (unescape_to_obstack): Use dico_unquote_char.
Happy GNU Year
2011-10-08 Sergey Poznyakoff
Use Imprimatur to check the docs.
* .gitmodules: Add imprimatur.
* Makefile.am (ACLOCAL_AMFLAGS,SUBDIRS): Add imprimatur.
* configure.ac: Call IMPRIMATUR_INIT.
* doc/Makefile.am: Use imprimatur. Drop files that are
no longer necessary.
* doc/check-docs.sh: Delete.
* doc/mastermenu.el: Delete.
* doc/untabify.el: Delete
* doc/dico.texi: Fix sentence spacing, use @: where appropriate.
* doc/strftime.texi: Likewise.
2011-02-15 Sergey Poznyakoff
Bugfixes.
* configure.ac (AC_CHECK_HEADERS): Check for sys/socket.h and socket.h.
* dicod/Makefile.am: Add $(AM_V_GEN) where needed.
* tests/Makefile.am: Likewise.
* dicod/main.c (main): Flush capabilities after loading all modules and
configuring authentication database. Take care not to switch to syslog
if --lint was given.
2010-11-13 Sergey Poznyakoff
Minor changes.
New strategy: pcre (perl-compatible regex).
* am/lib.m4: New file
* configure.ac: Check for libpcre.
* modules/pcre/Makefile.am: New file.
* modules/pcre/pcre.c: New file.
* modules/Makefile.am [PCRE_COND] (PCRE_DIR): Initialize to pcre.
(SUBDIRS): Add $(PCRE_DIR).
2010-11-13 Wojciech Polak
Switch to Django's cache framework (from direct Memcached).
* dicoweb/dicoclient/dicoclient.py: Minor code changes.
* dicoweb/dicoclient/dicoshell.py: Likewise.
* dicoweb/settings-sample.py: Add sample CACHE_BACKEND.
* dicoweb/views.py: Use Django's cache framework.
2010-11-13 Sergey Poznyakoff
Minor fix.
* dicod/regex.c (basic_flags): Remove REG_EXTENDED.
2010-08-19 Sergey Poznyakoff
Partially revert commit c4db582a8c.
As reported by Ahmed, it actually broke the previous solution.
See http://mail.gnu.org.ua/mailman/listarchive/bug-dico/last/msg00000.html,
for details.
2010-08-01 Wojciech Polak
Add "robots" meta value depending on the context.
* dicoweb/templates/base.html: Add page.robots.
* dicoweb/views.py: Set "robots" value.
2010-07-10 Wojciech Polak
Minor changes in mediawiki.py.
2010-07-10 Sergey Poznyakoff
Minor fix.
* app/python/mediawiki.py: Enforce utf-8 encoding.
2010-07-07 Sergey Poznyakoff
Version 2.1
* NEWS, README, THANKS: Update.
* configure.ac: Raise version number.
* lib/Makefile.am (libdico_la_LDFLAGS): Update.
Minor change
* modules/python/python.c: Fix indentation.
Improve mediawiki matching.
* app/python/mediawiki.py (match_word): Use strat selector,
if it is available. Return sorted results. Make sure the
[0] of the result is 'match' (to avoid misinterpreting
eventual match results for the word 'define').
Minor changes
* NEWS: Update.
* modules/template.scm (match-word): Fix definition.
* po/POTFILES.in: Add new files.
* tests/Makefile.am (EXTRA_DIST): Add example.py
2010-07-02 Sergey Poznyakoff
Version 2.0.92
* configure.ac, NEWS: Version 2.0.92
* doc/dico.texi: Document LDAP.
* dicod/main.c: Minor fix.
Fix typos in debugging messages.
Use encrypted passwords for authentication, if the underlying GSASL mechanism allows that.
* configure.ac: Cjeck for crypt.h and -lcrypt.
* dicod/ckpass.c: New file.
* dicod/Makefile.am (dicod_SOURCES): Add ckpass.c
* dicod/dicod.h (dicod_check_password): New proto.
* dicod/gsasl.c (cb_validate): Use dicod_check_password
instead of comparing plaintext passwords.
* dicod/ident.c (decode64_buf): Remove.
(ident_decrypt): Use dico_base64_decode.
* dicod/main.c (user_db_config): Don't attempt to
open uninitialized database.
* gnulib.modules: Add crypto/sha1
* include/dico/filter.h (dico_base64_decode)
(dico_base64_encode, dico_base64_input): Change signature.
(dico_qp_decode, dico_qp_encode): Remove.
* lib/base64.c (dico_base64_input): Rewrite.
(dico_base64_decode): Rename to static _flt_base64_decode.
(dico_base64_encode): Rename to static _flt_base64_encode.
(dico_base64_decode,dico_base64_encode): New functions.
* lib/qp.c (dico_qp_decode, dico_qp_encode): Static.
2010-07-01 Sergey Poznyakoff
Bugfix
* modules/ldap/ldap.c (db_get_groups): Fix typo.
Implement LDAP user database.
* configure.ac: Check for openldap.
* dicod/Makefile.am (dicod_SOURCES): Remove udb.c
* dicod/udb.c: Move to lib (with changes).
* dicod/auth.c: Update calls to dico_udb_ * functions.
* dicod/gsasl.c: Likewise.
* dicod/dbtext.c (dbtext_open): Add 3rd parameter.
(text_udb_def): Change type.
* dicod/dicod.h (udb_def): Remove struct.
(dicod_user_db_t)
(user_db, udb_init, udb_create, udb_open)
(udb_close, udb_get_password, udb_get_groups)
(udp_define): Remove. See dico/udb.h
* dicod/loader.c (dicod_load_module): Minor fix.
* dicod/main.c (user_db): Change data type.
(kwd_user_db): New keyword "options".
(user_db_config): Do not create user database at
once, wait untill the modules have been loaded.
(init_user_db): New function.
(main): Call init_user_db.
* dicod/ostream.c (ostream_write): Remove unused
variable.
* include/dico.h: Include udb.h
* include/dico/Makefile.am (pkginclude_HEADERS): Add udb.h
* lib/Makefile.am (libdico_la_SOURCES): Add udb.c.
* modules/Makefile.am [LDAP_COND] (LDAP_DIR): New variable.
(SUBDIRS): Add LDAP_DIR
* modules/ldap/ldap.c: New file.
* modules/ldap/Makefile.am: New file.
2010-06-30 Sergey Poznyakoff
Allow the use of an external strategy as the default one.
* dicod/main.c (default_strategy_name): New variable.
(set_defstrat): Remove.
(keywords): Change handling of the default-strategy statement.
(main): Set default strategy after all modules have been loaded,
to allow for using external strategies.
2010-06-29 Sergey Poznyakoff
Update docs.
2010-06-28 Sergey Poznyakoff
Minor fix.
* am/gsasl.m4: Use AC_CACHE_VAL instead of AC_CACHE_CHECK.
2010-06-27 Sergey Poznyakoff
* configure.ac: Distribute bz2 and xz tarballs.
Improve the previous commit.
* include/dico/strat.h (dico_key): New struct.
(dico_key_deinit, dico_key_init)
(dico_key_match): New proto.
* include/dico/types.h (dico_select_key): Moved to
strat.h as dico_key, with edits.
(dico_select_t): Change signature.
* lib/key.c: New file.
* lib/Makefile.am (libdico_la_SOURCES): Add key.c
* modules/dict.org/dictorg.c: Reflect recent changes.
Use dico_key_* functions.
* modules/guile/guile.c: Likewise.
(dico-key?, dico-key->word, dico-make-key): New functions.
* modules/outline/outline.c: Reflect recent changes.
Use dico_key_* functions.
* modules/python/python.c: Reflect recent changes.
Use dico_key_* functions.
* dicod/dicod.c (soundex_sel): Reflect recent changes.
* dicod/lev.c (lev_sel): Likewise.
* dicod/regex.c (regex_sel): Likewise.
* modules/stratall/stratall.c: Likewise.
* modules/substr/substr.c: Likewise.
* app/python/mediawiki.py (match_word): Likewise.
* tests/example.scm: Likewise.
* tests/dicod.cfin: Load stratall and substr.
Change strategy selector calling convention.
Strategy selectors often need to keep selection specific data, i.e.
such data that remain in effect (although not necessarily invariant)
between DICO_SELECT_BEGIN and DICO_SELECT_END calls. These data do
not belong to the strategy itself, therefore it is necessary to introduce
a specific data type for them.
An example of a strategy that uses this approach is regexp, which needs to
store the compiled expression somewhere.
* dicod/dicod.c (soundex_sel): Change signature. Use
key->call_data to keep call-specific data.
* dicod/lev.c (lev_sel): Likewise.
* dicod/regex.c (regex_sel): Likewise.
* include/dico/types.h (dico_select_key): New struct.
(dico_select_t): Change signature. Take struct dico_select_key *
as 2nd arg.
* modules/dict.org/dictorg.c (_match_all): Rewrite to use new
calling sequence.
* modules/guile/guile.c (_guile_select_key_tag): New tag.
(dico_scm_from_select_key): New function.
(_guile_select_key_free, _guile_select_key_print): New methods.
(_guile_init_select_key): New function.
(dico-select-key?, dico-select-key-word): New functions.
(dico-strat-select?): Key is either a string or a selection key.
(_guile_selector): Rewrite to use new calling sequence.
(mod_match): Likewise.
* modules/outline/outline.c (outline_match_all): Rewrite to use new
calling sequence.
* modules/python/python.c (PySelectionKey): New object.
(strat_select_method): Rewrite to use new
calling sequence.
(_python_selector): Likewise.
(mod_match): Likewise.
* modules/stratall/stratall.c (all_sel): Rewrite to use new
calling sequence.
* modules/substr/substr.c (substr_sel): Likewise.
* tests/example.py (match_word): 3rd arg is a selection key.
* tests/example.scm (match-selector): 3rd arg is a selection key.
(match-word): Update.
Move Guile support to gint.
* am/guile.m4: Remove
* gint: New module.
* bootstrap.conf: Unconditionally call git submodules.
* Makefile.am: Use gint.
* configure.ac: Likewise.
* modules/guile/Makefile.am: Likewise.
* modules/guile/guile.c: Use SCM_DEFINE_PUBLIC everywhere.
(_guile_init_funcs): Include guile.x instead of declaring the
stuff manually.
(all functions): Use lowercase parameter names. Refer to them
in docstrings using @var.
* modules/guile/.gitignore: New file.
Bugfixes.
* include/dico/utf8.h (utf8_wc_strchr)
(utf8_wc_strchr_ci, utf8_wc_strstr): Fix return types.
* lib/utf8.c: Likewise.
Improve conditional module builds.
* configure.ac (GUILE_COND,PYTHON_COND): New conditionals.
(BUILD_DICO_GUILE_MODULES)
(BUILD_DICO_PYTHON_MODULES): Remove.
* modules/Makefile.am [GUILE_COND]: Define GUILE_DIR.
[PYTHON_COND]: Define PYTHON_DIR.
(SUBDIRS): add $(GUILE_DIR) and $(PYTHON_DIR) instead
of the literal dirs.
* modules/guile/Makefile.am: Define mod_LTLIBRARIES unconditionally.
* modules/python/Makefile.am: Likewise.
Implement `substr' strategy. Re-implement the `all' strategy as a module.
* configure.ac: Version 2.0.91
(AC_CONFIG_FILES): Add Makefiles in modules/stratall/
and modules/substr.
* NEWS: Version 2.0.91
* dicod/dicod.c: Remove the built-in `all' strategy.
* dicod/loader.c (dicod_load_module0): If DICO_CAPA_NODB
capability is set, the module must have only the dico_init
method.
(dicod_init_database): Prohibit the use of DICO_CAPA_NODB
modules.
* include/dico/types.h (DICO_CAPA_NODB): New capability.
* include/dico/utf8.h (utf8_wc_strchr, utf8_wc_strchr_ci)
(utf8_wc_strstr, utf8_wc_strupper)
(utf8_wc_strlower): New prototypes.
* lib/utf8.c (utf8_wc_strchr, utf8_wc_strchr_ci)
(utf8_wc_strstr, utf8_wc_strupper)
(utf8_wc_strlower): New functions.
* modules/Makefile.am (SUBDIRS): Add stratall and substr.
* modules/stratall/Makefile.am: New file.
* modules/stratall/stratall.c: New file.
* modules/substr/Makefile.am: New file.
* modules/substr/substr.c: New file.
* tests/dicod.cfin: Use prepend-load-path.
Bugfixes.
* modules/guile/guile.c (scm_dico_strat_select_p): Swap
key and word arguments in a call to sel.
* modules/python/python.c (strat_select_method): Likewise.
* tests/example.scm: Use srfi-1.
Use filter-map instead of mapcan.
(match-selector): : Swap key and word arguments in a call to
dico-strat-select?
2010-06-26 Sergey Poznyakoff
New configuration statement "prepend-load-path".
* dicod/dicod.h (prepend_load_path): New extern.
* dicod/loader.c (dicod_loader_init): Add prepend_load_path
before DICO_MODDIR.
* dicod/main.c (prepend_load_path): New variable.
(keywords): New keyword.
* NEWS, doc/dico.texi: Update.
Fix counting output octets in dicod.
* include/dico/stream.h (DICO_IOCTL_BYTES_IN)
(DICO_IOCTL_BYTES_OUT): New ioctls.
* lib/stream.c (dico_stream_bytes_in)
(dico_stream_bytes_out): First try ioctl. If it
fails, return bytes_in (bytes_out).
* lib/fltstream.c (filter_flush): Reset level to 0.
(filter_ioctl): New function.
(filter_stream_create): Set ioctl method.
* lib/gsaslstr.c (_gsasl_ioctl): New function.
(dico_gsasl_stream): Set ioctl method.
* lib/xscript.c (transcript_ioctl): Handle
DICO_IOCTL_BYTES_IN and DICO_IOCTL_BYTES_OUT.
* dicod/loader.c (dicod_match_word_db)
(dicod_match_word_all, print_definitions): Update total_bytes_out.
* dicod/ostream.c (ostream): New member.
(ostream_write): Don't modify total_bytes_out.
(ostream_ioctl): New function.
(dicod_ostream_create): Initialize nout to the number of octets
output so far by the transport stream.
Set ioctl method.
2010-06-25 Sergey Poznyakoff
Bugfixes.
* dicod/loader.c (dicod_load_module0): Save handle.
* lib/stream.c (dico_stream_seek, dico_stream_read)
(dico_stream_write): Return immediately if the stream
is in permanent error state.
* lib/xscript.c (transcript_close): Close both underlying
streams.
2010-05-24 Sergey Poznyakoff
Speed up output procedure in dictorg.
Provide a general-purpose mechanism to address iterators by item
number in O(|n-pos|) time.
* include/dico/list.h (dico_iterator_prev)
(dico_iterator_item, dico_iterator_position): New prototypes.
* lib/list.c (list_entry) : New member.
(iterator) : New member.
(dico_iterator_position): New function.
(_iterator_increase_pos): New static.
(dico_iterator_first): Initialize pos to 0.
(dico_iterator_next): Increase pos.
(dico_iterator_prev,dico_iterator_item): New function.
(_dico_list_append): Initialize ep->prev.
(_dico_list_prepend): Initialize ep->prev. Call
_iterator_increase_pos to tell iterators to update their recorded positions.
(_dico_list_remove): Rewrite removal code using next & prev pointers.
(_dico_list_insert_sorted): Update next & prev pointers.
Call _iterator_increase_pos.
* modules/dict.org/dictorg.h (result) : New member.
* modules/dict.org/dictorg.c (common_match)
(suffix_match, _match_all): Initialize itr.
(mod_output_result): Use iterator to avoid rescanning the list
on each call.
(mod_free_result): Destroy the iterator.
* lib/utf8.c (utf8_strcasecmp, utf8_strncasecmp): Break the loop if
alen or blen is zero. This means that one of the operands is not
utf8, but try to return meaningful value anyway.
2010-05-23 Sergey Poznyakoff
Housekeeping work.
* NEWS: Document new features and bugfixes.
* dico/.gitignore, tests/.gitignore: Update.
2010-05-23 Wojciech Polak
Improve Dicoweb.
* dicoweb/dicoclient/dicoclient.py (define): Allow for empty
descriptions in response.
* dicoweb/static/opensearch.xml: Move to templates and make it dynamic.
* dicoweb/views.py (opensearch): Add view.
2010-05-23 Sergey Poznyakoff
Filter out duplicate matches.
* include/dico/list.h (DICO_LIST_COMPARE_HEAD)
(DICO_LIST_COMPARE_TAIL): New define.
(dico_list_set_flags)
(dico_list_get_flags): New proto.
* lib/list.c (dico_list): New member.
(dico_list_create): Initialize flags.
(dico_list_set_flags)
(dico_list_get_flags): New functions.
(_dico_list_append,_dico_list_prepend): New auxiliary
functions.
(dico_list_append,dico_list_prepend): Rewrite. Use
flags to define whether to compare the data with
the tail (head). Set errno to EEXIST and return 1
if attempting to add a duplicate entry.
(_dico_list_insert_sorted): Use _dico_list_append and
_dico_list_prepend instead of their public counterparts.
* modules/dict.org/dictorg.c (common_match): Take additional
argument that defines whether duplicate entries should be
filtered out. All callers updated.
(suffix_match,_match_all): Filter out duplicates.
(mod_define): Call common with unique=0.
2010-05-23 Wojciech Polak
Minor Dicoweb changes.
* dicoweb/settings.py: Rename to settings-sample.py
* dicoweb/static/dicoweb.js: Bugfix.
* dicoweb/static/dicoweb.css: Minor changes.
* dicoweb/templates/base.html: Likewise.
* dicoweb/templates/index.html: Likewise.
2010-05-23 Sergey Poznyakoff
Minor fixes.
* configure.ac: Version 2.0.90
Call gl_INIT before checking for data types.
Check for socklen_t.
* NEWS: Version 2.0.90
* dico/connect.c (dict_auth): Return 1 if everything else
fails.
* dico/dico-priv.h (print_version, print_version_only): New protos.
* dicod/dicod.h (server_addrlen, client_addrlen): Change type to
socklen_t.
* dicod/server.c (dicod_server): Change type of addrlen to
socklen_t.
* include/dico/utf8.h (utf8_char_width, utf8_iter_first)
(utf8_wctomb, utf8_symcmp, utf8_symcasecmp, utf8_strcasecmp)
(utf8_strncasecmp): Use (unqualified) char in argument lists.
All uses updated.
* lib/utf8.c: Likewise.
* dico/lookup.c: Silence gcc warnings about diff in signedness.
* dicod/ident.c: Likewise.
* lib/tokenize.c: Likewise.
* lib/xstream.c: Likewise.
* modules/dict.org/dictorg.c: Likewise.
* modules/dict.org/dictstr.c: Likewise.
* modules/outline/outline.c: Likewise.
* modules/guile/guile.c: Remove unused functions and variables.
* utils/getopt.m4 (print_help): Avoid gcc warning about condition
always true.
Fix indentation in lib/utf8.c
Avoid using fixed-size buffer in dictorg.c.
Fixes bug reported by Marc Dequènes (debian #582708).
* modules/dict.org/dictorg.c (read_index): Use dico stream instead
of FILE to avoid using fixed-size buffer.
Fix improper handling of conversion errors in levenshtein.c (debian #582692)
* include/dico/utf8.h (utf8_mbstr_to_wc)
(utf8_mbstr_to_norm_wc): Change signature.
* lib/utf8.c (utf8_mbstr_to_wc)
(utf8_mbstr_to_norm_wc): Take additional return argument.
Return error code. All callers updated.
* lib/levenshtein.c (dico_levenshtein_distance): conv
returns non-zero (not necessarily negative) value on errors.
Minor fixes.
* include/dico/strat.h (dico_get_default_strategy): Remove const
from return type.
* lib/strat.c (dico_get_default_strategy): Likewise.
* lib/fdstream.c (fd_seek): Fix error condition.
* lib/fltstream.c (filter_write): Return error code.
* lib/stream.c (dico_stream_read_unbuffered): Initialize rc.
2010-05-01 Sergey Poznyakoff
Bugfixes.
* dicod/main.c: Fix recursive invocation.
* dicod/pp.c (preprocess_config): Terminate debugging message with a \n.
2010-04-07 Wojciech Polak
Minor fix.
* dicoweb/views.py: Fix the list of accepted languages.
2010-03-29 Sergey Poznyakoff
Minor fix.
* doc/dico.texi: Fix typos and improper uses of @pxref.
2010-03-26 Sergey Poznyakoff
Normalize exit codes.
* gnulib.modules: Add sysexits
* lib/xalloc-die.c: Exit with code EX_OSERR.
* utils/getopt.m4 (GETOPT): Provide optional `opterr' argument.
* dicod/cmdline.opt (get_options): Exit with EX_USAGE in
case of unhandled option.
* dicod/config-lex.l: Move includes to the '%top' block.
Define YY_EXIT_FAILURE.
* dicod/dicod.c (sig_alarm): Exit with EXIT_TIMEOUT.
* dicod/dicod.h: Include sysexits.h.
* dicod/main.c (main): Normalize exit codes.
* dicod/pp.c: Likewise.
* dicod/server.c: Normalize exit codes.
(print_status): Handle 'time out' exit code separately.
Print informational message.
* doc/dico.texi (Exit Codes): New section.
* NEWS: Update.
2010-03-14 Sergey Poznyakoff
Do not use deprecated/internal Guile features.
* am/guile.m4 (MU_CHECK_GUILE): Remove leftovers
from pre-1.8 times.
Check for SCM_DEVAL_P, SCM_BACKTRACE_P,
SCM_RECORD_POSITIONS_P and SCM_RESET_DEBUG_MODE,
define GUILE_DEBUG_MACROS if all these are available.
Check for scm_t_off (Guile 1.9)
* modules/guile/guile.c (apply_data): New struct.
(apply_catch_body): New function.
(eval_catch_body): Remove.
(guile_call_proc): Use apply_catch_body as body.
![HAVE_SCM_T_OFF]: Define scm_t_off.
(_make_dico_port): Rewrite using scm_new_port_table_entry.
(_dico_port_seek): Change prototype. Second arg is scm_t_off.
(mod_init)[GUILE_DEBUG_MACROS]: Protect the use of
SCM_DEVAL_P and friends.
(all functions): Use scm_from_locale_string instead
of the deprecated scm_makfrom0str.
2010-03-09 Sergey Poznyakoff
Keep namespace clean.
* modules/dict.org/crc.h: Prefix all function
names with `dicod_' to avoid name clashes.
2010-01-02 Sergey Poznyakoff
Update copyright years.
Happy GNU Year!
2009-11-05 Wojciech Polak
Improve mediawiki.py
* app/python/mediawiki.py: Drop ns_mediawiki usage.
2009-10-29 Sergey Poznyakoff
Fix doc/Commit
* doc/Commit (gray_print_section): Output anchors before
chapter/section/etc. titles, so that the heading menu in
monolithic document works properly.
2009-10-23 Sergey Poznyakoff
Documentation fixes.
* Config: New file.
* doc/Makefile.am: Make manual a phony target.
Add man-tar rule.
* doc/dico.texi: Minor changes to improve html
output.
* doc/gendocs_template: Rewrite for the new site
design.
2009-10-18 Wojciech Polak
Simplify dicoweb.wsgi.
2009-10-16 Wojciech Polak
Simplify dicoweb settings.
* dicoweb/settings.py: Automatically determine paths.
2009-10-14 Sergey Poznyakoff
Fix ACL code.
* dicod/acl.c (_parse_sockaddr): Fix netmask calculation.
(_check_sockaddr): Fix comparison for AF_INET.
2009-09-27 Sergey Poznyakoff
Minor changes
* Makefile.am: Update ChangeLog rule
* configure.ac: Require autoconf 2.63, automake 1.11.
Enable silent rules.
* dico/connect.c (dict_match): Properly handle successful return
from XLEV command.
2009-03-29 Sergey Poznyakoff
Version 2.0
* configure.ac: Version 2.0
* Makefile.am (make-ChangeLog): Remove rule
* NEWS, README: Update.
* doc/dico.texi: Update.
2009-03-28 Sergey Poznyakoff
Minor fix
2009-03-14 Sergey Poznyakoff
Minor fixes
2009-03-09 Sergey Poznyakoff
Use git:// url for wit
Various organizational changes
* bootstrap.conf: Init and update wit submodule.
* configure.ac: Version 1.99.97
(AC_INIT): Spell full name as 'GNU dico' (lowercase), in order to help
the `po' machinery recognize the project as official GNU one
(po/Makefile.in.in uses a primitive `grep 'GNU @PROJECT@' ../*', so
actually any file containing this string would do).
* NEWS: Update.
* Makefile.am (SUBDIRS): Remove makedict. It is not yet needed.
(EXTRA_DIST): Add app and dicoweb.
* po/POTFILES.in: Remove makedict.
* dicod/acl.c: Provide a translators comment.
* modules/dict.org/dictorg.c: Fix typo.
2009-03-08 Wojciech Polak
Add mediawiki.py -- a Python module for a remote access to Wikipedia.
Add Dicoweb -- a web search interface.
2009-01-13 Sergey Poznyakoff
Change documentation license to GFDLv1.3+
2008-12-20 Sergey Poznyakoff
Minor fix.
* dico/cmdline.opt: Fix --sasl and --nosasl definitions.
Remove --strats alias. Use --strat(egies) instead.
2008-12-19 Sergey Poznyakoff
Fix qp
Base64 fix.
* lib/base64.c (dico_base64_encode): Fix calculation of the number of
consumed bytes.
Fix filter encoding.
* include/dico/filter.h (filter_xcode_t): Remove last two parameters.
Filter stream is now responsible for keeping track of line widths.
(dico_base64_decode,dico_base64_encode)
(dico_qp_decode,dico_qp_encode): Update.
* lib/base64.c (dico_base64_decode): Remove line_max and pline_len.
(dico_base64_encode): Likewise.
(dico_base64_stream_create): Set minimal input length to 3.
It is valid for encoding. Decoding remains a fixme.
* lib/qp.c (dico_qp_decode, dico_qp_encode): Remove last two parameters.
* lib/fltstream.c (struct filter_stream): New members inbuf and inlevel.
(filter_flush): New function. Keep track of line lengths.
(filter_write0): New function.
(filter_write,filter_wr_flush): Rewrite using filter_flush.
(filter_stream_destroy): New method.
(filter_stream_create): Initialize inbuf and inlevel.
* dicod/ident.c: Update call to dico_base64_decode.
2008-12-18 Wojciech Polak
Implement dico_result_headers in Python module.
* modules/python/python.c (_assoc_to_dict, _dict_to_assoc,
mod_result_headers): New functions.
* modules/template.py (result_headers): New optional method.
2008-12-17 Sergey Poznyakoff
Allow modules to return or modify MIME headers for definition results.
* dicod/loader.c (print_definitions): Use mp->dico_result_headers
to get headers from the module.
(mime_headers_cb): Allow 8bit encoding.
* dicod/ostream.c: Handle 8bit encoding.
* include/dico/assoc.h (dico_assoc_clear, dico_assoc_dup): New prototypes.
* include/dico/list.h (dico_list_clear): New prototype.
* include/dico/types.h (struct dico_database_module): New method
dico_result_headers.
* lib/assoc.c (dico_assoc_clear, dico_assoc_dup): New functions.
(_dico_assoc_find_n): Allow for assoc==NULL.
(dico_assoc_destroy): Likewise.
* lib/header.c (dico_header_parse): Allow for text==NULL.
* lib/list.c (dico_list_clear): New function.
(dico_list_destroy): Use dico_list_clear.
(dico_iterator_remove_current): Bugfix: use default comparator.
* modules/guile/guile.c: Implement dico_result_headers.
* tests/example.scm: Likewise.
2008-12-16 Sergey Poznyakoff
Rewamp list and assoc support. Keep MIME headers in an assoc list.
* include/dico/assoc.h (struct dico_assoc): Key is const
(DICO_ASSOC_CI, DICO_ASSOC_MULT): New defines.
(dico_assoc_append,dico_assoc_find_n): New functions.
(dico_assoc_iterator, dico_assoc_remove_n): New functions.
(dico_header_parse): New function.
* include/dico/list.h (dico_list_destroy): Change signature.
(dico_list_set_free_item)
(dico_list_set_comparator,dico_list_get_comparator): New functions.
(dico_list_insert_sorted): Change signature.
(dico_list_locate,dico_list_remove): Change signature.
(_dico_list_locate): New function.
(dico_iterator_create): Rename to dico_list_iterator
(dico_iterator_remove_current): Change signature and return type.
* dico/strat.h (dico_strat_name_cmp): Change signature.
(dico_strat_free): New proto.
* dico/types.h (dico_assoc_list_t): New type.
* include/xdico.h (xdico_assoc_append, xdico_assoc_add): New protos.
* lib/header.c: New file.
* lib/Makefile.am (libdico_la_SOURCES): Add header.c
* lib/assoc.c: Major rewrite.
* lib/list.c: Associate free_item and compare_item functions with the list.
* dicod/dicod.h (dicod_database_t): Remove content_type and
content_transfer_encoding. Change type of mime_headers to
dico_assoc_list_t.
(CONTENT_TRANSFER_ENCODING_HEADER): New define.
(dicod_ostream_create): Takes two arguments.
* dicod/ostream.c: Rewrite using dico_assoc_list_t for headers.
* dicod/main.c: Update calls to list/assoc functions.
(kwd_load_module): Remove content-type and content-transfer-encoding.
Load mime-headers through a callback, with checking.
* dicod/commands.c: Update calls to dicod_ostream_create.
* dicod/lang.c: Likewise.
* dicod/loader.c: Likewise.
* dico/autologin.c: Update calls to list/assoc functions.
* dico/connect.c: Likewise.
* dico/saslauth.c: Likewise.
* dicod/accesslog.c: Likewise.
* dicod/acl.c: Likewise.
* dicod/alias.c: Likewise.
* dicod/auth.c: Likewise.
* dicod/capa.c: Likewise.
* dicod/config-gram.y: Likewise.
* dicod/dbtext.c: Likewise.
* dicod/dicod.c: Likewise.
* dicod/gsasl.c: Likewise.
* dicod/markup.c: Likewise.
* dicod/pp.c: Likewise.
* dicod/udb.c: Likewise.
* lib/markup.c: Likewise.
* lib/strat.c: Likewise.
* lib/url.c: Likewise.
* lib/userprivs.c: Likewise.
* lib/utf8.c: Likewise.
* modules/dict.org/dictorg.c: Likewise.
* modules/outline/outline.c: Likewise.
2008-11-30 Sergey Poznyakoff
Fix output in mime mode.
* dicod/config-lex.l: Ignore m4 line statemens appearing within
a here-doc.
* dicod/loader.c (outproc_t): New argument "data"
(dicod_word_first, dicod_word_all): Likewise
(dicod_match_word_db, dicod_match_word_first): Update calls to lower-level
functions.
(dicod_match_word_all): Create a separate output stream.
(print_matches): Do not create ostream for each
database.
2008-11-29 Sergey Poznyakoff
Allow to pass additional headers for MIME output
* dicod/dicod.h (struct dicod_database): New member mime_headers
(dicod_ostream_create): Change signature
* dicod/main.c (kwd_database): New keyword "mime-headers"
* dicod/ostream.c (struct ostream): New member "headers".
(print_headers): Print ostream->headers, if given.
(dicod_ostream_create): Initialize ostream->headers.
* dicod/commands.c, dicod/lang.c, dicod/loader.c: Update calls to
dicod_ostream_create.
* doc/dico.texi: Minor changes.
2008-11-28 Sergey Poznyakoff
Bugfix
* dicod/commands.c (dicod_show_server): Avoid passing NULL server_info
to stream_write_multiline
(dicod_status): Add a space before 'No timing data available'
2008-10-31 Sergey Poznyakoff
Fix precedence of '*' in language statements (both config and module)
Improvements in Python module
* modules/python/python.c (dico_methods): Typecast to shut up a
gcc warning.
(_tuple_to_langlist, mod_lang): Handle lists. Be more strict at
checking. Add more diagnostics.
* tests/example.py (class DicoModule): New member langlist.
New method lang.
* tests/example.text: Add language definitions.
Allow to use * as a synonym to empty list (meaning "all languages")
* dicod/config-lex.l: Add * to symbols allowed in non-quoted strings.
* dicod/dicod.h (dicod_any_lang_list_p): New prototype.
* dicod/loader.c (dicod_any_lang_list_p): New function.
(dicod_get_database_languages): "*" is equvalent to empty list.
* dicod/main.c (fix_lang_list): Likewise.
2008-10-25 Sergey Poznyakoff
Merge branch 'master' of ssh://git.gnu.org.ua/gitroot/dico
* modules/guile/guile.c (mod_lang): Fix return value
2008-10-24 Wojciech Polak
Implement dico_db_lang in Python module.
* modules/python/python.c (_tuple_to_langlist, mod_lang): New functions.
* modules/template.py (lang): New optional method.
2008-10-24 Sergey Poznyakoff
Bugfixes.
* dicod/main.c (fix_lang_list): Disable dico_db_lang if
at least one of language lists is given in the config.
* modules/guile/guile.c (mod_lang): Fix return value.
2008-10-19 Sergey Poznyakoff
* dicod/config-gram.y: Allow for empty lists.
2008-10-18 Sergey Poznyakoff
Further improvement of language extensions.
* dicod/dicod.h (DICOD_DBF_LANG): New define.
(struct dicod_database): Replace lang with langlist[2] (languages from -> to).
(dicod_lang_check, dicod_get_database_languages): Change proto.
(dicod_langlist_copy): New proto.
* dicod/lang.c (dicod_lang_preferences): Remove.
(dicod_lang_lazy_prefs, dicod_lang_prefs): New variables.
(dicod_lang_check): Change arguments.
(dicod_lang, dicod_show_lang_pref, dicod_show_lang_info): Implement using
new preference system.
* dicod/loader.c (dicod_langlist_copy): New function.
(dicod_get_database_languages): Change signature.
* dicod/main.c (fix_lang_list): Change signature.
(main): Call fix_lang_list for both langlist parts.
(kwd_database): Replace languages with languages-from/languages-to.
(dicod_database_free): Reflect changes to struct dicod_database.
* include/dico/types.h (struct dico_database_module):
Change arguments and return type of dico_db_lang.
* modules/guile/guile.c: Update
* modules/outline/outline.c: Update
* modules/template.c: Update.
* modules/template.scm: Update.
* tests/example.db: Update.
Implement language extensions.
* dicod/lang.c: New file.
* dicod/Makefile.am: Add lang.c
* dicod/dicod.h (struct dicod_database): New member lang.
(DICOD_MAXPARAM_INF): New define.
(register_lang, dicod_lang_check): New prototypes.
(dicod_get_database_languages): New prototype.
* dicod/loader.c (dicod_get_database_languages): New function.
* dicod/main.c (set_database): Create and fixup language list.
(kwd_database): New keyword 'languages'.
(check_db_visibility): Use dicod_lang_check to determine if the
database is visible.
(dicod_database_free): Free lang list.
(main): Call register_lang.
* dicod/commands.c (dicod_handle_command): Allow maxparam to be
DICOD_MAXPARAM_INF, in which case any number of parameters, greater than
minparam, is allowed.
* dicod/capa.c (dicod_capa_flush): Take a NULL terminated
array of commands to declare.
* dicod/auth.c, dicod/lev.c, dicod/markup.c, dicod/mime.c,
dicod/xidle.c, dicod/xversion.c: Update definitions of cmd to match
changes in dicod/capa.c.
* include/dico/list.h (dico_list_t, dico_iterator_t): Move to types.
* include/dico/types.h (struct dico_database_module): New member dico_db_lang.
* include/xdico.h (dicod_free_item): New prototype.
* lib/xutil.c (dicod_free_item): New function.
* modules/dict.org/dictorg.c (dictorg module): Reserve a slot for dico_db_lang.
* modules/python/python.c (dictorg module): Reserve a slot for dico_db_lang.
* modules/guile/guile.c: Implement dico_db_lang.
Use scm_to_locale_string instead of deprecated scm_i_string_chars.
* outline/outline.c: Implement dico_db_lang.
* modules/template.c: Implement dico_db_lang.
* modules/template.scm: Implement dico_db_lang.
* tests/devils.out: Add Languages section.
* tests/example.db: Add language definition.
* tests/example.scm (db:get): New rule 'lang'
(lang): New function.
(example-init): Init "lang"
2008-10-09 Sergey Poznyakoff
Allow to override some settings from the command line.
* dicod/cmdline.opt: New options --transcript and --no-transcript.
(get_options): Take three arguments.
* dicod/dicod.h (get_options): Take three arguments.
* dicod/main.c (init_conf_override, apply_conf_override): New functions.
(main): Use conf_override to override some configuration
statements from the command line.
2008-09-30 Sergey Poznyakoff
Fix UTF-8 handling in SHOW DB output.
* dicod/commands.c (_show_database): Use utf8_quote, not quotearg.
* include/dico/utf8.h (utf8_wc_to_mbstr): Change prototype.
(utf8_quote, utf8_wc_quote): New functions.
* lib/utf8.c (utf8_quote, utf8_wc_quote): New functions.
(utf8_wc_to_mbstr): Change signature.
(utf8_mbstr_to_wc): fix indentation.
* modules/dict.org/dictstr.c (stream_get16, stream_get32): Static.
Reflect available markup types in capability string.
* dicod/dicod.h (markup_flush_capa): New function.
* dicod/main.c (main): Call markup_flush_capa.
* dicod/markup.c (markup_flush_capa): New function.
* lib/markup.c (dico_markup_valid_name_p): New function.
(dico_markup_register): Enforce valid markup names.
* modules/guile/guile.c (dico-register-markup): Reflect changes to
the return value of dico_markup_register.
Minor fixes.
* dicod/config-lex.l: Improve "stray character" diagnostics.
* include/dico/strat.h (struct dico_strategy): Add comments.
2008-09-28 Wojciech Polak
Changes to Python module.
* modules/python/python.c (dico_register_markup,
dico_current_markup): New functions.
2008-09-28 Sergey Poznyakoff
Implement html output in examples.
* lib/markup.c (dico_markup_register): Store a copy of the string.
* modules/guile/guile.c (_guile_strategy_create): Remove.
(dico-register-markup, dico-current-markup): New functions.
* tests/example.scm (output): Implement rudimentary html output.
Implement experimental OPTION MARKUP command.
* dicod/markup.c: New file
* dicod/Makefile.am (dicod_SOURCES): Add markup.c
* dicod/dicod.h (register_markup): New function.
* dicod/main.c (main): Call register_markup.
* include/dico/markup.h: New file
* include/dico/Makefile.am (pkginclude_HEADERS): Add markup.h
* include/dico/types.h: Minor formatting changes.
* include/dico.h: Include dico/markup.h
* lib/markup.c: New file
* lib/Makefile.am (libdico_la_SOURCES): Add markup.c
2008-09-24 Wojciech Polak
Improve stdout capture in Python module.
* modules/python/python.c (_capture_stdout_info): New function.
2008-09-24 Sergey Poznyakoff
Bugfix
* modules/guile/guile.c (mod_init): Move call to dico_parseopt to after
Guile initialization.
2008-09-23 Sergey Poznyakoff
Minor fix
Changes to Guile module.
* modules/guile/guile.c (mod_init_db): Accept init-script,
init-args and init-fun options.
* tests/dicod.cfin (numerals): Rename to plnum.
(cznum): New database.
* tests/example.scm (open-module): Reflect changes to guile.c
* tests/example.text: Use Czech numerals, to discern from example.db
* doc/dico.texi: Update.
Various changes.
* NEWS: Update version number.
* README: Mention Python.
* configure.ac: Raise version number to 1.99.96.
Check for python-config.
Define BUILD_DICO_GUILE_MODULES and BUILD_DICO_PYTHON_MODULES,
instead of the corresponding _DIRs.
* doc/dico.texi: Mention Python. Provide a placeholder for a new section.
* doc/libdico.texi (utf8_mbstr_to_norm_wc): New deftypefn
* modules/Makefile.am (SUBDIRS): Unconditionally list guile and python
* modules/guile/Makefile.am: Build if BUILD_DICO_GUILE_MODULES is defined.
(AM_LDFLAGS): Add -rpath to force libtool build a shared library.
* modules/python/Makefile.am: Build if BUILD_DICO_PYTHON_MODULES is defined.
(AM_LDFLAGS): Add -rpath to force libtool build a shared library.
* modules/dict.org/dictorg.c, modules/guile/guile.c,
modules/python/python.c: Mark all functions as static.
* lib/levenshtein.c (dico_levenshtein_distance): Fix Damerau part (again).
* tests/levtest.c: New file.
* tests/Makefile.am (noinst_PROGRAMS): Add levtest.
* tests/example.py: New file. * tests/example.text: New file. * AUTHORS: Add Wojciech.
2008-09-22 Wojciech Polak
Add Python support.
* configure.ac: Check for Python.
* modules/Makefile.am (SUBDIRS): Add python.
* modules/python/Makefile.am: New file.
* modules/python/python.c: New file. Python module.
* modules/template.py: New file. A Python module template.
2008-09-21 Sergey Poznyakoff
Update
Minor fix
2008-09-20 Sergey Poznyakoff
Minor fix.
* dicod/loader.c (dicod_load_module0): Use lt_dlopenadvise and set `global'
advise.
2008-09-19 Sergey Poznyakoff
Improve dico_parseopt.
* include/dico/parseopt.h (DICO_PARSEOPT_PARSE_ARGV0)
(DICO_PARSEOPT_PERMUTE): New macros.
* lib/parseopt.c (dico_parseopt): Take two additional arguments: flags and
pindex. Return index of the first non-optional argument in *pindex.
Use flags to modify the operation.
* modules/dict.org/dictorg.c: Update calls to dico_parseopt.
* modules/guile/guile.c: Likewise.
* doc/libdico.texi: Update.
2008-09-12 Sergey Poznyakoff
Bugfix
* dicod/config-lex.l: Make sure stray characters are displayed correctly
in diagnostic messages.
2008-09-10 Sergey Poznyakoff
Update devdict.out
Update.
* doc/dico.texi: Document the strategy statement.
* tests/devils.out: Minor fix.
2008-09-08 Sergey Poznyakoff
Bugfix.
* lib/argcv.c (argcv_quoted_length): Set *quote if input string
has zero length.
Bugfix.
* .gitignore: Remove po
* modules/dict.org/dictorg.c (compare_prefix): Do not match strings shorter
than the requested prefix.
(common_match, suffix_match, _match_all): Ignore reserved words, if requested.
2008-09-07 Sergey Poznyakoff
Fix Damerau-Levenshtein strategy, implement new strategies.
* dicod/lev.c: Implement "normalized" Levenshtein and Damerau-Levenshtein
strategies, i.e. such that assume equality between runs of whitespace
characters, no matter what their length.
* include/dico/utf8.h (DICO_LEV_NORM, DICO_LEV_DAMERAU): New defines.
(utf8_mbstr_to_norm_wc) New function.
* lib/levenshtein.c (dico_levenshtein_distance): Fix Damerau-Levenshtein
algorithm. Change semantics of the 3rd argument.
* lib/utf8.c (utf8_mbstr_to_norm_wc): New function.
2008-09-06 Sergey Poznyakoff
Bugfix
* lib/strat.c (dico_strategy_create): Fill allocated memory with zeros.
2008-08-31 Sergey Poznyakoff
Allow to restrict the use of default matches that may cause considerable strain on the server (e.g. MATCH * prefix "").
* NEWS, configure.ac: Version 1.99.95
* dico/func.c (check_disconnect): Remove duplicate condition.
* dicod/Makefile.am (dicod_SOURCES): Add stratcl.c
* dicod/stratcl.c: New file.
* dicod/config-gram.y (string_to_unsigned): Additional argument `locus'.
All callers updated.
* dicod/dicod.c: New exterimental strategy `all'.
* dicod/dicod.h (string_to_unsigned): New proto.
(enum cmp_op): New data type.
(stratcl_add_word, stratcl_add_cmp)
(stratcl_add_disable, stratcl_check_word): New functions.
* dicod/loader.c (dicod_word_first, dicod_word_all): Check if this word is
allowed for searches using this strategy.
* dicod/main.c (flush_strat_forward_fn, destroy_strat_forward_fn)
(flush_strat_forward, strategy_cb, strategy_deny_all_cb)
(strategy_deny_word_cb, strategy_deny_length)
(strategy_deny_length_lt_cb, strategy_deny_length_le_cb)
(strategy_deny_length_gt_cb, strategy_deny_length_ge_cb)
(strategy_deny_length_eq_cb, strategy_deny_length_ne_cb): New functions.
(kwd_strategy): New configuration keywords: deny-all, deny-worddeny-word,
deny-length-lt, deny-length-le, deny-length-gt, deny-length-ge,
deny-length-eq, deny-length-ne.
(keywords): New block statement: strategy
(main): Call flush_strat_forward
* dico/strat.h (struct dico_strategy): New member: stratcl
(dico_strat_name_cmp): New function.
(dico_strategy_create): New function.
* lib/strat.c (strat_name_cmp): Rename to dico_strat_name_cmp. Make global.
(dico_strategy_create): New function.
(dico_strategy_dup): Use dico_strategy_create.
2008-08-11 Sergey Poznyakoff
Improve security when using anonymous authentication.
* dicod/dicod.h (sasl_anon_groups): New declaration.
* dicod/gsasl.c (sasl_anon_groups): New variable.
(struct sasl_data): New data type.
(sasl_auth): Pass a pointer to struct sasl_data to gsasl callback as a hook.
Make sure group info for anonymous users is not searched in the user database.
Use sasl_anon_groups instead.
(cb_validate, callback): Adopt the change of hook data type.
* dicod/main.c (kwd_sasl): sasl-disable-mechanism and sasl-enable-mechanism
renamed to disable-mechanism and enable-mechanism, respectively.
(anon-group): New statement.
2008-08-10 Sergey Poznyakoff
Bugfix.
* configure.ac: Call AM_ICONV before AM_GNU_GETTEXT.
2008-08-09 Sergey Poznyakoff
Version 1.99.94
Bugfix.
* dico/saslauth.c (callback): Handle GSASL_ANONYMOUS_TOKEN.
Bugfixes.
* dicod/dicod.h (sasl_realm): New declaration.
* dico/saslauth.c (callback): Add missing callbacks.
* dicod/gsasl.c (sasl_realm): New variable.
(callback): Add missing callbacks.
* dicod/main.c (kwd_sasl): New keyword `realm'.
Improve SASL configurability.
* dicod/config-gram.y (string_to_bool): Make extern.
* dicod/dicod.h (string_to_bool): New prototype.
(sasl_enable, sasl_enabled_mech, sasl_service): New declarations.
* dicod/gsasl.c (sasl_enable, sasl_enabled_mech, sasl_service): New variables.
(disabled_mechanism_p): A mechanism state is controlled by two lists:
sasl_enabled_mech and sasl_disabled_mech.
(callback): sasl_service keeps service name.
(init_sasl_1): Initialize sasl_service.
(register_sasl): sasl_enable controls whether SASL is enabled.
* dicod/main.c: New configuration file block statement `sasl'.
Remove debugging hooks
Bugfixes in SASL-related code.
* dico/saslauth.c (selectmech): Do not use _free_el to deallocate
elements of impl. This avoids duplicate calls to free.
(sasl_free_data): Do nothing if *pdata is NULL.
* dicod/gsasl.c (callback): Fix coredump.
* lib/xutil.c (xdico_sasl_capa_match_p): Use c_strcasecmp.
Finish implementing GSASL streams.
* include/gsaslstr.h: New file.
* include/Makefile.am: Add gsaslstr.h.
* configure.ac: Require gettext 0.17
Define BUILD_LIBDICOSASL and LIBDICOSASL if SASL is required.
* dico/Makefile.am, dicod/Makefile.am: Link with LIBDICOSASL.
* dico/connect.c, lib/xscript.c: Use new IOCTL codes.
* dico/saslauth.c: Include gsaslstr.h
(do_gsasl_auth): Insert GSASL stream on success.
* dicod/commands.c (dicod_remove_command): New function.
* dicod/dicod.c (replace_io_stream): New function.
(dicod_loop): I/O stream is static variable instead of the automatic, so
that authentication functions can reset it.
* dicod/dicod.h (replace_io_stream, dicod_remove_command): New variables.
* dicod/gsasl.c: Include gsaslstr.h
(sasl_auth): Call gsasl_finish on failure.
(dicod_saslauth): Insert GSASL stream on success.
* include/dico/diag.h (DICO_DBG_CTL_SET_FILE)
(DICO_DBG_CTL_SET_LINE, DICO_DBG_CTL_SET_TS): Remove.
* include/dico/stream.h (DICO_IOCTL_GET_TRANSPORT)
(DICO_IOCTL_SET_TRANSPORT)
(DICO_DBG_CTL_SET_FILE, DICO_DBG_CTL_SET_LINE)
(DICO_DBG_CTL_SET_TS): New defines.
* include/xdico.h (XSCRIPT_CTL_GET_TRANSPORT)
(XSCRIPT_CTL_SET_TRANSPORT): Remove.
* lib/Makefile.am (noinst_LIBRARIES): Add @BUILD_LIBDICOSASL@
* lib/gsaslstr.c (struct g_buf): New member pos.
(g_buf_ptr, g_buf_level, g_buf_drop): Take into account pos.
(g_buf_advance): New macro.
(_gsasl_read): Fix buffering.
(dico_gsasl_stream): Set line buffering.
(insert_gsasl_stream): New function.
* lib/stream.c (dico_stream_read): If the stream is line buffered,
break the reading loop after receiving a newline character.
2008-08-06 Sergey Poznyakoff
Implement GSASL stream.
* lib/gsaslstr.c: New file.
* lib/Makefile.am (libdico_la_SOURCES): Add gsaslstr.c.
Remove obsolete linebuf code.
* include/dico/lbuf.h, lib/linebuf.c: Remove.
* include/dico/Makefile.am, include/dico.h: Remove lbuf.h
* lib/Makefile.am: Remove linebuf.c
* dicod/dicod.c, dicod/server.c: Remove duplicate calls to dico_stream_set_buffer.
* lib/dbgstream.c: Include sys/time.h
2008-08-04 Sergey Poznyakoff
Update docs
Improve server debugging.
* dicod/dicod.c (dicod_loop): Log session start and end if debug level is set.
* dicod/dicod.h (debug_level): Remove. Declared in xdico.h.
* dicod/main.c (debug_source_info, debug_stream): New variables.
(main): Initialize debug_stream.
* dicod/pp.c: Use debugging macros.
* dicod/server.c (handle_connection): Remove an outdated fixme comment.
* dicod/cmdline.opt (source-info): New option.
Minor fix.
* dicod/server.c (handle_connection): Move call to query ident_name to ...
* dicod/dicod.c (dicod_loop): ... here
Fix AUTH I/O in dicod.
* dicod/accesslog.c: New directive %d.
* dicod/dicod.h (ident_timeout): New declaration.
* dicod/ident.c: Use non-blocking I/O.
* dicod/main.c (ident_timeout): New global variable.
(keywords): New keyword ident-timeout.
* dicod/udb.c (udb_open): Do not coredump on NULL argument.
* doc/dico.texi: Reflect recent changes.
* THANKS: Reformat for GNU standards.
2008-08-02 Sergey Poznyakoff
Improve debugging.
* dico/connect.c (dict_read_reply): Remove superfluous call to XDICO_DEBUG.
* dico/dico-priv.h (ds_verbose): New prototype.
* dico/func.c (ds_verbose): New function.
* dico/shell.c (verbose): New command.
(filename): const.
(script_diag, parse_script_file): Minor fix.
Improve debugging.
* lib/dbgstream.c: Include microseconds in timing output.
Merge branch 'master' of ssh://git.gnu.org.ua/gitroot/dico
Improve debugging.
* dico/cmdline.opt: New option --time-stamp.
* include/dico/diag.h (DICO_DBG_CTL_SET_TS): New define.
* lib/dbgstream.c: Optionally print timestamp information.
Add more debugging to the client.
* configure.ac, NEWS: Version 1.99.93
* lib/dbgstream.c: New file.
* lib/Makefile.am (libdico_la_SOURCES): Add dbgstream.c.
* dico/autologin.c, dico/connect.c, dico/dico.c, dico/lookup.c,
dico/saslauth.c,
* include/dico/diag.h (dico_dbg_stream_create): New prototype.
(DICO_DBG_CTL_SET_FILE, DICO_DBG_CTL_SET_LINE): New defines.
(DICO_DEBUG_SINFO): New macro.
* lib/xscript.c (transcript_ioctl): Fix typo.
* include/xdico.h (XSCRIPT_CLT_GET_TRANSPORT)
(XSCRIPT_CLT_SET_TRANSPORT):
(debug_level, debug_source_info, debug_stream): New declarations.
(XDICO_DEBUG)
(XDICO_DEBUG_F1 through XDICO_DEBUG_F4): New macros.
* dico/cmdline.opt: New options --verbose (-v) and --source-info.
2008-07-31 Sergey Poznyakoff
Add po
* po/.gitignore: New file.
* po/POTFILES.in: New file.
2008-07-30 Sergey Poznyakoff
Bugfix
* dicod/ident.c (query_ident_name): Return NULL if bind failed.
* dicod/server.c (handle_connection): Move the call to query_ident_name
to a proper place.
2008-07-28 Sergey Poznyakoff
Dico is dubbed GNU package
2008-07-24 Sergey Poznyakoff
Version 1.99.92
Update docs.
* README: Update.
* doc/dico.texi: Update.
Finish SASL support.
* dico/autologin.c (parse_autologin): Support for new
keywords: realm, service and host.
* dico/cmdline.opt: New options --sasl, --nosasl.
* dico/connect.c (dict_auth): Rewrite authention to avoid dependency from
"auth" capability.
(auth_cred_free): Free new auth_cred members.
(get_credentials): Rename to auth_cred_get, make global.
* dico/dico-priv.h (struct auth_cred): New fields service, realm and
hostname.
(GETCRED_OK, GETCRED_FAIL, GETCRED_NOAUTH): New defines.
(auth_cred_get, auth_cred_free): New prototypes.
(set_bool): Change return type to int.
(ds_sasl): New prototype.
(saslauth): Change signature.
* dico/func.c (set_bool): Change return type to int.
(ds_sasl): New function.
* dico/saslauth.c (callback): Use new auth_cred members.
(saslauth): Rename to saslauth0.
(saslauth, sasl_enable, sasl_enabled_p): New functions.
* dico/shell.c: Add `sasl' command.
* dicod/main.c (get_full_hostname): Moved to libxdico.
* include/xdico.h (xdico_local_hostname): New prototype.
* lib/Makefile.am (libxdico_a_SOURCES): Add xhostname.c.
Minor fix.
Implement SASL in client.
* dico/saslauth.c: New file.
* dico/Makefile.am (dico_SOURCES): Add saslauth.c
* dico/autologin.c (parse_autologin): Bugfix.
* dico/connect.c (dict_auth): Rename to apop_auth.
(dict_auth): New function.
(get_credentials): Fill cred with zeros.
(dict_connect): Initialize obstack before eventual authentication.
* dico/dico-priv.h (AUTH_OK, AUTH_FAIL, AUTH_CONT): New defines.
(saslauth): New proto.
* dico/func.c (ds_show_info): Remove unused variable.
* dicod/dicod.h (struct dicod_command): Rename nparam to minparam. Add new
member maxparam.
* dicod/auth.c, dicod/commands.c, dicod/lev.c, dicod/mime.c,
dicod/xidle.c, dicod/xversion.c: Reflect changes to struct
dicod_command.
* dicod/gsasl.c (send_challenge): Do not send zero-length data (don't know
if I'm right here).
(get_sasl_response): Bugfixes.
(sasl_auth): Prevent coredump.
(callback): Fix.
(xlate_mech_to_capa): Move to libxdico.
* include/xdico.h (xdico_sasl_mech_to_capa)
(xdico_sasl_capa_match_p): New protos.
* lib/stream.c (dico_stream_read_unbuffered): Return EIO if stream has hit
EOF and user does not check for the number of bytes read.
* lib/utf8.c (strlen): Remove. How did it get there???
* lib/xutil.c (xdico_sasl_mech_to_capa)
(xdico_sasl_capa_match_p): New functions.
2008-07-23 Sergey Poznyakoff
Implement SASL framework (unfinished).
* am/gsasl.m4: Enable GSASL by default, if available.
Export GSASL_LIBS.
* configure.ac: Check for gsasl.
Display a configuration summary before exiting.
* dicod/gsasl.c: New file.
* dicod/Makefile.am (dicod_SOURCES): Add gsasl.c
(LDADD): Add GSASL_LIBS.
* dicod/dicod.h (get_input_line, register_sasl): New functions.
(sasl_disabled_mech): New extern.
* dicod/main.c (keywords): New keyword sasl-disable-mechanism.
(main): Call register_sasl.
* dico/Makefile.am (LDADD): Add GSASL_LIBS
* dico/dico-priv.h (struct auth_cred): New fields sasl and mech.
(AUTOLOGIN_MECH): New define.
* dico/autologin.c (parse_autologin): Rewrite to allow for multi-line
statements. Handle new auth_cred fields.
2008-07-22 Sergey Poznyakoff
Minor changes.
* dico/dico-priv.h, dico/func.c (ds_show_info): New function.
* dico/pager.c: Setting pager to "-" disables it.
* dico/shell.c (funtab): Add info command.
* dico.texi: Update.
* doc/libdico.texi (utf8_strbytelen): Remove.
* lib/tokenize.c, lib/utf8.c, lib/xstream.c: Use strlen instead of
the removed utf8_strbytelen.
Minor fix
Check the spelling
Improve autologin mode.
* configure.ac (--with-netrc-file): Rename to --with-autologin-file.
(DEFAULT_NETRC_NAME): Rename to DEFAULT_AUTOLOGIN_FILE.
* dico/connect.c (get_credentials): Consult session-specific autologin first,
the default one afterwards.
Return a three-state value.
All callers updated.
* dico/dico-priv.h (AUTOLOGIN_USERNAME, AUTOLOGIN_PASSWORD)
(AUTOLOGIN_NOAUTH): New defines.
(parse_netrc): Rename to parse_autologin.
* dico/netrc.c: Rename to dico/autologin.c
(parse_netrc): Rename to parse_autologin. Return additional information
in *pflags.
Support `noauth' keyword.
* doc/dico.texi: Finish documenting dico.
2008-07-21 Sergey Poznyakoff
Minor change.
* dico/connect.c, dico/dico-priv.h (ds_tilde_expand): New function.
* dico/func.c (ds_autologin): Perform tilde expansion.
* doc/dico.texi, doc/libdico.texi: Update.
Fix history handling in Dico and provide a couple of new commands.
* dico/connect.c (dict_connect): Initialize conn->fd.
* dico/dico-priv.h (struct dict_connection): Add fd member to be
able to select on it.
(ds_pager): New prototype.
* dico/func.c (check_disconnect): New function.
(ensure_connection): Call check_disconnect first.
* dico/pager.c (ds_pager): New function.
(create_pager_stream): Prefer internal pager setting over the environment
variable.
* dico/shell.c: Fix history handling.
(prompt, pager): New commands.
* doc/dico.texi: Document interactive mode.
Implement command history.
* dico/shell.c: Implement history commands.
2008-07-19 Sergey Poznyakoff
Update
I18n.
* include/.gitignore: New file.
* include/Xaw.h: Remove.
* include/appi18n.h, include/libi18n.h,
lib/appi18n.c, lib/libi18n.c: New files.
* .gitignore: Add po
* Makefile.am (SUBDIRS): Add po
* NEWS: Update.
* bootstrap.conf: I18n
* configure.ac: Check for gettext.
(AC_CONFIG_FILES): Add po/Makefile.in
Link gnu/gettext.h to include.
* dico/dico-priv.h: Include appi18n.h
* dico/dico.c (main): Call appi18n_init
* dicod/Makefile.am (LDADD): Add LIBINTL
(INCLUDES): Add -I../gnu
* dicod/dicod.h: Include appi18n.h
dicod/main.c (main): Call appi18n_init
* include/Makefile.am (noinst_HEADERS): Add appi18n.h and libi18n.h
* include/dico/diag.h, lib/diag.c (dico_die): format argument is const.
* include/xdico.h (appi18n_init): New prototype.
* lib/Makefile.am (INCLUDES): Add -I../gnu
(libdico_la_SOURCES): Add libi18n.c
(libxdico_a_SOURCES): Add appi18n.c
* lib/iostr.c, lib/parseopt.c, lib/userprivs.c: Include libi18n.h.
Call _dico_libi18n_init.
* lib/xstream.c: Include libi18n.h.
* makedict/makedict.h: Include appi18n.h
(main): Call appi18n_init
* modules/dict.org/Makefile.am (INCLUDES): Add -I$(top_builddir)/include
* modules/guile/Makefile.am: Likewise.
* modules/outline/Makefile.am: Likewise.
* modules/dict.org/dictorg.h: Include appi18n.h
* modules/guile/guile.c: Likewise.
* modules/outline/outline: Likewise.
Bugfix.
* dico/connect.c (get_credentials): Avoid freeing the result from getpass.
2008-07-18 Sergey Poznyakoff
Bugfix.
* doc/dico.c (fixup_url): Use xdico_assign_string to initialize host.
2008-07-17 Sergey Poznyakoff
Minor fixes.
* dico/cmdline.opt: Reword the docstring for --levdist and --quiet.
* dico/connect.c (get_credentials): Ask for password if it is not given.
* doc/dico.texi: Begin documenting dico client.
* doc/libdico.texi (url): Update.
* gnulib.modules: Require getpass-gnu
* lib/url.c (url_get_user): Allow `;' to delimit username and password, as
requested by RFC2229.
(url_parse_dico_request): /d-type urls do not have :strat part.
Minor change.
* dico-priv.h, func.c, shell.c (script_error)
(script_warning): Remove unused first argument.
Add `--quite' option and `quiet' initialization command.
* dico/cmdline.opt: New option --quiet.
* dico/dico-priv.h (quiet_option): New declaration.
(set_bool): New prototype.
* dico/dico.c (quiet_option): New variable.
* dico/shell.c (helptext): New variable.
(funtab): New command `quiet'.
(ds_prefix): Exclude # from allowed characters for command prefix.
(ds_help): Improve output.
(_command_generator): Skip commands without documentation strings.
Improve matching.
* dico/connect.c (dict_result_free): Allow for null argument.
* dico/dico-priv.h (struct dict_connection): New member match_result.
(dict_run_single_command): Change type to void.
(ensure_connection, ds_define_nth): New prototypes.
* dico/func.c (ds_match): Store match result in conn->match_result.
If no argument, or an empty argument is given, re-display previous
result. Prefix a list of matches from the same database with the
database name. Prefix each match with its ordinal number, so it
can be picked up using it later.
(ds_define_nth): New function.
* dico/lookup.c (print_reply): Make extern. Discern 'no match' from other
replies.
(print_match_result): New function.
* dico/shell.c
(parse_script_file): A single number means define the Nth element from the
previous match.
Improve readline completion in the client.
* dico/connect.c (dict_transcript): New function.
(dict_connect): Use dict_transcript.
(dict_define, dict_match): Fix second argument in call to dict_result_create.
* dico/dico-priv.h (struct dict_connection): New members `transcript',
`db_result', and `strat_result'.
(struct funtab): New type (from shell.c).
(dict_transcript, print_result)
(find_funtab, dict_completion_matches)
(ds_compl_database, ds_compl_strategy): New prototypes.
* dico/func.c (get_list): New function.
(ensure_connection): Get and cache database and strategy information.
(ds_compl_strategy, ds_compl_database): New functions.
(ds_transcript): Actually toggle transcript.
(ds_show_db, ds_show_strat): Show cached results.
* dico/lookup.c (print_result): Make extern.
* dico/shell.c (struct funtab): Move definition to dico-priv.h
(funtab): Imitialize completion functions.
(ds_help): Minor fix.
(parse_script_file): Pass the complete input line to default
define and match.
(_command_completion): Rewrite.
(dict_completion_matches): New function.
* include/dico/stream.h (dico_stream_set_ioctl)
(dico_stream_ioctl): New prototypes.
* include/xdico.h (XSCRIPT_CLT_GET_TRANSPORT)
(XSCRIPT_CLT_SET_TRANSPORT): New define.
* lib/stream.c (struct dico_stream): New field `ctl'.
(dico_stream_set_ioctl): New function.
(dico_stream_flush): Don't coredump if stream is NULL.
(dico_stream_ioctl): New function.
* lib/xscript.c (transcript_flush): Return immediately if transport is NULL.
(xdico_transcript_stream_create): Install ioctl handler.
Minor change.
* dico/func.c: Ensure the connection is opened before
sending commands to the server.
2008-07-16 Sergey Poznyakoff
Minor changes.
* dico/dico-priv.h (dict_define, dict_match)
(dict_run_single_command): New prototypes.
(ds_show_db, ds_show_strat): New prototypes.
* dico/func.c (ds_show_db, ds_show_strat): New functions.
* dico/lookup.c (dict_lookup_url): Call dict_conn_close.
(dict_run_single_command): New function.
(dict_single_command): Read final response code.
* dico/shell.c: New commands ls and ld.
Update .gitignores
Implement general-purpose result structure.
* dico/connect.c (dict_connect): Always initialize stk.
(dict_define, dict_match): New functions.
(dict_multiline_reply): Remove second arg. Do not push current
buf on stack.
(dict_result_create, dict_result_free): New functions.
(dict_conn_close): Reflect changes to the connection structure.
* dico/dico-priv.h (struct match_result)
(struct define_result, dict_result): New data types.
(struct dict_connection): New fields levdist, last_result. Remove
stk_init. Document all fields.
(dict_result_create, dict_result_free): New prototypes.
(dict_conn_last_result): New macro.
* dico/lookup.c (print_definitions): Remove.
(print_multiline): Remove.
(print_result): New function.
(dict_lookup): Rewrite using new result functions.
Add informational functions.
* dico/dico-priv.h, dico/func.c, dico/shell.c: Implement
version and warranty commands.
* utils/getopt.m4 (print_version_only): New function.
Minor change.
* dico/dico-priv.h, dico/func.c, dico/shell.c (ds_distance): New function.
* dico/lookup.c (dict_lookup): Bugfix.
Implement match and defines in shell mode.
* dico/dico-priv.h, dico/lookup.c (dict_lookup): Rename to dict_word.
(dict_lookup): New function.
(ds_define, ds_match): New functions.
* dico/dico.c: Update uses of dict_lookup
* dico/func.c (ds_define, ds_match): New functions.
* dico/shell.c : Improve help output.
(cmdprefix): Do not initialize. This lets init scripts use
commands without leading prefix.
(parse_script_file): Use shortcuts for define and match.
Provide an interactive dico shell.
* configure.ac: Check for readline.
* dico/func.c, dico/shell.c: New files.
* dico/Makefile.am (dico_SOURCES): Add them.
(LDADD): Add $READLINE_LIBS.
* dico/cmdline.opt: Use xdico_assign_string to initialize string values.
* dico/connect.c (get_homedir): Change to extern.
* dico/dico-priv.h: Add new prototypes.
* dico/dico.c (fixup_url): Use xdico_assign_string to initialize string values.
(main): Call parse_init_scripts.
Switch to shell mode if no arguments given.
* dico/netrc.c (skipws): Change to extern.
* dicod/config-lex.l (unquote_char, quote_char): Move to the library.
All uses changed.
* dicod/dicod.c (tokenize_input): Move to the library. All uses changed.
* include/dico/utf8.h: Include ctype.h.
* include/xdico.h (xdico_unquote_char, xdico_quote_char):
(xdico_tokenize_begin, xdico_tokenize_end, xdico_tokenize_input): New protos.
* lib/tokenize.c: New file.
* lib/Makefile.am (libxdico_a_SOURCES): Add tokenize.c
* utils/getopt.m4 (print_version): Change to extern.
Remove superfluous 'Written by' clause.
Minor change.
* lib/assoc.c, lib/util.c, lib/xlat.c, lib/xutil.c: Fix copyright headers.
2008-07-15 Sergey Poznyakoff
Handle .netrc file in dico. Some minor improvements.
* configure.ac: New option --with-netrc-file
* dico/Makefile.am (dico_SOURCES): Add netrc.c.
* dico/netrc.c: New file.
* dico/cmdline.opt: The --strategy option implies --match.
New option --autologin.
* dico/connect.c (dict_auth): Take struct auth_cred * as its second argument.
(dict_connect): If an autologin file is given, consult it for user credentials.
* dico/dico-priv.h (struct auth_cred): New data type.
(user, key): Replace with default_cred. All uses updated.
(autologin_file): New declaration.
* dico/dico.c (main): Report a warning if incorrect number of arguments is
given.
* dicod/commands.c (_show_database, _show_strategy): Quote descriptions.
* dicod/dicod.h: Include quotearg.h.
* dicod/main.c (main): Set default quoting style.
Provide a default dict server address.
* configure.ac (DEFAULT_DICT_SERVER): New variable.
* dico/Makefile.am (AM_CPPFLAGS): Define DEFAULT_DICT_SERVER
* dico/dico.c (fixup_url): Use DEFAULT_DICT_SERVER, if no server was specified.
Implement --levdist option.
* dico/cmdline.opt: New option --levdist.
* dico/dico-priv.h (levenshtein_threshold): New declaration.
* dico/dico.c (levenshtein_threshold): New variable.
* dico/lookup.c (dict_lookup_url): Set Levenshtein distance, if supported.
Bugfix.
* utils/getopt.m4 (OPTION): Quote invocation of `prep'.
Bugfix.
* dico/lookup.c (dict_lookup_url): Fix slot allocation for MATCH command.
2008-07-14 Sergey Poznyakoff
Implement authentication.
* README, TODO: Update.
* dico/cmdline.opt: Handle --noauth option.
* dico/connect.c (parse_initial_reply): Fix storing of the msgid.
* dict_connect: Authenticate if necessary.
* dico/dico-priv.h (noauth_option): New declaration.
* dico/dico.c (noauth_option): New variable.
Bugfix
* util/getopt.m4 (OPTION): Apply prep to DOCSTRING here, instead of in BEGIN.
Bugfix
Forgottent to add.
* lib/xstream.c: New file.
Implement command-line version of dico.
* dicod/fdio.c: Move ...
* lib/fdiostr.c: ... there.
* dicod/xscript.c: Move ...
* lib/xscript.c: ... there.
* dicod/Makefile.am, lib/Makefile.am: Reflect the move.
* dico/connect.c: New file.
* dico/lookup.c: New file.
* dico/pager.c: New file.
* lib/xstream.c: New file.
* dico/Makefile.am (dico_SOURCES): Add connect.c, lookup.c, pager.c
* dico/cmdline.opt: New options --source and --transcript.
(get_options): Do not intialize *index.
* dico/dico-priv.h: Add new prototypes.
(host, port, database, strategy): Replace by dico_url.
* dico/dico.c (host, port, database, strategy): Replace by dico_url.
(transcript, source_addr): New globals.
(main): Add missing implementations.
* dicod/config-gram.y, dicod/server.c: Use DICO_DICT_PORT instead of DICT_PORT.
* dicod/dicod.c (stream_writez, stream_printf)
(stream_write_multiline): Move to lib/xstream.c
* icod/dicod.h (DICT_PORT): Remove.
(fd_stream_create, stream_writez, stream_printf)
(stream_write_multiline): Remove.
* dicod/loader.c (dicod_word_first): Bugfix: break on the first non-empty result.
* gnulib.modules: Add quote and quotearg.
* include/dico/stream.h (dico_fd_stream_create): Change signature.
(dico_fd_io_stream_create): New proto.
* include/dico/types.h (DICO_DICT_PORT): New define.
* include/xdico.h (xdico_transcript_stream_create, stream_writez)
(stream_printf, stream_write_multiline): New protos.
* lib/url.c: Fix copyright header.
* utils/getopt.m4 (GETOPT): Fix handling of 3rd argument.
Rename dico/main.c
* dico/main.c: Rename to ...
* dico/dico.c: ... this.
* dico/Makefile.am: Reflect the rename.
Minor additions to the client.
* dico/cmdline.opt: Initialize dico globals.
* dico/dico-priv.h (enum dico_client_mode): New type.
(DICO_CLIENT_ID): New define.
(host, port, database, strategy, user)
(key, client, req, mode): New declarations.
* dico/main.c (host, port, database, strategy, user)
(key, client, req, mode): New variables.
(dico_lookup): New function placeholder.
(main): Call dico_lookup.
Improve URL parsing.
* include/dico/url.h (DICO_REQUEST_DEFINE, DICO_REQUEST_MATCH): New defines.
(struct dico_request): New data type.
(struct dico_url): Add port and request.
* lib/url.c: Parse `dict://' urls.
(url_get_host,url_get_user): Bug fix.
(url_get_passwd): Remove.
(dico_url_destroy): Free the request.
Bugfix.
* lib/logstream.c (dico_log_stream_create): Remove unused variable.
* utils/getopt.m4: Remove debugging comments.
2008-07-13 Sergey Poznyakoff
Start writing dico client.
* dico/Makefile.am, dico/cmdline.opt, dico/dico-priv.h,
dico/main.c: New files.
* Makefile.am, configure.ac: Add dico subdirectory.
* lib/logstream.c (dico_log_stream_create): Bugfix.
* utils/getopt.m4: Allow to define aliases for the options.
* dicod/cmdline.opt: Add c-mode marker for Emacs.
2008-07-09 Sergey Poznyakoff
Cleanup
* configure.ac: Remove unnecessary variables.
* makedict/Makefile.am, makedict/main.c: Remove INPUTDICTPATH and DICTPATH defines.
* modules/guile/guile.c (silent_close_port): Remove unused function.
Remove unnecessary directories and files.
* client, fonts: Removed
* utils/bdfextract.pl, utils/mkbushufont.awk
* utils/Makefile.am: Remove bdfextract.pl and mkbushufont.awk.
Fix documentation.
* doc/libdico.texi: Fix erroneous deftypefns.
2008-07-08 Sergey Poznyakoff
Minor fix.
* doc/libdico.texi: Fix incorrect deftypefn usage.
Minor improvement.
* dicod/Makefile.am (dicod_SOURCES): Add xidle.c and xversion.c
* dicod/cmdline.opt (OPTIONS_BEGIN): Fix canonical program name.
* dicod/dicod.h (register_xidle, register_xversion): New prototypes.
* dicod/main.c (dicod_xversion, register_xversion): Move to a separate file.
(main): Call register_xidle.
* dicod/xidle.c: New file. Implementation of XIDLE command.
* dicod/xversion.c: New file. Implementation of XVERSION command.
* doc/dico.texi (inactivity-timeout): Add an anchor.
* doc/proto.texi: Document XIDLE command.
2008-07-06 Sergey Poznyakoff
Move dico log streams to the library. Redirect guile errors to logs.
* dicod/logstr.c: Rename to ...
* lib/logstream.c: ... this.
(log_stream_create): Rename to dico_log_stream_create.
* dicod/Makefile.am (dicod_SOURCES): Remove logstr.c.
* dicod/dicod.c (dicod_loop): Use dico_log_stream_create.
* dicod/dicod.h (log_stream_create): Remove proto.
* doc/libdico.texi (diag): Add a template for dico_log_stream_create.
* include/dico/diag.h (dico_log_stream_create): New prototype.
* lib/Makefile.am (libdico_la_SOURCES): add logstream.c.
* modules/guile/guile.c: Implement `log ports'.
(guile_exit_script, guile_outfile): Remove.
(init_option): Remove unused option `exit-script'.
Remove `outfile' option.
(mod_init): Call _guile_init_dico_log_port; Redirect current output and
error ports to log.
* bootstrap.conf: Mention make ChangeLog in the template.
2008-07-04 Sergey Poznyakoff
Add .bootstrap to .gitignore
Reorganize docs.
* doc/Makefile.am (dico_TEXINFOS): Add libdico.texi
* doc/libdico.texi: New file.
* doc/dico.texi: Minor changes.
Use dico_free_db method.
* dicod/dicod.c, dicod/dicod.h (dicod_server_cleanup): New function.
* dicod/loader.c (dicod_free_database): Fix return value.
* dicod/main.c (main): Call dicod_server_cleanup when dicod_inetd finishes.
* dicod/server.c (dicod_server): Call dicod_server_cleanup before terminating.
* doc/dico.texi: Update.
Minor changes.
* doc/Makefile.am: Remove leftover references to dictd.
Remove leftovers of dictd.h
2008-07-03 Sergey Poznyakoff
Minor changes.
* README: Minor changes.
Minor changes.
* doc/dico.texi: Minor changes.
Rename dictd to dicod.
Documentation.
* doc/dico.texi, doc/proto.texi: Start documenting C API. Resolve several
pending xrefs.
Namespace cleanup.
* dictd/dictd.h, dictd/loader.c, include/dico/types.h,
modules/dict.org/dictorg.c, modules/guile/guile.c,
modules/outline/outline.c, modules/template.c: Rename `dico_handler_module'
to `dico_database_module'. Prefix its members with `dico_', instead
of `module_'.
* dictd/loader.c (dictd_close_database): Initialize return value to 0.
Work on documentation.
* dictd/main.c (kwd_user_db): Rename `get-password' to `password-resource',
and `get-groups' to `group-resource'.
* doc/dico.texi: Document authentication.
Housekeeping.
* configure.ac, NEWS, README: Change bug-reporting email.
* dictd/dictd.c (dictd_close_databases): Remove duplicated function.
(close_databases): issue a log notice if dictd_close_database returns failure.
* doc/dico.texi: Update.
Housekeeping.
* doc/Makefile.am (check-options): Improve rule.
* doc/check-docs.sh: Squeeze repeated newlines in sed output.
Untabify docs.
2008-07-02 Sergey Poznyakoff
Work on documentation and examples.
* dictd/commands.c: Bugfix.
* doc/dico.texi: Describe an example Guile module.
* modules/Makefile.am: Rename `sample' to `template'.
* modules/sample.scm, modules/sample.c: Rename to ...
* modules/template.scm, modules/template.c: ... this.
* tests/dictd.cfin: Add database definitions for an example Guile module.
* tests/glossary.scm (mapcan): Do not export.
2008-06-28 Sergey Poznyakoff
Minor change.
* dictd/server.c (handle_connection): Return textual replies to the client
if its IP is not allowed to connect and if the server is not able to fork.
Improve docs.
* doc/dico.texi: Create master menu.
* doc/proto.texi: Minor changes.
Improve docs.
* doc/dico.texi: Spell-check. Resolve hanging xrefs.
* doc/proto.texi: Completed.
Improve docs.
* doc/Makefile.am (dico_TEXINFOS): Add proto.texi.
(check-unrevised rule): Scan all texinfo sources.
* doc/dico.texi (Dictionary Server Protocol): New appendix.
* doc/proto.texi: New file.
Bugfixes.
* lib/mapstream.c (_mapfile_open): Fix computing open flags.
* lib/stream.c (dico_stream_close, dico_stream_destroy): Be robust in
case of NULL arguments.
Improve --config-help output.
* dictd/config-format.c (format_simple_statement): Do not output superfluous <>
delimiters.
2008-06-27 Sergey Poznyakoff
Bugfix.
* modules/dict.org/dictstr.c (_dict_read_dzip): Fix length calculation.
Add a sample Guile module.
* tests/glossary.scm: New file
Pass command line arguments to the Guile init script.
* doc/dico.texi (Guile API): Document init-args.
* modules/guile/guile.c (init-args): New initialization parameter.
(load_path_handler, guile_load): Pass command line to the init script.
(dico-strat-select?): Bugfix: swap 2nd and 3rd arguments to the selector.
(guile_init_args): New variable.
Improve docs.
* doc/dico.texi: Document Guile API and Dico Scheme Primitives.
2008-06-25 Sergey Poznyakoff
Minimize number of comparisons in suffix strategy.
* modules/dict.org/dictorg.c (compare_entry_ptr): New function.
(suffix_match): Quicksort the result entries. Remove duplicates.
Minor changes.
* Makefile.am (ChangeLog rules): Remove eventual '' markers.
* modules/dict.org/dictorg.c (init_suffix_index): Run qsort only once.
Minor fixes
2008-06-23 Sergey Poznyakoff
Implement command aliasing.
* dictd/Makefile.am (dictd_SOURCES): Add alias.c
* dictd/alias.c: New file.
* dictd/commands.c (dictd_handle_command): Expand aliases.
* dictd/dictd.h (alias_install, alias_expand): New prototypes.
* dictd/main.c (allow_cb, deny_cb, apply_acl_cb, set_user)
(set_supp_group, set_mode, set_log_facility, set_dict_handler)
(enable_capability, set_defstrat): Improve error handling.
(alias_cb): New function.
(keywords): New keyword `alias'.
* tests/dictd.cfin: Define some aliases and document them.
* doc/dico.texi: Document aliasing support.
Documentation.
* doc/dico.texi: Update docs for Guile module.
2008-06-22 Sergey Poznyakoff
Bugfix.
* dictd/server.c (dictd_server): Remove pidfile before terminating.
Documentation.
* TODO: Update.
* doc/dico.texi: Document guile module.
* modules/Makefile.am (EXTRA_DIST): Add sample.scm
* modules/sample.scm: New file.
* modules/sample.c: Update.
* modules/guile/guile.c: Minor fix in a docstring.
2008-06-21 Sergey Poznyakoff
Fix keeping track of input line numbers.
* dictd/config-lex.l: Fixup line numbers obtained from m4 #line directives.
* dictd/pp.c: Output information used for the above fixup.
* dictd/dictd.h (parse_line_cpp, parse_line): Remove prototypes.
(install_text): New prototype.
Allow to create Scheme matching strategies.
* modules/guile/guile.c (dico-register-strat): New function.
2008-06-17 Sergey Poznyakoff
Bugfixes.
* guile/guile.c (dico-strat-default?): Fix a typo.
(init_vtab): Check for SCM_EOL
(mod_init): Move constistency checking to mod_init_db.
(mod_init_db): Fix the call to init_vtab.
Add consistency checking. Attempt to diagnose all missing virtual functions.
Provide a way for modules to tell if a default strategy is being used. Fix visibilty of symbols in guile.c
* include/dico/strat.h (struct dico_strategy): New field is_default.
(dico_strategy_is_default_p): New macro.
* include/dico/types.h (dico_strategy_t): Change into a typedef.
* lib/strat.c (default_strategy): Remove const qualifier.e
(dico_strategy_find): Remove const qualifier from the return type.
(dico_set_default_strategy): Clear/set strat->is_default as appropriate.
* modules/guile/guile.c (struct _guile_strategy): Remove const qualifier.
(dico-strat-description): Fix mistyped Scheme name.
(dico-strat-default?): New function.
(_guile_init_funcs): Explicitly export all Scheme interfaces.
(mod_init_db): Fix inconsistent return type.
2008-06-16 Sergey Poznyakoff
Minor fixes.
* modules/guile/guile.c: Minor fixes.
Use virtual function tables. A database is allowed to have its own interface functions.
* modules/guile/guile.c (guile_call_proc): Change type of the second argument.
All callers updated.
(guile_init_fun): New variable.
(guile_proc_name): Change all underscores to dashes.
(guile_proc): Remove.
(guile_vtab): New type, instead of it.
(global_vtab): New variable.
(init_vtab): New function.
(init_option): Remove function name options. Add `init-fun' option.
(mod_init): Initialize global_vtab.
(mod_init_db): Initialize database vtab.
(mod_match, mod_define, mod_output_result, mod_result_count)
(mod_compare_count, mod_free_result): Store pointer to the db in the result.
2008-06-15 Sergey Poznyakoff
Revert c665e5de094d4. Was not worth the candles.
* dictd/dictd.h (dictd_module_t): Remove.
(dictd_module_instance_t): Move there significant fields from dictd_module_t.
* dictd/loader.c: Update all uses of the above.
* include/dico/types.h (dico_instance_t): Remove.
(DICO_CAPA_MULTI_INSTANCE): Remove.
(module_init,module_init_db): Revert changes.
* modules/dict.org/dictorg.c: Revert changes.
* modules/guile/guile.c: Likewise.
* modules/outline/outline.c: Likewise.
2008-06-14 Sergey Poznyakoff
Minor fix.
* modules/guile/guile.c (mod_close, mod_get_text)
(mod_match, mod_define): Remove superfluous dbname argument.
Allow several module instances to be used simultaneously.
* include/dico/types.h (DICO_CAPA_NONE, DICO_CAPA_DEFAULT)
(DICO_CAPA_MULTI_INSTANCE): New macros.
(dico_handler_module.capabilities): New field.
(dico_handler_module.module_init): Change prototype.
(dico_handler_module.module_init_db): Change prototype.
(dico_instance_t): New typedef.
* dict.org/dictorg.c: Reflect changes to include/dico/types.h.
* modules/guile/guile.c: Likewise.
* modules/outline/outline.c: Likewise.
* dictd/config-gram.y (process_ident): Fix error message.
* dictd/dictd.c: Rename dictd_handler_t to dictd_module_instance_t.
* dictd/dictd.h (handler_list): Rename to modinst_list.
(dictd_handler_type): Remove.
(dictd_module_t): New data type.
(dictd_module_instance_t): New data type.
(dictd_handler_t): Remove.
(dictd_database): Rename `mod' to `mod_handle'.
Remove `handler'. Add `instance'.
(database_remove_dependent, dictd_load_module): Change prototypes.
* dictd/loader.c (dictd_load_module0): Use table of modules.
Pass a pointer to instance handle to module_init.
(dictd_load_module): Change argument type.
(dictd_init_database): Pass instance handle to module_init_db.
(dictd_open_database, dictd_close_database)
(dictd_free_database, dictd_get_database_descr)
(dictd_get_database_info, dictd_word_first)
(dictd_word_all, print_matches, dictd_match_word_db)
(print_definitions, dictd_define_word_db): Reflect changes to the internal structure.
* dictd/main.c (handler_list): Rename to modinst_list.
Remove `handler' keyword. Use `load-module' instead.
* tests/dictd.cfin (handler): Rename to `load-module'.
* doc/dico.texi: Update.
2008-06-13 Sergey Poznyakoff
Documentation improvements.
* doc/dico.texi: Document Outline and Dictorg modules.
* README, TODO: Minor changes.
2008-06-12 Sergey Poznyakoff
Documentation improvements.
* dictd/cmdline.opt: Fix docstrings.
* doc/macros.texi (opsummary): Generate a comment.
* doc/Makefile.am (check-options): Use generated comment as a sed anchor to retrieve the list of documented options.
* doc/dico.texi: Resolve some FIXMEs, document operation modes, etc.
Various improvements.
* dictd/dictd.h (DICTD_LOGGING_ENVAR): New macro.
(dictd_log_pre_setup, dictd_log_encode_envar, run_lint): New prototypes.
* dictd/main.c (kwd_database, keywords): Rename apply-acl to visibility-acl.
(dictd_log_pre_setup, dictd_log_encode_envar): New functions.
(main): Call dictd_log_pre_setup.
* dictd/pp.c (run_lint): New function.
* dictd/server.c (pre_restart_lint, pre_restart_lint_internal): New functions.
(server_loop): Restart only if configuration passes lint.
* doc/dico.texi: Document security settings and database visibility.
Use ACLs to control incoming connections.
* dictd/config-lex.l (isemptystr): Allow only ; after the delimiter.
* dictd/dictd.h (connect_acl): New extern.
* dictd/main.c (connect_acl): New global.
* dictd/server.c (handle_connection): Use connect_acl to determine wheter to allow connection.
* doc/dico.texi: Document ACLs
Finish ACLs.
* dictd/acl.c (struct acl_entry): New member acl.
(_parse_sub_acl): New function.
(_parse_group, _parse_acl, _acl_check): Allow sub-acls.
(dictd_acl_check): Second argument gives default result.
* dictd/auth.c (dictd_auth): Call check_db_visibility.
(init_auth_data): Call reset_db_visibility.
* dictd/dictd.c (dictd_loop): Call reset_db_visibility.
* dictd/dictd.h (dictd_acl_check): Change signature.
(struct dictd_database): Remove require_auth and groups.
Add new members acl and visible.
(show_sys_info, ssi_group_list): Remove declarations.
(check_db_visibility, reset_db_visibility): New functions.
(database_visible_p): New macro.
* dictd/main.c (ssi_group_list): Remove.
(require_auth): Remove.
(global_acl): New global.
(apply_acl_cb): New function.
(kwd_database): Remove require-auth and groups. Add apply-acl.
(set_show_sys_info): Remove.
(keywords): Remove sys-info-groups and require-auth. Add apply-acl.
(reset_db_visibility, check_db_visibility): New functions.
(database_visible_p): Remove.
* tests/dictd.cfin: Fix here-document syntax.
Begin implementing ACLs.
* dictd/acl.c: New file.
* dictd/Makefile.am (dictd_SOURCES): Add acl.c
* dictd/config-gram.y: Allow multiple values after ident.
Alsways require a semicolon after MSTRING.
* dictd/config-lex.l (isemptystr): Change signature. Allow semicolon or comma after the EOT delimiter.
(multiline_begin): Fix calculation of the delimiter length.
* dictd/dictd.h (TYPE_ARRAY): New define.
(config_value_t): New member arg.
(dictd_acl_t): New data type.
(dictd_acl_create, dictd_acl_check, dictd_acl_install)
(dictd_acl_lookup): New functions.
(ssi_mode): Remove.
(show_sys_info): Fix declaration.
* dictd/main.c (show_sys_info): Change type.
(kwd_acl): New keywords.
(set_show_sys_info): Argument to show-sys-info is an ACL name.
(keywords): New statement `acl'.
(show_sys_info_p): Rewrite using dictd_acl_check.
* dictd/ident.c (query_ident_name): Remove unused variable.
2008-06-09 Sergey Poznyakoff
Improve docs.
* dictd/main.c: Add check for valid transfer encoding.
* doc/dico.texi: Add summary contents, document `database' statement,
finish `Preprocessing' section.
Improve docs.
* doc/dico.texi: Document pragmatic comments, database modules, tuning and preporcessing.
2008-06-08 Sergey Poznyakoff
Improve docs.
* dictd/lev.c (register_lev): Rename command to XLEV to match the capability name.
* doc/dico.texi: Document logging, access logs, global configuration and capability.
* doc/strftime.texi: Resolve @FIXME-pxref.
Improve the docs.
* dictd/accesslog.c: Fix a typo.
* doc/dico.texi: Update.
2008-06-07 Sergey Poznyakoff
Improve the docs.
* doc/dico.texi: Update.
More fixes.
* dictd/Makefile.am (AM_CFLAGS): Define LOCALSTATEDIR.
* dictd/main.c (pidfile_name): Change the default.
(max_children): Provide the default value.
(keywords): Fix typo in docstring.
Minor improvement.
* dictd/config-gram.y (string_to_sockaddr): Allow to use a hostname
without port or a port without hostname.
Improve configuration parser.
* dictd/config-gram.y (string rule): Add IDENT.
(config_diag, config_warning): New functions.
(config_error): Rewrite using config_diag.
* dictd/config-lex.l: Do not require identifier to appear on a new line.
Fix '\newline' escapes.
Issue error message if stray characters appear in input.
Issue warnings if undefined escape sequence is used.
* dictd/dictd.h (config_warning): New prototype.
Minor changes.
* README: Improve.
* doc/dico.texi: Improve structure.
* configure.ac (LOG_FACILITY): Allow argument in lowercase. Default to LOG_DAEMON.
* dictd/main.c (keywords): Fix typo.
2008-06-06 Sergey Poznyakoff
Work on documentation structure.
* dictd/main.c (config_help): Change docstring.
* doc/dico.texi: Documentation framework.
2008-06-05 Sergey Poznyakoff
Minor changes.
* dictd/accesslog.c (alog_conf_hostname): Print actual server IP address.
* dictd/commands.c (dictd_status): Print `dictd' timer.
* doc/Makefile.am (dico_TEXINFOS): Add strftime.texi
* doc/strftime.texi: New file.
* doc/dico.texi: Use makeinfo auto-sectioning capability.
2008-06-03 Sergey Poznyakoff
Improve access log output.
* dictd/accesslog.c (print_str): Output a dash if fmt is NULL.
All callers updated.
* dictd/main.c (main): Set dico_argcv_quoting_style to hex. This helps keep access log compatible with Apache and existing log analyzer software.
* include/dico/argcv.h (dico_argcv_quoting_style): New enum and global variable.
* lib/argcv.c (argcv_quoting_style): New global variable.
(argcv_quoted_length, argcv_quote_copy): Take into account argcv_quoting_style.
Inplement identity check (RFC 1413).
* dictd/Makefile.am (dictd_SOURCES): Add ident.c
* dictd/ident.c: New file.
* dictd/accesslog.c: Implement %l
* dictd/auth.c (init_auth_data): Reset identity_name.
* dictd/dictd.h (identity_check, identity_name, ident_keyfile): New externs.
(query_ident_name): New proto.
* dictd/main.c (identity_check, identity_name, ident_keyfile): New variables.
(keywords): New keywords `identity-check' and `ident-keyfile'.
* dictd/server.c (handle_connection): Run identity check if required.
* gnulib.modules: Add crypto/des.
Implement more format specs in access log.
* dictd/accesslog.c (sockaddr_to_hostname, sockaddr_to_portname): New functions.
(alog_remote_ip): Use sockaddr_to_hostname.
(alog_local_ip): Print actual IP of the server that handled the request.
(alog_remote_host): Use sockaddr_to_hostname.
(alog_server_port): Implement.
* dictd/dictd.c (dictd_inetd): Initialize server_addr and server_addrlen.
* dictd/dictd.h (UINTMAX_STRSIZE_BOUND): New define.
(server_addr, server_addrlen): New externs.
* dictd/server.c (struct dictd_server): New data type.
(fdtab): Replace with srvtab.
(fdcount): Rename to srvcount.
(server_addr, server_addrlen): New variables.
(handle_connection): Change argument semantics.
Initialize server_addr and server_addrlen.
Minor fix.
* include/xdico.h (timer_get_temp): Remove.
* lib/timer.c: Likewise.
* dictd/commands.c: Use timer_stop instead of timer_get_temp
Implement more access log specifiers.
* dictd/accesslog.c (add_instr): Fill allocated memory with 0s.
(alog_response_size,alog_response_size_clf,alog_time_ms)
(alog_process_time): Implement.
(free_cache): Bugfix. P was used uninitialized.
* dictd/commands.c (dictd_status): Free the temporary timer.
(dictd_match, dictd_define): Initialize total_bytes_out.
* dictd/dictd.h: Include inttostr.h
(total_bytes_out): New extern.
* dictd/loader.c (dictd_match_word_db, dictd_define_word_db): Add missing calls
to access_log_status.
* dictd/ostream.c (total_bytes_out): New variable.
(ostream_write): Update total_bytes_out. Return a meaningful error code.
* include/dico/stream.h (dico_stream_bytes_in, dico_stream_bytes_out): New prototypes.
* lib/stream.c (struct dico_stream): Remove `offset'. Add new fields `bytes_in' and `bytes_out'.
(dico_stream_open, dico_stream_read_unbuffered)
(dico_stream_write_unbuffered): Update bytes_in and bytes_out.
(dico_stream_bytes_in, dico_stream_bytes_out): New functions.
* lib/timer.c (timer_hasher, timer_compare): Use case-insensitive comparison.
(DIFFTIME): Make sure the result is double.
2008-06-02 Sergey Poznyakoff
Implement access log file.
* dictd/Makefile.am (dictd_SOURCES): Add accesslog.c
* dictd/accesslog.c: New file.
* dictd/auth.c (init_auth_data): Free client_id.
* dictd/commands.c (dictd_status): Assign client_id.
(dictd_match, dictd_define): Call access_log.
* dictd/dictd.c (dictd_inetd): Initialize client_addr and client_addrlen.
(dictd_loop): Call access_log_free_cache when finished.
* dictd/dictd.h (client_id, access_log_format, access_log_file)
(client_addr, client_addrlen): New externs.
(get_full_hostname): New proto.
(access_log_status, access_log, compile_access_log)
(access_log_free_cache): New protos.
* dictd/loader.c (dictd_word_first, dictd_word_first, dictd_word_all)
(dictd_match_word_db): Call access_log functions.
* dictd/main.c (client_id): New global variable.
(keywords): New statements access-log-format and access-log-file.
(get_full_hostname): Change return variable, remove static qualifier.
(main): Update call to get_full_hostname, call compile_access_log.
* dictd/server.c (client_addr, client_addrlen): New variables.
(handle_connection): Initialize client_addr and client_addrlen.
* dictd/xscript.c (transcript_flush): New function.
* gnulib.modules: Add fprintftime.
* include/xdico.h (xdico_assign_string): New proto.
* lib/xutil.c (xdico_assign_string): New function.
* tests/dictd.cfin: Configure timing output and access log.
2008-05-31 Sergey Poznyakoff
Minor fix.
* dictd/pp.c: Fix indentation.
(try_file): Bugfix.
Preprocess the configuration file.
* configure.ac (--without-preprocessor): New option.
(DEFAULT_PREPROCESSOR): New variable.
* dictd/pp-setup: New file.
* dictd/pp.c: New file.
* dictd/Makefile.am (dictd_SOURCES): Add pp.c
(AM_CFLAGS): Add -DDEFAULT_VERSION_INCLUDE_DIR, -DDEFAULT_INCLUDE_DIR,
-DDEFAULT_PREPROCESSOR
(EXTRA_DIST): Add pp-setup.
(inc_DATA): New var. Add $(PP_SETUP_FILE)
* dictd/cmdline.opt: New options --syslog, -E, --preprocessor,
--no-preprocessor, --include-dir.
* dictd/config-lex.l (fillbuf, ctx_lookup, push_source, pop_source)
(get_file_name, config_include): Remove.
(YY_INPUT): Change definition.
(config_lex_begin): Rewrite using preprocessor interface.
(config_lex_end): Empty placeholder.
* dictd/dictd.h (getmaxfd): New macro (from server.c).
(preprocessor, debug_level, debug_level_str): New externs.
(MODE_PREPROC): New constant.
(dictd_log_setup, include_path_setup, add_include_dir, parse_line_cpp)
(parse_line, pp_init, pp_done, preprocess_config, pp_make_argcv)
(pp_extrn_start, pp_extrn_shutdown, pp_fill_buffer): New protos.
* dictd/server.c (getmaxfd): Move to dictd.h.
* dictd/main.c (debug_level, debug_level_str): New variables.
(dictd_log_setup): New function.
(main): Call include_path_setup. Handle mode == MODE_PREPROC.
* include/dico/argcv.h (dico_argcv_string): 2nd arg is const.
* lib/argcv.c: Likewise.
* include/dico/diag.h (dico_invocation_name): New extern.
* lib/diag.c (dico_invocation_name): New variable.
(dico_set_program_name): Set dico_invocation_name.
Minor fix.
* config-lex.l: \f is a white-space char.
Namespace cleanup.
* dictd/dictd.h (gd_locus_t): Rename to dictd_locus_t.
* dictd/config-gram.y: Likewise.
* dictd/config-lex.l: Likewise.
* dictd/main.c: Likewise.
* dictd/udb.c: Likewise.
Minor fix.
* dictd/main.c (main): Use log_facility in openlog.
Implement STATUS command.
* dictd/commands.c (dictd_quit): Use report_current_timing.
(dictd_status): New function.
(command_tab): Bind dictd_status to STATUS command.
* dictd/dictd.h (num_defines, num_matches, num_compares): Remove.
(struct dico_stat): New data type.
(current_stat, total_stat): New externs.
(report_timing): Change signature.
(report_current_timing): New function, to be used instead of report_timing.
* dictd/loader.c: Use report_current_timing.
* dictd/stat.c (num_defines, num_matches, num_compares): Remove.
(current_stat, total_stat): New variables.
report_timing): Rewrite for general purpose usage.
(report_current_timing): New function.
Minor fix in guile module.
* modules/guile/guile.c (argv_to_scm): Quote each element.
(mod_open): Open function takes variable number of arguments.
2008-05-30 Sergey Poznyakoff
Improve module interface.
* dictd/dictd.c (init_databases): Call dictd_init_database.
(dictd_close_databases, open_databases, close_databases): New functions.
(dictd_loop): Begin with open_databases and end with close_databases.
* dictd/dictd.h (ictd_open_database_handler)
(dictd_close_database_handler): Removed.
(dictd_init_database, dictd_open_database)
(dictd_close_database, dictd_free_database): New protos.
* dictd/loader.c (MODULE_ASSERT): New macro.
(dictd_load_module0): Improve error diagnostic and cosistency
checks.
(dictd_open_database_handler): Remove.
(dictd_init_database): New function.
(dictd_close_database_handler): Remove.
(dictd_close_database): New function.
(dictd_free_database): New function.
* include/dico/types.h (dico_handler_module.version): Change type to unsigned.
(module_open): Change signature
(module_init_db, module_free_db): New functions.
* lib/stream.c (stream_flush_buffer): Fix typo.
* modules/dict.org/dictorg.c: Rewrite for new interface.
* modules/guile/guile.c: Rewrite for new interface.
* modules/outline/outline.c: Rewrite for new interface.
Bugfix.
* lib/stream.c (_stream_buffer_full_p, _stream_flush_buffer): Fix handling of
line buffers.
2008-05-29 Sergey Poznyakoff
Minor improvements.
* modules/guile/guile.c (_dico_port_close): Call scm_gc_free.
(_dico_port_free): Return 0.
(mod_open): Return value of #f or '() means failure.
2008-05-28 Sergey Poznyakoff
Improve docs.
* THANKS, TODO: Update.
* dictd/config-format.c: Place a newline before each statement, except
ones appearing immediately after an opening curly brace.
(format_statement_array): Take an extra argument, specifying whether to
begin the output with a newline.
* dictd/dictd.h (format_statement_array): Change prototype.
(format_docstring): New prototype.
* dictd/main.c (config_help): Output an initial heading.
Introduce interface version numbering.
* include/dico/types.h (DICO_MODULE_VERSION): New define
(struct dico_handler_module): New field `version'.
* modules/dict.org/dictorg.c: Set interface version number.
* modules/guile/guile.c: Likewise.
* modules/outline/outline.c: Likewise.
* modules/sample.c: Likewise.
* lib/Makefile.am (libdico_la_LDFLAGS): Define version-info.
Finished guile.c
* lib/stream.c (_stream_flush_buffer): Second argument instructs whether to
flush all buffer contents in case of line buffers. All callers updated.
* modules/guile/guile.c (dico-strat-selector?, dico-strat-select?)
(dico-strat-name, dico-strat-descriprion): New Scheme functions.
(_guile_init_funcs): New function.
(guile_proc_name): New variable.
(mod_init): Call _guile_init_funcs. Improve error diagnostics.
(mod_match): Call strategy selector if supplied.
Minor change.
* README: Update.
Guile module almost finished.
* modules/guile/guile.c: Implement mod_define, mod_match, and the rest of
mod_ interfaces.
2008-05-27 Sergey Poznyakoff
Develope guile.c
* am/guile.m4: Require Guile 1.8
(_stream_fill_buffer): Return a meaningful error code.
* modules/guile/guile.c: Implement mod_init, mod_open, mod_close, mod_info
and mod_descr.
Bugfixes.
* bootstrap: Obtain aclocal arguments from Makefile.am
* gnulib.modules (xgetdomainname): New module.
* lib/stream.c (dico_stream_read_unbuffered): Return EIO if less than
size bytes were read and pread is NULL.
Add a placeholder for Guile module.
* Makefile.am (ACLOCAL_AMFLAGS): Add am.
* configure.ac: Check for guile.
* am/gsasl.m4, am/guile.m4: New files.
* modules/guile/Makefile.am, modules/guile/guile.c: New files.
2008-05-26 Sergey Poznyakoff
Minor change.
* README-hacking (Debugging): New section.
* utils/gud-wrapper: New function.
Speed up connection startup in daemon mode.
* dictd/dictd.c (dictd_loop): Remove call to dictd_server_init.
(dictd_inetd): Fix arguments to dico_stream_set_buffer.
* dictd/dictd.h (dictd_server_init.): New proto.
* dictd/main.c (main): Call dictd_server_init here.
* dictd/server.c (handle_connectiond): Fix arguments to dico_stream_set_buffer.
* include/dico/types.h (DICO_MAX_BUFFER): New define.
Improve stat info.
* dictd/commands.c (dictd_show_server): Show additional statistics about
the server.
* dictd/dictd.c (dictd_loop): Do not close and destroy the stream, leave
it for the caller.
* dictd/dictd.h (total_forks): New extern.
(ssi_mode): New enum.
(show_sys_info, ssi_group_list): New externs.
* dictd/main.c (show_sys_info, ssi_group_list): New globals.
(show-sys-info, sys-info-groups): New config file statements.
(show_sys_info_p, get_full_hostname): New function.
(main): Init "server" timer.
* dictd/server.c (total_forks): New global.
(register_child): Increase total_forks.
(stop_all, stop_children): Do nothing if childtab is NULL.
(handle_connection): Destroy the stream after dictd_loop terminates.
* include/xdico.h (timer_get_temp): New proto.
* lib/timer.c (timer_get_temp): New function.
* modules/dict.org/dictorg.c (printdef): Improve error checking.
Bugfix.
* modules/dict.org/dictstr.c (_dict_read_dzip): Update str->offset.
Do not show 00-database entries, unless a special option is given.
* modules/dict.org/dictorg.c (show_dictorg_entries): New global.
(show-dictorg-entries): New command line option.
(mod_open): Set show_dictorg_entries.
(RESERVED_WORD): New macro.
(mod_match, mod_define): Use the value of db->show_dictorg_entries
to decide whether to show dict.org service entries.
* modules/dict.org/dictorg.h (struct dictdb): New field `show_dictorg_entries'.
Compile dictorg even if zlib is not found.
* configure.ac: Bugfix.
* modules/dict.org/dictorg.h: Include zlib.h conditionally.
* modules/dict.org/dictstr.c: Conditionally compile libz-related code.
Implement DZIP format.
* README: Update.
* modules/dict.org/dictstr.c (struct _dict_chunk_cache): New field `size'.
All references updated.
(struct _dict_stream): New field `buffer'. All references updated.
(cache_get): Implement.
(get_chunk_num): Remove.
(_dict_destroy): Free buffer and deinitialize inflation engine.
(_dict_open): Compute chunk offsets after header_length has been fixed up.
(_dict_read_dzip): Implement.
Bugfix
* lib/stream.c (dico_stream_write): Initialize bufp.
Minor fix.
* modules/dict.org/dictorg.c (_dict_seek_text, _dict_seek_gzip): Fix
erroneous return type.
Preparatory work for DZIP support.
* modules/dict.org/dictorg.c (free_db): Close and destroy stream.
* modules/dict.org/dictorg.h: Include stdint.h
(GZ_OS_): New defines.
(dict_stream_create): Change signature. All callers changed.
* modules/dict.org/dictstr.c (DE_UNSUPPORTED_VERSION, DE_BAD_HEADER)
(DE_GZIP_SEEK): New defines.
(struct _dict_chunk, struct _dict_chunk_cache): New data types.
(struct _dict_stream): Add dzip-related fields.
(cache_create_chunk, cache_alloc, cache_destroy, cache_promote)
(cache_get, get_chunk_num): New functions.
(_dict_open, _dict_read, _dict_seek): Handle dzip format.
(_dict_strerror): Handle new error code.s
(_dict_read_dzip): New placeholder.
(_dict_seek_dzip): New function.
(dict_stream_create): Take two arguments.
Change signatures of stream I/O functions.
* include/dico/stream.h (dico_stream_read_unbuffered)
(dico_stream_write_unbuffered)
(dico_stream_read, dico_stream_write): buf argument is void*, not char*.
(dico_stream_getdelim): New function.
* lib/stream.c: Likewise.
(dico_stream_seek): Clear eof marker.
Bugfix in dictorg module.
* modules/dict.org/dictorg.c (suffix_match): Fix lost entry.
Bugfix in outline module.
* modules/outline/outline.c (outline_match0): Fix coredump.
Minor improvement in dictorg module.
* modules/dict.org/dictorg.c: Implement trim-ws option.
Silent compiler warnings.
* dictd/config-gram.y, dictd/dictd.h, dictd/main.c, lib/jiscvt.c, lib/utf8.c,
makedict/index.c, makedict/makedict.h, modules/outline/outline.c: Avoid
compiler warnings.
* dictd/logstr.c, dictd/ostream.c, dictd/xscript.c, include/dico/stream.h,
lib/fdstream.c, lib/fltstream.c, lib/iostr.c,
lib/stream.c: dico_stream_write takes const char * buffer.
Delay setting capabilities until the end of config parsing.
* dictd/capa.c (dictd_capa_register): Move actual initialization to dictd_capa_flush.
(dictd_capa_flush): New function.
* dictd/cmdline.opt: New option --lint (-t).
* dictd/dictd.h (config_lint_option): New extern.
* dictd/main.c (config_lint_option): New global.
(main): Call dictd_capa_flush. Exit immediately if config_lint_option is set.
Provide library functions for parsing module command lines.
* include/dico.h: Include dico/parseopt.h.
* include/dico/Makefile.am (pkginclude_HEADERS): Add parseopt.h
* include/dico/parseopt.h: New file.
* lib/Makefile.am (libdico_la_SOURCES): Add parseopt.c.
* lib/parseopt.c: New file. Ported from pam-modules.
* modules/dict.org/dictorg.c (mod_init, mod_open): Use dico_parseopt to
parse command line.
(free_db): Free suf_index.
Minor improvement.
* modules/dict.org/dictorg.c (mod_open): Additional option "sort" forces sortin of the index.
Bugfixes.
* dictd/commands.c (_show_database): Print "" if the database description is NULL.
* dictd/loader.c (print_definitions): Likewise.
* modules/dict.org/dictorg.c (parse_index_entry): Use \t as a field separator.
(_match_simple): Fix coredump.
2008-05-25 Sergey Poznyakoff
Another minor update.
* utils/bdfextract.pl: Fix bitmasks.
Minor update for completeness sake.
* utils/Makefile.am: Remove revbits.
* utils/revbits.c: Remove.
* utils/bdfextract.pl: Compute reversed bit string in place.
* utils/mkbushufont.awk: Compute reversed bit string in place.
Keep namespace clean.
* include/dico/types.h (ARRAY_SIZE): Rename to DICO_ARRAY_SIZE.
* dictd/config-gram.y: Likewise.
* dictd/dictd.c: Likewise.
* modules/dict.org/dictorg.c: Likewise.
* modules/outline/outline.c: Likewise.
Implement `size' method in streams.
* include/dico/stream.h (dico_stream_set_size, dico_stream_size): New functions.
* lib/fdstream.c (fd_size, dico_fd_stream_create): Implement size method.
* lib/mapstream.c (_mapfile_size, dico_mapfile_stream_create): Implement size method.
* lib/stream.c (struct dico_stream): New member size.
(dico_stream_set_size, dico_stream_size): New functions.
Avoid building programs whose requisite libraries are missing.
* configure.ac: Remove leftover --with-log-facility option.
Detect presence of libz.
Do not abort if no Berkeley DB is found.
Set BUILD_JDICT_PROGS substitution variable if libdb is found.
(check_bdb): Make sure -ldb does not make it into LIBS.
* dictd/Makefile.am (INCLUDES): Remove DB_INCLUDES
(LDADD): Remove DB_LIBS.
* makedict/Makefile.am (bin_PROGRAMS): Set to @BUILD_JDICT_PROGS@
* modules/dict.org/Makefile.am (dictorg_la_LIBADD): Replace -lz with @LIBZ@
Initial implementation of dict.org format.
* README: Update.
* include/dico/stream.h (dico_stream_seek): New prototype.
(dico_mapfile_stream_create): New prototype.
* lib/Makefile.am (libdico_la_SOURCES): Add mapstream.c.
* lib/mapstream.c: New file.
* lib/list.c (dico_list_insert_sorted): Bugfix: increase count when
adding a new entry.
* lib/stream.c (all functions): Return a meaningful error code.
(dico_stream_strerror): Bugfix.
(dico_stream_seek): Implement.
* modules/dict.org/Makefile.am (dictorg_la_SOURCES): Add dictstr.c.
* modules/dict.org/dictstr.c: New file.
* modules/dict.org/dictorg.c: Implement full functionality.
* modules/dict.org/dictorg.h: Include zlib.h. Add dict.org format definitions.
2008-05-23 Sergey Poznyakoff
MInor fix.
* lib/fltstream.c (filter_wr_flush): Make sure the output is terminated with
CRLF.
Merge branch 'master' of ssh://gray@git.gnu.org.ua/gitroot/dico
./F
2008-05-20 Sergey Poznyakoff
Update the docs.
* README, README-hacking: Update.
2008-05-19 Sergey Poznyakoff
Add modules/dict.org/data.c
Add modules/dict.org/crc.c
Minor change.
* modules/dict.org/Makefile.am (dictorg_la_SOURCES): Add crc.c and data.c
(noinst_HEADERS): New variable. Add crc.h and dictorg.h
* modules/dict.org/crc.h: New file.
* modules/dict.org/dictorg.h: New file.
* modules/dict.org/dictorg.c: Move includes and data definitions to
dictorg.h
* include/dico/util.h: New file * lib/xutil.c: Renamed from util.c (make_full_file_name): Rewrite using dico_full_file_name. * lib/util.c: New file. * include/dico.h: Include dico/util.h * include/dico/Makefile.am (pkginclude_HEADERS): Add util.h. * include/dico/filter.h (dico_base64_input): New prototype. * lib/Makefile.am (libdico_la_SOURCES): Add util.c (libxdico_a_SOURCES): Remove util.c, add xutil.c * lib/base64.c (b64_input): Rename to dico_base64_input. All callers changed. * modules/dict.org/dictorg.c: Implement mod_init and, partially, mod_open. Parse index file.
Fix coredump in outline module.
* modules/outline/outline.c (outline_define): Fix coredump on missing
definitions.
2008-05-18 Sergey Poznyakoff
Add session transcript feature.
* dictd/logstr.c: New file.
* dictd/xscript.c: New file
* dictd/Makefile.am (dictd_SOURCES): Add logstr.c and xscript.c
* dictd/dictd.c (dictd_loop): Set up session transcript, if requested.
* dictd/dictd.h (transcript): New declaration.
(transcript_stream_create, log_stream_create): New proto.
* dictd/main.c (transcript): New variable.
(keywords): New keyword "transcript".
Implement suffix matching strategy.
* outline/outline.c (struct entry): New fields: length and peer.
(struct outline_file): New field suf_index.
(alloc_entry): Set length and wordlen.
(suffix_match): New function.
(strat_tab): Add suffix_match.
(revert_word, init_suffix_index): New functions.
(exact_match, prefix_match): Initialize x.length and x.wordlen. Set result
type to result_match;
(compare_entry_ptr): New function.
(outline_close): Free suf_index.
(outline_define): Set result type to result_define.
Re-create the test dictionary.
* tests/devils.out: Re-create.
2008-05-17 Sergey Poznyakoff
Provide a macro for the size of a soundex buffer.
* include/dico/utf8.h (DICO_SOUNDEX_SIZE): New macro.
* dictd/dictd.c (soundex_sel): Use DICO_SOUNDEX_SIZE macro.
* lib/soundex.c (dico_soundex): Use DICO_SOUNDEX_SIZE macro.
Minor change
* Makefile.am (ChangeLog): Append Local variables section.
2008-05-16 Sergey Poznyakoff
Add a framework for dict.org module.
* modules/dict.org: New directory.
* modules/dict.org/Makefile.am, modules/dict.org/dictorg.c
* modules/sample.c: New file.
* configure.ac, modules/Makefile.am: Add modules/dict.org.
* dictd/Makefile.am (dictd_SOURCES): Add stat.c * dictd/stat.c: New file. * dictd/commands.c, dictd/dictd.c: Use begin_timing/report_timing. * dictd/dictd.h (num_defines, num_matches, num_compares): New globals. (begin_timing, report_timing): New prototypes. * dictd/loader.c (print_timing): Remove. Use begin_timing/report_timing for stat output. Use module_compare_count to retrieve number of comparisons. * modules/outline/outline.c: Keep track of the number of comparisons. Provide module_compare_count method.
Report overall timing.
* dictd/commands.c (dictd_quit): Print timing information.
* dictd/dictd.c (dictd_loop): Start timer.
Minor change.
* tests/devils.out: Fix typos.
Implement Soundex strategy.
* lib/soundex.c: New file
* lib/Makefile.am (libdico_la_SOURCES): Add soundex.c.
* dictd/dictd.c (dictd_init_strategies): Add soundex.
* include/dico/utf8.h (dico_soundex): New proto.
Implement regex strategies.
* dictd/regex.c: New file.
* dictd/Makefile.am (dictd_SOURCES): Add regex.c
* dictd/loader.c (dictd_load_module0): Update.
(dictd_word_first, dictd_word_all, dictd_word_db): Use new dico_strategy_t type.
(ictd_match_word_first, ictd_match_word_all): Likewise.
* dictd/commands.c, dictd/dictd.c, lib/strat.c,
modules/outline/outline.c: Use new dico_strategy_t type.
* dictd/config-gram.y (config_error): Correctly handle locus->file == NULL.
* dictd/dictd.h (register_lev, register_regex): New functions.
* dictd/lev.c (lev_sel): Use new signature.
* dictd/main.c (main): Call register_regex.
* include/dico/strat.h: Move typedef to types.h
Use new dico_strategy_t type in prototypes
* include/dico/types.h (dico_select_t): Change signature.
(struct dico_handler_module.module_match_all): Remove.
(struct dico_handler_module.module_match): Take const dico_strategy_t strat as
the 2nd argument.
2008-05-15 Sergey Poznyakoff
Minor fixes.
* dictd/loader.c (print_matches): Quote the word. This is not required by
the RFC, but some clients (kdict) expect it.
* dictd/server.c (dictd_server): Fix copy-n-paste errors.
Implement Levenshtein and Damerau-Levenshtein match strategies.
* dictd/lev.c: New file.
* dictd/Makefile.am (dictd_SOURCES): Add lev.c.
* dictd/commands.c (dictd_match): Update calls to dictd_match_* functions.
* dictd/dictd.h (struct dictd_database.mod): Fix type.
(dictd_match_word_db, dictd_match_word_first)
(dictd_define_word_db): Change type of `strat'.
(DICTD_DEFAULT_STRATEGY): Define to "lev".
* dictd/loader.c (dictd_load_module0): Bail out if the module does not define
mandatory methods.
(dictd_word_first, dictd_word_all)
(dictd_match_word_db, dictd_match_word_all): Change type of `strat'.
* dictd/main.c: Call register_lev.
* include/dico/types.h: New file.
* include/dico/Makefile.am (pkginclude_HEADERS): Add types.h
* include/dico.h: Move all definitions to dico/types.h. Include it.
(dico_handle_t, dico_result_t): Change typedefs to help improve compilation
diagnostics.
* include/dico/diag.h: Include dico/types.h, instead of sys/types.h.
(DICO_PRINTFLIKE): Remove redefinition.
* include/dico/strat.h: Include dico/types.h, instead of sys/types.h.
(struct dico_strategy): New members `sel' and `closure'.
* lib/strat.c (dico_strategy_dup): Handle new fields.
* include/dico/stream.h (dico_linebuf_t, dico_stream_t): Move to dico/types.h
* include/dico/utf8.h (dico_levenshtein_distance): First two arguments are
const.
* lib/levenshtein.c: Likewise.
* modules/outline/outline.c: Implement module_match_all.
Minor change.
* include/dico/utf8.h, lib/utf8.c: Fix a typo.
Improve UTF-8 functions. Add a function for computing levenshtein distance.
* lib/levenshtein.c: New file.
* lib/Makefile.am (libdico_la_SOURCES): Add levenshtein.c
* dico/utf8.h (utf8_symcmp, utf8_symcasecmp, utf8_strcasecmp)
(utf8_strncasecmp,utf8_mbstr_to_wc)
(dico_levenshtein_distance): New prototypes.
* lib/utf8.c (utf8_symcmp, utf8_symcasecmp, utf8_strcasecmp)
(utf8_strncasecmp,utf8_mbstr_to_wc): New functions.
* modules/outline/outline.c: Use utf8 comparitors.
Add ChangeLog rule. Use fmt to split long lines in ChangeLog
Move diagnostics functions to libdico.
* include/dico/diag.h: New file
* lib/diag.c: Prefix all global symbols with dico_. All uses updated.
* lib/Makefile.am (libxdico_a_SOURCES): Remove diag.c
(libdico_la_SOURCES): Add diag.c
* include/dico.h: Include dico/diag.h
* include/dico/Makefile.am (pkginclude_HEADERS): Add diag.h
* modules/outline/outline.c: Use dico_log instead of syslog.
2008-05-14 Sergey Poznyakoff
Discontinue ChangeLog, use git log to regenerate it when making a distribution.
* .gitignore: Add ChangeLog
* ChangeLog: Rename to ChangeLog.2008
* Makefile.am (EXTRA_DIST): Add ChangeLog.2008
(make-ChangeLog): New rule.
(dist-hook): New rule.
* bootstrap.conf: Create a placeholder for ChangeLog.
* gnulib.modules: Add gitlog-to-changelog
2008-05-13 Sergey Poznyakoff
Minor changes.
* doc/Makefile.am: Add check-options rule
* doc/gjdict.texi: New file.
* utils/Makefile.am: Remove helpcmp.pl
* utils/helpcmp.pl: Remove.
Introduce a documentation framework:
* doc/.gitignore, doc/Makefile.am, doc/check-docs.sh,
doc/dico.texi, doc/fdl.texi, doc/gendocs_template,
doc/macros.texi, doc/mastermenu.el, doc/rendition.texi,
doc/untabify.el: New files.
* Makefile.am (SUBDIRS): Add doc.
* configure.ac (RENDITION): New subst variable.
(AC_CONFIG_FILES): Add doc/Makefile.
Implement quoted-printable encoding.
* lib/Makefile.am (libdico_la_SOURCES): Add qp.c
* lib/qp.c: New file. Implementation of quoted-printable
encoding/decoding.
* lib/fltstream.c (dico_codec_stream_create): New function.
* dictd/ostream.c (print_headers): Use dico_codec_stream_create to
create encoder stream.
* include/dico/filter.h (dico_codec_stream_create)
(dico_qp_stream_create,dico_qp_decodeflush, if not NULL.
(dico_stream_destroy): Call stream->destroy, if not NULL.
* modules/outline/outline.c (outline_output_result): Fix return
value.
2008-05-12 Sergey Poznyakoff
Implement OPTION MIME.
* README: Update.
* dictd/Makefile.am (dictd_SOURCES): Add mime.c, ostream.c.
* dictd/dictd.h (register_mime, dictd_ostream_create): New
prototypes.
* dictd/loader.c (print_matches, print_definitions): Use ostream
for output.
* dictd/commands.c (dictd_help, dictd_show_info)
(dictd_show_databases, dictd_show_strategies)
(dictd_show_strategies): Use ostream for output.
* dictd/main.c (main): Call register_mime.
* tests/dictd.cfin: Request mime capability.
* lib/stream.c (dico_stream_read_unbuffered)
(dico_stream_write_unbuffered): Return 1 and set errno to ENOSYS
if the underlying method is NULL.
Implement authentication and database authorization.
* dictd/auth.c (auth): Set user_name and user_groups.
(init_auth_data): New function.
* dictd/commands.c (dictd_show_info): Use database_count and
database_iterate instead of dico_list_ functions.
* dictd/dbtext.c (dbtext_get_groups): Store groups in a list.
* dictd/dictd.c (dictd_loop): Call init_auth_data before
returning.
* dictd/dictd.h (user_name, user_groups): New globals.
(struct dictd_database): New fields: require_auth and groups.
(database_count, database_iterate, database_visible_p): New
prototypes.
(struct udb_def._db_get_groups): Change signature.
(udb_get_groups): Change signature.
(init_auth_data): New function.
* dictd/loader.c (dictd_word_first, dictd_word_all): Ignore
databases that are not visible.
(dictd_define_word_db): Restore accidentally deleted call to
mp->module_define.
* dictd/main.c (require_auth, user_name, user_groups): New
variables.
(kwd_database): New keywords: `require-auth' and `groups'.
(keywords): New keyword `require-auth'.
(database_visible_p, database_count, database_iterate): New
functions.
(cmp_database_name): Ignore invisible databases.
(struct dictd_user_db._db_get_groups): Change signature.
(udb_get_groups): Change signature.
* include/dico/list.h (dico_list_intersect_p): New function.
* lib/list.c (dico_list_intersect_p): New function.
* modules/outline/outline.c (compare_prefix): Bugfix.
* tests/devils.out (PRECIPITATE): Remove duplicate entry.
Optionally print timing information for match and define commands.
* dictd/commands.c (dictd_match): Resolve strategy before passing
it to the handler module.
* dictd/dictd.h (timing_option): New global.
* dictd/loader.c (print_timing): New function.
(dictd_word_first, dictd_word_all, dictd_match_word_db)
(dictd_match_word_first, dictd_match_word_all)
(dictd_define_word_db, dictd_define_word_first)
(dictd_define_word_all): Optionally print timing information.
* dictd/main.c (timing_option): New global.
(keywords): New statement `timing'.
* gnulib.modules: Add gettimeofday.
* include/xdico.h (xdico_timer_t): New data type.
(timer_get, timer_start, timer_stop, timer_reset)
(timer_get_real, timer_get_user, timer_get_system)
(timer_format_time): New functions.
* lib/Makefile.am (libxdico_a_SOURCES): Add timer.c
* lib/timer.c: New file.
Implement prefix matches
Update
Implement working outline module. Add example data and configuration, for testing.
* dictd/loader.c (dictd_word_all): Bugfix
(print_matches): Fix output.
(print_definitions): Remove optional ': text follows' part, as it
seems to confuse some clients (notably, kdict).
* include/dico.h: Include dico/utf8.h
* include/dico/utf8.h: New file.
* include/xdico.h (utf8_*): Move to dico/utf8.h
* lib/Makefile.am (libdico_la_SOURCES): Add utf8.c.
(libxdico_la_SOURCES): Remove utf8.c.
* lib/utf8.c: Do not include xalloc.h and xdico.h, include dico.h
instead.
(utf8_wc_strdup): Use calloc.
(utf8_wc_to_mbstr): Do not use logmsg.
* modules/outline/outline.c: Working implementation.
* tests/.gitignore, tests/Makefile.am, tests/devils.out,
tests/dictd.cfin
* Makefile.am (SUBDIRS): Add tests.
* configure.ac (AC_CONFIG_FILES): Add tests/Makefile.am
2008-05-11 Sergey Poznyakoff
Provide a generalized framework for ! and * (matches and defines).
* dictd/commands.c (dictd_match): Handle ! and *.
* dictd/dictd.h (dictd_match_word): Remove.
(dictd_match_word_db, dictd_match_word_first)
(dictd_match_word_all): New functions.
* dictd/loader.c (dictd_word_first, dictd_word_all): New functions.
(dictd_match_word): Rename to
dictd_match_word_db.
(dictd_match_word_first,dictd_match_word_all): New functions.
(dictd_define_word_first, dictd_define_word_all): Rewrite using
dictd_word_first and dictd_word_all.
Provide a framework for ! and * searches.
* dictd/commands.c (dictd_define): Implement ! and * searches.
* dictd/dictd.h (dictd_define_word): Remove.
(dictd_define_word_db, dictd_define_word_first)
(dictd_define_word_all): New prototypes.
* dictd/loader.c (print_definitions): New function.
(dictd_define_word): Rename to dictd_define_word_db; use
print_definitions.
(dictd_define_word_first, dictd_define_word_all): New functions.
Provide a default strategy.
* dictd/dictd.c (init_strategies): Rename to dictd_init_strategies.
(dictd_server_init): Remove call to init_strategies, it is done in
main. Ensure that a default strategy is set.
* dictd/dictd.h (DICTD_DEFAULT_STRATEGY): New define.
(dictd_init_strategies): New prototype.
* dictd/main.c: Fix typos in diagnostics messages.
(keywords): New statement `default-strategy'.
(main): Call dictd_init_strategies.
* include/dico/strat.h (dico_set_default_strategy)
(dico_get_default_strategy): New prototypes.
* lib/strat.c (dico_set_default_strategy)
(dico_get_default_strategy): New functions.
2008-05-10 Sergey Poznyakoff
Initial implementation of MATCH and DEFINE.
* README: Update.
* dictd/commands.c: Initial implementation of MATCH and DEFINE
commands.
* dictd/dictd.c (init_strategies): Always define the "prefix"
strategy.
* dictd/dictd.h (dictd_match_word, dictd_define_word): New
functions.
* dictd/fdio.c (fd_close): Don't raise error on closing descr -1.
* dictd/loader.c (dictd_get_database_descr)
(dictd_get_database_info): Bugfix.
(dictd_match_word, dictd_define_word): New functions.
* include/dico.h (dico_result_t): New data type.
(struct dico_handler_module): Change signatures of module_match
and module_define. Add new methods: module_output_result,
module_result_count, module_free_result.
* modules/outline/outline.c: Reflect changes to struct
dico_handler_module.
2008-05-07 Sergey Poznyakoff
Bugfix.
* dictd/dictd.c (tokenize_input): Correctly handle quoted arguments.
Rewrite interface to strategies.
* include/dico/strat.h: New file.
* include/dico/Makefile.am (pkginclude_HEADERS): Add strat.h
* lib/strat.c: New file.
* lib/Makefile.am (libdico_la_SOURCES): Add strat.c
* dictd/dictd.c (init_databases): Remove querying for supported
strategies.
(init_strategies): New function.
(dictd_server_init): Call init_strategies.
* dictd/commands.c (dictd_show_strategies): Use new interface to
strategies.
* dictd/dictd.h (dictd_database_t): Remove stratc and stratv.
* dictd/loader.c (strat_name_cmp, add_strategies)
(dictd_database_get_strats): Remove.
* dictd/main.c (strategy_list): Remove.
(dictd_database_free): Remove references to stratc and stratv.
* include/dico.h: Include dico/strat.h
(dico_strategy_t): Move definition to dico/strat.h
(struct dico_handler_module): Remove module_strats.
* outline/outline.c (outline_strats): Remove. Register strategies
in outline_init.
Implement SHOW STRAT. Begin writing `outline' handler module.
* modules: New directory.
* modules/Makefile.am: New file.
* modules/outline: New directory.
* modules/outline/Makefile.am: New file.
* modules/outline/outline.c: New file.
* Makefile.am (SUBDIRS): Add modules.
* configure.ac (AC_CONFIG_FILES): Add modules, modules/outline
* dictd/commands.c (_show_database, dictd_show_info): Use data
returned by the backend module, if not configured in the database
structure.
(dictd_show_strategies): New function.
(command_tab): Implement show strat.
* dictd/dictd.c (init_databases): Initialize strategy list.
* dictd/dictd.h (strategy_list): New declaration.
(dictd_get_database_descr, dictd_free_database_descr)
(dictd_get_database_info, dictd_free_database_info): New
prototypes.
* dictd/loader.c (_add_load_dir): Bugfix.
(add_strategies, strat_name_cmp): New functions.
(dictd_database_get_strats): Rewrite using new version of
module_strats.
(dictd_get_database_descr, dictd_free_database_descr)
(dictd_get_database_info, dictd_free_database_info): New
functions.
(dictd_match_word): New placeholder.
* dictd/main.c (strategy_list): New variable.
* include/dico.h (dico_strategy_t): New data type.
(dico_handler_module): New members module_db_info and
module_db_descr.
(module_strats, module_define): Change signature.
* lib/list.c: Initialize p with zeroes.
Add loader.c
* README: Update
* configure.ac: Require libtool 2.2.5a
(DICO_MODDIR): Define
* dictd/loader.c: New file.
* dictd/Makefile.am: Add loader.c.
* dictd/dictd.h (dictd_loader_init): New proto.
* dictd/main.c (main): Call dictd_loader_init.
2008-05-06 Sergey Poznyakoff
Initialize databases.
* dictd/dictd.c (init_databases): New function.
(dictd_server_init): Call init_databases.
* dictd/dictd.h (struct dictd_dictionary): New fields: mod, argc,
argv.
(dictd_open_dictionary_handler): New proto.
* dictd/loader.c (dictd_open_dictionary_handler): New function.
* dictd/main.c (set_dico_handler): Rename to set_dict_handler (fix
a typo). Intialize command, argc and argv.
Load modules.
* dictd/commands.c (dictd_show_databases): Return 554 response if
no databases are configured.
* dictd/dictd.c (dictd_loop): Load all configured handlers.
* dictd/dictd.h: Include ltdl.h
(handler_list, dictionary_list): Add declarations.
(dictd_handler_t): New fields: module and handle.
(dictionary_remove_dependent, dictd_load_module): New proto.
* dictd/loader.c (dictd_load_module): New function.
* dictd/main.c (dictionary_remove_dependent): New function.
* dictd/udb.c (udb_create): Improve error diagnostics.
* include/dico.h: Include dico/argcv.h
(DICO_EXPORT): New define.
(dico_handle_t, struct dico_handler_module): New declarations.
* include/dico/Makefile.am (pkginclude_HEADERS): Add argcv.h.
* include/dico/argcv.h: New file.
* include/dico/list.h (dico_iterator_remove_current): Change
return type.
* lib/Makefile.am (libdico_la_SOURCES): add argcv.c
* lib/argcv.c: New file.
* lib/list.c, lib/url.c: Fix dummy errors.
Forgot to add with the previous commit
Provide an installable library and header files for dico database modules.
* include/dico/Makefile.am: New file.
* include/dico/assoc.h: New file.
* include/dico/list.h: New file.
* include/dico/url.h: New file.
* include/dico/xlat.h: New file.
* include/xdico.h: New file.
* include/dico.h: Rewrite. Installable header.
* include/Makefile.am (pkginclude_HEADERS): New var.
Add SUBDIRS.
* dictd/linebuf.c: Move to ...
* lib/linebuf.c: ... this (with mods).
* dictd/stream.c: Move to ...
* lib/stream.c: ... this (with mods).
* lib/Makefile.am (lib_LTLIBRARIES): New installable library
libdico.la.
(noinst_LIBRARIES): New library libxdico.
* lib/assoc.c, lib/list.c, lib/url.c: Avoid using xalloc calls,
instead return error status and set errno.
* lib/diag.c, lib/iputil.c, lib/userprivs.c, lib/utf8.c,
lib/xalloc-die.c: Include xdico.h
* lib/util.c: Likewise.
(xdico_list_create, xdico_iterator_create, xdico_list_append)
(xdico_list_prepend, xdico_assoc_create, xdico_assoc_add): New
functions.
* .gitignore: Update.
* configure.ac (AC_CONFIG_FILES): Add include/dico/Makefile
* dictd/Makefile.am (dictd_SOURCES): Remove linebuf.c and
stream.c.
(LDADD): Add libxdico.a, libdico.la
* dictd/auth.c, dictd/capa.c, dictd/commands.c, dictd/config-gram.y,
dictd/dictd.c, dictd/dictd.h, dictd/fdio.c, dictd/main.c,
dictd/server.c, dictd/udb.c: Reflect changes to the namespace.
* makedict/Makefile.am (LDADD): Add libxdico.a, libdico.la
* makedict/makedict.h: Include xdico.h
Add loader.c
* README: Update
* configure.ac: Require libtool 2.2.5a
(DICO_MODDIR): Define
* dictd/loader.c: New file.
* dictd/Makefile.am: Add loader.c.
* dictd/dictd.h (dictd_loader_init): New proto.
* dictd/main.c (main): Call dictd_loader_init.
Local Variables:
mode: change-log
version-control: never
buffer-read-only: t
End:
dico-2.2/ChangeLog.2008 0000664 0000000 0000000 00000056013 11726126741 0014451 0 ustar 00root root 0000000 0000000 2008-05-05 Sergey Poznyakoff
Moved to the new project. Namespace cleanup.
2008-05-04 Sergey Poznyakoff
Further fixes.
* dictd/Makefile.am (LDADD): Change libgnu.a to libgnu.la
* makedict/Makefile.am: Likewise.
Minor fixes.
* dictd/dictd.h (handler_extern): Replace with
handler_loadable. All uses changed.
* dictd/main.c (set_handler_type): Bugfix.
Add preliminary ltdl support.
* .gitignore: Add libtool and libltdl
* Makefile.am (SUBDIRS): Add libltdl
* README-hacking: Update.
* bootstrap: Pass --ltdl flag to libtoolize, if necessary.
* configure.ac: Use ltdl.
* makedict/index.c: Minor changes.
* doc: New directory
* doc/rfc2229.txt: New file.
Document configuration statements.
* dictd/Makefile.am (dictd_SOURCES): Add config-format.c
* dictd/config-format.c: New file.
* dictd/cmdline.opt: New option `--config-help'.
* dictd/config-gram.y: Reflect changes to struct config_keyword.
* dictd/dbtext.c: Shut gcc warnings.
* dictd/dictd.h (cfg_callback): Remove.
(struct config_keyword): New members argname and docstring.
(format_statement_array, config_help, dictd_server): New
prototypes.
* dictd/main.c: Provide docstrings for configuration statements.
(config_help): New function.
2008-05-03 Sergey Poznyakoff
Implement AUTH command.
* dictd/Makefile.am (dictd_SOURCES): Add auth.c, dbtext.c, udb.c.
* dictd/auth.c, dictd/dbtext.c, dictd/udb.c: New files.
* dictd/capa.c (dictd_capa_add): Fail if init finction returns
non-zero.
* dictd/dictd.c (msg_id): New global.
(initial_banner): Save msg_id for further use.
(trim): Move to the library. All uses updated.
* dictd/dictd.h (msg_id): New declaration.
Add udb prototypes and declarations.
* dictd/main.c (user_db): New global.
(user_db_config): Call udb_create.
(main): Call udb_init and register_auth.
* include/dico.h (struct dict_assoc): New data type.
(dict_assoc_create, dict_assoc_destroy, dict_assoc_add,
dict_assoc_find, dict_assoc_remove): New prototypes.
(struct dict_url,dict_url_t): New data types.
(dict_url_parse, dict_url_destroy, dict_url_get_arg)
(dict_url_full_path): New prototypes.
(make_full_file_name, trimnl): New prototypes.
* lib/Makefile.am (libgjdict_a_SOURCES): Add assoc.c, url.c,
util.c.
* lib/assoc.c, lib/url.c, lib/util.c: New files.
Fix handling of continuation strings in configuration file.
* dictd/config-gram.y (stmt_end): Get kw as argument and use it to
compute target pointer.
(slist,slist0): Fix algorithm for coalescing string parts.
* dictd/config-lex.l: Return QSTRING for quoted strings.
* dictd/main.c (user-db): New configuration block statement.
(set_handler, set_dictionary): Fix handling of callback_set_value.
* include/dico.h (dict_list_intersect): New prototype.
* lib/list.c (dict_list_intersect): New function.
Capability framework.
* dictd/Makefile.am (dictd_SOURCES): Add capa.c
* dictd/capa.c: New file.
* dictd/commands.c (command_tab): Remove capability-dependent
commands.
(command_list): New variable.
(dictd_add_command, dictd_init_command_tab): New finctions.
(dictd_show_std_help,locate_command): Rewrite using list of
commands.
* dictd/dictd.c (output_capabilities): Implement.
* dictd/dictd.h (dictd_init_command_tab,dictd_add_command)
(dictd_capa_register, dictd_capa_add)
(dictd_capa_iterate): New protos.
* dictd/main.c (keywords): New statement `capability'.
(main): Initialize command and capability lists.
2008-05-01 Sergey Poznyakoff
Redo command handling. Improve daemon help output. Control
inactivity timeouts.
* dictd/commands.c (dictd_help): Use help strings provided in the
command tab. If help-text (config) begins with a `+', append it
to the default help output.
(dictd_show): Split into separate functions for each show
subcommand:
(dictd_show_info, dictd_show_databases, dictd_show_server);
(command_tab): Use new structure.
(locate_command): Take into account arguments, so that "SHOW INFO"
and "SHOW DB" are recognized as different commands (no matter what
the amount of whitespace between the keywords).
(dictd_show_std_help): New function.
* dictd/dictd.c: Handle inactivity timeout.
* dictd/dictd.h (struct dictd_command): Rewritten.
* dictd/main.c (inactivity_timeout): New variable.
(keywords): New statement `inactivity-timeout'.
* dictd/server.c (handle_connection): Reset signals in child.
* gnulib.modules: Add crypto/md5 and hash.
* include/dico.h: Move #endif to the end of file.
2008-04-30 Sergey Poznyakoff
Preliminary implementation of "SHOW" commands.
* dictd/commands.c: Preliminary implementation of "SHOW" commands.
* dictd/dictd.c (stream_write_multiline): New function.
* dictd/dictd.h (dictionary_list, server_info): New declarations.
(stream_write_multiline, find_dictionary): New prototype.
* dictd/main.c (find_dictionary): New function.
Implement RFC 2229 dialog.
* dictd/commands.c: New file.
* dictd/Makefile.am (dictd_SOURCES): Add commands.c
* dictd/cmdline.opt: New option `--inetd' (`-i')
* dictd/config-lex.l (quote_char): New function.
* dictd/dictd.c: Implement RFC 2229 dialog.
(tokenize_input, stream_writez)
(stream_printf, output_capabilities, initial_banner): New
functions.
* dictd/dictd.h (mode, hostname, program_version)
(initial_banner_text, got_quit, help_text): New globals.
(quote_char, unquote_char): New functions.
(stream_writez, stream_printf): New functions.
(dictd_cmd_fn, struct dictd_command): New data types.
(dictd_handle_command): New function.
* dictd/main.c (hostname, initial_banner_text, help_text): New
globals.
(initial-banner-text, help-text, hostname): New config statements.
* dictd/server.c (dictd_server): Refuse to restart if the
configuration file name is not a full file name.
* gnulib.modules: Add xgethostname.
* include/dico.h: Add utf8 prototypes and declarations.
* lib/utf8.c (utf8_char_width, utf8_strlen, utf8_strbytelen)
(utf8_iter_end_p, utf8_iter_first, utf8_iter_next): New functions.
Normalize the namespace.
* utils/getopt.m4 (GETOPT): Exit if an invalid option is given.
(program_version): Make global.
2008-04-29 Sergey Poznyakoff
Minor changes.
* lib/utf8.c: New file.
* lib/Makefile.am (libgjdict_a_SOURCES): Add utf8.c.
* gnulib.modules: Add c-strcase
* makedict/Makefile.am (LDADD) Swap libgjdict.a and libgnu.a. Add
libextra.a.
Implement daemon and inetd modes.
* dictd/dictd.c, dictd/server.c: New files.
* dictd/Makefile.am (dictd_SOURCES): Add dictd.c and server.c
(LDADD): Swap libgjdict.a and libgnu.a. Add libextra.a.
* lib/userprivs.c: New file.
* lib/Makefile.am (noinst_LIBRARIES): Add libextra.a
(libgjdict_a_SOURCES): Add userprivs.c; remove xalloc-die.c.
(libextra_a_SOURCES): Add xalloc-die.c.
* lib/iputil.c (sockaddr_to_str, sockaddr_to_astr): New functions.
* configure.ac: Check for setegid, setregid, setresgid, seteuid,
setreuid, sysconf, getdtablesize.
(PIDFILE): Remove define.
* dictd/cmdline.opt (console-logging): Rename to stderr.
* dictd/dictd.h: Update.
* dictd/main.c (pidfile_name, shutdown_timeout): New globals.
(user): Replace with :
(user_id, group_id): New variables.
(keywords): New configuration file statements `pidfile' and
`shutdown-timeout'.
(main): Call dictd driver appropriate for the current mode.
* dictd/stream.c (stream_set_error_string): Change type to void.
* include/dico.h (offsetof, GD_ARG_UNUSED, GD_PRINTFLIKE): New
defines (move from ../dictd/dictd.h).
(logmsg, die): Mark with GD_PRINTFLIKE.
(sockaddr_to_str, sockaddr_to_astr, switch_to_privs): New protos.
2008-04-28 Sergey Poznyakoff
Add stream I/O framework.
* README-hacking: New file.
* dictd/fdio.c, dictd/linebuf.c, dictd/stream.c: New files.
* dictd/Makefile.am (dictd_SOURCES): Add new files.
* include/dico.h (dict_list_t, dict_iterator_t): Change
definitions. All uses updated.
* lib/list.c: Likewise.
* dictd/config-gram.y: Reflect changes to dict_list_t. Add missing
gettext markers.
* gnulib.modules: Add strerror.
* configure.ac (LOG_FACILITY): New configuration variable.
* dictd/dictd.h (LOG_FACILITY): New define.
Reflect changes to dict_list_t.
Add linebuf and stream prototypes and declarations.
(dictd_dictionary_t): New field `info'.
* dictd/main.c: Reflect changes to dict_list_t.
2008-04-27 Sergey Poznyakoff
Finish configuration framework. Some minor issues still remain,
though.
* lib/list.c, lib/xlat.c: New files.
* lib/Makefile.am: Add list.c and xlat.c
* dictd/config-gram.y: Remove unneeded productions. Implement C
code.
* dictd/config-lex.l: Remove NUMBER.
* dictd/dictd.h: Add more includes and new prototypes.
* dictd/main.c: Add configuration structures.
* gnulib.modules: More modules.
* include/dico.h: Add prototypes for list and xlat functions.
* lib/bushu.dat, lib/diag.c, lib/iputil.c, lib/jiscvt.c: Add
copyleft headers.
* lib/list.c (dict_iterator_remove_current)
(dict_iterator_set_data): New functions.
2008-04-26 Sergey Poznyakoff
Implement configuration framework for dictd.
* configure.ac: Add AC_PROG_LEX
* dictd/Makefile.am: Add config-gram.y and config-lex.l.
* dictd/config-gram.y, dictd/config-lex.l: New files.
* dictd/cmdline.opt: Implement the --config option. New options
--trace-gram and --trace-lex.
* dictd/dictd.h: Add new protos.
* dictd/main.c (main): Call config_parse.
* include/dico.h (vlogmsg): New proto.
* lib/diag.c (vlogmsg): New function.
2008-04-23 Sergey Poznyakoff
Use gnulib. Remove old server. Start to write dictd.
* bootstrap, bootstrap.conf, gnulib.modules: New files.
* dictd/.gitignore, dictd/Makefile.am, dictd/cmdline.opt: New files.
* lib/xmalloc.c: remove.
* dictd/dictd.h, dictd/main.c: New file.
* include/gjdictd.h: Delete.
* lib/xalloc-die.c: New file.
* server/*: Remove.
2008-04-22 Sergey Poznyakoff
Finish new makedict.
* makedict/Makefile.am: Add romaji.c.
* makedict/romaji.c: Rewrite from scratch.
* makedict/index.c: Implement all indexes.
* makedict/makedict.h (romaji_out_fn): New data type.
(kana_to_romaji,kana_to_romaji_str): New prototypes.
Begin switching to Berkeley DB.
* Makefile.am: Remove dbs
* configure.ac: Check for Berkeley DB.
Remove dbs
* include/Makefile.am: Remove dbs
* include/dict.h: Remove include dbs.h.
(*_TREE macros): use `.db' suffix.
(DictEntry): Use Bushu structure. Text entries are represented by
their offsets after the end of the structure.
(DICT_PTR, DICT_ENGLISH_PTR, DICT_PINYIN_PTR, DICT_KANJI_PTR,
DICT_YOMI_PTR): New macros.
* include/dico.h: Include stdlib.h.
(xmalloc, xzalloc, xcalloc, xrealloc): New functions.
* include/gjdictd.h: Remove include dbs.h.
* dbs/Makefile.am, dbs/dclose.c, dbs/dcreate.c, dbs/dflush.c,
dbs/dmode.c, dbs/dopen.c, dbs/dread.c, dbs/dreadpriv.c,
dbs/dseek.c, dbs/dwrite.c, dbs/dwritepriv.c, dbs/iadd.c,
dbs/iblk.c, dbs/ibottom.c, dbs/ibuild.c, dbs/iclose.c, dbs/icmp.c,
dbs/icmplen.c, dbs/icreate.c, dbs/ilock.c, dbs/imode.c,
dbs/iopen.c, dbs/irecno.c, dbs/iseek.c, dbs/iseq.c, dbs/iskip.c,
dbs/isync.c, dbs/itop.c, dbs/ivalue.c, dbs/mem.c, dbs/reorder.c,
include/dbs.h, makedict/btree.opt, makedict/check.c,
makedict/info.c, makedict/output.c: Remove.
* makedict/.gitignore: Remove btree
* makedict/Makefile.am: Remove btree.
Rewrite makedict using Berkeley DB.
* makedict/compile.c, makedict/index.c, makedict/main.c,
makedict/makedict.h, makedict/makedict.opt,
makedict/utils.c: Rewrite using Berkeley DB.
* lib/xmalloc.c: New file.
* lib/Makefile.am: Add xmalloc.c
* lib/iputil.c: Include dico.h
2008-04-21 Sergey Poznyakoff
* client/Gjdict.ad: Set kanjilarge height.
* client/search.c: Do not set width/height of the kanjilarge widget.
2008-04-20 Sergey Poznyakoff
Control verbosity level.
* client/Gjdict.ad: Update.
* client/client.c (sendf, get_lines): use config.transcript
instead of config.verbose.
* client/client.h (Config): Remove `debug', change type of
`verbose' to int.
* client/cmdline.opt: New option `--transcript'. Change the meaning
of the `--verbose' option.
* client/init.c: Add new resources.
(_gjdict_log_printer): New function.
(initsys): Set _gjdict_log_printer as the default diagnostics
printer.
(translate_options): Handle verbose field.
* client/options.h (OptionsRec) Remove `debug', change type of
`verbose' to String.
* include/dico.h (str_to_diag_level): New function.
* lib/diag.c: Likewise.
Fix building of the help file.
* client/Makefile.am: Set GROFF_TMAC_PATH.
* client/dico.help: Minor changes.
* client/gjdict.chl: Remove generated file.
* client/.gitignore: Add gjdict.chl
* utils/helpcmp.pl (replace_upper_ascii): New function.
(convert): Remove.
Housekeeping work.
* configure.ac: Provide placeholders for eventual i18n framework.
Place pidfile in /var/run on all systems.
* client/Gjdict.ad: Widen status bar to match recent changes.
* client/cmdline.opt, makedict/makedict.h,
server/cmdline.opt: Remove redefinitions of N_, _ and gettext.
Implement inetd-style connections.
* server/cmdline.opt: New option --inetd (-i).
* server/main.c: Implement inetd-style connections.
* server/server.c (server): Change signature.
(set_fd_ctl_addr, set_lo_ctl_addr): New functions.
* server/server.h (inetd): New extern.
(server): Change function signature.
* client/Gjdict.ad: Widen pinyinText widget.
* client/client.c (get_line): Bugfix: return actual code.
* client/help.c, client/search.c: Use myXawtextScrollWhenNeeded.
* client/util.c (format_string): Return empty output on empty
input.
* configure.ac (SCROLL_WHEN_NEEDED): New configuration variable.
2008-04-19 Sergey Poznyakoff
* client/client.c, client/helpfile.c, client/util.c, dbs/dopen.c,
dbs/dreadpriv.c, dbs/iblk.c, dbs/ibuild.c, dbs/icreate.c,
dbs/ilock.c, dbs/iopen.c, dbs/mem.c, makedict/check.c,
makedict/info.c, makedict/output.c, server/dict.c, server/main.c,
server/search.c, server/server.c: Fix wording of the diagnostic
messages (can't -> cannot).
Speed up input operations.
* client/client.c (get_lines): Optimize
* client/client.h (get_lines): Change prototype.
* server/server.c (server): Do not ignore SIGINT.
Remove unneeded files.
* client/options.c, client/util.h: Remove.
* client/Makefile.am: Remove unneded files.
* client/client.h, client/cmdline.opt, client/init.c,
client/util.c: Remove unneded includes.
* include/gjdictd.h (ip_hostname,get_ipaddr,str2port): Move to
dico.h
(good_ipaddr,ipaddr2str,ipstr2long): Remove.
* include/dico.h (ip_hostname,get_ipaddr,str2port): New protos.
Use autogenerated argument parsing in all programs.
* client/.gitignore, makedict/.gitignore: Add generated files.
* client/Makefile.am, makedict/Makefile.am: Add rules for
generating command line parsers.
* client/client.h, makedict/makedict.h, server/server.h: Add new
protos. Explicitly mark void argument lists as such.
* client/cmdline.opt: New file.
* client/init.c, client/main.c: Rewrite command line handling.
* makedict/btree.c: Rename to...
* makedict/btree.opt: ... this and rewrite command line handling.
* makedict/check.c, makedict/info.c, makedict/output.c: Add
missing includes.
* makedict/main.c: Rewrite command line handling.
* makedict/makedict.opt: New file.
* server/main.c: Remove unused variables.
* utils/getopt.m4 (print_help, print_usage): Remove static.
Automate generation of command-line argument parsing code.
* server/.gitignore, server/Makefile.am, server/main.c,
server/server.h: Rewrite command line handling.
* server/cmdline.opt: New file
* utils/Makefile.am: Add getopt.m4
* utils/getopt.m4: New file
* client/init.c (options): Use GJDICT_PORT
Provide a general-purpose framework for diagnostic functions.
* client/log.c, client/log.h, client/msg.c: Remove
* lib/diag.c: new file
* server/log.h, server/patchlevel.h: Remove
* client/Makefile.am, client/bushusearch.c, client/client.c,
client/client.h, client/convert.c, client/cornersearch.c,
client/help.c, client/helpfile.c, client/init.c,
client/kanasearch.c, client/main.c, client/search.c,
client/util.c, client/widgets.c, client/xref.c, dbs/dopen.c,
dbs/dreadpriv.c, dbs/dwritepriv.c, dbs/iblk.c, dbs/ibuild.c,
dbs/iclose.c, dbs/icreate.c, dbs/ilock.c, dbs/iopen.c, dbs/iseq.c,
dbs/mem.c, dbs/reorder.c, include/dbs.h, include/dico.h,
lib/Makefile.am, makedict/Makefile.am, makedict/btree.c,
makedict/check.c, makedict/index.c, makedict/info.c,
makedict/main.c, makedict/makedict.h, makedict/output.c,
server/Makefile.am, server/dict.c, server/gram.y, server/log.c,
server/main.c, server/search.c, server/server.c, server/server.h,
server/utils.c: Use new diagnostic functions.
Fix minor incosistencies: provide prototypes, remove unused
variables, etc.
* client/bushusearch.c, client/client.c, client/client.h,
client/cornersearch.c, client/getfile.c, client/help.c,
client/init.c, client/kanasearch.c, client/license.c,
client/log.c, client/main.c, client/search.c, client/skipsearch.c,
client/util.c, client/widgets.c, client/xref.c, dbs/dwrite.c,
dbs/icmp.c, dbs/iseq.c, dbs/reorder.c, include/dbs.h,
lib/iputil.c, lib/jiscvt.c, makedict/btree.c, makedict/check.c,
makedict/index.c, makedict/info.c, makedict/main.c,
makedict/makedict.h, makedict/output.c, makedict/romaji.c,
server/bushu.code.c, server/dict.c, server/gram.y, server/log.c,
server/log.h, server/main.c, server/server.c, server/server.h,
server/utils.c, utils/bushu.awk, utils/revbits.c.
2008-04-14 Sergey Poznyakoff
* fonts/*.xbm: Add copyright header.
Relicense under GPLv3+
* COPYING
* client/license.c
* fonts/Makefile.am
* lib/jiscvt.c
* makedict/main.c
* server/main.c
Fix make distcheck.
* Makefile.am (distcleancheck_listfiles): New var.
* client/license.c (helptext): Remove
* configure.ac (AM_INIT_AUTOMAKE): Remove std-options/
* fonts/Makefile.am: Fix build.
* utils/Makefile.am: Fix build.
Improve make in fonts.
* fonts/3.xbm: Fix erroneous declarations.
* fonts/Makefile.am (bushu.bdf): Change rule
* fonts/header, fonts/footer: New files.
* fonts/bushu.pcf: Delete auto-generated file.
* utils/knr2ansi: Delete unneeded file.
* utils/mkbushufont: Replaced by ...
* utils/mkbushufont.awk: ... this.
* utils/revbits.c: Include config.h
Improve fallback resource generation.
* client/Makefile.am (fallback.h): Use resource.sed
* client/resource.sed: New file.
2008-04-13 Sergey Poznyakoff
Provide fallback resources.
* client/.gitignore: Add fallback.h
* client/Makefile.am: New rule for creating fallback.h
* client/init.c (fallback): Include fallback.h
2008-04-12 Sergey Poznyakoff
* client/Gjdict.ad (replaceMode): Remove. Not available in Xaw8.
* client/search.c (makesouth): make searchDropInput editable,
otherwise pastes don't work.
* All files: switch to ANSI C.
2008-04-11 Sergey Poznyakoff
Rewrite for Xaw v. >= 7. Use asciiTextWidgetClass instead of the
custom wcharTextWidgetClass.
* client/Gjdict.ad: Rewrite for Xaw >= 7
* client/bushusearch.c: Force international: false on all bushu
widgets.
* client/kanasearch.c: Force international: false
* client/client.h (struct popup_info): remove LargeKanjiFont,
EnglishFont.
* client/options.h: Likewise.
* client/widgets.c: Likewise.
* client/init.c: Likewise. Force ja_JP.eucjp locale.
* client/cornersearch.c, client/help.c, client/search.c,
client/skipsearch.c, client/xref.c: Rewrite using
asciiTextWidgetClass and assuming international: true. Delegate as
much as possible to the resource file.
* lib/Makefile.am: Remove Wchar* sources.
* lib/WcharCommon.h, lib/WcharCommonP.h, lib/WcharSink.h,
lib/WcharSinkP.h, lib/WcharSrc.h, lib/WcharSrcP.h,
lib/WcharText.h, lib/WcharTextP.h: Remove.
* makedict/btree.c, makedict/main.c: Fix va_start calls.
* server/server.c: Move eofline several lines up.
2008-04-09 Sergey Poznyakoff
Set up Git `ident' replacement for all sources.
* configure.in: Rename to configure.ac. Update to newer
autoconf syntax.
* acconfig.h: Remove.
* .gitconfig: New file.
2008-04-08 Sergey Poznyakoff
* INSTALL: Remove auto-generated file.
* client/client.c, client/getfile.c, client/log.c,
client/log.h, client/msg.c, client/search.c, client/util.c,
include/dbs.h, makedict/btree.c, makedict/main.c,
makedict/makedict.h, server/gram.y, server/log.c, server/log.h,
server/main.c, server/search.c, server/server.c, server/server.h:
use stdarg
* client/search.c (makesouth): Give correct default of XtNencoding
for searchDropInput.
* lib/WcharSink.c, lib/WcharSrc.c: Cleanup
* client/client.h: Update
* client/main.c: Remove unneded globals.
* client/help.c: Use XawtextScrollAlways (temp kludge).
2002-05-23 Sergey Poznyakoff
* include/Makefile.am: Added Xaw.h
2002-04-18 Sergey Poznyakoff
* acconfig.h: Placeholder for USE_XAW3D
* configure.in: Define USE_XAW3D if requested.
* include/Xaw.h: (new) libXaw dependent definitions.
* client/bushusearch.c: Removed lots of X11/Xaw includes.
Include single file Xaw.h instead.
* client/cornersearch.c: Likewise.
* client/getfile.c: Likewise.
* client/help.c: Likewise.
* client/init.c: Likewise.
* client/kanasearch.c: Likewise.
* client/license.c: Likewise.
* client/main.c: Likewise.
* client/options.c: Likewise.
* client/search.c: Likewise.
* client/skipsearch.c: Likewise.
* client/widgets.c: Likewise.
* client/xref.c: Likewise.
* client/msg.c: Include errno.h.
* include/gjdictd.h: Include errno.h. Renamed global variable
daemon to daemon_mode.
* lib/WcharSink.h: Discern between Xaw and Xaw3d
* lib/WcharSinkP.h: Likewise.
* lib/WcharSrc.h: Likewise.
* lib/WcharSrcP.h: Likewise.
* lib/WcharText.c: Likewise.
* lib/WcharText.h: Likewise.
* server/log.c: Include errno.h.
* server/main.c: Renamed global variable daemon to daemon_mode.
2001-11-06 Sergey Poznyakoff
* server/main.c: -i (--ip-address) option.
* server/search.c: Issue OK reply before starting to transmit data.
In ascii mode, output results using udata().
2001-11-04 Sergey Poznyakoff
* client/init.c: Send BIN to server at startup.
* dbs/iopen.c: Increase default number of index pages.
* include/dict.h: Declare Xref structure.
* makedict/index.c: Changed xref index strcture: it now has two
subkeys, a jis code of kanji and its position in the sentence.
This results in all cross-references being ordered by the position
of the kanji in sentence.
* makedict/output.c: Likewise.
* server/search.c: Likewise.
* server/gram.y: Special handling for binary mode.
* server/server.c: Rudimentary implementation of ASCII mode. NB: the
mode name itself seems to be a misnomer :^)
Housekeeping:
* .cvsignore: (new)
* dbs/.cvsignore: (new)
* fonts/.cvsignore: (new)
* include/.cvsignore: (new)
* lib/.cvsignore: (new)
* makedict/.cvsignore: (new)
* server/.cvsignore: (new)
* utils/.cvsignore: (new)
2001-11-03 Sergey Poznyakoff
Excavated this beast from among my old projects. As far
as I can tell, this started on March, 1999. The RCS snapshots
of DBS subsystem date back to September, 1998.
Local Variables:
mode: change-log
version-control: never
End:
dico-2.2/INSTALL 0000664 0000000 0000000 00000036600 11726126741 0013340 0 ustar 00root root 0000000 0000000 Installation Instructions
*************************
Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved. This file is offered as-is,
without warranty of any kind.
Basic Installation
==================
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package. Some packages provide this
`INSTALL' file but do not implement all of the features documented
below. The lack of an optional feature in a given package is not
necessarily a bug. More recommendations for GNU packages can be found
in *note Makefile Conventions: (standards)Makefile Conventions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You need `configure.ac' if
you want to change it or regenerate `configure' using a newer version
of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system.
Running `configure' might take a while. While running, it prints
some messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
the package, generally using the just-built uninstalled binaries.
4. Type `make install' to install the programs and any data files and
documentation. When installing into a prefix owned by root, it is
recommended that the package be configured and built as a regular
user, and only the `make install' phase executed with root
privileges.
5. Optionally, type `make installcheck' to repeat any self-tests, but
this time using the binaries in their final installed location.
This target does not install anything. Running this target as a
regular user, particularly if the prior `make install' required
root privileges, verifies that the installation completed
correctly.
6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
7. Often, you can also type `make uninstall' to remove the installed
files again. In practice, not all packages have tested that
uninstallation works correctly, even though it is required by the
GNU Coding Standards.
8. Some packages, particularly those that use Automake, provide `make
distcheck', which can by used by developers to test that all other
targets like `make install' and `make uninstall' work correctly.
This target is generally not run by end users.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. Run `./configure --help'
for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'. This
is known as a "VPATH" build.
With a non-GNU `make', it is safer to compile the package for one
architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
On MacOS X 10.5 and later systems, you can create libraries and
executables that work on multiple system types--known as "fat" or
"universal" binaries--by specifying multiple `-arch' options to the
compiler but only a single `-arch' option to the preprocessor. Like
this:
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CPP="gcc -E" CXXCPP="g++ -E"
This is not guaranteed to produce working output in all cases, you
may have to build one architecture at a time and combine the results
using the `lipo' tool if you have problems.
Installation Names
==================
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX', where PREFIX must be an
absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them. In general, the
default for these options is expressed in terms of `${prefix}', so that
specifying just `--prefix' will affect all of the other directory
specifications that were not explicitly provided.
The most portable way to affect installation locations is to pass the
correct locations to `configure'; however, many packages provide one or
both of the following shortcuts of passing variable assignments to the
`make install' command line to change installation locations without
having to reconfigure or recompile.
The first method involves providing an override variable for each
affected directory. For example, `make install
prefix=/alternate/directory' will choose an alternate location for all
directory configuration variables that were expressed in terms of
`${prefix}'. Any directories that were specified during `configure',
but not in terms of `${prefix}', must each be overridden at install
time for the entire installation to be relocated. The approach of
makefile variable overrides for each directory variable is required by
the GNU Coding Standards, and ideally causes no recompilation.
However, some platforms have known limitations with the semantics of
shared libraries that end up requiring recompilation when using this
method, particularly noticeable in packages that use GNU Libtool.
The second method involves providing the `DESTDIR' variable. For
example, `make install DESTDIR=/alternate/directory' will prepend
`/alternate/directory' before all installation names. The approach of
`DESTDIR' overrides is not required by the GNU Coding Standards, and
does not work on platforms that have drive letters. On the other hand,
it does better at avoiding recompilation issues, and works well even
when some directory options were not specified in terms of `${prefix}'
at `configure' time.
Optional Features
=================
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Some packages offer the ability to configure how verbose the
execution of `make' will be. For these packages, running `./configure
--enable-silent-rules' sets the default to minimal output, which can be
overridden with `make V=1'; while running `./configure
--disable-silent-rules' sets the default to verbose, which can be
overridden with `make V=0'.
Particular systems
==================
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
HP-UX `make' updates targets which have the same time stamps as
their prerequisites, which makes it generally unusable when shipped
generated files such as `configure' are involved. Use GNU `make'
instead.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
to try
./configure CC="cc"
and if that doesn't work, try
./configure CC="cc -nodtk"
On Solaris, don't put `/usr/ucb' early in your `PATH'. This
directory contains several dysfunctional programs; working variants of
these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
in your `PATH', put it _after_ `/usr/bin'.
On Haiku, software installed for all users goes in `/boot/common',
not `/usr/local'. It is recommended to use the following options:
./configure --prefix=/boot/common
Specifying the System Type
==========================
There may be some features `configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
_same_ architectures, `configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
where SYSTEM can have one of these forms:
OS
KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share,
you can create a site shell script called `config.site' that gives
default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
an Autoconf bug. Until the bug is fixed you can use this workaround:
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
`configure' recognizes the following options to control how it
operates.
`--help'
`-h'
Print a summary of all of the options to `configure', and exit.
`--help=short'
`--help=recursive'
Print a summary of the options unique to this package's
`configure', and exit. The `short' variant lists options used
only in the top level, while the `recursive' variant lists options
also present in any nested packages.
`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.
`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`--prefix=DIR'
Use DIR as the installation prefix. *note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
`--no-create'
`-n'
Run the configure checks, but stop before creating any output
files.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
dico-2.2/Makefile.am 0000664 0000000 0000000 00000002710 11726126741 0014336 0 ustar 00root root 0000000 0000000 # This file is part of GNU Dico
# Copyright (C) 1998-2000, 2008-2010, 2012 Sergey Poznyakoff
#
# GNU Dico 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 3, or (at your option)
# any later version.
#
# GNU Dico 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 GNU Dico. If not, see .
ACLOCAL_AMFLAGS = -I m4 -I am -I grecs/am -I gint -I imprimatur
SUBDIRS=\
include\
utils\
examples\
gint\
gnu\
grecs\
lib\
libltdl\
dicod\
modules\
dico\
scripts\
imprimatur\
doc\
po
#FIXME: add these when ready: makedict client fonts
EXTRA_DIST = ChangeLog.2008
dist-hook:
tar -C $(srcdir) -c -f - --exclude-vcs app dicoweb | \
tar -C $(distdir) -x -f -
# Start Git ChangeLog from this date.
gen_start_date = 2008-05-05
.PHONY: ChangeLog
ChangeLog:
$(AM_V_GEN)if test -d .git; then \
git log --pretty='format:%ct %an <%ae>%n%n%s%n%n%b%n' | \
awk -f $(top_srcdir)/@GRECS_SUBDIR@/build-aux/git2chg.awk \
-vsince=$(gen_start_date) > ChangeLog; \
fi
dico-2.2/Makefile.in 0000664 0000000 0000000 00000146434 11726126741 0014363 0 ustar 00root root 0000000 0000000 # Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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@
# This file is part of GNU Dico
# Copyright (C) 1998-2000, 2008-2010, 2012 Sergey Poznyakoff
#
# GNU Dico 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 3, or (at your option)
# any later version.
#
# GNU Dico 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 GNU Dico. If not, see .
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
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@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
INSTALL NEWS THANKS TODO build-aux/config.guess \
build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
build-aux/install-sh build-aux/ltmain.sh build-aux/mdate-sh \
build-aux/missing build-aux/texinfo.tex build-aux/ylwrap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/imprimatur/imprimatur.m4 \
$(top_srcdir)/gint/gint.m4 $(top_srcdir)/gint/guile.m4 \
$(top_srcdir)/grecs/am/grecs.m4 $(top_srcdir)/am/gsasl.m4 \
$(top_srcdir)/am/lib.m4 $(top_srcdir)/am/testdir.m4 \
$(top_srcdir)/m4/00gnulib.m4 $(top_srcdir)/m4/alloca.m4 \
$(top_srcdir)/m4/argz.m4 $(top_srcdir)/m4/btowc.m4 \
$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/configmake.m4 \
$(top_srcdir)/m4/des.m4 $(top_srcdir)/m4/errno_h.m4 \
$(top_srcdir)/m4/extensions.m4 $(top_srcdir)/m4/fcntl-o.m4 \
$(top_srcdir)/m4/float_h.m4 $(top_srcdir)/m4/fprintftime.m4 \
$(top_srcdir)/m4/fseeko.m4 $(top_srcdir)/m4/getdelim.m4 \
$(top_srcdir)/m4/getdomainname.m4 \
$(top_srcdir)/m4/gethostname.m4 $(top_srcdir)/m4/getline.m4 \
$(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpass.m4 \
$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettimeofday.m4 \
$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \
$(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/hash.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \
$(top_srcdir)/m4/inline.m4 $(top_srcdir)/m4/intlmacosx.m4 \
$(top_srcdir)/m4/intmax_t.m4 $(top_srcdir)/m4/inttostr.m4 \
$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/langinfo_h.m4 \
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-zh.m4 \
$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
$(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
$(top_srcdir)/m4/md5.m4 $(top_srcdir)/m4/memchr.m4 \
$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/multiarch.m4 \
$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/nl_langinfo.m4 \
$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \
$(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \
$(top_srcdir)/m4/sha1.m4 $(top_srcdir)/m4/size_max.m4 \
$(top_srcdir)/m4/snprintf.m4 $(top_srcdir)/m4/socketlib.m4 \
$(top_srcdir)/m4/sockets.m4 $(top_srcdir)/m4/socklen.m4 \
$(top_srcdir)/m4/ssize_t.m4 $(top_srcdir)/m4/stdbool.m4 \
$(top_srcdir)/m4/stddef_h.m4 $(top_srcdir)/m4/stdint.m4 \
$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/stdio_h.m4 \
$(top_srcdir)/m4/stdlib_h.m4 $(top_srcdir)/m4/strerror.m4 \
$(top_srcdir)/m4/strftime.m4 $(top_srcdir)/m4/string_h.m4 \
$(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \
$(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \
$(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \
$(top_srcdir)/m4/sys_socket_h.m4 \
$(top_srcdir)/m4/sys_time_h.m4 $(top_srcdir)/m4/sysexits.m4 \
$(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \
$(top_srcdir)/m4/tm_gmtoff.m4 $(top_srcdir)/m4/unistd_h.m4 \
$(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \
$(top_srcdir)/m4/warn-on-use.m4 $(top_srcdir)/m4/wchar_h.m4 \
$(top_srcdir)/m4/wchar_t.m4 $(top_srcdir)/m4/wcrtomb.m4 \
$(top_srcdir)/m4/wctype_h.m4 $(top_srcdir)/m4/wint_t.m4 \
$(top_srcdir)/m4/xalloc.m4 $(top_srcdir)/m4/xsize.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
AM_V_GEN = $(am__v_GEN_$(V))
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
AM_V_at = $(am__v_at_$(V))
am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
install-html-recursive install-info-recursive \
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
distdir dist dist-all distcheck
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)"; }; }
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
sed_rest='s,^[^/]*/*,,'; \
sed_last='s,^.*/\([^/]*\)$$,\1,'; \
sed_butlast='s,/*[^/]*$$,,'; \
while test -n "$$dir1"; do \
first=`echo "$$dir1" | sed -e "$$sed_first"`; \
if test "$$first" != "."; then \
if test "$$first" = ".."; then \
dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
else \
first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
if test "$$first2" = "$$first"; then \
dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
else \
dir2="../$$dir2"; \
fi; \
dir0="$$dir0"/"$$first"; \
fi; \
fi; \
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).tar.xz
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARGZ_H = @ARGZ_H@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOM4TE = @AUTOM4TE@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BITSIZEOF_PTRDIFF_T = @BITSIZEOF_PTRDIFF_T@
BITSIZEOF_SIG_ATOMIC_T = @BITSIZEOF_SIG_ATOMIC_T@
BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
BUILD_LIBDICOSASL = @BUILD_LIBDICOSASL@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFAULT_DICT_SERVER = @DEFAULT_DICT_SERVER@
DEFAULT_PREPROCESSOR = @DEFAULT_PREPROCESSOR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DICO_MODDIR = @DICO_MODDIR@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@
EMULTIHOP_VALUE = @EMULTIHOP_VALUE@
ENOLINK_HIDDEN = @ENOLINK_HIDDEN@
ENOLINK_VALUE = @ENOLINK_VALUE@
EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@
EOVERFLOW_VALUE = @EOVERFLOW_VALUE@
ERRNO_H = @ERRNO_H@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FLOAT_H = @FLOAT_H@
GETHOSTNAME_LIB = @GETHOSTNAME_LIB@
GETOPT_H = @GETOPT_H@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GINT_INCLUDES = @GINT_INCLUDES@
GINT_LDADD = @GINT_LDADD@
GINT_MODULE_DIR = @GINT_MODULE_DIR@
GLIBC21 = @GLIBC21@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GNULIB_ACCEPT = @GNULIB_ACCEPT@
GNULIB_ACCEPT4 = @GNULIB_ACCEPT4@
GNULIB_ATOLL = @GNULIB_ATOLL@
GNULIB_BIND = @GNULIB_BIND@
GNULIB_BTOWC = @GNULIB_BTOWC@
GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
GNULIB_CHOWN = @GNULIB_CHOWN@
GNULIB_CLOSE = @GNULIB_CLOSE@
GNULIB_CONNECT = @GNULIB_CONNECT@
GNULIB_DPRINTF = @GNULIB_DPRINTF@
GNULIB_DUP2 = @GNULIB_DUP2@
GNULIB_DUP3 = @GNULIB_DUP3@
GNULIB_ENVIRON = @GNULIB_ENVIRON@
GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
GNULIB_FCHDIR = @GNULIB_FCHDIR@
GNULIB_FCHOWNAT = @GNULIB_FCHOWNAT@
GNULIB_FCLOSE = @GNULIB_FCLOSE@
GNULIB_FFLUSH = @GNULIB_FFLUSH@
GNULIB_FOPEN = @GNULIB_FOPEN@
GNULIB_FPRINTF = @GNULIB_FPRINTF@
GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
GNULIB_FPURGE = @GNULIB_FPURGE@
GNULIB_FPUTC = @GNULIB_FPUTC@
GNULIB_FPUTS = @GNULIB_FPUTS@
GNULIB_FREOPEN = @GNULIB_FREOPEN@
GNULIB_FSEEK = @GNULIB_FSEEK@
GNULIB_FSEEKO = @GNULIB_FSEEKO@
GNULIB_FSYNC = @GNULIB_FSYNC@
GNULIB_FTELL = @GNULIB_FTELL@
GNULIB_FTELLO = @GNULIB_FTELLO@
GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
GNULIB_FWRITE = @GNULIB_FWRITE@
GNULIB_GETADDRINFO = @GNULIB_GETADDRINFO@
GNULIB_GETCWD = @GNULIB_GETCWD@
GNULIB_GETDELIM = @GNULIB_GETDELIM@
GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
GNULIB_GETGROUPS = @GNULIB_GETGROUPS@
GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
GNULIB_GETLINE = @GNULIB_GETLINE@
GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
GNULIB_GETLOGIN = @GNULIB_GETLOGIN@
GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
GNULIB_GETTIMEOFDAY = @GNULIB_GETTIMEOFDAY@
GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
GNULIB_GRANTPT = @GNULIB_GRANTPT@
GNULIB_IMAXABS = @GNULIB_IMAXABS@
GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
GNULIB_LCHOWN = @GNULIB_LCHOWN@
GNULIB_LINK = @GNULIB_LINK@
GNULIB_LINKAT = @GNULIB_LINKAT@
GNULIB_LISTEN = @GNULIB_LISTEN@
GNULIB_LSEEK = @GNULIB_LSEEK@
GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
GNULIB_MBRLEN = @GNULIB_MBRLEN@
GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
GNULIB_MBSCHR = @GNULIB_MBSCHR@
GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
GNULIB_MBSINIT = @GNULIB_MBSINIT@
GNULIB_MBSLEN = @GNULIB_MBSLEN@
GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
GNULIB_MBSSEP = @GNULIB_MBSSEP@
GNULIB_MBSSPN = @GNULIB_MBSSPN@
GNULIB_MBSSTR = @GNULIB_MBSSTR@
GNULIB_MBSTOK_R = @GNULIB_MBSTOK_R@
GNULIB_MBTOWC = @GNULIB_MBTOWC@
GNULIB_MEMCHR = @GNULIB_MEMCHR@
GNULIB_MEMMEM = @GNULIB_MEMMEM@
GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
GNULIB_MKOSTEMP = @GNULIB_MKOSTEMP@
GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
GNULIB_MKTIME = @GNULIB_MKTIME@
GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
GNULIB_PERROR = @GNULIB_PERROR@
GNULIB_PIPE = @GNULIB_PIPE@
GNULIB_PIPE2 = @GNULIB_PIPE2@
GNULIB_POPEN = @GNULIB_POPEN@
GNULIB_PREAD = @GNULIB_PREAD@
GNULIB_PRINTF = @GNULIB_PRINTF@
GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
GNULIB_PTSNAME = @GNULIB_PTSNAME@
GNULIB_PUTC = @GNULIB_PUTC@
GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
GNULIB_PUTENV = @GNULIB_PUTENV@
GNULIB_PUTS = @GNULIB_PUTS@
GNULIB_PWRITE = @GNULIB_PWRITE@
GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
GNULIB_READLINK = @GNULIB_READLINK@
GNULIB_READLINKAT = @GNULIB_READLINKAT@
GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
GNULIB_REALPATH = @GNULIB_REALPATH@
GNULIB_RECV = @GNULIB_RECV@
GNULIB_RECVFROM = @GNULIB_RECVFROM@
GNULIB_REMOVE = @GNULIB_REMOVE@
GNULIB_RENAME = @GNULIB_RENAME@
GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
GNULIB_RMDIR = @GNULIB_RMDIR@
GNULIB_RPMATCH = @GNULIB_RPMATCH@
GNULIB_SEND = @GNULIB_SEND@
GNULIB_SENDTO = @GNULIB_SENDTO@
GNULIB_SETENV = @GNULIB_SETENV@
GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
GNULIB_SLEEP = @GNULIB_SLEEP@
GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
GNULIB_SOCKET = @GNULIB_SOCKET@
GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
GNULIB_STPCPY = @GNULIB_STPCPY@
GNULIB_STPNCPY = @GNULIB_STPNCPY@
GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
GNULIB_STRCHRNUL = @GNULIB_STRCHRNUL@
GNULIB_STRDUP = @GNULIB_STRDUP@
GNULIB_STRERROR = @GNULIB_STRERROR@
GNULIB_STRERROR_R = @GNULIB_STRERROR_R@
GNULIB_STRNCAT = @GNULIB_STRNCAT@
GNULIB_STRNDUP = @GNULIB_STRNDUP@
GNULIB_STRNLEN = @GNULIB_STRNLEN@
GNULIB_STRPBRK = @GNULIB_STRPBRK@
GNULIB_STRPTIME = @GNULIB_STRPTIME@
GNULIB_STRSEP = @GNULIB_STRSEP@
GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
GNULIB_STRSTR = @GNULIB_STRSTR@
GNULIB_STRTOD = @GNULIB_STRTOD@
GNULIB_STRTOIMAX = @GNULIB_STRTOIMAX@
GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
GNULIB_STRTOLL = @GNULIB_STRTOLL@
GNULIB_STRTOULL = @GNULIB_STRTOULL@
GNULIB_STRTOUMAX = @GNULIB_STRTOUMAX@
GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
GNULIB_SYMLINK = @GNULIB_SYMLINK@
GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
GNULIB_TIMEGM = @GNULIB_TIMEGM@
GNULIB_TIME_R = @GNULIB_TIME_R@
GNULIB_TMPFILE = @GNULIB_TMPFILE@
GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
GNULIB_UNISTD_H_GETOPT = @GNULIB_UNISTD_H_GETOPT@
GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
GNULIB_UNLINK = @GNULIB_UNLINK@
GNULIB_UNLINKAT = @GNULIB_UNLINKAT@
GNULIB_UNLOCKPT = @GNULIB_UNLOCKPT@
GNULIB_UNSETENV = @GNULIB_UNSETENV@
GNULIB_USLEEP = @GNULIB_USLEEP@
GNULIB_VASPRINTF = @GNULIB_VASPRINTF@
GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
GNULIB_VPRINTF = @GNULIB_VPRINTF@
GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
GNULIB_WCPCPY = @GNULIB_WCPCPY@
GNULIB_WCPNCPY = @GNULIB_WCPNCPY@
GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
GNULIB_WCSCASECMP = @GNULIB_WCSCASECMP@
GNULIB_WCSCAT = @GNULIB_WCSCAT@
GNULIB_WCSCHR = @GNULIB_WCSCHR@
GNULIB_WCSCMP = @GNULIB_WCSCMP@
GNULIB_WCSCOLL = @GNULIB_WCSCOLL@
GNULIB_WCSCPY = @GNULIB_WCSCPY@
GNULIB_WCSCSPN = @GNULIB_WCSCSPN@
GNULIB_WCSDUP = @GNULIB_WCSDUP@
GNULIB_WCSLEN = @GNULIB_WCSLEN@
GNULIB_WCSNCASECMP = @GNULIB_WCSNCASECMP@
GNULIB_WCSNCAT = @GNULIB_WCSNCAT@
GNULIB_WCSNCMP = @GNULIB_WCSNCMP@
GNULIB_WCSNCPY = @GNULIB_WCSNCPY@
GNULIB_WCSNLEN = @GNULIB_WCSNLEN@
GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
GNULIB_WCSPBRK = @GNULIB_WCSPBRK@
GNULIB_WCSRCHR = @GNULIB_WCSRCHR@
GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
GNULIB_WCSSPN = @GNULIB_WCSSPN@
GNULIB_WCSSTR = @GNULIB_WCSSTR@
GNULIB_WCSTOK = @GNULIB_WCSTOK@
GNULIB_WCSWIDTH = @GNULIB_WCSWIDTH@
GNULIB_WCSXFRM = @GNULIB_WCSXFRM@
GNULIB_WCTOB = @GNULIB_WCTOB@
GNULIB_WCTOMB = @GNULIB_WCTOMB@
GNULIB_WCTRANS = @GNULIB_WCTRANS@
GNULIB_WCTYPE = @GNULIB_WCTYPE@
GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
GNULIB_WMEMCHR = @GNULIB_WMEMCHR@
GNULIB_WMEMCMP = @GNULIB_WMEMCMP@
GNULIB_WMEMCPY = @GNULIB_WMEMCPY@
GNULIB_WMEMMOVE = @GNULIB_WMEMMOVE@
GNULIB_WMEMSET = @GNULIB_WMEMSET@
GNULIB_WRITE = @GNULIB_WRITE@
GNULIB__EXIT = @GNULIB__EXIT@
GRECS_BUILD_AUX = @GRECS_BUILD_AUX@
GRECS_CHANGELOG = @GRECS_CHANGELOG@
GRECS_DISTCK_AT = @GRECS_DISTCK_AT@
GRECS_DISTDOC = @GRECS_DISTDOC@
GRECS_DOCDIR = @GRECS_DOCDIR@
GRECS_HOST_PROJECT_INCLUDES = @GRECS_HOST_PROJECT_INCLUDES@
GRECS_INCLUDES = @GRECS_INCLUDES@
GRECS_INCLUDE_DIR = @GRECS_INCLUDE_DIR@
GRECS_LDADD = @GRECS_LDADD@
GRECS_README = @GRECS_README@
GRECS_SRCDIR = @GRECS_SRCDIR@
GRECS_SUBDIR = @GRECS_SUBDIR@
GRECS_TESTDIR = @GRECS_TESTDIR@
GREP = @GREP@
GSASL_LIBS = @GSASL_LIBS@
GUILE_CONFIG = @GUILE_CONFIG@
GUILE_INCLUDES = @GUILE_INCLUDES@
GUILE_LIBS = @GUILE_LIBS@
GUILE_SITE = @GUILE_SITE@
GUILE_SNARF = @GUILE_SNARF@
GUILE_TOOLS = @GUILE_TOOLS@
GUILE_VERSION = @GUILE_VERSION@
GUILE_VERSION_NUMBER = @GUILE_VERSION_NUMBER@
HAVE_ACCEPT4 = @HAVE_ACCEPT4@
HAVE_ATOLL = @HAVE_ATOLL@
HAVE_BTOWC = @HAVE_BTOWC@
HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
HAVE_CHOWN = @HAVE_CHOWN@
HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
HAVE_DECL_FREEADDRINFO = @HAVE_DECL_FREEADDRINFO@
HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
HAVE_DECL_GAI_STRERROR = @HAVE_DECL_GAI_STRERROR@
HAVE_DECL_GETADDRINFO = @HAVE_DECL_GETADDRINFO@
HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
HAVE_DECL_GETDOMAINNAME = @HAVE_DECL_GETDOMAINNAME@
HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
HAVE_DECL_GETNAMEINFO = @HAVE_DECL_GETNAMEINFO@
HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
HAVE_DECL_STRNLEN = @HAVE_DECL_STRNLEN@
HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
HAVE_DPRINTF = @HAVE_DPRINTF@
HAVE_DUP2 = @HAVE_DUP2@
HAVE_DUP3 = @HAVE_DUP3@
HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
HAVE_FACCESSAT = @HAVE_FACCESSAT@
HAVE_FCHDIR = @HAVE_FCHDIR@
HAVE_FCHOWNAT = @HAVE_FCHOWNAT@
HAVE_FEATURES_H = @HAVE_FEATURES_H@
HAVE_FSEEKO = @HAVE_FSEEKO@
HAVE_FSYNC = @HAVE_FSYNC@
HAVE_FTELLO = @HAVE_FTELLO@
HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
HAVE_GETGROUPS = @HAVE_GETGROUPS@
HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
HAVE_GETLOGIN = @HAVE_GETLOGIN@
HAVE_GETOPT_H = @HAVE_GETOPT_H@
HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
HAVE_GETTIMEOFDAY = @HAVE_GETTIMEOFDAY@
HAVE_GRANTPT = @HAVE_GRANTPT@
HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
HAVE_ISWBLANK = @HAVE_ISWBLANK@
HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
HAVE_LANGINFO_CODESET = @HAVE_LANGINFO_CODESET@
HAVE_LANGINFO_ERA = @HAVE_LANGINFO_ERA@
HAVE_LANGINFO_H = @HAVE_LANGINFO_H@
HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
HAVE_LCHOWN = @HAVE_LCHOWN@
HAVE_LINK = @HAVE_LINK@
HAVE_LINKAT = @HAVE_LINKAT@
HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
HAVE_MBRLEN = @HAVE_MBRLEN@
HAVE_MBRTOWC = @HAVE_MBRTOWC@
HAVE_MBSINIT = @HAVE_MBSINIT@
HAVE_MBSLEN = @HAVE_MBSLEN@
HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
HAVE_MEMCHR = @HAVE_MEMCHR@
HAVE_MEMPCPY = @HAVE_MEMPCPY@
HAVE_MKDTEMP = @HAVE_MKDTEMP@
HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
HAVE_MKSTEMP = @HAVE_MKSTEMP@
HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
HAVE_NETDB_H = @HAVE_NETDB_H@
HAVE_NL_LANGINFO = @HAVE_NL_LANGINFO@
HAVE_OS_H = @HAVE_OS_H@
HAVE_PIPE = @HAVE_PIPE@
HAVE_PIPE2 = @HAVE_PIPE2@
HAVE_PREAD = @HAVE_PREAD@
HAVE_PTSNAME = @HAVE_PTSNAME@
HAVE_PWRITE = @HAVE_PWRITE@
HAVE_RANDOM_H = @HAVE_RANDOM_H@
HAVE_RANDOM_R = @HAVE_RANDOM_R@
HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
HAVE_READLINK = @HAVE_READLINK@
HAVE_READLINKAT = @HAVE_READLINKAT@
HAVE_REALPATH = @HAVE_REALPATH@
HAVE_RENAMEAT = @HAVE_RENAMEAT@
HAVE_RPMATCH = @HAVE_RPMATCH@
HAVE_SA_FAMILY_T = @HAVE_SA_FAMILY_T@
HAVE_SETENV = @HAVE_SETENV@
HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
HAVE_SLEEP = @HAVE_SLEEP@
HAVE_STDINT_H = @HAVE_STDINT_H@
HAVE_STPCPY = @HAVE_STPCPY@
HAVE_STPNCPY = @HAVE_STPNCPY@
HAVE_STRCASESTR = @HAVE_STRCASESTR@
HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
HAVE_STRPBRK = @HAVE_STRPBRK@
HAVE_STRPTIME = @HAVE_STRPTIME@
HAVE_STRSEP = @HAVE_STRSEP@
HAVE_STRTOD = @HAVE_STRTOD@
HAVE_STRTOLL = @HAVE_STRTOLL@
HAVE_STRTOULL = @HAVE_STRTOULL@
HAVE_STRUCT_ADDRINFO = @HAVE_STRUCT_ADDRINFO@
HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY = @HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY@
HAVE_STRUCT_TIMEVAL = @HAVE_STRUCT_TIMEVAL@
HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
HAVE_SYMLINK = @HAVE_SYMLINK@
HAVE_SYMLINKAT = @HAVE_SYMLINKAT@
HAVE_SYSEXITS_H = @HAVE_SYSEXITS_H@
HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
HAVE_TIMEGM = @HAVE_TIMEGM@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HAVE_UNLINKAT = @HAVE_UNLINKAT@
HAVE_UNLOCKPT = @HAVE_UNLOCKPT@
HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
HAVE_USLEEP = @HAVE_USLEEP@
HAVE_VASPRINTF = @HAVE_VASPRINTF@
HAVE_VDPRINTF = @HAVE_VDPRINTF@
HAVE_WCHAR_H = @HAVE_WCHAR_H@
HAVE_WCHAR_T = @HAVE_WCHAR_T@
HAVE_WCPCPY = @HAVE_WCPCPY@
HAVE_WCPNCPY = @HAVE_WCPNCPY@
HAVE_WCRTOMB = @HAVE_WCRTOMB@
HAVE_WCSCASECMP = @HAVE_WCSCASECMP@
HAVE_WCSCAT = @HAVE_WCSCAT@
HAVE_WCSCHR = @HAVE_WCSCHR@
HAVE_WCSCMP = @HAVE_WCSCMP@
HAVE_WCSCOLL = @HAVE_WCSCOLL@
HAVE_WCSCPY = @HAVE_WCSCPY@
HAVE_WCSCSPN = @HAVE_WCSCSPN@
HAVE_WCSDUP = @HAVE_WCSDUP@
HAVE_WCSLEN = @HAVE_WCSLEN@
HAVE_WCSNCASECMP = @HAVE_WCSNCASECMP@
HAVE_WCSNCAT = @HAVE_WCSNCAT@
HAVE_WCSNCMP = @HAVE_WCSNCMP@
HAVE_WCSNCPY = @HAVE_WCSNCPY@
HAVE_WCSNLEN = @HAVE_WCSNLEN@
HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
HAVE_WCSPBRK = @HAVE_WCSPBRK@
HAVE_WCSRCHR = @HAVE_WCSRCHR@
HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
HAVE_WCSSPN = @HAVE_WCSSPN@
HAVE_WCSSTR = @HAVE_WCSSTR@
HAVE_WCSTOK = @HAVE_WCSTOK@
HAVE_WCSWIDTH = @HAVE_WCSWIDTH@
HAVE_WCSXFRM = @HAVE_WCSXFRM@
HAVE_WCTRANS_T = @HAVE_WCTRANS_T@
HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
HAVE_WCTYPE_T = @HAVE_WCTYPE_T@
HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
HAVE_WINT_T = @HAVE_WINT_T@
HAVE_WMEMCHR = @HAVE_WMEMCHR@
HAVE_WMEMCMP = @HAVE_WMEMCMP@
HAVE_WMEMCPY = @HAVE_WMEMCPY@
HAVE_WMEMMOVE = @HAVE_WMEMMOVE@
HAVE_WMEMSET = @HAVE_WMEMSET@
HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
HAVE__BOOL = @HAVE__BOOL@
HAVE__EXIT = @HAVE__EXIT@
IMPRIMATUR_MAKEINFOFLAGS = @IMPRIMATUR_MAKEINFOFLAGS@
IMPRIMATUR_MODULE_DIR = @IMPRIMATUR_MODULE_DIR@
INCLTDL = @INCLTDL@
INCLUDE_NEXT = @INCLUDE_NEXT@
INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LEX = @LEX@
LEXLIB = @LEXLIB@
LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
LIBADD_DL = @LIBADD_DL@
LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
LIBADD_DLOPEN = @LIBADD_DLOPEN@
LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
LIBDICOSASL = @LIBDICOSASL@
LIBGNU_LIBDEPS = @LIBGNU_LIBDEPS@
LIBGNU_LTLIBDEPS = @LIBGNU_LTLIBDEPS@
LIBICONV = @LIBICONV@
LIBINTL = @LIBINTL@
LIBLTDL = @LIBLTDL@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSOCKET = @LIBSOCKET@
LIBTOOL = @LIBTOOL@
LIBZ = @LIBZ@
LIPO = @LIPO@
LN_S = @LN_S@
LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
LOCALE_FR = @LOCALE_FR@
LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
LOCALE_JA = @LOCALE_JA@
LOCALE_ZH_CN = @LOCALE_ZH_CN@
LOG_FACILITY = @LOG_FACILITY@
LTDLDEPS = @LTDLDEPS@
LTDLINCL = @LTDLINCL@
LTDLOPEN = @LTDLOPEN@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
LT_CONFIG_H = @LT_CONFIG_H@
LT_DLLOADERS = @LT_DLLOADERS@
LT_DLPREOPEN = @LT_DLPREOPEN@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FLOAT_H = @NEXT_AS_FIRST_DIRECTIVE_FLOAT_H@
NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@
NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
NEXT_AS_FIRST_DIRECTIVE_NETDB_H = @NEXT_AS_FIRST_DIRECTIVE_NETDB_H@
NEXT_AS_FIRST_DIRECTIVE_STDDEF_H = @NEXT_AS_FIRST_DIRECTIVE_STDDEF_H@
NEXT_AS_FIRST_DIRECTIVE_STDINT_H = @NEXT_AS_FIRST_DIRECTIVE_STDINT_H@
NEXT_AS_FIRST_DIRECTIVE_STDIO_H = @NEXT_AS_FIRST_DIRECTIVE_STDIO_H@
NEXT_AS_FIRST_DIRECTIVE_STDLIB_H = @NEXT_AS_FIRST_DIRECTIVE_STDLIB_H@
NEXT_AS_FIRST_DIRECTIVE_STRING_H = @NEXT_AS_FIRST_DIRECTIVE_STRING_H@
NEXT_AS_FIRST_DIRECTIVE_SYSEXITS_H = @NEXT_AS_FIRST_DIRECTIVE_SYSEXITS_H@
NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_SOCKET_H@
NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@
NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
NEXT_ERRNO_H = @NEXT_ERRNO_H@
NEXT_FLOAT_H = @NEXT_FLOAT_H@
NEXT_GETOPT_H = @NEXT_GETOPT_H@
NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
NEXT_NETDB_H = @NEXT_NETDB_H@
NEXT_STDDEF_H = @NEXT_STDDEF_H@
NEXT_STDINT_H = @NEXT_STDINT_H@
NEXT_STDIO_H = @NEXT_STDIO_H@
NEXT_STDLIB_H = @NEXT_STDLIB_H@
NEXT_STRING_H = @NEXT_STRING_H@
NEXT_SYSEXITS_H = @NEXT_SYSEXITS_H@
NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@
NEXT_TIME_H = @NEXT_TIME_H@
NEXT_UNISTD_H = @NEXT_UNISTD_H@
NEXT_WCHAR_H = @NEXT_WCHAR_H@
NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PAM_LIBS = @PAM_LIBS@
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
PPBIN = @PPBIN@
PP_SETUP_FILE = @PP_SETUP_FILE@
PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PRI_MACROS_BROKEN = @PRI_MACROS_BROKEN@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
PYTHON_CONFIG = @PYTHON_CONFIG@
PYTHON_INCLUDES = @PYTHON_INCLUDES@
PYTHON_LIBS = @PYTHON_LIBS@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
RENDITION = @RENDITION@
REPLACE_BTOWC = @REPLACE_BTOWC@
REPLACE_CALLOC = @REPLACE_CALLOC@
REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
REPLACE_CHOWN = @REPLACE_CHOWN@
REPLACE_CLOSE = @REPLACE_CLOSE@
REPLACE_DPRINTF = @REPLACE_DPRINTF@
REPLACE_DUP = @REPLACE_DUP@
REPLACE_DUP2 = @REPLACE_DUP2@
REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
REPLACE_FCLOSE = @REPLACE_FCLOSE@
REPLACE_FFLUSH = @REPLACE_FFLUSH@
REPLACE_FOPEN = @REPLACE_FOPEN@
REPLACE_FPRINTF = @REPLACE_FPRINTF@
REPLACE_FPURGE = @REPLACE_FPURGE@
REPLACE_FREOPEN = @REPLACE_FREOPEN@
REPLACE_FSEEK = @REPLACE_FSEEK@
REPLACE_FSEEKO = @REPLACE_FSEEKO@
REPLACE_FTELL = @REPLACE_FTELL@
REPLACE_FTELLO = @REPLACE_FTELLO@
REPLACE_GETCWD = @REPLACE_GETCWD@
REPLACE_GETDELIM = @REPLACE_GETDELIM@
REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@
REPLACE_GETGROUPS = @REPLACE_GETGROUPS@
REPLACE_GETLINE = @REPLACE_GETLINE@
REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
REPLACE_LCHOWN = @REPLACE_LCHOWN@
REPLACE_LINK = @REPLACE_LINK@
REPLACE_LINKAT = @REPLACE_LINKAT@
REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
REPLACE_LSEEK = @REPLACE_LSEEK@
REPLACE_MALLOC = @REPLACE_MALLOC@
REPLACE_MBRLEN = @REPLACE_MBRLEN@
REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
REPLACE_MBSINIT = @REPLACE_MBSINIT@
REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
REPLACE_MBTOWC = @REPLACE_MBTOWC@
REPLACE_MEMCHR = @REPLACE_MEMCHR@
REPLACE_MEMMEM = @REPLACE_MEMMEM@
REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
REPLACE_MKTIME = @REPLACE_MKTIME@
REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
REPLACE_NULL = @REPLACE_NULL@
REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
REPLACE_PERROR = @REPLACE_PERROR@
REPLACE_POPEN = @REPLACE_POPEN@
REPLACE_PREAD = @REPLACE_PREAD@
REPLACE_PRINTF = @REPLACE_PRINTF@
REPLACE_PUTENV = @REPLACE_PUTENV@
REPLACE_PWRITE = @REPLACE_PWRITE@
REPLACE_READLINK = @REPLACE_READLINK@
REPLACE_REALLOC = @REPLACE_REALLOC@
REPLACE_REALPATH = @REPLACE_REALPATH@
REPLACE_REMOVE = @REPLACE_REMOVE@
REPLACE_RENAME = @REPLACE_RENAME@
REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
REPLACE_RMDIR = @REPLACE_RMDIR@
REPLACE_SETENV = @REPLACE_SETENV@
REPLACE_SLEEP = @REPLACE_SLEEP@
REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
REPLACE_SPRINTF = @REPLACE_SPRINTF@
REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
REPLACE_STPNCPY = @REPLACE_STPNCPY@
REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
REPLACE_STRDUP = @REPLACE_STRDUP@
REPLACE_STRERROR = @REPLACE_STRERROR@
REPLACE_STRERROR_R = @REPLACE_STRERROR_R@
REPLACE_STRNCAT = @REPLACE_STRNCAT@
REPLACE_STRNDUP = @REPLACE_STRNDUP@
REPLACE_STRNLEN = @REPLACE_STRNLEN@
REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
REPLACE_STRSTR = @REPLACE_STRSTR@
REPLACE_STRTOD = @REPLACE_STRTOD@
REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
REPLACE_SYMLINK = @REPLACE_SYMLINK@
REPLACE_TIMEGM = @REPLACE_TIMEGM@
REPLACE_TMPFILE = @REPLACE_TMPFILE@
REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
REPLACE_UNLINK = @REPLACE_UNLINK@
REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
REPLACE_UNSETENV = @REPLACE_UNSETENV@
REPLACE_USLEEP = @REPLACE_USLEEP@
REPLACE_VASPRINTF = @REPLACE_VASPRINTF@
REPLACE_VDPRINTF = @REPLACE_VDPRINTF@
REPLACE_VFPRINTF = @REPLACE_VFPRINTF@
REPLACE_VPRINTF = @REPLACE_VPRINTF@
REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
REPLACE_WCSWIDTH = @REPLACE_WCSWIDTH@
REPLACE_WCTOB = @REPLACE_WCTOB@
REPLACE_WCTOMB = @REPLACE_WCTOMB@
REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
REPLACE_WRITE = @REPLACE_WRITE@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
STDBOOL_H = @STDBOOL_H@
STDDEF_H = @STDDEF_H@
STDINT_H = @STDINT_H@
STRIP = @STRIP@
SYSEXITS_H = @SYSEXITS_H@
SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@
WINT_T_SUFFIX = @WINT_T_SUFFIX@
WISH = @WISH@
WORDNET_IOPT = @WORDNET_IOPT@
WORDNET_LOPT = @WORDNET_LOPT@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
YACC = @YACC@
YFLAGS = @YFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
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@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
gl_LIBOBJS = @gl_LIBOBJS@
gl_LTLIBOBJS = @gl_LTLIBOBJS@
gltests_LIBOBJS = @gltests_LIBOBJS@
gltests_LTLIBOBJS = @gltests_LTLIBOBJS@
gltests_WITNESS = @gltests_WITNESS@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
lispdir = @lispdir@
localedir = @localedir@
localstatedir = @localstatedir@
ltdl_LIBOBJS = @ltdl_LIBOBJS@
ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sys_symbol_underscore = @sys_symbol_underscore@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4 -I am -I grecs/am -I gint -I imprimatur
SUBDIRS = \
include\
utils\
examples\
gint\
gnu\
grecs\
lib\
libltdl\
dicod\
modules\
dico\
scripts\
imprimatur\
doc\
po
#FIXME: add these when ready: makedict client fonts
EXTRA_DIST = ChangeLog.2008
# Start Git ChangeLog from this date.
gen_start_date = 2008-05-05
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) --gnits'; \
$(am__cd) $(srcdir) && $(AUTOMAKE) --gnits \
&& exit 0; \
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnits 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;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: $(am__configure_deps)
$(am__cd) $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
$(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
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)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
distclean-hdr:
-rm -f config.h stamp-h1
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
distclean-libtool:
-rm -f libtool config.lt
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
# (1) if the variable is set in `config.status', edit `config.status'
# (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):
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
local_target="$$target-am"; \
else \
local_target="$$target"; \
fi; \
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done; \
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
*k*) failcom='fail=yes';; \
esac; \
done; \
dot_seen=no; \
case "$@" in \
distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
*) list='$(SUBDIRS)' ;; \
esac; \
rev=''; for subdir in $$list; do \
if test "$$subdir" = "."; then :; else \
rev="$$subdir $$rev"; \
fi; \
done; \
rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
local_target="$$target-am"; \
else \
local_target="$$target"; \
fi; \
($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
|| eval $$failcom; \
done && test -z "$$fail"
tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
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; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
set x; \
here=`pwd`; \
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 || \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) config.h.in $(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; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
if test $$# -gt 0; then \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
"$$@" $$unique; \
else \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$unique; \
fi; \
fi
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
list='$(SOURCES) $(HEADERS) config.h.in $(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; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@case `sed 15q $(srcdir)/NEWS` in \
*"$(VERSION)"*) : ;; \
*) \
echo "NEWS not updated; not releasing" 1>&2; \
exit 1;; \
esac
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d "$(distdir)/$$file"; then \
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
test -f "$(distdir)/$$file" \
|| cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
|| $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
fi; \
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
dir1=$$subdir; dir2="$(top_distdir)"; \
$(am__relativize); \
new_top_distdir=$$reldir; \
echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$new_top_distdir" \
distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-test -n "$(am__skip_mode_fix)" \
|| find "$(distdir)" -type d ! -perm -755 \
-exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(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-lzma: distdir
tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
$(am__remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
$(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)
$(am__remove_distdir)
dist dist-all: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
$(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) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
distuninstallcheck \
&& chmod -R a-w "$$dc_install_base" \
&& ({ \
(cd ../.. && umask 077 && mkdir "$$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) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@$(am__cd) '$(distuninstallcheck_dir)' \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
fi ; \
$(distuninstallcheck_listfiles) ; \
exit 1; } >&2
distcleancheck: distclean
@if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
check: check-recursive
all-am: Makefile config.h
installdirs: installdirs-recursive
installdirs-am:
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
installcheck: installcheck-recursive
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:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_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-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f Makefile
distclean-am: clean-am distclean-generic distclean-hdr \
distclean-libtool distclean-tags
dvi: dvi-recursive
dvi-am:
html: html-recursive
html-am:
info: info-recursive
info-am:
install-data-am:
install-dvi: install-dvi-recursive
install-dvi-am:
install-exec-am:
install-html: install-html-recursive
install-html-am:
install-info: install-info-recursive
install-info-am:
install-man:
install-pdf: install-pdf-recursive
install-pdf-am:
install-ps: install-ps-recursive
install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-recursive
pdf-am:
ps: ps-recursive
ps-am:
uninstall-am:
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
ctags-recursive install-am install-strip tags-recursive
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
dist-zip distcheck distclean distclean-generic distclean-hdr \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags tags-recursive uninstall uninstall-am
dist-hook:
tar -C $(srcdir) -c -f - --exclude-vcs app dicoweb | \
tar -C $(distdir) -x -f -
.PHONY: ChangeLog
ChangeLog:
$(AM_V_GEN)if test -d .git; then \
git log --pretty='format:%ct %an <%ae>%n%n%s%n%n%b%n' | \
awk -f $(top_srcdir)/@GRECS_SUBDIR@/build-aux/git2chg.awk \
-vsince=$(gen_start_date) > ChangeLog; \
fi
# 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:
dico-2.2/NEWS 0000664 0000000 0000000 00000010006 11726126741 0012776 0 ustar 00root root 0000000 0000000 GNU Dico NEWS -- history of user-visible changes. 2012-03-04
Copyright (C) 2008-2010, 2012 Sergey Poznyakoff
See the end of file for copying conditions.
Please send Dico bug reports to
Version 2.2, 2012-03-04
* Configuration changes
** load-module
The load-module form allows for a statement use, e.g.:
load-module word;
The above statement is equivalent to:
load-module word {
command "word";
}
Either string or list of strings is accepted as argument. The latter
is useful for loading several modules with a single statement, e.g.:
load-module (stratall,substr,word);
* New modules
** gcide
This module provides support for GNU Collaborative International
Dictionary of English.
** wordnet
This module provides support for WordNet, a lexical database for the
English language developed in the Princeton University and distributed
under a BSD style license.
** word
This module provides the following strategies:
word "Match separate words within headwords"
first "Match the first word within headwords"
last "Match the last word within headwords"
** nprefix
Provides the nprefix strategy. It is similar to prefix but returns the
specified range of matches. For example
MATCH nprefix ##
returns at most headwords whose prefix matches ,
skipping first unique matches.
** pcre
Provides matching strategy based on Perl regular expressions.
** pam
Implements PAM authentication.
* New utility: gcider
"Gcider" is a window-based application for browsing the GNU
Collaborative International Dictionary of English (see
http://www.gnu.org/software/gcide).
Version 2.1, 2010-07-07
* Normalize exit codes.
The dicod server uses exit codes from sysexits.h.
* Replies to MATCH command.
The dictorg backend filters out duplicate entries from MATCH replies.
Only the first one from a sequence of such duplicates is retained.
* New configuration statements.
** prepend-load-path
Acts much the same as module-load-path, but adds directories at front
of the default Dico module directory.
* Strategies
** All
The `all' strategy has been re-implemented as a loadable module. To
enable this strategy in daemon, load the `stratall' module:
load-module stratall {
command "stratall";
}
** Substr
New strategy `substr' matches a substring anywhere in the headword.
To enable this strategy, load the `substr' module:
load-module substr {
command "substr";
}
* LDAP
Dicod now supports LDAP as an underlying mechanism for storing
user databases. The LDAP support is loaded as a module:
load-module ldap {
command "ldap";
}
See the documentation, subsection 3.3.3.2 "LDAP Databases", for
a detailed description.
* Dicoweb
Improved handling of databases without a descriptive name (previous
version would throw exception for such cases).
The file settings.py renamed to settings-sample.py.
The file static/opensearch.xml has been moved to templates. If
you are upgrading from an earlier version, you may safely remove it.
* Bugfixes:
** Fixed improper handling of conversion errors in levenshtein.c
(debian #582692)
** Removed the use of fixed-size buffer in dictorg.c (fixes debian
#582708)
Version 2.0, 2009-03-29
Initial version.
=========================================================================
Copyright information:
Copyright (C) 2008, 2009, 2010 Sergey Poznyakoff
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
copyright notice and this permission notice are preserved,
thus giving the recipient permission to redistribute in turn.
Permission is granted to distribute modified versions
of this document, or of portions of it,
under the above conditions, provided also that they
carry prominent notices stating who last changed them.
Local variables:
mode: outline
paragraph-separate: "[ ]*$"
eval: (add-hook 'write-file-hooks 'time-stamp)
time-stamp-start: "changes. "
time-stamp-format: "%:y-%02m-%02d"
time-stamp-end: "\n"
end:
dico-2.2/README 0000664 0000000 0000000 00000014732 11726126741 0013171 0 ustar 00root root 0000000 0000000 GNU Dico README
Copyright (C) 2008-2010, 2012 Sergey Poznyakoff
* Introduction
==============
This file contains brief information about configuring, testing
and running GNU Dico. It is *not* intended as a replacement
for the documentation, but is provided as a brief reference only.
The complete documentation for Dico is available in doc/
subdirectory. To read it without installing the package run
`info -f doc/dico.info'. After the package is installed the
documentation can be accessed running `info Dico'. Invoking
`info dico' and `info dicod' (with a lower-case `d') will show you a
concise description of the command line syntax (similar to a man-page
style) of `dico' and `dicod' programs, correspondingly.
An online copy of the documentation in various formats is available
at http://dico.man.gnu.org.ua.
* Overview
==========
Dico is a flexible implementation of DICT server (RFC 2229). The
server is modular: the daemon itself (dicod) provides only the server
functionality, and knows nothing about database formats. Actual
searches are performed by functions supplied in loadable modules. A
single module can handle any number of database instances.
The package includes several modules for searching in different
dictionary databases, such as dict.org, WordNet and others.
The server can be configured to handle both anonymous and authorized
access. It supports a wide variety of authentication algorithms.
Simpler configurations can keep the user database in plaintext files,
while more complex ones can use LDAP.
A console client program, `dico', is included.
A module for lookups in Jim Breen's Kanjidic and Edict databases will
be added in future.
* What's in a name?
===================
Dico is informal French for "Dictionary". It is pronounced "Deekoh",
with the stress on the last syllable.
* Modules
=========
The package comes with the following modules:
- dictorg
This module handles databases in dict.org format.
- outline
Support for databases in Emacs outline format. This module is
designed mostly as an example and for testing purposes.
- gcide
GNUCIDE dictionary support.
- wordnet
WordNet support. WordNet is a lexical database for the English
language, created and maintained at the Cognitive Science Laboratory
of Princeton University.
- guile
An abstract layer for interfacing with database modules written in
Guile.
- python
An abstract layer for interfacing with database modules written in
Python.
- substr
Defines the "substr" lookup strategy, which matches a supplied
substring anywhere in the headword.
- stratall
Defines a special lookup strategy, named "all", which returns all
headwords from the database.
- word
Defines the "word" lookup strategy, which matches a supplied
word anywhere in the headword.
- pcre
Defines a strategy for using Perl-compatible regular expressions.
- ldap
Brings support for LDAP user databases.
- pam
Implements PAM authentication.
* Building
==========
As usual:
$ ./configure
$ make
$ make install
See INSTALL for the generic configure instructions. The rest of this
section describes configuration options and variables specific for
Dico.
** Default Preprocessor
------------------------
The runtime configuration system uses `m4' to preprocess the
configuration file, which makes the configuration extremely flexible.
We recommend to use GNU m4 as a preprocessor, although any other
implementation of `m4' can be used as well. The `configure' script tries to
determine the full file name of the preprocessor binary and the necessary
command line options. In case it makes a wrong guess, you can instruct
it to use a particular preprocessor by defining the `DEFAULT_PREPROCESSOR'
configuration variable. For example, the following `configure'
invocation instructs it to use `/usr/local/bin/gm4':
$ ./configure DEFAULT_PREPROCESSOR="/usr/local/bin/gm4 -s"
Note the use of the `-s' preprocessor option. It tells `m4' to
produce line directives which help `dicod' produce correct diagnostics
about eventual configuration errors. Unless your `m4' implementation
does not have this feature, we recommend to always use it in
`DEFAULT_PREPROCESSOR' value.
Finally, if you do not wish to use preprocessor at all, use
the `--without-preprocessor' option.
** Default Server
-----------------
Unless given an explicit dictionary server, the client program `dico'
attempts to connect the server `dict://dico.gnu.org.ua'. You can
change this default by setting the DEFAULT_DICT_SERVER environment
variable to the desired server hostname. For example:
$ ./configure DEFAULT_DICT_SERVER=dict.org
** Guile Support
-----------------
The "GNU's Ubiquitous Intelligent Language for Extensions" (Guile)
can be used to write database modules for `dico'. This
requires Guile version 1.8.4 or newer. The `configure' script will
probe for the presence of Guile on your system and automatically enable
its use if its version number is high enough.
If you do not wish to use Guile, use `--without-guile' to disable it.
** WordNet database
-------------------
If you plan to use WordNet database, you will most probably need the
`--with-wordnet' option to inform the script about the location where
WordNet libraries and headers can be found. For example, the command
./configure --with-wordnet=/usr/local/WordNet-3.0
instructs the script to look for WordNet library files in
/usr/local/WordNet-3.0/lib and for include files in
/usr/local/WordNet-3.0/include.
** Other Configure Settings
----------------------------
The `dicod' daemon uses syslog for diagnostics. The default syslog
facility can be set using `LOG_FACILITY' configuration variable.
Allowed arguments are `user', `daemon', `auth', `authpriv', `mail',
`cron', and `local0' through `local7' (case insensitive).
By default, the `daemon' facility is used.
* Bug reporting.
Send bug reports to .
* Copyright information:
Copyright (C) 2008-2010, 2012 Sergey Poznyakoff
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
copyright notice and this permission notice are preserved,
thus giving the recipient permission to redistribute in turn.
Permission is granted to distribute modified versions
of this document, or of portions of it,
under the above conditions, provided also that they
carry prominent notices stating who last changed them.
Local Variables:
mode: outline
paragraph-separate: "[ ]*$"
version-control: never
End:
dico-2.2/THANKS 0000664 0000000 0000000 00000000617 11726126741 0013221 0 ustar 00root root 0000000 0000000 GNU Dico THANKS file.
Many people further contributed to GNU Dico by reporting problems,
suggesting various improvements or submitting actual code. Here is a list
of these people. Help us keep it complete and exempt of errors.
Goran Tal
Karl Berry
Marc Dequènes
Wojciech Polak
dico-2.2/TODO 0000664 0000000 0000000 00000000604 11726126741 0012772 0 ustar 00root root 0000000 0000000 Dico TODO list.
* Streams
Drop stream functions from lib and import the stream library from Mailutils.
It sprang off from Dico a couple of years ago and evolved into a pretty
mature system.
* Documentation.
** Add a pointer to ellinika.gnu.org.ua:dict.
* A module for kanjidic/edict.
* X client for the above.
Local variables:
mode: outline
paragraph-separate: "[ ]*$"
end:
dico-2.2/aclocal.m4 0000664 0000000 0000000 00000121143 11726126741 0014144 0 ustar 00root root 0000000 0000000 # generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 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 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.
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
[m4_warning([this file was generated for autoconf 2.63.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 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_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
# _AM_AUTOCONF_VERSION(VERSION)
# -----------------------------
# aclocal traces this macro to find the Autoconf version.
# This is a private macro too. Using m4_define simplifies
# the logic in aclocal, which can simply ignore this definition.
m4_define([_AM_AUTOCONF_VERSION], [])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- 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.
# 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.
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`
])
# AM_COND_IF -*- Autoconf -*-
# Copyright (C) 2008 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 1
# _AM_COND_IF
# _AM_COND_ELSE
# _AM_COND_ENDIF
# --------------
# These macros are only used for tracing.
m4_define([_AM_COND_IF])
m4_define([_AM_COND_ELSE])
m4_define([_AM_COND_ENDIF])
# AM_COND_IF(COND, [IF-TRUE], [IF-FALSE])
# ---------------------------------------
# If the shell condition matching COND is true, execute IF-TRUE,
# otherwise execute IF-FALSE. Allow automake to learn about conditional
# instantiating macros (the AC_CONFIG_FOOS).
AC_DEFUN([AM_COND_IF],
[m4_ifndef([_AM_COND_VALUE_$1],
[m4_fatal([$0: no such condition "$1"])])dnl
_AM_COND_IF([$1])dnl
if _AM_COND_VALUE_$1; then
m4_default([$2], [:])
m4_ifval([$3],
[_AM_COND_ELSE([$1])dnl
else
$3
])dnl
_AM_COND_ENDIF([$1])dnl
fi[]dnl
])
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
# 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 9
# 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])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
m4_define([_AM_COND_VALUE_$1], [$2])dnl
if $2; then
$1_TRUE=
$1_FALSE='#'
else
$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) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
# 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 10
# 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,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
# NAME is "CC", "CXX", "GCJ", or "OBJC".
# We try a few techniques and use that to set a single cache variable.
#
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
# dependency, and given that the user is not expected to run this macro,
# just rely on AC_PROG_CC.
AC_DEFUN([_AM_DEPENDENCIES],
[AC_REQUIRE([AM_SET_DEPDIR])dnl
AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
[$1], UPC, [depcc="$UPC" am_compiler_list=],
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
AC_CACHE_CHECK([dependency style of $depcc],
[am_cv_$1_dependencies_compiler_type],
[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_$1_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
am__universal=false
m4_case([$1], [CC],
[case " $depcc " in #(
*\ -arch\ *\ -arch\ *) am__universal=true ;;
esac],
[CXX],
[case " $depcc " in #(
*\ -arch\ *\ -arch\ *) am__universal=true ;;
esac])
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
# 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. Also, some Intel
# versions had trouble with output in subdirs
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
gcc)
# This depmode causes a compiler race in universal mode.
test "$am__universal" = false || continue
;;
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
;;
msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
am__minus_obj=
;;
none) break ;;
esac
if depmode=$depmode \
source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep $am__obj 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_$1_dependencies_compiler_type=$depmode
break
fi
fi
done
cd ..
rm -rf conftest.dir
else
am_cv_$1_dependencies_compiler_type=none
fi
])
AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
AM_CONDITIONAL([am__fastdep$1], [
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_$1_dependencies_compiler_type" = gcc3])
])
# AM_SET_DEPDIR
# -------------
# Choose a directory name for dependency files.
# This macro is AC_REQUIREd in _AM_DEPENDENCIES
AC_DEFUN([AM_SET_DEPDIR],
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
])
# AM_DEP_TRACK
# ------------
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])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
# 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 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[{
# Autoconf 2.62 quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
*\'*) eval set x "$CONFIG_FILES" ;;
*) set x $CONFIG_FILES ;;
esac
shift
for mf
do
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
# We used to match only the files named `Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`AS_DIRNAME("$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"`
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" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
AS_MKDIR_P([$dirpart/$fdir])
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
done
}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
# AM_OUTPUT_DEPENDENCY_COMMANDS
# -----------------------------
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
# is enabled. FIXME. This creates each `.P' file that we will
# need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
[test x"$AMDEP_TRUE" != x"" || _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($@)])
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2008, 2009 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 16
# 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.62])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
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
fi
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
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
[m4_fatal([AC_INIT should be called with package and version arguments])])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)
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
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
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
[_AM_DEPENDENCIES(OBJC)],
[define([AC_PROG_OBJC],
defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
])
_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
AC_CONFIG_COMMANDS_PRE(dnl
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
])
dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
dnl mangled by Autoconf and run in a shell conditional statement.
m4_define([_AC_COMPILER_EXEEXT],
m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
# 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_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
$_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005, 2008 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
if test x"${install_sh}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
*)
install_sh="\${SHELL} $am_aux_dir/install-sh"
esac
fi
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])])
# Copyright (C) 1998, 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.
# serial 5
# AM_PROG_LEX
# -----------
# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a
# "missing" invocation, for better error output.
AC_DEFUN([AM_PROG_LEX],
[AC_PREREQ(2.50)dnl
AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
AC_REQUIRE([AC_PROG_LEX])dnl
if test "$LEX" = :; then
LEX=${am_missing_run}flex
fi])
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005, 2009 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 4
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
AC_DEFUN([AM_MAKE_INCLUDE],
[am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
@echo this is the am__doit target
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
AC_MSG_CHECKING([for style of include used by $am_make])
am__include="#"
am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
# Ignore all kinds of additional output from `make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
am__quote=
_am_result=GNU
;;
esac
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=.include
am__quote="\""
_am_result=BSD
;;
esac
fi
AC_SUBST([am__include])
AC_SUBST([am__quote])
AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
# 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 6
# 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)])
# 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
AC_REQUIRE_AUX_FILE([missing])dnl
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
*)
MISSING="\${SHELL} $am_aux_dir/missing" ;;
esac
fi
# 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
])
# Copyright (C) 2003, 2004, 2005, 2006 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_MKDIR_P
# ---------------
# Check for `mkdir -p'.
AC_DEFUN([AM_PROG_MKDIR_P],
[AC_PREREQ([2.60])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
dnl while keeping a definition of mkdir_p for backward compatibility.
dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
dnl Makefile.ins that do not define MKDIR_P, so we do our own
dnl adjustment using top_builddir (which is defined more often than
dnl MKDIR_P).
AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
case $mkdir_p in
[[\\/$]]* | ?:[[\\/]]*) ;;
*/*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
esac
])
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005, 2008 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 4
# _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],
[m4_foreach_w([_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])])
# 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_RUN_LOG(COMMAND)
# -------------------
# Run COMMAND, save the exit status in ac_status, and log it.
# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
AC_DEFUN([AM_RUN_LOG],
[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
(exit $ac_status); }])
# Check to make sure that the build environment is sane. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
# 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 5
# 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
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
'
case `pwd` in
*[[\\\"\#\$\&\'\`$am_lf]]*)
AC_MSG_ERROR([unsafe absolute working directory name]);;
esac
case $srcdir in
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
esac
# 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
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)])
# Copyright (C) 2009 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 1
# AM_SILENT_RULES([DEFAULT])
# --------------------------
# Enable less verbose build rules; with the default set to DEFAULT
# (`yes' being less verbose, `no' or empty being verbose).
AC_DEFUN([AM_SILENT_RULES],
[AC_ARG_ENABLE([silent-rules],
[ --enable-silent-rules less verbose build output (undo: `make V=1')
--disable-silent-rules verbose build output (undo: `make V=0')])
case $enable_silent_rules in
yes) AM_DEFAULT_VERBOSITY=0;;
no) AM_DEFAULT_VERBOSITY=1;;
*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
esac
AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
AM_BACKSLASH='\'
AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
# 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_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="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Copyright (C) 2006, 2008 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
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# 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.
# serial 2
# _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
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'
;;
none)
am__tar=false
am__tar_=false
am__untar=false
;;
esac
# 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
# 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 /dev/null 2>&1 && break
fi
done
rm -rf conftest.dir
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
m4_include([imprimatur/imprimatur.m4])
m4_include([gint/gint.m4])
m4_include([gint/guile.m4])
m4_include([grecs/am/grecs.m4])
m4_include([am/gsasl.m4])
m4_include([am/lib.m4])
m4_include([am/testdir.m4])
m4_include([m4/00gnulib.m4])
m4_include([m4/alloca.m4])
m4_include([m4/argz.m4])
m4_include([m4/btowc.m4])
m4_include([m4/codeset.m4])
m4_include([m4/configmake.m4])
m4_include([m4/des.m4])
m4_include([m4/errno_h.m4])
m4_include([m4/extensions.m4])
m4_include([m4/fcntl-o.m4])
m4_include([m4/float_h.m4])
m4_include([m4/fprintftime.m4])
m4_include([m4/fseeko.m4])
m4_include([m4/getdelim.m4])
m4_include([m4/getdomainname.m4])
m4_include([m4/gethostname.m4])
m4_include([m4/getline.m4])
m4_include([m4/getopt.m4])
m4_include([m4/getpass.m4])
m4_include([m4/gettext.m4])
m4_include([m4/gettimeofday.m4])
m4_include([m4/glibc21.m4])
m4_include([m4/gnulib-common.m4])
m4_include([m4/gnulib-comp.m4])
m4_include([m4/hash.m4])
m4_include([m4/iconv.m4])
m4_include([m4/include_next.m4])
m4_include([m4/inline.m4])
m4_include([m4/intlmacosx.m4])
m4_include([m4/intmax_t.m4])
m4_include([m4/inttostr.m4])
m4_include([m4/inttypes-pri.m4])
m4_include([m4/inttypes.m4])
m4_include([m4/inttypes_h.m4])
m4_include([m4/langinfo_h.m4])
m4_include([m4/lib-ld.m4])
m4_include([m4/lib-link.m4])
m4_include([m4/lib-prefix.m4])
m4_include([m4/libtool.m4])
m4_include([m4/localcharset.m4])
m4_include([m4/locale-fr.m4])
m4_include([m4/locale-ja.m4])
m4_include([m4/locale-zh.m4])
m4_include([m4/longlong.m4])
m4_include([m4/lseek.m4])
m4_include([m4/ltdl.m4])
m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4])
m4_include([m4/ltversion.m4])
m4_include([m4/lt~obsolete.m4])
m4_include([m4/malloc.m4])
m4_include([m4/mbrtowc.m4])
m4_include([m4/mbsinit.m4])
m4_include([m4/mbstate_t.m4])
m4_include([m4/mbtowc.m4])
m4_include([m4/md5.m4])
m4_include([m4/memchr.m4])
m4_include([m4/mmap-anon.m4])
m4_include([m4/multiarch.m4])
m4_include([m4/netdb_h.m4])
m4_include([m4/nl_langinfo.m4])
m4_include([m4/nls.m4])
m4_include([m4/po.m4])
m4_include([m4/printf.m4])
m4_include([m4/progtest.m4])
m4_include([m4/quote.m4])
m4_include([m4/quotearg.m4])
m4_include([m4/realloc.m4])
m4_include([m4/regex.m4])
m4_include([m4/sha1.m4])
m4_include([m4/size_max.m4])
m4_include([m4/snprintf.m4])
m4_include([m4/socketlib.m4])
m4_include([m4/sockets.m4])
m4_include([m4/socklen.m4])
m4_include([m4/ssize_t.m4])
m4_include([m4/stdbool.m4])
m4_include([m4/stddef_h.m4])
m4_include([m4/stdint.m4])
m4_include([m4/stdint_h.m4])
m4_include([m4/stdio_h.m4])
m4_include([m4/stdlib_h.m4])
m4_include([m4/strerror.m4])
m4_include([m4/strftime.m4])
m4_include([m4/string_h.m4])
m4_include([m4/strtoimax.m4])
m4_include([m4/strtol.m4])
m4_include([m4/strtoll.m4])
m4_include([m4/strtoul.m4])
m4_include([m4/strtoull.m4])
m4_include([m4/strtoumax.m4])
m4_include([m4/sys_socket_h.m4])
m4_include([m4/sys_time_h.m4])
m4_include([m4/sysexits.m4])
m4_include([m4/time_h.m4])
m4_include([m4/time_r.m4])
m4_include([m4/tm_gmtoff.m4])
m4_include([m4/unistd_h.m4])
m4_include([m4/vasnprintf.m4])
m4_include([m4/vasprintf.m4])
m4_include([m4/warn-on-use.m4])
m4_include([m4/wchar_h.m4])
m4_include([m4/wchar_t.m4])
m4_include([m4/wcrtomb.m4])
m4_include([m4/wctype_h.m4])
m4_include([m4/wint_t.m4])
m4_include([m4/xalloc.m4])
m4_include([m4/xsize.m4])
dico-2.2/am/ 0000775 0000000 0000000 00000000000 11726126741 0012677 5 ustar 00root root 0000000 0000000 dico-2.2/am/gsasl.m4 0000664 0000000 0000000 00000003751 11726126741 0014260 0 ustar 00root root 0000000 0000000 dnl This file is part of GNU mailutils.
dnl Copyright (C) 2003, 2007-2008, 2012 Free Software Foundation, Inc.
dnl
dnl GNU Mailutils is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
dnl the Free Software Foundation; either version 3, or (at your option)
dnl any later version.
dnl
dnl GNU Mailutils is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
dnl GNU General Public License for more details.
dnl
dnl You should have received a copy of the GNU General Public License along
dnl with GNU Mailutils; if not, write to the Free Software Foundation,
dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
dnl
AC_DEFUN([MU_CHECK_GSASL],
[AC_CACHE_VAL([mu_cv_lib_gsasl],
[if test "x$mu_cv_lib_gsasl" = x; then
cached=""
mu_cv_lib_gsasl=no
AC_ARG_WITH(gsasl,
AC_HELP_STRING([--with-gsasl], [use libgsasl for SASL authentication]),
[case $withval in
yes|no) wantgsasl=$withval;;
*) AC_MSG_ERROR([bad value for --with-gsasl: $withval]);;
esac],
[wantgsasl=yes])
if test $wantgsasl = yes; then
AC_CHECK_HEADER(gsasl.h,
[:],
[wantgsasl=no])
if test $wantgsasl != no; then
save_LIBS=$LIBS
AC_SEARCH_LIBS(gsasl_init, gsasl,
[mu_cv_lib_gsasl=-lgsasl],
[mu_cv_lib_gsasl=no])
if test $mu_cv_lib_gsasl != no; then
LIBS="$LIBS $mu_cv_lib_gsasl"
AC_TRY_RUN([
#include
int
main()
{
return gsasl_check_version ("$1") == (char*) 0;
}],
[:],
[mu_cv_lib_gsasl=no],
[mu_cv_lib_gsasl=no])
fi
LIBS=$save_LIBS
fi
fi
fi])
if test $mu_cv_lib_gsasl != no; then
AC_SUBST(GSASL_LIBS,$mu_cv_lib_gsasl)
ifelse([$2],,,[$2])
fi])
dico-2.2/am/lib.m4 0000664 0000000 0000000 00000003377 11726126741 0013721 0 ustar 00root root 0000000 0000000 # This file is part of GNU Dico
# Copyright (C) 2010, 2012 Sergey Poznyakoff
#
# GNU Dico 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 3, or (at your option)
# any later version.
#
# GNU Dico 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 GNU Dico. If not, see .
dnl Arguments:
dnl $1 -- Library to look for
dnl $2 -- Function to check in the library
dnl $3 -- Any additional libraries that might be needed
dnl $4 -- Action to be taken when test succeeds
dnl $5 -- Action to be taken when test fails
dnl $6 -- Directories where the library may reside
AC_DEFUN([DICO_CHECK_LIB],
[m4_ifval([$4], , [AH_CHECK_LIB([$1])])dnl
AS_VAR_PUSHDEF([dico_lib], [mu_cv_lib_$1])dnl
AC_CACHE_CHECK([for $2 in -l$1], [dico_lib],
[AS_VAR_SET([dico_lib], [no])
dico_check_lib_save_LIBS=$LIBS
for path in "" $6
do
if test -n "$path"; then
dico_ldflags="-L$path -l$1 $3"
else
dico_ldflags="-l$1 $3"
fi
LIBS="$dico_ldflags $mu_check_lib_save_LIBS"
AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
[AS_VAR_SET([dico_lib], ["$mu_ldflags"])
break])
done
LIBS=$dico_check_lib_save_LIBS])
AS_IF([test "AS_VAR_GET([dico_lib])" != no],
[m4_default([$4], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
LIBS="-l$1 $LIBS"
])],
[$5])dnl
AS_VAR_POPDEF([dico_lib])dnl
])# DICO_CHECK_LIB
dico-2.2/am/testdir.m4 0000664 0000000 0000000 00000001472 11726126741 0014623 0 ustar 00root root 0000000 0000000 # testdir.m4 serial 1
# This file is part of GNU Dico
# Copyright (C) 2012 Sergey Poznyakoff
#
# GNU Dico 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 3, or (at your option)
# any later version.
#
# GNU Dico 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 GNU Dico. If not, see .
AC_DEFUN([DICO_TESTS],[
AC_CONFIG_TESTDIR($1/tests)
AC_CONFIG_FILES($1/tests/Makefile)
AC_CONFIG_FILES($1/tests/atlocal)
]) dico-2.2/app/ 0000775 0000000 0000000 00000000000 11726126741 0013062 5 ustar 00root root 0000000 0000000 dico-2.2/app/python/ 0000775 0000000 0000000 00000000000 11726126741 0014403 5 ustar 00root root 0000000 0000000 dico-2.2/app/python/mediawiki.py 0000664 0000000 0000000 00000011500 11726126741 0016715 0 ustar 00root root 0000000 0000000 # -*- coding: utf-8 -*-
#
# This file is part of GNU Dico.
# Copyright (C) 2008-2010, 2012 Wojciech Polak
#
# GNU Dico 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 3, or (at your option)
# any later version.
#
# GNU Dico 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 GNU Dico. If not, see .
import sys
import re
import socket
import urllib2
from htmlentitydefs import name2codepoint
from xml.dom import minidom
from wit import wiki2text
# Set utf-8 as the default encoding.
# Trying to do so using encode('utf_8')/unicode, which is
# supposed to be the right way, does not work.
# Simply calling sys.setdefaultencoding is not possible,
# because, for some obscure reason, Python chooses to delete
# this symbol from the namespace after setting its default
# encoding in site.py. That's why reload is needed.
reload(sys)
sys.setdefaultencoding('utf-8')
try:
import json
except ImportError:
import simplejson as json
import dico
__version__ = '1.03'
class DicoModule:
user_agent = 'Mozilla/1.0'
endpoint_match = '/w/api.php?action=opensearch&format=json&search='
endpoint_define = '/wiki/Special:Export/'
def __init__ (self, *argv):
self.wikihost = argv[0]
socket.setdefaulttimeout (4)
dico.register_markup ('wiki')
def open (self, dbname):
self.dbname = dbname
return True
def close (self):
return True
def descr (self):
return self.wikihost
def info (self):
return False
def define_word (self, word):
url = 'http://%s%s%s' % (self.wikihost, self.endpoint_define,
urllib2.quote (word))
req = urllib2.Request (url)
req.add_header ('User-Agent', self.user_agent)
try:
xml = urllib2.urlopen (req).read ()
except urllib2.URLError:
return False
dom = minidom.parseString (xml)
el = dom.getElementsByTagName ('text')
if len (el):
data = el[0].firstChild.data
if dico.current_markup () != 'wiki':
data = self.__htmlentitydecode (data).encode ('utf_8')
wikiparser = wiki2text.TextWiktionaryMarkup (text=data)
wikiparser.parse ()
data = str (wikiparser)
return ['define', data]
else:
return False
def match_word (self, strat, key):
url = 'http://%s%s%s' % (self.wikihost, self.endpoint_match,
urllib2.quote (key.word))
req = urllib2.Request (url)
req.add_header ('User-Agent', self.user_agent)
try:
result = json.load (urllib2.urlopen (req))
if result:
if strat.has_selector:
fltres = []
for k in result[1]:
if strat.select (k, key):
fltres.append (k)
if fltres.count > 0:
return ['match', sorted(fltres, key=unicode.lower)]
else:
result[1].sort ()
return ['match', sorted(result[1], key=unicode.lower)]
return False
except urllib2.URLError:
return False
def output (self, rh, n):
if rh[0] == 'define':
try:
print rh[1].encode ('utf_8'),
except UnicodeDecodeError:
print rh[1],
else:
list = rh[1]
sys.stdout.softspace = 0
try:
print list[n].encode ('utf_8'),
except UnicodeDecodeError:
print list[n],
return True
def result_count (self, rh):
if rh[0] == 'define':
return 1
else:
return len (rh[1])
def compare_count (self, rh):
return 1
def result_headers (self, rh, hdr):
if dico.current_markup () != 'wiki':
hdr['Content-Type'] = 'text/plain';
elif '.wikipedia.org' in self.wikihost:
hdr['Content-Type'] = 'text/x-wiki-wikipedia';
elif '.wiktionary.org' in self.wikihost:
hdr['Content-Type'] = 'text/x-wiki-wiktionary';
else:
hdr['Content-Type'] = 'text/x-wiki';
return hdr
def free_result (self, rh):
pass
def __htmlentitydecode (self, s):
return re.sub ('&(%s);' % '|'.join (name2codepoint),
lambda m: unichr (name2codepoint[m.group (1)]), s)
dico-2.2/app/python/wit/ 0000775 0000000 0000000 00000000000 11726126741 0015206 5 ustar 00root root 0000000 0000000 dico-2.2/app/python/wit/__init__.py 0000664 0000000 0000000 00000001351 11726126741 0017317 0 ustar 00root root 0000000 0000000 #!/usr/bin/python
# -*- coding: utf-8 -*-
# Copyright (C) 2008 Sergey Poznyakoff
#
# 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 3, 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, see .
__all__ = [ "wiki2html", "wiki2text" ]
dico-2.2/app/python/wit/build-aux/ 0000775 0000000 0000000 00000000000 11726126741 0017100 5 ustar 00root root 0000000 0000000 dico-2.2/app/python/wit/build-aux/extrns.php 0000664 0000000 0000000 00000002716 11726126741 0021142 0 ustar 00root root 0000000 0000000 $val) {
if ($val == '')
continue;
if (preg_match('/(.*)\$1(.*)/', $val, $matches))
array_push($reg,
array($matches[1], $matches[2],
$ns));
else
printf(" \"%s\": \"%s\",\n", $val, $ns);
}
print "}\n";
if (count($reg)) {
array_push($ns_res, $lang);
printf("wiki_ns_re_%s = [\n", $lang);
foreach ($reg as $val) {
printf(" (\"%s\", \"%s\", \"%s\"),\n",
$val[0], $val[1], $val[2]);
}
print "]\n";
}
}
}
function process_dir($dir)
{
if (!($dp = opendir ($dir)))
die ("Can't open data directory.");
while ($name = readdir ($dp)) {
if (preg_match('|.*/?Messages([A-Z][a-z_-]+).php|', $name, $matches)) {
$lang = strtolower($matches[1]);
#print "$lang\n";
select_ns($name, $lang);
}
}
closedir ($dp);
}
echo "# This file is generated automatically. Do not edit.\n";
echo "# -*- coding: utf-8 -*-\n";
process_dir(".");
print "wiki_ns = {\n";
if (count($nss)) {
foreach ($nss as $lang)
printf(" \"%s\": wiki_ns_%s,\n", $lang, $lang);
}
print "}\n";
print "wiki_ns_re = {\n";
if (count($ns_res)) {
foreach ($nss as $lang)
printf(" \"%s\": wiki_ns_re_%s,\n", $lang, $lang);
}
print "}\n";
?>
dico-2.2/app/python/wit/setup.py 0000664 0000000 0000000 00000002667 11726126741 0016733 0 ustar 00root root 0000000 0000000 #!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright (C) 2008,2009 Sergey Poznyakoff
#
# 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 3, 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, see .
from distutils.core import setup
import wikimarkup
setup(name='wit',
version='0.1',
author='Sergey Poznyakoff',
author_email='gray@gnu.org.ua',
url='http://gray.gnu.org.ua/',
package_dir = {'wit': ''},
packages=['wit'],
license='GPL License',
description='Wiki markup translator.',
platforms=['any'],
classifiers=[
'Development Status :: 3 - Alpha',
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Topic :: Software Development :: Libraries :: Python Modules',
'Topic :: Text Processing :: Markup'
]
)
dico-2.2/app/python/wit/test.py 0000664 0000000 0000000 00000003563 11726126741 0016546 0 ustar 00root root 0000000 0000000 #!/usr/bin/python
# -*- coding: utf-8 -*-
# Copyright (C) 2008 Sergey Poznyakoff
#
# 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 3, 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, see .
import unittest
import wiki2html
class TestMarkupParserBasic (unittest.TestCase):
def test_colon(self):
self.assert_(self.__test('colon'))
pass
def test_headings(self):
self.assert_(self.__test('headings'))
pass
def test_hz(self):
self.assert_(self.__test('hz'))
pass
def test_numlist(self):
self.assert_(self.__test('numlist'))
pass
def test_unlist(self):
self.assert_(self.__test('unlist'))
pass
def test_door(self):
self.assert_(self.__test('door'))
pass
def test_drzwi(self):
self.assert_(self.__test('drzwi'))
pass
def __test(self, filename):
name_in = 'testdata/' + filename + '.wiki'
name_out = 'testdata/' + filename + '.html'
fh = open(name_out)
buf = ''.join(fh.readlines()).strip()
hwm = wiki2html.HtmlWiktionaryMarkup(filename=name_in, lang="pl")
hwm.parse()
if str(hwm).strip() == buf:
return True
# fail
print "\n>>>%s<<<" % buf
print ">>>%s<<<" % str(hwm).strip()
return False
if __name__ == '__main__':
unittest.main()
dico-2.2/app/python/wit/testdata/ 0000775 0000000 0000000 00000000000 11726126741 0017017 5 ustar 00root root 0000000 0000000 dico-2.2/app/python/wit/testdata/bold.wiki 0000664 0000000 0000000 00000000062 11726126741 0020622 0 ustar 00root root 0000000 0000000 now is the time for '''all good''' men to come to
dico-2.2/app/python/wit/testdata/boldit0.wiki 0000664 0000000 0000000 00000000066 11726126741 0021243 0 ustar 00root root 0000000 0000000 now is the time for '''''all good''''' men to come to
dico-2.2/app/python/wit/testdata/boldit1.wiki 0000664 0000000 0000000 00000000066 11726126741 0021244 0 ustar 00root root 0000000 0000000 now is the time for ''all '''good''''' men to come to
dico-2.2/app/python/wit/testdata/boldit2.wiki 0000664 0000000 0000000 00000000066 11726126741 0021245 0 ustar 00root root 0000000 0000000 now is the time for '''all ''good''''' men to come to
dico-2.2/app/python/wit/testdata/boldit3.wiki 0000664 0000000 0000000 00000000066 11726126741 0021246 0 ustar 00root root 0000000 0000000 now is the time for ''all '''good''' men'' to come to
dico-2.2/app/python/wit/testdata/boldit4.wiki 0000664 0000000 0000000 00000000060 11726126741 0021241 0 ustar 00root root 0000000 0000000 '''''Door''' files kan ik niet op tijd komen.''
dico-2.2/app/python/wit/testdata/boldit5.wiki 0000664 0000000 0000000 00000000060 11726126741 0021242 0 ustar 00root root 0000000 0000000 '''''Door'' files kan ik niet op tijd komen.'''
dico-2.2/app/python/wit/testdata/colon.html 0000664 0000000 0000000 00000000527 11726126741 0021023 0 ustar 00root root 0000000 0000000 - A colon (:) indents a line or paragraph.
A newline starts a new paragraph.
Should only be used on talk pages.
For articles, you probably want the blockquote tag.
- We use 1 colon to indent once.