From 0109816b50064a314389333ff64aaf22cb4b1e56 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 5 Oct 2010 18:36:45 -0400
Subject: [PATCH] Update build system

---
 autogen.sh   | 3 ---
 configure.ac | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index e4317db89..fb0148b92 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -171,9 +171,6 @@ do_cmd $AUTOHEADER
 
 touch ChangeLog
 
-# We don't call gtkdocize right now.  When we do, we should then modify
-# the generated gtk-doc.make and move it to build/Makefile.am.gtk-doc.
-# See that file for details.
 #do_cmd $GTKDOCIZE $GTKDOCIZE_FLAGS
 
 do_cmd $AUTOMAKE $AUTOMAKE_FLAGS
diff --git a/configure.ac b/configure.ac
index 721c91292..56c63235f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,7 @@ AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL dnl ([1.4]) Don't remove!
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_CXX
 
 AC_CHECK_FUNCS(mprotect sysconf getpagesize)