PR #22770 opened by Ramiro Polla (ramiro) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22770 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22770.patch
>From 047d1efc99e2f3edfa306ce600cac75ebe8323c1 Mon Sep 17 00:00:00 2001 From: Ramiro Polla <[email protected]> Date: Thu, 9 Apr 2026 17:48:07 +0200 Subject: [PATCH 1/3] configure: fix html docs generation when makeinfo is disabled The makeinfo_html variable wasn't being disabled when the makeinfo test failed, which prevented texi2html from being probed. Fixes 589da160b2. Found-by: Luke Jolliffe <[email protected]> --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 719642d96b..14750782d5 100755 --- a/configure +++ b/configure @@ -7626,7 +7626,7 @@ enabled schannel && enabled schannel && check_cc dtls_protocol "windows.h security.h schnlsp.h" "int i = SECPKG_ATTR_DTLS_MTU;" -DSECURITY_WIN32 -$makeinfo --version > /dev/null 2>&1 && enable makeinfo_command || disable makeinfo_command +$makeinfo --version > /dev/null 2>&1 && enable makeinfo_command || disable makeinfo_command makeinfo_html if enabled makeinfo_command; then [ 0$($makeinfo --version | grep "texinfo" | sed 's/.*texinfo[^0-9]*\([0-9]*\)\..*/\1/') -ge 5 ] \ && enable makeinfo_html || disable makeinfo_html -- 2.52.0 >From ee4bd88b53a28c7028a715d0d1b85040936c4f16 Mon Sep 17 00:00:00 2001 From: Ramiro Polla <[email protected]> Date: Thu, 9 Apr 2026 17:54:31 +0200 Subject: [PATCH 2/3] configure: add missing quotes around user-specified tool paths Found-by: Luke Jolliffe <[email protected]> --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 14750782d5..4501ba401f 100755 --- a/configure +++ b/configure @@ -5074,7 +5074,7 @@ elif is_in -static $cc $LDFLAGS && ! is_in --static $pkg_config $pkg_config_flag Note: When building a static binary, add --pkg-config-flags=\"--static\"." fi -if test $doxygen != $doxygen_default && \ +if test "$doxygen" != "$doxygen_default" && \ ! $doxygen --version >/dev/null 2>&1; then warn "Specified doxygen \"$doxygen\" not found, API documentation will fail to build." fi @@ -7631,7 +7631,7 @@ if enabled makeinfo_command; then [ 0$($makeinfo --version | grep "texinfo" | sed 's/.*texinfo[^0-9]*\([0-9]*\)\..*/\1/') -ge 5 ] \ && enable makeinfo_html || disable makeinfo_html else - if test $makeinfo != $makeinfo_default ; then + if test "$makeinfo" != "$makeinfo_default" ; then warn "Specified makeinfo \"$makeinfo\" not found." fi fi -- 2.52.0 >From 0f1c6e65d0fbd1273ee0cd219eb058bdd110521f Mon Sep 17 00:00:00 2001 From: Ramiro Polla <[email protected]> Date: Thu, 9 Apr 2026 17:56:30 +0200 Subject: [PATCH 3/3] configure: collapse else + if into elif --- configure | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 4501ba401f..663131e8b2 100755 --- a/configure +++ b/configure @@ -7630,10 +7630,8 @@ $makeinfo --version > /dev/null 2>&1 && enable makeinfo_command || disable makei if enabled makeinfo_command; then [ 0$($makeinfo --version | grep "texinfo" | sed 's/.*texinfo[^0-9]*\([0-9]*\)\..*/\1/') -ge 5 ] \ && enable makeinfo_html || disable makeinfo_html -else - if test "$makeinfo" != "$makeinfo_default" ; then - warn "Specified makeinfo \"$makeinfo\" not found." - fi +elif test "$makeinfo" != "$makeinfo_default" ; then + warn "Specified makeinfo \"$makeinfo\" not found." fi disabled makeinfo_html && texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disable texi2html -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
