Tvheadend

After the great reorganisation over the weekend it is no longer possible to build TVH without descrambling.
This is my configure command:

./configure \
--prefix=/usr \
--disable-libvpx \
--disable-libvpx_static \
--enable-libx265 \
--disable-libx264_static \
--disable-libx265_static \
--disable-libvorbis \
--disable-libvorbis_static \
--disable-libtheora_static \
--disable-libtheora \
--disable-libopus \
--disable-libopus_static \
--disable-ffmpeg_static \
--disable-ffmpeg \
--disable-libfdkaac-static \
--disable-hdhomerun_static \
--disable-hdhomerun_client \
--enable-satip_server \
--disable-satip_client \
--disable-imagecache \
--enable-dvbscan \
--disable-cwc \
--disable-cccam \
--disable-capmt \
--disable-constcw \
--disable-ddci \
--disable-iptv

and the error:

CC src/main.o
In file included from src/descrambler/descrambler.h:25:0,
from src/esstream.h:23,
from src/service.h:22,
from src/subscriptions.h:22,
from src/main.c:48:
/tmp/makepkg/tvheadend/src/tvheadend/src/descrambler/tvhcsa.h:30:10: fatal error: ffdecsa/FFdecsa.h: No such file or directory
#include "ffdecsa/FFdecsa.h"
^~~~~~~~~~~~~~~~~~~
compilation terminated.

It seems that the build only succeeded previously because of the built-in version of ffdecsa, which has now been removed. Would it be possible for configure to remove all of the descrambling code from the build if no descrambling-related options have been selected?