[Gpg4win-commits] r1086 - in trunk: . m4

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-01-26 16:35:37 +0100 (Mon, 26 Jan 2009)
New Revision: 1086

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/m4/gpg4win.m4
Log:
Summarize all packages with more than one version.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-01-23 11:16:32 UTC (rev 1085)
+++ trunk/ChangeLog	2009-01-26 15:35:37 UTC (rev 1086)
@@ -1,3 +1,9 @@
+2009-01-26  Werner Koch  <wk at 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 at g10code.com>
 
 	* src/inst-paperkey.nsi, src/uninst-paperkey.nsi: New.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-01-23 11:16:32 UTC (rev 1085)
+++ trunk/configure.ac	2009-01-26 15:35:37 UTC (rev 1086)
@@ -172,12 +172,14 @@
 done
 
 
+
 # Optional tools.
 
 AC_CHECK_PROGS(WGET, wget)
 
 
 # Packages.
+gpg4win_dup_sources=""
 
 GPG4WIN_BPKG_GNU([libiconv])
 GPG4WIN_BPKG_GNU([gettext], [libiconv])
@@ -283,7 +285,17 @@
 ***]])
 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.
 
 AC_CONFIG_COMMANDS([gpg4win-conf],[[

Modified: trunk/m4/gpg4win.m4
===================================================================
--- trunk/m4/gpg4win.m4	2009-01-23 11:16:32 UTC (rev 1085)
+++ trunk/m4/gpg4win.m4	2009-01-26 15:35:37 UTC (rev 1086)
@@ -152,7 +152,8 @@
   _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