callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Don't build gtk-launch when gio-unix is not available"

Browse Source 
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 9a1235bf0d.

https://bugzilla.gnome.org/show_bug.cgi?id=682824
This commit is contained in:
Hib Eris 2013-04-30 16:17:43 +02:00
parent 11c9c70673
commit 4dcd49352b
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -1242,7 +1242,6 @@ if test "$have_gio_unix" = "yes"; then
else else
GDK_GIO_PACKAGE=gio-2.0 GDK_GIO_PACKAGE=gio-2.0
fi fi
AM_CONDITIONAL(HAVE_GIO_UNIX, test "$have_gio_unix" = "yes")
# Check for Pango flags # Check for Pango flags

7
gtk/Makefile.am
View File

@ -1356,7 +1356,9 @@ endif
# #
# Installed tools # Installed tools
# #
bin_PROGRAMS = gtk-query-immodules-3.0 bin_PROGRAMS = \
gtk-query-immodules-3.0 \
gtk-launch
if BUILD_ICON_CACHE if BUILD_ICON_CACHE
bin_PROGRAMS += gtk-update-icon-cache bin_PROGRAMS += gtk-update-icon-cache
@ -1403,11 +1405,8 @@ gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
gtk_update_icon_cache_SOURCES = updateiconcache.c gtk_update_icon_cache_SOURCES = updateiconcache.c
endif endif
if HAVE_GIO_UNIX
bin_PROGRAMS += gtk-launch
gtk_launch_LDADD = $(LDADDS) gtk_launch_LDADD = $(LDADDS)
gtk_launch_SOURCES = gtk-launch.c gtk_launch_SOURCES = gtk-launch.c
endif
noinst_PROGRAMS = extract-strings noinst_PROGRAMS = extract-strings