build: remove --enable-exampledir

This is no longer used with the recent config example removal.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/Makefile.am b/Makefile.am
index a38029dcfa537ad2ef3fb7ba60c4007ec582f9f1..8c9d7df77c9678c91721ccb7dc2e48c001b5cf1c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -109,8 +109,6 @@ CLEANFILES =
 DISTCLEANFILES =
 SUFFIXES =
 
-examplesdir = $(exampledir)
-
 bin_PROGRAMS =
 sbin_PROGRAMS =
 sbin_SCRIPTS =
@@ -122,7 +120,6 @@ lib_LTLIBRARIES =
 module_LTLIBRARIES =
 pkginclude_HEADERS =
 nodist_pkginclude_HEADERS =
-dist_examples_DATA =
 dist_yangmodels_DATA =
 man_MANS =
 vtysh_scan =

diff --git a/buildtest.sh b/buildtest.sh
index b4b02d10bf02bbb372a5da1ea506fc7eb400adba..eeae82fc44535d6943b40f71be2be757a5c29122 100755 (executable)
--- a/buildtest.sh
+++ b/buildtest.sh
@@ -4,7 +4,7 @@
 # builds some git commit of FRR in some different configurations
 # usage: buildtest.sh [commit [configurations...]]
 
-basecfg="--prefix=/usr --enable-user=frr --enable-group=frr --enable-vty-group=frr --enable-configfile-mask=0660 --enable-logfile-mask=0640 --enable-vtysh --sysconfdir=/etc/frr --enable-exampledir=/etc/frr/samples --localstatedir=/var/run/frr --libdir=/usr/lib64/frr  --enable-rtadv --disable-static --enable-isisd --enable-multipath=0 --enable-pimd --enable-werror"
+basecfg="--prefix=/usr --enable-user=frr --enable-group=frr --enable-vty-group=frr --enable-configfile-mask=0660 --enable-logfile-mask=0640 --enable-vtysh --sysconfdir=/etc/frr --localstatedir=/var/run/frr --libdir=/usr/lib64/frr  --enable-rtadv --disable-static --enable-isisd --enable-multipath=0 --enable-pimd --enable-werror"
 
 configs_base="gcc|$basecfg"
 

diff --git a/configure.ac b/configure.ac
index 96bacc9ed4df49a1dd00877b7454a1ae868ba4f8..2f907c6ed38bdb56bb5b355c80e119ce95909f9a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -113,15 +113,6 @@ AC_CONFIG_HEADERS([config.h])
 AC_PATH_PROG([PERL], [perl])
 PKG_PROG_PKG_CONFIG
 
-dnl default is to match previous behavior
-exampledir=${sysconfdir}
-AC_ARG_ENABLE([exampledir],
-         AS_HELP_STRING([--enable-exampledir],
-                        [specify alternate directory for examples]),
-                        exampledir="$enableval",)
-dnl XXX add --exampledir to autoconf standard directory list somehow
-AC_SUBST([exampledir])
-
 dnl default is to match previous behavior
 pkgsrcrcdir=""
 AC_ARG_ENABLE([pkgsrcrcdir],
@@ -2693,7 +2684,6 @@ make                    : ${MAKE-make}
 linker flags            : ${LDFLAGS} ${SAN_FLAGS} ${LIBS} ${LIBCAP} ${LIBREADLINE} ${LIBM}
 state file directory    : ${frr_statedir}
 config file directory   : `eval echo \`echo ${sysconfdir}\``
-example directory       : `eval echo \`echo ${exampledir}\``
 module directory        : ${CFG_MODULE}
 script directory        : ${CFG_SCRIPT}
 user to run as          : ${enable_user}

diff --git a/doc/developer/building-frr-for-centos6.rst b/doc/developer/building-frr-for-centos6.rst
index 5d3be492de8b18676c6601a19d67df52c79d91c2..7a7af42119cdef460465ee5d4f63e6f9be7e83c5 100644 (file)
--- a/doc/developer/building-frr-for-centos6.rst
+++ b/doc/developer/building-frr-for-centos6.rst
@@ -172,7 +172,6 @@ an example.)
         --enable-user=frr \
         --enable-group=frr \
         --enable-vty-group=frrvty \
-        --disable-exampledir \
         --disable-ldpd \
         --enable-fpm \
         --with-pkg-git-version \

diff --git a/doc/developer/building-frr-for-centos7.rst b/doc/developer/building-frr-for-centos7.rst
index 8d0aea943c1b3a4a2bdb96a6f57269a3fa459f7a..93b9993a3868b0aca10d01d22185bd5c24d7feaa 100644 (file)
--- a/doc/developer/building-frr-for-centos7.rst
+++ b/doc/developer/building-frr-for-centos7.rst
@@ -67,7 +67,6 @@ an example.)
         --enable-group=frr \
         --enable-vty-group=frrvty \
        --enable-systemd=yes \
-        --disable-exampledir \
         --disable-ldpd \
         --enable-fpm \
         --with-pkg-git-version \

diff --git a/doc/developer/building-frr-for-centos8.rst b/doc/developer/building-frr-for-centos8.rst
index 77fe48935808cf587a1f8391bf9a9f2205b56974..65c93286b7ac5a55ff1c7aa49b2eb6616bb2eaf6 100644 (file)
--- a/doc/developer/building-frr-for-centos8.rst
+++ b/doc/developer/building-frr-for-centos8.rst
@@ -60,7 +60,6 @@ an example.)
         --enable-group=frr \
         --enable-vty-group=frrvty \
        --enable-systemd=yes \
