From: Tollef Fog Heen <tfheen@err.no>
Date: Sun, 16 Oct 2005 18:08:18 +0000 (+0000)
Subject: Minor m4 cleanups
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9d147e189cd0ea42b24dd3a52ea94169b71e835;p=pkg-config

Minor m4 cleanups
2005-10-16  Tollef Fog Heen  <tfheen@err.no>

	* pkg.m4: Minor cleanups, use m4_default rather than m4_ifval and
	echo 1>&FD is silly, just use echo >&FD
---

diff --git a/ChangeLog b/ChangeLog
index 7528845..0a2d773 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-10-16  Tollef Fog Heen  <tfheen@err.no>
 
+	* pkg.m4: Minor cleanups, use m4_default rather than m4_ifval and
+	echo 1>&FD is silly, just use echo >&FD
+
 	* main.c (main): Try to print out all the errors and not just the
 	first.
 
diff --git a/pkg.m4 b/pkg.m4
index 251a62d..c8ab6c7 100644
--- a/pkg.m4
+++ b/pkg.m4
@@ -31,7 +31,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
 if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
+	_pkg_min_version=m4_default([$1], [0.9.0])
 	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
 		AC_MSG_RESULT([yes])
@@ -120,7 +120,7 @@ if test $pkg_failed = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
 	ifelse([$4], , [AC_MSG_ERROR(dnl
 [Package requirements ($2) were not met: