groff-commit
[Top][All Lists]
Advanced

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

[groff] 08/08: Drop now-unused Autoconf macros.


From: G. Branden Robinson
Subject: [groff] 08/08: Drop now-unused Autoconf macros.
Date: Fri, 15 Nov 2024 17:21:41 -0500 (EST)

gbranden pushed a commit to branch master
in repository groff.

commit f107252c3c0d3b70236e0db5a56238a406231bf5
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Nov 15 15:57:34 2024 -0600

    Drop now-unused Autoconf macros.
    
    * configure.ac: Stop expanding `GROFF_AWK_NOTICE`,
      `GROFF_PDFROFF_DEPENDENCIES_CHECK`, and `GROFF_PDFROFF_PROGRAM_NOTICE`
      macros.  Drop `AM_CONDITIONAL` with `USE_PDFROFF` argument.
    
    * m4/groff.m4 (GROFF_AWK_NOTICE, GROFF_AWK_PATH, GROFF_AWK_PREFS)
      (GROFF_PDFROFF_DEPENDENCIES_CHECK, GROFF_PDFROFF_PROGRAM_NOTICE): Drop
      unused macro definitions.
---
 ChangeLog    | 12 +++++++++
 Makefile.am  |  3 ---
 configure.ac |  4 ---
 m4/groff.m4  | 85 ------------------------------------------------------------
 4 files changed, 12 insertions(+), 92 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5b18fb6c9..63ff9d858 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-11-14  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       Drop now-unused Autoconf macros.
+
+       * configure.ac: Stop expanding `GROFF_AWK_NOTICE`,
+       `GROFF_PDFROFF_DEPENDENCIES_CHECK`, and
+       `GROFF_PDFROFF_PROGRAM_NOTICE` macros.  Drop `AM_CONDITIONAL`
+       with `USE_PDFROFF` argument.
+       * m4/groff.m4 (GROFF_AWK_NOTICE, GROFF_AWK_PATH)
+       (GROFF_AWK_PREFS, GROFF_PDFROFF_DEPENDENCIES_CHECK)
+       (GROFF_PDFROFF_PROGRAM_NOTICE): Drop unused macro definitions.
+
 2024-11-14  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        Stop distributing pdfmark.  It is now separately maintained.
diff --git a/Makefile.am b/Makefile.am
index 14b8b52db..f762a4f09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,9 +45,6 @@ SH_SEP=@PATH_SEPARATOR@
 # 'ALT_GHOSTSCRIPT_PROGS' specifies a list of alternative names to be
 # tried if 'GHOSTSCRIPT' cannot be found at run time.
 
-# 'ALT_AWK_PROGS' similarly specifies a list of alternative names,
-# which can be tried at run time, to identify the awk program.
-
 # BROKEN_SPOOLER_FLAGS
 #
 # Normally the Postscript driver, grops, produces output that conforms
diff --git a/configure.ac b/configure.ac
index 1f562f033..c30dd9a39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,7 +160,6 @@ GROFF_TMAC
 GROFF_WITH_COMPATIBILITY_WRAPPERS
 GROFF_TARGET_PATH_SEPARATOR
 GROFF_CHECK_GROHTML_PROGRAMS
-GROFF_PDFROFF_DEPENDENCIES_CHECK
 GROFF_GROPDF_DEPENDENCIES_CHECK
 GROFF_PNMTOOLS_CAN_BE_QUIET
 GROFF_PNMTOPS_NOSETPAGE
@@ -191,7 +190,6 @@ AM_CONDITIONAL([MAKE_DEFINES_RM], [test 
"$groff_make_defines_rm" = yes])
 AM_CONDITIONAL([USEPROGRAMPREFIX], [test "$g" = g])
 
 AM_CONDITIONAL([USE_GROHTML], [test "$use_grohtml" = yes])
-AM_CONDITIONAL([USE_PDFROFF], [test "$use_pdfroff" = yes])
 AM_CONDITIONAL([USE_GROPDF], [test "$use_gropdf" = yes])
 AM_CONDITIONAL([USE_GROFF_ALLOCATOR],
                [test "$groff_use_own_allocator" = yes])
@@ -249,11 +247,9 @@ echo "\
 ----------------------------------------------------------------------"
 
 GROFF_APPDEFDIR_NOTICE
-GROFF_AWK_NOTICE
 GROFF_GHOSTSCRIPT_AVAILABILITY_NOTICE
 GROFF_GHOSTSCRIPT_VERSION_NOTICE
 GROFF_URW_FONTS_NOTICE
 GROFF_UCHARDET_NOTICE
 GROFF_GROHTML_PROGRAM_NOTICE
