diff options
| author | Hib Eris <hib@hiberis.nl> | 2013-04-30 16:17:43 +0200 |
|---|---|---|
| committer | Hib Eris <hib@hiberis.nl> | 2013-05-01 07:39:36 +0200 |
| commit | 4dcd49352b61d91796a2628666a0c9dfc5fdb2fd (patch) | |
| tree | 973a0bd2cf4b8d35038bd92e8160405a2785112d | |
| parent | 11c9c706730fd5b912b0288c2f8b06e2a89db8f5 (diff) | |
| download | gtk+-4dcd49352b61d91796a2628666a0c9dfc5fdb2fd.tar.gz | |
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
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | gtk/Makefile.am | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 882715049f..4a66b5051b 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 6e7bbf1ae7..bfb0983ac6 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1356,7 +1356,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 @@ -1403,11 +1405,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 noinst_PROGRAMS = extract-strings |