groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 36/39: [build]: Report more configuration data.


From: G. Branden Robinson
Subject: [groff] 36/39: [build]: Report more configuration data.
Date: Tue, 31 May 2022 20:32:32 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit 4d30dd7424161f968f79e310bf0527eca402df8b
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue May 31 17:43:59 2022 -0500

    [build]: Report more configuration data.
    
    * configure.ac: Report use of "g" prefix for commands and macro package
      compatibility wrappers.
    
    * m4/groff.m4 (GROFF_G): Fix code style nits.  Update indentation to
      match recent practice.
---
 ChangeLog    |  7 +++++++
 configure.ac | 16 ++++++++++++++--
 m4/groff.m4  | 24 ++++++++++++++----------
 3 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 74744978..ad887330 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-05-31  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * configure.ac: Report use of "g" prefix for commands and macro
+       package compatibility wrappers.
+       * m4/groff.m4 (GROFF_G): Fix code style nits.  Update
+       indentation to match recent practice.
+
 2022-05-31  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * configure.ac: Fix code style nits and tweak report.  Stop
diff --git a/configure.ac b/configure.ac
index 85dd8bc4..12cfa1be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,7 +194,8 @@ AM_CONDITIONAL([WITHOUT_X11], [test "$groff_no_x" = yes])
 # make builtin variable RM
 AM_CONDITIONAL([MAKE_DONT_HAVE_RM], [test "$groff_is_rm_defined" = no])
 
-# Some programs have a "g" prefix if an existing groff installation is detected
+# Some programs have a "g" prefix if an existing troff installation is
+# detected.
 AM_CONDITIONAL([USEPROGRAMPREFIX], [test "$g" = g])
 
 AM_CONDITIONAL([USE_GROHTML], [test "$use_grohtml" = yes])
@@ -210,7 +211,18 @@ AC_OUTPUT
 echo "
 $PACKAGE_NAME version $PACKAGE_VERSION
 ----------------------------------------------------------------------
- installation directory prefix    : $prefix
+ installation directory prefix    : $prefix"
+if test -n "$g"
+then
+  echo "\
+ command name prefix              : $g"
+  if test -n "$tmac_wrap"
+  then
+  echo "\
+ prefix used for macro packages   : $tmac_wrap"
+  fi
+fi
+echo "\
  C++ compiler and options         : $CXX $CXXFLAGS $CPPFLAGS
  use libgroff's memory allocator  : $groff_use_own_allocator
  C compiler and options           : $CC $CFLAGS $CPPFLAGS
diff --git a/m4/groff.m4 b/m4/groff.m4
index 551e872e..32d7f3de 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1052,16 +1052,20 @@ AC_DEFUN([GROFF_TMAC],
 
 # Searching if a non-GNU Troff is installed.  The built-in register
 # \n[.g] is always 1 in GNU Troff.
-AC_DEFUN([GROFF_G],
-  [AC_MSG_CHECKING([for existing troff installation])
-   if test "`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 
2>/dev/null`" = 0; then
-     AC_MSG_RESULT([yes])
-     g=g
-   else
-     AC_MSG_RESULT([no])
-     g=
-   fi
-   AC_SUBST([g])])
+AC_DEFUN([GROFF_G], [
+  g=
+  AC_MSG_CHECKING([for existing troff installation])
+  if test "`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) \
+    2>/dev/null`" = 0
+  then
+    AC_MSG_RESULT([yes])
+    g=g
+  else
+    AC_MSG_RESULT([no])
+  fi
+  AC_SUBST([g])
+])
+
 
 # Controllable groff compatibility wrappers for vendor-provided macro sets
 #



reply via email to

[Prev in Thread] Current Thread [Next in Thread]