build-sys: perform autodetection of quota-tools binaries

Use AC_PATH_PROG to try and locate the quotaon and quotacheck binaries,
falling back on hardcoded defaults when they can't be found.
This commit is contained in:
Dave Reisner 2012-09-02 17:28:30 -04:00 committed by Lennart Poettering
parent 742a862bb8
commit b51fc639f0
5 changed files with 13 additions and 3 deletions

View File

@ -382,6 +382,7 @@ EXTRA_DIST += \
units/debug-shell.service.in \ units/debug-shell.service.in \
units/systemd-hibernate.service.in \ units/systemd-hibernate.service.in \
units/systemd-suspend.service.in \ units/systemd-suspend.service.in \
units/quotaon.service.in \
introspect.awk \ introspect.awk \
man/custom-html.xsl man/custom-html.xsl
@ -2794,6 +2795,9 @@ endif
EXTRA_DIST += \ EXTRA_DIST += \
units/systemd-quotacheck.service.in units/systemd-quotacheck.service.in
nodist_systemunit_DATA += \
units/quotaon.service
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
if ENABLE_RANDOMSEED if ENABLE_RANDOMSEED
rootlibexec_PROGRAMS += \ rootlibexec_PROGRAMS += \
@ -3427,6 +3431,8 @@ SED_PROCESS = \
-e 's,@rootprefix\@,$(rootprefix),g' \ -e 's,@rootprefix\@,$(rootprefix),g' \
-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \ -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
-e 's,@sushell\@,$(sushell),g' \ -e 's,@sushell\@,$(sushell),g' \
-e 's,@QUOTAON\@,$(QUOTAON),g' \
-e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
< $< > $@ < $< > $@
units/%: units/%.in Makefile units/%: units/%.in Makefile

View File

@ -64,6 +64,9 @@ AC_PROG_GCC_TRADITIONAL
AC_PATH_PROG([M4], [m4]) AC_PATH_PROG([M4], [m4])
AC_PATH_PROG([XSLTPROC], [xsltproc]) AC_PATH_PROG([XSLTPROC], [xsltproc])
AC_PATH_PROG([QUOTAON], [quotaon], [/sbin/quotaon])
AC_PATH_PROG([QUOTACHECK], [quotacheck], [/sbin/quotacheck])
# gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
m4_ifdef([GTK_DOC_CHECK], [ m4_ifdef([GTK_DOC_CHECK], [
GTK_DOC_CHECK([1.18],[--flavour no-tmpl]) GTK_DOC_CHECK([1.18],[--flavour no-tmpl])

1
units/.gitignore vendored
View File

@ -14,6 +14,7 @@
/rescue.service /rescue.service
/systemd-ask-password-wall.service /systemd-ask-password-wall.service
/systemd-quotacheck.service /systemd-quotacheck.service
/quotaon.service
/systemd-fsck@.service /systemd-fsck@.service
/systemd-fsck-root.service /systemd-fsck-root.service
/systemd-tmpfiles-clean.service /systemd-tmpfiles-clean.service

View File

@ -11,9 +11,9 @@ Documentation=man:quotaon(8)
DefaultDependencies=no DefaultDependencies=no
After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-quotacheck.service After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-quotacheck.service
Before=local-fs.target shutdown.target Before=local-fs.target shutdown.target
ConditionPathExists=/sbin/quotaon ConditionPathExists=@QUOTAON@
[Service] [Service]
Type=oneshot Type=oneshot
RemainAfterExit=yes RemainAfterExit=yes
ExecStart=/sbin/quotaon -aug ExecStart=@QUOTAON@ -aug

View File

@ -11,7 +11,7 @@ Documentation=man:systemd-quotacheck.service(8)
DefaultDependencies=no DefaultDependencies=no
After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service
Before=local-fs.target shutdown.target Before=local-fs.target shutdown.target
ConditionPathExists=/sbin/quotacheck ConditionPathExists=@QUOTACHECK@
[Service] [Service]
Type=oneshot Type=oneshot