diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-03-18 15:20:28 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-03-18 15:36:02 +0100 |
| commit | ff19c781d3b655aba3dcf07a68537c7bae2468b5 (patch) | |
| tree | 6683b1038cdad76c3329fdc59cf337422216736c | |
| parent | 0c97b088f1df5b1d56a5ffa75fe736368f1f2586 (diff) | |
| download | libnl-ff19c781d3b655aba3dcf07a68537c7bae2468b5.tar.gz | |
build: extend configure option --enable-cli and install all cli programs
Previously, some cli programs were installed to sbin/
and most were not installed at all.
Now, by default install all of them to bin/ directory.
But extend the configure option to allow specifying
'no-inst', 'bin', or 'sbin'.
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | src/Makefile.am | 38 |
2 files changed, 32 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 02453c35..751683d9 100644 --- a/configure.ac +++ b/configure.ac @@ -91,9 +91,16 @@ AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], AC_SUBST([pkgconfigdir]) AC_ARG_ENABLE([cli], - AS_HELP_STRING([--disable-cli], [Do not build command line interface utils]), + AS_HELP_STRING([--enable-cli=yes|no|no-inst|bin|sbin], [Whether to build command line interface utils. Defaults to 'yes' which is a synonym for 'bin'. 'no-inst' means only build, not installing. 'bin'/'sbin' means installing to bin/sbin directory]), [enable_cli="$enableval"], [enable_cli="yes"]) -AM_CONDITIONAL([ENABLE_CLI], [test "$enable_cli" = "yes"]) +if test "$enable_cli" != "no" && + test "$enable_cli" != "no-inst" && + test "$enable_cli" != "sbin"; then + enable_cli="bin" +fi +AM_CONDITIONAL([ENABLE_CLI], [test "$enable_cli" != "no"]) +AM_CONDITIONAL([ENABLE_CLI_INSTALL_BIN], [test "$enable_cli" = "bin"]) +AM_CONDITIONAL([ENABLE_CLI_INSTALL_SBIN], [test "$enable_cli" = "sbin"]) AC_ARG_ENABLE([pthreads], AS_HELP_STRING([--disable-pthreads], [Disable pthreads support]), diff --git a/src/Makefile.am b/src/Makefile.am index aee1c486..a77b3288 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,22 +19,8 @@ LDADD = \ ${top_builddir}/lib/libnl-route-3.la \ ${top_builddir}/lib/libnl-idiag-3.la -sbin_PROGRAMS = \ +cli_programs = \ genl-ctrl-list \ - nl-class-add \ - nl-class-delete \ - nl-classid-lookup \ - nl-class-list \ - nl-cls-add \ - nl-cls-delete \ - nl-cls-list \ - nl-link-list \ - nl-pktloc-lookup \ - nl-qdisc-add \ - nl-qdisc-delete \ - nl-qdisc-list - -noinst_PROGRAMS = \ idiag-socket-details \ nf-ct-add \ nf-ct-list \ @@ -47,9 +33,17 @@ noinst_PROGRAMS = \ nl-addr-add \ nl-addr-delete \ nl-addr-list \ + nl-class-add \ + nl-class-delete \ + nl-classid-lookup \ + nl-class-list \ + nl-cls-add \ + nl-cls-delete \ + nl-cls-list \ nl-fib-lookup \ nl-link-enslave \ nl-link-ifindex2name \ + nl-link-list \ nl-link-name2ifindex \ nl-link-release \ nl-link-set \ @@ -61,6 +55,10 @@ noinst_PROGRAMS = \ nl-neigh-delete \ nl-neigh-list \ nl-neightbl-list \ + nl-pktloc-lookup \ + nl-qdisc-add \ + nl-qdisc-delete \ + nl-qdisc-list \ nl-route-add \ nl-route-delete \ nl-route-get \ @@ -69,6 +67,16 @@ noinst_PROGRAMS = \ nl-tctree-list \ nl-util-addr +if ENABLE_CLI_INSTALL_BIN +bin_PROGRAMS = $(cli_programs) +else +if ENABLE_CLI_INSTALL_SBIN +sbin_PROGRAMS = $(cli_programs) +else +noinst_PROGRAMS = $(cli_programs) +endif +endif + genl_ctrl_list_SOURCES = genl-ctrl-list.c nf_ct_list_SOURCES = nf-ct-list.c |