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

configure.ac: Pull gio-unix dependency for all unix builds

Browse Source 
It's now needed by gtk-launch, so it's just the case to enable it for all the
builds except the win32 one, instead of adding it for every unix backend.

https://bugzilla.gnome.org/show_bug.cgi?id=744086
This commit is contained in:
Marco Trevisan (Treviño) 2015-05-07 11:49:54 +02:00
parent 92ecb117df
commit 8084ebda14
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -358,9 +358,6 @@ if test "$enable_x11_backend" = "yes"; then
# backend names are identical. # backend names are identical.
cairo_backends="$cairo_backends cairo-xlib" cairo_backends="$cairo_backends cairo-xlib"
GDK_BACKENDS="$GDK_BACKENDS x11" GDK_BACKENDS="$GDK_BACKENDS x11"
# Pull in gio-unix for GDesktopAppInfo usage, see at least
# gdkapplaunchcontext-x11.c
have_gio_unix=yes
backend_immodules="$backend_immodules,xim" backend_immodules="$backend_immodules,xim"
GDK_WINDOWING="$GDK_WINDOWING GDK_WINDOWING="$GDK_WINDOWING
#define GDK_WINDOWING_X11" #define GDK_WINDOWING_X11"
@ -394,9 +391,6 @@ if test "x$enable_quartz_backend" = xyes; then
if test "x$quartz_relocation" = xyes; then if test "x$quartz_relocation" = xyes; then
AC_DEFINE([QUARTZ_RELOCATION], [1], [Use NSBundle functions to determine load paths for libraries, translations, etc.]) AC_DEFINE([QUARTZ_RELOCATION], [1], [Use NSBundle functions to determine load paths for libraries, translations, etc.])
fi fi
# Pull in gio-unix for GDesktopAppInfo usage, see at least
# gdkapplaunchcontext-x11.c
have_gio_unix=yes
else else
AM_CONDITIONAL(USE_QUARTZ, false) AM_CONDITIONAL(USE_QUARTZ, false)
fi fi
@ -411,9 +405,6 @@ if test "x$enable_broadway_backend" = xyes; then
GDK_BACKENDS="$GDK_BACKENDS broadway" GDK_BACKENDS="$GDK_BACKENDS broadway"
cairo_backends="$cairo_backends cairo" cairo_backends="$cairo_backends cairo"
backend_immodules="$backend_immodules,broadway" backend_immodules="$backend_immodules,broadway"
if test "$os_win32" != "yes"; then
have_gio_unix=yes
fi
GDK_WINDOWING="$GDK_WINDOWING GDK_WINDOWING="$GDK_WINDOWING
#define GDK_WINDOWING_BROADWAY" #define GDK_WINDOWING_BROADWAY"
GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lz" GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lz"
@ -441,7 +432,6 @@ if test "$enable_wayland_backend" = "yes"; then
# For the cairo image backend # For the cairo image backend
cairo_backends="$cairo_backends cairo" cairo_backends="$cairo_backends cairo"
GDK_BACKENDS="$GDK_BACKENDS wayland" GDK_BACKENDS="$GDK_BACKENDS wayland"
have_gio_unix=yes
GDK_WINDOWING="$GDK_WINDOWING GDK_WINDOWING="$GDK_WINDOWING
#define GDK_WINDOWING_WAYLAND" #define GDK_WINDOWING_WAYLAND"
WAYLAND_PACKAGES="$WAYLAND_DEPENDENCIES" WAYLAND_PACKAGES="$WAYLAND_DEPENDENCIES"
@ -473,7 +463,6 @@ if test "$enable_mir_backend" = "yes"; then
GDK_WINDOWING="$GDK_WINDOWING GDK_WINDOWING="$GDK_WINDOWING
#define GDK_WINDOWING_MIR" #define GDK_WINDOWING_MIR"
MIR_PACKAGES="$MIR_DEPENDENCIES" MIR_PACKAGES="$MIR_DEPENDENCIES"
have_gio_unix=yes
AM_CONDITIONAL(USE_MIR, true) AM_CONDITIONAL(USE_MIR, true)
else else
@ -1273,6 +1262,11 @@ else
fi fi
# Check for gio-unix # Check for gio-unix
if test "$os_win32" != "yes"; then
# Pull in gio-unix for gtk-launch usage, see at least
# gtk-launch.c
have_gio_unix=yes
fi
if test "$have_gio_unix" = "yes"; then if test "$have_gio_unix" = "yes"; then
GDK_GIO_PACKAGE="gio-unix-2.0 >= glib_required_version" GDK_GIO_PACKAGE="gio-unix-2.0 >= glib_required_version"
AC_DEFINE([HAVE_GIO_UNIX], [1], AC_DEFINE([HAVE_GIO_UNIX], [1],