Re: aclocal.m4 (STEPMAKE_GUILE_DEVEL): Fix logic and improve diagnostics. (issue 573570044 by address@hidden)

[lemzwerg]

Reviewers: hahnjo,

Message:
> Do we really want that many "no"s in the output

Currently, you get this (in one long line):

  checking for guile-1.8 >= 1.8.2... checking for guile-2.2 >= 2.2.0...
checking for guile-2.0 >= 2.0.7... Package guile-2.0 was not found in
the pkg-config search path. Perhaps you should add the directory
containing `guile-2.0.pc' to the PKG_CONFIG_PATH environment variable No
package 'guile-2.0' found

With the above patch, you get

  checking for guile-1.8 >= 1.8.2... no
  checking for guile-2.2 >= 2.2.0... no
  checking for guile-2.0 >= 2.0.7... no

  ...

  ERROR: Please install required programs:  guile-devel >= 1.8

So I think the many 'no' strings are the right thing to do.

Description:
aclocal.m4 (STEPMAKE_GUILE_DEVEL): Fix logic and improve diagnostics.

Add quotes around string argument that contains a logical operator to
avoid
unexpected results.

Also use $PKG_CONFIG everywhere.

Please review this at https://codereview.appspot.com/573570044/

Affected files (+20, -13 lines):
  M aclocal.m4


Index: aclocal.m4
diff --git a/aclocal.m4 b/aclocal.m4
index 
19345394857c85a6d6f0e8a8cb8796d9bb928245..0d63a178aa16e12802a17fb265cf7fc1584d0d7b
 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -669,13 +669,20 @@ AC_DEFUN(STEPMAKE_GUILE, [
 
 AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
     if test -n "$GUILE_FLAVOR"; then
-        PKG_CHECK_MODULES([GUILE], [$GUILE_FLAVOR], true, [GUILE_FLAVOR=""])
+        PKG_CHECK_MODULES([GUILE], [$GUILE_FLAVOR],
+                            [true], [GUILE_FLAVOR="missing"])
     else
-        PKG_CHECK_MODULES([GUILE], [guile-1.8 >= 1.8.2], 
[GUILE_FLAVOR="guile-1.8"], [
-            PKG_CHECK_MODULES(
-                [GUILE], [guile-2.2 >= 2.2.0], [GUILE_FLAVOR="guile-2.2"], [
-                    PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.7], 
[GUILE_FLAVOR="guile-2.0"])
-                ])
+        PKG_CHECK_MODULES([GUILE], [guile-1.8 >= 1.8.2],
+                            [GUILE_FLAVOR="guile-1.8"], [
+            AC_MSG_RESULT([no])
+            PKG_CHECK_MODULES([GUILE], [guile-2.2 >= 2.2.0],
+                                [GUILE_FLAVOR="guile-2.2"], [
+                AC_MSG_RESULT([no])
+                PKG_CHECK_MODULES([GUILE], [guile-2.0 >= 2.0.7],
+                                    [GUILE_FLAVOR="guile-2.0"], [
+                    AC_MSG_RESULT([no])
+                    GUILE_FLAVOR="missing"])
+            ])
         ])
     fi
 
@@ -686,7 +693,7 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
         guile-1.8)
             ;;
         *)
-            STEPMAKE_ADD_ENTRY(REQUIRED, [guile-devel >= 1.8])
+            STEPMAKE_ADD_ENTRY(REQUIRED, ["guile-devel >= 1.8"])
             ;;
     esac
 ])
@@ -1093,7 +1100,7 @@ AC_DEFUN(STEPMAKE_GLIB, [
         LIBS="$save_LIBS"
     else
         r="libglib-dev or glib?-devel"
-        ver="`pkg-config --modversion $1`"
+        ver="`$PKG_CONFIG --modversion $1`"
         STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
     fi
 ])
@@ -1112,7 +1119,7 @@ AC_DEFUN(STEPMAKE_GOBJECT, [
         LIBS="$save_LIBS"
     else
         r="libgobject-dev or gobject?-devel"
-        ver="`pkg-config --modversion $1`"
+        ver="`$PKG_CONFIG --modversion $1`"
         STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
     fi
 ])
@@ -1134,7 +1141,7 @@ AC_DEFUN(STEPMAKE_FREETYPE2, [
         # URG
         #r="lib$1-dev or $1-devel"
         r="libfreetype6-dev or freetype?-devel"
-        ver="`pkg-config --modversion $1`"
+        ver="`$PKG_CONFIG --modversion $1`"
         STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
     fi
 ])
@@ -1157,7 +1164,7 @@ AC_DEFUN(STEPMAKE_PANGO_FT2, [
         # URG
         #r="lib$1-dev or $1-devel"e
         r="libpango1.0-dev or pango?-devel"
-        ver="`pkg-config --modversion $1`"
+        ver="`$PKG_CONFIG --modversion $1`"
         STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
     fi
 ])
@@ -1183,7 +1190,7 @@ AC_DEFUN(STEPMAKE_PANGO_FT2_WITH_OTF_FEATURE, [
         # URG
         #r="lib$1-dev or $1-devel"e
         r="libpango1.0-dev or pango?-devel"
-        ver="`pkg-config --modversion $1`"
+        ver="`$PKG_CONFIG --modversion $1`"
         STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (It is required if you'd like "])
         STEPMAKE_ADD_ENTRY($2, ["to use OpenType font feature. "])
         STEPMAKE_ADD_ENTRY($2, ["installed: $ver)"])
@@ -1206,7 +1213,7 @@ AC_DEFUN(STEPMAKE_FONTCONFIG, [
         LIBS="$save_LIBS"
     else
         r="lib$1-dev or $1-devel"
-        ver="`pkg-config --modversion $1`"
+        ver="`$PKG_CONFIG --modversion $1`"
         STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
     fi
 ])