diff options
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | spice-client-glib-2.0.pc.in | 2 | ||||
| -rw-r--r-- | spice-client-gtk-2.0.pc.in | 2 | ||||
| -rw-r--r-- | spice-client-gtk-3.0.pc.in | 2 |
4 files changed, 11 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index e1ec8a2..8c2802b 100644 --- a/configure.ac +++ b/configure.ac @@ -64,23 +64,24 @@ dnl Chek optional features PKG_CHECK_MODULES(PROTOCOL, spice-protocol >= 0.6.3) AC_SUBST(PROTOCOL_CFLAGS) -SPICE_REQUIRES="" +SPICE_GLIB_REQUIRES="" +SPICE_GTK_REQUIRES="" PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7) AC_SUBST(PIXMAN_CFLAGS) AC_SUBST(PIXMAN_LIBS) -SPICE_REQUIRES+=" pixman-1 >= 0.17.7" +SPICE_GLIB_REQUIRES+=" pixman-1 >= 0.17.7" PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1) AC_SUBST(CELT051_CFLAGS) AC_SUBST(CELT051_LIBS) AC_SUBST(CELT051_LIBDIR) -SPICE_REQUIRES+=" celt051 >= 0.5.1.1" +SPICE_GLIB_REQUIRES+=" celt051 >= 0.5.1.1" PKG_CHECK_MODULES(SSL, openssl) AC_SUBST(SSL_CFLAGS) AC_SUBST(SSL_LIBS) -SPICE_REQUIRES+=" openssl" +SPICE_GLIB_REQUIRES+=" openssl" dnl Cyrus SASL AC_ARG_WITH([sasl], @@ -163,6 +164,7 @@ AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"]) PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) +SPICE_GTK_REQUIRES+=" gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" PKG_CHECK_EXISTS([gtk+-x11-$with_gtk], [have_x11=yes], [have_x11=no]) AS_IF([test "x$have_x11" = "xyes"], [AC_DEFINE([HAVE_X11], 1, [Have x11?])]) @@ -485,7 +487,8 @@ AC_SUBST(SPICE_GLIB_CFLAGS) AC_SUBST(SPICE_GTK_CFLAGS) AC_SUBST(SPICE_COMMON_SRCDIR) -AC_SUBST(SPICE_REQUIRES) +AC_SUBST(SPICE_GLIB_REQUIRES) +AC_SUBST(SPICE_GTK_REQUIRES) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) diff --git a/spice-client-glib-2.0.pc.in b/spice-client-glib-2.0.pc.in index 494b397..738862e 100644 --- a/spice-client-glib-2.0.pc.in +++ b/spice-client-glib-2.0.pc.in @@ -7,6 +7,6 @@ Name: spice-client-glib-2.0 Description: SPICE Client GLib 2.0 library Version: @VERSION@ -Requires: @SPICE_REQUIRES@ spice-protocol +Requires: @SPICE_GLIB_REQUIRES@ spice-protocol Libs: -L${libdir} -lspice-client-glib-2.0 Cflags: -I${includedir}/spice-client-glib-2.0 diff --git a/spice-client-gtk-2.0.pc.in b/spice-client-gtk-2.0.pc.in index 2221af3..a5b96e2 100644 --- a/spice-client-gtk-2.0.pc.in +++ b/spice-client-gtk-2.0.pc.in @@ -7,6 +7,6 @@ Name: spice-client-gtk-2.0 Description: SPICE Client Gtk 2.0 library Version: @VERSION@ -Requires: @SPICE_REQUIRES@ spice-protocol spice-client-glib-2.0 +Requires: @SPICE_GTK_REQUIRES@ spice-client-glib-2.0 Libs: -L${libdir} -lspice-client-gtk-2.0 Cflags: -I${includedir}/spice-client-gtk-2.0 diff --git a/spice-client-gtk-3.0.pc.in b/spice-client-gtk-3.0.pc.in index ebef093..7bad0c8 100644 --- a/spice-client-gtk-3.0.pc.in +++ b/spice-client-gtk-3.0.pc.in @@ -7,6 +7,6 @@ Name: spice-client-gtk-3.0 Description: SPICE Client Gtk 3.0 library Version: @VERSION@ -Requires: @SPICE_REQUIRES@ spice-protocol spice-client-glib-2.0 +Requires: @SPICE_GTK_REQUIRES@ spice-client-glib-2.0 Libs: -L${libdir} -lspice-client-gtk-3.0 Cflags: -I${includedir}/spice-client-gtk-3.0 |