[gtk+] Don't build gtk-launch when gio-unix is not available
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Don't build gtk-launch when gio-unix is not available
- Date: Sat, 2 Feb 2013 04:07:26 +0000 (UTC)
commit 9a1235bf0dbdb1701779bec0ccae043cc4243ce5
Author: Erik van Pienbroek <epienbro fedoraproject org>
Date: Sun Jan 27 15:14:35 2013 +0100
Don't build gtk-launch when gio-unix is not available
https://bugzilla.gnome.org/show_bug.cgi?id=682824
configure.ac | 1 +
gtk/Makefile.am | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 121a490..5461828 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1238,6 +1238,7 @@ if test "$have_gio_unix" = "yes"; then
else
GDK_GIO_PACKAGE=gio-2.0
fi
+AM_CONDITIONAL(HAVE_GIO_UNIX, test "$have_gio_unix" = "yes")
# Check for Pango flags
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e476706..973f3c8 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1306,9 +1306,7 @@ endif
#
# Installed tools
#
-bin_PROGRAMS = \
- gtk-query-immodules-3.0 \
- gtk-launch
+bin_PROGRAMS = gtk-query-immodules-3.0
if BUILD_ICON_CACHE
bin_PROGRAMS += gtk-update-icon-cache
@@ -1355,8 +1353,11 @@ gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
gtk_update_icon_cache_SOURCES = updateiconcache.c
endif
+if HAVE_GIO_UNIX
+bin_PROGRAMS += gtk-launch
gtk_launch_LDADD = $(LDADDS)
gtk_launch_SOURCES = gtk-launch.c
+endif
.PHONY: files test test-debug
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]