projects / packages / spice-space.git / blame
| Commit | Line | Data |
|---|---|---|
| 8a86771e JB |
1 | --- spice-0.8.1/configure.ac.orig 2011-04-20 10:48:33.000000000 +0200 |
| 2 | +++ spice-0.8.1/configure.ac 2011-07-16 12:18:43.082766454 +0200 | |
| 3 | @@ -138,7 +138,7 @@ | |
| 4 | ) | |
| 5 | AC_SUBST(LIBRT) | |
| 6 | ||
| 7 | -SPICE_NONPKGCONFIG_LIBS+=" -pthread $LIBM $LIBRT" | |
| 8 | +SPICE_NONPKGCONFIG_LIBS="$SPICE_NONPKGCONFIG_LIBS -pthread $LIBM $LIBRT" | |
| 9 | ||
| 10 | dnl The client needs a yield function | |
| 11 | AC_MSG_CHECKING(for posix yield function) | |
| 12 | @@ -150,7 +150,7 @@ | |
| 13 | [$yield_func()], | |
| 14 | [posix_yield_func="$yield_func" | |
| 15 | break]) | |
| 16 | - CPPFLAGS="spice_save_CPPFLAGS" | |
| 17 | + CPPFLAGS="$spice_save_CPPFLAGS" | |
| 18 | done | |
| 19 | if test x"$posix_yield_func" = xnone; then | |
| 20 | AC_MSG_ERROR([No posix yield function found]) | |
| 21 | @@ -167,13 +167,13 @@ | |
| 22 | [ | |
| 23 | AC_SUBST(CEGUI06_CFLAGS) | |
| 24 | AC_SUBST(CEGUI06_LIBS) | |
| 25 | - CEGUI06_CFLAGS+="-DUSE_GUI" | |
| 26 | + CEGUI06_CFLAGS="$CEGUI06_CFLAGS -DUSE_GUI" | |
| 27 | ], | |
| 28 | [ | |
| 29 | PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.6.0 CEGUI < 0.7.0) | |
| 30 | AC_SUBST(CEGUI_CFLAGS) | |
| 31 | AC_SUBST(CEGUI_LIBS) | |
| 32 | - CEGUI_CFLAGS+="-DUSE_GUI" | |
| 33 | + CEGUI_CFLAGS="$CEGUI_CFLAGS -DUSE_GUI" | |
| 34 | ]) | |
| 35 | fi | |
| 36 | ||
| 37 | @@ -181,7 +181,7 @@ | |
| 38 | PKG_CHECK_MODULES(SLIRP, slirp) | |
| 39 | AC_SUBST(SLIRP_CFLAGS) | |
| 40 | AC_SUBST(SLIRP_LIBS) | |
| 41 | - SPICE_REQUIRES+=" slirp" | |
| 42 | + SPICE_REQUIRES="$SPICE_REQUIRES slirp" | |
| 43 | AC_DEFINE([HAVE_SLIRP], [], [Define if we have slirp]) | |
| 44 | fi | |
| 45 | ||
| 46 | @@ -197,13 +197,13 @@ | |
| 47 | PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7) | |
| 48 | AC_SUBST(PIXMAN_CFLAGS) | |
| 49 | AC_SUBST(PIXMAN_LIBS) | |
| 50 | -SPICE_REQUIRES+=" pixman-1 >= 0.17.7" | |
| 51 | +SPICE_REQUIRES="$SPICE_REQUIRES pixman-1 >= 0.17.7" | |
| 52 | ||
| 53 | PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1) | |
| 54 | AC_SUBST(CELT051_CFLAGS) | |
| 55 | AC_SUBST(CELT051_LIBS) | |
| 56 | AC_SUBST(CELT051_LIBDIR) | |
| 57 | -SPICE_REQUIRES+=" celt051 >= 0.5.1.1" | |
| 58 | +SPICE_REQUIRES="$SPICE_REQUIRES celt051 >= 0.5.1.1" | |
| 59 | ||
| 60 | PKG_CHECK_MODULES(ALSA, alsa) | |
| 61 | AC_SUBST(ALSA_CFLAGS) | |
| 62 | @@ -212,14 +212,14 @@ | |
| 63 | PKG_CHECK_MODULES(SSL, openssl) | |
| 64 | AC_SUBST(SSL_CFLAGS) | |
| 65 | AC_SUBST(SSL_LIBS) | |
| 66 | -SPICE_REQUIRES+=" openssl" | |
| 67 | +SPICE_REQUIRES="$SPICE_REQUIRES openssl" | |
| 68 | ||
| 69 | # These are commented out because the gl libraries on RHEL 5 do not have pkgconfig files | |
| 70 | # | |
| 71 | # PKG_CHECK_MODULES(GL, gl glu) | |
| 72 | # AC_SUBST(GL_CFLAGS) | |
| 73 | # AC_SUBST(GL_LIBS) | |
| 74 | -# SPICE_REQUIRES+=" gl glu" | |
| 75 | +# SPICE_REQUIRES="$SPICE_REQUIRES gl glu" | |
| 76 | ||
| 77 | if test "x$have_opengl" = "xyes"; then | |
| 78 | AC_CHECK_LIB(GL, glBlendFunc, GL_LIBS="$GL_LIBS -lGL", have_opengl=no) | |
| 79 | @@ -233,7 +233,7 @@ | |
| 80 | ||
| 81 | AC_SUBST(GL_CFLAGS) | |
| 82 | AC_SUBST(GL_LIBS) | |
| 83 | -SPICE_NONPKGCONFIG_LIBS+=" $GL_LIBS" | |
| 84 | +SPICE_NONPKGCONFIG_LIBS="$SPICE_NONPKGCONFIG_LIBS $GL_LIBS" | |
| 85 | ||
| 86 | PKG_CHECK_MODULES(XRANDR, xrandr) | |
| 87 | PKG_CHECK_MODULES(XFIXES, xfixes) |