Mercurial > hg > octave-nkf
changeset 20045:4006a7377a19
don't save and restore FFLAGS in configure (bug #44359)
* configure.ac: Don't attempt to save and restore FFLAGS.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 23 Feb 2015 23:05:30 -0500 |
parents | d3dcc62512d7 |
children | 07b970d6cdfe |
files | configure.ac |
diffstat | 1 files changed, 6 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac +++ b/configure.ac @@ -316,16 +316,14 @@ AC_PROG_CPP AC_PROG_GCC_TRADITIONAL -## Save and restore CFLAGS, CXXFLAGS, and FFLAGS globally. These variables -## are for users, so we shouldn't be touching them. Instead, we should set -## the corresponding AM_ flags (currently by way of the XTRA_ variables). -## However, for the duration of the configure script, we may set CFLAGS, -## CXXFLAGS, or FFLAGS so that subsequent tests succeed. Temporary -## settings like this are currently done for pthreads and openmp, for -## example. +## Save and restore CFLAGS and CXXFLAGS globally. These variables +## are for users, so we shouldn't be touching them. Instead, we should +## set the corresponding AM_ flags (currently by way of the XTRA_ variables). +## However, for the duration of the configure script, we may set CFLAGS +## and CXXFLAGS so that subsequent tests succeed. Temporary settings +## like this are currently done for pthreads and openmp, for example. original_octave_configure_CFLAGS="$CFLAGS" original_octave_configure_CXXFLAGS="$CXXFLAGS" -original_octave_configure_FFLAGS="$FFLAGS" ## Check for MSVC have_msvc=no @@ -2969,7 +2967,6 @@ CFLAGS="$original_octave_configure_CFLAGS" CXXFLAGS="$original_octave_configure_CXXFLAGS" -FFLAGS="$original_octave_configure_FFLAGS" AH_BOTTOM([#include "oct-conf-post.h"])