Semi-Merge commit 'ac053ed' into cg_merges_20130524b

Conflicts:
	autogen.sh
	configure.ac

autogen.sh

@@ -14,5 +14,5 @@ echo 'Running autoreconf -if...'
 	cd "${bs_dir}"
 	rm -rf autom4te.cache
 	rm -f aclocal.m4 ltmain.sh
-	autoreconf -if
+	autoreconf -if ${AC_FLAGS}
 )

ccan/Makefile.am

@@ -1,3 +1,4 @@
 noinst_LIBRARIES	= libccan.a
 
 libccan_a_SOURCES	= compiler/compiler.h opt/helpers.c opt/opt.c opt/opt.h opt/parse.c opt/private.h opt/usage.c typesafe_cb/typesafe_cb.h
+libccan_a_CPPFLAGS	= -I$(top_srcdir)