-
Notifications
You must be signed in to change notification settings - Fork 82
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Attempt to make whitespace a bit more consistent
- Loading branch information
Showing
16 changed files
with
528 additions
and
498 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | ||
# serial 1 (pkg-config-0.24) | ||
# | ||
# | ||
# Copyright © 2004 Scott James Remnant <[email protected]>. | ||
# | ||
# This program is free software; you can redistribute it and/or modify | ||
|
@@ -32,17 +32,17 @@ AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) | |
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) | ||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) | ||
AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) | ||
fi | ||
if test -n "$PKG_CONFIG"; then | ||
_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]) | ||
else | ||
AC_MSG_RESULT([no]) | ||
PKG_CONFIG="" | ||
fi | ||
_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]) | ||
else | ||
AC_MSG_RESULT([no]) | ||
PKG_CONFIG="" | ||
fi | ||
fi[]dnl | ||
])# PKG_PROG_PKG_CONFIG | ||
|
||
|
@@ -73,7 +73,7 @@ m4_define([_PKG_CONFIG], | |
elif test -n "$PKG_CONFIG"; then | ||
PKG_CHECK_EXISTS([$3], | ||
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], | ||
[pkg_failed=yes]) | ||
[pkg_failed=yes]) | ||
else | ||
pkg_failed=untried | ||
fi[]dnl | ||
|
@@ -117,17 +117,17 @@ and $1[]_LIBS to avoid the need to call pkg-config. | |
See the pkg-config man page for more details.]) | ||
if test $pkg_failed = yes; then | ||
AC_MSG_RESULT([no]) | ||
AC_MSG_RESULT([no]) | ||
_PKG_SHORT_ERRORS_SUPPORTED | ||
if test $_pkg_short_errors_supported = yes; then | ||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` | ||
else | ||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` | ||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` | ||
else | ||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` | ||
fi | ||
# Put the nasty error message in config.log where it belongs | ||
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD | ||
# Put the nasty error message in config.log where it belongs | ||
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD | ||
m4_default([$4], [AC_MSG_ERROR( | ||
m4_default([$4], [AC_MSG_ERROR( | ||
[Package requirements ($2) were not met: | ||
$$1_PKG_ERRORS | ||
|
@@ -138,8 +138,8 @@ installed software in a non-standard prefix. | |
_PKG_TEXT]) | ||
]) | ||
elif test $pkg_failed = untried; then | ||
AC_MSG_RESULT([no]) | ||
m4_default([$4], [AC_MSG_FAILURE( | ||
AC_MSG_RESULT([no]) | ||
m4_default([$4], [AC_MSG_FAILURE( | ||
[The pkg-config script could not be found or is too old. Make sure it | ||
is in your PATH or set the PKG_CONFIG environment variable to the full | ||
path to pkg-config. | ||
|
@@ -149,9 +149,9 @@ _PKG_TEXT | |
To get pkg-config, see <https://pkg-config.freedesktop.org/>.]) | ||
]) | ||
else | ||
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS | ||
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS | ||
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS | ||
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS | ||
AC_MSG_RESULT([yes]) | ||
$3 | ||
$3 | ||
fi[]dnl | ||
])# PKG_CHECK_MODULES |
Oops, something went wrong.