From c0e966b21e92e1a48087061f053aa26265064c55 Mon Sep 17 00:00:00 2001 From: Ralph Little Date: Fri, 22 Jul 2022 09:10:46 -0700 Subject: [PATCH] configure: corrected issue in Makefile.am and removed noinst build of umax_pp tool Currently, there is no way to disable the build of the umax_pp low level sources because the tool umax_pp is *always* built. Some platforms cannot build the umax_pp low level code so this causes problems. --- configure.ac | 2 +- tools/Makefile.am | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index ed9660609..a763be518 100644 --- a/configure.ac +++ b/configure.ac @@ -650,7 +650,7 @@ ALL_BACKENDS="abaton agfafocus apple artec artec_eplus48u as6e \ mustek_usb mustek_usb2 nec net niash pie pieusb pint \ pixma plustek plustek_pp qcam ricoh ricoh2 rts8891 s9036 \ sceptre sharp sm3600 sm3840 snapscan sp15c st400 \ - stv680 tamarack teco1 teco2 teco3 test u12 umax + stv680 tamarack teco1 teco2 teco3 test u12 umax \ umax_pp umax1220u v4l xerox_mfp p5" # If user specifies backends manually then cause configure diff --git a/tools/Makefile.am b/tools/Makefile.am index c8619795a..3c3698872 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -11,8 +11,6 @@ bin_PROGRAMS = sane-find-scanner gamma4scanimage noinst_PROGRAMS = sane-desc if INSTALL_UMAX_PP_TOOLS bin_PROGRAMS += umax_pp -else -noinst_PROGRAMS += umax_pp endif if CROSS_COMPILING