Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Y
yaxt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dkrz-sw
yaxt
Commits
6a49c8b1
Commit
6a49c8b1
authored
1 year ago
by
Thomas Jahns
Browse files
Options
Downloads
Patches
Plain Diff
configure: Add fix for autoconf 2.70 and 2.71.
* The C compiler selection got some major updates in both releases.
parent
2cd43a60
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure.ac
+15
-6
15 additions, 6 deletions
configure.ac
with
15 additions
and
6 deletions
configure.ac
+
15
−
6
View file @
6a49c8b1
...
...
@@ -79,13 +79,22 @@ dnl Only substitute MAKE in Makefiles if actually needed
AC_PROG_MAKE_SET
AM_SUBST_NOTMAKE([MAKE])
dnl Require an ISO C99 compliant C compiler
m4_pushdef([_AC_PROG_CC_C89],
[_AC_PROG_CC_C99(,[AC_MSG_FAILURE([CC=$CC is not an ISO C99 compiler])])])
m4_pushdef([_AM_PROG_CC_C_O],m4_bpatsubst(m4_dquote(m4_defn([_AM_PROG_CC_C_O])),
[rm -f\(.* conftest\*.*\)], [rm -rf\1]))dnl
m4_pushdef(m4_case(m4_version_compare(AC_AUTOCONF_VERSION,[2.70]),
[-1],[[_AC_PROG_CC_C89]],
[0],[[_AC_PROG_CC_C11]],
[1],[[_AC_PROG_CC_STDC_EDITION]]),
[rm -rf conftest.dSYM # needed when configured on MacOS with CFLAGS='-g'
m4_case(m4_cmp(m4_version_compare(AC_AUTOCONF_VERSION,[2.71]),[-1]),
[0],[_AC_PROG_CC_C99(,[AC_MSG_FAILURE([CC=$CC is not an ISO C99 compiler])])],
[1],[ac_prog_cc_stdc=no
_AC_PROG_CC_STDC_EDITION_TRY([99])
AS_IF([test "x$ac_prog_cc_stdc" != xc99],
[AC_MSG_FAILURE([CC=$CC is not an ISO C99 compiler])])])])dnl
AC_PROG_CC([mpicc mpiicc mpxlc_r mpixlc_r gcc cc])
m4_popdef([_AM_PROG_CC_C_O])
m4_popdef([_AC_PROG_CC_C89])
m4_popdef(m4_case(m4_version_compare(AC_AUTOCONF_VERSION,[2.70]),
[-1],[[_AC_PROG_CC_C89]],
[0],[[_AC_PROG_CC_C11]],
[1],[[_AC_PROG_CC_STDC_EDITION]]))dnl
AX_PTHREAD([AC_DEFINE([HAVE_PTHREAD],1,[Define if you have POSIX threads libraries and header files.])
LIBS="$PTHREAD_LIBS $LIBS"
...
...
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