Index: ext/gconf/Makefile.am
===================================================================
--- ext/gconf/Makefile.am	(revision 3027)
+++ ext/gconf/Makefile.am	(working copy)
@@ -4,5 +4,6 @@
 
 libgstgconfelements2_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GCONF_CFLAGS)
 libgstgconfelements2_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GCONF_LIBS)
+libgstgconfelements2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS)
 
 noinst_HEADERS = gstgconfv4l2src.h
Index: configure.ac
===================================================================
--- configure.ac	(revision 3027)
+++ configure.ac	(working copy)
@@ -343,7 +343,9 @@
 
 AC_MSG_RESULT(Checking for --enable-g729... $g729)
 AM_CONDITIONAL(ENABLE_G729, test "x$g729" != "xno")
+if test x$g729 = xyes; then
 AC_DEFINE(ENABLE_G729, , [Compile the G729 payloader and depayloader])
+fi
 
 AC_OUTPUT(Makefile \
 ext/Makefile \