build: deprecate the autotools build system

v2: also update CI to use meson build to run CTS

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Lepton Wu <lepton@chromium.org>
macos/master
Gert Wollny 5 years ago
parent c162f33d5f
commit debb6e6ac4
  1. 6
      ci/run_tests.sh
  2. 13
      configure.ac

@ -49,7 +49,7 @@ run_setup()
if [ "x$use_meson" = "x" ]; then if [ "x$use_meson" = "x" ]; then
if [ -d "$VIRGL_PATH" ]; then if [ -d "$VIRGL_PATH" ]; then
cd $VIRGL_PATH cd $VIRGL_PATH
./autogen.sh --prefix=/usr/local --enable-debug --enable-tests ./autogen.sh --prefix=/usr/local --enable-debug --enable-tests --enable-autotools
make -j$NUM_THREADS install make -j$NUM_THREADS install
fi fi
else else
@ -93,7 +93,7 @@ run_make_check_meson()
run_deqp() run_deqp()
{ {
run_setup run_setup meson
OGL_BACKEND="$1" OGL_BACKEND="$1"
SUITE="$2" SUITE="$2"
@ -135,7 +135,7 @@ run_deqp()
run_piglit() run_piglit()
{ {
run_setup run_setup meson
OGL_BACKEND="$1" OGL_BACKEND="$1"

@ -4,6 +4,19 @@ AC_PREREQ([2.60])
AC_INIT([virglrenderer], [0.8.0], AC_INIT([virglrenderer], [0.8.0],
[virglrenderer-devel@lists.freedesktop.org]) [virglrenderer-devel@lists.freedesktop.org])
AC_ARG_ENABLE(autotools,
AS_HELP_STRING([--enable-autotools],
[Enable the use of the now deprecated autotools build]),
[force_autotools=$enableval])
if test "x$force_autotools" != "xyes"; then
AC_MSG_ERROR([The autotools build system is deprecated, please try the
new meson build system.
> meson <src-dir> [<build-dir>]
To force the use of autotools run configure with --enable-autotools])
fi
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])

Loading…
Cancel
Save