From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Tue, 15 Feb 2011 15:31:49 +0000 (+0100)
Subject: Fix building with --disable-extras
X-Git-Tag: 174~255^2~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c283cd6c598b38a6e1bb1ffd7372b9c550e45233;hp=32567f8c95290a8819c0bc7d57849b8abfba9554

Fix building with --disable-extras

We always need to define automake conditionals, otherwise configure fails with
--disable-extras.
---

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 <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])