Harmonize pprint macro across projects

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/m4/pprint.m4 b/m4/pprint.m4
index c7024c34d9b57d250243349f04d55f5dd4d2c480..a7cfd94c18b5fe2053855f5189a35735e612136f 100644 (file)
--- a/m4/pprint.m4
+++ b/m4/pprint.m4
@@ -2,6 +2,8 @@
 #
 # Author: Philippe Proulx <pproulx@efficios.com>
 
 #
 # Author: Philippe Proulx <pproulx@efficios.com>
 

+#serial 1
+

 # PPRINT_INIT(): initializes the pretty printing system.
 #
 # Use this macro before using any other PPRINT_* macro.
 # PPRINT_INIT(): initializes the pretty printing system.
 #
 # Use this macro before using any other PPRINT_* macro.


@@ -15,17 +17,17 @@ AC_DEFUN([PPRINT_INIT], [
   AC_PATH_PROG([pprint_tput], [tput])
 
   AS_IF([test -n "$pprint_tput"], [
   AC_PATH_PROG([pprint_tput], [tput])
 
   AS_IF([test -n "$pprint_tput"], [

-    AS_IF([test -n "$PS1" && test `"$pprint_tput" colors` -ge 8 && test -t 1], [
+    AS_IF([test -n "$PS1" && test `"$pprint_tput" colors` -eq 256 && test -t 1], [

       # interactive shell and colors supported and standard output
       # file descriptor is opened on a terminal
       # interactive shell and colors supported and standard output
       # file descriptor is opened on a terminal

-      PPRINT_COLOR_TXTBLK="`"$pprint_tput" setf 0`"
-      PPRINT_COLOR_TXTBLU="`"$pprint_tput" setf 1`"
-      PPRINT_COLOR_TXTGRN="`"$pprint_tput" setf 2`"
-      PPRINT_COLOR_TXTCYN="`"$pprint_tput" setf 3`"
-      PPRINT_COLOR_TXTRED="`"$pprint_tput" setf 4`"
-      PPRINT_COLOR_TXTPUR="`"$pprint_tput" setf 5`"
-      PPRINT_COLOR_TXTYLW="`"$pprint_tput" setf 6`"
-      PPRINT_COLOR_TXTWHT="`"$pprint_tput" setf 7`"
+      PPRINT_COLOR_TXTBLK="`"$pprint_tput" setaf 0`"
+      PPRINT_COLOR_TXTBLU="`"$pprint_tput" setaf 4`"
+      PPRINT_COLOR_TXTGRN="`"$pprint_tput" setaf 2`"
+      PPRINT_COLOR_TXTCYN="`"$pprint_tput" setaf 6`"
+      PPRINT_COLOR_TXTRED="`"$pprint_tput" setaf 1`"
+      PPRINT_COLOR_TXTPUR="`"$pprint_tput" setaf 5`"
+      PPRINT_COLOR_TXTYLW="`"$pprint_tput" setaf 3`"
+      PPRINT_COLOR_TXTWHT="`"$pprint_tput" setaf 7`"

       PPRINT_COLOR_BLD=`"$pprint_tput" bold`
       PPRINT_COLOR_BLDBLK="$PPRINT_COLOR_BLD$PPRINT_COLOR_TXTBLK"
       PPRINT_COLOR_BLDBLU="$PPRINT_COLOR_BLD$PPRINT_COLOR_TXTBLU"
       PPRINT_COLOR_BLD=`"$pprint_tput" bold`
       PPRINT_COLOR_BLDBLK="$PPRINT_COLOR_BLD$PPRINT_COLOR_TXTBLK"
       PPRINT_COLOR_BLDBLU="$PPRINT_COLOR_BLD$PPRINT_COLOR_TXTBLU"


@@ -148,6 +150,36 @@ AC_DEFUN([PPRINT_PROP_BOOL], [
   m4_popdef([pprint_title])
 ])
 
   m4_popdef([pprint_title])
 ])
 

+# PPRINT_PROP_BOOL_CUSTOM(title, value, no_msg, title_color?): pretty prints a boolean
+# property.
+#
+# The title is put as is in a double-quoted shell string so the user
+# needs to escape ".
+#
+# The value is evaluated at shell runtime. Its evaluation must be
+# 0 (false) or 1 (true).
+#
+# Uses the PPRINT_PROP_STRING() with the "yes" or "no" string.
+#
+# Use PPRINT_INIT() before using this macro.
+AC_DEFUN([PPRINT_PROP_BOOL_CUSTOM], [
+  m4_pushdef([pprint_title], [$1])
+  m4_pushdef([pprint_value], [$2])
+  m4_pushdef([pprint_value_no_msg], [$3])
+
+  test pprint_value -eq 0 && pprint_msg="$PPRINT_NO_MSG (pprint_value_no_msg)" || pprint_msg="$PPRINT_YES_MSG"
+
+  m4_if([$#], [4], [
+    PPRINT_PROP_STRING(pprint_title, [$pprint_msg], $4)
+  ], [
+    PPRINT_PROP_STRING(pprint_title, [$pprint_msg])
+  ])
+
+  m4_popdef([pprint_value_no_msg])
+  m4_popdef([pprint_value])
+  m4_popdef([pprint_title])
+])
+

 # PPRINT_WARN(msg): pretty prints a warning message.
 #
 # The message is put as is in a double-quoted shell string so the user
 # PPRINT_WARN(msg): pretty prints a warning message.
 #
 # The message is put as is in a double-quoted shell string so the user