From 73efcd77d17fe92750bf5f76896786ca8e147a9f Mon Sep 17 00:00:00 2001 From: Hugues Fruchet Date: Wed, 17 May 2017 10:03:10 +0200 Subject: [PATCH] configure.ac: revisit --disable-libv4l to --disable-dyn-libv4l --disable-libv4l is not disabling libv4l compilation, but only dynamic library support of libv4l libraries. Signed-off-by: Hugues Fruchet Signed-off-by: Hans Verkuil --- configure.ac | 16 ++++++++-------- lib/libv4l1/Makefile.am | 2 +- lib/libv4l2/Makefile.am | 2 +- lib/libv4l2rds/Makefile.am | 2 +- lib/libv4lconvert/Makefile.am | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 5f20fc8..8e536cc 100644 --- a/configure.ac +++ b/configure.ac @@ -371,11 +371,11 @@ AC_ARG_ENABLE(libdvbv5, esac] ) -AC_ARG_ENABLE(libv4l, - AS_HELP_STRING([--disable-libv4l], [disable dynamic libv4l compilation]), +AC_ARG_ENABLE(dyn-libv4l, + AS_HELP_STRING([--disable-dyn-libv4l], [disable dynamic libv4l support]), [case "${enableval}" in yes | no ) ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-libv4l) ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-dyn-libv4l) ;; esac] ) @@ -427,11 +427,11 @@ AC_SEARCH_LIBS([backtrace], [execinfo], [ AM_CONDITIONAL([WITH_LIBDVBV5], [test x$enable_libdvbv5 != xno -a x$have_libudev = xyes]) AM_CONDITIONAL([WITH_DVBV5_REMOTE], [test x$enable_libdvbv5 != xno -a x$have_libudev = xyes -a x$have_pthread = xyes]) -AM_CONDITIONAL([WITH_LIBV4L], [test x$enable_libv4l != xno]) +AM_CONDITIONAL([WITH_DYN_LIBV4L], [test x$enable_dyn_libv4l != xno]) AM_CONDITIONAL([WITH_V4LUTILS], [test x$enable_v4l_utils != xno -a x$linux_os = xyes]) AM_CONDITIONAL([WITH_QV4L2], [test x${qt_pkgconfig} = xtrue -a x$enable_qv4l2 != xno]) -AM_CONDITIONAL([WITH_V4L_PLUGINS], [test x$enable_libv4l != xno -a x$enable_shared != xno]) -AM_CONDITIONAL([WITH_V4L_WRAPPERS], [test x$enable_libv4l != xno -a x$enable_shared != xno]) +AM_CONDITIONAL([WITH_V4L_PLUGINS], [test x$enable_dyn_libv4l != xno -a x$enable_shared != xno]) +AM_CONDITIONAL([WITH_V4L_WRAPPERS], [test x$enable_dyn_libv4l != xno -a x$enable_shared != xno]) AM_CONDITIONAL([WITH_QTGL], [test x${qt_pkgconfig_gl} = xtrue]) AM_CONDITIONAL([WITH_GCONV], [test x${enable_gconv} = xyes]) AM_CONDITIONAL([WITH_V4L2_CTL_LIBV4L], [test x${enable_v4l2_ctl_libv4l} != xno]) @@ -455,7 +455,7 @@ AM_COND_IF([WITH_LIBDVBV5], [USE_LIBDVBV5="yes"], [USE_LIBDVBV5="no"]) AM_COND_IF([WITH_DVBV5_REMOTE], [USE_DVBV5_REMOTE="yes" AC_DEFINE([HAVE_DVBV5_REMOTE], [1], [Usage of DVBv5 remote enabled])], [USE_DVBV5_REMOTE="no"]) -AM_COND_IF([WITH_LIBV4L], [USE_LIBV4L="yes"], [USE_LIBV4L="no"]) +AM_COND_IF([WITH_DYN_LIBV4L], [USE_DYN_LIBV4L="yes"], [USE_DYN_LIBV4L="no"]) AM_COND_IF([WITH_V4LUTILS], [USE_V4LUTILS="yes"], [USE_V4LUTILS="no"]) AM_COND_IF([WITH_QV4L2], [USE_QV4L2="yes"], [USE_QV4L2="no"]) AM_COND_IF([WITH_V4L_PLUGINS], [USE_V4L_PLUGINS="yes"], [USE_V4L_PLUGINS="no"]) @@ -490,7 +490,7 @@ compile time options summary gconv : $USE_GCONV - dynamic libv4l : $USE_LIBV4L + dynamic libv4l : $USE_DYN_LIBV4L v4l_plugins : $USE_V4L_PLUGINS v4l_wrappers : $USE_V4L_WRAPPERS libdvbv5 : $USE_LIBDVBV5 diff --git a/lib/libv4l1/Makefile.am b/lib/libv4l1/Makefile.am index f768eaa..42cb3db 100644 --- a/lib/libv4l1/Makefile.am +++ b/lib/libv4l1/Makefile.am @@ -1,4 +1,4 @@ -if WITH_LIBV4L +if WITH_DYN_LIBV4L lib_LTLIBRARIES = libv4l1.la include_HEADERS = ../include/libv4l1.h ../include/libv4l1-videodev.h pkgconfig_DATA = libv4l1.pc diff --git a/lib/libv4l2/Makefile.am b/lib/libv4l2/Makefile.am index 1314a99..811c45c 100644 --- a/lib/libv4l2/Makefile.am +++ b/lib/libv4l2/Makefile.am @@ -1,4 +1,4 @@ -if WITH_LIBV4L +if WITH_DYN_LIBV4L lib_LTLIBRARIES = libv4l2.la include_HEADERS = ../include/libv4l2.h ../include/libv4l-plugin.h pkgconfig_DATA = libv4l2.pc diff --git a/lib/libv4l2rds/Makefile.am b/lib/libv4l2rds/Makefile.am index 4f23a3f..73fdd3e 100644 --- a/lib/libv4l2rds/Makefile.am +++ b/lib/libv4l2rds/Makefile.am @@ -1,4 +1,4 @@ -if WITH_LIBV4L +if WITH_DYN_LIBV4L lib_LTLIBRARIES = libv4l2rds.la include_HEADERS = ../include/libv4l2rds.h pkgconfig_DATA = libv4l2rds.pc diff --git a/lib/libv4lconvert/Makefile.am b/lib/libv4lconvert/Makefile.am index 5c8a1cf..4f332fa 100644 --- a/lib/libv4lconvert/Makefile.am +++ b/lib/libv4lconvert/Makefile.am @@ -1,4 +1,4 @@ -if WITH_LIBV4L +if WITH_DYN_LIBV4L lib_LTLIBRARIES = libv4lconvert.la libv4lconvertpriv_PROGRAMS = ov511-decomp ov518-decomp include_HEADERS = ../include/libv4lconvert.h -- 1.9.1