Commit 82cc4d10 authored by Hendryk Bockelmann's avatar Hendryk Bockelmann
Browse files

Merge branch 'config_leftover' into 'master'

Clean-up and gitignore a.out.

See merge request dkrz-sw/sct!6
parents 55b483af 4ddfbc8b
...@@ -41,6 +41,7 @@ Makefile ...@@ -41,6 +41,7 @@ Makefile
Doxyfile Doxyfile
stamp-h1 stamp-h1
stamp-h2 stamp-h2
a.out
# Common files created by make # Common files created by make
...@@ -48,3 +49,7 @@ stamp-h2 ...@@ -48,3 +49,7 @@ stamp-h2
*.lo *.lo
*.la *.la
*.o *.o
# Files created by MacOS
*.dSYM
.DS_Store
...@@ -6,7 +6,7 @@ verlte() { ...@@ -6,7 +6,7 @@ verlte() {
autoreconf -fvi || exit $? autoreconf -fvi || exit $?
libtool_version=`libtool --version | awk 'NR==1 {print $4}'` libtool_version=`{ libtool --version 2>/dev/null || glibtool --version 2>/dev/null; } | awk 'NR==1 {print $4}'`
verlte $libtool_version 2.4.2 && { verlte $libtool_version 2.4.2 && {
# fix m4/libtool.m4 for nagfor sharedflag # fix m4/libtool.m4 for nagfor sharedflag
......
...@@ -21,6 +21,8 @@ AM_EXTRA_RECURSIVE_TARGETS([doc]) ...@@ -21,6 +21,8 @@ AM_EXTRA_RECURSIVE_TARGETS([doc])
AC_CONFIG_SRCDIR([src/sct_reporter.c]) AC_CONFIG_SRCDIR([src/sct_reporter.c])
LT_INIT([pic-only]) LT_INIT([pic-only])
dnl Clean up after Libtool checks for C compiler:
rm -f a.out
# #
# information on the package # information on the package
...@@ -171,6 +173,8 @@ AX_PROG_CC_MPI([test x"$mpi" != xfalse], ...@@ -171,6 +173,8 @@ AX_PROG_CC_MPI([test x"$mpi" != xfalse],
fi]) fi])
AC_PROG_FC AC_PROG_FC
dnl Clean up after Libtool checks for Fortran compiler:
rm -f a.out
AX_PROG_FC_MPI([test x"$mpi" != xfalse], AX_PROG_FC_MPI([test x"$mpi" != xfalse],
[], [],
[if test x"$mpi" = xtrue; then [if test x"$mpi" = xtrue; then
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment