diff options
| -rw-r--r-- | src/Makefile.am | 9 | ||||
| -rw-r--r-- | src/main.c | 46 |
2 files changed, 54 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9142ab44..3041a933 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,6 +13,15 @@ endif if BUILD_XTABLES AM_CPPFLAGS += ${XTABLES_CFLAGS} endif +if BUILD_MINIGMP +AM_CPPFLAGS += -DHAVE_MINIGMP +endif +if BUILD_JSON +AM_CPPFLAGS += -DHAVE_JSON +endif +if BUILD_XTABLES +AM_CPPFLAGS += -DHAVE_XTABLES +endif AM_CFLAGS = -Wall \ -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \ @@ -27,6 +27,7 @@ static struct nft_ctx *nft; enum opt_vals { OPT_HELP = 'h', OPT_VERSION = 'v', + OPT_VERSION_LONG = 'V', OPT_CHECK = 'c', OPT_FILE = 'f', OPT_INTERACTIVE = 'i', @@ -46,7 +47,7 @@ enum opt_vals { OPT_TERSE = 't', OPT_INVALID = '?', }; -#define OPTSTRING "+hvd:cf:iI:jvnsNaeSupypTt" +#define OPTSTRING "+hvVd:cf:iI:jvnsNaeSupypTt" static const struct option options[] = { { @@ -141,6 +142,7 @@ static void show_help(const char *name) "Options:\n" " -h, --help Show this help\n" " -v, --version Show version information\n" +" -V Show extended version information\n" "\n" " -c, --check Check commands validity without actually applying the changes.\n" " -f, --file <filename> Read input from <filename>\n" @@ -164,6 +166,45 @@ static void show_help(const char *name) name, DEFAULT_INCLUDE_PATH); } +static void show_version(void) +{ + const char *cli, *minigmp, *json, *xt; + +#if defined(HAVE_LIBREADLINE) + cli = "readline"; +#elif defined(HAVE_LIBLINENOISE) + cli = "linenoise"; +#else + cli = "no"; +#endif + +#if defined(HAVE_MINIGMP) + minigmp = "yes"; +#else + minigmp = "no"; +#endif + +#if defined(HAVE_JSON) + json = "yes"; +#else + json = "no"; +#endif + +#if defined(HAVE_XTABLES) + xt = "yes"; +#else + xt = "no"; +#endif + + printf("%s v%s (%s)\n" + " cli: %s\n" + " json: %s\n" + " minigmp: %s\n" + " libxtables: %s\n", + PACKAGE_NAME, PACKAGE_VERSION, RELEASE_NAME, + cli, minigmp, json, xt); +} + static const struct { const char *name; enum nft_debug_level level; @@ -272,6 +313,9 @@ int main(int argc, char * const *argv) printf("%s v%s (%s)\n", PACKAGE_NAME, PACKAGE_VERSION, RELEASE_NAME); exit(EXIT_SUCCESS); + case OPT_VERSION_LONG: + show_version(); + exit(EXIT_SUCCESS); case OPT_CHECK: nft_ctx_set_dry_run(nft, true); break; |