Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libcdi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
mpim-sw
libcdi
Commits
bb836648
Commit
bb836648
authored
5 years ago
by
Sergey Kosukhin
Browse files
Options
Downloads
Patches
Plain Diff
Clean-up files that are generated by libtool at the configure time.
parent
e9e6e70d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure.ac
+7
-0
7 additions, 0 deletions
configure.ac
m4/acx_check_cfortran.m4
+3
-0
3 additions, 0 deletions
m4/acx_check_cfortran.m4
with
10 additions
and
0 deletions
configure.ac
+
7
−
0
View file @
bb836648
...
...
@@ -488,6 +488,13 @@ dnl
COMPILER="$CC $CFLAGS"
AC_DEFINE_UNQUOTED(COMPILER, ["$COMPILER"], [Compiler])
dnl Once all the compiling/linking checks are run, we can try to delete the
dnl directory generated by libtool. Unfortunately, there is no reasonable way
dnl to add the following commands to the trap code of the configure script,
dnl which would be more reliable.
rm -f "${objdir}/conftest.${OBJEXT}"
rmdir "$objdir" 2>/dev/null
AC_CONFIG_FILES([tests/test_cksum_grib \
tests/test_cksum_grib2 \
tests/test_cksum_nc \
...
...
This diff is collapsed.
Click to expand it.
m4/acx_check_cfortran.m4
+
3
−
0
View file @
bb836648
...
...
@@ -122,6 +122,7 @@ AC_DEFUN([_ACX_CHECK_CFORTRAN_FC],
[AC_MSG_NOTICE([Skipping run test for cfortran.h in cross-compilation mode,])
AC_MSG_NOTICE([cfortran.h link test succeeded for $FC.])
acx_cv_cfortran_works=yes])
rm -f conftest_data* CONFTEST_DATA* "conftest_f.$ac_objext" "conftest_f.$OBJEXT" ".libs/conftest_f.$OBJEXT"
LIBS=$save_LIBS],
[acx_cv_cfortran_works="error compiling Fortran subroutine"])
AC_LANG_POP([Fortran])])
...
...
@@ -192,6 +193,7 @@ AC_DEFUN([_ACX_CHECK_CFORTRAN_F77],
[AC_MSG_NOTICE([Skipping run test for cfortran.h in cross-compilation mode,])
AC_MSG_NOTICE([cfortran.h link test succeeded for $F77.])
acx_cv_cfortran_works=yes])
rm -f "conftest_f.$ac_objext" "conftest_f.$OBJEXT" ".libs/conftest_f.$OBJEXT"
LIBS=$save_LIBS],
[acx_cv_cfortran_works="error compiling Fortran subroutine"])
AC_LANG_POP([Fortran 77])])
...
...
@@ -263,6 +265,7 @@ FCALLSCSUB0(errExit,ERR_EXIT,err_exit)
[acx_cv_cfortran_works=${acx_cv_cfortran_works-yes}])])
AC_PROVIDE_IFELSE([AC_PROG_F77],
[AS_IF([test -n "$F77" -a X"$F77" != Xno AC_PROVIDE_IFELSE([AC_PROG_FC],[-a x"$acx_cv_cfortran_works" = xyes])],[_ACX_CHECK_CFORTRAN_F77])])
rm -f "conftest_c.$ac_objext" "conftest_c.$OBJEXT" ".libs/conftest_c.$OBJEXT"
],
[acx_cv_cfortran_works="compiling with cfortran.h failed"])
AC_LANG_POP([C])
...
...
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