From d880cd72bf9ac203da973a56c4737b3ac05706a8 Mon Sep 17 00:00:00 2001 From: Nikolai Kondrashov Date: Wed, 19 Mar 2014 12:57:42 +0200 Subject: Remove --with-distro-version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove support for "--with-distro-version" configure option as unused. The option was added in August 2011 (d3da1c1). As of now nothing seems to use it. Packaging checked: rpm, deb, pacman, ebuilds, FreeBSD ports. Reviewed-by: Lukáš Slebodník --- configure.ac | 1 - src/conf_macros.m4 | 11 ----------- src/monitor/monitor.c | 2 +- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 82951396a..b4f9221fb 100644 --- a/configure.ac +++ b/configure.ac @@ -95,7 +95,6 @@ AC_SUBST(pammoddir) m4_include([src/external/platform.m4]) m4_include(src/conf_macros.m4) -WITH_DISTRO_VERSION WITH_DB_PATH WITH_PLUGIN_PATH WITH_PID_PATH diff --git a/src/conf_macros.m4 b/src/conf_macros.m4 index 71118593c..87e1eefe1 100644 --- a/src/conf_macros.m4 +++ b/src/conf_macros.m4 @@ -1,14 +1,3 @@ -AC_DEFUN([WITH_DISTRO_VERSION], - [ AC_ARG_WITH([distro-version], - [AC_HELP_STRING([--with-distro-version=VERSION], - [Distro version number []] - ) - ] - ) - AC_DEFINE_UNQUOTED(DISTRO_VERSION, "$with_distro_version", - [Distro version number]) - ]) - AC_DEFUN([WITH_DB_PATH], [ AC_ARG_WITH([db-path], [AC_HELP_STRING([--with-db-path=PATH], diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index 9470075b5..7f8ef412e 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -2690,7 +2690,7 @@ int main(int argc, const char *argv[]) DEBUG_INIT(debug_level); if (opt_version) { - puts(VERSION""DISTRO_VERSION""PRERELEASE_VERSION); + puts(VERSION""PRERELEASE_VERSION); return EXIT_SUCCESS; } -- cgit