summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac>2010-03-26 21:24:30 +0000
committerschnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac>2010-03-26 21:24:30 +0000
commitb2acecab88ed635e468dc70e42a4db45117725ec (patch)
tree5a999406048d144f35f4ad64d5c633c11d9c3df4
parent3dba410dab86db4baf9183d4429f61d7d9569593 (diff)
Add the names that gcc has on Mac OS when installed from the Mac Ports
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4601 17b73243-c579-4c4c-a9d2-2d5706c11dac
-rwxr-xr-xlib/make/configure12
-rw-r--r--lib/make/configure.in8
2 files changed, 10 insertions, 10 deletions
diff --git a/lib/make/configure b/lib/make/configure
index 662b3561..9ee611c4 100755
--- a/lib/make/configure
+++ b/lib/make/configure
@@ -852,7 +852,7 @@ fi
if test -z "$CC" ; then
- for ac_prog in gcc cc cl xlc
+ for ac_prog in gcc-mp-4.4 gcc-mp-4.3 gcc-mp-4.2 gcc cc cl xlc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -963,7 +963,7 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
if test "x$CXX" != 'xnone' ; then
if test -z "$CXX" ; then
- for ac_prog in c++ g++ gcc CC cxx cc++ cl xlC
+ for ac_prog in g++-mp-4.4 g++-mp-4.2 g++-mp-4.2 c++ g++ gcc CC cxx cc++ cl xlC
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -1232,7 +1232,7 @@ done
fi
if test -z "$F90" ; then
- for ac_prog in f90 pgf90 xlf90 ifort gfortran
+ for ac_prog in f90 pgf90 xlf90 ifort gfortran-mp-4.4 gfortran-mp-4.3 gfortran-mp-4.2 gfortran
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -1269,7 +1269,7 @@ done
fi
if test -z "$F77" ; then
- for ac_prog in f77 pgf77 g77 f90 pgf90 xlf90 ifort gfortran
+ for ac_prog in f77 pgf77 g77 f90 pgf90 xlf90 ifort gfortran-mp-4.4 gfortran-mp-4.3 gfortran-mp-4.2 gfortran
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5429,10 +5429,10 @@ cat > conftest.$ac_ext <<EOF
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char uzSGED;
+char yQvOsr;
int main() {
-A58b58
+zr9MtX
; return 0; }
EOF
if { (eval echo configure:5439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff --git a/lib/make/configure.in b/lib/make/configure.in
index 910d7354..0d934d5e 100644
--- a/lib/make/configure.in
+++ b/lib/make/configure.in
@@ -159,7 +159,7 @@ dnl Checks for programs.
AC_PROG_MAKE_SET
if test -z "$CC" ; then
- AC_CHECK_PROGS(CC, gcc cc cl xlc)
+ AC_CHECK_PROGS(CC, gcc-mp-4.4 gcc-mp-4.3 gcc-mp-4.2 gcc cc cl xlc)
fi
CCTK_PROG_CC_WORKS
@@ -167,7 +167,7 @@ AC_PROG_CC_GNU
if test "x$CXX" != 'xnone' ; then
if test -z "$CXX" ; then
- AC_CHECK_PROGS(CXX, c++ g++ gcc CC cxx cc++ cl xlC)
+ AC_CHECK_PROGS(CXX, g++-mp-4.4 g++-mp-4.2 g++-mp-4.2 c++ g++ gcc CC cxx cc++ cl xlC)
fi
CCTK_PROG_CXX_WORKS
@@ -195,11 +195,11 @@ if test -z "$PERL" ; then
fi
if test -z "$F90" ; then
- AC_CHECK_PROGS(F90, f90 pgf90 xlf90 ifort gfortran)
+ AC_CHECK_PROGS(F90, f90 pgf90 xlf90 ifort gfortran-mp-4.4 gfortran-mp-4.3 gfortran-mp-4.2 gfortran)
fi
if test -z "$F77" ; then
- AC_CHECK_PROGS(F77, f77 pgf77 g77 f90 pgf90 xlf90 ifort gfortran)
+ AC_CHECK_PROGS(F77, f77 pgf77 g77 f90 pgf90 xlf90 ifort gfortran-mp-4.4 gfortran-mp-4.3 gfortran-mp-4.2 gfortran)
fi
if test -z "$AR" ; then