diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2015-08-07 12:49:22 +0200 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2015-08-14 16:37:40 +0200 |
| commit | d0ae58a8dfe137564129ee9edac457d7a8e39bf6 (patch) | |
| tree | 81c54e8f7cce68e3aaf462c8d3a53dbfeabf9a4c | |
| parent | 364b81a70ea910181aed42b1708b2664906c6686 (diff) | |
build-sys: Remove spice-protocol submodule
It's seeing regular releases and is API stable, so we don't need to
bundle it with spice-gtk
| -rw-r--r-- | configure.ac | 8 | ||||
| m--------- | spice-common | 0 |
2 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 1b347c0..0a60ec3 100644 --- a/configure.ac +++ b/configure.ac @@ -73,7 +73,9 @@ AC_CHECK_LIBM AC_SUBST(LIBM) AC_CONFIG_SUBDIRS([spice-common]) -COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_srcdir}/spice-common/spice-protocol/' +PKG_CHECK_MODULES([SPICE_PROTOCOL], [spice-protocol >= 0.12.10]) + +COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ ${SPICE_PROTOCOL_CFLAGS}' AC_SUBST(COMMON_CFLAGS) SPICE_GTK_MAJOR_VERSION=`echo $PACKAGE_VERSION | cut -d. -f1` @@ -99,7 +101,7 @@ if test ! -e "$srcdir/src/vncdisplaykeymap_osx2xtkbd.c"; then AC_MSG_RESULT([found]) fi -SPICE_GLIB_REQUIRES="" +SPICE_GLIB_REQUIRES="spice-protocol >= 0.12.10" SPICE_GTK_REQUIRES="" PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.17.7) @@ -700,7 +702,7 @@ SPICE_CFLAGS="$SPICE_CFLAGS $WARN_CFLAGS" AC_SUBST(SPICE_CFLAGS) -SPICE_GLIB_CFLAGS="$PROTOCOL_CFLAGS $PIXMAN_CFLAGS $PULSE_CFLAGS $GST_CFLAGS $GLIB2_CFLAGS $GIO_CFLAGS $GOBJECT2_CFLAGS $SSL_CFLAGS $SASL_CFLAGS" +SPICE_GLIB_CFLAGS="$PIXMAN_CFLAGS $PULSE_CFLAGS $GST_CFLAGS $GLIB2_CFLAGS $GIO_CFLAGS $GOBJECT2_CFLAGS $SSL_CFLAGS $SASL_CFLAGS" SPICE_GTK_CFLAGS="$SPICE_GLIB_CFLAGS $GTK_CFLAGS " AC_SUBST(SPICE_GLIB_CFLAGS) diff --git a/spice-common b/spice-common -Subproject 2d054e0e6901a1cfbe396f30d9899da46ff533d +Subproject dd63a3b656bd11af7d97317f2de0824cd6cef5d |