Fix bug in HTML construction that resulted in malformed HTML (CC)

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5d668ee05da7c826b561a564e85cb065a9b0dfe9..adbbddd45772436e5b874a8b00e3480dc2b5fce6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1950,6 +1950,8 @@ fi
 dnl
 dnl  Video4Linux 2
 dnl
+AC_ARG_ENABLE(libv4l2, [AS_HELP_STRING([--disable-libv4l2],
+  [disable userspace V4L2 library (default auto)])])
 AC_ARG_ENABLE(pvr, [AS_HELP_STRING([--enable-pvr],
   [support PVR V4L2 cards (default disabled)])])
 have_v4l2="no"
@@ -1957,10 +1959,12 @@ AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [
   have_v4l2="yes"
 ])
 AS_IF([test "$have_v4l2" = "yes"], [
-  PKG_CHECK_MODULES(LIBV4L2, libv4l2, [
-    AC_DEFINE(HAVE_LIBV4L2, 1, [Define to 1 if libv4l2 is available])
-  ], [
-    AC_MSG_WARN([libv4l2 development headers were not found])
+  AS_IF([test "${enable_libv4l2}" != "no"], [
+    PKG_CHECK_MODULES(LIBV4L2, libv4l2, [
+      AC_DEFINE(HAVE_LIBV4L2, 1, [Define to 1 if libv4l2 is available])
+    ], [
+      AC_MSG_WARN([${LIBV4L2_PKG_ERRORS}])
+    ])
   ])
   AS_IF([test "${enable_pvr}" = "yes"], [
     VLC_ADD_PLUGIN([pvr])
@@ -2190,11 +2194,8 @@ dnl
 PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto])
 if test "${enable_sout}" != "no"; then
     PKG_ENABLE_MODULES_VLC([MUX_OGG], [], [ogg >= 1.0], [Ogg mux support], [auto])
-fi
-
-if test "${enable_sout}" != "no"; then
 dnl Check for libshout
-PKG_ENABLE_MODULES_VLC([SHOUT], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto])
+    PKG_ENABLE_MODULES_VLC([SHOUT], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto])
 fi
 
 dnl
@@ -3613,9 +3614,11 @@ AS_IF([test "${enable_skins2}" != "no"], [
     ], [
       AC_MSG_ERROR([Skins2 interface requires FreeType, libxpm, libxext and libxinerama])
     ])
+    enable_skins2="no"
+  ], [
+    VLC_ADD_PLUGIN([skins2])
+    ALIASES="${ALIASES} svlc"
   ])
-  VLC_ADD_PLUGIN([skins2])
-  ALIASES="${ALIASES} svlc"
 ])
 AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"])