From 53aeb0305a32402029bfffb1046f1315d3d4a55a Mon Sep 17 00:00:00 2001
From: Simon Arlott <sa.me.uk>
Date: Sun, 15 Sep 2019 11:12:44 +0100
Subject: [PATCH] librb: Specify -Wno-unused-parameter

---
 .travis.yml        | 12 ++++++------
 librb/configure.ac |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2e584659..092a7cbc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ matrix:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['gcc-4.8', 'automake', 'autoconf', 'libtool', 'shtool', 'libsqlite3-dev', 'python-sphinx', 'texinfo']
-      env: COMPILER=gcc-4.8 CFLAGS="-Werror -Wno-unused-value -Wno-unused-parameter -Wno-unused-variable"
+      env: COMPILER=gcc-4.8
 
     - os: linux
       compiler: gcc
@@ -27,7 +27,7 @@ matrix:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['gcc-4.9', 'automake', 'autoconf', 'libtool', 'shtool', 'libsqlite3-dev', 'python-sphinx', 'texinfo']
-      env: COMPILER=gcc-4.9 CFLAGS="-Werror -Wno-unused-value -Wno-unused-parameter -Wno-unused-variable"
+      env: COMPILER=gcc-4.9
 
     - os: linux
       compiler: gcc
@@ -35,7 +35,7 @@ matrix:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['gcc-5', 'automake', 'autoconf', 'libtool', 'shtool', 'libsqlite3-dev', 'python-sphinx', 'texinfo']
-      env: COMPILER=gcc-5 CFLAGS="-Werror -Wno-unused-value -Wno-unused-parameter -Wno-unused-variable"
+      env: COMPILER=gcc-5
 
     - os: linux
       compiler: gcc
@@ -43,7 +43,7 @@ matrix:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['gcc-7', 'automake', 'autoconf', 'libtool', 'shtool', 'libsqlite3-dev', 'python-sphinx', 'texinfo']
-      env: COMPILER=gcc-7 CFLAGS="-Werror -Wno-unused-value -Wno-unused-parameter -Wno-unused-variable"
+      env: COMPILER=gcc-7
 
     - os: linux
       compiler: gcc
@@ -51,7 +51,7 @@ matrix:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['gcc-8', 'automake', 'autoconf', 'libtool', 'shtool', 'libsqlite3-dev', 'python-sphinx', 'texinfo']
-      env: COMPILER=gcc-8 CFLAGS="-Werror -Wno-unused-value -Wno-unused-parameter -Wno-unused-variable"
+      env: COMPILER=gcc-8
 
     - os: linux
       compiler: clang
@@ -72,7 +72,7 @@ cache:
 
 script:
   - bash autogen.sh
-  - CC=$COMPILER ./configure --with-shared-sqlite --with-assert=hard --enable-warnings
+  - CC=$COMPILER CFLAGS="-Werror -Wno-unused-value -Wno-unused-parameter -Wno-unused-variable" ./configure --with-shared-sqlite --with-assert=hard --enable-warnings
   - make -j4
   - "if [ ${TRAVIS_OS_NAME} != 'osx' ]; then make check; fi"
   - make install
diff --git a/librb/configure.ac b/librb/configure.ac
index 24b1367f..8c0cb29a 100644
--- a/librb/configure.ac
+++ b/librb/configure.ac
@@ -449,7 +449,7 @@ fi
 
 AC_ARG_ENABLE(warnings,
 AC_HELP_STRING([--enable-warnings],[Enable all sorts of warnings for debugging.]),
-[CFLAGS="$CFLAGS -Wall -Werror -Wcast-qual -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -W -Wno-unused -Wunused-function -Wunused-variable"],[])
+[CFLAGS="$CFLAGS -Wall -Werror -Wcast-qual -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings -W -Wno-unused -Wunused-function -Wunused-variable -Wno-unused-parameter"],[])
 
 AC_SUBST(LDFLAGS)
 AC_SUBST(PICFLAGS)