Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
df2306ff
Commit
df2306ff
authored
7 years ago
by
Alejandro Sanchez
Committed by
Danny Auble
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Detect systemd presence, version and system unit dir at configure time.
Bug 3526
parent
113a60cc
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
auxdir/Makefile.am
+2
-1
2 additions, 1 deletion
auxdir/Makefile.am
auxdir/x_ac_systemd.m4
+60
-0
60 additions, 0 deletions
auxdir/x_ac_systemd.m4
configure.ac
+5
-0
5 additions, 0 deletions
configure.ac
with
67 additions
and
1 deletion
auxdir/Makefile.am
+
2
−
1
View file @
df2306ff
...
...
@@ -35,4 +35,5 @@ EXTRA_DIST = \
x_ac_readline.m4
\
x_ac_setproctitle.m4
\
x_ac_sgi_job.m4
\
x_ac_slurm_ssl.m4
x_ac_slurm_ssl.m4
\
x_ac_systemd.m4
This diff is collapsed.
Click to expand it.
auxdir/x_ac_systemd.m4
0 → 100644
+
60
−
0
View file @
df2306ff
##*****************************************************************************
# AUTHOR:
# Written by Alejandro Sanchez - alex@schedmd.com
#
# SYNOPSIS:
# X_AC_SYSTEMD
#
# DESCRIPTION:
# Determine systemd presence
# Determine systemd version
# Determine systemd system unit dir
##*****************************************************************************
AC_DEFUN([X_AC_SYSTEMD],
[
AC_CACHE_CHECK([for systemd presence],
[_cv_systemd_presence],
[PKG_CHECK_EXISTS([systemd],
[_cv_systemd_presence=yes],
[_cv_systemd_presence=no])])
if [ test "x$_cv_systemd_presence" != "xno" ]; then
AC_DEFINE([HAVE_SYSTEMD],
[1],
[Define systemd presence])
AC_CACHE_CHECK([for systemd version],
[_cv_systemd_version],
[AS_IF([_cv_systemd_version=$($PKG_CONFIG --modversion systemd 2>/dev/null)],
[],
[_cv_systemd_version=no])])
AS_IF([test "x$_cv_systemd_version" != "xno"],
[AC_DEFINE([SYSTEMD_VERSION],
[$_cv_systemd_version],
[Define systemd version identified])]
[AM_CONDITIONAL([HAVE_SYSTEMD_TASKSMAX],
[ test -n "$_cv_systemd_version" && test "$_cv_systemd_version" -ge 227 ])]
[AM_COND_IF([HAVE_SYSTEMD_TASKSMAX],
[AC_SUBST([SYSTEMD_TASKSMAX_OPTION], ["TasksMax=infinity"])],
[AC_SUBST([SYSTEMD_TASKSMAX_OPTION], [""])])])
# In the future we might want to enable the configure option
# --with-systemdsystemunitdir=DIR, so that users can specify
# at configure time the directory to install the .service files.
# https://www.freedesktop.org/software/systemd/man/daemon.html#Installing%20Systemd%20Service%20Files
#AC_CACHE_CHECK([for systemd system unit dir],
# [_cv_systemd_systemunitdir],
# [PKG_CHECK_VAR([SYSTEMD_SYSTEM_UNIT_DIR],
# [systemd],
# [systemdsystemunitdir],
# [_cv_systemd_systemunitdir=$SYSTEMD_SYSTEM_UNIT_DIR],
# [_cv_systemd_systemunitdir=no])])
fi
])
This diff is collapsed.
Click to expand it.
configure.ac
+
5
−
0
View file @
df2306ff
...
...
@@ -352,6 +352,11 @@ X_AC_SLURM_WITH_SSL
AM_CONDITIONAL(HAVE_OPENSSL, test "x$ac_have_openssl" = "xyes")
AC_SUBST(HAVE_OPENSSL)
dnl
dnl Check for systemd presence, version and system unit dir
dnl
X_AC_SYSTEMD
dnl
dnl Check for compilation of SLURM auth modules:
dnl
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment