[gtk+/gtk-3-8] Revert "Don't build gtk-launch when gio-unix is not available"



commit 4380ce84958d78d912180353fa939feec8f30edc
Author: Hib Eris <hib hiberis nl>
Date:   Tue Apr 30 16:17:43 2013 +0200

    Revert "Don't build gtk-launch when gio-unix is not available"
    
    The gtk-launch tool can be build without gio-unix (although it
    will not really do much without an alternative implementation for
    g_desktop_app_info).
    
    So there is no need to not build gtk-launch anymore.
    
    This reverts commit 9a1235bf0dbdb1701779bec0ccae043cc4243ce5.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=682824

 configure.ac    |    1 -
 gtk/Makefile.am |    7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 181fe23..ec5b2c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1242,7 +1242,6 @@ 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 e164c90..90487fb 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1308,7 +1308,9 @@ endif
 #
 # Installed tools
 #
-bin_PROGRAMS = gtk-query-immodules-3.0
+bin_PROGRAMS = \
+       gtk-query-immodules-3.0 \
+       gtk-launch
 
 if BUILD_ICON_CACHE
 bin_PROGRAMS += gtk-update-icon-cache
@@ -1355,11 +1357,8 @@ 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]