gnome-desktop r4958 - in trunk: . libgnome-desktop

[vuntz svn gnome org]

Author: vuntz
Date: Mon Jan  7 22:59:58 2008
New Revision: 4958
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=4958&view=rev

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

	* configure.in: pkg-config (and old checks) for X11
	* libgnome-desktop/Makefile.am: add X11 libs and cflags
	Fix bug #504635


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libgnome-desktop/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jan  7 22:59:58 2008
@@ -101,6 +101,22 @@
 
 AC_SUBST(STARTUP_NOTIFICATION_PACKAGE)
 
+dnl we need x11 for GnomeBG
+
+PKG_CHECK_MODULES(XLIB, x11,
+    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_CFLAGS=$X_CFLAGS
+     fi])
+AC_SUBST(X11_PACKAGE)
+AC_SUBST(XLIB_CFLAGS)
+AC_SUBST(XLIB_LIBS)
+
 dnl pkg-config dependency checks
 
 PKG_CHECK_MODULES(GNOME_DESKTOP, libxml-2.0 >= $LIBXML_REQUIRED gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gconf-2.0 >= $GCONF_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED $STARTUP_NOTIFICATION_PACKAGE)

Modified: trunk/libgnome-desktop/Makefile.am
==============================================================================
--- trunk/libgnome-desktop/Makefile.am	(original)
+++ trunk/libgnome-desktop/Makefile.am	Mon Jan  7 22:59:58 2008
@@ -9,6 +9,7 @@
 	-DDATADIR=\""$(pkgdatadir)"\"				\
 	$(WARN_CFLAGS)						\
 	$(DISABLE_DEPRECATED)					\
+	$(XLIB_CFLAGS)						\
 	$(GNOME_DESKTOP_CFLAGS)
 
 lib_LTLIBRARIES = libgnome-desktop-2.la
@@ -21,7 +22,8 @@
 	gnome-hint.c		\
 	gnome-bg.c
 
-libgnome_desktop_2_la_LIBADD = \
+libgnome_desktop_2_la_LIBADD =	\
+	$(XLIB_LIBS)		\
 	$(GNOME_DESKTOP_LIBS)
 
 libgnome_desktop_2_la_LDFLAGS = \
@@ -33,6 +35,7 @@
 
 test_ditem_LDADD = \
 	libgnome-desktop-2.la		\
+	$(XLIB_LIBS)			\
 	$(GNOME_DESKTOP_LIBS)
 
 test_hint_SOURCES = \
@@ -40,12 +43,14 @@
 
 test_hint_LDADD = \
         libgnome-desktop-2.la           \
+	$(XLIB_LIBS)			\
         $(GNOME_DESKTOP_LIBS)
 
 test_ditem_edit_SOURCES = test-ditem-edit.c
 
 test_ditem_edit_LDADD =		\
 	libgnome-desktop-2.la	\
+	$(XLIB_LIBS)		\
 	$(GNOME_DESKTOP_LIBS)
 
 pkgconfigdir = $(libdir)/pkgconfig