diff -up gnome-panel-2.31.2/configure.in.libs gnome-panel-2.31.2/configure.in
--- gnome-panel-2.31.2/configure.in.libs	2010-05-26 14:17:31.000000000 -0400
+++ gnome-panel-2.31.2/configure.in	2010-05-28 01:06:01.347433767 -0400
@@ -72,7 +72,7 @@ dnl pkg-config dependency checks
 
 PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0)
 
-PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk)
+PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk dbus-glib-1 dbus-1)
 AC_SUBST(PANEL_CFLAGS)
 AC_SUBST(PANEL_LIBS)
 
@@ -256,16 +256,17 @@ PKG_CHECK_MODULES(X, x11 xau, :, [
   X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS"
 ])
 
-AC_SUBST(X_LIBS)
-
 dnl X RANDR extension
 
-if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
-	AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
-	have_randr=yes
-else
-	have_randr=no
-fi
+PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, [
+  AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
+  have_randr=yes
+  X_LIBS="$X_LIBS $XRANDR_LIBS"
+], [
+  have_randr=no
+])
+
+AC_SUBST(X_LIBS)
 
 dnl Modules dir
 AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules")
diff -up gnome-panel-2.31.2/gnome-panel/Makefile.am.libs gnome-panel-2.31.2/gnome-panel/Makefile.am
--- gnome-panel-2.31.2/gnome-panel/Makefile.am.libs	2010-05-26 11:13:52.000000000 -0400
+++ gnome-panel-2.31.2/gnome-panel/Makefile.am	2010-05-28 01:01:38.674674304 -0400
@@ -152,6 +152,7 @@ gnome_panel_LDADD =		\
 	$(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private.la	\
 	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la			\
 	$(PANEL_LIBS)									\
+	-lm 	\
 	$(X_LIBS)
 
 gnome_panel_LDFLAGS = -export-dynamic
@@ -168,6 +169,7 @@ gnome_desktop_item_edit_LDFLAGS = -expor
 gnome_desktop_item_edit_LDADD = 	\
 	$(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \
 	$(PANEL_LIBS)			\
+	-lm	\
 	$(X_LIBS)
 
 uidir = $(datadir)/gnome-panel/ui