Changeset 4845

Timestamp:

06/29/09 01:08:44 (5 months ago)

Author:

balaji

Message:

This patch is really a hack to get around some of the issues with the
top-level configure.in. We currently do not store any of the detected
compiler flags in CFLAGS, but rather add them to
MPICH2_EXTRA_CFLAGS. So, the autoconf and confdb macros which use
these flags make incorrect decisions on what should be defined and
what not. This patch temporarily sets the CFLAGS to the detected flags
for each test and resets them once the test is done. The correct fix
for this is to save the user-defined CFLAGS in some place and append
flags as they are detected into the CFLAGS variable itself.

Files:

• mpich2/trunk/configure.in (modified) (8 diffs)

mpich2/trunk/configure.in

@@ -3159 +3159 @@
 PAC_C_VOLATILE
 PAC_C_RESTRICT
+
+saveCFLAGS=$CFLAGS
+CFLAGS="$CFLAGS $MPICH2_EXTRA_CFLAGS"
 AC_C_INLINE
+CFLAGS=$saveCFLAGS
+
 PAC_C_GNU_ATTRIBUTE
 # We need to check for the endianess in order to implement the
@@ -5085 +5090 @@
 if test "$ac_cv_func_vsnprintf" = "yes" ; then
     # vsnprintf may be declared in stdio.h and may need stdarg.h 
+    saveCFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS $MPICH2_EXTRA_CFLAGS"
     PAC_FUNC_NEEDS_DECL([#include <stdio.h>
 #include <stdarg.h>],vsnprintf)
+    CFLAGS=$saveCFLAGS
 fi
 # We would like to use strerror in the file namepublisher; it is also used
@@ -5095 +5103 @@
 AC_CHECK_FUNCS(snprintf)
 if test "$ac_cv_func_snprintf" = "yes" ; then
+    saveCFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS $MPICH2_EXTRA_CFLAGS"
     PAC_FUNC_NEEDS_DECL([#include <stdio.h>],snprintf)
+    CFLAGS=$saveCFLAGS
 fi
 # if we are using stdarg, we may need va_copy .  Test to see if we have it
@@ -5104 +5115 @@
 # test in confdb/aclocal_cc.m4).
 AC_CACHE_CHECK([for va_copy],pac_cv_func_va_copy,[
+saveCFLAGS=$CFLAGS
+CFLAGS="$CFLAGS $MPICH2_EXTRA_CFLAGS"
 AC_TRY_LINK([
 #include <stdarg.h>
@@ -5114 +5127 @@
 }
 ],[foo1("a test %d", 3);],pac_cv_func_va_copy=yes,pac_cv_func_va_copy=no)])
+CFLAGS=$saveCFLAGS
+
 if test "$pac_cv_func_va_copy" = "yes" ; then
     AC_DEFINE(HAVE_VA_COPY,1,[Define if we have va_copy])
-fi
-# We might have __va_copy...
-if test "$pac_cv_func_va_copy" != "yes" ; then 
+else
     AC_CACHE_CHECK([for __va_copy],pac_cv_func___va_copy,[
+    saveCFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS $MPICH2_EXTRA_CFLAGS"
     AC_TRY_LINK([
 #include <stdarg.h>
@@ -5130 +5145 @@
 }
 ],[foo1("a test %d", 3);],pac_cv_func___va_copy=yes,pac_cv_func___va_copy=no)])
+    CFLAGS=$saveCFLAGS
     if test "$pac_cv_func___va_copy" = "yes" ; then
-    AC_DEFINE(HAVE___VA_COPY,1,[Define if we have __va_copy])
+        AC_DEFINE(HAVE___VA_COPY,1,[Define if we have __va_copy])
     fi
 fi
@@ -5165 +5181 @@
     if test "$ac_cv_func_strdup" = "yes" ; then
         # Do we need to declare strdup?
+        saveCFLAGS=$CFLAGS
+        CFLAGS="$CFLAGS $MPICH2_EXTRA_CFLAGS"
         PAC_FUNC_NEEDS_DECL([#include <string.h>],strdup)
+        CFLAGS=$saveCFLAGS
     fi
 else
@@ -5196 +5215 @@
 AC_HAVE_FUNCS(mkstemp)
 if test "$ac_cv_func_mkstemp" = "yes" ; then
+    saveCFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS $MPICH2_EXTRA_CFLAGS"
     PAC_FUNC_NEEDS_DECL([#include <stdlib.h>],mkstemp)
+    CFLAGS=$saveCFLAGS
 fi
 # fdopen() converts from an fd to a FILE*
 AC_HAVE_FUNCS(fdopen)
 if test "$ac_cv_func_fdopen" = "yes" ; then
+    saveCFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS $MPICH2_EXTRA_CFLAGS"
     PAC_FUNC_NEEDS_DECL([#include <stdlib.h>],fdopen)
+    CFLAGS=$saveCFLAGS
 fi
 # putenv() sets environment variable
 AC_HAVE_FUNCS(putenv)
 if test "$ac_cv_func_putenv" = "yes" ; then
+    saveCFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS $MPICH2_EXTRA_CFLAGS"
     PAC_FUNC_NEEDS_DECL([#include <stdlib.h>],putenv)
+    CFLAGS=$saveCFLAGS
 fi