diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-08-21 23:02:06 +0200 |
|---|---|---|
| committer | Hans Verkuil <hans.verkuil@cisco.com> | 2017-12-15 15:47:12 +0100 |
| commit | 8f27b518952db17c10e403df921e80296c36bfb7 (patch) | |
| tree | efe105a0e249b28972e861da6aa777f797f7faa0 /utils/Makefile.am | |
| parent | f257c2fd7494d13ad33d085be88c358fcc937d25 (diff) | |
configure.ac: drop --disable-libv4l, disable plugin support instead
In commit 2e604dfbcd09b93f0808cedb2a0b324c5569a599 ("configure.ac: add
--disable-libv4l option"), an option --disable-libv4l was added. As
part of this, libv4l is no longer built at all in static linking
configurations, just because libv4l uses dlopen() for plugin support.
However, plugin support is only a side feature of libv4l, and one may
need to use libv4l in static configurations, just without plugin
support.
Therefore, this commit:
- Essentially reverts 2e604dfbcd09b93f0808cedb2a0b324c5569a599, so
that libv4l can be built in static linking configurations again.
- Adjusts the compilation of libv4l2 so that the plugin support is
not compiled in when dlopen() in static linking configuration
(dlopen is not available).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Hugues Fruchet <hugues.fruchet@st.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Diffstat (limited to 'utils/Makefile.am')
| -rw-r--r-- | utils/Makefile.am | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am index 1e278cc5..dc0f5f0e 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -12,12 +12,8 @@ SUBDIRS = \ v4l2-sysfs-path \ cec-ctl \ cec-compliance \ - cec-follower - -if WITH_LIBV4L -SUBDIRS += \ + cec-follower \ rds-ctl -endif if WITH_LIBDVBV5 SUBDIRS += \ |