]> err.no Git - pkg-config/commitdiff
Make sure AC_MSG_RESULT is always called
authorTollef Fog Heen <tfheen@err.no>
Sun, 6 Dec 2009 20:32:35 +0000 (21:32 +0100)
committerTollef Fog Heen <tfheen@err.no>
Sun, 6 Dec 2009 20:32:35 +0000 (21:32 +0100)
Based on a patch by Peter Breitenlohner, thanks.
Bug #9704

pkg.m4

diff --git a/pkg.m4 b/pkg.m4
index 0294d77c35fa156e6d04c0681c5554b29b0421a4..fb3ae58005ee373e8eade10c4bb36bfdce1d702d 100644 (file)
--- a/pkg.m4
+++ b/pkg.m4
@@ -119,6 +119,7 @@ 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])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
                $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
@@ -138,9 +139,9 @@ installed software in a non-standard prefix.
 
 _PKG_TEXT
 ])],
-               [AC_MSG_RESULT([no])
-                $4])
+                [$4])
 elif test $pkg_failed = untried; then
+       AC_MSG_RESULT([no])
        ifelse([$4], , [AC_MSG_FAILURE(dnl
 [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
@@ -149,8 +150,7 @@ path to pkg-config.
 _PKG_TEXT
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-               [AC_MSG_RESULT([no])
-                $4])
+                [$4])
 else
        $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
        $1[]_LIBS=$pkg_cv_[]$1[]_LIBS