[Spice-devel] [spice-gtk] Fix setting of SPICE_{GLIB, GTK}_REQUIRES
Christophe Fergeau
cfergeau at redhat.com
Fri Apr 12 02:38:04 PDT 2013
Because of a typo (REQUIRED vs REQUIRES), these variables only
contained the last require that was set rather than a concatenation
of all the needed libraries.
---
configure.ac | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index ae83f9d..8ab5b6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,18 +95,18 @@ SPICE_GTK_REQUIRES=""
PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7)
AC_SUBST(PIXMAN_CFLAGS)
AC_SUBST(PIXMAN_LIBS)
-SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRED} pixman-1 >= 0.17.7"
+SPICE_GLIB_REQUIRES="${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_GLIB_REQUIRES="${SPICE_GLIB_REQUIRED} celt051 >= 0.5.1.1"
+SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} celt051 >= 0.5.1.1"
PKG_CHECK_MODULES(SSL, openssl)
AC_SUBST(SSL_CFLAGS)
AC_SUBST(SSL_LIBS)
-SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRED} openssl"
+SPICE_GLIB_REQUIRES="${SPICE_GLIB_REQUIRES} openssl"
dnl Cyrus SASL
AC_ARG_WITH([sasl],
@@ -189,7 +189,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="${SPICE_GLIB_REQUIRED} gtk+-$GTK_API_VERSION >= $GTK_REQUIRED"
+SPICE_GTK_REQUIRES="${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?])])
--
1.8.1.4
More information about the Spice-devel
mailing list