* solve mutual dependencies problem linking programs in src/

7 files changed, 172 insertions, 169 deletions

diff --git a/ChangeLog b/ChangeLog
index 48c0a7f..bf72b42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,10 @@
 	* configure.ac: fixed unwanted change in bugs mailing list address
 	* configure.ac: moved development to version 4.1
 	* m4/extra_dist.sh: added script to autogenerate extra dist Makefile.am
-		
+	* src/Makefile.am: pass libgnu to the linker before and after libintl
+	  to solve mutual dependencies problems caused by gnulib modules
+	  getopt and regex, which include libintl.h
+			
 	* lib/dirname.c, lib/dirname.h [new files]: added dirname module
 	* lib/basename.c [new file]: likewise
 	* lib/stripslash.c [new file]: likewise
diff --git a/po/de.po b/po/de.po
index e32ee48..d0ddd15 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU mkid 3.0.8\n"
 "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
-"POT-Creation-Date: 2005-12-27 04:46+0100\n"
+"POT-Creation-Date: 2005-12-27 07:15+0100\n"
 "PO-Revision-Date: 1996-03-23 22:34 MET\n"
 "Last-Translator: Karl Eichwalder <ke@ke.Central.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -14,36 +14,36 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: libidu/fnprint.c:135
+#: libidu/fnprint.c:136
 #, c-format
 msgid "invalid `--separator' style: `%s'"
 msgstr ""
 
-#: libidu/hash.c:51
+#: libidu/hash.c:52
 #, c-format
 msgid "can't allocate %ld bytes for hash table: memory exhausted"
 msgstr ""
 
-#: libidu/hash.c:264
+#: libidu/hash.c:265
 #, fuzzy, c-format
 msgid "Load=%ld/%ld=%.0f%%, "
 msgstr "\"Load\"=%ld/%ld=%.2f, "
 
-#: libidu/hash.c:266
+#: libidu/hash.c:267
 #, c-format
 msgid "Rehash=%d, "
 msgstr "\"Rehash\"=%d, "
 
-#: libidu/hash.c:267
+#: libidu/hash.c:268
 #, c-format
 msgid "Collisions=%ld/%ld=%.0f%%"
 msgstr ""
 
-#: libidu/idfile.c:105
+#: libidu/idfile.c:106
 msgid "can't determine the io_size of a string!"
 msgstr ""
 
-#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:227
+#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:228
 #, c-format
 msgid "can't open `%s'"
 msgstr ""
@@ -63,55 +63,55 @@ msgstr ""
 msgid "unsupported size in io_read (): %d"
 msgstr "Nicht unterstützte Größe (`size') in \"io_read ()\": %d"
 
-#: libidu/idread.c:198 libidu/idwrite.c:168
+#: libidu/idread.c:198 libidu/idwrite.c:169
 #, c-format
 msgid "unknown I/O type: %d"
 msgstr ""
 
-#: libidu/idwrite.c:157
+#: libidu/idwrite.c:158
 #, fuzzy, c-format
 msgid "unsupported size in io_write (): %d"
 msgstr "Nicht unterstützte Größe (`size') in \"io_write ()\": %d"
 
-#: libidu/scanners.c:101
+#: libidu/scanners.c:102
 #, fuzzy, c-format
 msgid "unrecognized language: `%s'"
 msgstr "Kein Scanner für die Sprache '%s'"
 
-#: libidu/scanners.c:147
+#: libidu/scanners.c:148
 msgid "can't allocate language args obstack: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:201 libidu/scanners.c:270
+#: libidu/scanners.c:202 libidu/scanners.c:271
 msgid "can't allocate language args: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:209
+#: libidu/scanners.c:210
 #, c-format
 msgid "language name expected following `%s' in file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:264
+#: libidu/scanners.c:265
 #, fuzzy, c-format
 msgid "can't open language map file `%s'"
 msgstr "Kein Scanner für die Sprache '%s'"
 
-#: libidu/scanners.c:266
+#: libidu/scanners.c:267
 #, c-format
 msgid "can't get size of map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:276
+#: libidu/scanners.c:277
 #, fuzzy, c-format
 msgid "can't read language map file `%s'"
 msgstr "Kein Scanner für die Sprache '%s'"
 
-#: libidu/scanners.c:279
+#: libidu/scanners.c:280
 #, c-format
 msgid "can't read entire language map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:424
+#: libidu/scanners.c:425
 #, c-format
 msgid ""
 "C language:\n"
@@ -123,7 +123,7 @@ msgid ""
 "strings\n"
 msgstr ""
 
-#: libidu/scanners.c:435
+#: libidu/scanners.c:436
 #, c-format
 msgid ""
 "C++ language:\n"
@@ -135,19 +135,19 @@ msgid ""
 "strings\n"
 msgstr ""
 
