mirror of
git://git.code.sf.net/p/openocd/code
synced 2025-08-16 17:57:47 +10:00
configure.ac: show the parallel port adapter in the config summary
Use the same processing logic as most other enable/disable options. Change-Id: I994963fdab32a09c191f2e29620c9540136f980c Signed-off-by: R. Diez <rdiez-2006@rd10.de> Reviewed-on: https://review.openocd.org/c/openocd/+/9003 Tested-by: jenkins Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
parent
7cbb3c3854
commit
bf8590ea65
20
configure.ac
20
configure.ac
@ -183,6 +183,9 @@ m4_define([XVC_ADAPTERS],
|
||||
m4_define([SERIAL_PORT_ADAPTERS],
|
||||
[[[buspirate], [Bus Pirate], [BUS_PIRATE]]])
|
||||
|
||||
m4_define([PARALLEL_PORT_ADAPTER],
|
||||
[[[parport], [PC Parallel Port], [PARPORT]]])
|
||||
|
||||
m4_define([LINUXSPIDEV_ADAPTER],
|
||||
[[[linuxspidev], [Linux spidev driver], [LINUXSPIDEV]]])
|
||||
m4_define([VDEBUG_ADAPTER],
|
||||
@ -340,6 +343,7 @@ AC_ARG_ADAPTERS([
|
||||
],[auto])
|
||||
|
||||
AC_ARG_ADAPTERS([
|
||||
PARALLEL_PORT_ADAPTER,
|
||||
AMTJTAGACCEL_ADAPTER
|
||||
],[no])
|
||||
|
||||
@ -353,10 +357,6 @@ AC_ARG_ADAPTERS([
|
||||
AC_ARG_ADAPTERS([HOST_ARM_BITBANG_ADAPTERS],[no])
|
||||
AC_ARG_ADAPTERS([HOST_ARM_OR_AARCH64_BITBANG_ADAPTERS],[no])
|
||||
|
||||
AC_ARG_ENABLE([parport],
|
||||
AS_HELP_STRING([--enable-parport], [Enable building the pc parallel port driver]),
|
||||
[build_parport=$enableval], [build_parport=no])
|
||||
|
||||
AC_ARG_ENABLE([parport_ppdev],
|
||||
AS_HELP_STRING([--disable-parport-ppdev],
|
||||
[Disable use of ppdev (/dev/parportN) for parport (for x86 only)]),
|
||||
@ -433,7 +433,7 @@ AS_CASE([$host_os],
|
||||
], [
|
||||
is_cygwin=yes
|
||||
# sys/io.h needed under cygwin for parport access
|
||||
AS_IF([test "x$build_parport" = "xyes"], [
|
||||
AS_IF([test "x$enable_parport" != "xno"], [
|
||||
AC_CHECK_HEADERS([sys/io.h],[],AC_MSG_ERROR([Please install the cygwin ioperm package]))
|
||||
])
|
||||
])
|
||||
@ -496,13 +496,6 @@ AS_IF([test "x$is_darwin" = "xyes"], [
|
||||
AC_DEFINE([IS_DARWIN], [0], [0 if not building for Darwin.])
|
||||
])
|
||||
|
||||
AS_IF([test "x$build_parport" = "xyes"], [
|
||||
build_bitbang=yes
|
||||
AC_DEFINE([BUILD_PARPORT], [1], [1 if you want parport.])
|
||||
], [
|
||||
AC_DEFINE([BUILD_PARPORT], [0], [0 if you don't want parport.])
|
||||
])
|
||||
|
||||
AS_IF([test "x$ADAPTER_VAR([dummy])" != "xno"], [
|
||||
build_bitbang=yes
|
||||
])
|
||||
@ -647,6 +640,7 @@ PROCESS_ADAPTERS([LIBJAYLINK_ADAPTERS], ["x$use_internal_libjaylink" = "xyes" -o
|
||||
PROCESS_ADAPTERS([XVC_ADAPTERS], ["x$is_linux" = "xyes" -a "x$ac_cv_header_linux_pci_h" = "xyes"], [Linux build])
|
||||
PROCESS_ADAPTERS([SERIAL_PORT_ADAPTERS], ["x$can_build_buspirate" = "xyes"],
|
||||
[internal error: validation should happen beforehand])
|
||||
PROCESS_ADAPTERS([PARALLEL_PORT_ADAPTER], [true], [unused])
|
||||
PROCESS_ADAPTERS([LINUXSPIDEV_ADAPTER], ["x$is_linux" = "xyes" -a "x$ac_cv_header_linux_spi_spidev_h" = "xyes"],
|
||||
[Linux spidev])
|
||||
PROCESS_ADAPTERS([VDEBUG_ADAPTER], [true], [unused])
|
||||
@ -724,7 +718,6 @@ AS_IF([test "x$enable_esp_usb_jtag" != "xno"], [
|
||||
])
|
||||
|
||||
AM_CONDITIONAL([RELEASE], [test "x$build_release" = "xyes"])
|
||||
AM_CONDITIONAL([PARPORT], [test "x$build_parport" = "xyes"])
|
||||
AM_CONDITIONAL([GIVEIO], [test "x$parport_use_giveio" = "xyes"])
|
||||
AM_CONDITIONAL([BITBANG], [test "x$build_bitbang" = "xyes"])
|
||||
AM_CONDITIONAL([USB_BLASTER_DRIVER], [test "x$enable_usb_blaster" != "xno" -o "x$enable_usb_blaster_2" != "xno"])
|
||||
@ -842,6 +835,7 @@ m4_foreach([adapterTuple], [USB1_ADAPTERS,
|
||||
REMOTE_BITBANG_ADAPTER,
|
||||
LIBJAYLINK_ADAPTERS, XVC_ADAPTERS,
|
||||
SERIAL_PORT_ADAPTERS,
|
||||
PARALLEL_PORT_ADAPTER,
|
||||
LINUXSPIDEV_ADAPTER,
|
||||
VDEBUG_ADAPTER,
|
||||
JTAG_DPI_ADAPTER,
|
||||
|
Loading…
Reference in New Issue
Block a user