aboutsummaryrefslogtreecommitdiffstats
path: root/utils/v4l2-compliance/Makefile.am
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-08-21 23:02:06 +0200
committerHans Verkuil <hans.verkuil@cisco.com>2017-12-15 15:47:12 +0100
commit8f27b518952db17c10e403df921e80296c36bfb7 (patch)
treeefe105a0e249b28972e861da6aa777f797f7faa0 /utils/v4l2-compliance/Makefile.am
parentf257c2fd7494d13ad33d085be88c358fcc937d25 (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/v4l2-compliance/Makefile.am')
-rw-r--r--utils/v4l2-compliance/Makefile.am4
1 files changed, 0 insertions, 4 deletions
diff --git a/utils/v4l2-compliance/Makefile.am b/utils/v4l2-compliance/Makefile.am
index 0671fda2..58bad86c 100644
--- a/utils/v4l2-compliance/Makefile.am
+++ b/utils/v4l2-compliance/Makefile.am
@@ -7,16 +7,12 @@ v4l2_compliance_SOURCES = v4l2-compliance.cpp v4l2-test-debug.cpp v4l2-test-inpu
v4l2-test-codecs.cpp v4l2-test-colors.cpp v4l2-compliance.h
v4l2_compliance_CPPFLAGS = -I$(top_srcdir)/utils/common
-if WITH_LIBV4L
if WITH_V4L2_COMPLIANCE_LIBV4L
v4l2_compliance_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la -lrt -lpthread
else
v4l2_compliance_LDADD = -lrt -lpthread
DEFS += -DNO_LIBV4L2
endif
-else
-DEFS += -DNO_LIBV4L2
-endif
EXTRA_DIST = Android.mk fixme.txt v4l2-compliance.1

Privacy Policy