-#: libidu/scanners.c:718 libidu/scanners.c:989 libidu/scanners.c:1192
-#: libidu/scanners.c:1456
+#: libidu/scanners.c:719 libidu/scanners.c:990 libidu/scanners.c:1193
+#: libidu/scanners.c:1457
 #, c-format
 msgid "junk: `%c'"
 msgstr "\"junk\": '%c'"
 
-#: libidu/scanners.c:720 libidu/scanners.c:991 libidu/scanners.c:1194
-#: libidu/scanners.c:1458
+#: libidu/scanners.c:721 libidu/scanners.c:992 libidu/scanners.c:1195
+#: libidu/scanners.c:1459
 #, c-format
 msgid "junk: `\\%03o'"
 msgstr "\"junk\": '\\%03o'"
 
-#: libidu/scanners.c:824
+#: libidu/scanners.c:825
 #, c-format
 msgid ""
 "Assembly language:\n"
@@ -158,7 +158,7 @@ msgid ""
 "  -n,--no-cpp            Don't handle C pre-processor directives\n"
 msgstr ""
 
-#: libidu/scanners.c:1095
+#: libidu/scanners.c:1096
 #, c-format
 msgid ""
 "Text language:\n"
@@ -168,7 +168,7 @@ msgid ""
 "delimiters\n"
 msgstr ""
 
-#: libidu/scanners.c:1300
+#: libidu/scanners.c:1301
 #, c-format
 msgid ""
 "Perl language:\n"
@@ -287,17 +287,17 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/fid.c:73 src/fnid.c:53 src/lid.c:238 src/mkid.c:126 src/xtokid.c:47
+#: src/fid.c:74 src/fnid.c:54 src/lid.c:238 src/mkid.c:126 src/xtokid.c:48
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/fid.c:81
+#: src/fid.c:82
 #, c-format
 msgid "Usage: %s [OPTION] FILENAME [FILENAME2]\n"
 msgstr ""
 
-#: src/fid.c:84
+#: src/fid.c:85
 #, c-format
 msgid ""
 "List identifiers that occur in FILENAME, or if FILENAME2 is\n"
@@ -308,34 +308,34 @@ msgid ""
 "      --version    output version information and exit\n"
 msgstr ""
 
-#: src/fid.c:147
+#: src/fid.c:148
 msgid "no file name arguments"
 msgstr ""
 
-#: src/fid.c:152
+#: src/fid.c:153
 msgid "too many file name arguments"
 msgstr ""
 
-#: src/fid.c:159 src/fnid.c:154 src/lid.c:414
+#: src/fid.c:160 src/fnid.c:155 src/lid.c:414
 msgid "can't locate `ID'"
 msgstr ""
 
-#: src/fid.c:241
+#: src/fid.c:242
 #, c-format
 msgid "`%s' is ambiguous"
 msgstr ""
 
-#: src/fid.c:247
+#: src/fid.c:248
 #, fuzzy, c-format
 msgid "`%s' not found"
 msgstr "%s: nicht gefunden"
 
-#: src/fnid.c:70
+#: src/fnid.c:71
 #, c-format
 msgid "Usage: %s [OPTION]... [PATTERN]...\n"
 msgstr ""
 
-#: src/fnid.c:74
+#: src/fnid.c:75
 #, c-format
 msgid ""
 "Print constituent file names that match PATTERN,\n"
@@ -443,7 +443,7 @@ msgstr ""
 msgid "can't match regular-expression: memory exhausted"
 msgstr ""
 
-#: src/mkid.c:151 src/xtokid.c:68
+#: src/mkid.c:151 src/xtokid.c:69
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
 msgstr ""
@@ -577,7 +577,7 @@ msgstr ""
 msgid "level %d: %ld/%ld = %.0f%%\n"
 msgstr "level %d: %ld == %ld\n"
 
-#: src/xtokid.c:72
+#: src/xtokid.c:73
 #, c-format
 msgid ""
 "Print all tokens found in a source file.\n"
diff --git a/po/fr.po b/po/fr.po
index bfc8452..853e92b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU mkid 3.0.8\n"
 "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
-"POT-Creation-Date: 2005-12-27 04:46+0100\n"
+"POT-Creation-Date: 2005-12-27 07:15+0100\n"
 "PO-Revision-Date: 1996-03-23 22:34 MET\n"
 "Last-Translator: Unknown <unknown@unknown.fr>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: libidu/fnprint.c:135
+#: libidu/fnprint.c:136
 #, c-format
 msgid "invalid `--separator' style: `%s'"
 msgstr ""
@@ -30,31 +30,31 @@ msgstr ""
 # "Files: alloca.c ansi2knr.c bitops.c fid.c filenames.c getopt.c getopt1.c "
 # "idfile.c idx.c iid.c iid.y lid.c misc.c mkid.c regex.c scanners.c "
 # "strcasecmp.c strerror.c token.c\n"
-#: libidu/hash.c:51
+#: libidu/hash.c:52
 #, c-format
 msgid "can't allocate %ld bytes for hash table: memory exhausted"
 msgstr ""
 
-#: libidu/hash.c:264
+#: libidu/hash.c:265
 #, fuzzy, c-format
 msgid "Load=%ld/%ld=%.0f%%, "
 msgstr "Charge=%ld/%ld=%.2f, "
 
-#: libidu/hash.c:266
+#: libidu/hash.c:267
 #, c-format
 msgid "Rehash=%d, "
 msgstr "Rehacher=%d, "
 
-#: libidu/hash.c:267
+#: libidu/hash.c:268
 #, c-format
 msgid "Collisions=%ld/%ld=%.0f%%"
 msgstr ""
 
-#: libidu/idfile.c:105
+#: libidu/idfile.c:106
 msgid "can't determine the io_size of a string!"
 msgstr ""
 
-#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:227
+#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:228
 #, c-format
 msgid "can't open `%s'"
 msgstr ""
@@ -74,55 +74,55 @@ msgstr ""
 msgid "unsupported size in io_read (): %d"
 msgstr "Paramtre taille pass  io_read () non suport: %d"
 
-#: libidu/idread.c:198 libidu/idwrite.c:168
+#: libidu/idread.c:198 libidu/idwrite.c:169
 #, c-format
 msgid "unknown I/O type: %d"
 msgstr ""
 
-#: libidu/idwrite.c:157
+#: libidu/idwrite.c:158
 #, fuzzy, c-format
 msgid "unsupported size in io_write (): %d"
 msgstr "Paramtre taille pass  io_write () non suport: %d"
 
-#: libidu/scanners.c:101
+#: libidu/scanners.c:102
 #, fuzzy, c-format
 msgid "unrecognized language: `%s'"
 msgstr "Pas d'analyseur lexical pour le langag `%s'"
 
-#: libidu/scanners.c:147
+#: libidu/scanners.c:148
 msgid "can't allocate language args obstack: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:201 libidu/scanners.c:270
+#: libidu/scanners.c:202 libidu/scanners.c:271
 msgid "can't allocate language args: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:209
+#: libidu/scanners.c:210
 #, c-format
 msgid "language name expected following `%s' in file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:264
+#: libidu/scanners.c:265
 #, fuzzy, c-format
 msgid "can't open language map file `%s'"
 msgstr "Pas d'analyseur lexical pour le langag `%s'"
 
-#: libidu/scanners.c:266
+#: libidu/scanners.c:267
 #, c-format
 msgid "can't get size of map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:276
+#: libidu/scanners.c:277
 #, fuzzy, c-format
 msgid "can't read language map file `%s'"
 msgstr "Pas d'analyseur lexical pour le langag `%s'"
 
-#: libidu/scanners.c:279
+#: libidu/scanners.c:280
 #, c-format
 msgid "can't read entire language map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:424
+#: libidu/scanners.c:425
 #, c-format
 msgid ""
 "C language:\n"
@@ -134,7 +134,7 @@ msgid ""
 "strings\n"
 msgstr ""
 
-#: libidu/scanners.c:435
+#: libidu/scanners.c:436
 #, c-format
 msgid ""
 "C++ language:\n"
@@ -146,19 +146,19 @@ msgid ""
 "strings\n"
 msgstr ""
 
-#: libidu/scanners.c:718 libidu/scanners.c:989 libidu/scanners.c:1192
-#: libidu/scanners.c:1456
+#: libidu/scanners.c:719 libidu/scanners.c:990 libidu/scanners.c:1193
+#: libidu/scanners.c:1457
 #, c-format
 msgid "junk: `%c'"
 msgstr "dchet: `%c'"
 
-#: libidu/scanners.c:720 libidu/scanners.c:991 libidu/scanners.c:1194
-#: libidu/scanners.c:1458
+#: libidu/scanners.c:721 libidu/scanners.c:992 libidu/scanners.c:1195
+#: libidu/scanners.c:1459
 #, c-format
 msgid "junk: `\\%03o'"
 msgstr "dchet: `\\%03o'"
 
-#: libidu/scanners.c:824
+#: libidu/scanners.c:825
 #, c-format
 msgid ""
 "Assembly language:\n"
@@ -169,7 +169,7 @@ msgid ""
 "  -n,--no-cpp            Don't handle C pre-processor directives\n"
 msgstr ""
 
-#: libidu/scanners.c:1095
+#: libidu/scanners.c:1096
 #, c-format
 msgid ""
 "Text language:\n"
@@ -179,7 +179,7 @@ msgid ""
 "delimiters\n"
 msgstr ""
 
-#: libidu/scanners.c:1300
+#: libidu/scanners.c:1301
 #, c-format
 msgid ""
 "Perl language:\n"
@@ -298,17 +298,17 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/fid.c:73 src/fnid.c:53 src/lid.c:238 src/mkid.c:126 src/xtokid.c:47
+#: src/fid.c:74 src/fnid.c:54 src/lid.c:238 src/mkid.c:126 src/xtokid.c:48
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/fid.c:81
+#: src/fid.c:82
 #, c-format
 msgid "Usage: %s [OPTION] FILENAME [FILENAME2]\n"
 msgstr ""
 
-#: src/fid.c:84
+#: src/fid.c:85
 #, c-format
 msgid ""
 "List identifiers that occur in FILENAME, or if FILENAME2 is\n"
@@ -319,34 +319,34 @@ msgid ""
 "      --version    output version information and exit\n"
 msgstr ""
 
-#: src/fid.c:147
+#: src/fid.c:148
 msgid "no file name arguments"
 msgstr ""
 
-#: src/fid.c:152
+#: src/fid.c:153
 msgid "too many file name arguments"
 msgstr ""
 
-#: src/fid.c:159 src/fnid.c:154 src/lid.c:414
+#: src/fid.c:160 src/fnid.c:155 src/lid.c:414
 msgid "can't locate `ID'"
 msgstr ""
 
-#: src/fid.c:241
+#: src/fid.c:242
 #, c-format
 msgid "`%s' is ambiguous"
 msgstr ""
 
-#: src/fid.c:247
+#: src/fid.c:248
 #, fuzzy, c-format
 msgid "`%s' not found"
 msgstr "%s pas trouv"
 
-#: src/fnid.c:70
+#: src/fnid.c:71
 #, c-format
 msgid "Usage: %s [OPTION]... [PATTERN]...\n"
 msgstr ""
 
-#: src/fnid.c:74
+#: src/fnid.c:75
 #, c-format
 msgid ""
 "Print constituent file names that match PATTERN,\n"
@@ -452,7 +452,7 @@ msgstr ""
 msgid "can't match regular-expression: memory exhausted"
 msgstr ""
 
-#: src/mkid.c:151 src/xtokid.c:68
+#: src/mkid.c:151 src/xtokid.c:69
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
 msgstr ""
@@ -584,7 +584,7 @@ msgstr ""
 msgid "level %d: %ld/%ld = %.0f%%\n"
 msgstr "niveau %d: %ld == %ld\n"
 
-#: src/xtokid.c:72
+#: src/xtokid.c:73
 #, c-format
 msgid ""
 "Print all tokens found in a source file.\n"
diff --git a/po/nl.po b/po/nl.po
index a4cf045..2925453 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: id-utils 3.2\n"
 "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
-"POT-Creation-Date: 2005-12-27 04:46+0100\n"
+"POT-Creation-Date: 2005-12-27 07:15+0100\n"
 "PO-Revision-Date: 1998-09-30 13:31+02:00\n"
 "Last-Translator: Ivo Timmermans <zarq@iname.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -14,36 +14,36 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libidu/fnprint.c:135
+#: libidu/fnprint.c:136
 #, fuzzy, c-format
 msgid "invalid `--separator' style: `%s'"
 msgstr "ongeldige `--key' stijl: `%s'"
 
-#: libidu/hash.c:51
+#: libidu/hash.c:52
 #, c-format
 msgid "can't allocate %ld bytes for hash table: memory exhausted"
 msgstr "kan geen %ld bytes voor frommeltabel reserveren: geheugen vol"
 
-#: libidu/hash.c:264
+#: libidu/hash.c:265
 #, c-format
 msgid "Load=%ld/%ld=%.0f%%, "
 msgstr "Belasting=%ld/%ld=%.0f%%, "
 
-#: libidu/hash.c:266
+#: libidu/hash.c:267
 #, c-format
 msgid "Rehash=%d, "
 msgstr "herverfrommeling=%d, "
 
-#: libidu/hash.c:267
+#: libidu/hash.c:268
 #, c-format
 msgid "Collisions=%ld/%ld=%.0f%%"
 msgstr "Botsingen=%ld/%ld=%.0f%%"
 
-#: libidu/idfile.c:105
+#: libidu/idfile.c:106
 msgid "can't determine the io_size of a string!"
 msgstr "kan de io_size van een letterreeks niet vaststellen!"
 
-#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:227
+#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:228
 #, c-format
 msgid "can't open `%s'"
 msgstr "kan `%s' niet openen"
@@ -63,55 +63,55 @@ msgstr "`%s' is versie %d, maar ik lust alleen versie %d"
 msgid "unsupported size in io_read (): %d"
 msgstr "niet-ondersteunde afmeting in io_read(): %d"
 
