[Gpg4win-commits] r1310 - in trunk: . m4
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Jan 5 11:35:12 CET 2010
Author: werner
Date: 2010-01-05 11:35:11 +0100 (Tue, 05 Jan 2010)
New Revision: 1310
Modified:
trunk/ChangeLog
trunk/m4/gpg4win.m4
Log:
Fix annoying error messages in case of duplicated packages
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-01-05 09:15:59 UTC (rev 1309)
+++ trunk/ChangeLog 2010-01-05 10:35:11 UTC (rev 1310)
@@ -1,5 +1,8 @@
2010-01-05 Werner Koch <wk at g10code.com>
+ * m4/gpg4win.m4: Quote variables in test comamnds instead of using
+ instead of comparing against xno or xyes.
+
* packages/packages.current: Update gpgex and gpgol.
2009-12-22 Werner Koch <wk at g10code.com>
Modified: trunk/m4/gpg4win.m4
===================================================================
--- trunk/m4/gpg4win.m4 2010-01-05 09:15:59 UTC (rev 1309)
+++ trunk/m4/gpg4win.m4 2010-01-05 10:35:11 UTC (rev 1310)
@@ -103,7 +103,7 @@
# Only check if critical or auto detection is requested.
AS_IF([test $_gpg4win_auto_detection = yes -o $_gpg4win_critical = yes],
- [AS_IF([test -z "$_gpg4win_dir" -o x$_gpg4win_dir = xyes -o x$_gpg4win_dir = xmaybe],
+ [AS_IF([test -z "$_gpg4win_dir" -o "$_gpg4win_dir" = yes -o "$_gpg4win_dir" = maybe],
[_gpg4win_dir=$gpg4win_packages])
# Install pattern.
@@ -207,7 +207,7 @@
AS_HELP_STRING([--enable-debug], [enable debugging [[no]]]),
_gpg4win_debug=$enableval)
- AS_IF([test "x${_gpg4win_debug}" != "xno"],
+ AS_IF([test "x${_gpg4win_debug}" != no],
GPG4WIN_DEFINE(GPG4WIN_DEBUG))
])
@@ -260,7 +260,7 @@
_gpg4win_pkg=$enableval)
_gpg4win_spkg=no
_gpg4win_version=
- AS_IF([test x$_gpg4win_pkg != xno],
+ AS_IF([test "$_gpg4win_pkg" != no],
[GPG4WIN_FIND($1,,, $_gpg4win_pkg,
_gpg4win_spkg=$gpg4win_val
_gpg4win_version=$gpg4win_version)])
@@ -307,7 +307,7 @@
_gpg4win_pkg=$enableval)
_gpg4win_bpkg=no
_gpg4win_version=
- AS_IF([test x$_gpg4win_pkg != xno],
+ AS_IF([test "$_gpg4win_pkg" != no],
[GPG4WIN_FIND($1-bin, [$1-\(.*\)-bin],,
$_gpg4win_pkg,
_gpg4win_bpkg=$gpg4win_val
@@ -327,7 +327,7 @@
gpg4win_pkg_[]m4_translit([$1],[A-Z+-],[a-z__])[]_deps="$2"
AC_SUBST(gpg4win_pkg_[]m4_translit([$1],[A-Z+-],[a-z__])[]_deps)
- AS_IF([test $_gpg4win_bpkg != no],
+ AS_IF([test "$_gpg4win_bpkg" != "no" ],
GPG4WIN_FIND($1-lib, [$1-\(.*\)-lib],,
$_gpg4win_pkg, _gpg4win_bpkg=$gpg4win_val,
AC_MSG_ERROR(can not find development package for package $1))
@@ -371,7 +371,7 @@
_gpg4win_pkg=$enableval)
_gpg4win_bpkg=no
_gpg4win_version=
- AS_IF([test x$_gpg4win_pkg != xno],
+ AS_IF([test "$_gpg4win_pkg" != no],
[GPG4WIN_FIND($1-lib, [$1-\(.*\)-lib],,
$_gpg4win_pkg,
_gpg4win_bpkg=$gpg4win_val
@@ -387,7 +387,7 @@
gpg4win_pkg_[]m4_translit([$1],[-+],[__])[]_version=$_gpg4win_version
AC_SUBST(gpg4win_pkg_[]m4_translit([$1],[-+],[__])[]_version)
- AS_IF([test $_gpg4win_bpkg != no],
+ AS_IF([test "$_gpg4win_bpkg" != no],
GPG4WIN_FIND($1-src, [$1-\(.*\)-src],,
$_gpg4win_pkg, _gpg4win_bpkg=$gpg4win_val,
AC_MSG_ERROR(can not find sources for package $1))
@@ -425,7 +425,7 @@
_gpg4win_pkg=$enableval)
_gpg4win_bpkg=no
_gpg4win_version=
- AS_IF([test x$_gpg4win_pkg != xno],
+ AS_IF([test "$_gpg4win_pkg" != no],
[GPG4WIN_FIND($1,,zip, $_gpg4win_pkg,
_gpg4win_bpkg=$gpg4win_val
_gpg4win_version=$gpg4win_version)])
@@ -444,7 +444,7 @@
gpg4win_pkg_[]m4_translit([$1],[A-Z+-],[a-z__])[]_deps="$2"
AC_SUBST(gpg4win_pkg_[]m4_translit([$1],[A-Z+-],[a-z__])[]_deps)
- AS_IF([test $_gpg4win_bpkg != no],
+ AS_IF([test "$_gpg4win_bpkg" != no],
[GPG4WIN_FIND($1,,tar, $_gpg4win_pkg, _gpg4win_bpkg=$gpg4win_val,
AC_MSG_ERROR(can not find sources for package $1))]
# gpg4win_pkg_PKGNAME_src=FILENAME_OF_SOURCE
@@ -481,7 +481,7 @@
_gpg4win_pkg=$enableval)
_gpg4win_bpkg=no
_gpg4win_version=
- AS_IF([test x$_gpg4win_pkg != xno],
+ AS_IF([test "$_gpg4win_pkg" != no],
[GPG4WIN_FIND($1,,zip, $_gpg4win_pkg,
_gpg4win_bpkg=$gpg4win_val
_gpg4win_version=$gpg4win_version)])
@@ -500,7 +500,7 @@
gpg4win_pkg_[]m4_translit([$1],[A-Z+-],[a-z__])[]_deps="$2"
AC_SUBST(gpg4win_pkg_[]m4_translit([$1],[A-Z+-],[a-z__])[]_deps)
- AS_IF([test $_gpg4win_bpkg != no],
+ AS_IF([test "$_gpg4win_bpkg" != no],
[GPG4WIN_FIND($1-dev,,, $_gpg4win_pkg, _gpg4win_bpkg=$gpg4win_val,
AC_MSG_ERROR(can not find development package for package $1))]
# gpg4win_pkg_PKGNAME_dev=FILENAME_OF_BINARY_DEVEL
@@ -544,7 +544,7 @@
_gpg4win_bpkg=no
_gpg4win_version=
- AS_IF([test x$_gpg4win_pkg != xno],
+ AS_IF([test "$_gpg4win_pkg" != no],
[
# For some shameful reason, the gettext package is actually called
# gettext-runtime!
@@ -571,7 +571,7 @@
gpg4win_pkg_[]m4_translit([$1],[A-Z+-],[a-z__])[]_deps="$2"
AC_SUBST(gpg4win_pkg_[]m4_translit([$1],[A-Z+-],[a-z__])[]_deps)
- AS_IF([test $_gpg4win_bpkg != no],
+ AS_IF([test "$_gpg4win_bpkg" != no],
[GPG4WIN_FIND($1,,tar, $_gpg4win_pkg, _gpg4win_bpkg=$gpg4win_val,
AC_MSG_ERROR(can not find sources for package $1))]
# gpg4win_pkg_PKGNAME_src=FILENAME_OF_SOURCE
@@ -608,12 +608,12 @@
_gpg4win_pkg=$enableval)
_gpg4win_bpkg=no
_gpg4win_version=
- AS_IF([test x$_gpg4win_pkg != xno],
+ AS_IF([test "$_gpg4win_pkg" != no],
[GPG4WIN_FIND($1-bin, [$1-\(.*\)-bin],,
$_gpg4win_pkg,
_gpg4win_bpkg=$gpg4win_val
_gpg4win_version=$gpg4win_version)])
- AS_IF([test x$_gpg4win_pkg != xno -a x$_gpg4win_bpkg = xno],
+ AS_IF([test "$_gpg4win_pkg" != no -a "$_gpg4win_bpkg" = no],
[GPG4WIN_FIND($1-noinstaller, [$1-\(.*\)-noinstaller],,
$_gpg4win_pkg,
_gpg4win_bpkg=$gpg4win_val
@@ -633,7 +633,7 @@
gpg4win_pkg_[]m4_translit([$1],[A-Z+-],[a-z__])[]_deps="$2"
AC_SUBST(gpg4win_pkg_[]m4_translit([$1],[A-Z+-],[a-z__])[]_deps)
- AS_IF([test $_gpg4win_bpkg != no],
+ AS_IF([test "$_gpg4win_bpkg" != no],
tmp_binsrc=yes
GPG4WIN_FIND($1-src, [$1-\(.*\)-src],,
$_gpg4win_pkg, _gpg4win_bpkg=$gpg4win_val, tmp_binsrc=no)
More information about the Gpg4win-commits
mailing list