- John Vandenberg <jayvdb@gmail.com>: Make check depends on

  programs that have been configured with --with-<name>=<prog>.
  Make dependencies would get confused by symlinks, so create
  wrappers in compat/ for make check.
- Remove binaries in compat/ that are not listed in COMPAT_PROGRAMS
  or COMPAT_SYMLINKS.
- configure.ac: use --without-$foo instead of --with-foo=none.
- Fix processing of translations again, and update de.po.

7 files changed, 426 insertions, 373 deletions

diff --git a/Makefile.in b/Makefile.in
index a1c5afd..7a36c35 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,11 +117,13 @@ export QUILT_DIR QUILT_LIB QUILTRC
 
 #-----------------------------------------------------------------------
 
-all : scripts compat-programs $(if $(MSGFMT),$(LINGUAS:%=po/%.mo))
+all : scripts compat mofiles
 
 $(LIB:%=lib/%) : $(LIB_SRC:%.c=lib/%.o)
 	$(CC) -o $@ $(LDFLAGS) $^ $(LIBS)
 
+mofiles : $(if $(MSGFMT),$(LINGUAS:%=po/%.mo))
+
 %.mo : %.po
 	msgfmt --statistics -o $@ $<
 
@@ -140,7 +142,8 @@ rpm rpmbuild : $(PACKAGE)-$(VERSION).tar.gz
 	$(RPMBUILD) -ta $<
 
 po/quilt.pot: $(filter-out debian/control.in doc/quilt.1.in		\
-			   doc/README.in, $(wildcard */*.in))
+			   doc/README.in, $(wildcard */*.in)		\
+			   		  $(wildcard */*/*.in))
 	rm -f po/quilt.pot; touch po/quilt.pot
 	for file in $+ ; do						\
 	  if test -n "`$(SED) -ne '1{ /@BASH''@/p }' $$file`"; then	\
@@ -186,7 +189,7 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%)
 	done < $< 2>&1 > $@
 
 .PHONY :: reference
-reference : $(QUILT:%=quilt/%) compat-programs quilt/scripts/patchfns
+reference : $(QUILT:%=quilt/%) quilt/scripts/patchfns compat
 	@unset LANG LC_MESSAGES LC_CTYPE LC_ALL;			\
 	for i in $(QUILT);						\
 	do								\
@@ -245,6 +248,36 @@ Makefile : Makefile.in
 	@echo "Please run ./configure"
 	@false
 
+compat_leftover := $(filter-out $(COMPAT_PROGRAMS:%=compat/%) $(COMPAT_SYMLINKS:%=compat/%),$(shell find compat/ -maxdepth 1 -type f -perm +111))
+
+.PHONY :: compat
+compat : compat-programs compat-symlinks
+	$(if $(compat_leftover),rm -f $(compat_leftover))
+
+compat-programs : $(COMPAT_PROGRAMS:%=compat/%)
+compat-symlinks : $(COMPAT_SYMLINKS:%=compat/%)
+
+# VIRTUAL_SYMLINKS creates a shell script that operates similar to
+# a symbolic link.  It is used to workaround the way make treats
+# symlinks as targets.
+#   Usage: $(call VIRTUAL_SYMLINK, source, target)
+define VIRTUAL_SYMLINK
+	@echo "Generating $(strip $(1)) wrapper" >&2
+	@printf "#!%s\n%s "'"$$$$@"'"\n" $(BASH) $(strip $(1)) > $(2)
+endef
+
+# Generate rules to create compat/<binary> for each binary in $(COMPAT_SYMLINKS)
+define COMPAT_SYMLINK_local_install
+compat/$(strip $(1)) : Makefile
+	$(call VIRTUAL_SYMLINK, \
+		'$($(shell echo $(1) | $(AWK) '{print toupper($$1)}'))', \
+		compat/$(strip $(1)))
+	@chmod +x compat/$(strip $(1))
+
+endef
+
+$(eval $(foreach symlink,$(COMPAT_SYMLINKS),$(call COMPAT_SYMLINK_local_install, $(symlink))))
+
 install-main :: scripts
 	$(INSTALL) -d $(BUILD_ROOT)$(bindir)
 	$(INSTALL) -m 755 $(BIN:%=bin/%) $(BUILD_ROOT)$(bindir)/
@@ -277,8 +310,11 @@ install-main :: scripts
 		   $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt
 	$(INSTALL) -m 644 quilt.quiltrc $(BUILD_ROOT)$(etcdir)/
 
-install-compat:
-	@rm -rf $(BUILD_ROOT)$(datadir)/$(PACKAGE)/compat
+install-compat: install-compat1 $(COMPAT_SYMLINKS:%=install-compat-symlink-%)
+$(COMPAT_SYMLINKS:%=install-compat-symlink-%) :: install-compat1
+
+install-compat1:
+	rm -rf $(BUILD_ROOT)$(datadir)/$(PACKAGE)/compat
 ifneq ($(COMPAT_PROGRAMS)$(COMPAT_SYMLINKS),)
 	$(INSTALL) -d $(BUILD_ROOT)$(datadir)/$(PACKAGE)/compat
 ifneq ($(COMPAT_PROGRAMS),)
@@ -287,17 +323,16 @@ ifneq ($(COMPAT_PROGRAMS),)
 endif
 endif
 
+# Generate rules to install symlinks for each binary in $(COMPAT_SYMLINKS)
 define COMPAT_SYMLINK_install
-install-compat-symlink-$(strip $(1)): install-compat
+install-compat-symlink-$(strip $(1)) ::
 	ln -sf $($(shell echo $(1) | $(AWK) '{print toupper($$1)}'))	\
 	       $(BUILD_ROOT)$(datadir)/$(PACKAGE)/compat/$(strip $(1))
 endef
 
 $(foreach symlink,$(COMPAT_SYMLINKS),$(eval $(call COMPAT_SYMLINK_install, $(symlink))))
 
-compat-programs : $(COMPAT_PROGRAMS:%=compat/%)
-
-install: install-main $(COMPAT_SYMLINKS:%=install-compat-symlink-%)
+install: install-main install-compat
 
 uninstall ::
 	rm -rf $(BIN:%=$(BUILD_ROOT)$(bindir)/%)			\
diff --git a/aclocal.m4 b/aclocal.m4
index 60e90f8..4e7d492 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -7,10 +7,10 @@ AC_DEFUN([QUILT_COMPAT_PROG_PATH],[
 
   AC_ARG_WITH($2, AC_HELP_STRING(
     [--with-$2], [name of the $2 executable to use]
-                 m4_if(internal_$2_cmd,[],[],[ (or 'none'
+                 m4_if(internal_$2_cmd,[],[],[ (use --without-$2
                           to use an internal mechanism)])),
   [
-    if test ! x"$withval" = xnone; then
+    if test ! x"$withval" = xno; then
       $1="$withval"
       AC_MSG_NOTICE([Using $2 executable $$1])
       COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
diff --git a/po/de.po b/po/de.po
index 621ad4a..5dbd6a1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -694,16 +694,14 @@ msgid "Failed to insert patch %s into file series\\n"
 msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n"
 
 #: quilt/mail.in:24
-#, fuzzy
 msgid ""
-"Usage: quilt mail {--mbox file|--send} [--sender ...] [--from ...] [--"
-"to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
+"Usage: quilt mail {--mbox file|--send} [--sender ...] [--from ...] "
+"[--to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
 msgstr ""
-"Verwendung: quilt mail {--mbox datei|--send} [--from ...] [--to ...] [--"
-"cc ...] [--bcc ...] [--subject ...]\\n"
+"Verwendung: quilt mail {--mbox datei|--send} [--sender ...] [--from ...] "
+"[--to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
 
 #: quilt/mail.in:27
-#, fuzzy
 msgid ""
 "\n"
 "Create mail messages from all patches in the series file, and either store\n"
@@ -743,6 +741,10 @@ msgstr ""
 "--send\n"
 "\tVerschicke die Nachrichten direkt.\n"
 "\n"
+"--sender\n"
+"\tVerwende die angegebene Envelope-Adresse. Die Adresse muss von der Form\n"
+"\t\\`\\`user@domain.name'' sein; Anzeigenamen sind nicht möglich.\n"
+"\n"
 "--from, --subject\n"
 "\tDie Werte für die From- und Subject-Kopfzeilen.\n"
 "\n"
@@ -751,7 +753,7 @@ msgstr ""
 
 #: quilt/mail.in:145
 msgid "Could not determine the envelope sender address. Please use --sender."
-msgstr ""
+msgstr "Konnte die Envelope-Adresse nicht feststellen. Bitte verwenden Sie --sender."
 
 #: quilt/new.in:22
 msgid "Usage: quilt new {patchname}\\n"
@@ -1195,6 +1197,98 @@ msgstr "Fehler beim Umbenennen von Patch %s auf %s\\n"
 msgid "Patch %s renamed to %s\\n"
 msgstr "Patch %s auf %s umbenannt\\n"
 
+#: quilt/scripts/edmail.in:81
+#, perl-format
+msgid "Display name '%s' contains unpaired parentheses\n"
+msgstr "Anzeigename '%s' enthält eine unvollständige Klammerung\n"
+
+#: quilt/scripts/edmail.in:85
+#, perl-format
+msgid "Display name '%s' contains invalid characters\n"
+msgstr "Anzeigename '%s' enthält ungültige Zeichen\n"
+
+#: quilt/scripts/edmail.in:89
+#, perl-format
+msgid "Display name '%s' contains non-printable or 8-bit characters\n"
+msgstr "Anzeigename '%s' enthält nichtdruckbare or 8-Bit-Zeichen\n"
+
+#: quilt/scripts/edmail.in:95
+#, perl-format
+msgid "Delivery address '%s' is invalid\n"
+msgstr "Zustelladresse '%s' ist ungültig\n"
+
+#: quilt/scripts/parse-patch.in:50
+#, perl-format
+msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
+msgstr "Verwendung: %s {-s|-u} abschnitt datei [< ersetzung]\n"
+
+#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
+#, perl-format
+msgid "File %s disappeared!\n"
+msgstr "Datei %s ist verschwunden\n"
+
+#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
+#, perl-format
+msgid "Failed to rename %s to %s: %s\n"
+msgstr "Konnte %s nicht auf %s umbenennen: %s\n"
+
+#: quilt/scripts/patchfns.in:703
+msgid ""
+"The quilt meta-data in this tree has version %s, but this version of quilt "
+"can only handle meta-data formats up to and including version %s. Please pop "
+"all the patches using the version of quilt used to push them before "
+"downgrading.\\n"
+msgstr ""
+"Die quilt-Metadaten in diesem Arbeitsverzeichnis haben Version $version, "
+"aber diese Version von quilt kann nur mit Metadaten in den Versionen "
+"$DB_VERSION und darunter umgehen. Bitte entfernen Sie vor dem Downgrade von "
+"quilt alle Patches mit der Version von quilt, die zur Erstellung des "
+"Arbeitsverzeichnisses verwendet wurde.\\n"
+
+#: quilt/scripts/patchfns.in:788
+msgid ""
+"The working tree was created by an older version of quilt. Please run 'quilt "
+"upgrade'.\\n"
+msgstr ""
+"Das Arbeitsverzeichnis wurde von einer älteren Version von quilt erstellt. "
+"Bitte führen Sie \\`quilt upgrade' aus.\\n"
+
+#: quilt/scripts/remove-trailing-ws.in:43
+#, perl-format
+msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
+msgstr "Aufruf: %s [-p num] [-n] [patch]\n"
+
+#: quilt/scripts/remove-trailing-ws.in:65
+#: quilt/scripts/remove-trailing-ws.in:92
+#, perl-format
+msgid "%s: I'm confused.\n"
+msgstr "%s: Ich bin verwirrt.\n"
+
+#: quilt/scripts/remove-trailing-ws.in:113
+#, perl-format
+msgid "Warning: trailing whitespace in line %s of %s\n"
+msgstr "Warnung: abschliessende Leerzeichen in Zeile %s von %s\n"
+
+#: quilt/scripts/remove-trailing-ws.in:116
+#, perl-format
+msgid "Warning: trailing whitespace in lines %s of %s\n"
+msgstr "Warnung: abschliessende Leerzeichen in den Zeilen %s von %s\n"
+
+#: quilt/scripts/remove-trailing-ws.in:120
+#, perl-format
+msgid "Removing trailing whitespace from line %s of %s\n"
+msgstr "Entferne abschliessende Leerzeichen in Zeile %s von %s\n"
+
+#: quilt/scripts/remove-trailing-ws.in:123
+#, perl-format
+msgid "Removing trailing whitespace from lines %s of %s\n"
+msgstr "Entferne abschliessende Leerzeichen in den Zeilen %s von %s\n"
+
+#: quilt/scripts/remove-trailing-ws.in:143
+#, perl-format
+msgid "Renaming %s to %s: %s\n"
+msgstr "Umbenennen von %s auf %s: %s\n"
+
 #: quilt/series.in:22
 msgid "Usage: quilt series [-v]\\n"
 msgstr "Verwendung: quilt series [-v]\\n"
@@ -1354,94 +1448,3 @@ msgstr ""
 "Bitte entfernen Sie alle Patches mit \\`quilt pop -a' der quilt-Version, die "
 "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie "
 "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n"
-
-#: scripts/edmail.in:81
-#, perl-format
-msgid "Display name '%s' contains unpaired parentheses\n"
-msgstr "Anzeigename '%s' enthält eine unvollständige Klammerung\n"
-
-#: scripts/edmail.in:85
-#, perl-format
-msgid "Display name '%s' contains invalid characters\n"
-msgstr "Anzeigename '%s' enthält ungültige Zeichen\n"
-
-#: scripts/edmail.in:89
-#, perl-format
-msgid "Display name '%s' contains non-printable or 8-bit characters\n"
-msgstr "Anzeigename '%s' enthält nichtdruckbare or 8-Bit-Zeichen\n"
-
-#: scripts/edmail.in:95
-#, perl-format
-msgid "Delivery address '%s' is invalid\n"
-msgstr "Zustelladresse '%s' ist ungültig\n"
-
-#: scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr "Verwendung: %s {-s|-u} abschnitt datei [< ersetzung]\n"
-
-#: scripts/parse-patch.in:97 scripts/parse-patch.in:104
-#, perl-format
-msgid "File %s disappeared!\n"
-msgstr "Datei %s ist verschwunden\n"
-
-#: scripts/parse-patch.in:150 scripts/parse-patch.in:156
-#, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr "Konnte %s nicht auf %s umbenennen: %s\n"
-
-#: scripts/patchfns.in:703
-msgid ""
-"The quilt meta-data in this tree has version %s, but this version of quilt "
-"can only handle meta-data formats up to and including version %s. Please pop "
-"all the patches using the version of quilt used to push them before "
-"downgrading.\\n"
-msgstr ""
-"Die quilt-Metadaten in diesem Arbeitsverzeichnis haben Version $version, "
-"aber diese Version von quilt kann nur mit Metadaten in den Versionen "
-"$DB_VERSION und darunter umgehen. Bitte entfernen Sie vor dem Downgrade von "
-"quilt alle Patches mit der Version von quilt, die zur Erstellung des "
-"Arbeitsverzeichnisses verwendet wurde.\\n"
-
-#: scripts/patchfns.in:788
-msgid ""
-"The working tree was created by an older version of quilt. Please run 'quilt "
-"upgrade'.\\n"
-msgstr ""
-"Das Arbeitsverzeichnis wurde von einer älteren Version von quilt erstellt. "
-"Bitte führen Sie \\`quilt upgrade' aus.\\n"
-
-#: scripts/remove-trailing-ws.in:43
-#, perl-format
-msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
-msgstr "Aufruf: %s [-p num] [-n] [patch]\n"
-
-#: scripts/remove-trailing-ws.in:65 scripts/remove-trailing-ws.in:92
-#, perl-format
-msgid "%s: I'm confused.\n"
-msgstr "%s: Ich bin verwirrt.\n"
-
-#: scripts/remove-trailing-ws.in:113
-#, perl-format
-msgid "Warning: trailing whitespace in line %s of %s\n"
-msgstr "Warnung: abschliessende Leerzeichen in Zeile %s von %s\n"
-
-#: scripts/remove-trailing-ws.in:116
-#, perl-format
-msgid "Warning: trailing whitespace in lines %s of %s\n"
-msgstr "Warnung: abschliessende Leerzeichen in den Zeilen %s von %s\n"
-
-#: scripts/remove-trailing-ws.in:120
-#, perl-format
-msgid "Removing trailing whitespace from line %s of %s\n"
-msgstr "Entferne abschliessende Leerzeichen in Zeile %s von %s\n"
-
-#: scripts/remove-trailing-ws.in:123
-#, perl-format
-msgid "Removing trailing whitespace from lines %s of %s\n"
-msgstr "Entferne abschliessende Leerzeichen in den Zeilen %s von %s\n"
-
-#: scripts/remove-trailing-ws.in:143
-#, perl-format
-msgid "Renaming %s to %s: %s\n"
-msgstr "Umbenennen von %s auf %s: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 2780b43..79cd219 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1210,6 +1210,97 @@ msgstr "Le renommage de %s en %s a �chou�\\n"
 msgid "Patch %s renamed to %s\\n"
 msgstr "Patch %s renomm� en %s\\n"
 
+#: quilt/scripts/edmail.in:81
+#, perl-format
+msgid "Display name '%s' contains unpaired parentheses\n"
+msgstr "Le nom '%s' est mal parenth�s�\n"
+
+#: quilt/scripts/edmail.in:85
+#, perl-format
+msgid "Display name '%s' contains invalid characters\n"
+msgstr "Le nom '%s' comprend des caract�res invalides\n"
+
+#: quilt/scripts/edmail.in:89
+#, perl-format
+msgid "Display name '%s' contains non-printable or 8-bit characters\n"
+msgstr "Le nom '%s' comprend des caract�res non-affichables ou 8 bits\n"
+
+#: quilt/scripts/edmail.in:95
+#, perl-format
+msgid "Delivery address '%s' is invalid\n"
+msgstr "L'adresse de destination '%s' est invalide\n"
+
+#: quilt/scripts/parse-patch.in:50
+#, perl-format
+msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
+msgstr "USAGE : %s {-s|-u} section fichier [< remplacement]\n"
+
+#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
+#, perl-format
+msgid "File %s disappeared!\n"
+msgstr "Le fichier %s a disparu !\n"
+
+#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
+#, perl-format
+msgid "Failed to rename %s to %s: %s\n"
+msgstr "Impossible de renommer %s en %s : %s\n"
+
+#: quilt/scripts/patchfns.in:703
+msgid ""
+"The quilt meta-data in this tree has version %s, but this version of quilt "
+"can only handle meta-data formats up to and including version %s. Please pop "
+"all the patches using the version of quilt used to push them before "
+"downgrading.\\n"
+msgstr ""
+"Les m�ta-donn�es de quilt dans cet arbre de travail sont au format \n"
+"v%s, mais cette version de quilt ne peut traiter que jusqu'au \n"
+"format %s (inclus). Veuillez retirer vos patches avec la version \n"
+"utilis�e pour les appliquer avant d'installer une version plus ancienne.\\n"
+
+#: quilt/scripts/patchfns.in:788
+msgid ""
+"The working tree was created by an older version of quilt. Please run 'quilt "
+"upgrade'.\\n"
+msgstr ""
+"Votre arbre a �t� cr�� par une vieille version de quilt. Veuillez \n"
+"utiliser � quilt upgrade �.\\n"
+
+#: quilt/scripts/remove-trailing-ws.in:43
+#, perl-format
+msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
+msgstr "SYNOPSIS : %s [-p num] [-n] [patch]\n"
+
+#: quilt/scripts/remove-trailing-ws.in:65
+#: quilt/scripts/remove-trailing-ws.in:92
+#, perl-format
+msgid "%s: I'm confused.\n"
+msgstr "%s : Je suis confus.\n"
+
+#: quilt/scripts/remove-trailing-ws.in:113
+#, perl-format
+msgid "Warning: trailing whitespace in line %s of %s\n"
+msgstr "Attention : espaces � la fin de la ligne %s de %s\n"
+
+#: quilt/scripts/remove-trailing-ws.in:116
+#, perl-format
+msgid "Warning: trailing whitespace in lines %s of %s\n"
+msgstr "Attention : espaces � la fin des lignes %s de %s\n"
+
+#: quilt/scripts/remove-trailing-ws.in:120
+#, perl-format
+msgid "Removing trailing whitespace from line %s of %s\n"
+msgstr "Suppression des espaces � la fin de la ligne %s de %s\n"
+
+#: quilt/scripts/remove-trailing-ws.in:123
+#, perl-format
+msgid "Removing trailing whitespace from lines %s of %s\n"
+msgstr "Suppression des espaces � la fin des lignes %s de %s\n"
+
+#: quilt/scripts/remove-trailing-ws.in:143
+#, perl-format
+msgid "Renaming %s to %s: %s\n"
+msgstr "En renommant %s en %s : %s\n"
+
 #: quilt/series.in:22
 msgid "Usage: quilt series [-v]\\n"
 msgstr "Usage : quilt series [-v]\\n"
@@ -1371,96 +1462,6 @@ msgstr ""
 "version utilis�e pour cr�er cet arbre de travail, ou effacez le r�pertoire\n"
 "%s et r�appliquez compl�tement vos patchs.\\n"
 
-#: scripts/edmail.in:81
-#, perl-format
-msgid "Display name '%s' contains unpaired parentheses\n"
-msgstr "Le nom '%s' est mal parenth�s�\n"
-
-#: scripts/edmail.in:85
-#, perl-format
-msgid "Display name '%s' contains invalid characters\n"
-msgstr "Le nom '%s' comprend des caract�res invalides\n"
-
-#: scripts/edmail.in:89
-#, perl-format
-msgid "Display name '%s' contains non-printable or 8-bit characters\n"
-msgstr "Le nom '%s' comprend des caract�res non-affichables ou 8 bits\n"
-
-#: scripts/edmail.in:95
-#, perl-format
-msgid "Delivery address '%s' is invalid\n"
-msgstr "L'adresse de destination '%s' est invalide\n"
-
-#: scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr "USAGE : %s {-s|-u} section fichier [< remplacement]\n"
-
-#: scripts/parse-patch.in:97 scripts/parse-patch.in:104
-#, perl-format
-msgid "File %s disappeared!\n"
-msgstr "Le fichier %s a disparu !\n"
-
-#: scripts/parse-patch.in:150 scripts/parse-patch.in:156
-#, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr "Impossible de renommer %s en %s : %s\n"
-
-#: scripts/patchfns.in:703
-msgid ""
-"The quilt meta-data in this tree has version %s, but this version of quilt "
-"can only handle meta-data formats up to and including version %s. Please pop "
-"all the patches using the version of quilt used to push them before "
-"downgrading.\\n"
-msgstr ""
-"Les m�ta-donn�es de quilt dans cet arbre de travail sont au format \n"
-"v%s, mais cette version de quilt ne peut traiter que jusqu'au \n"
-"format %s (inclus). Veuillez retirer vos patches avec la version \n"
-"utilis�e pour les appliquer avant d'installer une version plus ancienne.\\n"
-
-#: scripts/patchfns.in:788
-msgid ""
-"The working tree was created by an older version of quilt. Please run 'quilt "
-"upgrade'.\\n"
-msgstr ""
-"Votre arbre a �t� cr�� par une vieille version de quilt. Veuillez \n"
-"utiliser � quilt upgrade �.\\n"
-
-#: scripts/remove-trailing-ws.in:43
-#, perl-format
-msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
-msgstr "SYNOPSIS : %s [-p num] [-n] [patch]\n"
-
-#: scripts/remove-trailing-ws.in:65 scripts/remove-trailing-ws.in:92
-#, perl-format
-msgid "%s: I'm confused.\n"
-msgstr "%s : Je suis confus.\n"
-
-#: scripts/remove-trailing-ws.in:113
-#, perl-format
-msgid "Warning: trailing whitespace in line %s of %s\n"
-msgstr "Attention : espaces � la fin de la ligne %s de %s\n"
-
-#: scripts/remove-trailing-ws.in:116
-#, perl-format
-msgid "Warning: trailing whitespace in lines %s of %s\n"
-msgstr "Attention : espaces � la fin des lignes %s de %s\n"
-
-#: scripts/remove-trailing-ws.in:120
-#, perl-format
-msgid "Removing trailing whitespace from line %s of %s\n"
-msgstr "Suppression des espaces � la fin de la ligne %s de %s\n"
-
-#: scripts/remove-trailing-ws.in:123
-#, perl-format
-msgid "Removing trailing whitespace from lines %s of %s\n"
-msgstr "Suppression des espaces � la fin des lignes %s de %s\n"
-
-#: scripts/remove-trailing-ws.in:143
-#, perl-format
-msgid "Renaming %s to %s: %s\n"
-msgstr "En renommant %s en %s : %s\n"
-
 #, fuzzy
 #~ msgid ""
 #~ "\n"
diff --git a/po/ja.po b/po/ja.po
index d4c4324..8d164c1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1174,6 +1174,97 @@ msgstr "パッチ %s から %sへの名前の変更に失敗しました\\n"
 msgid "Patch %s renamed to %s\\n"
 msgstr "パッチ %s から %s へ名前を変更しました\\n"
 
+#: quilt/scripts/edmail.in:81
+#, perl-format
+msgid "Display name '%s' contains unpaired parentheses\n"
+msgstr "表示用の名前 '%s' が対にならない括弧を含んでいます\n"
+
+#: quilt/scripts/edmail.in:85
+#, perl-format
+msgid "Display name '%s' contains invalid characters\n"
+msgstr "表示用の名前 '%s' が不正な文字を含んでいます\n"
+
+#: quilt/scripts/edmail.in:89
+#, perl-format
+msgid "Display name '%s' contains non-printable or 8-bit characters\n"
+msgstr "表示用の名前 '%s' が非印刷文字または 8 bitの文字を含んでいます\n"
+
+#: quilt/scripts/edmail.in:95
+#, perl-format
+msgid "Delivery address '%s' is invalid\n"
+msgstr "配送先のアドレス '%s' が不正です\n"
+
+#: quilt/scripts/parse-patch.in:50
+#, perl-format
+msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
+msgstr "使いかた: %s {-s|-u} section file [< replacement]\n"
+
+#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
+#, perl-format
+msgid "File %s disappeared!\n"
+msgstr "ファイル %s が消えました!\n"
+
+#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
+#, perl-format
+msgid "Failed to rename %s to %s: %s\n"
+msgstr "パッチ %s から %sへの名前の変更に失敗しました: %s\n"
+
+#: quilt/scripts/patchfns.in:703
+msgid ""
+"The quilt meta-data in this tree has version %s, but this version of quilt "
+"can only handle meta-data formats up to and including version %s. Please pop "
+"all the patches using the version of quilt used to push them before "
+"downgrading.\\n"
+msgstr ""
+"このツリー内にはバージョン %sの quiltメタデータが存在します。しかしこ\n"
+"のバージョンの quiltでは、バージョン %s までのメタデータしかサポートし\n"
+"ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
+"すべてのパッチを pop してください。\\n"
+
+#: quilt/scripts/patchfns.in:788
+msgid ""
+"The working tree was created by an older version of quilt. Please run 'quilt "
+"upgrade'.\\n"
+msgstr ""
+"現在作業中のディレクトリは古いバージョンの quiltによって作られたもので"
+"す。'quilt upgrade'を実行してください。\\n"
+
+#: quilt/scripts/remove-trailing-ws.in:43
+#, perl-format
+msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
+msgstr "書式: %s [p num] [-n] [patch]\n"
+
+#: quilt/scripts/remove-trailing-ws.in:65
+#: quilt/scripts/remove-trailing-ws.in:92
+#, perl-format
+msgid "%s: I'm confused.\n"
+msgstr "%s: 混乱しました\n"
+
+#: quilt/scripts/remove-trailing-ws.in:113
+#, perl-format
+msgid "Warning: trailing whitespace in line %s of %s\n"
+msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n"
+
+#: quilt/scripts/remove-trailing-ws.in:116
+#, perl-format
+msgid "Warning: trailing whitespace in lines %s of %s\n"
+msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n"
+
+#: quilt/scripts/remove-trailing-ws.in:120
+#, perl-format
+msgid "Removing trailing whitespace from line %s of %s\n"
+msgstr "%2$s の %1$s 行目末尾にある空白文字を削除します\n"
+
+#: quilt/scripts/remove-trailing-ws.in:123
+#, perl-format
+msgid "Removing trailing whitespace from lines %s of %s\n"
+msgstr "%2$s の %1$s 行目末尾にある空白文字を削除します\n"
+
+#: quilt/scripts/remove-trailing-ws.in:143
+#, perl-format
+msgid "Renaming %s to %s: %s\n"
+msgstr "%s から %s へ名前を変更しました: %s\n"
+
 #: quilt/series.in:22
 msgid "Usage: quilt series [-v]\\n"
 msgstr "使い方: quilt series [-v]\\n"
@@ -1332,93 +1423,3 @@ msgstr ""
 "現在作業中のツリーを作成した quiltと同じバージョンの quiltで \\`quilt\n"
 "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n"
 "トリを削除し、最初からパッチをあて直してください。\\n"
-
-#: scripts/edmail.in:81
-#, perl-format
-msgid "Display name '%s' contains unpaired parentheses\n"
-msgstr "表示用の名前 '%s' が対にならない括弧を含んでいます\n"
-
-#: scripts/edmail.in:85
-#, perl-format
-msgid "Display name '%s' contains invalid characters\n"
-msgstr "表示用の名前 '%s' が不正な文字を含んでいます\n"
-
-#: scripts/edmail.in:89
-#, perl-format
-msgid "Display name '%s' contains non-printable or 8-bit characters\n"
-msgstr "表示用の名前 '%s' が非印刷文字または 8 bitの文字を含んでいます\n"
-
-#: scripts/edmail.in:95
-#, perl-format
-msgid "Delivery address '%s' is invalid\n"
-msgstr "配送先のアドレス '%s' が不正です\n"
-
-#: scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr "使いかた: %s {-s|-u} section file [< replacement]\n"
-
-#: scripts/parse-patch.in:97 scripts/parse-patch.in:104
-#, perl-format
-msgid "File %s disappeared!\n"
-msgstr "ファイル %s が消えました!\n"
-
-#: scripts/parse-patch.in:150 scripts/parse-patch.in:156
-#, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr "パッチ %s から %sへの名前の変更に失敗しました: %s\n"
-
-#: scripts/patchfns.in:703
-msgid ""
-"The quilt meta-data in this tree has version %s, but this version of quilt "
-"can only handle meta-data formats up to and including version %s. Please pop "
-"all the patches using the version of quilt used to push them before "
-"downgrading.\\n"
-msgstr ""
-"このツリー内にはバージョン %sの quiltメタデータが存在します。しかしこ\n"
-"のバージョンの quiltでは、バージョン %s までのメタデータしかサポートし\n"
-"ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
-"すべてのパッチを pop してください。\\n"
-
-#: scripts/patchfns.in:788
-msgid ""
-"The working tree was created by an older version of quilt. Please run 'quilt "
-"upgrade'.\\n"
-msgstr ""
-"現在作業中のディレクトリは古いバージョンの quiltによって作られたもので"
-"す。'quilt upgrade'を実行してください。\\n"
-
-#: scripts/remove-trailing-ws.in:43
-#, perl-format
-msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
-msgstr "書式: %s [p num] [-n] [patch]\n"
-
-#: scripts/remove-trailing-ws.in:65 scripts/remove-trailing-ws.in:92
-#, perl-format
-msgid "%s: I'm confused.\n"
-msgstr "%s: 混乱しました\n"
-
-#: scripts/remove-trailing-ws.in:113
-#, perl-format
-msgid "Warning: trailing whitespace in line %s of %s\n"
-msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n"
-
-#: scripts/remove-trailing-ws.in:116
-#, perl-format
-msgid "Warning: trailing whitespace in lines %s of %s\n"
-msgstr "警告: %2$s の %1$s 行目末尾に空白文字があります\n"
-
-#: scripts/remove-trailing-ws.in:120
-#, perl-format
-msgid "Removing trailing whitespace from line %s of %s\n"
-msgstr "%2$s の %1$s 行目末尾にある空白文字を削除します\n"
-
-#: scripts/remove-trailing-ws.in:123
-#, perl-format
-msgid "Removing trailing whitespace from lines %s of %s\n"
-msgstr "%2$s の %1$s 行目末尾にある空白文字を削除します\n"
-
-#: scripts/remove-trailing-ws.in:143
-#, perl-format
-msgid "Renaming %s to %s: %s\n"
-msgstr "%s から %s へ名前を変更しました: %s\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index ca1ec8d..a007638 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -823,6 +823,91 @@ msgstr ""
 msgid "Patch %s renamed to %s\\n"
 msgstr ""
 
+#: quilt/scripts/edmail.in:81
+#, perl-format
+msgid "Display name '%s' contains unpaired parentheses\n"
+msgstr ""
+
+#: quilt/scripts/edmail.in:85
+#, perl-format
+msgid "Display name '%s' contains invalid characters\n"
+msgstr ""
+
+#: quilt/scripts/edmail.in:89
+#, perl-format
+msgid "Display name '%s' contains non-printable or 8-bit characters\n"
+msgstr ""
+
+#: quilt/scripts/edmail.in:95
+#, perl-format
+msgid "Delivery address '%s' is invalid\n"
+msgstr ""
+
+#: quilt/scripts/parse-patch.in:50
+#, perl-format
+msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
+msgstr ""
+
+#: quilt/scripts/parse-patch.in:97 quilt/scripts/parse-patch.in:104
+#, perl-format
+msgid "File %s disappeared!\n"
+msgstr ""
+
+#: quilt/scripts/parse-patch.in:150 quilt/scripts/parse-patch.in:156
+#, perl-format
+msgid "Failed to rename %s to %s: %s\n"
+msgstr ""
+
+#: quilt/scripts/patchfns.in:703
+msgid ""
+"The quilt meta-data in this tree has version %s, but this version of quilt "
+"can only handle meta-data formats up to and including version %s. Please pop "
+"all the patches using the version of quilt used to push them before "
+"downgrading.\\n"
+msgstr ""
+
+#: quilt/scripts/patchfns.in:788
+msgid ""
+"The working tree was created by an older version of quilt. Please run 'quilt "
+"upgrade'.\\n"
+msgstr ""
+
+#: quilt/scripts/remove-trailing-ws.in:43
+#, perl-format
+msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
+msgstr ""
+
+#: quilt/scripts/remove-trailing-ws.in:65
+#: quilt/scripts/remove-trailing-ws.in:92
+#, perl-format
+msgid "%s: I'm confused.\n"
+msgstr ""
+
+#: quilt/scripts/remove-trailing-ws.in:113
+#, perl-format
+msgid "Warning: trailing whitespace in line %s of %s\n"
+msgstr ""
+
+#: quilt/scripts/remove-trailing-ws.in:116
+#, perl-format
+msgid "Warning: trailing whitespace in lines %s of %s\n"
+msgstr ""
+
+#: quilt/scripts/remove-trailing-ws.in:120
+#, perl-format
+msgid "Removing trailing whitespace from line %s of %s\n"
+msgstr ""
+
+#: quilt/scripts/remove-trailing-ws.in:123
+#, perl-format
+msgid "Removing trailing whitespace from lines %s of %s\n"
+msgstr ""
+
+#: quilt/scripts/remove-trailing-ws.in:143
+#, perl-format
+msgid "Renaming %s to %s: %s\n"
+msgstr ""
+
 #: quilt/series.in:22
 msgid "Usage: quilt series [-v]\\n"
 msgstr ""
@@ -942,87 +1027,3 @@ msgid ""
 "to create this working tree, or remove the %s directory and apply the "
 "patches from scratch.\\n"
 msgstr ""
-
-#: scripts/edmail.in:81
-#, perl-format
-msgid "Display name '%s' contains unpaired parentheses\n"
-msgstr ""
-
-#: scripts/edmail.in:85
-#, perl-format
-msgid "Display name '%s' contains invalid characters\n"
-msgstr ""
-
-#: scripts/edmail.in:89
-#, perl-format
-msgid "Display name '%s' contains non-printable or 8-bit characters\n"
-msgstr ""
-
-#: scripts/edmail.in:95
-#, perl-format
-msgid "Delivery address '%s' is invalid\n"
-msgstr ""
-
-#: scripts/parse-patch.in:50
-#, perl-format
-msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
-msgstr ""
-
-#: scripts/parse-patch.in:97 scripts/parse-patch.in:104
-#, perl-format
-msgid "File %s disappeared!\n"
-msgstr ""
-
-#: scripts/parse-patch.in:150 scripts/parse-patch.in:156
-#, perl-format
-msgid "Failed to rename %s to %s: %s\n"
-msgstr ""
-
-#: scripts/patchfns.in:703
-msgid ""
-"The quilt meta-data in this tree has version %s, but this version of quilt "
-"can only handle meta-data formats up to and including version %s. Please pop "
-"all the patches using the version of quilt used to push them before "
-"downgrading.\\n"
-msgstr ""
-
-#: scripts/patchfns.in:788
-msgid ""
-"The working tree was created by an older version of quilt. Please run 'quilt "
-"upgrade'.\\n"
-msgstr ""
-
-#: scripts/remove-trailing-ws.in:43
-#, perl-format
-msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
-msgstr ""
-
-#: scripts/remove-trailing-ws.in:65 scripts/remove-trailing-ws.in:92
-#, perl-format
-msgid "%s: I'm confused.\n"
-msgstr ""
-
-#: scripts/remove-trailing-ws.in:113
-#, perl-format
-msgid "Warning: trailing whitespace in line %s of %s\n"
-msgstr ""
-
-#: scripts/remove-trailing-ws.in:116
-#, perl-format
-msgid "Warning: trailing whitespace in lines %s of %s\n"
-msgstr ""
-
-#: scripts/remove-trailing-ws.in:120
-#, perl-format
-msgid "Removing trailing whitespace from line %s of %s\n"
-msgstr ""
-
-#: scripts/remove-trailing-ws.in:123
-#, perl-format
-msgid "Removing trailing whitespace from lines %s of %s\n"
-msgstr ""
-
-#: scripts/remove-trailing-ws.in:143
-#, perl-format
-msgid "Renaming %s to %s: %s\n"
-msgstr ""
diff --git a/quilt.changes b/quilt.changes
index b098b78..c14f2db 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,16 @@
 -------------------------------------------------------------------
+Sun Jan 15 16:00:17 CET 2006 - agruen@suse.de
+
+- John Vandenberg <jayvdb@gmail.com>: Make check depends on
+  programs that have been configured with --with-<name>=<prog>.
+  Make dependencies would get confused by symlinks, so create
+  wrappers in compat/ for make check.
+- Remove binaries in compat/ that are not listed in COMPAT_PROGRAMS
+  or COMPAT_SYMLINKS.
+- configure.ac: use --without-$foo instead of --with-foo=none.
+- Fix processing of translations again, and update de.po.
+
+-------------------------------------------------------------------
 Sat Jan 14 19:42:21 CET 2006 - agruen@suse.de
 
 - Move scripts directory to quilt/scripts to simplify running quilt