-#: libidu/idread.c:198 libidu/idwrite.c:168
+#: libidu/idread.c:198 libidu/idwrite.c:169
 #, c-format
 msgid "unknown I/O type: %d"
 msgstr "onbekend I/O type: %d"
 
-#: libidu/idwrite.c:157
+#: libidu/idwrite.c:158
 #, c-format
 msgid "unsupported size in io_write (): %d"
 msgstr "niet-ondersteunde afmeting in io_write(): %d"
 
-#: libidu/scanners.c:101
+#: libidu/scanners.c:102
 #, c-format
 msgid "unrecognized language: `%s'"
 msgstr "niet herkende taal: `%s'"
 
-#: libidu/scanners.c:147
+#: libidu/scanners.c:148
 msgid "can't allocate language args obstack: memory exhausted"
 msgstr "kan geen objectstapel voor taalargumenten vrijmaken: geheugen vol"
 
-#: libidu/scanners.c:201 libidu/scanners.c:270
+#: libidu/scanners.c:202 libidu/scanners.c:271
 msgid "can't allocate language args: memory exhausted"
 msgstr "kan geen geheugen vrijmaken voor taalargumenten: geheugen vol"
 
-#: libidu/scanners.c:209
+#: libidu/scanners.c:210
 #, c-format
 msgid "language name expected following `%s' in file `%s'"
 msgstr "taalnaam verwacht na `%s' in bestand `%s'"
 
-#: libidu/scanners.c:264
+#: libidu/scanners.c:265
 #, c-format
 msgid "can't open language map file `%s'"
 msgstr "kan taalbestand `%s' niet openen"
 
-#: libidu/scanners.c:266
+#: libidu/scanners.c:267
 #, c-format
 msgid "can't get size of map file `%s'"
 msgstr "kan grootte van mapbestand `%s' niet krijgen"
 
-#: libidu/scanners.c:276
+#: libidu/scanners.c:277
 #, c-format
 msgid "can't read language map file `%s'"
 msgstr "kan taalbestand `%s' niet lezen"
 
-#: libidu/scanners.c:279
+#: libidu/scanners.c:280
 #, c-format
 msgid "can't read entire language map file `%s'"
 msgstr "kan niet het hele taalbestand `%s' lezen"
 
-#: libidu/scanners.c:424
+#: libidu/scanners.c:425
 #, c-format
 msgid ""
 "C language:\n"
@@ -130,7 +130,7 @@ msgstr ""
 "  -u,--strip-underscore Haal een voorgaand laag liggend streepje (`_')\n"
 "                        weg van reeksen van een eenheid\n"
 
-#: libidu/scanners.c:435
+#: libidu/scanners.c:436
 #, fuzzy, c-format
 msgid ""
 "C++ language:\n"
@@ -149,19 +149,19 @@ msgstr ""
 "  -u,--strip-underscore Haal een voorgaand laag liggend streepje (`_')\n"
 "                        weg van reeksen van een eenheid\n"
 
-#: libidu/scanners.c:718 libidu/scanners.c:989 libidu/scanners.c:1192
-#: libidu/scanners.c:1456
+#: libidu/scanners.c:719 libidu/scanners.c:990 libidu/scanners.c:1193
+#: libidu/scanners.c:1457
 #, c-format
 msgid "junk: `%c'"
 msgstr "onzin: `%c'"
 
-#: libidu/scanners.c:720 libidu/scanners.c:991 libidu/scanners.c:1194
-#: libidu/scanners.c:1458
+#: libidu/scanners.c:721 libidu/scanners.c:992 libidu/scanners.c:1195
+#: libidu/scanners.c:1459
 #, c-format
 msgid "junk: `\\%03o'"
 msgstr "onzin: `\\%03o'"
 
-#: libidu/scanners.c:824
+#: libidu/scanners.c:825
 #, c-format
 msgid ""
 "Assembly language:\n"
@@ -180,7 +180,7 @@ msgstr ""
 "eenheden\n"
 "  -n,--no-cpp            Behandel geen C pre-processor aanwijzingen\n"
 
-#: libidu/scanners.c:1095
+#: libidu/scanners.c:1096
 #, c-format
 msgid ""
 "Text language:\n"
@@ -195,7 +195,7 @@ msgstr ""
 "  -x,--exclude=TEKEN-KLASSE  Behandel tekens van TEKEN-KLASSE als "
 "eenheidscheiding\n"
 
-#: libidu/scanners.c:1300
+#: libidu/scanners.c:1301
 #, fuzzy, c-format
 msgid ""
 "Perl language:\n"
