forked from SchedMD/slurm
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'slurm-22.05' into 22.05.10.ug
- Loading branch information
Showing
128 changed files
with
3,876 additions
and
2,499 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -426,7 +426,7 @@ main () | |
| rm -f conf.gtktest | ||
| ]) | ||
|
|
||
| # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | ||
| # pkg.m4 - Macros to locate and use pkg-config. -*- Autoconf -*- | ||
| # serial 12 (pkg-config-0.29.2) | ||
|
|
||
| dnl Copyright © 2004 Scott James Remnant <[email protected]>. | ||
|
|
@@ -514,7 +514,7 @@ dnl Check to see whether a particular set of modules exists. Similar to | |
| dnl PKG_CHECK_MODULES(), but does not set variables or print errors. | ||
| dnl | ||
| dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | ||
| dnl only at the first occurence in configure.ac, so if the first place | ||
| dnl only at the first occurrence in configure.ac, so if the first place | ||
| dnl it's called might be skipped (such as if it is within an "if", you | ||
| dnl have to call PKG_CHECK_EXISTS manually | ||
| AC_DEFUN([PKG_CHECK_EXISTS], | ||
|
|
@@ -583,14 +583,14 @@ if test $pkg_failed = yes; then | |
| AC_MSG_RESULT([no]) | ||
| _PKG_SHORT_ERRORS_SUPPORTED | ||
| if test $_pkg_short_errors_supported = yes; then | ||
| $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` | ||
| $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` | ||
| else | ||
| $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` | ||
| $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` | ||
| fi | ||
| # Put the nasty error message in config.log where it belongs | ||
| echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD | ||
| # Put the nasty error message in config.log where it belongs | ||
| echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD | ||
| m4_default([$4], [AC_MSG_ERROR( | ||
| m4_default([$4], [AC_MSG_ERROR( | ||
| [Package requirements ($2) were not met: | ||
| $$1_PKG_ERRORS | ||
|
|
@@ -602,7 +602,7 @@ _PKG_TEXT])[]dnl | |
| ]) | ||
| elif test $pkg_failed = untried; then | ||
| AC_MSG_RESULT([no]) | ||
| m4_default([$4], [AC_MSG_FAILURE( | ||
| m4_default([$4], [AC_MSG_FAILURE( | ||
| [The pkg-config script could not be found or is too old. Make sure it | ||
| is in your PATH or set the PKG_CONFIG environment variable to the full | ||
| path to pkg-config. | ||
|
|
@@ -612,10 +612,10 @@ _PKG_TEXT | |
| To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl | ||
| ]) | ||
| else | ||
| $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS | ||
| $1[]_LIBS=$pkg_cv_[]$1[]_LIBS | ||
| $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS | ||
| $1[]_LIBS=$pkg_cv_[]$1[]_LIBS | ||
| AC_MSG_RESULT([yes]) | ||
| $3 | ||
| $3 | ||
| fi[]dnl | ||
| ])dnl PKG_CHECK_MODULES | ||
|
|
||
|
|
@@ -702,6 +702,74 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) | |
| AS_VAR_IF([$1], [""], [$5], [$4])dnl | ||
| ])dnl PKG_CHECK_VAR | ||
|
|
||
| dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||
| dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], | ||
| dnl [DESCRIPTION], [DEFAULT]) | ||
| dnl ------------------------------------------ | ||
| dnl | ||
| dnl Prepare a "--with-" configure option using the lowercase | ||
| dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and | ||
| dnl PKG_CHECK_MODULES in a single macro. | ||
| AC_DEFUN([PKG_WITH_MODULES], | ||
| [ | ||
| m4_pushdef([with_arg], m4_tolower([$1])) | ||
| m4_pushdef([description], | ||
| [m4_default([$5], [build with ]with_arg[ support])]) | ||
| m4_pushdef([def_arg], [m4_default([$6], [auto])]) | ||
| m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) | ||
| m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) | ||
| m4_case(def_arg, | ||
| [yes],[m4_pushdef([with_without], [--without-]with_arg)], | ||
| [m4_pushdef([with_without],[--with-]with_arg)]) | ||
| AC_ARG_WITH(with_arg, | ||
| AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, | ||
| [AS_TR_SH([with_]with_arg)=def_arg]) | ||
| AS_CASE([$AS_TR_SH([with_]with_arg)], | ||
| [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], | ||
| [auto],[PKG_CHECK_MODULES([$1],[$2], | ||
| [m4_n([def_action_if_found]) $3], | ||
| [m4_n([def_action_if_not_found]) $4])]) | ||
| m4_popdef([with_arg]) | ||
| m4_popdef([description]) | ||
| m4_popdef([def_arg]) | ||
| ])dnl PKG_WITH_MODULES | ||
|
|
||
| dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||
| dnl [DESCRIPTION], [DEFAULT]) | ||
| dnl ----------------------------------------------- | ||
| dnl | ||
| dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES | ||
| dnl check._[VARIABLE-PREFIX] is exported as make variable. | ||
| AC_DEFUN([PKG_HAVE_WITH_MODULES], | ||
| [ | ||
| PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) | ||
| AM_CONDITIONAL([HAVE_][$1], | ||
| [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) | ||
| ])dnl PKG_HAVE_WITH_MODULES | ||
|
|
||
| dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, | ||
| dnl [DESCRIPTION], [DEFAULT]) | ||
| dnl ------------------------------------------------------ | ||
| dnl | ||
| dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after | ||
| dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make | ||
| dnl and preprocessor variable. | ||
| AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], | ||
| [ | ||
| PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) | ||
| AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], | ||
| [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) | ||
| ])dnl PKG_HAVE_DEFINE_WITH_MODULES | ||
|
|
||
| # Copyright (C) 2002-2021 Free Software Foundation, Inc. | ||
| # | ||
| # This file is free software; the Free Software Foundation | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.