diff options
-rw-r--r-- | babeld/Makefile.am | 2 | ||||
-rw-r--r-- | bgpd/Makefile.am | 2 | ||||
-rwxr-xr-x | buildtest.sh | 2 | ||||
-rwxr-xr-x | configure.ac | 7 | ||||
-rw-r--r-- | isisd/Makefile.am | 2 | ||||
-rw-r--r-- | lib/Makefile.am | 1 | ||||
-rw-r--r-- | ospf6d/Makefile.am | 2 | ||||
-rw-r--r-- | ospfclient/Makefile.am | 1 | ||||
-rw-r--r-- | ospfd/Makefile.am | 1 | ||||
-rw-r--r-- | pimd/Makefile.am | 2 | ||||
-rw-r--r-- | ripd/Makefile.am | 2 | ||||
-rw-r--r-- | ripngd/Makefile.am | 2 | ||||
-rw-r--r-- | vtysh/Makefile.am | 2 | ||||
-rw-r--r-- | watchquagga/Makefile.am | 2 | ||||
-rw-r--r-- | zebra/Makefile.am | 2 |
15 files changed, 21 insertions, 11 deletions
diff --git a/babeld/Makefile.am b/babeld/Makefile.am index 13922d0f..d34e180b 100644 --- a/babeld/Makefile.am +++ b/babeld/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" INSTALL_SDATA=@INSTALL@ -m 600 -AM_CFLAGS = $(PICFLAGS) +AM_CFLAGS = $(PICFLAGS) $(WERROR) AM_LDFLAGS = $(PILDFLAGS) noinst_LIBRARIES = libbabel.a diff --git a/bgpd/Makefile.am b/bgpd/Makefile.am index 42f1f488..92fa10cd 100644 --- a/bgpd/Makefile.am +++ b/bgpd/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" INSTALL_SDATA=@INSTALL@ -m 600 -AM_CFLAGS = $(PICFLAGS) +AM_CFLAGS = $(PICFLAGS) $(WERROR) AM_LDFLAGS = $(PILDFLAGS) noinst_LIBRARIES = libbgp.a diff --git a/buildtest.sh b/buildtest.sh index 3bc25f23..3dd8ed82 100755 --- a/buildtest.sh +++ b/buildtest.sh @@ -4,7 +4,7 @@ # builds some git commit of Quagga in some different configurations # usage: buildtest.sh [commit [configurations...]] -basecfg="--prefix=/usr --enable-user=quagga --enable-group=quagga --enable-vty-group=quagga --enable-configfile-mask=0660 --enable-logfile-mask=0640 --enable-vtysh --sysconfdir=/etc/quagga --enable-exampledir=/etc/quagga/samples --localstatedir=/var/run/quagga --libdir=/usr/lib64/quagga --enable-rtadv --disable-static --enable-isisd --enable-multipath=0 --enable-babeld --enable-pimd" +basecfg="--prefix=/usr --enable-user=quagga --enable-group=quagga --enable-vty-group=quagga --enable-configfile-mask=0660 --enable-logfile-mask=0640 --enable-vtysh --sysconfdir=/etc/quagga --enable-exampledir=/etc/quagga/samples --localstatedir=/var/run/quagga --libdir=/usr/lib64/quagga --enable-rtadv --disable-static --enable-isisd --enable-multipath=0 --enable-babeld --enable-pimd --enable-werror" configs_base="gcc|$basecfg" diff --git a/configure.ac b/configure.ac index b11c989b..a82470cd 100755 --- a/configure.ac +++ b/configure.ac @@ -175,6 +175,11 @@ else AC_MSG_RESULT([CFLAGS supplied by user]) fi +if test x"${enable_werror}" = x"yes" ; then + WERROR="-Werror" +fi +AC_SUBST(WERROR) + dnl -------------- dnl Check programs dnl -------------- @@ -296,6 +301,8 @@ AC_ARG_ENABLE(pcreposix, AS_HELP_STRING([--enable-pcreposix], [enable using PCRE Posix libs for regex functions])) AC_ARG_ENABLE(fpm, AS_HELP_STRING([--enable-fpm], [enable Forwarding Plane Manager support])) +AC_ARG_ENABLE(werror, + AS_HELP_STRING([--enable-werror], [enable -Werror (recommended for developers only)])) if test x"${enable_gcc_rdynamic}" != x"no" ; then if test x"${enable_gcc_rdynamic}" = x"yes" -o x"$COMPILER" = x"GCC"; then diff --git a/isisd/Makefile.am b/isisd/Makefile.am index dba681b1..4e67b228 100644 --- a/isisd/Makefile.am +++ b/isisd/Makefile.am @@ -6,7 +6,7 @@ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" INSTALL_SDATA=@INSTALL@ -m 600 LIBS = @LIBS@ -AM_CFLAGS = $(PICFLAGS) +AM_CFLAGS = $(PICFLAGS) $(WERROR) AM_LDFLAGS = $(PILDFLAGS) noinst_LIBRARIES = libisis.a diff --git a/lib/Makefile.am b/lib/Makefile.am index 5a806183..56837d86 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,7 @@ ## Process this file with automake to produce Makefile.in. AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib +AM_CFLAGS = $(WERROR) DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" lib_LTLIBRARIES = libzebra.la diff --git a/ospf6d/Makefile.am b/ospf6d/Makefile.am index d30ce581..cbd850f3 100644 --- a/ospf6d/Makefile.am +++ b/ospf6d/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" INSTALL_SDATA=@INSTALL@ -m 600 -AM_CFLAGS = $(PICFLAGS) +AM_CFLAGS = $(PICFLAGS) $(WERROR) AM_LDFLAGS = $(PILDFLAGS) noinst_LIBRARIES = libospf6.a diff --git a/ospfclient/Makefile.am b/ospfclient/Makefile.am index 09d2ba86..c4f0da83 100644 --- a/ospfclient/Makefile.am +++ b/ospfclient/Makefile.am @@ -1,6 +1,7 @@ ## Automake.am for OSPF API client AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib +AM_CFLAGS = $(WERROR) lib_LTLIBRARIES = libospfapiclient.la libospfapiclient_la_LDFLAGS = -version-info 0:0:0 diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am index 4160bfcc..40f2cfe5 100644 --- a/ospfd/Makefile.am +++ b/ospfd/Makefile.am @@ -1,6 +1,7 @@ ## Process this file with automake to produce Makefile.in. AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib +AM_CFLAGS = $(WERROR) DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\" INSTALL_SDATA=@INSTALL@ -m 600 diff --git a/pimd/Makefile.am b/pimd/Makefile.am index f13debd9..816afb90 100644 --- a/pimd/Makefile.am +++ b/pimd/Makefile.am @@ -39,7 +39,7 @@ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" $(PIM_DEFS) INSTALL_SDATA=@INSTALL@ -m 600 LIBS = @LIBS@ -AM_CFLAGS = $(PICFLAGS) +AM_CFLAGS = $(PICFLAGS) $(WERROR) AM_LDFLAGS = $(PILDFLAGS) noinst_LIBRARIES = libpim.a diff --git a/ripd/Makefile.am b/ripd/Makefile.am index 65a626dd..34c5f183 100644 --- a/ripd/Makefile.am +++ b/ripd/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" INSTALL_SDATA=@INSTALL@ -m 600 -AM_CFLAGS = $(PICFLAGS) +AM_CFLAGS = $(PICFLAGS) $(WERROR) AM_LDFLAGS = $(PILDFLAGS) noinst_LIBRARIES = librip.a diff --git a/ripngd/Makefile.am b/ripngd/Makefile.am index 9bd14ba0..0487459b 100644 --- a/ripngd/Makefile.am +++ b/ripngd/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" INSTALL_SDATA=@INSTALL@ -m 600 -AM_CFLAGS = $(PICFLAGS) +AM_CFLAGS = $(PICFLAGS) $(WERROR) AM_LDFLAGS = $(PILDFLAGS) noinst_LIBRARIES = libripng.a diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am index a66615be..0cc6d5ba 100644 --- a/vtysh/Makefile.am +++ b/vtysh/Makefile.am @@ -5,7 +5,7 @@ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" LIBS = @LIBS@ @CURSES@ @LIBPAM@ -AM_CFLAGS = $(PICFLAGS) +AM_CFLAGS = $(PICFLAGS) $(WERROR) AM_LDFLAGS = $(PILDFLAGS) bin_PROGRAMS = vtysh diff --git a/watchquagga/Makefile.am b/watchquagga/Makefile.am index 9256006c..939ecd71 100644 --- a/watchquagga/Makefile.am +++ b/watchquagga/Makefile.am @@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib DEFS = @DEFS@ -DSTATEDIR=\"$(localstatedir)/\" -AM_CFLAGS = $(PICFLAGS) +AM_CFLAGS = $(PICFLAGS) $(WERROR) AM_LDFLAGS = $(PILDFLAGS) sbin_PROGRAMS = watchquagga diff --git a/zebra/Makefile.am b/zebra/Makefile.am index 48087917..7dcbd660 100644 --- a/zebra/Makefile.am +++ b/zebra/Makefile.am @@ -20,7 +20,7 @@ if HAVE_NETLINK othersrc = zebra_fpm_netlink.c endif -AM_CFLAGS = $(PICFLAGS) +AM_CFLAGS = $(PICFLAGS) $(WERROR) AM_LDFLAGS = $(PILDFLAGS) sbin_PROGRAMS = zebra |