diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | m4/groff.m4 | 24 |
3 files changed, 35 insertions, 12 deletions
@@ -1,5 +1,12 @@ 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 superfluously using braces for shell parameter expansions that don't require them. The shell is not make(1). Say diff --git a/configure.ac b/configure.ac index 85dd8bc40..12cfa1be0 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 551e872e6..32d7f3de0 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 # |