From: chas williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Date: Wed, 7 Sep 2011 13:55:47 +0000 (-0400)
Subject: autoconf: use $XCFLAGS from OPENAFS_OSCONF when making tests
X-Git-Tag: upstream/1.8.0_pre1^2~3298
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=440943e96b4be87abd02c47b3bcea8a5a2bdbc5f;p=packages%2Fo%2Fopenafs.git

autoconf: use $XCFLAGS from OPENAFS_OSCONF when making tests

Certain platforms (like ppc64_linux26) compiler options might
affect some autoconf tests.  In particular, the ones related to
the size of certain primitive types.

Change-Id: I20c3f737ee4623451bc6cab3f97e86d152cb397f
Reviewed-on: http://gerrit.openafs.org/5366
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/acinclude.m4 b/acinclude.m4
index 17e553084..99e0edf43 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1613,6 +1613,10 @@ AC_DEFINE_UNQUOTED([PTHREAD_SETNAME_NP_ARGS], $pthread_setname_np_args, [Number
 fi
 LIBS="$save_LIBS"
 
+OPENAFS_OSCONF
+openafs_cv_saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $XCFLAGS_NOCHECKING"
+
 AC_TYPE_SIGNAL
 OPENAFS_RETSIGTYPE
 AC_CHECK_SIZEOF(void *)
@@ -1661,6 +1665,8 @@ AC_CHECK_TYPES([long long], [], [], [])
 
 AC_SIZEOF_TYPE(long)
 
+CFLAGS="$openafs_cv_saved_CFLAGS"
+
 RRA_HEADER_PAM_CONST
 
 
@@ -1738,7 +1744,6 @@ AC_SUBST(XSLTPROC)
 AC_SUBST(DOCBOOK2PDF)
 AC_SUBST(DOCBOOK_STYLESHEETS)
 
-OPENAFS_OSCONF
 OPENAFS_FUSE
 OPENAFS_SWIG
 
diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 3bbeafe1d..623154650 100644
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -8,6 +8,7 @@ CCOBJ="$CC"
 MT_CC="$CC"
 XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} ${LIB_libintl}"
 MT_LIBS='-lpthread ${XLIBS}'
+XCFLAGS=
 
 dnl debugging and optimization flag defaults
 dnl Note, these are all the defaults for if debug/optimize turned on, and
@@ -707,6 +708,7 @@ CFLAGS_NOERROR=
 CFLAGS_NOSTRICT=
 CFLAGS_NOUNUSED=
 CFLAGS_NOOLDSTYLE=
+XCFLAGS_NOCHECKING="$XCFLAGS"
 
 if test "x$GCC" = "xyes"; then
   if test "x$enable_warnings" = "xyes"; then