# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1483526856 18000
# Node ID 8528b1ccd529e056a607a2b05052e869f56ff7f4
# Parent  2c34ec679fb3613c7eb0c76c37f9194201692f4c
default-octave: fix F77 integer size configuration

diff -r 2c34ec679fb3 -r 8528b1ccd529 src/default-octave.mk
--- a/src/default-octave.mk	Sun Jan 01 08:00:17 2017 -0500
+++ b/src/default-octave.mk	Wed Jan 04 05:47:36 2017 -0500
@@ -81,9 +81,8 @@
   $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
   ifeq ($(ENABLE_64),yes)
     $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull
-  endif
-  ifeq ($(ENABLE_FORTRAN_INT64),yes)
-    F77_INTEGER_8_FLAG=-fdefault-integer-8
+  else
+    $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --disable-64
   endif
 else
   ifeq ($(MXE_SYSTEM),mingw)
@@ -92,13 +91,18 @@
       gl_cv_func_gettimeofday_clobber=no
     ifeq ($(ENABLE_64),yes)
       $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull
-    endif
-    ifeq ($(ENABLE_FORTRAN_INT64),yes)
-      $(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS := F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes ax_blas_integer_size=8 octave_cv_sizeof_fortran_integer=8"
+    else
+      $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --disable-64
     endif
   endif
 endif
 
+ifeq ($(ENABLE_FORTRAN_INT64),yes)
+  $(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS := F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes ax_blas_integer_size=8 octave_cv_sizeof_fortran_integer=8
+else
+  $(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS := ax_blas_f77_func_ok=yes ax_blas_integer_size=4 octave_cv_sizeof_fortran_integer=4
+endif
+
 ifeq ($(MXE_SYSTEM),msvc)
   $(PKG)_PREFIX := '$(HOST_PREFIX)/local/$($(PKG)_SUBDIR)'
   # - Enable atomic refcount (required for QtHandles)