Compare commits
3 Commits
pkgconf-2.
...
master
Author | SHA1 | Date |
---|---|---|
Petr Písař | 2d26db3a98 | |
Pierce | a8a492e2e4 | |
Ismael Luceno | c583d49a37 |
|
@ -116,7 +116,7 @@ flags like so:
|
||||||
|
|
||||||
|
|
||||||
pkgconf is compiled using [Meson](https://mesonbuild.com) on Windows. In theory, you could also use
|
pkgconf is compiled using [Meson](https://mesonbuild.com) on Windows. In theory, you could also use
|
||||||
Meson to build on UNIX, but this is not recommended at this time as it pkgconf is typically built
|
Meson to build on UNIX, but this is not recommended at this time as pkgconf is typically built
|
||||||
much earlier than Meson.
|
much earlier than Meson.
|
||||||
|
|
||||||
$ meson setup build -Dtests=disabled
|
$ meson setup build -Dtests=disabled
|
||||||
|
|
5
man/pc.5
5
man/pc.5
|
@ -126,9 +126,10 @@ All dependencies must be satisfied or the pkg-config implementation must not use
|
||||||
the package.
|
the package.
|
||||||
(optional; dependency list)
|
(optional; dependency list)
|
||||||
.It Requires.private
|
.It Requires.private
|
||||||
Required dependencies that must be met for the package to be usable for static linking.
|
Required dependencies that must be met for the package to be usable for header
|
||||||
|
inclusion and static linking.
|
||||||
All dependencies must be satisfied or the pkg-config implementation must not use
|
All dependencies must be satisfied or the pkg-config implementation must not use
|
||||||
the package for static linking.
|
the package for header inclusion and static linking.
|
||||||
(optional; dependency list)
|
(optional; dependency list)
|
||||||
.It Conflicts
|
.It Conflicts
|
||||||
Dependencies that must not be met for the package to be usable.
|
Dependencies that must not be met for the package to be usable.
|
||||||
|
|
13
pkg.m4
13
pkg.m4
|
@ -46,8 +46,8 @@ 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])])
|
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
|
||||||
])dnl PKG_PREREQ
|
])dnl PKG_PREREQ
|
||||||
|
|
||||||
dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
|
dnl PKG_PROG_PKG_CONFIG([MIN-VERSION], [ACTION-IF-NOT-FOUND])
|
||||||
dnl ----------------------------------
|
dnl ---------------------------------------------------------
|
||||||
dnl Since: 0.16
|
dnl Since: 0.16
|
||||||
dnl
|
dnl
|
||||||
dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
|
dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
|
||||||
|
@ -55,6 +55,12 @@ dnl first found in the path. Checks that the version of pkg-config found
|
||||||
dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
|
dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
|
||||||
dnl used since that's the first version where most current features of
|
dnl used since that's the first version where most current features of
|
||||||
dnl pkg-config existed.
|
dnl pkg-config existed.
|
||||||
|
dnl
|
||||||
|
dnl If pkg-config is not found or older than specified, it will result
|
||||||
|
dnl in an empty PKG_CONFIG variable. To avoid widespread issues with
|
||||||
|
dnl scripts not checking it, ACTION-IF-NOT-FOUND defaults to aborting.
|
||||||
|
dnl You can specify [PKG_CONFIG=false] as an action instead, which would
|
||||||
|
dnl result in pkg-config tests failing, but no bogus error messages.
|
||||||
AC_DEFUN([PKG_PROG_PKG_CONFIG],
|
AC_DEFUN([PKG_PROG_PKG_CONFIG],
|
||||||
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
|
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
|
||||||
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
|
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
|
||||||
|
@ -75,6 +81,9 @@ if test -n "$PKG_CONFIG"; then
|
||||||
AC_MSG_RESULT([no])
|
AC_MSG_RESULT([no])
|
||||||
PKG_CONFIG=""
|
PKG_CONFIG=""
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
if test -z "$PKG_CONFIG"; then
|
||||||
|
m4_default([$2], [AC_MSG_ERROR([pkg-config not found])])
|
||||||
fi[]dnl
|
fi[]dnl
|
||||||
])dnl PKG_PROG_PKG_CONFIG
|
])dnl PKG_PROG_PKG_CONFIG
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue