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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-08-10 00:57:36 +0200 (Fri, 10 Aug 2007)
New Revision: 462

Modified:
   trunk/ChangeLog
   trunk/m4/gpg4win.m4
Log:
2007-08-10  Marcus Brinkmann  <marcus at g10code.de>

	* m4/gpg4win.m4: Check for duplicate packages.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-08-06 11:05:19 UTC (rev 461)
+++ trunk/ChangeLog	2007-08-09 22:57:36 UTC (rev 462)
@@ -1,3 +1,7 @@
+2007-08-10  Marcus Brinkmann  <marcus at g10code.de>
+
+	* m4/gpg4win.m4: Check for duplicate packages.
+
 2007-08-06  Werner Koch  <wk at g10code.com>
 
 	* src/gpgwrap.c (build_commandline): Terminate each itenm in the

Modified: trunk/m4/gpg4win.m4
===================================================================
--- trunk/m4/gpg4win.m4	2007-08-06 11:05:19 UTC (rev 461)
+++ trunk/m4/gpg4win.m4	2007-08-09 22:57:36 UTC (rev 462)
@@ -147,6 +147,15 @@
         AC_MSG_RESULT($_gpg4win_file))
   AS_IF([test -z "$_gpg4win_file" -a $_gpg4win_critical = yes],
         AC_MSG_ERROR(could not find sources for $1 in $_gpg4win_dir))
+
+  # Test for duplicate.
+  _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))
+      _gpg4win_found=yes
+  done
+
   AS_IF([test ! -z "$_gpg4win_file"],
         [gpg4win_val="$_gpg4win_file"
  	[gpg4win_version=`echo "$gpg4win_val" | sed -e "s,^.*/${_gpg4win_pat}${_gpg4win_suffix}$,\1,"`]