diff options
| -rwxr-xr-x | configure.ac | 2 | ||||
| -rw-r--r-- | doc/user/installation.rst | 30 | ||||
| -rw-r--r-- | lib/frrstr.c | 4 | ||||
| -rw-r--r-- | lib/frrstr.h | 5 | ||||
| -rw-r--r-- | lib/vty.c | 5 | ||||
| -rw-r--r-- | lib/vty.h | 4 |
6 files changed, 49 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c8371f304e..901cac2318 100755 --- a/configure.ac +++ b/configure.ac @@ -543,7 +543,7 @@ AC_ARG_ENABLE([realms], AC_ARG_ENABLE([rtadv], AS_HELP_STRING([--disable-rtadv], [disable IPV6 router advertisement feature])) AC_ARG_ENABLE([irdp], - AS_HELP_STRING([--disable-irdp], [enable IRDP server support in zebra (default if supported)])) + AS_HELP_STRING([--disable-irdp], [disable IRDP server support in zebra (enabled by default if supported)])) AC_ARG_ENABLE([capabilities], AS_HELP_STRING([--disable-capabilities], [disable using POSIX capabilities])) AC_ARG_ENABLE([rusage], diff --git a/doc/user/installation.rst b/doc/user/installation.rst index 392a2dd784..9cd1210529 100644 --- a/doc/user/installation.rst +++ b/doc/user/installation.rst @@ -144,6 +144,11 @@ options from the list below. Build watchfrr with systemd integration, this will allow FRR to communicate with systemd to tell systemd if FRR has come up properly. +.. option:: --enable-werror + + Build with all warnings converted to errors as a compile option. This + is recommended for developers only. + .. option:: --disable-pimd Turn off building of pimd. On some BSD platforms pimd will not build properly due @@ -181,6 +186,10 @@ options from the list below. Turn off bgpd's ability to use VNC. +.. option:: --disable-bgp-bmp + + Turn off BGP BMP support + .. option:: --enable-datacenter Enable system defaults to work as if in a Data Center. See defaults.h @@ -217,6 +226,11 @@ options from the list below. realm value when inserting into the Linux kernel. Then routing policy can be assigned to the realm. See the tc man page. +.. option:: --disable-irdp + + Disable IRDP server support. This is enabled by default if we have + both `struct in_pktinfo` and `struct icmphdr` available to us. + .. option:: --disable-rtadv Disable support IPV6 router advertisement in zebra. @@ -302,6 +316,18 @@ options from the list below. Build the Sysrepo northbound plugin. +.. option:: --enable-grpc + + Enable the gRPC northbound plugin. + +.. option:: --enable-zeromq + + Enable the ZeroMQ handler. + +.. option:: --with-libpam + + Use libpam for PAM support in vtysh. + .. option:: --enable-time-check XXX When this is enabled with a XXX value in microseconds, any thread that @@ -319,6 +345,10 @@ options from the list below. load might see improvement in behavior. Be aware that `show thread cpu` is considered a good data gathering tool from the perspective of developers. +.. option:: --enable-pcreposix + + Turn on the usage of PCRE Posix libs for regex functionality. + You may specify any combination of the above options to the configure script. By default, the executables are placed in :file:`/usr/local/sbin` and the configuration files in :file:`/usr/local/etc`. The :file:`/usr/local/` diff --git a/lib/frrstr.c b/lib/frrstr.c index 8a72a35af0..7ef5fffd12 100644 --- a/lib/frrstr.c +++ b/lib/frrstr.c @@ -25,7 +25,11 @@ #include <string.h> #include <ctype.h> #include <sys/types.h> +#ifdef HAVE_LIBPCREPOSIX +#include <pcreposix.h> +#else #include <regex.h> +#endif /* HAVE_LIBPCREPOSIX */ #include "frrstr.h" #include "memory.h" diff --git a/lib/frrstr.h b/lib/frrstr.h index 3a935c90cb..441d7b8670 100644 --- a/lib/frrstr.h +++ b/lib/frrstr.h @@ -22,7 +22,12 @@ #define _FRRSTR_H_ #include <sys/types.h> +#include <sys/types.h> +#ifdef HAVE_LIBPCREPOSIX +#include <pcreposix.h> +#else #include <regex.h> +#endif /* HAVE_LIBPCREPOSIX */ #include <stdbool.h> #include "vector.h" @@ -23,7 +23,12 @@ #include <lib/version.h> #include <sys/types.h> +#include <sys/types.h> +#ifdef HAVE_LIBPCREPOSIX +#include <pcreposix.h> +#else #include <regex.h> +#endif /* HAVE_LIBPCREPOSIX */ #include <stdio.h> #include "linklist.h" @@ -22,7 +22,11 @@ #define _ZEBRA_VTY_H #include <sys/types.h> +#ifdef HAVE_LIBPCREPOSIX +#include <pcreposix.h> +#else #include <regex.h> +#endif /* HAVE_LIBPCREPOSIX */ #include "thread.h" #include "log.h" |