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>

diff --git a/ceph.spec.in b/ceph.spec.in
index 895252da81952ed61a1387405be89f7027b94f75..b54054c8551ded43aca9bc0b82383dfe29bf13de 100644 (file)
--- 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 11bfad316244735580dccc449badfa21b2a383b4..e32bbea3a916961aeb842e56f21c825251087da9 100644 (file)
--- 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,