Index: configure.ac
===================================================================
RCS file: /cvs/cairo/roadster/configure.ac,v
retrieving revision 1.11
diff -u -p -r1.11 configure.ac
--- configure.ac	4 Mar 2005 04:35:42 -0000	1.11
+++ configure.ac	12 Mar 2005 04:23:05 -0000
@@ -35,17 +35,12 @@ GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
 
-dnl ========= check for gnome libraries ========================================
-PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 gtk+-2.0 libglade-2.0 libxml-2.0,,exit)
-AC_SUBST(GNOME_LIBS)
-AC_SUBST(GNOME_CFLAGS)
-
-dnl ========= check for cairo ==================================================
-PKG_CHECK_MODULES(CAIRO, cairo,,exit)
-
-AC_SUBST(CAIRO_LIBS)
-AC_SUBST(CAIRO_CFLAGS)
+dnl ========= check for libraries ==============================================
+PKG_CHECK_MODULES(ROADSTER, gtk+-2.0 libglade-2.0 libxml-2.0 cairo,,exit)
+AC_SUBST(ROADSTER_LIBS)
+AC_SUBST(ROADSTER_CFLAGS)
 
+dnl ========= check cairo version ==============================================
 PKG_CHECK_MODULES(, cairo > 0.2.0,
     [AC_DEFINE([HAVE_CAIRO_0_2_0], [1], [Newer Cairo])],
     continue
Index: src/Makefile.am
===================================================================
RCS file: /cvs/cairo/roadster/src/Makefile.am,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile.am
--- src/Makefile.am	8 Mar 2005 18:40:50 -0000	1.12
+++ src/Makefile.am	12 Mar 2005 04:23:05 -0000
@@ -7,8 +7,7 @@ INCLUDES= \
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" \
 	-I. \
-	$(GNOME_CFLAGS) \
-	$(CAIRO_CFLAGS) \
+	$(ROADSTER_CFLAGS) \
 	$(LIBSVG_CFLAGS) \
 	$(MYSQL_CFLAGS) \
 	$(GPSD_CFLAGS) \
@@ -50,8 +49,7 @@ roadster_SOURCES = \
 	prefs.c
 
 roadster_LDADD = \
-	$(GNOME_LIBS) \
-	$(CAIRO_LIBS) \
+	$(ROADSTER_LIBS) \
 	$(LIBSVG_LIBS) \
 	$(MYSQL_LIBS) \
 	$(GPSD_LIBS) \