summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorUri Lublin <uril@redhat.com>2010-01-03 19:31:29 +0200
committerYaniv Kamay <ykamay@redhat.com>2010-01-10 19:46:19 +0200
commitecc4e7d2cf9744acb18ab906348c98c89dcf5a13 (patch)
tree7a129c40d1bd5d95e93255ca42f1cc25001302a6 /server
parent82a73df97ffc5e9a937bfe3530cceee4f3ea6441 (diff)
downloadspice-ecc4e7d2cf9744acb18ab906348c98c89dcf5a13.tar.gz
spice-ecc4e7d2cf9744acb18ab906348c98c89dcf5a13.tar.xz
spice-ecc4e7d2cf9744acb18ab906348c98c89dcf5a13.zip
spice: subdirs: support ./autogen.sh in a "make dist" tarball (subdir config)
Each subdir (common, client and server) can "make dist". This commit adds configure.ac.shared and autogen.sh to the tar file. Above files are copied from .. (spice/ directory) Also added configure.ac.shared (which is not part of "distribution" tarball) that only imports ../configure.ac.shared such that ./autogen.sh still works (on "git directories"). Signed-off-by: Uri Lublin <uril@redhat.com>
Diffstat (limited to 'server')
-rw-r--r--server/Makefile.am3
-rw-r--r--server/configure.ac2
-rw-r--r--server/configure.ac.shared1
3 files changed, 5 insertions, 1 deletions
diff --git a/server/Makefile.am b/server/Makefile.am
index f092fd17..335a71a5 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -88,3 +88,6 @@ pkgconfig_DATA = spice.pc
DISTCLEANFILES = \
spice.pc
+
+dist-hook:
+ cp -p -f ../autogen.sh ../configure.ac.shared $(distdir)
diff --git a/server/configure.ac b/server/configure.ac
index d047078b..bc31986a 100644
--- a/server/configure.ac
+++ b/server/configure.ac
@@ -12,7 +12,7 @@ AC_CONFIG_MACRO_DIR([m4])
# Maybe overwritten by ../configure.ac.shared
SPICE_COMMON_SRCDIR='$(top_srcdir)'/../common
-m4_include(../configure.ac.shared)
+m4_include(configure.ac.shared)
AC_PROG_LIBTOOL
diff --git a/server/configure.ac.shared b/server/configure.ac.shared
new file mode 100644
index 00000000..4c292cb9
--- /dev/null
+++ b/server/configure.ac.shared
@@ -0,0 +1 @@
+m4_include(../configure.ac.shared)