Skip to content

Commit 2627f8c

Browse files
R. Diezborneoa
authored andcommitted
configure.ac: show the linuxgpiod adapter in the configuration summary
List AC_ARG_ADAPTERS was missing a comma separating two of the elements. Also verify that each adapter is set to either 'auto', 'yes' or 'no', which should prevent such issues from going unnoticed in the future. Change-Id: I0d407e03b1e5a3edc61d7dc93d5ffa70fe079b3c Signed-off-by: R. Diez <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/8534 Tested-by: jenkins Reviewed-by: R. Diez <[email protected]> Reviewed-by: Antonio Borneo <[email protected]>
1 parent 9ff79fd commit 2627f8c

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

configure.ac

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ AC_ARG_ADAPTERS([
283283
HIDAPI_ADAPTERS,
284284
HIDAPI_USB1_ADAPTERS,
285285
LIBFTDI_ADAPTERS,
286-
LIBFTDI_USB1_ADAPTERS
286+
LIBFTDI_USB1_ADAPTERS,
287287
LIBGPIOD_ADAPTERS,
288288
SERIAL_PORT_ADAPTERS,
289289
PCIE_ADAPTERS,
@@ -372,10 +372,6 @@ AS_CASE([$host_os],
372372
AC_MSG_ERROR([sysfsgpio is only available on linux])
373373
])
374374
375-
AS_IF([test "x$enable_linuxgpiod" = "xyes"], [
376-
AC_MSG_ERROR([linuxgpiod is only available on linux])
377-
])
378-
379375
AS_CASE([$host_os], [freebsd*], [],
380376
[
381377
AS_IF([test "x$build_rshim" = "xyes"], [
@@ -722,7 +718,7 @@ PROCESS_ADAPTERS([HIDAPI_ADAPTERS], ["x$use_hidapi" = "xyes"], [hidapi])
722718
PROCESS_ADAPTERS([HIDAPI_USB1_ADAPTERS], ["x$use_hidapi" = "xyes" -a "x$use_libusb1" = "xyes"], [hidapi and libusb-1.x])
723719
PROCESS_ADAPTERS([LIBFTDI_ADAPTERS], ["x$use_libftdi" = "xyes"], [libftdi])
724720
PROCESS_ADAPTERS([LIBFTDI_USB1_ADAPTERS], ["x$use_libftdi" = "xyes" -a "x$use_libusb1" = "xyes"], [libftdi and libusb-1.x])
725-
PROCESS_ADAPTERS([LIBGPIOD_ADAPTERS], ["x$use_libgpiod" = "xyes"], [libgpiod])
721+
PROCESS_ADAPTERS([LIBGPIOD_ADAPTERS], ["x$use_libgpiod" = "xyes"], [Linux libgpiod])
726722
PROCESS_ADAPTERS([LIBJAYLINK_ADAPTERS], ["x$use_internal_libjaylink" = "xyes" -o "x$use_libjaylink" = "xyes"], [libjaylink-0.2])
727723
PROCESS_ADAPTERS([PCIE_ADAPTERS], ["x$is_linux" = "xyes"], [Linux build])
728724
PROCESS_ADAPTERS([SERIAL_PORT_ADAPTERS], ["x$can_build_buspirate" = "xyes"],
@@ -889,6 +885,11 @@ m4_foreach([adapter], [USB1_ADAPTERS,
889885
],
890886
[no], [
891887
echo "$s"no
888+
],
889+
[
890+
AC_MSG_ERROR(m4_normalize([
891+
Error in [adapter] "ADAPTER_ARG([adapter])": Variable "ADAPTER_VAR([adapter])"
892+
has invalid value "$ADAPTER_VAR([adapter])".]))
892893
])
893894
])
894895
echo

0 commit comments

Comments
 (0)