@@ -320,17 +320,17 @@ msgstr "%s: optie `%s' is dubbelzinnig\n"
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: optie `--%s' staat geen argumenten toe\n"
 
-#: src/fid.c:73 src/fnid.c:53 src/lid.c:238 src/mkid.c:126 src/xtokid.c:47
+#: src/fid.c:74 src/fnid.c:54 src/lid.c:238 src/mkid.c:126 src/xtokid.c:48
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 
-#: src/fid.c:81
+#: src/fid.c:82
 #, c-format
 msgid "Usage: %s [OPTION] FILENAME [FILENAME2]\n"
 msgstr "Aanroep: %s [OPTIE] BESTANDSNAAM [BESTANDSNAAM2]\n"
 
-#: src/fid.c:84
+#: src/fid.c:85
 #, c-format
 msgid ""
 "List identifiers that occur in FILENAME, or if FILENAME2 is\n"
@@ -348,34 +348,34 @@ msgstr ""
 "      --help          geef deze hulp en beëindig\n"
 "      --version       geef versie informatie en beëindig\n"
 
-#: src/fid.c:147
+#: src/fid.c:148
 msgid "no file name arguments"
 msgstr "geen bestandsnaam argumenten"
 
-#: src/fid.c:152
+#: src/fid.c:153
 msgid "too many file name arguments"
 msgstr "te veel bestandsnaam argumenten"
 
-#: src/fid.c:159 src/fnid.c:154 src/lid.c:414
+#: src/fid.c:160 src/fnid.c:155 src/lid.c:414
 msgid "can't locate `ID'"
 msgstr "kan `ID' niet vinden"
 
-#: src/fid.c:241
+#: src/fid.c:242
 #, c-format
 msgid "`%s' is ambiguous"
 msgstr "`%s' is dubbelzinnig"
 
-#: src/fid.c:247
+#: src/fid.c:248
 #, c-format
 msgid "`%s' not found"
 msgstr "`%s' niet gevonden"
 
-#: src/fnid.c:70
+#: src/fnid.c:71
 #, c-format
 msgid "Usage: %s [OPTION]... [PATTERN]...\n"
 msgstr "Aanroep: %s [OPTIE]... [PATROON]...\n"
 
-#: src/fnid.c:74
+#: src/fnid.c:75
 #, c-format
 msgid ""
 "Print constituent file names that match PATTERN,\n"
@@ -530,7 +530,7 @@ msgstr "kan `%s' niet uitvoeren"
 msgid "can't match regular-expression: memory exhausted"
 msgstr "kan reguliere expressie niet vergelijken: geheugen vol"
 
-#: src/mkid.c:151 src/xtokid.c:68
+#: src/mkid.c:151 src/xtokid.c:69
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
 msgstr "Aanroep: %s [OPTIE]... [BESTAND]...\n"
@@ -684,7 +684,7 @@ msgstr ""
 msgid "level %d: %ld/%ld = %.0f%%\n"
 msgstr "niveau %d: %ld/%ld = %.0f%%\n"
 
-#: src/xtokid.c:72
+#: src/xtokid.c:73
 #, c-format
 msgid ""
 "Print all tokens found in a source file.\n"
diff --git a/po/pl.po b/po/pl.po
index c739b39..556cd88 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: id-utils 3.0.8\n"
 "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
-"POT-Creation-Date: 2005-12-27 04:46+0100\n"
+"POT-Creation-Date: 2005-12-27 07:15+0100\n"
 "PO-Revision-Date: 1997-03-26 23:59 +0100\n"
 "Last-Translator: Wojciech Marek Ga³±zka <wgalazka@chem.uw.edu.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -14,36 +14,36 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: libidu/fnprint.c:135
+#: libidu/fnprint.c:136
 #, c-format
 msgid "invalid `--separator' style: `%s'"
 msgstr ""
 
-#: libidu/hash.c:51
+#: libidu/hash.c:52
 #, c-format
 msgid "can't allocate %ld bytes for hash table: memory exhausted"
 msgstr ""
 
-#: libidu/hash.c:264
+#: libidu/hash.c:265
 #, fuzzy, c-format
 msgid "Load=%ld/%ld=%.0f%%, "
 msgstr "Obci±¿enie=%ld/%ld=%.2f, "
 
-#: libidu/hash.c:266
+#: libidu/hash.c:267
 #, c-format
 msgid "Rehash=%d, "
 msgstr "Ponownie mieszanie=%d, "
 
-#: libidu/hash.c:267
+#: libidu/hash.c:268
 #, fuzzy, c-format
 msgid "Collisions=%ld/%ld=%.0f%%"
 msgstr "Próby=%ld/%ld=%.2f, "
 
-#: libidu/idfile.c:105
+#: libidu/idfile.c:106
 msgid "can't determine the io_size of a string!"
 msgstr ""
 
-#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:227
+#: libidu/idread.c:49 src/mkid.c:476 src/xtokid.c:228
 #, c-format
 msgid "can't open `%s'"
 msgstr ""
