From a6cc8ea5d96b308f7b5324efcd23b3296c8239e2 Mon Sep 17 00:00:00 2001
From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 15 Feb 2016 19:54:14 +0100
Subject: [PATCH] rpm: drop systemd_libexec_dir template variable

General cleanup. Actual use of the template variable was discontinued in
7c9fdf44f2c18659a0bcc03f7b98dafdf9f54448.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---
 ceph.spec.in |  6 ------
 configure.ac | 41 -----------------------------------------
 2 files changed, 47 deletions(-)

diff --git a/ceph.spec.in b/ceph.spec.in
index 895252da8195..b54054c8551d 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -615,12 +615,6 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
 		--with-selinux \
 %endif
 		--with-librocksdb-static=check \
-%if 0%{?rhel} || 0%{?fedora}
-		--with-systemd-libexec-dir=/usr/libexec/ceph \
-%endif
-%if 0%{?suse_version}
-		--with-systemd-libexec-dir=/usr/lib/ceph/ \
-%endif
 		--with-radosgw \
 		$CEPH_EXTRA_CONFIGURE_ARGS \
 		%{?_with_ocf} \
diff --git a/configure.ac b/configure.ac
index 11bfad316244..e32bbea3a916 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1234,47 +1234,6 @@ if test "x$enable_valgrind" = "xyes"; then
   AC_CHECK_HEADERS([valgrind/helgrind.h])
 fi
 
-dnl systemd-libexec-dir
-AC_SUBST(systemd_libexec_dir)
-AC_ARG_WITH(
-    systemd-libexec-dir,
-    AS_HELP_STRING(
-	    [--with-systemd-libexec-dir=DIR],
-	    [systemd libexec directory @<:@SYSTEMD_LIBEXEC_DIR@:>@
-        defaults to --libexecdir=DIR]
-    ),
-    [
-	    systemd_libexec_dir="$withval"
-    ],
-    [
-        if test "x$SYSTEMD_LIBEXEC_DIR" = "x"; then
-            dnl store old values
-
-            prefix_save=$prefix
-            exec_prefix_save=$exec_prefix
-
-            dnl if no prefix given, then use /usr/local, the default prefix
-            if test "x$prefix" = "xNONE"; then
-                prefix="$ac_default_prefix"
-            fi
-            dnl if no exec_prefix given, then use prefix
-            if test "x$exec_prefix" = "xNONE"; then
-                exec_prefix=$prefix
-            fi
-
-            dnl now get the expanded default
-            systemd_libexec_dir="`eval exec_prefix=$exec_prefix prefix=$prefix echo $libexecdir`"
-
-            dnl now cleanup prefix and exec_prefix
-
-            prefix=$prefix_save
-            exec_prefix=$exec_prefix_save
-        else
-            systemd_libexec_dir="$SYSTEMD_LIBEXEC_DIR"
-        fi
-    ]
-)
-
 AC_SUBST(systemd_unit_dir)
 AC_ARG_WITH(
     systemd-unit-dir,
-- 
2.47.3