X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=configure.ac;h=a6bda8856cdf3f5b4b6d79b33855358fcab0769d;hb=3076fc601d9b4f8adf8aa080f550cb96290af60f;hp=9c2f1d7eab3cb2379c524614ecd9e5d25165c9ee;hpb=699a8475a1cdc4a374470f1269106534102db148;p=openocd.git diff --git a/configure.ac b/configure.ac index 9c2f1d7eab..a6bda8856c 100644 --- a/configure.ac +++ b/configure.ac @@ -222,11 +222,9 @@ AC_ARG_ENABLE([dummy], AS_HELP_STRING([--enable-dummy], [Enable building the dummy port driver]), [build_dummy=$enableval], [build_dummy=no]) -AS_CASE([$host_os], [linux*], [host_os_linux=yes], [host_os_linux=no]) - AC_ARG_ENABLE([rshim], AS_HELP_STRING([--enable-rshim], [Enable building the rshim driver]), - [build_rshim=$enableval], [build_rshim=$host_os_linux]) + [build_rshim=$enableval], [build_rshim=no]) m4_define([AC_ARG_ADAPTERS], [ m4_foreach([adapter], [$1], @@ -362,10 +360,6 @@ AC_ARG_ENABLE([internal-libjaylink], [Disable building internal libjaylink]), [use_internal_libjaylink=$enableval], [use_internal_libjaylink=yes]) -AC_ARG_ENABLE([target64], - AS_HELP_STRING([--disable-target64], [Disable 64-bit target address]), - [build_target64=$enableval], [build_target64=yes]) - build_minidriver=no AC_MSG_CHECKING([whether to enable ZY1000 minidriver]) AS_IF([test "x$build_zy1000" = "xyes"], [ @@ -619,13 +613,6 @@ AS_IF([test "x$build_xlnx_pcie_xvc" = "xyes"], [ AC_DEFINE([BUILD_XLNX_PCIE_XVC], [0], [0 if you don't want Xilinx XVC/PCIe driver.]) ]) -AS_IF([test "x$build_target64" = "xyes"], [ - AC_DEFINE([BUILD_TARGET64], [1], [1 if you want 64-bit addresses.]) -], [ - AC_DEFINE([BUILD_TARGET64], [0], [0 if you don't want 64-bit addresses.]) -]) - - PKG_CHECK_MODULES([LIBUSB1], [libusb-1.0], [ use_libusb1=yes AC_DEFINE([HAVE_LIBUSB1], [1], [Define if you have libusb-1.x]) @@ -748,7 +735,6 @@ AM_CONDITIONAL([BITQ], [test "x$build_bitq" = "xyes"]) AM_CONDITIONAL([USE_LIBFTDI], [test "x$use_libftdi" = "xyes"]) AM_CONDITIONAL([USE_HIDAPI], [test "x$use_hidapi" = "xyes"]) AM_CONDITIONAL([USE_LIBJAYLINK], [test "x$use_libjaylink" = "xyes"]) -AM_CONDITIONAL([TARGET64], [test "x$build_target64" = "xyes"]) AM_CONDITIONAL([RSHIM], [test "x$build_rshim" = "xyes"]) AM_CONDITIONAL([MINIDRIVER], [test "x$build_minidriver" = "xyes"])