From 2ee5fdba022c6fa78ac6ef6af2577f7dfad2ac02 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Tue, 13 Apr 2021 19:44:44 +0200 Subject: [PATCH] build: remove --enable-exampledir This is no longer used with the recent config example removal. Signed-off-by: David Lamparter --- Makefile.am | 3 --- buildtest.sh | 2 +- configure.ac | 10 ---------- doc/developer/building-frr-for-centos6.rst | 1 - doc/developer/building-frr-for-centos7.rst | 1 - doc/developer/building-frr-for-centos8.rst | 1 - doc/developer/building-frr-for-debian8.rst | 1 - doc/developer/building-frr-for-debian9.rst | 1 - doc/developer/building-frr-for-netbsd6.rst | 1 - doc/developer/building-frr-for-netbsd7.rst | 1 - doc/developer/include-compile.rst | 1 - doc/developer/topotests.rst | 1 - doc/user/installation.rst | 1 - 13 files changed, 1 insertion(+), 24 deletions(-) diff --git a/Makefile.am b/Makefile.am index a38029dcfa..8c9d7df77c 100644 --- 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 b4b02d10bf..eeae82fc44 100755 --- 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 96bacc9ed4..2f907c6ed3 100644 --- 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 5d3be492de..7a7af42119 100644 --- 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 8d0aea943c..93b9993a38 100644 --- 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 77fe489358..65c93286b7 100644 --- 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 51dd07c42a..475e0303fc 100644 --- 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 919b010314..1981127b3d 100644 --- 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 e50d11130a..a78f8b3c2f 100644 --- 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 32d1145edc..a52ece19a1 100644 --- 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 0ff0ae3ffe..d9fa260221 100644 --- 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 ba03aa9045..18317cd33c 100644 --- 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 f7e45a6231..cf79ccde9b 100644 --- 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 \