[cgma-dev] r3886 - cgm/trunk/m4
kraftche at cae.wisc.edu
kraftche at cae.wisc.edu
Wed May 12 12:53:11 CDT 2010
Author: kraftche
Date: 2010-05-12 12:53:11 -0500 (Wed, 12 May 2010)
New Revision: 3886
Modified:
cgm/trunk/m4/compiler.m4
Log:
sync compiler configuration w/ MOAB
Modified: cgm/trunk/m4/compiler.m4
===================================================================
--- cgm/trunk/m4/compiler.m4 2010-05-12 17:50:25 UTC (rev 3885)
+++ cgm/trunk/m4/compiler.m4 2010-05-12 17:53:11 UTC (rev 3886)
@@ -21,6 +21,7 @@
# CPP - The C preprocessor
# CC - The C compiler
# CXX - The C++ compiler
+# FC - The Fortran compiler
# CFLAGS - C compiler flags
# CXXFLAGS - C++ compiler flags
# WITH_MPI - 'yes' if parallel support, 'no' otherwise
@@ -41,7 +42,6 @@
test "xno" = "x$CHECK_CXX" || CHECK_CXX=yes
test "xno" = "x$CHECK_FC" || CHECK_FC=yes
-
# Save these before calling AC_PROG_CC or AC_PROG_CXX
# because those macros will modify them, and we want
# the original user values, not the autoconf defaults.
@@ -54,10 +54,10 @@
[WITH_MPI=$withval],[WITH_MPI=no] )
case "x$WITH_MPI" in
xno)
- CC_LIST="cc gcc cl egcs pgcc"
- CXX_LIST="CC aCC cxx xlC_r xlC c++ g++ pgCC gpp cc++ cl FCC KCC RCC"
- FC_LIST="gfortran ifort pgf90"
- F77_LIST="gfortran ifort pgf77"
+ CC_LIST=
+ CXX_LIST=
+ FC_LIST=
+ F77_LIST=
;;
xyes)
CC_LIST="mpicc mpcc"
@@ -111,16 +111,32 @@
esac
if test "xno" != "x$CHECK_CC"; then
- AC_PROG_CC( [$CC_LIST] )
+ if test "x" = "x$CC_LIST"; then
+ AC_PROG_CC
+ else
+ AC_PROG_CC( [$CC_LIST] )
+ fi
fi
AC_PROG_CPP
if test "xno" != "x$CHECK_CXX"; then
- AC_PROG_CXX( [$CXX_LIST] )
+ if test "x" = "x$CXX_LIST"; then
+ AC_PROG_CXX
More information about the cgma-dev
mailing list