[Xfce4-commits] [xfce/xfdesktop] 06/06: Fix build errors

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfdesktop.

commit d84f8bf2155728ff267bbf746f517ae971c0b37c
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Fri Mar 14 20:26:44 2014 +0300

    Fix build errors
    
    When some flags were passed xfdesktop failed to build because
    libexo wasn't being properly added.
---
 README          |    2 +-
 configure.ac.in |    4 +---
 src/Makefile.am |   14 +++++---------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/README b/README
index a502798..917a7cc 100644
--- a/README
+++ b/README
@@ -19,7 +19,7 @@ MINIMUM REQUIREMENTS
 * intltool 0.34
 * GTK+ 2.30.0
 * libxfce4util 4.10
-* libxfce4ui 4.10
+* libxfce4ui 4.11.1
 * libwnck 2.30
 * libexo 0.6
 * xfconf 4.10
diff --git a/configure.ac.in b/configure.ac.in
index 8c15fe7..14d7b0e 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -101,6 +101,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1],
                   [libxfce4ui_minimum_version])
 XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [wnck_minimum_version])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [xfconf_minimum_version])
+XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [exo_minimum_version])
 
 XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [glib_minimum_version], [gio-unix],
     [gio-unix, for special treatment of mount points on UNIX])
@@ -150,9 +151,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([THUNARX], [thunarx-2], [thunar_minimum_version],
     [thunarx],
     [Thunar's extension mechanism, to add external features to the desktop icon implementation])
 
-dnl LIBEXO is required if file icons are enabled
-XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [exo_minimum_version])
-
 
 AC_ARG_ENABLE([desktop-menu],
         AS_HELP_STRING([--disable-desktop-menu],
diff --git a/src/Makefile.am b/src/Makefile.am
index 42667a0..4b432ac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -83,7 +83,9 @@ xfdesktop_CFLAGS = \
 	$(LIBXFCE4UI_CFLAGS) \
 	$(LIBXFCE4SMCLIENT_PRIVATE_CFLAGS) \
 	$(LIBWNCK_CFLAGS) \
-	$(XFCONF_CFLAGS)
+	$(XFCONF_CFLAGS) \
+	-DEXO_API_SUBJECT_TO_CHANGE \
+	$(LIBEXO_CFLAGS)
 
 xfdesktop_LDFLAGS = \
 	-export-dynamic
@@ -103,7 +105,8 @@ xfdesktop_LDADD += \
 	$(LIBXFCE4UI_LIBS) \
 	$(LIBXFCE4SMCLIENT_PRIVATE_LIBS) \
 	$(LIBWNCK_LIBS) \
-	$(XFCONF_LIBS)
+	$(XFCONF_LIBS) \
+	$(LIBEXO_LIBS)
 
 if BUILD_DESKTOP_MENU
 
@@ -121,13 +124,6 @@ if ENABLE_DESKTOP_ICONS
 
 xfdesktop_SOURCES += $(desktop_icon_sources)
 
-xfdesktop_CFLAGS += \
-	-DEXO_API_SUBJECT_TO_CHANGE \
-	$(LIBEXO_CFLAGS)
-
-xfdesktop_LDADD += \
-	$(LIBEXO_LIBS)
-
 if ENABLE_FILE_ICONS
 
 xfdesktop_SOURCES += $(desktop_file_icon_sources)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.