Merge pull request #7639 from qlyoung/frr-lua

Scripting

diff --cc bgpd/bgp_main.c
Simple merge

diff --cc bgpd/bgp_routemap.c
Simple merge

diff --cc bgpd/subdir.am
Simple merge

diff --cc configure.ac
index 495019ee14ee7d42bf9f8cfcbe880354b42f5463,40fdc7e1cd219451ba8108144d05dd41d11f6330..8f9517763d359d31ecec787fcbba27fd80a399fd
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -697,18 -697,9 +701,18 @@@ f
  AC_ARG_ENABLE([dev_build],
      AS_HELP_STRING([--enable-dev-build], [build for development]))
  
- AC_ARG_ENABLE([lua],
-     AS_HELP_STRING([--enable-lua], [Build Lua scripting]))
+ AC_ARG_ENABLE([scripting],
+     AS_HELP_STRING([--enable-scripting], [Build with scripting support]))
  
 +AC_ARG_ENABLE([netlink-debug],
 +  AS_HELP_STRING([--disable-netlink-debug], [pretty print netlink debug messages]))
 +
 +if test "$enable_netlink_debug" != "no" ; then
 +  AC_DEFINE([NETLINK_DEBUG], [1], [Netlink extra debugging code])
 +fi
 +
 +AM_CONDITIONAL([NETLINK_DEBUG], [test "$enable_netlink_debug" != "no"])
 +
  if test "$enable_time_check" != "no" ; then
    if test "$enable_time_check" = "yes" -o "$enable_time_check" = "" ; then
      AC_DEFINE([CONSUMED_TIME_CHECK], [5000000], [Consumed Time Check])

diff --cc doc/developer/subdir.am
index 0129be6bf1a2ad7a24dec2ae340dc43f14d14f7a,092cd74b766c88e53448fc7e92576d6cbb410828..07a25886d0c2db65bbb8c3589611aa7d8c44e543
--- 1/doc/developer/subdir.am
--- 2/doc/developer/subdir.am
+++ b/doc/developer/subdir.am
@@@ -47,13 -44,9 +46,14 @@@ dev_RSTFILES = 
        doc/developer/packaging-debian.rst \
        doc/developer/packaging-redhat.rst \
        doc/developer/packaging.rst \
 +      doc/developer/path-internals-daemon.rst \
 +      doc/developer/path-internals-pcep.rst \
 +      doc/developer/path-internals.rst \
 +      doc/developer/path.rst \
        doc/developer/rcu.rst \
+       doc/developer/scripting.rst \
        doc/developer/static-linking.rst \
 +      doc/developer/tracing.rst \
        doc/developer/testing.rst \
        doc/developer/topotests-snippets.rst \
        doc/developer/topotests.rst \

diff --cc doc/user/index.rst
Simple merge

diff --cc doc/user/subdir.am
Simple merge

diff --cc lib/command.c
Simple merge

diff --cc lib/subdir.am
Simple merge