summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--client/Makefile.am3
-rw-r--r--client/configure.ac2
-rw-r--r--client/configure.ac.shared1
-rw-r--r--common/Makefile.am3
-rw-r--r--common/configure.ac2
-rw-r--r--common/configure.ac.shared1
-rw-r--r--server/Makefile.am3
-rw-r--r--server/configure.ac2
-rw-r--r--server/configure.ac.shared1
9 files changed, 15 insertions, 3 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index f30408c3..e948b5f7 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -87,3 +87,6 @@ RED_COMMON_SRCS = \
$(NULL)
EXTRA_DIST = $(RED_COMMON_SRCS)
+
+dist-hook:
+ cp -p -f ../autogen.sh ../configure.ac.shared $(distdir)
diff --git a/client/configure.ac b/client/configure.ac
index c1fd5b72..d9012deb 100644
--- a/client/configure.ac
+++ b/client/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)
dnl ================
diff --git a/client/configure.ac.shared b/client/configure.ac.shared
new file mode 100644
index 00000000..4c292cb9
--- /dev/null
+++ b/client/configure.ac.shared
@@ -0,0 +1 @@
+m4_include(../configure.ac.shared)
diff --git a/common/Makefile.am b/common/Makefile.am
index c1a55f15..8f96366b 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -57,3 +57,6 @@ linux_includedir=$(common_srcdir)/linux
linux_include_DATA=linux/ffmpeg_inc.h
DISTCLEANFILES = spice-common.pc linux/ffmpeg_inc.h
+
+dist-hook:
+ cp -p -f ../autogen.sh ../configure.ac.shared $(distdir)
diff --git a/common/configure.ac b/common/configure.ac
index 76318e65..b2d7e22e 100644
--- a/common/configure.ac
+++ b/common/configure.ac
@@ -8,7 +8,7 @@ AC_INIT(spice-common, [SPICE_MAJOR.SPICE_MINOR.SPICE_MICRO], [], spice-common)
AC_CONFIG_MACRO_DIR([m4])
-m4_include(../configure.ac.shared)
+m4_include(configure.ac.shared)
AC_CONFIG_FILES([Makefile linux/ffmpeg_inc.h spice-common.pc])
AC_OUTPUT
diff --git a/common/configure.ac.shared b/common/configure.ac.shared
new file mode 100644
index 00000000..4c292cb9
--- /dev/null
+++ b/common/configure.ac.shared
@@ -0,0 +1 @@
+m4_include(../configure.ac.shared)
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)