fdo-mirrors/pkg-config
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pkg-config/pkg-config.git synced 2026-05-16 04:38:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get rid of text duplication in pkg.m4

Browse source 
2005-10-16  Tollef Fog Heen  <tfheen@err.no>

	* pkg.m4: use m4_define to avoid duplication of text.
This commit is contained in:
Tollef Fog Heen 2005-10-16 18:13:43 +00:00
parent c9d147e189
commit 39ef912d6e
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,7 @@
2005-10-16 Tollef Fog Heen <tfheen@err.no>
* pkg.m4: use m4_define to avoid duplication of text.
* pkg.m4: Minor cleanups, use m4_default rather than m4_ifval and
echo 1>&FD is silly, just use echo >&FD

13
pkg.m4
View file

@ -112,6 +112,10 @@ AC_MSG_CHECKING([for $1])
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
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
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
@ -130,9 +134,8 @@ $$1_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
to avoid the need to call pkg-config. See the pkg-config man page for
more details.])],
_PKG_TEXT
])],
[$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
@ -140,9 +143,7 @@ elif test $pkg_failed = untried; then
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
to avoid the need to call pkg-config. See the pkg-config man page for
more details.
_PKG_TEXT
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
[$4])