Merge branch 'no-werror' into 'master'

Remove -Werror from default CFLAGS

See merge request glvnd/libglvnd!229

.gitlab-ci/run_build.sh

@@ -7,7 +7,7 @@ set -o xtrace
 
 mkdir build
 cd build
-../configure $CONFIGURE_OPTIONS
+../configure --enable-werror $CONFIGURE_OPTIONS
 
 make V=1 VERBOSE=1
 

.gitlab-ci/run_meson.sh

@@ -6,9 +6,9 @@ set -o xtrace
 # Running a unity build (sometimes called a jumbo build) is both a useful thing
 # to test and reduces compile time.
 #
-# Enable all auto-features to ensure that we're proprely testing all optional
+# Enable all auto-features to ensure that we're properly testing all optional
 # dependencies.
-meson build --unity=on --auto-features=enabled $CONFIGURE_OPTIONS
+meson build -Dwerror=true --unity=on --auto-features=enabled $CONFIGURE_OPTIONS
 ninja -C build
 
 xvfb-run --auto-servernum ninja -C build test

configure.ac

@@ -30,6 +30,15 @@ AC_PROG_MKDIR_P
 PKG_PROG_PKG_CONFIG
 AC_PROG_NM
 
+AC_ARG_ENABLE([werror],
+    [AS_HELP_STRING([--enable-werror],
+        [Build with -Werror @<:@default=disabled@:>@])],
+    [enable_werror=$enableval],
+    [enable_werror=no])
+if test "x$enable_werror" = xyes; then
+    CFLAGS="$CFLAGS -Werror"
+fi
+
 # The tarball from "make dist" already contains all of the generated files. If
 # we're building from that, then we won't need Python.
 if test -e "$srcdir/src/GLdispatch/vnd-glapi/g_glapi_mapi_gl_tmp.h" ; then
@@ -380,7 +389,7 @@ AS_IF([test "x$GLDISPATCH_PAGE_SIZE" != "x"],
 DEFINES="$DEFINES -DEGL_NO_X11"
 
 dnl default CFLAGS
-CFLAGS="$CFLAGS -Wall -Werror -include config.h -fvisibility=hidden $DEFINES"
+CFLAGS="$CFLAGS -Wall -include config.h -fvisibility=hidden $DEFINES"
 
 AC_CONFIG_FILES([Makefile
                  libglvnd.pc

meson.build

@@ -30,7 +30,7 @@ project(
   'c',
   version : '1.3.1',
   meson_version : '>= 0.48',
-  default_options : ['c_std=gnu99', 'werror=true']
+  default_options : ['c_std=gnu99']
 )
 
 dep_null = dependency('', required : false)