gnome-desktop r5206 - trunk

[vuntz svn gnome org]

Author: vuntz
Date: Mon Sep  1 21:46:49 2008
New Revision: 5206
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5206&view=rev

Log:
2008-09-01  Vincent Untz  <vuntz gnome org>

	* configure.in: fix compilation when we don't have Xorg .pc files
	Fix bug #549182


Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Sep  1 21:46:49 2008
@@ -76,6 +76,7 @@
 GCONF_REQUIRED=2.0.0
 LIBGNOMEUI_REQUIRED=2.6.0
 STARTUP_NOTIFICATION_REQUIRED=0.5
+XRANDR_REQUIRED=1.2
 
 AC_SUBST(LIBXML_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
@@ -84,6 +85,7 @@
 AC_SUBST(GCONF_REQUIRED)
 AC_SUBST(LIBGNOMEUI_REQUIRED)
 AC_SUBST(STARTUP_NOTIFICATION_REQUIRED)
+AC_SUBST(XRANDR_REQUIRED)
 
 if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_REQUIRED libstartup-notification-1.0; then
   echo "Building with libstartup-notification"
@@ -101,14 +103,14 @@
 
 dnl we need x11 for GnomeBG
 
-PKG_CHECK_MODULES(XLIB, x11 xrandr >= 1.2,
+PKG_CHECK_MODULES(XLIB, x11 xrandr >= $XRANDR_REQUIRED,
     X11_PACKAGE=x11,
     [X11_PACKAGE=
      AC_PATH_XTRA
      if test "x$no_x" = xyes; then
        AC_MSG_ERROR("no (requires X development libraries)")
      else
-       XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+       XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXrandr $X_EXTRA_LIBS"
        XLIB_CFLAGS=$X_CFLAGS
      fi])
 AC_SUBST(X11_PACKAGE)