Merge remote-tracking branch 'origin/cmaster' into cmaster-next

diff --cc bgpd/bgp_zebra.c
Simple merge

diff --cc bgpd/bgpd.c
Simple merge

diff --cc configure.ac
index 1f7d59d3aad0526ce2de9ccc192a5b4174b4a352,8338ad146250708a340f90f16159e6a255b7179d..5c9b2e552aa0f433b23a24fe6e8f759831534300
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -323,12 -307,19 +323,18 @@@ AC_ARG_ENABLE(cumulus
  AC_ARG_ENABLE(rr-semantics,
    AS_HELP_STRING([--disable-rr-semantics], [disable the v6 Route Replace semantics]))
  
 -if test x"${enable_gcc_ultra_verbose}" = x"yes" ; then
 -  CFLAGS="${CFLAGS} -W -Wcast-qual -Wstrict-prototypes"
 -  CFLAGS="${CFLAGS} -Wmissing-declarations -Wmissing-noreturn"
 -  CFLAGS="${CFLAGS} -Wmissing-format-attribute -Wunreachable-code"
 -  CFLAGS="${CFLAGS} -Wpacked -Wpadded"
 +AC_CHECK_HEADERS(json-c/json.h)
 +AC_CHECK_LIB(json-c, json_object_get, LIBS="$LIBS -ljson-c")
 +if test $ac_cv_lib_json_c_json_object_get = no; then
 +  AC_MSG_ERROR([lib json is needed to compile])
  fi
  
+ AC_CHECK_HEADERS(json-c/json.h)
+ AC_CHECK_LIB(json-c, json_object_get, LIBS="$LIBS -ljson-c")
+ if test $ac_cv_lib_json_c_json_object_get = no; then
+   AC_MSG_ERROR([lib json is needed to compile])
+ fi
+ 
  if test x"${enable_gcc_rdynamic}" != x"no" ; then
    if test x"${enable_gcc_rdynamic}" = x"yes" -o x"$COMPILER" = x"GCC"; then
      LDFLAGS="${LDFLAGS} -rdynamic"

diff --cc ospf6d/ospf6_zebra.c
Simple merge

diff --cc ospfd/ospf_zebra.c
Simple merge

diff --cc redhat/quagga.spec.in
index c1d5f001677afdb0cc13c4256aefc096d5de655d,cadc1fb8c94215db2213cffef2ffc1749e8104a1..9ff65e9a22e4f500ec098d049bb8a0f688ec514a
--- 1/redhat/quagga.spec.in
--- 2/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@@ -69,9 -69,8 +69,8 @@@
  %{!?quagga_gid:               %global         quagga_gid      92 }
  %{!?vty_gid:          %global         vty_gid         85 }
  
 -%define               daemon_list     zebra ripd ospfd bgpd isisd ripngd ospfd6d
 +%define               daemon_list     zebra ripd ospfd bgpd isisd pimd ripngd ospfd6d
  
- 
  %if %{with_watchquagga}
  %define         daemon_watchquagga    watchquagga
  %else

diff --cc zebra/zserv.c
Simple merge