Mercurial > octave

changeset 23389:f0eb5d4431b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* configure.ac: Reorder definition of compiler flag collections.
author John W. Eaton <jwe@octave.org>
date Wed, 12 Apr 2017 13:34:23 -0400
parents 41dcc5c1e41f
children 1ae9f4c1f48a
files configure.ac
diffstat 1 files changed, 57 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Wed Apr 12 10:31:05 2017 -0400
+++ b/configure.ac	Wed Apr 12 13:34:23 2017 -0400
@@ -1553,6 +1553,22 @@
   OCTAVE_CHECK_FFTW_THREADS(fftw3f, fftwf_plan_with_nthreads)
 fi
 
+## Collections of flags.  These are here instead of just in the
+## Makefile.am file because we substitute some of them into other
+## source files like mkoctfile.
+
+## Order matters, at least on some systems (Cygwin, for example).
+
+FFTW_XCPPFLAGS="$FFTW3_CPPFLAGS $FFTW3F_CPPFLAGS"
+
+FFTW_XLDFLAGS="$FFTW3_LDFLAGS $FFTW3F_LDFLAGS"
+
+FFTW_XLIBS="$FFTW3_LIBS $FFTW3F_LIBS"
+
+AC_SUBST(FFTW_XCPPFLAGS)
+AC_SUBST(FFTW_XLDFLAGS)
+AC_SUBST(FFTW_XLIBS)
+
 ## Subdirectory of liboctave/cruft to build if FFTW is not found.
 FFT_DIR="fftpack"
 AC_SUBST(FFT_DIR)
@@ -2130,15 +2146,37 @@
 fi
 AC_SUBST(SUITESPARSE_CONFIG_LIBS)
 
+## Collections of flags.  These are here instead of just in the
+## Makefile.am file because we substitute some of them into other
+## source files like mkoctfile.
+
+## Order matters, at least on some systems (Cygwin, for example).
+
+SPARSE_XCPPFLAGS="$CHOLMOD_CPPFLAGS $UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CAMD_CPPFLAGS $COLAMD_CPPFLAGS $CCOLAMD_CPPFLAGS $CXSPARSE_CPPFLAGS"
+
+SPARSE_XLDFLAGS="$CHOLMOD_LDFLAGS $UMFPACK_LDFLAGS $AMD_LDFLAGS $CAMD_LDFLAGS $COLAMD_LDFLAGS  $CCOLAMD_LDFLAGS $CXSPARSE_LDFLAGS"
+
+SPARSE_XLIBS="$CHOLMOD_LIBS $UMFPACK_LIBS $AMD_LIBS $CAMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $CXSPARSE_LIBS $SUITESPARSE_CONFIG_LIBS"
+
+AC_SUBST(SPARSE_XCPPFLAGS)
+AC_SUBST(SPARSE_XLDFLAGS)
+AC_SUBST(SPARSE_XLIBS)
+
 ## Check for UMFPACK separately split complex matrix and RHS.
 if test -n "$UMFPACK_LIBS"; then
   save_CPPFLAGS="$CPPFLAGS"
+  save_LDFLAGS="$LDFLAGS";
   save_LIBS="$LIBS";
-  CPPFLAGS="$UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CPPFLAGS"
-  LIBS="$UMFPACK_LIBS $CHOLMOD_LDFLAGS $CHOLMOD_LIBS $AMD_LDFLAGS $AMD_LIBS $COLAMD_LDFLAGS $COLAMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs"
+
+  CPPFLAGS="$SPARSE_XCPPFLAGS $CPPFLAGS"
+  LDFLAGS="$SPARSE_XLDFLAGS $LDFLAGS"
+  LIBS="$SPARSE_XLIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs"
+
   OCTAVE_UMFPACK_SEPARATE_SPLIT
+
+  CPPFLAGS="$save_CPPFLAGS"
+  LDFLAGS="$save_LDFLAGS"
   LIBS="$save_LIBS"
-  CPPFLAGS="$save_CPPFLAGS"
 fi
 
 ### Check for Sundials nvecserial library and header.
@@ -2174,6 +2212,22 @@
   AC_DEFINE(HAVE_SUNDIALS, 1, [Define Sundials is available.])
 fi
 
+## Collections of flags.  These are here instead of just in the
+## Makefile.am file because we substitute some of them into other
+## source files like mkoctfile.
+
+## Order matters, at least on some systems (Cygwin, for example).
+
+SUNDIALS_XCPPFLAGS="$SUNDIALS_IDA_CPPFLAGS $SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS"
+
+SUNDIALS_XLDFLAGS="$SUNDIALS_IDA_LDFLAGS $SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS"
+
+SUNDIALS_XLIBS="$SUNDIALS_IDA_LIBS $SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS"
+
+AC_SUBST(SUNDIALS_XCPPFLAGS)
+AC_SUBST(SUNDIALS_XLDFLAGS)
+AC_SUBST(SUNDIALS_XLIBS)
+
 ### Check for ARPACK library.
 
 save_LIBS="$LIBS"
@@ -2953,42 +3007,6 @@
 AC_DEFINE_UNQUOTED([JAVA_HOME], ["$JAVA_HOME"], [Java home (top-level installation dir)])
 AC_DEFINE_UNQUOTED([JAVA_LDPATH], ["$JAVA_LDPATH"], [Java library path (libjvm)])
 
-## Collections of flags.  These are here instead of just in the
-## Makefile.am file because we substitute some of them into other
-## source files like mkoctfile.
-
-## Order matters, at least on some systems (Cygwin, for example).
-
-FFTW_XCPPFLAGS="$FFTW3_CPPFLAGS $FFTW3F_CPPFLAGS"
-
-FFTW_XLDFLAGS="$FFTW3_LDFLAGS $FFTW3F_LDFLAGS"
-
-FFTW_XLIBS="$FFTW3_LIBS $FFTW3F_LIBS"
-
-SUNDIALS_XCPPFLAGS="$SUNDIALS_IDA_CPPFLAGS $SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS"
-
-SUNDIALS_XLDFLAGS="$SUNDIALS_IDA_LDFLAGS $SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS"
-
-SUNDIALS_XLIBS="$SUNDIALS_IDA_LIBS $SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS"
-
-SPARSE_XCPPFLAGS="$CHOLMOD_CPPFLAGS $UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CAMD_CPPFLAGS $COLAMD_CPPFLAGS $CCOLAMD_CPPFLAGS $CXSPARSE_CPPFLAGS"
-
-SPARSE_XLDFLAGS="$CHOLMOD_LDFLAGS $UMFPACK_LDFLAGS $AMD_LDFLAGS $CAMD_LDFLAGS $COLAMD_LDFLAGS  $CCOLAMD_LDFLAGS $CXSPARSE_LDFLAGS"
-
-SPARSE_XLIBS="$CHOLMOD_LIBS $UMFPACK_LIBS $AMD_LIBS $CAMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $CXSPARSE_LIBS $SUITESPARSE_CONFIG_LIBS"
-
-AC_SUBST(FFTW_XCPPFLAGS)
-AC_SUBST(FFTW_XLDFLAGS)
-AC_SUBST(FFTW_XLIBS)
-
-AC_SUBST(SUNDIALS_XCPPFLAGS)
-AC_SUBST(SUNDIALS_XLDFLAGS)
-AC_SUBST(SUNDIALS_XLIBS)
-
-AC_SUBST(SPARSE_XCPPFLAGS)
-AC_SUBST(SPARSE_XLDFLAGS)
-AC_SUBST(SPARSE_XLIBS)
-
 GNULIB_LINK_DEPS="$COPYSIGNF_LIBM $COPYSIGN_LIBM $FLOORF_LIBM $FLOOR_LIBM $GETHOSTNAME_LIB $LIBSOCKET $LIB_NANOSLEEP $LIB_SELECT $LTLIBINTL $ROUNDF_LIBM $ROUND_LIBM $TRUNCF_LIBM $TRUNC_LIBM"
 
 AC_SUBST(GNULIB_LINK_DEPS)