This is an automated email from Gerrit. "Antonio Borneo <[email protected]>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9160
-- gerrit commit e4917e718c50b78ff9e6ee17aa8c65ecf5b83d69 Author: Antonio Borneo <[email protected]> Date: Sun Oct 5 11:17:16 2025 +0200 configure.ac: rename 'adapterTuple' as 'adapter_driver' Commit ce3bf664c815 ("configure.ac: rename M4 macro 'adapter' to prevent accidental conflicts") renames the macro as 'adapterTuple' but since the macro name is printed in error messages, this creates cryptic errors like: configure: error: header sys/mman.h is required for adapterTuple "Bitbanging on EP93xx-based SBCs". Rename it as 'adapter_driver'. It keeps valid the purpose of the former renaming, while keeping readable the error message. Change-Id: Idd68270fbdf879153cd59f4cacf5036aa599b251 Signed-off-by: Antonio Borneo <[email protected]> Fixes: ce3bf664c815 ("configure.ac: rename M4 macro 'adapter' to prevent accidental conflicts") diff --git a/configure.ac b/configure.ac index 8335d52dd9..29ebc91f14 100644 --- a/configure.ac +++ b/configure.ac @@ -301,15 +301,15 @@ AS_IF([test "x$debug_malloc" = "xyes" -a "x$have_glibc" = "xyes"], [ ]) m4_define([AC_ARG_ADAPTERS], [ - m4_foreach([adapterTuple], [$1], - [AC_ARG_ENABLE(ADAPTER_OPT([adapterTuple]), - AS_HELP_STRING([--enable-ADAPTER_OPT([adapterTuple])[[[=yes/no/auto]]]], - [Enable building support for the ]ADAPTER_DESC([adapterTuple])[ (default is $2)]), + m4_foreach([adapter_driver], [$1], + [AC_ARG_ENABLE(ADAPTER_OPT([adapter_driver]), + AS_HELP_STRING([--enable-ADAPTER_OPT([adapter_driver])[[[=yes/no/auto]]]], + [Enable building support for the ]ADAPTER_DESC([adapter_driver])[ (default is $2)]), [case "${enableval}" in yes|no|auto) ;; - *) AC_MSG_ERROR([Option --enable-ADAPTER_OPT([adapterTuple]) has invalid value "${enableval}".]) ;; + *) AC_MSG_ERROR([Option --enable-ADAPTER_OPT([adapter_driver]) has invalid value "${enableval}".]) ;; esac], - [ADAPTER_VAR([adapterTuple])=$2]) + [ADAPTER_VAR([adapter_driver])=$2]) ]) ]) @@ -607,23 +607,24 @@ PKG_CHECK_MODULES([LIBJAYLINK], [libjaylink >= 0.2], # Arg $3: What prerequisites are missing, to be shown in an error message # if an adapter was requested but cannot be enabled. m4_define([PROCESS_ADAPTERS], [ - m4_foreach([adapterTuple], [$1], [ + m4_foreach([adapter_driver], [$1], [ AS_IF([test $2], [ - AS_IF([test "x$ADAPTER_VAR([adapterTuple])" != "xno"], [ - AC_DEFINE([BUILD_]ADAPTER_SYM([adapterTuple]), [1], - [1 if you want the ]ADAPTER_DESC([adapterTuple]).) + AS_IF([test "x$ADAPTER_VAR([adapter_driver])" != "xno"], [ + AC_DEFINE([BUILD_]ADAPTER_SYM([adapter_driver]), [1], + [1 if you want the ]ADAPTER_DESC([adapter_driver]).) ], [ - AC_DEFINE([BUILD_]ADAPTER_SYM([adapterTuple]), [0], - [0 if you do not want the ]ADAPTER_DESC([adapterTuple]).) + AC_DEFINE([BUILD_]ADAPTER_SYM([adapter_driver]), [0], + [0 if you do not want the ]ADAPTER_DESC([adapter_driver]).) ]) ], [ - AS_IF([test "x$ADAPTER_VAR([adapterTuple])" = "xyes"], [ - AC_MSG_ERROR([$3 is required for [adapterTuple] "ADAPTER_DESC([adapterTuple])".]) + AS_IF([test "x$ADAPTER_VAR([adapter_driver])" = "xyes"], [ + AC_MSG_ERROR([$3 is required for [adapter_driver] "ADAPTER_DESC([adapter_driver])".]) ]) - ADAPTER_VAR([adapterTuple])=no - AC_DEFINE([BUILD_]ADAPTER_SYM([adapterTuple]), [0], [0 if you do not want the ]ADAPTER_DESC([adapterTuple]).) + ADAPTER_VAR([adapter_driver])=no + AC_DEFINE([BUILD_]ADAPTER_SYM([adapter_driver]), [0], + [0 if you do not want the ]ADAPTER_DESC([adapter_driver]).) ]) - AM_CONDITIONAL(ADAPTER_SYM([adapterTuple]), [test "x$ADAPTER_VAR([adapterTuple])" != "xno"]) + AM_CONDITIONAL(ADAPTER_SYM([adapter_driver]), [test "x$ADAPTER_VAR([adapter_driver])" != "xno"]) ]) ]) @@ -832,7 +833,7 @@ echo echo echo OpenOCD configuration summary echo --------------------------------------------------- -m4_foreach([adapterTuple], [USB1_ADAPTERS, +m4_foreach([adapter_driver], [USB1_ADAPTERS, HIDAPI_ADAPTERS, HIDAPI_USB1_ADAPTERS, LIBFTDI_ADAPTERS, LIBFTDI_USB1_ADAPTERS, LIBGPIOD_ADAPTERS, @@ -854,8 +855,8 @@ m4_foreach([adapterTuple], [USB1_ADAPTERS, DUMMY_ADAPTER, OPTIONAL_LIBRARIES, COVERAGE], - [s=m4_format(["%-49s"], ADAPTER_DESC([adapterTuple])) - AS_CASE([$ADAPTER_VAR([adapterTuple])], + [s=m4_format(["%-49s"], ADAPTER_DESC([adapter_driver])) + AS_CASE([$ADAPTER_VAR([adapter_driver])], [auto], [ echo "$s"yes '(auto)' ], @@ -867,8 +868,8 @@ m4_foreach([adapterTuple], [USB1_ADAPTERS, ], [ AC_MSG_ERROR(m4_normalize([ - Error in [adapterTuple] "ADAPTER_ARG([adapterTuple])": Variable "ADAPTER_VAR([adapterTuple])" - has invalid value "$ADAPTER_VAR([adapterTuple])".])) + Error in [adapter_driver] "ADAPTER_ARG([adapter_driver])": Variable "ADAPTER_VAR([adapter_driver])" + has invalid value "$ADAPTER_VAR([adapter_driver])".])) ]) ]) echo --
