diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-03-21 14:42:35 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-03-25 18:59:10 +0200 |
| commit | 359fc1cb5dbbcf32132c3e8ee6f881a23deff684 (patch) | |
| tree | 3ae7cc1c8b4d0449d50a13cb9640a6ef75f51f11 /configure.ac | |
| parent | 4df135c858d7dfb1aa0ae5d3cb17d786410d1544 (diff) | |
| download | spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.tar.gz spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.tar.xz spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.zip | |
Use the spice-common submodule
This patch will replace the common/ directory with the spice-common
project. It is for now a simple project subdirectory shared with
spice-gtk, but the goal is to make it a proper library later on.
With this change, the spice-server build is broken. The following
commits fix the build, and have been seperated to ease the review.
v2
- moves all the generated marshallers to spice-common library
- don't attempt to fix windows VS build, which should somehow be
splitted with spice-common (or built from tarball only to avoid
generation tools/libs deps)
v3
- uses libspice-common-client
- fix a mutex.h inclusion reported by Alon
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 1ca5e774..1feb36db 100644 --- a/configure.ac +++ b/configure.ac @@ -140,9 +140,9 @@ AM_CONDITIONAL(SUPPORT_AUTOMATED_TESTS, test "x$enable_automated_tests" != "xno" dnl ========================================================================= dnl Check deps -AC_CONFIG_SUBDIRS([spice-protocol]) -PROTOCOL_CFLAGS='-I ${top_srcdir}/spice-protocol' -AC_SUBST(PROTOCOL_CFLAGS) +AC_CONFIG_SUBDIRS([spice-common]) +COMMON_CFLAGS='-I ${top_srcdir}/spice-common/ -I ${top_srcdir}/spice-common/spice-protocol/' +AC_SUBST(COMMON_CFLAGS) AC_CHECK_LIBM AC_SUBST(LIBM) @@ -541,10 +541,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_OUTPUT([ Makefile spice-server.pc -common/Makefile -common/win/Makefile -common/win/my_getopt-1.5/Makefile -python_modules/Makefile server/Makefile server/tests/Makefile client/Makefile |