[libvirt] [PATCH 13/16] replace any autogen.sh reference with configure

libvirt from clean git checkout as the result of running autogen.sh is stored in git. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- .gitlab-ci.yml | 2 +- .travis.yml | 4 ++-- README-hacking | 5 ++--- ci/build.sh | 1 - docs/compiling.html.in | 8 +++----- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea49c6178b..99ec6b82bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ script: - mkdir build - cd build - - ../autogen.sh $CONFIGURE_OPTS || (cat config.log && exit 1) + - ../configure $CONFIGURE_OPTS || (cat config.log && exit 1) - make -j $(getconf _NPROCESSORS_ONLN) # We could run every arch on every versions, but it is a little diff --git a/.travis.yml b/.travis.yml index b243e3d5c4..86d6ffea6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,7 +81,7 @@ matrix: # We can't run 'distcheck' or 'syntax-check' because they fail on # macOS, but doing 'install' and 'dist' gives us some useful coverage - mkdir build && cd build - - ../autogen.sh --prefix=$(pwd)/install-root && make -j3 && make -j3 install && make -j3 dist + - ../configure --prefix=$(pwd)/install-root && make -j3 && make -j3 install && make -j3 dist - compiler: clang language: c os: osx @@ -96,7 +96,7 @@ matrix: # We can't run 'distcheck' or 'syntax-check' because they fail on # macOS, but doing 'install' and 'dist' gives us some useful coverage - mkdir build && cd build - - ../autogen.sh --prefix=$(pwd)/install-root && make -j3 && make -j3 install && make -j3 dist + - ../configure --prefix=$(pwd)/install-root && make -j3 && make -j3 install && make -j3 dist git: submodules: true diff --git a/README-hacking b/README-hacking index 7da940eb13..29589ce445 100644 --- a/README-hacking +++ b/README-hacking @@ -38,10 +38,9 @@ We require to have the build directory different than the source directory: $ mkdir build && cd build -The next step is to get all required pieces from gnulib, -to run autoreconf, and to invoke ../autogen.sh: +The next step is to run configure: - $ ../autogen.sh + $ ../configure And there you are! Just diff --git a/ci/build.sh b/ci/build.sh index 0874c2d1d9..476e45d513 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -11,7 +11,6 @@ mkdir -p "$CI_CONT_BUILDDIR" || exit 1 cd "$CI_CONT_BUILDDIR" export VIR_TEST_DEBUG=1 -NOCONFIGURE=1 "$CI_CONT_SRCDIR/autogen.sh" || exit 1 # $CONFIGURE_OPTS is a env that can optionally be set in the container, # populated at build time from the Dockerfile. A typical use case would diff --git a/docs/compiling.html.in b/docs/compiling.html.in index 3731bf0873..52fd5f5397 100644 --- a/docs/compiling.html.in +++ b/docs/compiling.html.in @@ -63,9 +63,7 @@ $ <b>sudo</b> <i>make install</i></pre> <h2><a id="building">Building from a GIT checkout</a></h2> <p> - The libvirt build process uses GNU autotools, so after obtaining a - checkout it is necessary to generate the configure script and Makefile.in - templates using the <code>autogen.sh</code> command. By default when + The libvirt build process uses GNU autotools. By default when the <code>configure</code> script is run from within a GIT checkout, it will turn on -Werror for builds. This can be disabled with --disable-werror, but this is not recommended. @@ -101,7 +99,7 @@ $ GNULIB_SRCDIR=/path/to/gnulib ./autogen.sh --no-git </p> <pre> -$ ./autogen.sh --prefix=$HOME/usr +$ ./configure --prefix=$HOME/usr $ make $ <b>sudo</b> make install</pre> @@ -113,7 +111,7 @@ $ <b>sudo</b> make install</pre> </p> <pre> -$ ./autogen.sh --with-system +$ ./configure --with-system $ make </pre> -- 2.24.1