]> Pileus Git - ~andy/gtk/commitdiff
Don't build gtk-launch when gio-unix is not available
authorErik van Pienbroek <epienbro@fedoraproject.org>
Sun, 27 Jan 2013 14:14:35 +0000 (15:14 +0100)
committerMatthias Clasen <mclasen@redhat.com>
Sat, 2 Feb 2013 04:08:03 +0000 (23:08 -0500)
https://bugzilla.gnome.org/show_bug.cgi?id=682824

configure.ac
gtk/Makefile.am

index 121a490257449b04eaba68ab8b6eb794bf21d3da..5461828b6cc287a2a7c64c911287ce42134d1c8b 100644 (file)
@@ -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
 
index e476706709a1c8ff687b9197319a56c44f6dc048..973f3c8994da1470e71f8e55c8f6a49d44ecb050 100644 (file)
@@ -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