[Xfce4-commits] <xfdesktop:master> Add GIO to the list of dependencies.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 54aff87c5587b870d06c767af36fd53b281a5333 (commit)
       from 5d5b553cd6a26b4776a9632f2f278201991d8e9b (commit)

commit 54aff87c5587b870d06c767af36fd53b281a5333
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sun Oct 17 14:33:55 2010 +0200

    Add GIO to the list of dependencies.

 configure.ac.in |   10 ++++++++++
 src/Makefile.am |   19 ++++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 5e1c9af..309e09a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -65,7 +65,17 @@ dnl Check for X11 installed
 XDT_CHECK_LIBX11_REQUIRE
 XDT_CHECK_LIBSM
 
+dnl Check for dbus-binding-tool
+AC_ARG_VAR([DBUS_BINDING_TOOL], [Tool to generate C bindings from XML D-Bus interface definitions])
+AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
+if test x"$DBUS_BINDING_TOOL" = x"no"; then
+  AC_MSG_ERROR([could not find dbus-binding-tool in \$PATH. You can run
+  ./configure DBUS_BINDING_TOOL=/path/to/dbus-binding-tool to define 
+  a custom location for it.])
+fi
+
 dnl required
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [glib_minimum_version])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [glib_minimum_version])
diff --git a/src/Makefile.am b/src/Makefile.am
index 85ee55b..f408e35 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,14 +62,16 @@ xfdesktop_CFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DXFCEMODDIR=\"$(libdir)/xfce4/modules\" \
-	$(LIBX11_CFLAGS)	\
+        $(GIO_CFLAGS) \
+        $(GLIB_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
+        $(GTK_CFLAGS) \
+	$(LIBX11_CFLAGS) \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
 	$(LIBXFCE4SMCLIENT_PRIVATE_CFLAGS) \
 	$(LIBWNCK_CFLAGS) \
-	$(XFCONF_CFLAGS) \
-	$(GARCON_CFLAGS)
+	$(XFCONF_CFLAGS)
 
 xfdesktop_LDFLAGS = \
 	-export-dynamic
@@ -77,17 +79,20 @@ xfdesktop_LDFLAGS = \
 # cygwin link order requires this split
 xfdesktop_LDADD = $(top_builddir)/common/libxfdesktop.la
 xfdesktop_LDADD += \
+        $(GIO_LIBS) \
+        $(GLIB_LIBS) \
+	$(GTHREAD_LIBS) \
+        $(GTK_LIBS) \
 	$(LIBX11_LDFLAGS) \
 	$(LIBX11_LIBS) \
-	$(GTHREAD_LIBS) \
 	$(LIBXFCE4UTIL_LIBS) \
 	$(LIBXFCE4UI_LIBS) \
 	$(LIBXFCE4SMCLIENT_PRIVATE_LIBS) \
 	$(LIBWNCK_LIBS) \
-	$(XFCONF_LIBS) \
-	$(GARCON_LIBS)
+	$(XFCONF_LIBS)
 
 if BUILD_DESKTOP_MENU
+
 xfdesktop_SOURCES += $(desktop_menu_sources)
 
 xfdesktop_CFLAGS += \
@@ -95,6 +100,7 @@ xfdesktop_CFLAGS += \
 
 xfdesktop_LDADD += \
 	$(GARCON_LIBS)
+
 endif
 
 if ENABLE_DESKTOP_ICONS
@@ -108,7 +114,6 @@ xfdesktop_CFLAGS += \
 xfdesktop_LDADD += \
 	$(LIBEXO_LIBS)
 
-
 if ENABLE_FILE_ICONS
 
 xfdesktop_SOURCES += $(desktop_file_icon_sources)