Hi everyone,

Please find attached removing the unused "--with-distro-version" configure
option.

Sincerely,
Nick
>From c7391960ced0866fe1bd9b43d729224248ce4a47 Mon Sep 17 00:00:00 2001
From: Nikolai Kondrashov <nikolai.kondras...@redhat.com>
Date: Wed, 19 Mar 2014 12:57:42 +0200
Subject: [PATCH 1/1] Remove --with-distro-version

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.
---
 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 8295139..b4f9221 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 7111859..87e1eef 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 9470075..7f8ef41 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;
     }
 
-- 
1.9.0

_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/sssd-devel

Reply via email to