spice-sh.patch

   1 --- spice-0.10.0/configure.ac.orig      2011-11-10 16:02:06.000000000 +0100
   2 +++ spice-0.10.0/configure.ac   2011-11-13 08:00:42.323766723 +0100
   3 @@ -145,9 +145,9 @@
   4  AC_SUBST(LIBRT)
   5
   6  if test "$red_target" = "windows"; then
   7 -       SPICE_NONPKGCONFIG_LIBS+=" -lpthreadGC2 -lversion -lmsimg32 $LIBM"
   8 +       SPICE_NONPKGCONFIG_LIBS="$SPICE_NONPKGCONFIG_LIBS -lpthreadGC2 -lversion -lmsimg32 $LIBM"
   9  else
  10 -       SPICE_NONPKGCONFIG_LIBS+=" -pthread $LIBM $LIBRT"
  11 +       SPICE_NONPKGCONFIG_LIBS="$SPICE_NONPKGCONFIG_LIBS -pthread $LIBM $LIBRT"
  12  fi
  13
  14  dnl The client needs a yield function
  15 @@ -191,7 +191,7 @@
  16         PKG_CHECK_MODULES(SLIRP, slirp)
  17         AC_SUBST(SLIRP_CFLAGS)
  18         AC_SUBST(SLIRP_LIBS)
  19 -       SPICE_REQUIRES+=" slirp"
  20 +       SPICE_REQUIRES="$SPICE_REQUIRES slirp"
  21         AC_DEFINE([HAVE_SLIRP], [], [Define if we have slirp])
  22  fi
  23
  24 @@ -207,13 +207,13 @@
  25  PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7)
  26  AC_SUBST(PIXMAN_CFLAGS)
  27  AC_SUBST(PIXMAN_LIBS)
  28 -SPICE_REQUIRES+=" pixman-1 >= 0.17.7"
  29 +SPICE_REQUIRES="$SPICE_REQUIRES pixman-1 >= 0.17.7"
  30
  31  PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1)
  32  AC_SUBST(CELT051_CFLAGS)
  33  AC_SUBST(CELT051_LIBS)
  34  AC_SUBST(CELT051_LIBDIR)
  35 -SPICE_REQUIRES+=" celt051 >= 0.5.1.1"
  36 +SPICE_REQUIRES="$SPICE_REQUIRES celt051 >= 0.5.1.1"
  37
  38  if test ! -e client/generated_marshallers.cpp; then
  39  AC_MSG_CHECKING([for pyparsing python module])
  40 @@ -234,14 +234,14 @@
  41  PKG_CHECK_MODULES(SSL, openssl)
  42  AC_SUBST(SSL_CFLAGS)
  43  AC_SUBST(SSL_LIBS)
  44 -SPICE_REQUIRES+=" openssl"
  45 +SPICE_REQUIRES="$SPICE_REQUIRES openssl"
  46
  47  # These are commented out because the gl libraries on RHEL 5 do not have pkgconfig files
  48  #
  49  # PKG_CHECK_MODULES(GL, gl glu)
  50  # AC_SUBST(GL_CFLAGS)
  51  # AC_SUBST(GL_LIBS)
  52 -# SPICE_REQUIRES+=" gl glu"
  53 +# SPICE_REQUIRES="$SPICE_REQUIRES gl glu"
  54
  55  if test "x$enable_opengl" = "xyes"; then
  56     AC_CHECK_LIB(GL, glBlendFunc, GL_LIBS="$GL_LIBS -lGL", enable_opengl=no)
  57 @@ -256,7 +256,7 @@
  58
  59  AC_SUBST(GL_CFLAGS)
  60  AC_SUBST(GL_LIBS)
  61 -SPICE_NONPKGCONFIG_LIBS+=" $GL_LIBS"
  62 +SPICE_NONPKGCONFIG_LIBS="$SPICE_NONPKGCONFIG_LIBS $GL_LIBS"
  63
  64  if test "$red_target" = "x11"; then
  65         PKG_CHECK_MODULES(XRANDR, xrandr)