1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

Add configure --with-systemdsystemunitdir.

This commit is contained in:
Peter Rajnoha 2012-02-13 13:02:47 +00:00
parent 424f6dc4ad
commit e587cb6ac5
4 changed files with 41 additions and 1 deletions

View File

@ -1,5 +1,6 @@
Version 2.02.92 -
====================================
Add configure --with-systemdsystemunitdir.
Add check for allocation failure in _build_matcher().
Add check for rimage name allocation failure in _raid_add_images().
Add check for mda_copy failure in _text_pv_setup().

22
configure vendored
View File

@ -596,6 +596,7 @@ ac_default_prefix=/usr
ac_subst_vars='LTLIBOBJS
usrsbindir
usrlibdir
systemdsystemunitdir
udevdir
udev_prefix
tmpdir
@ -840,6 +841,7 @@ with_usrlibdir
with_usrsbindir
with_udev_prefix
with_udevdir
with_systemdsystemunitdir
with_dmeventd_pidfile
with_dmeventd_path
with_default_run_dir
@ -1580,6 +1582,8 @@ Optional Packages:
--with-udev-prefix=UPREFIX
install udev rule files in UPREFIX [[EPREFIX]]
--with-udevdir=DIR udev rules in DIR [[UPREFIX/lib/udev/rules.d]]
--with-systemdsystemunitdir=DIR
systemd service files in DIR
--with-dmeventd-pidfile=PATH
dmeventd pidfile [[/var/run/dmeventd.pid]]
--with-dmeventd-path=PATH
@ -9700,6 +9704,23 @@ else
fi
################################################################################
# Check whether --with-systemdsystemunitdir was given.
if test "${with_systemdsystemunitdir+set}" = set; then :
withval=$with_systemdsystemunitdir; systemdsystemunitdir=$withval
else
pkg_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
fi
if test -n "$pkg_systemdsystemunitdir"; then
systemdsystemunitdir=$pkg_systemdsystemunitdir;
fi
if test -z "$systemdsystemunitdir"; then
systemdsystemunitdir='/lib/systemd/system';
fi
################################################################################
if test x$READLINE = xyes; then
for ac_header in readline/readline.h readline/history.h
@ -10343,6 +10364,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`
################################################################################

View File

@ -1167,6 +1167,22 @@ AC_ARG_WITH(udevdir,
[udev rules in DIR [[UPREFIX/lib/udev/rules.d]]]),
udevdir=$withval, udevdir='${udev_prefix}/lib/udev/rules.d')
################################################################################
dnl -- Get the systemd system unit dir value from pkg_config automatically if value not given explicitly.
dnl -- This follows the recommendation for systemd integration best practices mentioned in daemon(7) manpage.
AC_ARG_WITH(systemdsystemunitdir,
AC_HELP_STRING([--with-systemdsystemunitdir=DIR],
[systemd service files in DIR]),
systemdsystemunitdir=$withval,
pkg_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd))
if test -n "$pkg_systemdsystemunitdir"; then
systemdsystemunitdir=$pkg_systemdsystemunitdir;
fi
if test -z "$systemdsystemunitdir"; then
systemdsystemunitdir='/lib/systemd/system';
fi
################################################################################
dnl -- Ensure additional headers required
if test x$READLINE = xyes; then
@ -1435,6 +1451,7 @@ AC_SUBST(kernelvsn)
AC_SUBST(tmpdir)
AC_SUBST(udev_prefix)
AC_SUBST(udevdir)
AC_SUBST(systemdsystemunitdir)
AC_SUBST(usrlibdir)
AC_SUBST(usrsbindir)

View File

@ -66,7 +66,7 @@ staticdir = $(DESTDIR)@STATICDIR@
udevdir = $(DESTDIR)@udevdir@
pkgconfigdir = $(usrlibdir)/pkgconfig
initdir = $(DESTDIR)@sysconfdir@/rc.d/init.d
systemd_dir = $(DESTDIR)/lib/systemd/system
systemd_dir = $(DESTDIR)/@systemdsystemunitdir@
ocf_scriptdir = $(DESTDIR)@OCFDIR@
USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \