From c283cd6c598b38a6e1bb1ffd7372b9c550e45233 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 15 Feb 2011 16:31:49 +0100 Subject: [PATCH] Fix building with --disable-extras We always need to define automake conditionals, otherwise configure fails with --disable-extras. --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 2ceba5619..c7885b016 100644 --- a/configure.ac +++ b/configure.ac @@ -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 ' | 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]) -- 2.30.2