Attachment 13456 Details for Bug 13892 – pkg.m4 cleanup

[patch] pkg.m4 cleanup

pkg-config-13892.patch (text/plain), 1.65 KB, created by Stepan Kasal on 2008-01-02 04:55:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stepan Kasal

Created: 2008-01-02 04:55:21 UTC

Size: 1.65 KB

patch

obsolete

>2008-01-02  Stepan Kasal  <kasal@ucw.cz>
>
>	* pkg.m4: Use m4_default where appropriate and more m4
>	cosmetics.
>
>--- pkg.m4.res	2008-01-02 13:23:18.000000000 +0100
>+++ pkg.m4	2008-01-02 13:23:59.000000000 +0100
>@@ -39,7 +39,6 @@
> 		AC_MSG_RESULT([no])
> 		PKG_CONFIG=""
> 	fi
>-		
> fi[]dnl
> ])# PKG_PROG_PKG_CONFIG
> 
>@@ -57,7 +56,7 @@
> [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
> if test -n "$PKG_CONFIG" && \
>     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
>-  m4_ifval([$2], [$2], [:])
>+  m4_default([$2], [:])
> m4_ifvaln([$3], [else
>   $3])dnl
> fi])
>@@ -127,7 +126,7 @@
> 	# Put the nasty error message in config.log where it belongs
> 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
> 
>-	ifelse([$4], , [AC_MSG_ERROR(dnl
>+	m4_default([$4], [AC_MSG_ERROR(
> [Package requirements ($2) were not met:
> 
> $$1_PKG_ERRORS
>@@ -135,24 +134,23 @@
> Consider adjusting the PKG_CONFIG_PATH environment variable if you
> installed software in a non-standard prefix.
> 
>-_PKG_TEXT
>-])],
>-		[$4])
>+_PKG_TEXT])dnl
>+	])
> elif test $pkg_failed = untried; then
> 	AC_MSG_RESULT([no])
>-	ifelse([$4], , [AC_MSG_FAILURE(dnl
>+	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.
> 
> _PKG_TEXT
> 
>-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
>-		[$4])
>+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])
>-	ifelse([$3], , :, [$3])
>+	$3
> fi[]dnl
> ])# PKG_CHECK_MODULES

Actions: View | Splinter Review

Attachments on bug 13892: 13456

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.