buils-sys: Include autogen.sh in tarball and use for RPM build

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>

diff --git a/Makefile.am b/Makefile.am
index 53d51a1f7f670bbb5db1e7b87834b22d72442749..47b091ad9a262a659c9b70223ea4c214a4ce04e8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,4 +19,5 @@ EXTRA_DIST = \
        INSTALL \
        LICENSE \
        COPYING \
-       README
+       README \
+       autogen.sh

diff --git a/dist/swtpm.spec b/dist/swtpm.spec
index 1802b64ec7f8717aefad3751032946bd045f64c1..9a8d720fccfc0f419d5f21c43cacf9f92cc4f407 100644 (file)
--- a/dist/swtpm.spec
+++ b/dist/swtpm.spec
@@ -131,11 +131,10 @@ Tools for the TPM emulator from the swtpm package
 
 %build
 
-./bootstrap.sh
+NOCONFIGURE=1 ./autogen.sh
 %configure \
-        --prefix=/usr \
 %if %{with_gnutls}
-        --with-gnutls \
+        --with-gnutls
 %endif
 
 make %{?_smp_mflags}

diff --git a/dist/swtpm.spec.in b/dist/swtpm.spec.in
index 41ec4b7151c92c31771a8a69b4c1f9d3eb42ee15..9a0819d1494650bc7a73838fddbcfbb46bfda15c 100644 (file)
--- a/dist/swtpm.spec.in
+++ b/dist/swtpm.spec.in
@@ -131,11 +131,10 @@ Tools for the TPM emulator from the swtpm package
 
 %build
 
-./bootstrap.sh
+NOCONFIGURE=1 ./autogen.sh
 %configure \
-        --prefix=/usr \
 %if %{with_gnutls}
-        --with-gnutls \
+        --with-gnutls
 %endif
 
 make %{?_smp_mflags}