[mpich2-commits] r7901 - mpich2/trunk/confdb

[chan at mcs.anl.gov]

Author: chan
Date: 2011-02-03 17:03:34 -0600 (Thu, 03 Feb 2011)
New Revision: 7901

Modified:
   mpich2/trunk/confdb/aclocal_fc.m4
Log:
bugfix for PAC_PROG_FC_HAS_POINTER: clean up after AC_LANG_CONFTEST and restore FCFLAGS...



Modified: mpich2/trunk/confdb/aclocal_fc.m4
===================================================================
--- mpich2/trunk/confdb/aclocal_fc.m4	2011-02-03 22:04:22 UTC (rev 7900)
+++ mpich2/trunk/confdb/aclocal_fc.m4	2011-02-03 23:03:34 UTC (rev 7901)
@@ -273,9 +273,7 @@
         # cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
         _AC_MSG_LOG_CONFTEST
     fi
-    ],
-    []
-)
+],[])
 # Remove the conftest* after AC_LANG_CONFTEST
 rm -rf conftest.dSYM
 rm -f conftest.$ac_ext
@@ -421,7 +419,7 @@
 AC_DEFUN([PAC_PROG_FC_HAS_POINTER],[
 AC_CACHE_CHECK([whether Fortran 90 supports Cray-style pointer],
 pac_cv_prog_fc_has_pointer,[
-AC_LANG_PUSH(Fortran)
+AC_LANG_PUSH([Fortran])
 AC_LANG_CONFTEST([
     AC_LANG_PROGRAM([],[
         integer M
@@ -438,7 +436,10 @@
 if test "$pac_cv_prog_fc_has_pointer" = "yes" -a "X$ptrflag" != "X" ; then
     pac_cv_prog_fc_has_pointer="with $ptrflag"
 fi
-AC_LANG_POP(Fortran)
+FCFLAGS="$saved_FCFLAGS"
+dnl remove conftest after ac_lang_conftest
+rm -f conftest.$ac_ext
+AC_LANG_POP([Fortran])
 ])
 if test "X$pac_cv_prog_fc_has_pointer" != "X" ; then
     ifelse([$1],,:,[$1])