aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-08-30 17:19:53 -0300
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2018-08-30 17:19:53 -0300
commitfcccd99ebdc6ff01296f57948c52dacc9c1d2695 (patch)
tree1989333b3ceb529d4d8f0ef6c6f81b3d7ca50bae /configure.ac
parent129bae951c8a1d9274009e6a37420d05715ca208 (diff)
configure.ac: improve check for gconv build
if --enable-gconv is used, check if the used directory is a valid one. If not, print a warning message and disable it. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac7
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 5618d444..3ee89d64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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 -a x$enable_shared == xyes -a x$with_gconvdir != x])
+AM_CONDITIONAL([WITH_GCONV], [test x$enable_gconv = xyes -a x$enable_shared == xyes -a x$with_gconvdir != x -a -f $with_gconvdir/gconv-modules])
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])
@@ -529,6 +529,11 @@ AS_IF([test "x$alsa_pkgconfig" = "xtrue"], [USE_ALSA="yes"], [USE_ALSA="no"])
AC_OUTPUT
+if test x$enable_gconv = xyes -a x$USE_GCONV = xno; then
+ echo
+ echo "Failed to enable gconv. Disabling it"
+fi
+
dnl ---------------------------------------------------------------------
dnl compile time options summary

Privacy Policy