From 7b32e37eb68de43ef5cefe4558e314c3a28abd80 Mon Sep 17 00:00:00 2001 From: Vladimir Mezentsev Date: Tue, 31 Oct 2023 12:11:45 -0700 Subject: [PATCH] gprofng: remove dependency on help2man help2man is no longer used to create the gprofng man pages. gprofng/ChangeLog 2023-10-31 Vladimir Mezentsev * configure.ac: Remove HELP2MAN. * Makefile.in: Rebuild. * configure: Rebuild. * doc/Makefile.in: Rebuild. * gp-display-html/Makefile.in: Rebuild. * src/Makefile.in: Rebuild. --- gprofng/Makefile.in | 1 - gprofng/configure | 56 ++--------------------------- gprofng/configure.ac | 8 ----- gprofng/doc/Makefile.in | 1 - gprofng/gp-display-html/Makefile.in | 1 - gprofng/src/Makefile.in | 1 - 6 files changed, 2 insertions(+), 66 deletions(-) diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in index 7e7dbe53a6c..d0b66b7350e 100644 --- a/gprofng/Makefile.in +++ b/gprofng/Makefile.in @@ -271,7 +271,6 @@ GPROFNG_LIBADD = @GPROFNG_LIBADD@ GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS = @GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS@ GPROFNG_NO_SWITCH_CFLAGS = @GPROFNG_NO_SWITCH_CFLAGS@ GREP = @GREP@ -HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/gprofng/configure b/gprofng/configure index 90f869829f6..1c6a99291be 100755 --- a/gprofng/configure +++ b/gprofng/configure @@ -643,7 +643,6 @@ BUILD_DOC_FALSE BUILD_DOC_TRUE BUILD_MAN_FALSE BUILD_MAN_TRUE -HELP2MAN zlibinc zlibdir TCL_TRY_FALSE @@ -12249,7 +12248,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12252 "configure" +#line 12251 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12355,7 +12354,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12358 "configure" +#line 12357 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16784,57 +16783,6 @@ fi build_man=false build_doc=false if test $cross_compiling = no; then - for ac_prog in help2man -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_HELP2MAN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$HELP2MAN"; then - ac_cv_prog_HELP2MAN="$HELP2MAN" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_HELP2MAN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -HELP2MAN=$ac_cv_prog_HELP2MAN -if test -n "$HELP2MAN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HELP2MAN" >&5 -$as_echo "$HELP2MAN" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$HELP2MAN" && break -done -test -n "$HELP2MAN" || HELP2MAN="$MISSING help2man" - - case "x$HELP2MAN" in - x | */missing\ help2man* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gprofng: help2man is missing. Man pages will not be built." >&5 -$as_echo "$as_me: WARNING: gprofng: help2man is missing. Man pages will not be built." >&2;} - ;; - * ) build_man=true ;; - esac - for ac_prog in makeinfo do # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/gprofng/configure.ac b/gprofng/configure.ac index 7938d7b2cb0..6b8fe262748 100644 --- a/gprofng/configure.ac +++ b/gprofng/configure.ac @@ -208,14 +208,6 @@ AM_ZLIB build_man=false build_doc=false if test $cross_compiling = no; then - AC_CHECK_PROGS([HELP2MAN], help2man, [$MISSING help2man]) - case "x$HELP2MAN" in - x | */missing\ help2man* ) - AC_MSG_WARN([gprofng: help2man is missing. Man pages will not be built.]) - ;; - * ) build_man=true ;; - esac - AC_CHECK_PROGS([MAKEINFO], makeinfo, [$MISSING makeinfo]) case "x$MAKEINFO" in x | */missing\ makeinfo*) diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in index 78f8ae11fc7..0b38534ca7b 100644 --- a/gprofng/doc/Makefile.in +++ b/gprofng/doc/Makefile.in @@ -254,7 +254,6 @@ GPROFNG_LIBADD = @GPROFNG_LIBADD@ GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS = @GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS@ GPROFNG_NO_SWITCH_CFLAGS = @GPROFNG_NO_SWITCH_CFLAGS@ GREP = @GREP@ -HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in index 21cc1c6623b..20c3eaac5fd 100644 --- a/gprofng/gp-display-html/Makefile.in +++ b/gprofng/gp-display-html/Makefile.in @@ -213,7 +213,6 @@ GPROFNG_LIBADD = @GPROFNG_LIBADD@ GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS = @GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS@ GPROFNG_NO_SWITCH_CFLAGS = @GPROFNG_NO_SWITCH_CFLAGS@ GREP = @GREP@ -HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in index 47da873b80c..b45bf3284cc 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in @@ -337,7 +337,6 @@ GPROFNG_LIBADD = @GPROFNG_LIBADD@ GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS = @GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS@ GPROFNG_NO_SWITCH_CFLAGS = @GPROFNG_NO_SWITCH_CFLAGS@ GREP = @GREP@ -HELP2MAN = @HELP2MAN@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -- 2.30.2