-GROFF_PDFROFF_PROGRAM_NOTICE
 GROFF_GROPDF_PROGRAM_NOTICE
diff --git a/m4/groff.m4 b/m4/groff.m4
index 786489248..ee254d981 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -273,55 +273,6 @@ AC_DEFUN([GROFF_GROHTML_PROGRAM_NOTICE], [
   fi
 ])
 
-dnl pdfroff uses awk, and we use it in GROFF_URW_FONTS_CHECK.
-
-AC_DEFUN([GROFF_AWK_NOTICE], [
-  AC_REQUIRE([GROFF_AWK_PATH])
-
-  awk_names=awk
-  if test -n "$ALT_AWK_PROGS"
-  then
-    awk_names="$ALT_AWK_PROGS"
-  fi
-
-  if test "$AWK" = missing
-  then
-    AC_MSG_NOTICE([No awk program was found in \$PATH.
-
-  It was sought under the name(s) "$awk_names".
-    ])
-  fi
-])
-
-AC_DEFUN([GROFF_PDFROFF_DEPENDENCIES_CHECK], [
-  AC_REQUIRE([GROFF_AWK_PATH])
-  AC_REQUIRE([GROFF_GHOSTSCRIPT_PATH])
-
-  use_pdfroff=no
-  pdfroff_missing_deps=
-
-  test "$AWK" = missing && pdfroff_missing_deps="awk"
-
-  if test "$GHOSTSCRIPT" = missing
-  then
-    verb=is
-
-    if test -n "$pdfroff_missing_deps"
-    then
-      pdfroff_missing_deps="$pdfroff_missing_deps and "
-      verb=are
-    fi
-    pdfroff_missing_deps="${pdfroff_missing_deps}Ghostscript $verb"
-  fi
-
-  if test -z "$pdfroff_missing_deps"
-  then
-    use_pdfroff=yes
-  fi
-
-  AC_SUBST([use_pdfroff])
-])
-
 AC_DEFUN([GROFF_GROPDF_DEPENDENCIES_CHECK], [
   AC_REQUIRE([GROFF_GHOSTSCRIPT_PATH])
   AC_REQUIRE([GROFF_URW_FONTS_CHECK])
@@ -338,19 +289,6 @@ AC_DEFUN([GROFF_GROPDF_DEPENDENCIES_CHECK], [
   AC_SUBST([use_gropdf])
 ])
 
-AC_DEFUN([GROFF_PDFROFF_PROGRAM_NOTICE], [
-  AC_REQUIRE([GROFF_PDFROFF_DEPENDENCIES_CHECK])
-
-  if test "$use_pdfroff" = no
-  then
-    AC_MSG_NOTICE(['pdfroff' will not be functional.
-
-  Because $pdfroff_missing_deps missing, 'pdfroff' will not operate
-  and the 'pdfmark.pdf' document will not be available.
-])
-  fi
-])
-
 AC_DEFUN([GROFF_GROPDF_PROGRAM_NOTICE], [
   AC_REQUIRE([GROFF_GROPDF_DEPENDENCIES_CHECK])
 
@@ -663,29 +601,6 @@ AC_DEFUN([GROFF_GHOSTSCRIPT_VERSION_NOTICE], [
   fi
 ])
 
-# Check location of 'awk'; allow '--with-awk=PROG' option to override.
-
-AC_DEFUN([GROFF_AWK_PATH],
-  [AC_REQUIRE([GROFF_AWK_PREFS])
-   AC_ARG_WITH([awk],
-     [AS_HELP_STRING([--with-awk=PROG],
-       [actual [/path/]name of awk executable])],
-     [AWK=$withval],
-     [AC_CHECK_TOOLS(AWK, [$ALT_AWK_PROGS], [missing])])
-   test "$AWK" = no && AWK=missing])
-
-
-# Preferences for choice of 'awk' program; allow --with-alt-awk="LIST"
-# to override.
-
-AC_DEFUN([GROFF_AWK_PREFS],
-  [AC_ARG_WITH([alt-awk],
-    [AS_HELP_STRING([--with-alt-awk=LIST],
-      [alternative names for awk executable])],
-    [ALT_AWK_PROGS="$withval"],
-    [ALT_AWK_PROGS="gawk mawk nawk awk"])
-   AC_SUBST([ALT_AWK_PROGS])])
-
 
 # GROFF_CSH_HACK(if hack present, if not present)
 



reply via email to

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