-        --disable-exampledir \
         --disable-ldpd \
         --enable-fpm \
         --with-pkg-git-version \

diff --git a/doc/developer/building-frr-for-debian8.rst b/doc/developer/building-frr-for-debian8.rst
index 51dd07c42af760d7889dbcd9ed1b7071fa07d1c9..475e0303fca092f65f375057c1e04848d9018f16 100644 (file)
--- a/doc/developer/building-frr-for-debian8.rst
+++ b/doc/developer/building-frr-for-debian8.rst
@@ -57,7 +57,6 @@ an example.)
     cd frr
     ./bootstrap.sh
     ./configure \
-        --enable-exampledir=/usr/share/doc/frr/examples/ \
         --localstatedir=/var/run/frr \
         --sbindir=/usr/lib/frr \
         --sysconfdir=/etc/frr \

diff --git a/doc/developer/building-frr-for-debian9.rst b/doc/developer/building-frr-for-debian9.rst
index 919b01031490ab54510795bb3046f8badb13f970..1981127b3d44662f45de16286370bcb84a4864d4 100644 (file)
--- a/doc/developer/building-frr-for-debian9.rst
+++ b/doc/developer/building-frr-for-debian9.rst
@@ -44,7 +44,6 @@ an example.)
     cd frr
     ./bootstrap.sh
     ./configure \
-        --enable-exampledir=/usr/share/doc/frr/examples/ \
         --localstatedir=/var/opt/frr \
         --sbindir=/usr/lib/frr \
         --sysconfdir=/etc/frr \

diff --git a/doc/developer/building-frr-for-netbsd6.rst b/doc/developer/building-frr-for-netbsd6.rst
index e50d11130a1759a09281b1a567b2beeda8881f73..a78f8b3c2f206f450a4c9753484912b56e036fd3 100644 (file)
--- a/doc/developer/building-frr-for-netbsd6.rst
+++ b/doc/developer/building-frr-for-netbsd6.rst
@@ -64,7 +64,6 @@ an example)
     export CPPFLAGS="-I/usr/pkg/include"
     ./configure \
         --sysconfdir=/usr/pkg/etc/frr \
-        --enable-exampledir=/usr/pkg/share/examples/frr \
         --enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \
         --localstatedir=/var/run/frr \
         --enable-multipath=64 \

diff --git a/doc/developer/building-frr-for-netbsd7.rst b/doc/developer/building-frr-for-netbsd7.rst
index 32d1145edce77730c2ae9a0f91ec8d318786154d..a52ece19a18b78d6b2f74ab41fc9a62bc91dce0e 100644 (file)
--- a/doc/developer/building-frr-for-netbsd7.rst
+++ b/doc/developer/building-frr-for-netbsd7.rst
@@ -55,7 +55,6 @@ an example)
     export CPPFLAGS="-I/usr/pkg/include"
     ./configure \
         --sysconfdir=/usr/pkg/etc/frr \
-        --enable-exampledir=/usr/pkg/share/examples/frr \
         --enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \
         --localstatedir=/var/run/frr \
         --enable-multipath=64 \

diff --git a/doc/developer/include-compile.rst b/doc/developer/include-compile.rst
index 0ff0ae3ffe7bccec537f77a4060052fcc3597796..d9fa260221744027f769bf0b88df2f95d39d67b3 100644 (file)
--- a/doc/developer/include-compile.rst
+++ b/doc/developer/include-compile.rst
@@ -15,7 +15,6 @@ obtained by running ``./configure -h``. The options shown below are examples.
    ./configure \
        --prefix=/usr \
        --includedir=\${prefix}/include \
-       --enable-exampledir=\${prefix}/share/doc/frr/examples \
        --bindir=\${prefix}/bin \
        --sbindir=\${prefix}/lib/frr \
        --libdir=\${prefix}/lib/frr \

diff --git a/doc/developer/topotests.rst b/doc/developer/topotests.rst
index ba03aa9045ffa4edca6d75347d5e141463977068..18317cd33c4a309e414b5e93de6939e1e20632a9 100644 (file)
--- a/doc/developer/topotests.rst
+++ b/doc/developer/topotests.rst
@@ -221,7 +221,6 @@ for ``master`` branch:
        --prefix=/usr/lib/frr --sysconfdir=/etc/frr \
        --localstatedir=/var/run/frr \
        --sbindir=/usr/lib/frr --bindir=/usr/lib/frr \
-       --enable-exampledir=/usr/lib/frr/examples \
        --with-moduledir=/usr/lib/frr/modules \
        --enable-multipath=0 --enable-rtadv \
        --enable-tcp-zebra --enable-fpm --enable-pimd \

diff --git a/doc/user/installation.rst b/doc/user/installation.rst
index f7e45a62317ff67be584dc18d685733a973a9182..cf79ccde9be71bd0921ec0fdf5cf34965f3646c6 100644 (file)
--- a/doc/user/installation.rst
+++ b/doc/user/installation.rst
@@ -561,7 +561,6 @@ the options you chose:
 
    ./configure \
        --prefix=/usr \
-       --enable-exampledir=/usr/share/doc/frr/examples/ \
        --localstatedir=/var/run/frr \
        --sbindir=/usr/lib/frr \
        --sysconfdir=/etc/frr \