chiark / gitweb /
Fix building with --disable-extras
authorMartin Pitt <martin.pitt@ubuntu.com>
Tue, 15 Feb 2011 15:31:49 +0000 (16:31 +0100)
committerMartin Pitt <martin.pitt@ubuntu.com>
Tue, 15 Feb 2011 15:31:49 +0000 (16:31 +0100)
We always need to define automake conditionals, otherwise configure fails with
--disable-extras.

configure.ac

index 2ceba56..c7885b0 100644 (file)
@@ -115,12 +115,12 @@ if test "x$enable_extras" = xyes; then
 
        AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
        AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
-
-       AC_CHECK_HEADER([linux/videodev.h], [have_videodev_h=yes], [])
-       AM_CONDITIONAL(HAVE_V4L1, [test "x$have_videodev_h" = "xyes"])
 fi
 AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
 
+AC_CHECK_HEADER([linux/videodev.h], [have_videodev_h=yes], [])
+AM_CONDITIONAL(HAVE_V4L1, [test "x$have_videodev_h" = "xyes"])
+
 AC_ARG_ENABLE([introspection],
        AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
        [], [enable_introspection=yes])