diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-02-04 16:54:17 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-02-04 16:54:17 +0100 |
| commit | 3d84818a7b8fc5ae09cc6470365e4072ef50c659 (patch) | |
| tree | 240189e35c95687c3c11e23fba79fe0e3b59c922 | |
| parent | a8ffd12e99dce07765244f776a6037c3b6ca174e (diff) | |
| download | spice-3d84818a7b8fc5ae09cc6470365e4072ef50c659.tar.gz spice-3d84818a7b8fc5ae09cc6470365e4072ef50c659.tar.xz spice-3d84818a7b8fc5ae09cc6470365e4072ef50c659.zip | |
Depend on spice-protocol module
This doesn't actually use the new module, just sets it up for use.
| -rw-r--r-- | client/x11/Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | server/Makefile.am | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am index 12039f0f..c5efd861 100644 --- a/client/x11/Makefile.am +++ b/client/x11/Makefile.am @@ -14,6 +14,7 @@ INCLUDES = \ -I$(top_srcdir)/common \ -I$(top_srcdir)/common/linux \ -I$(top_srcdir)/client \ + $(PROTOCOL_CFLAGS) \ $(GL_CFLAGS) \ $(ALSA_CFLAGS) \ $(FFMPEG_CFLAGS) \ diff --git a/configure.ac b/configure.ac index 01d607fa..dc67286b 100644 --- a/configure.ac +++ b/configure.ac @@ -87,6 +87,11 @@ AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes") dnl ========================================================================= dnl Check deps +PKG_CHECK_MODULES(PROTOCOL, spice-protocol) +AC_SUBST(PROTOCOL_CFLAGS) +SPICE_REQUIRES+=" log4cpp" + + AC_CHECK_LIBM AC_SUBST(LIBM) diff --git a/server/Makefile.am b/server/Makefile.am index fdaa15a5..03f15a3b 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -4,6 +4,7 @@ INCLUDES = \ -I. \ -I$(top_srcdir)/common \ -I$(top_srcdir)/common/linux \ + $(PROTOCOL_CFLAGS) \ $(FFMPEG_CFLAGS) \ $(QCAIRO_CFLAGS) \ $(GL_CFLAGS) \ |