Skip to content

Commit 80408ea

Browse files
committed
build: fix .pc Requires
1 parent 67cbd00 commit 80408ea

4 files changed

+11
-8
lines changed

configure.ac

+8-5
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,24 @@ dnl Chek optional features
6464
PKG_CHECK_MODULES(PROTOCOL, spice-protocol >= 0.6.3)
6565
AC_SUBST(PROTOCOL_CFLAGS)
6666

67-
SPICE_REQUIRES=""
67+
SPICE_GLIB_REQUIRES=""
68+
SPICE_GTK_REQUIRES=""
6869

6970
PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7)
7071
AC_SUBST(PIXMAN_CFLAGS)
7172
AC_SUBST(PIXMAN_LIBS)
72-
SPICE_REQUIRES+=" pixman-1 >= 0.17.7"
73+
SPICE_GLIB_REQUIRES+=" pixman-1 >= 0.17.7"
7374

7475
PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1)
7576
AC_SUBST(CELT051_CFLAGS)
7677
AC_SUBST(CELT051_LIBS)
7778
AC_SUBST(CELT051_LIBDIR)
78-
SPICE_REQUIRES+=" celt051 >= 0.5.1.1"
79+
SPICE_GLIB_REQUIRES+=" celt051 >= 0.5.1.1"
7980

8081
PKG_CHECK_MODULES(SSL, openssl)
8182
AC_SUBST(SSL_CFLAGS)
8283
AC_SUBST(SSL_LIBS)
83-
SPICE_REQUIRES+=" openssl"
84+
SPICE_GLIB_REQUIRES+=" openssl"
8485

8586
dnl Cyrus SASL
8687
AC_ARG_WITH([sasl],
@@ -163,6 +164,7 @@ AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"])
163164
PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
164165
AC_SUBST(GTK_CFLAGS)
165166
AC_SUBST(GTK_LIBS)
167+
SPICE_GTK_REQUIRES+=" gtk+-$GTK_API_VERSION >= $GTK_REQUIRED"
166168

167169
PKG_CHECK_EXISTS([gtk+-x11-$with_gtk], [have_x11=yes], [have_x11=no])
168170
AS_IF([test "x$have_x11" = "xyes"], [AC_DEFINE([HAVE_X11], 1, [Have x11?])])
@@ -485,7 +487,8 @@ AC_SUBST(SPICE_GLIB_CFLAGS)
485487
AC_SUBST(SPICE_GTK_CFLAGS)
486488

487489
AC_SUBST(SPICE_COMMON_SRCDIR)
488-
AC_SUBST(SPICE_REQUIRES)
490+
AC_SUBST(SPICE_GLIB_REQUIRES)
491+
AC_SUBST(SPICE_GTK_REQUIRES)
489492

490493
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
491494

spice-client-glib-2.0.pc.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ Name: spice-client-glib-2.0
77
Description: SPICE Client GLib 2.0 library
88
Version: @VERSION@
99

10-
Requires: @SPICE_REQUIRES@ spice-protocol
10+
Requires: @SPICE_GLIB_REQUIRES@ spice-protocol
1111
Libs: -L${libdir} -lspice-client-glib-2.0
1212
Cflags: -I${includedir}/spice-client-glib-2.0

spice-client-gtk-2.0.pc.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ Name: spice-client-gtk-2.0
77
Description: SPICE Client Gtk 2.0 library
88
Version: @VERSION@
99

10-
Requires: @SPICE_REQUIRES@ spice-protocol spice-client-glib-2.0
10+
Requires: @SPICE_GTK_REQUIRES@ spice-client-glib-2.0
1111
Libs: -L${libdir} -lspice-client-gtk-2.0
1212
Cflags: -I${includedir}/spice-client-gtk-2.0

spice-client-gtk-3.0.pc.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ Name: spice-client-gtk-3.0
77
Description: SPICE Client Gtk 3.0 library
88
Version: @VERSION@
99

10-
Requires: @SPICE_REQUIRES@ spice-protocol spice-client-glib-2.0
10+
Requires: @SPICE_GTK_REQUIRES@ spice-client-glib-2.0
1111
Libs: -L${libdir} -lspice-client-gtk-3.0
1212
Cflags: -I${includedir}/spice-client-gtk-3.0

0 commit comments

Comments
 (0)