Summarize all packages with more than one version.
authorWerner Koch <wk@gnupg.org>
Mon, 26 Jan 2009 15:35:37 +0000 (15:35 +0000)
committerWerner Koch <wk@gnupg.org>
Mon, 26 Jan 2009 15:35:37 +0000 (15:35 +0000)
ChangeLog
configure.ac
m4/gpg4win.m4

index 5a12ba9..12c3f02 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-26  Werner Koch  <wk@g10code.com>
+
+       * configure.ac: Print an error message listing all duplicate packages.
+       * m4/gpg4win.m4 (GPG4WIN_FIND): Do not bail out on duplicate
+       packages.
+
 2009-01-23  Werner Koch  <wk@g10code.com>
 
        * src/inst-paperkey.nsi, src/uninst-paperkey.nsi: New.
index 31d48a6..70b5069 100644 (file)
@@ -172,12 +172,14 @@ for i in DLLTOOL MAKE UNZIP TAR MKDIR CP RM STOW MAKENSIS ZCAT TEXI2DVI \
 done
 
 
+
 # Optional tools.
 
 AC_CHECK_PROGS(WGET, wget)
 
 
 # Packages.
+gpg4win_dup_sources=""
 
 GPG4WIN_BPKG_GNU([libiconv])
 GPG4WIN_BPKG_GNU([gettext], [libiconv])
@@ -283,6 +285,16 @@ if test -n "$missing_tools"; then
 ***]])
 fi
 
+# Throw an error if any duplicate source packages have been found
+if test -n "$gpg4win_dup_sources"; then
+    tmp=
+    for i in $gpg4win_dup_sources; do 
+      tmp="$tmp
+$i"
+    done
+    AC_MSG_ERROR([Packages with more that one source version:$tmp])
+fi
+
 
 # Finalize.
 
index e694e19..0ffe311 100644 (file)
@@ -152,7 +152,8 @@ AC_DEFUN([GPG4WIN_FIND],
   _gpg4win_found=
   for _gpg4win_f in $_gpg4win_file; do
       AS_IF([test "$_gpg4win_found" = yes],
-            AC_MSG_ERROR(found more than one sources for $1 in $_gpg4win_dir))
+            [AC_MSG_WARN(found more than one sources for $1 in $_gpg4win_dir)
+             gpg4win_dup_sources="$gpg4win_dup_sources $1"])
       _gpg4win_found=yes
   done