-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
42 changed files
with
1,896 additions
and
1,415 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
Binary file not shown.
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
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 |
---|---|---|
|
@@ -14,14 +14,14 @@ | |
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) | ||
m4_ifndef([AC_AUTOCONF_VERSION], | ||
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | ||
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, | ||
[m4_warning([this file was generated for autoconf 2.71. | ||
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],, | ||
[m4_warning([this file was generated for autoconf 2.72. | ||
You have another version of autoconf. It may work, but is not guaranteed to. | ||
If you have problems, you may need to regenerate the build system entirely. | ||
To do so, use the procedure documented by the package, typically 'autoreconf'.])]) | ||
|
||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | ||
# serial 11 (pkg-config-0.29.1) | ||
# pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*- | ||
# serial 12 (pkg-config-0.29.2) | ||
|
||
dnl Copyright © 2004 Scott James Remnant <[email protected]>. | ||
dnl Copyright © 2012-2015 Dan Nicholson <[email protected]> | ||
|
@@ -63,7 +63,7 @@ dnl | |
dnl See the "Since" comment for each macro you use to see what version | ||
dnl of the macros you require. | ||
m4_defun([PKG_PREREQ], | ||
[m4_define([PKG_MACROS_VERSION], [0.29.1]) | ||
[m4_define([PKG_MACROS_VERSION], [0.29.2]) | ||
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, | ||
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) | ||
])dnl PKG_PREREQ | ||
|
@@ -108,7 +108,7 @@ dnl Check to see whether a particular set of modules exists. Similar to | |
dnl PKG_CHECK_MODULES(), but does not set variables or print errors. | ||
dnl | ||
dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
dnl only at the first occurence in configure.ac, so if the first place | ||
dnl only at the first occurrence in configure.ac, so if the first place | ||
dnl it's called might be skipped (such as if it is within an "if", you | ||
dnl have to call PKG_CHECK_EXISTS manually | ||
AC_DEFUN([PKG_CHECK_EXISTS], | ||
|
@@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl | |
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl | ||
pkg_failed=no | ||
AC_MSG_CHECKING([for $1]) | ||
AC_MSG_CHECKING([for $2]) | ||
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) | ||
_PKG_CONFIG([$1][_LIBS], [libs], [$2]) | ||
|
@@ -174,17 +174,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 --cflags --libs "$2" 2>&1` | ||
else | ||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` | ||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` | ||
else | ||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$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 | ||
|
@@ -195,8 +195,8 @@ installed software in a non-standard prefix. | |
_PKG_TEXT])[]dnl | ||
]) | ||
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. | ||
|
@@ -206,10 +206,10 @@ _PKG_TEXT | |
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl | ||
]) | ||
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 | ||
])dnl PKG_CHECK_MODULES | ||
|
||
|
Oops, something went wrong.