]>
Commit | Line | Data |
---|---|---|
f60f8378 JB |
1 | --- spice-0.12.5/configure.ac.orig 2014-05-19 14:20:53.000000000 +0200 |
2 | +++ spice-0.12.5/configure.ac 2014-05-23 19:18:10.227726292 +0200 | |
3 | @@ -163,9 +163,9 @@ | |
8a86771e JB |
4 | AC_SUBST(LIBRT) |
5 | ||
0ffcd9c3 JB |
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" | |
8a86771e JB |
12 | fi |
13 | ||
0ffcd9c3 | 14 | dnl The client needs a yield function |
f60f8378 JB |
15 | @@ -211,24 +211,24 @@ |
16 | SMARTCARD_CFLAGS="$CAC_CARD_CFLAGS" | |
17 | AC_SUBST(SMARTCARD_LIBS) | |
18 | AC_SUBST(SMARTCARD_CFLAGS) | |
19 | - SPICE_REQUIRES+=" libcacard >= 0.1.2" | |
20 | + SPICE_REQUIRES="$SPICE_REQUIRES libcacard >= 0.1.2" | |
8a86771e JB |
21 | fi |
22 | ||
f60f8378 JB |
23 | |
24 | PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= 2.22]) | |
25 | -SPICE_REQUIRES+=" glib-2.0 >= 2.22" | |
26 | +SPICE_REQUIRES="$SPICE_REQUIRES glib-2.0 >= 2.22" | |
27 | ||
8a86771e JB |
28 | PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7) |
29 | AC_SUBST(PIXMAN_CFLAGS) | |
30 | AC_SUBST(PIXMAN_LIBS) | |
31 | -SPICE_REQUIRES+=" pixman-1 >= 0.17.7" | |
32 | +SPICE_REQUIRES="$SPICE_REQUIRES pixman-1 >= 0.17.7" | |
33 | ||
f60f8378 JB |
34 | AC_ARG_ENABLE(celt051, |
35 | [ --disable-celt051 Disable celt051 audio codec (enabled by default)],, | |
36 | [enable_celt051="yes"]) | |
37 | ||
38 | if test "x$enable_celt051" = "xyes"; then | |
39 | - PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1, SPICE_REQUIRES+=" celt051 >= 0.5.1.1") | |
40 | + PKG_CHECK_MODULES(CELT051, celt051 >= 0.5.1.1, SPICE_REQUIRES="$SPICE_REQUIRES celt051 >= 0.5.1.1") | |
41 | fi | |
8a86771e | 42 | |
0ffcd9c3 | 43 | if test ! -e client/generated_marshallers.cpp; then |
f60f8378 | 44 | @@ -244,14 +244,14 @@ |
8a86771e JB |
45 | PKG_CHECK_MODULES(SSL, openssl) |
46 | AC_SUBST(SSL_CFLAGS) | |
47 | AC_SUBST(SSL_LIBS) | |
48 | -SPICE_REQUIRES+=" openssl" | |
49 | +SPICE_REQUIRES="$SPICE_REQUIRES openssl" | |
50 | ||
51 | # These are commented out because the gl libraries on RHEL 5 do not have pkgconfig files | |
52 | # | |
53 | # PKG_CHECK_MODULES(GL, gl glu) | |
54 | # AC_SUBST(GL_CFLAGS) | |
55 | # AC_SUBST(GL_LIBS) | |
56 | -# SPICE_REQUIRES+=" gl glu" | |
57 | +# SPICE_REQUIRES="$SPICE_REQUIRES gl glu" | |
58 | ||
0ffcd9c3 JB |
59 | if test "x$enable_opengl" = "xyes"; then |
60 | AC_CHECK_LIB(GL, glBlendFunc, GL_LIBS="$GL_LIBS -lGL", enable_opengl=no) | |
f60f8378 | 61 | @@ -266,7 +266,7 @@ |
8a86771e JB |
62 | |
63 | AC_SUBST(GL_CFLAGS) | |
64 | AC_SUBST(GL_LIBS) | |
65 | -SPICE_NONPKGCONFIG_LIBS+=" $GL_LIBS" | |
66 | +SPICE_NONPKGCONFIG_LIBS="$SPICE_NONPKGCONFIG_LIBS $GL_LIBS" | |
67 | ||
f60f8378 JB |
68 | if test "x$red_target" = "xx11" && test "x$enable_client" = "xyes" ; then |
69 | if test "$os_linux" = yes; then | |
70 | @@ -319,7 +319,7 @@ | |
71 | AC_DEFINE([HAVE_XINERAMA], [], [Define if we have Xinerama]) | |
72 | AC_SUBST(XINERAMA_CFLAGS) | |
73 | AC_SUBST(XINERAMA_LIBS) | |
74 | - SPICE_REQUIRES+=" xinerama" | |
75 | + SPICE_REQUIRES="$SPICE_REQUIRES xinerama" | |
76 | fi | |
77 | ||
78 | # Add parameter for (partial) static linkage of spice client. |