aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-08-30 16:30:16 -0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-08-30 16:34:40 -0300
commit129bae951c8a1d9274009e6a37420d05715ca208 (patch)
tree32173937c9573f64c088e54ee2324e158b8f2041 /configure.ac
parent0bc8d673a1731cdd2d137302d99b9473e36da437 (diff)
configure.ac: disable gconv if it can't find its location
if --enable-gconv is used, it will need to know where gconv files will be stored, otherwise linking the ARIB charset code will fail. Also, for it to work, v4l-utils should be built with shared libraries support. there is already a check for it, except that it doesn't really works the way it was coded. Fix it by placing the check conditions at the right place and adding a check to see if with_gconvdir was filled. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index fe4af798..5618d444 100644
--- a/configure.ac
+++ b/configure.ac
@@ -469,7 +469,7 @@ AC_ARG_ENABLE(qvidcap,
AC_ARG_ENABLE(gconv,
AS_HELP_STRING([--enable-gconv], [enable compilation of gconv modules]),
[case "${enableval}" in
- yes | no ) [test x$enable_shared == xno -o x$LIBICONV != x && enable_gconv = no] ;;
+ yes | no ) ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-gconv) ;;
esac]
)
@@ -492,7 +492,7 @@ AM_CONDITIONAL([WITH_QVIDCAP], [test x${qt_pkgconfig_gl} = xtrue -a x$enable
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_GCONV], [test x$enable_gconv = xyes -a x$enable_shared == xyes -a x$with_gconvdir != x])
AM_CONDITIONAL([WITH_V4L2_CTL_LIBV4L], [test x${enable_v4l2_ctl_libv4l} != xno])
AM_CONDITIONAL([WITH_V4L2_CTL_STREAM_TO], [test x${enable_v4l2_ctl_stream_to} != xno])
AM_CONDITIONAL([WITH_V4L2_COMPLIANCE_LIBV4L], [test x${enable_v4l2_compliance_libv4l} != xno])

Privacy Policy