@@ -63,55 +63,55 @@ msgstr ""
 msgid "unsupported size in io_read (): %d"
 msgstr "Nie obs³ugiwany rozmiar w io_write (): %d\n"
 
-#: libidu/idread.c:198 libidu/idwrite.c:168
+#: libidu/idread.c:198 libidu/idwrite.c:169
 #, c-format
 msgid "unknown I/O type: %d"
 msgstr ""
 
-#: libidu/idwrite.c:157
+#: libidu/idwrite.c:158
 #, fuzzy, c-format
 msgid "unsupported size in io_write (): %d"
 msgstr "Nie obs³ugiwany rozmiar w io_write (): %d\n"
 
-#: libidu/scanners.c:101
+#: libidu/scanners.c:102
 #, fuzzy, c-format
 msgid "unrecognized language: `%s'"
 msgstr "Brak skanera dla jêzyka `%s'\n"
 
-#: libidu/scanners.c:147
+#: libidu/scanners.c:148
 msgid "can't allocate language args obstack: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:201 libidu/scanners.c:270
+#: libidu/scanners.c:202 libidu/scanners.c:271
 msgid "can't allocate language args: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:209
+#: libidu/scanners.c:210
 #, c-format
 msgid "language name expected following `%s' in file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:264
+#: libidu/scanners.c:265
 #, fuzzy, c-format
 msgid "can't open language map file `%s'"
 msgstr "Brak skanera dla jêzyka `%s'\n"
 
-#: libidu/scanners.c:266
+#: libidu/scanners.c:267
 #, c-format
 msgid "can't get size of map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:276
+#: libidu/scanners.c:277
 #, fuzzy, c-format
 msgid "can't read language map file `%s'"
 msgstr "Brak skanera dla jêzyka `%s'\n"
 
-#: libidu/scanners.c:279
+#: libidu/scanners.c:280
 #, c-format
 msgid "can't read entire language map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:424
+#: libidu/scanners.c:425
 #, c-format
 msgid ""
 "C language:\n"
@@ -123,7 +123,7 @@ msgid ""
 "strings\n"
 msgstr ""
 
-#: libidu/scanners.c:435
+#: libidu/scanners.c:436
 #, c-format
 msgid ""
 "C++ language:\n"
@@ -135,19 +135,19 @@ msgid ""
 "strings\n"
 msgstr ""
 
-#: libidu/scanners.c:718 libidu/scanners.c:989 libidu/scanners.c:1192
-#: libidu/scanners.c:1456
+#: libidu/scanners.c:719 libidu/scanners.c:990 libidu/scanners.c:1193
+#: libidu/scanners.c:1457
 #, c-format
 msgid "junk: `%c'"
 msgstr "¶mieæ: `%c'"
 
-#: libidu/scanners.c:720 libidu/scanners.c:991 libidu/scanners.c:1194
-#: libidu/scanners.c:1458
+#: libidu/scanners.c:721 libidu/scanners.c:992 libidu/scanners.c:1195
+#: libidu/scanners.c:1459
 #, c-format
 msgid "junk: `\\%03o'"
 msgstr "¶mieæ: `\\%03o'"
 
-#: libidu/scanners.c:824
+#: libidu/scanners.c:825
 #, c-format
 msgid ""
 "Assembly language:\n"
@@ -158,7 +158,7 @@ msgid ""
 "  -n,--no-cpp            Don't handle C pre-processor directives\n"
 msgstr ""
 
-#: libidu/scanners.c:1095
+#: libidu/scanners.c:1096
 #, c-format
 msgid ""
 "Text language:\n"
@@ -168,7 +168,7 @@ msgid ""
 "delimiters\n"
 msgstr ""
 
-#: libidu/scanners.c:1300
+#: libidu/scanners.c:1301
 #, c-format
 msgid ""
 "Perl language:\n"
@@ -287,17 +287,17 @@ msgstr ""
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr ""
 
-#: src/fid.c:73 src/fnid.c:53 src/lid.c:238 src/mkid.c:126 src/xtokid.c:47
+#: src/fid.c:74 src/fnid.c:54 src/lid.c:238 src/mkid.c:126 src/xtokid.c:48
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/fid.c:81
+#: src/fid.c:82
 #, c-format
 msgid "Usage: %s [OPTION] FILENAME [FILENAME2]\n"
 msgstr ""
 
-#: src/fid.c:84
+#: src/fid.c:85
 #, c-format
 msgid ""
 "List identifiers that occur in FILENAME, or if FILENAME2 is\n"
@@ -308,34 +308,34 @@ msgid ""
 "      --version    output version information and exit\n"
 msgstr ""
 
-#: src/fid.c:147
+#: src/fid.c:148
 msgid "no file name arguments"
 msgstr ""
 
-#: src/fid.c:152
+#: src/fid.c:153
 msgid "too many file name arguments"
 msgstr ""
 
