pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-06 21:12:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: Update spice-common integration

Browse Source 
Use new common.m4 include file to make easier to integrate
with spice-common repository.
The new include will allow for instance spice-common to
add additional dependencies without changes (or minor) to
spice-server.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Kevin Pouget <kpouget@redhat.com>
This commit is contained in:
Frediano Ziglio 2019-11-26 21:15:53 +00:00
parent a7f25ca5a8
commit 626ad248f5
5 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -30,7 +30,6 @@ SPICE_SERVER_VERSION=`printf "0x%02x%02x%02x" $major $minor $micro`
AC_SUBST(SPICE_SERVER_VERSION)
AC_CONFIG_MACRO_DIR([m4])
m4_include([subprojects/spice-common/m4/spice-deps.m4])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_AUX_DIR(.)
@ -85,7 +84,6 @@ AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
dnl =========================================================================
dnl Check optional features
SPICE_CHECK_SMARTCARD
SPICE_EXTRA_CHECKS
AC_ARG_ENABLE(gstreamer,
AS_HELP_STRING([--enable-gstreamer=@<:@auto/0.10/1.0/yes/no@:>@],
@ -148,18 +146,12 @@ AX_VALGRIND_CHECK
SPICE_CHECK_LZ4
SPICE_CHECK_SASL
SPICE_CHECK_INSTRUMENTATION
AM_CONDITIONAL(HAVE_SASL, test "x$have_sasl" = "xyes")
dnl =========================================================================
dnl Check deps
AC_CONFIG_SUBDIRS([subprojects/spice-common])
COMMON_CFLAGS='-I ${top_srcdir}/subprojects/spice-common/ -I ${top_builddir}/subprojects/spice-common/'
COMMON_CFLAGS="$COMMON_CFLAGS -DG_LOG_DOMAIN=\\\"Spice\\\""
AC_SUBST(COMMON_CFLAGS)
SPICE_COMMON_DIR='${top_builddir}/subprojects/spice-common'
AC_SUBST(SPICE_COMMON_DIR)
m4_define([SPICE_PROTOCOL_MIN_VER],[0.14.0])
m4_include([subprojects/spice-common/m4/common.m4])
AC_CHECK_LIBM
AC_SUBST(LIBM)
@ -178,10 +170,6 @@ AS_IF([test x"$have_smartcard" = "xyes"], [
AS_VAR_APPEND([SPICE_REQUIRES], [" libcacard >= 2.5.1"])
])
SPICE_PROTOCOL_MIN_VER=0.14.0
PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= $SPICE_PROTOCOL_MIN_VER])
AC_SUBST([SPICE_PROTOCOL_MIN_VER])
GLIB2_REQUIRED=2.38
GLIB2_ENCODED_VERSION="GLIB_VERSION_2_38"
PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= $GLIB2_REQUIRED gio-2.0 >= $GLIB2_REQUIRED])
@ -202,8 +190,6 @@ AC_SUBST(PIXMAN_CFLAGS)
AC_SUBST(PIXMAN_LIBS)
AS_VAR_APPEND([SPICE_REQUIRES], [" pixman-1 >= $PIXMAN_REQUIRED"])
SPICE_CHECK_CELT051
PKG_CHECK_MODULES(SSL, openssl >= 1.0.0)
AC_SUBST(SSL_CFLAGS)
AC_SUBST(SSL_LIBS)

3
server/Makefile.am
View File

@ -6,7 +6,7 @@ check-valgrind:
AM_CPPFLAGS = \
-DSPICE_SERVER_INTERNAL \
$(COMMON_CFLAGS) \
$(SPICE_COMMON_CFLAGS) \
$(GLIB2_CFLAGS) \
$(GOBJECT2_CFLAGS) \
$(LZ4_CFLAGS) \
@ -15,7 +15,6 @@ AM_CPPFLAGS = \
$(SMARTCARD_CFLAGS) \
$(GSTREAMER_0_10_CFLAGS) \
$(GSTREAMER_1_0_CFLAGS) \
$(SPICE_PROTOCOL_CFLAGS) \
$(SSL_CFLAGS) \
$(VISIBILITY_HIDDEN_CFLAGS) \
$(WARN_CFLAGS) \

3
server/tests/Makefile.am
View File

@ -16,13 +16,12 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/server \
-I$(top_builddir)/server \
-I$(top_srcdir)/server/tests \
$(COMMON_CFLAGS) \
$(SPICE_COMMON_CFLAGS) \
$(GIO_UNIX_CFLAGS) \
$(GLIB2_CFLAGS) \
$(GOBJECT2_CFLAGS) \
$(SMARTCARD_CFLAGS) \
$(SPICE_NONPKGCONFIG_CFLAGS) \
$(SPICE_PROTOCOL_CFLAGS) \
$(WARN_CFLAGS) \
$(NULL)

2
subprojects/spice-common

@ -1 +1 @@
Subproject commit 2cec5f99afd40604b7a59ca1b473a04d9aea3588
Subproject commit 19ea60416c301e0b4b69ea038618452f0845d173

3
tools/Makefile.am
View File

@ -1,8 +1,7 @@
NULL =
AM_CPPFLAGS = \
$(COMMON_CFLAGS) \
$(SPICE_PROTOCOL_CFLAGS) \
$(SPICE_COMMON_CFLAGS) \
$(WARN_CFLAGS) \
$(NULL)