@@ -64,23 +64,24 @@ dnl Chek optional features
64
64
PKG_CHECK_MODULES(PROTOCOL, spice-protocol >= 0.6.3)
65
65
AC_SUBST ( PROTOCOL_CFLAGS )
66
66
67
- SPICE_REQUIRES=""
67
+ SPICE_GLIB_REQUIRES=""
68
+ SPICE_GTK_REQUIRES=""
68
69
69
70
PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7)
70
71
AC_SUBST ( PIXMAN_CFLAGS )
71
72
AC_SUBST ( PIXMAN_LIBS )
72
- SPICE_REQUIRES +=" pixman-1 >= 0.17.7"
73
+ SPICE_GLIB_REQUIRES +=" pixman-1 >= 0.17.7"
73
74
74
75
PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1)
75
76
AC_SUBST ( CELT051_CFLAGS )
76
77
AC_SUBST ( CELT051_LIBS )
77
78
AC_SUBST ( CELT051_LIBDIR )
78
- SPICE_REQUIRES +=" celt051 >= 0.5.1.1"
79
+ SPICE_GLIB_REQUIRES +=" celt051 >= 0.5.1.1"
79
80
80
81
PKG_CHECK_MODULES(SSL, openssl)
81
82
AC_SUBST ( SSL_CFLAGS )
82
83
AC_SUBST ( SSL_LIBS )
83
- SPICE_REQUIRES +=" openssl"
84
+ SPICE_GLIB_REQUIRES +=" openssl"
84
85
85
86
dnl Cyrus SASL
86
87
AC_ARG_WITH ( [ sasl] ,
@@ -163,6 +164,7 @@ AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"])
163
164
PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
164
165
AC_SUBST ( GTK_CFLAGS )
165
166
AC_SUBST ( GTK_LIBS )
167
+ SPICE_GTK_REQUIRES+=" gtk+-$GTK_API_VERSION >= $GTK_REQUIRED"
166
168
167
169
PKG_CHECK_EXISTS([ gtk+-x11-$with_gtk] , [ have_x11=yes] , [ have_x11=no] )
168
170
AS_IF ( [ test "x$have_x11" = "xyes"] , [ AC_DEFINE ( [ HAVE_X11] , 1 , [ Have x11?] ) ] )
@@ -485,7 +487,8 @@ AC_SUBST(SPICE_GLIB_CFLAGS)
485
487
AC_SUBST ( SPICE_GTK_CFLAGS )
486
488
487
489
AC_SUBST ( SPICE_COMMON_SRCDIR )
488
- AC_SUBST ( SPICE_REQUIRES )
490
+ AC_SUBST ( SPICE_GLIB_REQUIRES )
491
+ AC_SUBST ( SPICE_GTK_REQUIRES )
489
492
490
493
m4_ifdef ( [ AM_SILENT_RULES ] ,[ AM_SILENT_RULES ([ yes] )] )
491
494
0 commit comments