$NetBSD: patch-aa,v 1.6 2013/01/23 17:27:13 wiz Exp $

First and second chunk: automake-1.13 compat.
http://bugzilla.gnome.org/show_bug.cgi?id=583469

--- configure.ac.orig	2009-06-29 20:32:01.000000000 +0000
+++ configure.ac
@@ -3,7 +3,7 @@
 AC_INIT(cheese, 2.26.3)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_CONFIG_HEADER(cheese-config.h)
+AC_CONFIG_HEADERS(cheese-config.h)
 AM_MAINTAINER_MODE
 
 dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
@@ -11,14 +11,14 @@ AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FL
 
 AC_ISC_POSIX
 AC_PROG_CC
-AM_PROG_CC_STDC
 AC_HEADER_STDC
 AM_PROG_LIBTOOL
 
 CFLAGS="${CFLAGS} -Wall"
 
-GNOME_MAINTAINER_MODE_DEFINES
-GNOME_COMPILE_WARNINGS
+dnl If you can find where these come from, use them! ;)
+dnl GNOME_MAINTAINER_MODE_DEFINES
+dnl GNOME_COMPILE_WARNINGS
 
 #*******************************************************************************
 # Expanded dirs
@@ -86,7 +86,6 @@ PKG_CHECK_MODULES(CHEESE, \ 
   cairo >= $CAIRO_REQUIRED \
   dbus-1 >= $DBUS_REQUIRED \
   dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
-  hal >= $HAL_REQUIRED \
   pangocairo >= $PANGOCAIRO_REQUIRED \
   librsvg-2.0 >= $LIBRSVG_REQUIRED)
 AC_SUBST(CHEESE_CFLAGS)
@@ -105,6 +104,25 @@ fi
 
 AM_CONDITIONAL(WITH_HILDON, test "x$enable_hildon" = "xyes")
 
+AC_ARG_ENABLE(hal, AS_HELP_STRING([--enable-hal], [Use the HAL library (default=no)]),, enable_hal=no)
+
+if test "x$enable_hal" = "xyes"; then
+  PKG_CHECK_MODULES([HAL], hal >= $HAL_REQUIRED, ac_have_hal=yes, ac_have_hal=no)
+  AC_SUBST(CHEESE_CFLAGS)
+else
+  enable_hal=no
+fi
+
+if test "x$ac_have_hal" = "xyes"; then
+  AC_DEFINE(HAVE_HAL, 1, define to 1 if HAL is used)
+else
+  AC_DEFINE(HAVE_HAL, 0, define to 1 if HAL is used)
+fi
+
+AC_CHECK_HEADER([sys/videoio.h],
+  [AC_DEFINE(USE_SYS_VIDEOIO_H, 1, define to 1 if sys/videoio.h is present)],
+  [AC_DEFINE(USE_SYS_VIDEOIO_H, 0, define to 1 if sys/videoio.h is present)], [])
+
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 AM_GCONF_SOURCE_2
 
