From: Donald Sharp <sharpd@cumulusnetwroks.com>
Date: Wed, 13 Jul 2016 00:24:00 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/cmaster' into cmaster-next
X-Git-Tag: frr-2.0-rc1~465
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=275382273bc8b9d1868c6fbefd139c0a708a7d93;p=mirror_frr.git

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

275382273bc8b9d1868c6fbefd139c0a708a7d93
diff --cc configure.ac
index 1f7d59d3a,8338ad146..5c9b2e552
--- a/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 redhat/quagga.spec.in
index c1d5f0016,cadc1fb8c..9ff65e9a2
--- a/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