mirror of
https://gitlab.freedesktop.org/pkg-config/pkg-config.git
synced 2026-02-04 08:20:26 +01:00
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
This commit is contained in:
parent
3f5c1fa1b6
commit
c9d147e189
2 changed files with 5 additions and 2 deletions
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
4
pkg.m4
4
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:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue