Some cleanups

configure.ac

@@ -25,10 +25,12 @@ AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
 
 PKG_CHECK_MODULES(PYGTK, pygtk-2.0)
 
-PKG_CHECK_MODULES(GTKMOZEMBED, [xulrunner-gtkmozembed >= 1.8],
+PKG_CHECK_MODULES(LIB, gtk+-2.0 gstreamer-0.10 gstreamer-plugins-base-0.10)
+
+PKG_CHECK_MODULES(GECKO, [xulrunner-gtkmozembed >= 1.8],
   [have_gecko=true; mozpackage=xulrunner],
   [
-PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-gtkmozembed >= 1.5],
+PKG_CHECK_MODULES(GECKO, [firefox-gtkmozembed >= 1.5],
   [have_gecko=true; mozpackage=firefox],
   have_gecko=false)
   ])
@@ -37,8 +39,6 @@ if test "x$have_gecko" = xfalse; then
   AC_MSG_ERROR([Could not find xulrunner, mozilla or firefox $mozilla_required_version])
 fi
 
-PKG_CHECK_MODULES(LIB, gtk+-2.0 $mozpackage-gtkmozembed gstreamer-0.10 gstreamer-plugins-base-0.10)
-
 MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
 AC_SUBST(MOZILLA_HOME)
 

lib/python/Makefile.am

@@ -1,8 +1,9 @@
 INCLUDES =				\
 	$(PYTHON_INCLUDES)		\
 	$(PYGTK_CFLAGS)			\
-	$(PYCAIRO_CFLAGS)			\
+	$(PYCAIRO_CFLAGS)		\
 	$(LIB_CFLAGS)			\
+	$(GECKO_CFLAGS)			\
 	-I $(top_srcdir)/lib/src
 
 pkgpyexecdir = $(pythondir)
@@ -13,6 +14,7 @@ _sugar_la_LDFLAGS = -module -avoid-version -R$(MOZILLA_HOME)
 _sugar_la_LIBADD =					\
 	$(LIB_LIBS)					\
 	$(PYCAIRO_LIBS)					\
+	$(GECKO_LIBS)					\
 	$(top_builddir)/lib/src/libsugarprivate.la
 
 _sugar_la_SOURCES = 		\

lib/src/Makefile.am

@@ -1,6 +1,7 @@
 libsugarprivate_la_CPPFLAGS =			\
 	$(WARN_CFLAGS)				\
 	$(LIB_CFLAGS)				\
+	$(GECKO_CFLAGS)				\
 	-I$(MOZILLA_INCLUDE_DIR)/dom		\
 	-I$(MOZILLA_INCLUDE_DIR)/exthandler	\
 	-I$(MOZILLA_INCLUDE_DIR)/mimetype   	\
@@ -12,9 +13,11 @@ libsugarprivate_la_CPPFLAGS =			\
 
 noinst_LTLIBRARIES = libsugarprivate.la
 
-libsugarprivate_la_LIBADD = $(LIB_LIBS) 		\
-			    -lgstinterfaces-0.10	\
-			    -lgstaudio-0.10
+libsugarprivate_la_LIBADD = \
+	$(LIB_LIBS) 		\
+	$(GECKO_LIBS) 		\
+	-lgstinterfaces-0.10	\
+	-lgstaudio-0.10
 
 libsugarprivate_la_SOURCES =		\
 	$(BUILT_SOURCES)		\