-#: src/fid.c:159 src/fnid.c:154 src/lid.c:414
+#: src/fid.c:160 src/fnid.c:155 src/lid.c:414
 msgid "can't locate `ID'"
 msgstr ""
 
-#: src/fid.c:241
+#: src/fid.c:242
 #, c-format
 msgid "`%s' is ambiguous"
 msgstr ""
 
-#: src/fid.c:247
+#: src/fid.c:248
 #, fuzzy, c-format
 msgid "`%s' not found"
 msgstr "%s: nie odnaleziony\n"
 
-#: src/fnid.c:70
+#: src/fnid.c:71
 #, c-format
 msgid "Usage: %s [OPTION]... [PATTERN]...\n"
 msgstr ""
 
-#: src/fnid.c:74
+#: src/fnid.c:75
 #, c-format
 msgid ""
 "Print constituent file names that match PATTERN,\n"
@@ -441,7 +441,7 @@ msgstr ""
 msgid "can't match regular-expression: memory exhausted"
 msgstr ""
 
-#: src/mkid.c:151 src/xtokid.c:68
+#: src/mkid.c:151 src/xtokid.c:69
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]...\n"
 msgstr ""
@@ -573,7 +573,7 @@ msgstr ""
 msgid "level %d: %ld/%ld = %.0f%%\n"
 msgstr "poziom %d: %ld == %ld\n"
 
-#: src/xtokid.c:72
+#: src/xtokid.c:73
 #, c-format
 msgid ""
 "Print all tokens found in a source file.\n"
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b2f015..9987b77 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,5 +9,5 @@ AM_CPPFLAGS = -I$(top_srcdir)/libidu \
               -DLOCALEDIR=\"$(datadir)/locale\" \
               -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\"
 
-LDADD = ../libidu/libidu.a $(LIBINTL) ../lib/libgnu.a 
+LDADD = ../libidu/libidu.a ../lib/libgnu.a $(LIBINTL) ../lib/libgnu.a 
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 7e163ee..67d1b7b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -94,28 +94,28 @@ fid_SOURCES = fid.c
 fid_OBJECTS = fid.$(OBJEXT)
 fid_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
-fid_DEPENDENCIES = ../libidu/libidu.a $(am__DEPENDENCIES_1) \
-	../lib/libgnu.a
+fid_DEPENDENCIES = ../libidu/libidu.a ../lib/libgnu.a \
+	$(am__DEPENDENCIES_1) ../lib/libgnu.a
 fnid_SOURCES = fnid.c
 fnid_OBJECTS = fnid.$(OBJEXT)
 fnid_LDADD = $(LDADD)
-fnid_DEPENDENCIES = ../libidu/libidu.a $(am__DEPENDENCIES_1) \
-	../lib/libgnu.a
+fnid_DEPENDENCIES = ../libidu/libidu.a ../lib/libgnu.a \
+	$(am__DEPENDENCIES_1) ../lib/libgnu.a
 lid_SOURCES = lid.c
 lid_OBJECTS = lid.$(OBJEXT)
 lid_LDADD = $(LDADD)
-lid_DEPENDENCIES = ../libidu/libidu.a $(am__DEPENDENCIES_1) \
-	../lib/libgnu.a
+lid_DEPENDENCIES = ../libidu/libidu.a ../lib/libgnu.a \
+	$(am__DEPENDENCIES_1) ../lib/libgnu.a
 mkid_SOURCES = mkid.c
 mkid_OBJECTS = mkid.$(OBJEXT)
 mkid_LDADD = $(LDADD)
-mkid_DEPENDENCIES = ../libidu/libidu.a $(am__DEPENDENCIES_1) \
-	../lib/libgnu.a
+mkid_DEPENDENCIES = ../libidu/libidu.a ../lib/libgnu.a \
+	$(am__DEPENDENCIES_1) ../lib/libgnu.a
 xtokid_SOURCES = xtokid.c
 xtokid_OBJECTS = xtokid.$(OBJEXT)
 xtokid_LDADD = $(LDADD)
-xtokid_DEPENDENCIES = ../libidu/libidu.a $(am__DEPENDENCIES_1) \
-	../lib/libgnu.a
+xtokid_DEPENDENCIES = ../libidu/libidu.a ../lib/libgnu.a \
+	$(am__DEPENDENCIES_1) ../lib/libgnu.a
 dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(dist_bin_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -260,7 +260,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/libidu \
               -DLOCALEDIR=\"$(datadir)/locale\" \
               -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\"
 
-LDADD = ../libidu/libidu.a $(LIBINTL) ../lib/libgnu.a 
+LDADD = ../libidu/libidu.a ../lib/libgnu.a $(LIBINTL) ../lib/libgnu.a 
 all: all-am
 
 .SUFFIXES: