changeset 24337:999b167e5b4a

maint: merge stable to default.
author Rik <rik@octave.org>
date Wed, 29 Nov 2017 13:47:23 -0800
parents 8edaf9c80779 (current diff) 0771ce2d30ef (diff)
children 648616b26cc6
files m4/acinclude.m4
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/m4/acinclude.m4	Wed Nov 29 13:37:40 2017 -0800
+++ b/m4/acinclude.m4	Wed Nov 29 13:47:23 2017 -0800
@@ -785,7 +785,9 @@
 AC_DEFUN([OCTAVE_CHECK_LIB_ARPACK_OK_2], [
   AC_CACHE_CHECK([whether the arpack library is free of bugs],
     [octave_cv_lib_arpack_ok_2],
-    [AC_LANG_PUSH(Fortran 77)
+    [save_FFLAGS="$FFLAGS"
+    FFLAGS="$FFLAGS $F77_INTEGER_8_FLAG"
+    AC_LANG_PUSH(Fortran 77)
     AC_RUN_IFELSE([[
       program bug_52425 
 c
@@ -900,6 +902,8 @@
     octave_cv_lib_arpack_ok_2=yes,
     octave_cv_lib_arpack_ok_2=no,
     octave_cv_lib_arpack_ok_2=yes)
+    ## Restore FFLAGS.
+    FFLAGS="$save_FFLAGS"
     AC_LANG_POP(Fortran 77)
   ])
   if test $octave_cv_lib_arpack_ok_2 = yes; then