Revert "[media] [v4l-utils] Add configure option to allow qv4l2 disable"
authorGregor Jasny <gjasny@googlemail.com>
Wed, 20 Jun 2012 15:31:37 +0000 (17:31 +0200)
committerGregor Jasny <gjasny@googlemail.com>
Wed, 20 Jun 2012 15:34:13 +0000 (17:34 +0200)
This reverts commit 06e5235b4e1514f9234a21942261ba417deb106c.

Another patch to disable qv4l2 was already added via
7fc9fa40e7fd1a72688c6f43fc11e085079b3f0c

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
configure.ac

index 83519ba..8e166b1 100644 (file)
@@ -93,17 +93,8 @@ AS_IF([test "x$with_jpeg" != xno],
 
 AM_CONDITIONAL([HAVE_JPEG], [$have_jpeg])
 
-AC_ARG_ENABLE(qv4l2,
-  [  --disable-qv4l2         disable qv4l2 compilation],
-  [case "${enableval}" in
-     yes | no ) with_qv4l2="${enableval}" ;;
-     *) AC_MSG_ERROR(bad value ${enableval} for --disable-qv4l2) ;;
-   esac],
-  [with_qv4l2="yes"]
-)
-
 PKG_CHECK_MODULES(QT, [QtCore >= 4.4 QtGui >= 4.4], [qt_pkgconfig=true], [qt_pkgconfig=false])
-if test "x$qt_pkgconfig" = "xtrue" && test "x$with_qv4l2" = "xyes"; then
+if test "x$qt_pkgconfig" = "xtrue"; then
    AC_SUBST(QT_CFLAGS)
    AC_SUBST(QT_LIBS)
    MOC=`$PKG_CONFIG --variable=moc_location QtCore`